Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1 | # SOME DESCRIPTIVE TITLE. |
| 2 | # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
| 3 | # This file is distributed under the same license as the PACKAGE package. |
| 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
| 5 | # |
| 6 | #, fuzzy |
| 7 | msgid "" |
| 8 | msgstr "" |
| 9 | "Project-Id-Version: PACKAGE VERSION\n" |
| 10 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 11 | "POT-Creation-Date: 2013-04-30 08:25+0800\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 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" |
| 15 | "Language: \n" |
| 16 | "MIME-Version: 1.0\n" |
| 17 | "Content-Type: text/plain; charset=CHARSET\n" |
| 18 | "Content-Transfer-Encoding: 8bit\n" |
| 19 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
| 20 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 21 | #: advice.c:53 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 22 | #, c-format |
| 23 | msgid "hint: %.*s\n" |
| 24 | msgstr "" |
| 25 | |
| 26 | #. |
| 27 | #. * Message used both when 'git commit' fails and when |
| 28 | #. * other commands doing a merge do. |
| 29 | #. |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 30 | #: advice.c:83 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 31 | msgid "" |
| 32 | "Fix them up in the work tree,\n" |
| 33 | "and then use 'git add/rm <file>' as\n" |
| 34 | "appropriate to mark resolution and make a commit,\n" |
| 35 | "or use 'git commit -a'." |
| 36 | msgstr "" |
| 37 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 38 | #: archive.c:10 |
| 39 | msgid "git archive [options] <tree-ish> [<path>...]" |
| 40 | msgstr "" |
| 41 | |
| 42 | #: archive.c:11 |
| 43 | msgid "git archive --list" |
| 44 | msgstr "" |
| 45 | |
| 46 | #: archive.c:12 |
| 47 | msgid "" |
| 48 | "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" |
| 49 | msgstr "" |
| 50 | |
| 51 | #: archive.c:13 |
| 52 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
| 53 | msgstr "" |
| 54 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 55 | #: archive.c:323 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 56 | msgid "fmt" |
| 57 | msgstr "" |
| 58 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 59 | #: archive.c:323 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 60 | msgid "archive format" |
| 61 | msgstr "" |
| 62 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 63 | #: archive.c:324 builtin/log.c:1126 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 64 | msgid "prefix" |
| 65 | msgstr "" |
| 66 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 67 | #: archive.c:325 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 68 | msgid "prepend prefix to each pathname in the archive" |
| 69 | msgstr "" |
| 70 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 71 | #: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 |
| 72 | #: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 |
| 73 | #: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 |
| 74 | #: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 75 | #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 76 | msgid "file" |
| 77 | msgstr "" |
| 78 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 79 | #: archive.c:327 builtin/archive.c:89 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 80 | msgid "write the archive to this file" |
| 81 | msgstr "" |
| 82 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 83 | #: archive.c:329 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 84 | msgid "read .gitattributes in working directory" |
| 85 | msgstr "" |
| 86 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 87 | #: archive.c:330 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 88 | msgid "report archived files on stderr" |
| 89 | msgstr "" |
| 90 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 91 | #: archive.c:331 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 92 | msgid "store only" |
| 93 | msgstr "" |
| 94 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 95 | #: archive.c:332 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 96 | msgid "compress faster" |
| 97 | msgstr "" |
| 98 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 99 | #: archive.c:340 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 100 | msgid "compress better" |
| 101 | msgstr "" |
| 102 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 103 | #: archive.c:343 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 104 | msgid "list supported archive formats" |
| 105 | msgstr "" |
| 106 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 107 | #: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 108 | msgid "repo" |
| 109 | msgstr "" |
| 110 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 111 | #: archive.c:346 builtin/archive.c:91 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 112 | msgid "retrieve the archive from remote repository <repo>" |
| 113 | msgstr "" |
| 114 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 115 | #: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 116 | msgid "command" |
| 117 | msgstr "" |
| 118 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 119 | #: archive.c:348 builtin/archive.c:93 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 120 | msgid "path to the remote git-upload-archive command" |
| 121 | msgstr "" |
| 122 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 123 | #: attr.c:259 |
| 124 | msgid "" |
Jiang Xin | ed1ddaf | 2013-03-05 12:41:45 +0800 | [diff] [blame] | 125 | "Negative patterns are ignored in git attributes\n" |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 126 | "Use '\\!' for literal leading exclamation." |
| 127 | msgstr "" |
| 128 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 129 | #: branch.c:60 |
| 130 | #, c-format |
| 131 | msgid "Not setting branch %s as its own upstream." |
| 132 | msgstr "" |
| 133 | |
| 134 | #: branch.c:82 |
| 135 | #, c-format |
| 136 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." |
| 137 | msgstr "" |
| 138 | |
| 139 | #: branch.c:83 |
| 140 | #, c-format |
| 141 | msgid "Branch %s set up to track remote branch %s from %s." |
| 142 | msgstr "" |
| 143 | |
| 144 | #: branch.c:87 |
| 145 | #, c-format |
| 146 | msgid "Branch %s set up to track local branch %s by rebasing." |
| 147 | msgstr "" |
| 148 | |
| 149 | #: branch.c:88 |
| 150 | #, c-format |
| 151 | msgid "Branch %s set up to track local branch %s." |
| 152 | msgstr "" |
| 153 | |
| 154 | #: branch.c:92 |
| 155 | #, c-format |
| 156 | msgid "Branch %s set up to track remote ref %s by rebasing." |
| 157 | msgstr "" |
| 158 | |
| 159 | #: branch.c:93 |
| 160 | #, c-format |
| 161 | msgid "Branch %s set up to track remote ref %s." |
| 162 | msgstr "" |
| 163 | |
| 164 | #: branch.c:97 |
| 165 | #, c-format |
| 166 | msgid "Branch %s set up to track local ref %s by rebasing." |
| 167 | msgstr "" |
| 168 | |
| 169 | #: branch.c:98 |
| 170 | #, c-format |
| 171 | msgid "Branch %s set up to track local ref %s." |
| 172 | msgstr "" |
| 173 | |
| 174 | #: branch.c:118 |
| 175 | #, c-format |
| 176 | msgid "Tracking not set up: name too long: %s" |
| 177 | msgstr "" |
| 178 | |
| 179 | #: branch.c:137 |
| 180 | #, c-format |
| 181 | msgid "Not tracking: ambiguous information for ref %s" |
| 182 | msgstr "" |
| 183 | |
| 184 | #: branch.c:182 |
| 185 | #, c-format |
| 186 | msgid "'%s' is not a valid branch name." |
| 187 | msgstr "" |
| 188 | |
| 189 | #: branch.c:187 |
| 190 | #, c-format |
| 191 | msgid "A branch named '%s' already exists." |
| 192 | msgstr "" |
| 193 | |
| 194 | #: branch.c:195 |
| 195 | msgid "Cannot force update the current branch." |
| 196 | msgstr "" |
| 197 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 198 | #: branch.c:201 |
| 199 | #, c-format |
| 200 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
| 201 | msgstr "" |
| 202 | |
| 203 | #: branch.c:203 |
| 204 | #, c-format |
| 205 | msgid "the requested upstream branch '%s' does not exist" |
| 206 | msgstr "" |
| 207 | |
| 208 | #: branch.c:205 |
| 209 | msgid "" |
| 210 | "\n" |
| 211 | "If you are planning on basing your work on an upstream\n" |
| 212 | "branch that already exists at the remote, you may need to\n" |
| 213 | "run \"git fetch\" to retrieve it.\n" |
| 214 | "\n" |
| 215 | "If you are planning to push out a new local branch that\n" |
| 216 | "will track its remote counterpart, you may want to use\n" |
| 217 | "\"git push -u\" to set the upstream config as you push." |
| 218 | msgstr "" |
| 219 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 220 | #: branch.c:250 |
| 221 | #, c-format |
| 222 | msgid "Not a valid object name: '%s'." |
| 223 | msgstr "" |
| 224 | |
| 225 | #: branch.c:270 |
| 226 | #, c-format |
| 227 | msgid "Ambiguous object name: '%s'." |
| 228 | msgstr "" |
| 229 | |
| 230 | #: branch.c:275 |
| 231 | #, c-format |
| 232 | msgid "Not a valid branch point: '%s'." |
| 233 | msgstr "" |
| 234 | |
| 235 | #: branch.c:281 |
| 236 | msgid "Failed to lock ref for update" |
| 237 | msgstr "" |
| 238 | |
| 239 | #: branch.c:299 |
| 240 | msgid "Failed to write ref" |
| 241 | msgstr "" |
| 242 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 243 | #: bundle.c:36 |
| 244 | #, c-format |
| 245 | msgid "'%s' does not look like a v2 bundle file" |
| 246 | msgstr "" |
| 247 | |
| 248 | #: bundle.c:63 |
| 249 | #, c-format |
| 250 | msgid "unrecognized header: %s%s (%d)" |
| 251 | msgstr "" |
| 252 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 253 | #: bundle.c:89 builtin/commit.c:676 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 254 | #, c-format |
| 255 | msgid "could not open '%s'" |
| 256 | msgstr "" |
| 257 | |
| 258 | #: bundle.c:140 |
| 259 | msgid "Repository lacks these prerequisite commits:" |
| 260 | msgstr "" |
| 261 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 262 | #: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 |
| 263 | #: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 |
| 264 | #: builtin/shortlog.c:155 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 265 | msgid "revision walk setup failed" |
| 266 | msgstr "" |
| 267 | |
| 268 | #: bundle.c:186 |
| 269 | #, c-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 270 | msgid "The bundle contains this ref:" |
| 271 | msgid_plural "The bundle contains these %d refs:" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 272 | msgstr[0] "" |
| 273 | msgstr[1] "" |
| 274 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 275 | #: bundle.c:193 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 276 | msgid "The bundle records a complete history." |
| 277 | msgstr "" |
| 278 | |
| 279 | #: bundle.c:195 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 280 | #, c-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 281 | msgid "The bundle requires this ref:" |
| 282 | msgid_plural "The bundle requires these %d refs:" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 283 | msgstr[0] "" |
| 284 | msgstr[1] "" |
| 285 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 286 | #: bundle.c:294 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 287 | msgid "rev-list died" |
| 288 | msgstr "" |
| 289 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 290 | #: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 291 | #, c-format |
| 292 | msgid "unrecognized argument: %s" |
| 293 | msgstr "" |
| 294 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 295 | #: bundle.c:335 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 296 | #, c-format |
| 297 | msgid "ref '%s' is excluded by the rev-list options" |
| 298 | msgstr "" |
| 299 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 300 | #: bundle.c:380 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 301 | msgid "Refusing to create empty bundle." |
| 302 | msgstr "" |
| 303 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 304 | #: bundle.c:398 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 305 | msgid "Could not spawn pack-objects" |
| 306 | msgstr "" |
| 307 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 308 | #: bundle.c:416 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 309 | msgid "pack-objects died" |
| 310 | msgstr "" |
| 311 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 312 | #: bundle.c:419 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 313 | #, c-format |
| 314 | msgid "cannot create '%s'" |
| 315 | msgstr "" |
| 316 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 317 | #: bundle.c:441 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 318 | msgid "index-pack died" |
| 319 | msgstr "" |
| 320 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 321 | #: commit.c:50 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 322 | #, c-format |
| 323 | msgid "could not parse %s" |
| 324 | msgstr "" |
| 325 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 326 | #: commit.c:52 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 327 | #, c-format |
| 328 | msgid "%s %s is not a commit!" |
| 329 | msgstr "" |
| 330 | |
| 331 | #: compat/obstack.c:406 compat/obstack.c:408 |
| 332 | msgid "memory exhausted" |
| 333 | msgstr "" |
| 334 | |
| 335 | #: connected.c:39 |
| 336 | msgid "Could not run 'git rev-list'" |
| 337 | msgstr "" |
| 338 | |
| 339 | #: connected.c:48 |
| 340 | #, c-format |
| 341 | msgid "failed write to rev-list: %s" |
| 342 | msgstr "" |
| 343 | |
| 344 | #: connected.c:56 |
| 345 | #, c-format |
| 346 | msgid "failed to close rev-list's stdin: %s" |
| 347 | msgstr "" |
| 348 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 349 | #: date.c:95 |
| 350 | msgid "in the future" |
| 351 | msgstr "" |
| 352 | |
| 353 | #: date.c:101 |
| 354 | #, c-format |
| 355 | msgid "%lu second ago" |
| 356 | msgid_plural "%lu seconds ago" |
| 357 | msgstr[0] "" |
| 358 | msgstr[1] "" |
| 359 | |
| 360 | #: date.c:108 |
| 361 | #, c-format |
| 362 | msgid "%lu minute ago" |
| 363 | msgid_plural "%lu minutes ago" |
| 364 | msgstr[0] "" |
| 365 | msgstr[1] "" |
| 366 | |
| 367 | #: date.c:115 |
| 368 | #, c-format |
| 369 | msgid "%lu hour ago" |
| 370 | msgid_plural "%lu hours ago" |
| 371 | msgstr[0] "" |
| 372 | msgstr[1] "" |
| 373 | |
| 374 | #: date.c:122 |
| 375 | #, c-format |
| 376 | msgid "%lu day ago" |
| 377 | msgid_plural "%lu days ago" |
| 378 | msgstr[0] "" |
| 379 | msgstr[1] "" |
| 380 | |
| 381 | #: date.c:128 |
| 382 | #, c-format |
| 383 | msgid "%lu week ago" |
| 384 | msgid_plural "%lu weeks ago" |
| 385 | msgstr[0] "" |
| 386 | msgstr[1] "" |
| 387 | |
| 388 | #: date.c:135 |
| 389 | #, c-format |
| 390 | msgid "%lu month ago" |
| 391 | msgid_plural "%lu months ago" |
| 392 | msgstr[0] "" |
| 393 | msgstr[1] "" |
| 394 | |
| 395 | #: date.c:146 |
| 396 | #, c-format |
| 397 | msgid "%lu year" |
| 398 | msgid_plural "%lu years" |
| 399 | msgstr[0] "" |
| 400 | msgstr[1] "" |
| 401 | |
| 402 | #: date.c:149 |
| 403 | #, c-format |
| 404 | msgid "%s, %lu month ago" |
| 405 | msgid_plural "%s, %lu months ago" |
| 406 | msgstr[0] "" |
| 407 | msgstr[1] "" |
| 408 | |
| 409 | #: date.c:154 date.c:159 |
| 410 | #, c-format |
| 411 | msgid "%lu year ago" |
| 412 | msgid_plural "%lu years ago" |
| 413 | msgstr[0] "" |
| 414 | msgstr[1] "" |
| 415 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 416 | #: diff.c:112 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 417 | #, c-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 418 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 419 | msgstr "" |
| 420 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 421 | #: diff.c:117 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 422 | #, c-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 423 | msgid " Unknown dirstat parameter '%s'\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 424 | msgstr "" |
| 425 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 426 | #: diff.c:210 |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 427 | #, c-format |
| 428 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
| 429 | msgstr "" |
| 430 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 431 | #: diff.c:260 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 432 | #, c-format |
| 433 | msgid "" |
| 434 | "Found errors in 'diff.dirstat' config variable:\n" |
| 435 | "%s" |
| 436 | msgstr "" |
| 437 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 438 | #: diff.c:3481 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 439 | #, c-format |
| 440 | msgid "" |
| 441 | "Failed to parse --dirstat/-X option parameter:\n" |
| 442 | "%s" |
| 443 | msgstr "" |
| 444 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 445 | #: diff.c:3495 |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 446 | #, c-format |
| 447 | msgid "Failed to parse --submodule option parameter: '%s'" |
| 448 | msgstr "" |
| 449 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 450 | #: gpg-interface.c:59 gpg-interface.c:131 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 451 | msgid "could not run gpg." |
| 452 | msgstr "" |
| 453 | |
| 454 | #: gpg-interface.c:71 |
| 455 | msgid "gpg did not accept the data" |
| 456 | msgstr "" |
| 457 | |
| 458 | #: gpg-interface.c:82 |
| 459 | msgid "gpg failed to sign the data" |
| 460 | msgstr "" |
| 461 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 462 | #: gpg-interface.c:115 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 463 | #, c-format |
| 464 | msgid "could not create temporary file '%s': %s" |
| 465 | msgstr "" |
| 466 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 467 | #: gpg-interface.c:118 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 468 | #, c-format |
| 469 | msgid "failed writing detached signature to '%s': %s" |
| 470 | msgstr "" |
| 471 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 472 | #: grep.c:1623 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 473 | #, c-format |
| 474 | msgid "'%s': unable to read %s" |
| 475 | msgstr "" |
| 476 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 477 | #: grep.c:1640 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 478 | #, c-format |
| 479 | msgid "'%s': %s" |
| 480 | msgstr "" |
| 481 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 482 | #: grep.c:1651 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 483 | #, c-format |
| 484 | msgid "'%s': short read %s" |
| 485 | msgstr "" |
| 486 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 487 | #: help.c:212 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 488 | #, c-format |
| 489 | msgid "available git commands in '%s'" |
| 490 | msgstr "" |
| 491 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 492 | #: help.c:219 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 493 | msgid "git commands available from elsewhere on your $PATH" |
| 494 | msgstr "" |
| 495 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 496 | #: help.c:235 |
| 497 | msgid "The most commonly used git commands are:" |
| 498 | msgstr "" |
| 499 | |
| 500 | #: help.c:292 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 501 | #, c-format |
| 502 | msgid "" |
| 503 | "'%s' appears to be a git command, but we were not\n" |
| 504 | "able to execute it. Maybe git-%s is broken?" |
| 505 | msgstr "" |
| 506 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 507 | #: help.c:349 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 508 | msgid "Uh oh. Your system reports no Git commands at all." |
| 509 | msgstr "" |
| 510 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 511 | #: help.c:371 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 512 | #, c-format |
| 513 | msgid "" |
| 514 | "WARNING: You called a Git command named '%s', which does not exist.\n" |
| 515 | "Continuing under the assumption that you meant '%s'" |
| 516 | msgstr "" |
| 517 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 518 | #: help.c:376 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 519 | #, c-format |
| 520 | msgid "in %0.1f seconds automatically..." |
| 521 | msgstr "" |
| 522 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 523 | #: help.c:383 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 524 | #, c-format |
| 525 | msgid "git: '%s' is not a git command. See 'git --help'." |
| 526 | msgstr "" |
| 527 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 528 | #: help.c:387 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 529 | msgid "" |
| 530 | "\n" |
| 531 | "Did you mean this?" |
| 532 | msgid_plural "" |
| 533 | "\n" |
| 534 | "Did you mean one of these?" |
| 535 | msgstr[0] "" |
| 536 | msgstr[1] "" |
| 537 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 538 | #: merge.c:56 |
| 539 | msgid "failed to read the cache" |
| 540 | msgstr "" |
| 541 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 542 | #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 |
| 543 | #: builtin/clone.c:645 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 544 | msgid "unable to write new index file" |
| 545 | msgstr "" |
| 546 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 547 | #: merge-recursive.c:190 |
| 548 | #, c-format |
| 549 | msgid "(bad commit)\n" |
| 550 | msgstr "" |
| 551 | |
| 552 | #: merge-recursive.c:206 |
| 553 | #, c-format |
| 554 | msgid "addinfo_cache failed for path '%s'" |
| 555 | msgstr "" |
| 556 | |
| 557 | #: merge-recursive.c:268 |
| 558 | msgid "error building trees" |
| 559 | msgstr "" |
| 560 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 561 | #: merge-recursive.c:672 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 562 | #, c-format |
| 563 | msgid "failed to create path '%s'%s" |
| 564 | msgstr "" |
| 565 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 566 | #: merge-recursive.c:683 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 567 | #, c-format |
| 568 | msgid "Removing %s to make room for subdirectory\n" |
| 569 | msgstr "" |
| 570 | |
| 571 | #. something else exists |
| 572 | #. .. but not some other error (who really cares what?) |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 573 | #: merge-recursive.c:697 merge-recursive.c:718 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 574 | msgid ": perhaps a D/F conflict?" |
| 575 | msgstr "" |
| 576 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 577 | #: merge-recursive.c:708 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 578 | #, c-format |
| 579 | msgid "refusing to lose untracked file at '%s'" |
| 580 | msgstr "" |
| 581 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 582 | #: merge-recursive.c:748 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 583 | #, c-format |
| 584 | msgid "cannot read object %s '%s'" |
| 585 | msgstr "" |
| 586 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 587 | #: merge-recursive.c:750 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 588 | #, c-format |
| 589 | msgid "blob expected for %s '%s'" |
| 590 | msgstr "" |
| 591 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 592 | #: merge-recursive.c:773 builtin/clone.c:313 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 593 | #, c-format |
| 594 | msgid "failed to open '%s'" |
| 595 | msgstr "" |
| 596 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 597 | #: merge-recursive.c:781 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 598 | #, c-format |
| 599 | msgid "failed to symlink '%s'" |
| 600 | msgstr "" |
| 601 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 602 | #: merge-recursive.c:784 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 603 | #, c-format |
| 604 | msgid "do not know what to do with %06o %s '%s'" |
| 605 | msgstr "" |
| 606 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 607 | #: merge-recursive.c:922 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 608 | msgid "Failed to execute internal merge" |
| 609 | msgstr "" |
| 610 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 611 | #: merge-recursive.c:926 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 612 | #, c-format |
| 613 | msgid "Unable to add %s to database" |
| 614 | msgstr "" |
| 615 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 616 | #: merge-recursive.c:942 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 617 | msgid "unsupported object type in the tree" |
| 618 | msgstr "" |
| 619 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 620 | #: merge-recursive.c:1021 merge-recursive.c:1035 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 621 | #, c-format |
| 622 | msgid "" |
| 623 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
| 624 | "in tree." |
| 625 | msgstr "" |
| 626 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 627 | #: merge-recursive.c:1027 merge-recursive.c:1040 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 628 | #, c-format |
| 629 | msgid "" |
| 630 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
| 631 | "in tree at %s." |
| 632 | msgstr "" |
| 633 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 634 | #: merge-recursive.c:1081 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 635 | msgid "rename" |
| 636 | msgstr "" |
| 637 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 638 | #: merge-recursive.c:1081 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 639 | msgid "renamed" |
| 640 | msgstr "" |
| 641 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 642 | #: merge-recursive.c:1137 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 643 | #, c-format |
| 644 | msgid "%s is a directory in %s adding as %s instead" |
| 645 | msgstr "" |
| 646 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 647 | #: merge-recursive.c:1159 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 648 | #, c-format |
| 649 | msgid "" |
| 650 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
| 651 | "\"->\"%s\" in \"%s\"%s" |
| 652 | msgstr "" |
| 653 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 654 | #: merge-recursive.c:1164 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 655 | msgid " (left unresolved)" |
| 656 | msgstr "" |
| 657 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 658 | #: merge-recursive.c:1218 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 659 | #, c-format |
| 660 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
| 661 | msgstr "" |
| 662 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 663 | #: merge-recursive.c:1248 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 664 | #, c-format |
| 665 | msgid "Renaming %s to %s and %s to %s instead" |
| 666 | msgstr "" |
| 667 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 668 | #: merge-recursive.c:1447 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 669 | #, c-format |
| 670 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
| 671 | msgstr "" |
| 672 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 673 | #: merge-recursive.c:1457 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 674 | #, c-format |
| 675 | msgid "Adding merged %s" |
| 676 | msgstr "" |
| 677 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 678 | #: merge-recursive.c:1462 merge-recursive.c:1660 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 679 | #, c-format |
| 680 | msgid "Adding as %s instead" |
| 681 | msgstr "" |
| 682 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 683 | #: merge-recursive.c:1513 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 684 | #, c-format |
| 685 | msgid "cannot read object %s" |
| 686 | msgstr "" |
| 687 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 688 | #: merge-recursive.c:1516 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 689 | #, c-format |
| 690 | msgid "object %s is not a blob" |
| 691 | msgstr "" |
| 692 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 693 | #: merge-recursive.c:1564 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 694 | msgid "modify" |
| 695 | msgstr "" |
| 696 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 697 | #: merge-recursive.c:1564 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 698 | msgid "modified" |
| 699 | msgstr "" |
| 700 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 701 | #: merge-recursive.c:1574 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 702 | msgid "content" |
| 703 | msgstr "" |
| 704 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 705 | #: merge-recursive.c:1581 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 706 | msgid "add/add" |
| 707 | msgstr "" |
| 708 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 709 | #: merge-recursive.c:1615 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 710 | #, c-format |
| 711 | msgid "Skipped %s (merged same as existing)" |
| 712 | msgstr "" |
| 713 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 714 | #: merge-recursive.c:1629 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 715 | #, c-format |
| 716 | msgid "Auto-merging %s" |
| 717 | msgstr "" |
| 718 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 719 | #: merge-recursive.c:1633 git-submodule.sh:1029 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 720 | msgid "submodule" |
| 721 | msgstr "" |
| 722 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 723 | #: merge-recursive.c:1634 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 724 | #, c-format |
| 725 | msgid "CONFLICT (%s): Merge conflict in %s" |
| 726 | msgstr "" |
| 727 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 728 | #: merge-recursive.c:1724 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 729 | #, c-format |
| 730 | msgid "Removing %s" |
| 731 | msgstr "" |
| 732 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 733 | #: merge-recursive.c:1749 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 734 | msgid "file/directory" |
| 735 | msgstr "" |
| 736 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 737 | #: merge-recursive.c:1755 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 738 | msgid "directory/file" |
| 739 | msgstr "" |
| 740 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 741 | #: merge-recursive.c:1760 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 742 | #, c-format |
| 743 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
| 744 | msgstr "" |
| 745 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 746 | #: merge-recursive.c:1770 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 747 | #, c-format |
| 748 | msgid "Adding %s" |
| 749 | msgstr "" |
| 750 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 751 | #: merge-recursive.c:1787 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 752 | msgid "Fatal merge failure, shouldn't happen." |
| 753 | msgstr "" |
| 754 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 755 | #: merge-recursive.c:1806 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 756 | msgid "Already up-to-date!" |
| 757 | msgstr "" |
| 758 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 759 | #: merge-recursive.c:1815 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 760 | #, c-format |
| 761 | msgid "merging of trees %s and %s failed" |
| 762 | msgstr "" |
| 763 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 764 | #: merge-recursive.c:1845 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 765 | #, c-format |
| 766 | msgid "Unprocessed path??? %s" |
| 767 | msgstr "" |
| 768 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 769 | #: merge-recursive.c:1890 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 770 | msgid "Merging:" |
| 771 | msgstr "" |
| 772 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 773 | #: merge-recursive.c:1903 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 774 | #, c-format |
Jiang Xin | bb2ba06 | 2012-08-06 23:48:08 +0800 | [diff] [blame] | 775 | msgid "found %u common ancestor:" |
| 776 | msgid_plural "found %u common ancestors:" |
| 777 | msgstr[0] "" |
| 778 | msgstr[1] "" |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 779 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 780 | #: merge-recursive.c:1940 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 781 | msgid "merge returned no commit" |
| 782 | msgstr "" |
| 783 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 784 | #: merge-recursive.c:1997 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 785 | #, c-format |
| 786 | msgid "Could not parse object '%s'" |
| 787 | msgstr "" |
| 788 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 789 | #: merge-recursive.c:2009 builtin/merge.c:658 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 790 | msgid "Unable to write index." |
| 791 | msgstr "" |
| 792 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 793 | #: object.c:195 |
| 794 | #, c-format |
| 795 | msgid "unable to parse object: %s" |
| 796 | msgstr "" |
| 797 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 798 | #: parse-options.c:489 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 799 | msgid "..." |
| 800 | msgstr "" |
| 801 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 802 | #: parse-options.c:507 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 803 | #, c-format |
| 804 | msgid "usage: %s" |
| 805 | msgstr "" |
| 806 | |
| 807 | #. TRANSLATORS: the colon here should align with the |
| 808 | #. one in "usage: %s" translation |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 809 | #: parse-options.c:511 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 810 | #, c-format |
| 811 | msgid " or: %s" |
| 812 | msgstr "" |
| 813 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 814 | #: parse-options.c:514 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 815 | #, c-format |
| 816 | msgid " %s" |
| 817 | msgstr "" |
| 818 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 819 | #: parse-options.c:548 |
| 820 | msgid "-NUM" |
| 821 | msgstr "" |
| 822 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 823 | #: pathspec.c:83 |
| 824 | #, c-format |
| 825 | msgid "Path '%s' is in submodule '%.*s'" |
| 826 | msgstr "" |
| 827 | |
| 828 | #: pathspec.c:99 |
| 829 | #, c-format |
| 830 | msgid "'%s' is beyond a symbolic link" |
| 831 | msgstr "" |
| 832 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 833 | #: remote.c:1781 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 834 | #, c-format |
| 835 | msgid "Your branch is ahead of '%s' by %d commit.\n" |
| 836 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" |
| 837 | msgstr[0] "" |
| 838 | msgstr[1] "" |
| 839 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 840 | #: remote.c:1787 |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 841 | msgid " (use \"git push\" to publish your local commits)\n" |
| 842 | msgstr "" |
| 843 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 844 | #: remote.c:1790 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 845 | #, c-format |
| 846 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" |
| 847 | msgid_plural "" |
| 848 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" |
| 849 | msgstr[0] "" |
| 850 | msgstr[1] "" |
| 851 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 852 | #: remote.c:1798 |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 853 | msgid " (use \"git pull\" to update your local branch)\n" |
| 854 | msgstr "" |
| 855 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 856 | #: remote.c:1801 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 857 | #, c-format |
| 858 | msgid "" |
| 859 | "Your branch and '%s' have diverged,\n" |
| 860 | "and have %d and %d different commit each, respectively.\n" |
| 861 | msgid_plural "" |
| 862 | "Your branch and '%s' have diverged,\n" |
| 863 | "and have %d and %d different commits each, respectively.\n" |
| 864 | msgstr[0] "" |
| 865 | msgstr[1] "" |
| 866 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 867 | #: remote.c:1811 |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 868 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
| 869 | msgstr "" |
| 870 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 871 | #: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 |
| 872 | #: builtin/merge.c:1009 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 873 | #, c-format |
| 874 | msgid "Could not open '%s' for writing" |
| 875 | msgstr "" |
| 876 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 877 | #: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 |
| 878 | #: builtin/merge.c:1001 builtin/merge.c:1014 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 879 | #, c-format |
| 880 | msgid "Could not write to '%s'" |
| 881 | msgstr "" |
| 882 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 883 | #: sequencer.c:229 |
Jiang Xin | 2b911f8 | 2012-03-08 10:20:20 +0800 | [diff] [blame] | 884 | msgid "" |
| 885 | "after resolving the conflicts, mark the corrected paths\n" |
| 886 | "with 'git add <paths>' or 'git rm <paths>'" |
| 887 | msgstr "" |
| 888 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 889 | #: sequencer.c:232 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 890 | msgid "" |
| 891 | "after resolving the conflicts, mark the corrected paths\n" |
| 892 | "with 'git add <paths>' or 'git rm <paths>'\n" |
| 893 | "and commit the result with 'git commit'" |
| 894 | msgstr "" |
| 895 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 896 | #: sequencer.c:245 sequencer.c:859 sequencer.c:942 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 897 | #, c-format |
| 898 | msgid "Could not write to %s" |
| 899 | msgstr "" |
| 900 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 901 | #: sequencer.c:248 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 902 | #, c-format |
| 903 | msgid "Error wrapping up %s" |
| 904 | msgstr "" |
| 905 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 906 | #: sequencer.c:263 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 907 | msgid "Your local changes would be overwritten by cherry-pick." |
| 908 | msgstr "" |
| 909 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 910 | #: sequencer.c:265 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 911 | msgid "Your local changes would be overwritten by revert." |
| 912 | msgstr "" |
| 913 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 914 | #: sequencer.c:268 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 915 | msgid "Commit your changes or stash them to proceed." |
| 916 | msgstr "" |
| 917 | |
| 918 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 919 | #: sequencer.c:319 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 920 | #, c-format |
| 921 | msgid "%s: Unable to write new index file" |
| 922 | msgstr "" |
| 923 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 924 | #: sequencer.c:350 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 925 | msgid "Could not resolve HEAD commit\n" |
| 926 | msgstr "" |
| 927 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 928 | #: sequencer.c:371 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 929 | msgid "Unable to update cache tree\n" |
| 930 | msgstr "" |
| 931 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 932 | #: sequencer.c:416 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 933 | #, c-format |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 934 | msgid "Could not parse commit %s\n" |
| 935 | msgstr "" |
| 936 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 937 | #: sequencer.c:421 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 938 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 939 | msgid "Could not parse parent commit %s\n" |
| 940 | msgstr "" |
| 941 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 942 | #: sequencer.c:487 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 943 | msgid "Your index file is unmerged." |
| 944 | msgstr "" |
| 945 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 946 | #: sequencer.c:506 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 947 | #, c-format |
| 948 | msgid "Commit %s is a merge but no -m option was given." |
| 949 | msgstr "" |
| 950 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 951 | #: sequencer.c:514 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 952 | #, c-format |
| 953 | msgid "Commit %s does not have parent %d" |
| 954 | msgstr "" |
| 955 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 956 | #: sequencer.c:518 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 957 | #, c-format |
| 958 | msgid "Mainline was specified but commit %s is not a merge." |
| 959 | msgstr "" |
| 960 | |
| 961 | #. TRANSLATORS: The first %s will be "revert" or |
| 962 | #. "cherry-pick", the second %s a SHA1 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 963 | #: sequencer.c:531 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 964 | #, c-format |
| 965 | msgid "%s: cannot parse parent commit %s" |
| 966 | msgstr "" |
| 967 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 968 | #: sequencer.c:535 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 969 | #, c-format |
| 970 | msgid "Cannot get commit message for %s" |
| 971 | msgstr "" |
| 972 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 973 | #: sequencer.c:621 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 974 | #, c-format |
| 975 | msgid "could not revert %s... %s" |
| 976 | msgstr "" |
| 977 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 978 | #: sequencer.c:622 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 979 | #, c-format |
| 980 | msgid "could not apply %s... %s" |
| 981 | msgstr "" |
| 982 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 983 | #: sequencer.c:654 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 984 | msgid "empty commit set passed" |
| 985 | msgstr "" |
| 986 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 987 | #: sequencer.c:662 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 988 | #, c-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 989 | msgid "git %s: failed to read the index" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 990 | msgstr "" |
| 991 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 992 | #: sequencer.c:667 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 993 | #, c-format |
| 994 | msgid "git %s: failed to refresh the index" |
| 995 | msgstr "" |
| 996 | |
| 997 | #: sequencer.c:725 |
| 998 | #, c-format |
| 999 | msgid "Cannot %s during a %s" |
| 1000 | msgstr "" |
| 1001 | |
| 1002 | #: sequencer.c:747 |
| 1003 | #, c-format |
| 1004 | msgid "Could not parse line %d." |
| 1005 | msgstr "" |
| 1006 | |
| 1007 | #: sequencer.c:752 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1008 | msgid "No commits parsed." |
| 1009 | msgstr "" |
| 1010 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1011 | #: sequencer.c:765 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1012 | #, c-format |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 1013 | msgid "Could not open %s" |
| 1014 | msgstr "" |
| 1015 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1016 | #: sequencer.c:769 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 1017 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1018 | msgid "Could not read %s." |
| 1019 | msgstr "" |
| 1020 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1021 | #: sequencer.c:776 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1022 | #, c-format |
| 1023 | msgid "Unusable instruction sheet: %s" |
| 1024 | msgstr "" |
| 1025 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1026 | #: sequencer.c:804 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1027 | #, c-format |
| 1028 | msgid "Invalid key: %s" |
| 1029 | msgstr "" |
| 1030 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1031 | #: sequencer.c:807 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1032 | #, c-format |
| 1033 | msgid "Invalid value for %s: %s" |
| 1034 | msgstr "" |
| 1035 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1036 | #: sequencer.c:819 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1037 | #, c-format |
| 1038 | msgid "Malformed options sheet: %s" |
| 1039 | msgstr "" |
| 1040 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1041 | #: sequencer.c:840 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1042 | msgid "a cherry-pick or revert is already in progress" |
| 1043 | msgstr "" |
| 1044 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1045 | #: sequencer.c:841 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1046 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
| 1047 | msgstr "" |
| 1048 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1049 | #: sequencer.c:845 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1050 | #, c-format |
| 1051 | msgid "Could not create sequencer directory %s" |
| 1052 | msgstr "" |
| 1053 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1054 | #: sequencer.c:861 sequencer.c:946 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1055 | #, c-format |
| 1056 | msgid "Error wrapping up %s." |
| 1057 | msgstr "" |
| 1058 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1059 | #: sequencer.c:880 sequencer.c:1014 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1060 | msgid "no cherry-pick or revert in progress" |
| 1061 | msgstr "" |
| 1062 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1063 | #: sequencer.c:882 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1064 | msgid "cannot resolve HEAD" |
| 1065 | msgstr "" |
| 1066 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1067 | #: sequencer.c:884 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1068 | msgid "cannot abort from a branch yet to be born" |
| 1069 | msgstr "" |
| 1070 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1071 | #: sequencer.c:906 builtin/apply.c:4060 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1072 | #, c-format |
| 1073 | msgid "cannot open %s: %s" |
| 1074 | msgstr "" |
| 1075 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1076 | #: sequencer.c:909 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1077 | #, c-format |
| 1078 | msgid "cannot read %s: %s" |
| 1079 | msgstr "" |
| 1080 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1081 | #: sequencer.c:910 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1082 | msgid "unexpected end of file" |
| 1083 | msgstr "" |
| 1084 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1085 | #: sequencer.c:916 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1086 | #, c-format |
| 1087 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" |
| 1088 | msgstr "" |
| 1089 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1090 | #: sequencer.c:939 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1091 | #, c-format |
| 1092 | msgid "Could not format %s." |
| 1093 | msgstr "" |
| 1094 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1095 | #: sequencer.c:1083 |
| 1096 | #, c-format |
| 1097 | msgid "%s: can't cherry-pick a %s" |
| 1098 | msgstr "" |
| 1099 | |
| 1100 | #: sequencer.c:1085 |
| 1101 | #, c-format |
| 1102 | msgid "%s: bad revision" |
| 1103 | msgstr "" |
| 1104 | |
| 1105 | #: sequencer.c:1119 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1106 | msgid "Can't revert as initial commit" |
| 1107 | msgstr "" |
| 1108 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1109 | #: sequencer.c:1120 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1110 | msgid "Can't cherry-pick into empty head" |
| 1111 | msgstr "" |
| 1112 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1113 | #: sha1_name.c:1036 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 1114 | msgid "HEAD does not point to a branch" |
| 1115 | msgstr "" |
| 1116 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1117 | #: sha1_name.c:1039 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 1118 | #, c-format |
| 1119 | msgid "No such branch: '%s'" |
| 1120 | msgstr "" |
| 1121 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1122 | #: sha1_name.c:1041 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 1123 | #, c-format |
| 1124 | msgid "No upstream configured for branch '%s'" |
| 1125 | msgstr "" |
| 1126 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1127 | #: sha1_name.c:1044 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 1128 | #, c-format |
| 1129 | msgid "Upstream branch '%s' not stored as a remote-tracking branch" |
| 1130 | msgstr "" |
| 1131 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1132 | #: wrapper.c:408 |
| 1133 | #, c-format |
| 1134 | msgid "unable to access '%s': %s" |
| 1135 | msgstr "" |
| 1136 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 1137 | #: wrapper.c:423 |
| 1138 | #, c-format |
| 1139 | msgid "unable to access '%s'" |
| 1140 | msgstr "" |
| 1141 | |
| 1142 | #: wrapper.c:434 |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 1143 | #, c-format |
| 1144 | msgid "unable to look up current user in the passwd file: %s" |
| 1145 | msgstr "" |
| 1146 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 1147 | #: wrapper.c:435 |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 1148 | msgid "no such user" |
| 1149 | msgstr "" |
| 1150 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1151 | #: wt-status.c:140 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1152 | msgid "Unmerged paths:" |
| 1153 | msgstr "" |
| 1154 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1155 | #: wt-status.c:167 wt-status.c:194 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1156 | #, c-format |
| 1157 | msgid " (use \"git reset %s <file>...\" to unstage)" |
| 1158 | msgstr "" |
| 1159 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1160 | #: wt-status.c:169 wt-status.c:196 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1161 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
| 1162 | msgstr "" |
| 1163 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1164 | #: wt-status.c:173 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1165 | msgid " (use \"git add <file>...\" to mark resolution)" |
| 1166 | msgstr "" |
| 1167 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1168 | #: wt-status.c:175 wt-status.c:179 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1169 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
| 1170 | msgstr "" |
| 1171 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1172 | #: wt-status.c:177 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1173 | msgid " (use \"git rm <file>...\" to mark resolution)" |
| 1174 | msgstr "" |
| 1175 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1176 | #: wt-status.c:188 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1177 | msgid "Changes to be committed:" |
| 1178 | msgstr "" |
| 1179 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1180 | #: wt-status.c:206 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1181 | msgid "Changes not staged for commit:" |
| 1182 | msgstr "" |
| 1183 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1184 | #: wt-status.c:210 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1185 | msgid " (use \"git add <file>...\" to update what will be committed)" |
| 1186 | msgstr "" |
| 1187 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1188 | #: wt-status.c:212 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1189 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
| 1190 | msgstr "" |
| 1191 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1192 | #: wt-status.c:213 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1193 | msgid "" |
| 1194 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" |
| 1195 | msgstr "" |
| 1196 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1197 | #: wt-status.c:215 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1198 | msgid " (commit or discard the untracked or modified content in submodules)" |
| 1199 | msgstr "" |
| 1200 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1201 | #: wt-status.c:227 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1202 | #, c-format |
| 1203 | msgid " (use \"git %s <file>...\" to include in what will be committed)" |
| 1204 | msgstr "" |
| 1205 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1206 | #: wt-status.c:244 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1207 | msgid "bug" |
| 1208 | msgstr "" |
| 1209 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1210 | #: wt-status.c:249 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1211 | msgid "both deleted:" |
| 1212 | msgstr "" |
| 1213 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1214 | #: wt-status.c:250 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1215 | msgid "added by us:" |
| 1216 | msgstr "" |
| 1217 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1218 | #: wt-status.c:251 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1219 | msgid "deleted by them:" |
| 1220 | msgstr "" |
| 1221 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1222 | #: wt-status.c:252 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1223 | msgid "added by them:" |
| 1224 | msgstr "" |
| 1225 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1226 | #: wt-status.c:253 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1227 | msgid "deleted by us:" |
| 1228 | msgstr "" |
| 1229 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1230 | #: wt-status.c:254 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1231 | msgid "both added:" |
| 1232 | msgstr "" |
| 1233 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1234 | #: wt-status.c:255 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1235 | msgid "both modified:" |
| 1236 | msgstr "" |
| 1237 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1238 | #: wt-status.c:285 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1239 | msgid "new commits, " |
| 1240 | msgstr "" |
| 1241 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1242 | #: wt-status.c:287 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1243 | msgid "modified content, " |
| 1244 | msgstr "" |
| 1245 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1246 | #: wt-status.c:289 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1247 | msgid "untracked content, " |
| 1248 | msgstr "" |
| 1249 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1250 | #: wt-status.c:306 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1251 | #, c-format |
| 1252 | msgid "new file: %s" |
| 1253 | msgstr "" |
| 1254 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1255 | #: wt-status.c:309 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1256 | #, c-format |
| 1257 | msgid "copied: %s -> %s" |
| 1258 | msgstr "" |
| 1259 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1260 | #: wt-status.c:312 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1261 | #, c-format |
| 1262 | msgid "deleted: %s" |
| 1263 | msgstr "" |
| 1264 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1265 | #: wt-status.c:315 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1266 | #, c-format |
| 1267 | msgid "modified: %s" |
| 1268 | msgstr "" |
| 1269 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1270 | #: wt-status.c:318 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1271 | #, c-format |
| 1272 | msgid "renamed: %s -> %s" |
| 1273 | msgstr "" |
| 1274 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1275 | #: wt-status.c:321 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1276 | #, c-format |
| 1277 | msgid "typechange: %s" |
| 1278 | msgstr "" |
| 1279 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1280 | #: wt-status.c:324 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1281 | #, c-format |
| 1282 | msgid "unknown: %s" |
| 1283 | msgstr "" |
| 1284 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1285 | #: wt-status.c:327 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1286 | #, c-format |
| 1287 | msgid "unmerged: %s" |
| 1288 | msgstr "" |
| 1289 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1290 | #: wt-status.c:330 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1291 | #, c-format |
| 1292 | msgid "bug: unhandled diff status %c" |
| 1293 | msgstr "" |
| 1294 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1295 | #: wt-status.c:803 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1296 | msgid "You have unmerged paths." |
| 1297 | msgstr "" |
| 1298 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1299 | #: wt-status.c:806 wt-status.c:958 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1300 | msgid " (fix conflicts and run \"git commit\")" |
| 1301 | msgstr "" |
| 1302 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1303 | #: wt-status.c:809 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1304 | msgid "All conflicts fixed but you are still merging." |
| 1305 | msgstr "" |
| 1306 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1307 | #: wt-status.c:812 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1308 | msgid " (use \"git commit\" to conclude merge)" |
| 1309 | msgstr "" |
| 1310 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1311 | #: wt-status.c:822 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1312 | msgid "You are in the middle of an am session." |
| 1313 | msgstr "" |
| 1314 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1315 | #: wt-status.c:825 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1316 | msgid "The current patch is empty." |
| 1317 | msgstr "" |
| 1318 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1319 | #: wt-status.c:829 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1320 | msgid " (fix conflicts and then run \"git am --resolved\")" |
| 1321 | msgstr "" |
| 1322 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1323 | #: wt-status.c:831 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1324 | msgid " (use \"git am --skip\" to skip this patch)" |
| 1325 | msgstr "" |
| 1326 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1327 | #: wt-status.c:833 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1328 | msgid " (use \"git am --abort\" to restore the original branch)" |
| 1329 | msgstr "" |
| 1330 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1331 | #: wt-status.c:893 wt-status.c:910 |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1332 | #, c-format |
| 1333 | msgid "You are currently rebasing branch '%s' on '%s'." |
| 1334 | msgstr "" |
| 1335 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1336 | #: wt-status.c:898 wt-status.c:915 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1337 | msgid "You are currently rebasing." |
| 1338 | msgstr "" |
| 1339 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1340 | #: wt-status.c:901 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1341 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
| 1342 | msgstr "" |
| 1343 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1344 | #: wt-status.c:903 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1345 | msgid " (use \"git rebase --skip\" to skip this patch)" |
| 1346 | msgstr "" |
| 1347 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1348 | #: wt-status.c:905 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1349 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
| 1350 | msgstr "" |
| 1351 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1352 | #: wt-status.c:918 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1353 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
| 1354 | msgstr "" |
| 1355 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1356 | #: wt-status.c:922 |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1357 | #, c-format |
| 1358 | msgid "" |
| 1359 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
| 1360 | msgstr "" |
| 1361 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1362 | #: wt-status.c:927 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1363 | msgid "You are currently splitting a commit during a rebase." |
| 1364 | msgstr "" |
| 1365 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1366 | #: wt-status.c:930 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1367 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
| 1368 | msgstr "" |
| 1369 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1370 | #: wt-status.c:934 |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1371 | #, c-format |
| 1372 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." |
| 1373 | msgstr "" |
| 1374 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1375 | #: wt-status.c:939 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1376 | msgid "You are currently editing a commit during a rebase." |
| 1377 | msgstr "" |
| 1378 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1379 | #: wt-status.c:942 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1380 | msgid " (use \"git commit --amend\" to amend the current commit)" |
| 1381 | msgstr "" |
| 1382 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1383 | #: wt-status.c:944 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1384 | msgid "" |
| 1385 | " (use \"git rebase --continue\" once you are satisfied with your changes)" |
| 1386 | msgstr "" |
| 1387 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1388 | #: wt-status.c:954 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1389 | msgid "You are currently cherry-picking." |
| 1390 | msgstr "" |
| 1391 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1392 | #: wt-status.c:961 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1393 | msgid " (all conflicts fixed: run \"git commit\")" |
| 1394 | msgstr "" |
| 1395 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1396 | #: wt-status.c:970 |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1397 | #, c-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1398 | msgid "You are currently reverting commit %s." |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1399 | msgstr "" |
| 1400 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1401 | #: wt-status.c:975 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1402 | msgid " (fix conflicts and run \"git revert --continue\")" |
| 1403 | msgstr "" |
| 1404 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1405 | #: wt-status.c:978 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1406 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
| 1407 | msgstr "" |
| 1408 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1409 | #: wt-status.c:980 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1410 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
| 1411 | msgstr "" |
| 1412 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1413 | #: wt-status.c:991 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1414 | #, c-format |
| 1415 | msgid "You are currently bisecting, started from branch '%s'." |
| 1416 | msgstr "" |
| 1417 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1418 | #: wt-status.c:995 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1419 | msgid "You are currently bisecting." |
| 1420 | msgstr "" |
| 1421 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1422 | #: wt-status.c:998 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1423 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
| 1424 | msgstr "" |
| 1425 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1426 | #: wt-status.c:1173 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1427 | msgid "On branch " |
| 1428 | msgstr "" |
| 1429 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1430 | #: wt-status.c:1184 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1431 | msgid "HEAD detached at " |
| 1432 | msgstr "" |
| 1433 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1434 | #: wt-status.c:1186 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1435 | msgid "HEAD detached from " |
| 1436 | msgstr "" |
| 1437 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1438 | #: wt-status.c:1189 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1439 | msgid "Not currently on any branch." |
| 1440 | msgstr "" |
| 1441 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1442 | #: wt-status.c:1206 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1443 | msgid "Initial commit" |
| 1444 | msgstr "" |
| 1445 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1446 | #: wt-status.c:1220 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1447 | msgid "Untracked files" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1448 | msgstr "" |
| 1449 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1450 | #: wt-status.c:1222 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1451 | msgid "Ignored files" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1452 | msgstr "" |
| 1453 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1454 | #: wt-status.c:1226 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1455 | #, c-format |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1456 | msgid "" |
| 1457 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" |
| 1458 | "may speed it up, but you have to be careful not to forget to add\n" |
| 1459 | "new files yourself (see 'git help status')." |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1460 | msgstr "" |
| 1461 | |
| 1462 | #: wt-status.c:1232 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1463 | #, c-format |
| 1464 | msgid "Untracked files not listed%s" |
| 1465 | msgstr "" |
| 1466 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1467 | #: wt-status.c:1234 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1468 | msgid " (use -u option to show untracked files)" |
| 1469 | msgstr "" |
| 1470 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1471 | #: wt-status.c:1240 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1472 | msgid "No changes" |
| 1473 | msgstr "" |
| 1474 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1475 | #: wt-status.c:1245 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1476 | #, c-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1477 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1478 | msgstr "" |
| 1479 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1480 | #: wt-status.c:1248 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1481 | #, c-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1482 | msgid "no changes added to commit\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1483 | msgstr "" |
| 1484 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1485 | #: wt-status.c:1251 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1486 | #, c-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1487 | msgid "" |
| 1488 | "nothing added to commit but untracked files present (use \"git add\" to " |
| 1489 | "track)\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1490 | msgstr "" |
| 1491 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1492 | #: wt-status.c:1254 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1493 | #, c-format |
| 1494 | msgid "nothing added to commit but untracked files present\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1495 | msgstr "" |
| 1496 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1497 | #: wt-status.c:1257 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1498 | #, c-format |
| 1499 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1500 | msgstr "" |
| 1501 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1502 | #: wt-status.c:1260 wt-status.c:1265 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1503 | #, c-format |
| 1504 | msgid "nothing to commit\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1505 | msgstr "" |
| 1506 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1507 | #: wt-status.c:1263 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1508 | #, c-format |
| 1509 | msgid "nothing to commit (use -u to show untracked files)\n" |
| 1510 | msgstr "" |
| 1511 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1512 | #: wt-status.c:1267 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1513 | #, c-format |
| 1514 | msgid "nothing to commit, working directory clean\n" |
| 1515 | msgstr "" |
| 1516 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1517 | #: wt-status.c:1375 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1518 | msgid "HEAD (no branch)" |
| 1519 | msgstr "" |
| 1520 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1521 | #: wt-status.c:1381 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1522 | msgid "Initial commit on " |
| 1523 | msgstr "" |
| 1524 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1525 | #: wt-status.c:1396 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1526 | msgid "behind " |
| 1527 | msgstr "" |
| 1528 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1529 | #: wt-status.c:1399 wt-status.c:1402 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1530 | msgid "ahead " |
| 1531 | msgstr "" |
| 1532 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1533 | #: wt-status.c:1404 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1534 | msgid ", behind " |
| 1535 | msgstr "" |
| 1536 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1537 | #: compat/precompose_utf8.c:58 builtin/clone.c:352 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1538 | #, c-format |
| 1539 | msgid "failed to unlink '%s'" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1540 | msgstr "" |
| 1541 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1542 | #: builtin/add.c:20 |
| 1543 | msgid "git add [options] [--] <pathspec>..." |
| 1544 | msgstr "" |
| 1545 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1546 | #. |
| 1547 | #. * To be consistent with "git add -p" and most Git |
| 1548 | #. * commands, we should default to being tree-wide, but |
| 1549 | #. * this is not the original behavior and can't be |
| 1550 | #. * changed until users trained themselves not to type |
| 1551 | #. * "git add -u" or "git add -A". For now, we warn and |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1552 | #. * keep the old behavior. Later, the behavior can be changed |
| 1553 | #. * to tree-wide, keeping the warning for a while, and |
| 1554 | #. * eventually we can drop the warning. |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1555 | #. |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1556 | #: builtin/add.c:58 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1557 | #, c-format |
| 1558 | msgid "" |
| 1559 | "The behavior of 'git add %s (or %s)' with no path argument from a\n" |
| 1560 | "subdirectory of the tree will change in Git 2.0 and should not be used " |
| 1561 | "anymore.\n" |
| 1562 | "To add content for the whole tree, run:\n" |
| 1563 | "\n" |
| 1564 | " git add %s :/\n" |
| 1565 | " (or git add %s :/)\n" |
| 1566 | "\n" |
| 1567 | "To restrict the command to the current directory, run:\n" |
| 1568 | "\n" |
| 1569 | " git add %s .\n" |
| 1570 | " (or git add %s .)\n" |
| 1571 | "\n" |
| 1572 | "With the current Git version, the command is restricted to the current " |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1573 | "directory.\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1574 | msgstr "" |
| 1575 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1576 | #: builtin/add.c:100 |
| 1577 | #, c-format |
| 1578 | msgid "" |
| 1579 | "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" |
| 1580 | "whose behaviour will change in Git 2.0 with respect to paths you removed.\n" |
| 1581 | "Paths like '%s' that are\n" |
| 1582 | "removed from your working tree are ignored with this version of Git.\n" |
| 1583 | "\n" |
| 1584 | "* 'git add --ignore-removal <pathspec>', which is the current default,\n" |
| 1585 | " ignores paths you removed from your working tree.\n" |
| 1586 | "\n" |
| 1587 | "* 'git add --all <pathspec>' will let you also record the removals.\n" |
| 1588 | "\n" |
| 1589 | "Run 'git status' to check the paths you removed from your working tree.\n" |
| 1590 | msgstr "" |
| 1591 | |
| 1592 | #: builtin/add.c:144 |
| 1593 | #, c-format |
| 1594 | msgid "unexpected diff status %c" |
| 1595 | msgstr "" |
| 1596 | |
| 1597 | #: builtin/add.c:149 builtin/commit.c:233 |
| 1598 | msgid "updating files failed" |
| 1599 | msgstr "" |
| 1600 | |
| 1601 | #: builtin/add.c:163 |
| 1602 | #, c-format |
| 1603 | msgid "remove '%s'\n" |
| 1604 | msgstr "" |
| 1605 | |
| 1606 | #: builtin/add.c:253 |
| 1607 | msgid "Unstaged changes after refreshing the index:" |
| 1608 | msgstr "" |
| 1609 | |
| 1610 | #: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 |
| 1611 | #, c-format |
| 1612 | msgid "pathspec '%s' did not match any files" |
| 1613 | msgstr "" |
| 1614 | |
| 1615 | #: builtin/add.c:339 |
| 1616 | msgid "Could not read the index" |
| 1617 | msgstr "" |
| 1618 | |
| 1619 | #: builtin/add.c:349 |
| 1620 | #, c-format |
| 1621 | msgid "Could not open '%s' for writing." |
| 1622 | msgstr "" |
| 1623 | |
| 1624 | #: builtin/add.c:353 |
| 1625 | msgid "Could not write patch" |
| 1626 | msgstr "" |
| 1627 | |
| 1628 | #: builtin/add.c:358 |
| 1629 | #, c-format |
| 1630 | msgid "Could not stat '%s'" |
| 1631 | msgstr "" |
| 1632 | |
| 1633 | #: builtin/add.c:360 |
| 1634 | msgid "Empty patch. Aborted." |
| 1635 | msgstr "" |
| 1636 | |
| 1637 | #: builtin/add.c:366 |
| 1638 | #, c-format |
| 1639 | msgid "Could not apply '%s'" |
| 1640 | msgstr "" |
| 1641 | |
| 1642 | #: builtin/add.c:376 |
| 1643 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
| 1644 | msgstr "" |
| 1645 | |
| 1646 | #: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 |
| 1647 | #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 |
| 1648 | #: builtin/rm.c:206 |
| 1649 | msgid "dry run" |
| 1650 | msgstr "" |
| 1651 | |
| 1652 | #: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 |
| 1653 | #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 |
| 1654 | #: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 |
| 1655 | msgid "be verbose" |
| 1656 | msgstr "" |
| 1657 | |
| 1658 | #: builtin/add.c:396 |
| 1659 | msgid "interactive picking" |
| 1660 | msgstr "" |
| 1661 | |
| 1662 | #: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 |
| 1663 | msgid "select hunks interactively" |
| 1664 | msgstr "" |
| 1665 | |
| 1666 | #: builtin/add.c:398 |
| 1667 | msgid "edit current diff and apply" |
| 1668 | msgstr "" |
| 1669 | |
| 1670 | #: builtin/add.c:399 |
| 1671 | msgid "allow adding otherwise ignored files" |
| 1672 | msgstr "" |
| 1673 | |
| 1674 | #: builtin/add.c:400 |
| 1675 | msgid "update tracked files" |
| 1676 | msgstr "" |
| 1677 | |
| 1678 | #: builtin/add.c:401 |
| 1679 | msgid "record only the fact that the path will be added later" |
| 1680 | msgstr "" |
| 1681 | |
| 1682 | #: builtin/add.c:402 |
| 1683 | msgid "add changes from all tracked and untracked files" |
| 1684 | msgstr "" |
| 1685 | |
| 1686 | #. takes no arguments |
| 1687 | #: builtin/add.c:405 |
| 1688 | msgid "ignore paths removed in the working tree (same as --no-all)" |
| 1689 | msgstr "" |
| 1690 | |
| 1691 | #: builtin/add.c:407 |
| 1692 | msgid "don't add, only refresh the index" |
| 1693 | msgstr "" |
| 1694 | |
| 1695 | #: builtin/add.c:408 |
| 1696 | msgid "just skip files which cannot be added because of errors" |
| 1697 | msgstr "" |
| 1698 | |
| 1699 | #: builtin/add.c:409 |
| 1700 | msgid "check if - even missing - files are ignored in dry run" |
| 1701 | msgstr "" |
| 1702 | |
| 1703 | #: builtin/add.c:431 |
| 1704 | #, c-format |
| 1705 | msgid "Use -f if you really want to add them.\n" |
| 1706 | msgstr "" |
| 1707 | |
| 1708 | #: builtin/add.c:432 |
| 1709 | msgid "no files added" |
| 1710 | msgstr "" |
| 1711 | |
| 1712 | #: builtin/add.c:438 |
| 1713 | msgid "adding files failed" |
| 1714 | msgstr "" |
| 1715 | |
| 1716 | #: builtin/add.c:477 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1717 | msgid "-A and -u are mutually incompatible" |
| 1718 | msgstr "" |
| 1719 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1720 | #: builtin/add.c:495 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1721 | msgid "Option --ignore-missing can only be used together with --dry-run" |
| 1722 | msgstr "" |
| 1723 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1724 | #: builtin/add.c:525 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1725 | #, c-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1726 | msgid "Nothing specified, nothing added.\n" |
| 1727 | msgstr "" |
| 1728 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1729 | #: builtin/add.c:526 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1730 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1731 | msgid "Maybe you wanted to say 'git add .'?\n" |
| 1732 | msgstr "" |
| 1733 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1734 | #: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1735 | #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1736 | msgid "index file corrupt" |
| 1737 | msgstr "" |
| 1738 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1739 | #: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1740 | msgid "Unable to write new index file" |
| 1741 | msgstr "" |
| 1742 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1743 | #: builtin/apply.c:57 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 1744 | msgid "git apply [options] [<patch>...]" |
| 1745 | msgstr "" |
| 1746 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1747 | #: builtin/apply.c:110 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1748 | #, c-format |
| 1749 | msgid "unrecognized whitespace option '%s'" |
| 1750 | msgstr "" |
| 1751 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1752 | #: builtin/apply.c:125 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1753 | #, c-format |
| 1754 | msgid "unrecognized whitespace ignore option '%s'" |
| 1755 | msgstr "" |
| 1756 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1757 | #: builtin/apply.c:823 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1758 | #, c-format |
| 1759 | msgid "Cannot prepare timestamp regexp %s" |
| 1760 | msgstr "" |
| 1761 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1762 | #: builtin/apply.c:832 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1763 | #, c-format |
| 1764 | msgid "regexec returned %d for input: %s" |
| 1765 | msgstr "" |
| 1766 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1767 | #: builtin/apply.c:913 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1768 | #, c-format |
| 1769 | msgid "unable to find filename in patch at line %d" |
| 1770 | msgstr "" |
| 1771 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1772 | #: builtin/apply.c:945 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1773 | #, c-format |
| 1774 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" |
| 1775 | msgstr "" |
| 1776 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1777 | #: builtin/apply.c:949 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1778 | #, c-format |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 1779 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1780 | msgstr "" |
| 1781 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1782 | #: builtin/apply.c:950 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 1783 | #, c-format |
| 1784 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" |
| 1785 | msgstr "" |
| 1786 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1787 | #: builtin/apply.c:957 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1788 | #, c-format |
| 1789 | msgid "git apply: bad git-diff - expected /dev/null on line %d" |
| 1790 | msgstr "" |
| 1791 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1792 | #: builtin/apply.c:1422 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1793 | #, c-format |
| 1794 | msgid "recount: unexpected line: %.*s" |
| 1795 | msgstr "" |
| 1796 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1797 | #: builtin/apply.c:1479 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1798 | #, c-format |
| 1799 | msgid "patch fragment without header at line %d: %.*s" |
| 1800 | msgstr "" |
| 1801 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1802 | #: builtin/apply.c:1496 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1803 | #, c-format |
| 1804 | msgid "" |
| 1805 | "git diff header lacks filename information when removing %d leading pathname " |
| 1806 | "component (line %d)" |
| 1807 | msgid_plural "" |
| 1808 | "git diff header lacks filename information when removing %d leading pathname " |
| 1809 | "components (line %d)" |
| 1810 | msgstr[0] "" |
| 1811 | msgstr[1] "" |
| 1812 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1813 | #: builtin/apply.c:1656 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1814 | msgid "new file depends on old contents" |
| 1815 | msgstr "" |
| 1816 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1817 | #: builtin/apply.c:1658 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1818 | msgid "deleted file still has contents" |
| 1819 | msgstr "" |
| 1820 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1821 | #: builtin/apply.c:1684 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1822 | #, c-format |
| 1823 | msgid "corrupt patch at line %d" |
| 1824 | msgstr "" |
| 1825 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1826 | #: builtin/apply.c:1720 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1827 | #, c-format |
| 1828 | msgid "new file %s depends on old contents" |
| 1829 | msgstr "" |
| 1830 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1831 | #: builtin/apply.c:1722 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1832 | #, c-format |
| 1833 | msgid "deleted file %s still has contents" |
| 1834 | msgstr "" |
| 1835 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1836 | #: builtin/apply.c:1725 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1837 | #, c-format |
| 1838 | msgid "** warning: file %s becomes empty but is not deleted" |
| 1839 | msgstr "" |
| 1840 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1841 | #: builtin/apply.c:1871 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1842 | #, c-format |
| 1843 | msgid "corrupt binary patch at line %d: %.*s" |
| 1844 | msgstr "" |
| 1845 | |
| 1846 | #. there has to be one hunk (forward hunk) |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1847 | #: builtin/apply.c:1900 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1848 | #, c-format |
| 1849 | msgid "unrecognized binary patch at line %d" |
| 1850 | msgstr "" |
| 1851 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1852 | #: builtin/apply.c:1986 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1853 | #, c-format |
| 1854 | msgid "patch with only garbage at line %d" |
| 1855 | msgstr "" |
| 1856 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1857 | #: builtin/apply.c:2076 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1858 | #, c-format |
| 1859 | msgid "unable to read symlink %s" |
| 1860 | msgstr "" |
| 1861 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1862 | #: builtin/apply.c:2080 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1863 | #, c-format |
| 1864 | msgid "unable to open or read %s" |
| 1865 | msgstr "" |
| 1866 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1867 | #: builtin/apply.c:2688 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1868 | #, c-format |
| 1869 | msgid "invalid start of line: '%c'" |
| 1870 | msgstr "" |
| 1871 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1872 | #: builtin/apply.c:2806 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1873 | #, c-format |
| 1874 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
| 1875 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." |
| 1876 | msgstr[0] "" |
| 1877 | msgstr[1] "" |
| 1878 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1879 | #: builtin/apply.c:2818 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1880 | #, c-format |
| 1881 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
| 1882 | msgstr "" |
| 1883 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1884 | #: builtin/apply.c:2824 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1885 | #, c-format |
| 1886 | msgid "" |
| 1887 | "while searching for:\n" |
| 1888 | "%.*s" |
| 1889 | msgstr "" |
| 1890 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1891 | #: builtin/apply.c:2843 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1892 | #, c-format |
| 1893 | msgid "missing binary patch data for '%s'" |
| 1894 | msgstr "" |
| 1895 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1896 | #: builtin/apply.c:2946 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1897 | #, c-format |
| 1898 | msgid "binary patch does not apply to '%s'" |
| 1899 | msgstr "" |
| 1900 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1901 | #: builtin/apply.c:2952 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1902 | #, c-format |
| 1903 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
| 1904 | msgstr "" |
| 1905 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1906 | #: builtin/apply.c:2973 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1907 | #, c-format |
| 1908 | msgid "patch failed: %s:%ld" |
| 1909 | msgstr "" |
| 1910 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1911 | #: builtin/apply.c:3095 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1912 | #, c-format |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1913 | msgid "cannot checkout %s" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1914 | msgstr "" |
| 1915 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1916 | #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1917 | #, c-format |
| 1918 | msgid "read of %s failed" |
| 1919 | msgstr "" |
| 1920 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1921 | #: builtin/apply.c:3173 builtin/apply.c:3395 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1922 | #, c-format |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1923 | msgid "path %s has been renamed/deleted" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1924 | msgstr "" |
| 1925 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1926 | #: builtin/apply.c:3254 builtin/apply.c:3409 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1927 | #, c-format |
| 1928 | msgid "%s: does not exist in index" |
| 1929 | msgstr "" |
| 1930 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1931 | #: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1932 | #, c-format |
| 1933 | msgid "%s: %s" |
| 1934 | msgstr "" |
| 1935 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1936 | #: builtin/apply.c:3263 builtin/apply.c:3417 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1937 | #, c-format |
| 1938 | msgid "%s: does not match index" |
| 1939 | msgstr "" |
| 1940 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1941 | #: builtin/apply.c:3365 |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1942 | msgid "removal patch leaves file contents" |
| 1943 | msgstr "" |
| 1944 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1945 | #: builtin/apply.c:3434 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1946 | #, c-format |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1947 | msgid "%s: wrong type" |
| 1948 | msgstr "" |
| 1949 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1950 | #: builtin/apply.c:3436 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1951 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1952 | msgid "%s has type %o, expected %o" |
| 1953 | msgstr "" |
| 1954 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1955 | #: builtin/apply.c:3537 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1956 | #, c-format |
| 1957 | msgid "%s: already exists in index" |
| 1958 | msgstr "" |
| 1959 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1960 | #: builtin/apply.c:3540 |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1961 | #, c-format |
| 1962 | msgid "%s: already exists in working directory" |
| 1963 | msgstr "" |
| 1964 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1965 | #: builtin/apply.c:3560 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1966 | #, c-format |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 1967 | msgid "new mode (%o) of %s does not match old mode (%o)" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1968 | msgstr "" |
| 1969 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1970 | #: builtin/apply.c:3565 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1971 | #, c-format |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 1972 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
| 1973 | msgstr "" |
| 1974 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1975 | #: builtin/apply.c:3573 |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 1976 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1977 | msgid "%s: patch does not apply" |
| 1978 | msgstr "" |
| 1979 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1980 | #: builtin/apply.c:3586 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1981 | #, c-format |
| 1982 | msgid "Checking patch %s..." |
| 1983 | msgstr "" |
| 1984 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1985 | #: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1986 | #, c-format |
| 1987 | msgid "make_cache_entry failed for path '%s'" |
| 1988 | msgstr "" |
| 1989 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1990 | #: builtin/apply.c:3822 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1991 | #, c-format |
| 1992 | msgid "unable to remove %s from index" |
| 1993 | msgstr "" |
| 1994 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1995 | #: builtin/apply.c:3850 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1996 | #, c-format |
| 1997 | msgid "corrupt patch for subproject %s" |
| 1998 | msgstr "" |
| 1999 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2000 | #: builtin/apply.c:3854 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2001 | #, c-format |
| 2002 | msgid "unable to stat newly created file '%s'" |
| 2003 | msgstr "" |
| 2004 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2005 | #: builtin/apply.c:3859 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2006 | #, c-format |
| 2007 | msgid "unable to create backing store for newly created file %s" |
| 2008 | msgstr "" |
| 2009 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2010 | #: builtin/apply.c:3862 builtin/apply.c:3970 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2011 | #, c-format |
| 2012 | msgid "unable to add cache entry for %s" |
| 2013 | msgstr "" |
| 2014 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2015 | #: builtin/apply.c:3895 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2016 | #, c-format |
| 2017 | msgid "closing file '%s'" |
| 2018 | msgstr "" |
| 2019 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2020 | #: builtin/apply.c:3944 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2021 | #, c-format |
| 2022 | msgid "unable to write file '%s' mode %o" |
| 2023 | msgstr "" |
| 2024 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2025 | #: builtin/apply.c:4031 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2026 | #, c-format |
| 2027 | msgid "Applied patch %s cleanly." |
| 2028 | msgstr "" |
| 2029 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2030 | #: builtin/apply.c:4039 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2031 | msgid "internal error" |
| 2032 | msgstr "" |
| 2033 | |
| 2034 | #. Say this even without --verbose |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2035 | #: builtin/apply.c:4042 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2036 | #, c-format |
| 2037 | msgid "Applying patch %%s with %d reject..." |
| 2038 | msgid_plural "Applying patch %%s with %d rejects..." |
| 2039 | msgstr[0] "" |
| 2040 | msgstr[1] "" |
| 2041 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2042 | #: builtin/apply.c:4052 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2043 | #, c-format |
| 2044 | msgid "truncating .rej filename to %.*s.rej" |
| 2045 | msgstr "" |
| 2046 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2047 | #: builtin/apply.c:4073 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2048 | #, c-format |
| 2049 | msgid "Hunk #%d applied cleanly." |
| 2050 | msgstr "" |
| 2051 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2052 | #: builtin/apply.c:4076 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2053 | #, c-format |
| 2054 | msgid "Rejected hunk #%d." |
| 2055 | msgstr "" |
| 2056 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2057 | #: builtin/apply.c:4226 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2058 | msgid "unrecognized input" |
| 2059 | msgstr "" |
| 2060 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2061 | #: builtin/apply.c:4237 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2062 | msgid "unable to read index file" |
| 2063 | msgstr "" |
| 2064 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2065 | #: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2066 | #: builtin/fetch.c:63 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2067 | msgid "path" |
| 2068 | msgstr "" |
| 2069 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2070 | #: builtin/apply.c:4357 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2071 | msgid "don't apply changes matching the given path" |
| 2072 | msgstr "" |
| 2073 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2074 | #: builtin/apply.c:4360 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2075 | msgid "apply changes matching the given path" |
| 2076 | msgstr "" |
| 2077 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2078 | #: builtin/apply.c:4362 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2079 | msgid "num" |
| 2080 | msgstr "" |
| 2081 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2082 | #: builtin/apply.c:4363 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2083 | msgid "remove <num> leading slashes from traditional diff paths" |
| 2084 | msgstr "" |
| 2085 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2086 | #: builtin/apply.c:4366 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2087 | msgid "ignore additions made by the patch" |
| 2088 | msgstr "" |
| 2089 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2090 | #: builtin/apply.c:4368 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2091 | msgid "instead of applying the patch, output diffstat for the input" |
| 2092 | msgstr "" |
| 2093 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2094 | #: builtin/apply.c:4372 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2095 | msgid "show number of added and deleted lines in decimal notation" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2096 | msgstr "" |
| 2097 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2098 | #: builtin/apply.c:4374 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2099 | msgid "instead of applying the patch, output a summary for the input" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2100 | msgstr "" |
| 2101 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2102 | #: builtin/apply.c:4376 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2103 | msgid "instead of applying the patch, see if the patch is applicable" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2104 | msgstr "" |
| 2105 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2106 | #: builtin/apply.c:4378 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2107 | msgid "make sure the patch is applicable to the current index" |
| 2108 | msgstr "" |
| 2109 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2110 | #: builtin/apply.c:4380 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2111 | msgid "apply a patch without touching the working tree" |
| 2112 | msgstr "" |
| 2113 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2114 | #: builtin/apply.c:4382 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2115 | msgid "also apply the patch (use with --stat/--summary/--check)" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2116 | msgstr "" |
| 2117 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2118 | #: builtin/apply.c:4384 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2119 | msgid "attempt three-way merge if a patch does not apply" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2120 | msgstr "" |
| 2121 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2122 | #: builtin/apply.c:4386 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2123 | msgid "build a temporary index based on embedded index information" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2124 | msgstr "" |
| 2125 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2126 | #: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2127 | msgid "paths are separated with NUL character" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2128 | msgstr "" |
| 2129 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2130 | #: builtin/apply.c:4391 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2131 | msgid "ensure at least <n> lines of context match" |
| 2132 | msgstr "" |
| 2133 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2134 | #: builtin/apply.c:4392 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2135 | msgid "action" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2136 | msgstr "" |
| 2137 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2138 | #: builtin/apply.c:4393 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2139 | msgid "detect new or modified lines that have whitespace errors" |
| 2140 | msgstr "" |
| 2141 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2142 | #: builtin/apply.c:4396 builtin/apply.c:4399 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2143 | msgid "ignore changes in whitespace when finding context" |
| 2144 | msgstr "" |
| 2145 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2146 | #: builtin/apply.c:4402 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2147 | msgid "apply the patch in reverse" |
| 2148 | msgstr "" |
| 2149 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2150 | #: builtin/apply.c:4404 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2151 | msgid "don't expect at least one line of context" |
| 2152 | msgstr "" |
| 2153 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2154 | #: builtin/apply.c:4406 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2155 | msgid "leave the rejected hunks in corresponding *.rej files" |
| 2156 | msgstr "" |
| 2157 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2158 | #: builtin/apply.c:4408 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2159 | msgid "allow overlapping hunks" |
| 2160 | msgstr "" |
| 2161 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2162 | #: builtin/apply.c:4411 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2163 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
| 2164 | msgstr "" |
| 2165 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2166 | #: builtin/apply.c:4414 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2167 | msgid "do not trust the line counts in the hunk headers" |
| 2168 | msgstr "" |
| 2169 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2170 | #: builtin/apply.c:4416 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2171 | msgid "root" |
| 2172 | msgstr "" |
| 2173 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2174 | #: builtin/apply.c:4417 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2175 | msgid "prepend <root> to all filenames" |
| 2176 | msgstr "" |
| 2177 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2178 | #: builtin/apply.c:4439 |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 2179 | msgid "--3way outside a repository" |
| 2180 | msgstr "" |
| 2181 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2182 | #: builtin/apply.c:4447 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2183 | msgid "--index outside a repository" |
| 2184 | msgstr "" |
| 2185 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2186 | #: builtin/apply.c:4450 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2187 | msgid "--cached outside a repository" |
| 2188 | msgstr "" |
| 2189 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2190 | #: builtin/apply.c:4466 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2191 | #, c-format |
| 2192 | msgid "can't open patch '%s'" |
| 2193 | msgstr "" |
| 2194 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2195 | #: builtin/apply.c:4480 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2196 | #, c-format |
| 2197 | msgid "squelched %d whitespace error" |
| 2198 | msgid_plural "squelched %d whitespace errors" |
| 2199 | msgstr[0] "" |
| 2200 | msgstr[1] "" |
| 2201 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2202 | #: builtin/apply.c:4486 builtin/apply.c:4496 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2203 | #, c-format |
| 2204 | msgid "%d line adds whitespace errors." |
| 2205 | msgid_plural "%d lines add whitespace errors." |
| 2206 | msgstr[0] "" |
| 2207 | msgstr[1] "" |
| 2208 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2209 | #: builtin/archive.c:17 |
| 2210 | #, c-format |
| 2211 | msgid "could not create archive file '%s'" |
| 2212 | msgstr "" |
| 2213 | |
| 2214 | #: builtin/archive.c:20 |
| 2215 | msgid "could not redirect output" |
| 2216 | msgstr "" |
| 2217 | |
| 2218 | #: builtin/archive.c:37 |
| 2219 | msgid "git archive: Remote with no URL" |
| 2220 | msgstr "" |
| 2221 | |
| 2222 | #: builtin/archive.c:58 |
| 2223 | msgid "git archive: expected ACK/NAK, got EOF" |
| 2224 | msgstr "" |
| 2225 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2226 | #: builtin/archive.c:61 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2227 | #, c-format |
| 2228 | msgid "git archive: NACK %s" |
| 2229 | msgstr "" |
| 2230 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2231 | #: builtin/archive.c:63 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2232 | #, c-format |
| 2233 | msgid "remote error: %s" |
| 2234 | msgstr "" |
| 2235 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2236 | #: builtin/archive.c:64 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2237 | msgid "git archive: protocol error" |
| 2238 | msgstr "" |
| 2239 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2240 | #: builtin/archive.c:68 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2241 | msgid "git archive: expected a flush" |
| 2242 | msgstr "" |
| 2243 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2244 | #: builtin/bisect--helper.c:7 |
| 2245 | msgid "git bisect--helper --next-all [--no-checkout]" |
| 2246 | msgstr "" |
| 2247 | |
| 2248 | #: builtin/bisect--helper.c:17 |
| 2249 | msgid "perform 'git bisect next'" |
| 2250 | msgstr "" |
| 2251 | |
| 2252 | #: builtin/bisect--helper.c:19 |
| 2253 | msgid "update BISECT_HEAD instead of checking out the current commit" |
| 2254 | msgstr "" |
| 2255 | |
| 2256 | #: builtin/blame.c:25 |
| 2257 | msgid "git blame [options] [rev-opts] [rev] [--] file" |
| 2258 | msgstr "" |
| 2259 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2260 | #: builtin/blame.c:30 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2261 | msgid "[rev-opts] are documented in git-rev-list(1)" |
| 2262 | msgstr "" |
| 2263 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2264 | #: builtin/blame.c:2355 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2265 | msgid "Show blame entries as we find them, incrementally" |
| 2266 | msgstr "" |
| 2267 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2268 | #: builtin/blame.c:2356 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2269 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
| 2270 | msgstr "" |
| 2271 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2272 | #: builtin/blame.c:2357 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2273 | msgid "Do not treat root commits as boundaries (Default: off)" |
| 2274 | msgstr "" |
| 2275 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2276 | #: builtin/blame.c:2358 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2277 | msgid "Show work cost statistics" |
| 2278 | msgstr "" |
| 2279 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2280 | #: builtin/blame.c:2359 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2281 | msgid "Show output score for blame entries" |
| 2282 | msgstr "" |
| 2283 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2284 | #: builtin/blame.c:2360 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2285 | msgid "Show original filename (Default: auto)" |
| 2286 | msgstr "" |
| 2287 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2288 | #: builtin/blame.c:2361 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2289 | msgid "Show original linenumber (Default: off)" |
| 2290 | msgstr "" |
| 2291 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2292 | #: builtin/blame.c:2362 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2293 | msgid "Show in a format designed for machine consumption" |
| 2294 | msgstr "" |
| 2295 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2296 | #: builtin/blame.c:2363 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2297 | msgid "Show porcelain format with per-line commit information" |
| 2298 | msgstr "" |
| 2299 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2300 | #: builtin/blame.c:2364 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2301 | msgid "Use the same output mode as git-annotate (Default: off)" |
| 2302 | msgstr "" |
| 2303 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2304 | #: builtin/blame.c:2365 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2305 | msgid "Show raw timestamp (Default: off)" |
| 2306 | msgstr "" |
| 2307 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2308 | #: builtin/blame.c:2366 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2309 | msgid "Show long commit SHA1 (Default: off)" |
| 2310 | msgstr "" |
| 2311 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2312 | #: builtin/blame.c:2367 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2313 | msgid "Suppress author name and timestamp (Default: off)" |
| 2314 | msgstr "" |
| 2315 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2316 | #: builtin/blame.c:2368 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2317 | msgid "Show author email instead of name (Default: off)" |
| 2318 | msgstr "" |
| 2319 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2320 | #: builtin/blame.c:2369 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2321 | msgid "Ignore whitespace differences" |
| 2322 | msgstr "" |
| 2323 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2324 | #: builtin/blame.c:2370 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2325 | msgid "Spend extra cycles to find better match" |
| 2326 | msgstr "" |
| 2327 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2328 | #: builtin/blame.c:2371 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2329 | msgid "Use revisions from <file> instead of calling git-rev-list" |
| 2330 | msgstr "" |
| 2331 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2332 | #: builtin/blame.c:2372 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2333 | msgid "Use <file>'s contents as the final image" |
| 2334 | msgstr "" |
| 2335 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2336 | #: builtin/blame.c:2373 builtin/blame.c:2374 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2337 | msgid "score" |
| 2338 | msgstr "" |
| 2339 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2340 | #: builtin/blame.c:2373 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2341 | msgid "Find line copies within and across files" |
| 2342 | msgstr "" |
| 2343 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2344 | #: builtin/blame.c:2374 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2345 | msgid "Find line movements within and across files" |
| 2346 | msgstr "" |
| 2347 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2348 | #: builtin/blame.c:2375 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2349 | msgid "n,m" |
| 2350 | msgstr "" |
| 2351 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2352 | #: builtin/blame.c:2375 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2353 | msgid "Process only line range n,m, counting from 1" |
| 2354 | msgstr "" |
| 2355 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2356 | #: builtin/branch.c:24 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2357 | msgid "git branch [options] [-r | -a] [--merged | --no-merged]" |
| 2358 | msgstr "" |
| 2359 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2360 | #: builtin/branch.c:25 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2361 | msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" |
| 2362 | msgstr "" |
| 2363 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2364 | #: builtin/branch.c:26 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2365 | msgid "git branch [options] [-r] (-d | -D) <branchname>..." |
| 2366 | msgstr "" |
| 2367 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2368 | #: builtin/branch.c:27 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2369 | msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" |
| 2370 | msgstr "" |
| 2371 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2372 | #: builtin/branch.c:150 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2373 | #, c-format |
| 2374 | msgid "" |
| 2375 | "deleting branch '%s' that has been merged to\n" |
| 2376 | " '%s', but not yet merged to HEAD." |
| 2377 | msgstr "" |
| 2378 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2379 | #: builtin/branch.c:154 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2380 | #, c-format |
| 2381 | msgid "" |
| 2382 | "not deleting branch '%s' that is not yet merged to\n" |
| 2383 | " '%s', even though it is merged to HEAD." |
| 2384 | msgstr "" |
| 2385 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2386 | #: builtin/branch.c:168 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2387 | #, c-format |
| 2388 | msgid "Couldn't look up commit object for '%s'" |
| 2389 | msgstr "" |
| 2390 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2391 | #: builtin/branch.c:172 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2392 | #, c-format |
| 2393 | msgid "" |
| 2394 | "The branch '%s' is not fully merged.\n" |
| 2395 | "If you are sure you want to delete it, run 'git branch -D %s'." |
| 2396 | msgstr "" |
| 2397 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2398 | #: builtin/branch.c:185 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2399 | msgid "Update of config-file failed" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2400 | msgstr "" |
| 2401 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2402 | #: builtin/branch.c:213 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2403 | msgid "cannot use -a with -d" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2404 | msgstr "" |
| 2405 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2406 | #: builtin/branch.c:219 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2407 | msgid "Couldn't look up commit object for HEAD" |
| 2408 | msgstr "" |
| 2409 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2410 | #: builtin/branch.c:227 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2411 | #, c-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2412 | msgid "Cannot delete the branch '%s' which you are currently on." |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2413 | msgstr "" |
| 2414 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2415 | #: builtin/branch.c:240 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2416 | #, c-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2417 | msgid "remote branch '%s' not found." |
| 2418 | msgstr "" |
| 2419 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2420 | #: builtin/branch.c:241 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2421 | #, c-format |
| 2422 | msgid "branch '%s' not found." |
| 2423 | msgstr "" |
| 2424 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2425 | #: builtin/branch.c:255 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2426 | #, c-format |
| 2427 | msgid "Error deleting remote branch '%s'" |
| 2428 | msgstr "" |
| 2429 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2430 | #: builtin/branch.c:256 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2431 | #, c-format |
| 2432 | msgid "Error deleting branch '%s'" |
| 2433 | msgstr "" |
| 2434 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2435 | #: builtin/branch.c:263 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2436 | #, c-format |
| 2437 | msgid "Deleted remote branch %s (was %s).\n" |
| 2438 | msgstr "" |
| 2439 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2440 | #: builtin/branch.c:264 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2441 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2442 | msgid "Deleted branch %s (was %s).\n" |
| 2443 | msgstr "" |
| 2444 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2445 | #: builtin/branch.c:366 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2446 | #, c-format |
| 2447 | msgid "branch '%s' does not point at a commit" |
| 2448 | msgstr "" |
| 2449 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2450 | #: builtin/branch.c:453 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2451 | #, c-format |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2452 | msgid "[%s: behind %d]" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2453 | msgstr "" |
| 2454 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2455 | #: builtin/branch.c:455 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2456 | #, c-format |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2457 | msgid "[behind %d]" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2458 | msgstr "" |
| 2459 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2460 | #: builtin/branch.c:459 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2461 | #, c-format |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2462 | msgid "[%s: ahead %d]" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2463 | msgstr "" |
| 2464 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2465 | #: builtin/branch.c:461 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2466 | #, c-format |
| 2467 | msgid "[ahead %d]" |
| 2468 | msgstr "" |
| 2469 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2470 | #: builtin/branch.c:464 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2471 | #, c-format |
| 2472 | msgid "[%s: ahead %d, behind %d]" |
| 2473 | msgstr "" |
| 2474 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2475 | #: builtin/branch.c:467 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2476 | #, c-format |
| 2477 | msgid "[ahead %d, behind %d]" |
| 2478 | msgstr "" |
| 2479 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2480 | #: builtin/branch.c:490 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2481 | msgid " **** invalid ref ****" |
| 2482 | msgstr "" |
| 2483 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2484 | #: builtin/branch.c:582 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2485 | #, c-format |
| 2486 | msgid "(no branch, rebasing %s)" |
| 2487 | msgstr "" |
| 2488 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2489 | #: builtin/branch.c:585 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2490 | #, c-format |
| 2491 | msgid "(no branch, bisect started on %s)" |
| 2492 | msgstr "" |
| 2493 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2494 | #: builtin/branch.c:588 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2495 | #, c-format |
| 2496 | msgid "(detached from %s)" |
| 2497 | msgstr "" |
| 2498 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2499 | #: builtin/branch.c:591 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2500 | msgid "(no branch)" |
| 2501 | msgstr "" |
| 2502 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2503 | #: builtin/branch.c:637 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2504 | #, c-format |
| 2505 | msgid "object '%s' does not point to a commit" |
| 2506 | msgstr "" |
| 2507 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2508 | #: builtin/branch.c:669 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2509 | msgid "some refs could not be read" |
| 2510 | msgstr "" |
| 2511 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2512 | #: builtin/branch.c:682 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2513 | msgid "cannot rename the current branch while not on any." |
| 2514 | msgstr "" |
| 2515 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2516 | #: builtin/branch.c:692 |
Jiang Xin | 2b911f8 | 2012-03-08 10:20:20 +0800 | [diff] [blame] | 2517 | #, c-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2518 | msgid "Invalid branch name: '%s'" |
| 2519 | msgstr "" |
| 2520 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2521 | #: builtin/branch.c:707 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2522 | msgid "Branch rename failed" |
| 2523 | msgstr "" |
| 2524 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2525 | #: builtin/branch.c:711 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2526 | #, c-format |
| 2527 | msgid "Renamed a misnamed branch '%s' away" |
| 2528 | msgstr "" |
| 2529 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2530 | #: builtin/branch.c:715 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2531 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2532 | msgid "Branch renamed to %s, but HEAD is not updated!" |
| 2533 | msgstr "" |
| 2534 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2535 | #: builtin/branch.c:722 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2536 | msgid "Branch is renamed, but update of config-file failed" |
| 2537 | msgstr "" |
| 2538 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2539 | #: builtin/branch.c:737 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2540 | #, c-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2541 | msgid "malformed object name %s" |
| 2542 | msgstr "" |
| 2543 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2544 | #: builtin/branch.c:761 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2545 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2546 | msgid "could not write branch description template: %s" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2547 | msgstr "" |
| 2548 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2549 | #: builtin/branch.c:791 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2550 | msgid "Generic options" |
| 2551 | msgstr "" |
| 2552 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2553 | #: builtin/branch.c:793 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2554 | msgid "show hash and subject, give twice for upstream branch" |
| 2555 | msgstr "" |
| 2556 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2557 | #: builtin/branch.c:794 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2558 | msgid "suppress informational messages" |
| 2559 | msgstr "" |
| 2560 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2561 | #: builtin/branch.c:795 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2562 | msgid "set up tracking mode (see git-pull(1))" |
| 2563 | msgstr "" |
| 2564 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2565 | #: builtin/branch.c:797 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2566 | msgid "change upstream info" |
| 2567 | msgstr "" |
| 2568 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2569 | #: builtin/branch.c:801 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2570 | msgid "use colored output" |
| 2571 | msgstr "" |
| 2572 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2573 | #: builtin/branch.c:802 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2574 | msgid "act on remote-tracking branches" |
| 2575 | msgstr "" |
| 2576 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2577 | #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 |
| 2578 | #: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2579 | #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2580 | msgid "commit" |
| 2581 | msgstr "" |
| 2582 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2583 | #: builtin/branch.c:806 builtin/branch.c:812 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2584 | msgid "print only branches that contain the commit" |
| 2585 | msgstr "" |
| 2586 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2587 | #: builtin/branch.c:818 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2588 | msgid "Specific git-branch actions:" |
| 2589 | msgstr "" |
| 2590 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2591 | #: builtin/branch.c:819 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2592 | msgid "list both remote-tracking and local branches" |
| 2593 | msgstr "" |
| 2594 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2595 | #: builtin/branch.c:821 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2596 | msgid "delete fully merged branch" |
| 2597 | msgstr "" |
| 2598 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2599 | #: builtin/branch.c:822 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2600 | msgid "delete branch (even if not merged)" |
| 2601 | msgstr "" |
| 2602 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2603 | #: builtin/branch.c:823 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2604 | msgid "move/rename a branch and its reflog" |
| 2605 | msgstr "" |
| 2606 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2607 | #: builtin/branch.c:824 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2608 | msgid "move/rename a branch, even if target exists" |
| 2609 | msgstr "" |
| 2610 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2611 | #: builtin/branch.c:825 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2612 | msgid "list branch names" |
| 2613 | msgstr "" |
| 2614 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2615 | #: builtin/branch.c:826 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2616 | msgid "create the branch's reflog" |
| 2617 | msgstr "" |
| 2618 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2619 | #: builtin/branch.c:828 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2620 | msgid "edit the description for the branch" |
| 2621 | msgstr "" |
| 2622 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2623 | #: builtin/branch.c:829 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2624 | msgid "force creation (when already exists)" |
| 2625 | msgstr "" |
| 2626 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2627 | #: builtin/branch.c:832 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2628 | msgid "print only not merged branches" |
| 2629 | msgstr "" |
| 2630 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2631 | #: builtin/branch.c:838 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2632 | msgid "print only merged branches" |
| 2633 | msgstr "" |
| 2634 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2635 | #: builtin/branch.c:842 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2636 | msgid "list branches in columns" |
| 2637 | msgstr "" |
| 2638 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2639 | #: builtin/branch.c:855 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2640 | msgid "Failed to resolve HEAD as a valid ref." |
| 2641 | msgstr "" |
| 2642 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2643 | #: builtin/branch.c:860 builtin/clone.c:619 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2644 | msgid "HEAD not found below refs/heads!" |
| 2645 | msgstr "" |
| 2646 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2647 | #: builtin/branch.c:883 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2648 | msgid "--column and --verbose are incompatible" |
| 2649 | msgstr "" |
| 2650 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2651 | #: builtin/branch.c:889 builtin/branch.c:928 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2652 | msgid "branch name required" |
| 2653 | msgstr "" |
| 2654 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2655 | #: builtin/branch.c:904 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2656 | msgid "Cannot give description to detached HEAD" |
| 2657 | msgstr "" |
| 2658 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2659 | #: builtin/branch.c:909 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2660 | msgid "cannot edit description of more than one branch" |
| 2661 | msgstr "" |
| 2662 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2663 | #: builtin/branch.c:916 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2664 | #, c-format |
| 2665 | msgid "No commit on branch '%s' yet." |
| 2666 | msgstr "" |
| 2667 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2668 | #: builtin/branch.c:919 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2669 | #, c-format |
| 2670 | msgid "No branch named '%s'." |
| 2671 | msgstr "" |
| 2672 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2673 | #: builtin/branch.c:934 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2674 | msgid "too many branches for a rename operation" |
| 2675 | msgstr "" |
| 2676 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2677 | #: builtin/branch.c:939 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2678 | msgid "too many branches to set new upstream" |
| 2679 | msgstr "" |
| 2680 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2681 | #: builtin/branch.c:943 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2682 | #, c-format |
| 2683 | msgid "" |
| 2684 | "could not set upstream of HEAD to %s when it does not point to any branch." |
| 2685 | msgstr "" |
| 2686 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2687 | #: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2688 | #, c-format |
| 2689 | msgid "no such branch '%s'" |
| 2690 | msgstr "" |
| 2691 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2692 | #: builtin/branch.c:950 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2693 | #, c-format |
| 2694 | msgid "branch '%s' does not exist" |
| 2695 | msgstr "" |
| 2696 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2697 | #: builtin/branch.c:962 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2698 | msgid "too many branches to unset upstream" |
| 2699 | msgstr "" |
| 2700 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2701 | #: builtin/branch.c:966 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2702 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
| 2703 | msgstr "" |
| 2704 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2705 | #: builtin/branch.c:972 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2706 | #, c-format |
| 2707 | msgid "Branch '%s' has no upstream information" |
| 2708 | msgstr "" |
| 2709 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2710 | #: builtin/branch.c:987 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2711 | msgid "it does not make sense to create 'HEAD' manually" |
| 2712 | msgstr "" |
| 2713 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2714 | #: builtin/branch.c:993 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2715 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
| 2716 | msgstr "" |
| 2717 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2718 | #: builtin/branch.c:996 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2719 | #, c-format |
| 2720 | msgid "" |
| 2721 | "The --set-upstream flag is deprecated and will be removed. Consider using --" |
| 2722 | "track or --set-upstream-to\n" |
| 2723 | msgstr "" |
| 2724 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2725 | #: builtin/branch.c:1013 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2726 | #, c-format |
| 2727 | msgid "" |
| 2728 | "\n" |
| 2729 | "If you wanted to make '%s' track '%s', do this:\n" |
| 2730 | "\n" |
| 2731 | msgstr "" |
| 2732 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2733 | #: builtin/branch.c:1014 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2734 | #, c-format |
| 2735 | msgid " git branch -d %s\n" |
| 2736 | msgstr "" |
| 2737 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2738 | #: builtin/branch.c:1015 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2739 | #, c-format |
| 2740 | msgid " git branch --set-upstream-to %s\n" |
| 2741 | msgstr "" |
| 2742 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2743 | #: builtin/bundle.c:47 |
| 2744 | #, c-format |
| 2745 | msgid "%s is okay\n" |
| 2746 | msgstr "" |
| 2747 | |
| 2748 | #: builtin/bundle.c:56 |
| 2749 | msgid "Need a repository to create a bundle." |
| 2750 | msgstr "" |
| 2751 | |
| 2752 | #: builtin/bundle.c:60 |
| 2753 | msgid "Need a repository to unbundle." |
| 2754 | msgstr "" |
| 2755 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2756 | #: builtin/cat-file.c:176 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2757 | msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" |
| 2758 | msgstr "" |
| 2759 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2760 | #: builtin/cat-file.c:177 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2761 | msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" |
| 2762 | msgstr "" |
| 2763 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2764 | #: builtin/cat-file.c:195 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2765 | msgid "<type> can be one of: blob, tree, commit, tag" |
| 2766 | msgstr "" |
| 2767 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2768 | #: builtin/cat-file.c:196 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2769 | msgid "show object type" |
| 2770 | msgstr "" |
| 2771 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2772 | #: builtin/cat-file.c:197 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2773 | msgid "show object size" |
| 2774 | msgstr "" |
| 2775 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2776 | #: builtin/cat-file.c:199 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2777 | msgid "exit with zero when there's no error" |
| 2778 | msgstr "" |
| 2779 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2780 | #: builtin/cat-file.c:200 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2781 | msgid "pretty-print object's content" |
| 2782 | msgstr "" |
| 2783 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2784 | #: builtin/cat-file.c:202 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2785 | msgid "for blob objects, run textconv on object's content" |
| 2786 | msgstr "" |
| 2787 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2788 | #: builtin/cat-file.c:204 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2789 | msgid "show info and content of objects fed from the standard input" |
| 2790 | msgstr "" |
| 2791 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2792 | #: builtin/cat-file.c:207 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2793 | msgid "show info about objects fed from the standard input" |
| 2794 | msgstr "" |
| 2795 | |
| 2796 | #: builtin/check-attr.c:11 |
| 2797 | msgid "git check-attr [-a | --all | attr...] [--] pathname..." |
| 2798 | msgstr "" |
| 2799 | |
| 2800 | #: builtin/check-attr.c:12 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 2801 | msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2802 | msgstr "" |
| 2803 | |
| 2804 | #: builtin/check-attr.c:19 |
| 2805 | msgid "report all attributes set on file" |
| 2806 | msgstr "" |
| 2807 | |
| 2808 | #: builtin/check-attr.c:20 |
| 2809 | msgid "use .gitattributes only from the index" |
| 2810 | msgstr "" |
| 2811 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2812 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2813 | msgid "read file names from stdin" |
| 2814 | msgstr "" |
| 2815 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2816 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2817 | msgid "input paths are terminated by a null character" |
| 2818 | msgstr "" |
| 2819 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2820 | #: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2821 | msgid "suppress progress reporting" |
| 2822 | msgstr "" |
| 2823 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2824 | #: builtin/check-ignore.c:146 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2825 | msgid "cannot specify pathnames with --stdin" |
| 2826 | msgstr "" |
| 2827 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2828 | #: builtin/check-ignore.c:149 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2829 | msgid "-z only makes sense with --stdin" |
| 2830 | msgstr "" |
| 2831 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2832 | #: builtin/check-ignore.c:151 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2833 | msgid "no path specified" |
| 2834 | msgstr "" |
| 2835 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2836 | #: builtin/check-ignore.c:155 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2837 | msgid "--quiet is only valid with a single pathname" |
| 2838 | msgstr "" |
| 2839 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2840 | #: builtin/check-ignore.c:157 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2841 | msgid "cannot have both --quiet and --verbose" |
| 2842 | msgstr "" |
| 2843 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2844 | #: builtin/checkout-index.c:126 |
| 2845 | msgid "git checkout-index [options] [--] [<file>...]" |
| 2846 | msgstr "" |
| 2847 | |
| 2848 | #: builtin/checkout-index.c:187 |
| 2849 | msgid "check out all files in the index" |
| 2850 | msgstr "" |
| 2851 | |
| 2852 | #: builtin/checkout-index.c:188 |
| 2853 | msgid "force overwrite of existing files" |
| 2854 | msgstr "" |
| 2855 | |
| 2856 | #: builtin/checkout-index.c:190 |
| 2857 | msgid "no warning for existing files and files not in index" |
| 2858 | msgstr "" |
| 2859 | |
| 2860 | #: builtin/checkout-index.c:192 |
| 2861 | msgid "don't checkout new files" |
| 2862 | msgstr "" |
| 2863 | |
| 2864 | #: builtin/checkout-index.c:194 |
| 2865 | msgid "update stat information in the index file" |
| 2866 | msgstr "" |
| 2867 | |
| 2868 | #: builtin/checkout-index.c:200 |
| 2869 | msgid "read list of paths from the standard input" |
| 2870 | msgstr "" |
| 2871 | |
| 2872 | #: builtin/checkout-index.c:202 |
| 2873 | msgid "write the content to temporary files" |
| 2874 | msgstr "" |
| 2875 | |
| 2876 | #: builtin/checkout-index.c:203 builtin/column.c:30 |
| 2877 | msgid "string" |
| 2878 | msgstr "" |
| 2879 | |
| 2880 | #: builtin/checkout-index.c:204 |
| 2881 | msgid "when creating files, prepend <string>" |
| 2882 | msgstr "" |
| 2883 | |
| 2884 | #: builtin/checkout-index.c:207 |
| 2885 | msgid "copy out the files from named stage" |
| 2886 | msgstr "" |
| 2887 | |
| 2888 | #: builtin/checkout.c:25 |
| 2889 | msgid "git checkout [options] <branch>" |
| 2890 | msgstr "" |
| 2891 | |
| 2892 | #: builtin/checkout.c:26 |
| 2893 | msgid "git checkout [options] [<branch>] -- <file>..." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2894 | msgstr "" |
| 2895 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2896 | #: builtin/checkout.c:117 builtin/checkout.c:150 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2897 | #, c-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2898 | msgid "path '%s' does not have our version" |
| 2899 | msgstr "" |
| 2900 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2901 | #: builtin/checkout.c:119 builtin/checkout.c:152 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2902 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2903 | msgid "path '%s' does not have their version" |
| 2904 | msgstr "" |
| 2905 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2906 | #: builtin/checkout.c:135 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2907 | #, c-format |
| 2908 | msgid "path '%s' does not have all necessary versions" |
| 2909 | msgstr "" |
| 2910 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2911 | #: builtin/checkout.c:179 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2912 | #, c-format |
| 2913 | msgid "path '%s' does not have necessary versions" |
| 2914 | msgstr "" |
| 2915 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2916 | #: builtin/checkout.c:196 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2917 | #, c-format |
| 2918 | msgid "path '%s': cannot merge" |
| 2919 | msgstr "" |
| 2920 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2921 | #: builtin/checkout.c:213 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2922 | #, c-format |
| 2923 | msgid "Unable to add merge result for '%s'" |
| 2924 | msgstr "" |
| 2925 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2926 | #: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243 |
| 2927 | #: builtin/checkout.c:246 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2928 | #, c-format |
| 2929 | msgid "'%s' cannot be used with updating paths" |
| 2930 | msgstr "" |
| 2931 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2932 | #: builtin/checkout.c:249 builtin/checkout.c:252 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2933 | #, c-format |
| 2934 | msgid "'%s' cannot be used with %s" |
| 2935 | msgstr "" |
| 2936 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2937 | #: builtin/checkout.c:255 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2938 | #, c-format |
| 2939 | msgid "Cannot update paths and switch to branch '%s' at the same time." |
| 2940 | msgstr "" |
| 2941 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2942 | #: builtin/checkout.c:266 builtin/checkout.c:458 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2943 | msgid "corrupt index file" |
| 2944 | msgstr "" |
| 2945 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2946 | #: builtin/checkout.c:329 builtin/checkout.c:336 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2947 | #, c-format |
| 2948 | msgid "path '%s' is unmerged" |
| 2949 | msgstr "" |
| 2950 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2951 | #: builtin/checkout.c:480 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2952 | msgid "you need to resolve your current index first" |
| 2953 | msgstr "" |
| 2954 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2955 | #: builtin/checkout.c:601 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2956 | #, c-format |
| 2957 | msgid "Can not do reflog for '%s'\n" |
| 2958 | msgstr "" |
| 2959 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2960 | #: builtin/checkout.c:634 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2961 | msgid "HEAD is now at" |
| 2962 | msgstr "" |
| 2963 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2964 | #: builtin/checkout.c:641 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2965 | #, c-format |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2966 | msgid "Reset branch '%s'\n" |
| 2967 | msgstr "" |
| 2968 | |
| 2969 | #: builtin/checkout.c:644 |
| 2970 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2971 | msgid "Already on '%s'\n" |
| 2972 | msgstr "" |
| 2973 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2974 | #: builtin/checkout.c:648 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2975 | #, c-format |
| 2976 | msgid "Switched to and reset branch '%s'\n" |
| 2977 | msgstr "" |
| 2978 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2979 | #: builtin/checkout.c:650 builtin/checkout.c:987 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2980 | #, c-format |
| 2981 | msgid "Switched to a new branch '%s'\n" |
| 2982 | msgstr "" |
| 2983 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2984 | #: builtin/checkout.c:652 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2985 | #, c-format |
| 2986 | msgid "Switched to branch '%s'\n" |
| 2987 | msgstr "" |
| 2988 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2989 | #: builtin/checkout.c:708 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2990 | #, c-format |
| 2991 | msgid " ... and %d more.\n" |
| 2992 | msgstr "" |
| 2993 | |
| 2994 | #. The singular version |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2995 | #: builtin/checkout.c:714 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2996 | #, c-format |
| 2997 | msgid "" |
| 2998 | "Warning: you are leaving %d commit behind, not connected to\n" |
| 2999 | "any of your branches:\n" |
| 3000 | "\n" |
| 3001 | "%s\n" |
| 3002 | msgid_plural "" |
| 3003 | "Warning: you are leaving %d commits behind, not connected to\n" |
| 3004 | "any of your branches:\n" |
| 3005 | "\n" |
| 3006 | "%s\n" |
| 3007 | msgstr[0] "" |
| 3008 | msgstr[1] "" |
| 3009 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3010 | #: builtin/checkout.c:732 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3011 | #, c-format |
| 3012 | msgid "" |
| 3013 | "If you want to keep them by creating a new branch, this may be a good time\n" |
| 3014 | "to do so with:\n" |
| 3015 | "\n" |
| 3016 | " git branch new_branch_name %s\n" |
| 3017 | "\n" |
| 3018 | msgstr "" |
| 3019 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3020 | #: builtin/checkout.c:762 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3021 | msgid "internal error in revision walk" |
| 3022 | msgstr "" |
| 3023 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3024 | #: builtin/checkout.c:766 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3025 | msgid "Previous HEAD position was" |
| 3026 | msgstr "" |
| 3027 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3028 | #: builtin/checkout.c:793 builtin/checkout.c:982 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3029 | msgid "You are on a branch yet to be born" |
| 3030 | msgstr "" |
| 3031 | |
| 3032 | #. case (1) |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3033 | #: builtin/checkout.c:918 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3034 | #, c-format |
| 3035 | msgid "invalid reference: %s" |
| 3036 | msgstr "" |
| 3037 | |
| 3038 | #. case (1): want a tree |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3039 | #: builtin/checkout.c:957 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3040 | #, c-format |
| 3041 | msgid "reference is not a tree: %s" |
| 3042 | msgstr "" |
| 3043 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3044 | #: builtin/checkout.c:996 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3045 | msgid "paths cannot be used with switching branches" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3046 | msgstr "" |
| 3047 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3048 | #: builtin/checkout.c:999 builtin/checkout.c:1003 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3049 | #, c-format |
| 3050 | msgid "'%s' cannot be used with switching branches" |
| 3051 | msgstr "" |
| 3052 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3053 | #: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 |
| 3054 | #: builtin/checkout.c:1018 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3055 | #, c-format |
| 3056 | msgid "'%s' cannot be used with '%s'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3057 | msgstr "" |
| 3058 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3059 | #: builtin/checkout.c:1023 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3060 | #, c-format |
| 3061 | msgid "Cannot switch branch to a non-commit '%s'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3062 | msgstr "" |
| 3063 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3064 | #: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3065 | #: builtin/remote.c:169 builtin/remote.c:171 |
| 3066 | msgid "branch" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3067 | msgstr "" |
| 3068 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3069 | #: builtin/checkout.c:1046 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3070 | msgid "create and checkout a new branch" |
| 3071 | msgstr "" |
| 3072 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3073 | #: builtin/checkout.c:1048 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3074 | msgid "create/reset and checkout a branch" |
| 3075 | msgstr "" |
| 3076 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3077 | #: builtin/checkout.c:1049 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3078 | msgid "create reflog for new branch" |
| 3079 | msgstr "" |
| 3080 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3081 | #: builtin/checkout.c:1050 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3082 | msgid "detach the HEAD at named commit" |
| 3083 | msgstr "" |
| 3084 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3085 | #: builtin/checkout.c:1051 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3086 | msgid "set upstream info for new branch" |
| 3087 | msgstr "" |
| 3088 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3089 | #: builtin/checkout.c:1053 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3090 | msgid "new branch" |
| 3091 | msgstr "" |
| 3092 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3093 | #: builtin/checkout.c:1053 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3094 | msgid "new unparented branch" |
| 3095 | msgstr "" |
| 3096 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3097 | #: builtin/checkout.c:1054 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3098 | msgid "checkout our version for unmerged files" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3099 | msgstr "" |
| 3100 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3101 | #: builtin/checkout.c:1056 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3102 | msgid "checkout their version for unmerged files" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3103 | msgstr "" |
| 3104 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3105 | #: builtin/checkout.c:1058 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3106 | msgid "force checkout (throw away local modifications)" |
| 3107 | msgstr "" |
| 3108 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3109 | #: builtin/checkout.c:1059 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3110 | msgid "perform a 3-way merge with the new branch" |
| 3111 | msgstr "" |
| 3112 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3113 | #: builtin/checkout.c:1060 builtin/merge.c:217 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3114 | msgid "update ignored files (default)" |
| 3115 | msgstr "" |
| 3116 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3117 | #: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3118 | msgid "style" |
| 3119 | msgstr "" |
| 3120 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3121 | #: builtin/checkout.c:1062 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3122 | msgid "conflict style (merge or diff3)" |
| 3123 | msgstr "" |
| 3124 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3125 | #: builtin/checkout.c:1065 |
| 3126 | msgid "do not limit pathspecs to sparse entries only" |
| 3127 | msgstr "" |
| 3128 | |
| 3129 | #: builtin/checkout.c:1067 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3130 | msgid "second guess 'git checkout no-such-branch'" |
| 3131 | msgstr "" |
| 3132 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3133 | #: builtin/checkout.c:1091 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3134 | msgid "-b, -B and --orphan are mutually exclusive" |
| 3135 | msgstr "" |
| 3136 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3137 | #: builtin/checkout.c:1108 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3138 | msgid "--track needs a branch name" |
| 3139 | msgstr "" |
| 3140 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3141 | #: builtin/checkout.c:1115 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3142 | msgid "Missing branch name; try -b" |
| 3143 | msgstr "" |
| 3144 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3145 | #: builtin/checkout.c:1150 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3146 | msgid "invalid path specification" |
| 3147 | msgstr "" |
| 3148 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3149 | #: builtin/checkout.c:1157 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3150 | #, c-format |
| 3151 | msgid "" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3152 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3153 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
| 3154 | msgstr "" |
| 3155 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3156 | #: builtin/checkout.c:1162 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3157 | #, c-format |
| 3158 | msgid "git checkout: --detach does not take a path argument '%s'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3159 | msgstr "" |
| 3160 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3161 | #: builtin/checkout.c:1166 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3162 | msgid "" |
| 3163 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" |
| 3164 | "checking out of the index." |
| 3165 | msgstr "" |
| 3166 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3167 | #: builtin/clean.c:20 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3168 | msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3169 | msgstr "" |
| 3170 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3171 | #: builtin/clean.c:24 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3172 | #, c-format |
| 3173 | msgid "Removing %s\n" |
| 3174 | msgstr "" |
| 3175 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3176 | #: builtin/clean.c:25 |
| 3177 | #, c-format |
| 3178 | msgid "Would remove %s\n" |
| 3179 | msgstr "" |
| 3180 | |
| 3181 | #: builtin/clean.c:26 |
| 3182 | #, c-format |
| 3183 | msgid "Skipping repository %s\n" |
| 3184 | msgstr "" |
| 3185 | |
| 3186 | #: builtin/clean.c:27 |
| 3187 | #, c-format |
| 3188 | msgid "Would skip repository %s\n" |
| 3189 | msgstr "" |
| 3190 | |
| 3191 | #: builtin/clean.c:28 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3192 | #, c-format |
| 3193 | msgid "failed to remove %s" |
| 3194 | msgstr "" |
| 3195 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3196 | #: builtin/clean.c:160 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3197 | msgid "do not print names of files removed" |
| 3198 | msgstr "" |
| 3199 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3200 | #: builtin/clean.c:162 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3201 | msgid "force" |
| 3202 | msgstr "" |
| 3203 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3204 | #: builtin/clean.c:164 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3205 | msgid "remove whole directories" |
| 3206 | msgstr "" |
| 3207 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3208 | #: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3209 | #: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3210 | msgid "pattern" |
| 3211 | msgstr "" |
| 3212 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3213 | #: builtin/clean.c:166 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3214 | msgid "add <pattern> to ignore rules" |
| 3215 | msgstr "" |
| 3216 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3217 | #: builtin/clean.c:167 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3218 | msgid "remove ignored files, too" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3219 | msgstr "" |
| 3220 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3221 | #: builtin/clean.c:169 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3222 | msgid "remove only ignored files" |
| 3223 | msgstr "" |
| 3224 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3225 | #: builtin/clean.c:187 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3226 | msgid "-x and -X cannot be used together" |
| 3227 | msgstr "" |
| 3228 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3229 | #: builtin/clean.c:191 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3230 | msgid "" |
| 3231 | "clean.requireForce set to true and neither -n nor -f given; refusing to clean" |
| 3232 | msgstr "" |
| 3233 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3234 | #: builtin/clean.c:194 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3235 | msgid "" |
| 3236 | "clean.requireForce defaults to true and neither -n nor -f given; refusing to " |
| 3237 | "clean" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3238 | msgstr "" |
| 3239 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3240 | #: builtin/clone.c:37 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3241 | msgid "git clone [options] [--] <repo> [<dir>]" |
| 3242 | msgstr "" |
| 3243 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3244 | #: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3245 | #: builtin/push.c:436 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3246 | msgid "force progress reporting" |
| 3247 | msgstr "" |
| 3248 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3249 | #: builtin/clone.c:67 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3250 | msgid "don't create a checkout" |
| 3251 | msgstr "" |
| 3252 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3253 | #: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3254 | msgid "create a bare repository" |
| 3255 | msgstr "" |
| 3256 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3257 | #: builtin/clone.c:73 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3258 | msgid "create a mirror repository (implies bare)" |
| 3259 | msgstr "" |
| 3260 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3261 | #: builtin/clone.c:75 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3262 | msgid "to clone from a local repository" |
| 3263 | msgstr "" |
| 3264 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3265 | #: builtin/clone.c:77 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3266 | msgid "don't use local hardlinks, always copy" |
| 3267 | msgstr "" |
| 3268 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3269 | #: builtin/clone.c:79 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3270 | msgid "setup as shared repository" |
| 3271 | msgstr "" |
| 3272 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3273 | #: builtin/clone.c:81 builtin/clone.c:83 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3274 | msgid "initialize submodules in the clone" |
| 3275 | msgstr "" |
| 3276 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3277 | #: builtin/clone.c:84 builtin/init-db.c:485 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3278 | msgid "template-directory" |
| 3279 | msgstr "" |
| 3280 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3281 | #: builtin/clone.c:85 builtin/init-db.c:486 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3282 | msgid "directory from which templates will be used" |
| 3283 | msgstr "" |
| 3284 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3285 | #: builtin/clone.c:87 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3286 | msgid "reference repository" |
| 3287 | msgstr "" |
| 3288 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3289 | #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3290 | msgid "name" |
| 3291 | msgstr "" |
| 3292 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3293 | #: builtin/clone.c:89 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3294 | msgid "use <name> instead of 'origin' to track upstream" |
| 3295 | msgstr "" |
| 3296 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3297 | #: builtin/clone.c:91 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3298 | msgid "checkout <branch> instead of the remote's HEAD" |
| 3299 | msgstr "" |
| 3300 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3301 | #: builtin/clone.c:93 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3302 | msgid "path to git-upload-pack on the remote" |
| 3303 | msgstr "" |
| 3304 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3305 | #: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3306 | msgid "depth" |
| 3307 | msgstr "" |
| 3308 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3309 | #: builtin/clone.c:95 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3310 | msgid "create a shallow clone of that depth" |
| 3311 | msgstr "" |
| 3312 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3313 | #: builtin/clone.c:97 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3314 | msgid "clone only one branch, HEAD or --branch" |
| 3315 | msgstr "" |
| 3316 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3317 | #: builtin/clone.c:98 builtin/init-db.c:494 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3318 | msgid "gitdir" |
| 3319 | msgstr "" |
| 3320 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3321 | #: builtin/clone.c:99 builtin/init-db.c:495 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3322 | msgid "separate git dir from working tree" |
| 3323 | msgstr "" |
| 3324 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3325 | #: builtin/clone.c:100 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3326 | msgid "key=value" |
| 3327 | msgstr "" |
| 3328 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3329 | #: builtin/clone.c:101 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3330 | msgid "set config inside the new repository" |
| 3331 | msgstr "" |
| 3332 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3333 | #: builtin/clone.c:254 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3334 | #, c-format |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3335 | msgid "reference repository '%s' is not a local repository." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3336 | msgstr "" |
| 3337 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3338 | #: builtin/clone.c:317 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3339 | #, c-format |
| 3340 | msgid "failed to create directory '%s'" |
| 3341 | msgstr "" |
| 3342 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3343 | #: builtin/clone.c:319 builtin/diff.c:77 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3344 | #, c-format |
| 3345 | msgid "failed to stat '%s'" |
| 3346 | msgstr "" |
| 3347 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3348 | #: builtin/clone.c:321 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3349 | #, c-format |
| 3350 | msgid "%s exists and is not a directory" |
| 3351 | msgstr "" |
| 3352 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3353 | #: builtin/clone.c:335 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3354 | #, c-format |
| 3355 | msgid "failed to stat %s\n" |
| 3356 | msgstr "" |
| 3357 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3358 | #: builtin/clone.c:357 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3359 | #, c-format |
| 3360 | msgid "failed to create link '%s'" |
| 3361 | msgstr "" |
| 3362 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3363 | #: builtin/clone.c:361 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3364 | #, c-format |
| 3365 | msgid "failed to copy file to '%s'" |
| 3366 | msgstr "" |
| 3367 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3368 | #: builtin/clone.c:384 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3369 | #, c-format |
| 3370 | msgid "done.\n" |
| 3371 | msgstr "" |
| 3372 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3373 | #: builtin/clone.c:397 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3374 | msgid "" |
| 3375 | "Clone succeeded, but checkout failed.\n" |
| 3376 | "You can inspect what was checked out with 'git status'\n" |
| 3377 | "and retry the checkout with 'git checkout -f HEAD'\n" |
| 3378 | msgstr "" |
| 3379 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3380 | #: builtin/clone.c:476 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3381 | #, c-format |
| 3382 | msgid "Could not find remote branch %s to clone." |
| 3383 | msgstr "" |
| 3384 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3385 | #: builtin/clone.c:550 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3386 | msgid "remote did not send all necessary objects" |
| 3387 | msgstr "" |
| 3388 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3389 | #: builtin/clone.c:610 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3390 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
| 3391 | msgstr "" |
| 3392 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3393 | #: builtin/clone.c:641 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3394 | msgid "unable to checkout working tree" |
| 3395 | msgstr "" |
| 3396 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3397 | #: builtin/clone.c:749 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3398 | msgid "Too many arguments." |
| 3399 | msgstr "" |
| 3400 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3401 | #: builtin/clone.c:753 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3402 | msgid "You must specify a repository to clone." |
| 3403 | msgstr "" |
| 3404 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3405 | #: builtin/clone.c:764 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3406 | #, c-format |
| 3407 | msgid "--bare and --origin %s options are incompatible." |
| 3408 | msgstr "" |
| 3409 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3410 | #: builtin/clone.c:767 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3411 | msgid "--bare and --separate-git-dir are incompatible." |
| 3412 | msgstr "" |
| 3413 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3414 | #: builtin/clone.c:780 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3415 | #, c-format |
| 3416 | msgid "repository '%s' does not exist" |
| 3417 | msgstr "" |
| 3418 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3419 | #: builtin/clone.c:785 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3420 | msgid "--depth is ignored in local clones; use file:// instead." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3421 | msgstr "" |
| 3422 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3423 | #: builtin/clone.c:795 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3424 | #, c-format |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3425 | msgid "destination path '%s' already exists and is not an empty directory." |
| 3426 | msgstr "" |
| 3427 | |
| 3428 | #: builtin/clone.c:805 |
| 3429 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3430 | msgid "working tree '%s' already exists." |
| 3431 | msgstr "" |
| 3432 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3433 | #: builtin/clone.c:818 builtin/clone.c:830 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3434 | #, c-format |
| 3435 | msgid "could not create leading directories of '%s'" |
| 3436 | msgstr "" |
| 3437 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3438 | #: builtin/clone.c:821 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3439 | #, c-format |
| 3440 | msgid "could not create work tree dir '%s'." |
| 3441 | msgstr "" |
| 3442 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3443 | #: builtin/clone.c:840 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3444 | #, c-format |
| 3445 | msgid "Cloning into bare repository '%s'...\n" |
| 3446 | msgstr "" |
| 3447 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3448 | #: builtin/clone.c:842 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3449 | #, c-format |
| 3450 | msgid "Cloning into '%s'...\n" |
| 3451 | msgstr "" |
| 3452 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3453 | #: builtin/clone.c:877 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3454 | #, c-format |
| 3455 | msgid "Don't know how to clone %s" |
| 3456 | msgstr "" |
| 3457 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3458 | #: builtin/clone.c:926 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3459 | #, c-format |
| 3460 | msgid "Remote branch %s not found in upstream %s" |
| 3461 | msgstr "" |
| 3462 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3463 | #: builtin/clone.c:933 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3464 | msgid "You appear to have cloned an empty repository." |
| 3465 | msgstr "" |
| 3466 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3467 | #: builtin/column.c:9 |
| 3468 | msgid "git column [options]" |
| 3469 | msgstr "" |
| 3470 | |
| 3471 | #: builtin/column.c:26 |
| 3472 | msgid "lookup config vars" |
| 3473 | msgstr "" |
| 3474 | |
| 3475 | #: builtin/column.c:27 builtin/column.c:28 |
| 3476 | msgid "layout to use" |
| 3477 | msgstr "" |
| 3478 | |
| 3479 | #: builtin/column.c:29 |
| 3480 | msgid "Maximum width" |
| 3481 | msgstr "" |
| 3482 | |
| 3483 | #: builtin/column.c:30 |
| 3484 | msgid "Padding space on left border" |
| 3485 | msgstr "" |
| 3486 | |
| 3487 | #: builtin/column.c:31 |
| 3488 | msgid "Padding space on right border" |
| 3489 | msgstr "" |
| 3490 | |
| 3491 | #: builtin/column.c:32 |
| 3492 | msgid "Padding space between columns" |
| 3493 | msgstr "" |
| 3494 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3495 | #: builtin/column.c:51 |
| 3496 | msgid "--command must be the first argument" |
| 3497 | msgstr "" |
| 3498 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 3499 | #: builtin/commit.c:34 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3500 | msgid "git commit [options] [--] <pathspec>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3501 | msgstr "" |
| 3502 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 3503 | #: builtin/commit.c:39 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3504 | msgid "git status [options] [--] <pathspec>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3505 | msgstr "" |
| 3506 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 3507 | #: builtin/commit.c:44 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3508 | msgid "" |
| 3509 | "Your name and email address were configured automatically based\n" |
| 3510 | "on your username and hostname. Please check that they are accurate.\n" |
| 3511 | "You can suppress this message by setting them explicitly:\n" |
| 3512 | "\n" |
| 3513 | " git config --global user.name \"Your Name\"\n" |
| 3514 | " git config --global user.email you@example.com\n" |
| 3515 | "\n" |
| 3516 | "After doing this, you may fix the identity used for this commit with:\n" |
| 3517 | "\n" |
| 3518 | " git commit --amend --reset-author\n" |
| 3519 | msgstr "" |
| 3520 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 3521 | #: builtin/commit.c:56 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3522 | msgid "" |
| 3523 | "You asked to amend the most recent commit, but doing so would make\n" |
| 3524 | "it empty. You can repeat your command with --allow-empty, or you can\n" |
| 3525 | "remove the commit entirely with \"git reset HEAD^\".\n" |
| 3526 | msgstr "" |
| 3527 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 3528 | #: builtin/commit.c:61 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3529 | msgid "" |
| 3530 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" |
| 3531 | "If you wish to commit it anyway, use:\n" |
| 3532 | "\n" |
| 3533 | " git commit --allow-empty\n" |
| 3534 | "\n" |
| 3535 | "Otherwise, please use 'git reset'\n" |
| 3536 | msgstr "" |
| 3537 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3538 | #: builtin/commit.c:260 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3539 | msgid "failed to unpack HEAD tree object" |
| 3540 | msgstr "" |
| 3541 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3542 | #: builtin/commit.c:302 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3543 | msgid "unable to create temporary index" |
| 3544 | msgstr "" |
| 3545 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3546 | #: builtin/commit.c:308 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3547 | msgid "interactive add failed" |
| 3548 | msgstr "" |
| 3549 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3550 | #: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3551 | msgid "unable to write new_index file" |
| 3552 | msgstr "" |
| 3553 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3554 | #: builtin/commit.c:393 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3555 | msgid "cannot do a partial commit during a merge." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3556 | msgstr "" |
| 3557 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3558 | #: builtin/commit.c:395 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3559 | msgid "cannot do a partial commit during a cherry-pick." |
| 3560 | msgstr "" |
| 3561 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3562 | #: builtin/commit.c:405 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3563 | msgid "cannot read the index" |
| 3564 | msgstr "" |
| 3565 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3566 | #: builtin/commit.c:425 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3567 | msgid "unable to write temporary index file" |
| 3568 | msgstr "" |
| 3569 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3570 | #: builtin/commit.c:513 builtin/commit.c:519 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3571 | #, c-format |
| 3572 | msgid "invalid commit: %s" |
| 3573 | msgstr "" |
| 3574 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3575 | #: builtin/commit.c:542 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3576 | msgid "malformed --author parameter" |
| 3577 | msgstr "" |
| 3578 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3579 | #: builtin/commit.c:562 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3580 | #, c-format |
| 3581 | msgid "Malformed ident string: '%s'" |
| 3582 | msgstr "" |
| 3583 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3584 | #: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3585 | #, c-format |
| 3586 | msgid "could not lookup commit %s" |
| 3587 | msgstr "" |
| 3588 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3589 | #: builtin/commit.c:612 builtin/shortlog.c:270 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3590 | #, c-format |
| 3591 | msgid "(reading log message from standard input)\n" |
| 3592 | msgstr "" |
| 3593 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3594 | #: builtin/commit.c:614 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3595 | msgid "could not read log from standard input" |
| 3596 | msgstr "" |
| 3597 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3598 | #: builtin/commit.c:618 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3599 | #, c-format |
| 3600 | msgid "could not read log file '%s'" |
| 3601 | msgstr "" |
| 3602 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3603 | #: builtin/commit.c:624 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3604 | msgid "commit has empty message" |
| 3605 | msgstr "" |
| 3606 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3607 | #: builtin/commit.c:640 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3608 | msgid "could not read MERGE_MSG" |
| 3609 | msgstr "" |
| 3610 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3611 | #: builtin/commit.c:644 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3612 | msgid "could not read SQUASH_MSG" |
| 3613 | msgstr "" |
| 3614 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3615 | #: builtin/commit.c:648 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3616 | #, c-format |
| 3617 | msgid "could not read '%s'" |
| 3618 | msgstr "" |
| 3619 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3620 | #: builtin/commit.c:709 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3621 | msgid "could not write commit template" |
| 3622 | msgstr "" |
| 3623 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3624 | #: builtin/commit.c:720 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3625 | #, c-format |
| 3626 | msgid "" |
| 3627 | "\n" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3628 | "It looks like you may be committing a merge.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3629 | "If this is not correct, please remove the file\n" |
| 3630 | "\t%s\n" |
| 3631 | "and try again.\n" |
| 3632 | msgstr "" |
| 3633 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3634 | #: builtin/commit.c:725 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3635 | #, c-format |
| 3636 | msgid "" |
| 3637 | "\n" |
| 3638 | "It looks like you may be committing a cherry-pick.\n" |
| 3639 | "If this is not correct, please remove the file\n" |
| 3640 | "\t%s\n" |
| 3641 | "and try again.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3642 | msgstr "" |
| 3643 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3644 | #: builtin/commit.c:737 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3645 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3646 | msgid "" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3647 | "Please enter the commit message for your changes. Lines starting\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3648 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3649 | msgstr "" |
| 3650 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3651 | #: builtin/commit.c:742 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3652 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3653 | msgid "" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3654 | "Please enter the commit message for your changes. Lines starting\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3655 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3656 | "An empty message aborts the commit.\n" |
| 3657 | msgstr "" |
| 3658 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3659 | #: builtin/commit.c:755 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3660 | #, c-format |
| 3661 | msgid "%sAuthor: %s" |
| 3662 | msgstr "" |
| 3663 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3664 | #: builtin/commit.c:762 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3665 | #, c-format |
| 3666 | msgid "%sCommitter: %s" |
| 3667 | msgstr "" |
| 3668 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3669 | #: builtin/commit.c:782 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3670 | msgid "Cannot read index" |
| 3671 | msgstr "" |
| 3672 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3673 | #: builtin/commit.c:819 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3674 | msgid "Error building trees" |
| 3675 | msgstr "" |
| 3676 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3677 | #: builtin/commit.c:834 builtin/tag.c:359 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3678 | #, c-format |
| 3679 | msgid "Please supply the message using either -m or -F option.\n" |
| 3680 | msgstr "" |
| 3681 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3682 | #: builtin/commit.c:931 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3683 | #, c-format |
| 3684 | msgid "No existing author found with '%s'" |
| 3685 | msgstr "" |
| 3686 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3687 | #: builtin/commit.c:946 builtin/commit.c:1140 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3688 | #, c-format |
| 3689 | msgid "Invalid untracked files mode '%s'" |
| 3690 | msgstr "" |
| 3691 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3692 | #: builtin/commit.c:976 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3693 | msgid "Using both --reset-author and --author does not make sense" |
| 3694 | msgstr "" |
| 3695 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3696 | #: builtin/commit.c:987 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3697 | msgid "You have nothing to amend." |
| 3698 | msgstr "" |
| 3699 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3700 | #: builtin/commit.c:990 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3701 | msgid "You are in the middle of a merge -- cannot amend." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3702 | msgstr "" |
| 3703 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3704 | #: builtin/commit.c:992 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3705 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
| 3706 | msgstr "" |
| 3707 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3708 | #: builtin/commit.c:995 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3709 | msgid "Options --squash and --fixup cannot be used together" |
| 3710 | msgstr "" |
| 3711 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3712 | #: builtin/commit.c:1005 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3713 | msgid "Only one of -c/-C/-F/--fixup can be used." |
| 3714 | msgstr "" |
| 3715 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3716 | #: builtin/commit.c:1007 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3717 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
| 3718 | msgstr "" |
| 3719 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3720 | #: builtin/commit.c:1015 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3721 | msgid "--reset-author can be used only with -C, -c or --amend." |
| 3722 | msgstr "" |
| 3723 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3724 | #: builtin/commit.c:1032 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3725 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
| 3726 | msgstr "" |
| 3727 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3728 | #: builtin/commit.c:1034 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3729 | msgid "No paths with --include/--only does not make sense." |
| 3730 | msgstr "" |
| 3731 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3732 | #: builtin/commit.c:1036 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3733 | msgid "Clever... amending the last one with dirty index." |
| 3734 | msgstr "" |
| 3735 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3736 | #: builtin/commit.c:1038 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3737 | msgid "Explicit paths specified without -i nor -o; assuming --only paths..." |
| 3738 | msgstr "" |
| 3739 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3740 | #: builtin/commit.c:1048 builtin/tag.c:575 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3741 | #, c-format |
| 3742 | msgid "Invalid cleanup mode %s" |
| 3743 | msgstr "" |
| 3744 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3745 | #: builtin/commit.c:1053 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3746 | msgid "Paths with -a does not make sense." |
| 3747 | msgstr "" |
| 3748 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3749 | #: builtin/commit.c:1059 builtin/commit.c:1194 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 3750 | msgid "--long and -z are incompatible" |
| 3751 | msgstr "" |
| 3752 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3753 | #: builtin/commit.c:1154 builtin/commit.c:1390 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3754 | msgid "show status concisely" |
| 3755 | msgstr "" |
| 3756 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3757 | #: builtin/commit.c:1156 builtin/commit.c:1392 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3758 | msgid "show branch information" |
| 3759 | msgstr "" |
| 3760 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3761 | #: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3762 | msgid "machine-readable output" |
| 3763 | msgstr "" |
| 3764 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3765 | #: builtin/commit.c:1161 builtin/commit.c:1396 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 3766 | msgid "show status in long format (default)" |
| 3767 | msgstr "" |
| 3768 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3769 | #: builtin/commit.c:1164 builtin/commit.c:1399 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3770 | msgid "terminate entries with NUL" |
| 3771 | msgstr "" |
| 3772 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3773 | #: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 |
| 3774 | #: builtin/fast-export.c:662 builtin/tag.c:459 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3775 | msgid "mode" |
| 3776 | msgstr "" |
| 3777 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3778 | #: builtin/commit.c:1167 builtin/commit.c:1402 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3779 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
| 3780 | msgstr "" |
| 3781 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3782 | #: builtin/commit.c:1170 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3783 | msgid "show ignored files" |
| 3784 | msgstr "" |
| 3785 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3786 | #: builtin/commit.c:1171 parse-options.h:151 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3787 | msgid "when" |
| 3788 | msgstr "" |
| 3789 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3790 | #: builtin/commit.c:1172 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3791 | msgid "" |
| 3792 | "ignore changes to submodules, optional when: all, dirty, untracked. " |
| 3793 | "(Default: all)" |
| 3794 | msgstr "" |
| 3795 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3796 | #: builtin/commit.c:1174 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3797 | msgid "list untracked files in columns" |
| 3798 | msgstr "" |
| 3799 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3800 | #: builtin/commit.c:1248 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3801 | msgid "couldn't look up newly created commit" |
| 3802 | msgstr "" |
| 3803 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3804 | #: builtin/commit.c:1250 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3805 | msgid "could not parse newly created commit" |
| 3806 | msgstr "" |
| 3807 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3808 | #: builtin/commit.c:1291 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3809 | msgid "detached HEAD" |
| 3810 | msgstr "" |
| 3811 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3812 | #: builtin/commit.c:1293 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3813 | msgid " (root-commit)" |
| 3814 | msgstr "" |
| 3815 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3816 | #: builtin/commit.c:1360 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3817 | msgid "suppress summary after successful commit" |
| 3818 | msgstr "" |
| 3819 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3820 | #: builtin/commit.c:1361 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3821 | msgid "show diff in commit message template" |
| 3822 | msgstr "" |
| 3823 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3824 | #: builtin/commit.c:1363 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3825 | msgid "Commit message options" |
| 3826 | msgstr "" |
| 3827 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3828 | #: builtin/commit.c:1364 builtin/tag.c:457 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3829 | msgid "read message from file" |
| 3830 | msgstr "" |
| 3831 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3832 | #: builtin/commit.c:1365 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3833 | msgid "author" |
| 3834 | msgstr "" |
| 3835 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3836 | #: builtin/commit.c:1365 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3837 | msgid "override author for commit" |
| 3838 | msgstr "" |
| 3839 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3840 | #: builtin/commit.c:1366 builtin/gc.c:178 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3841 | msgid "date" |
| 3842 | msgstr "" |
| 3843 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3844 | #: builtin/commit.c:1366 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3845 | msgid "override date for commit" |
| 3846 | msgstr "" |
| 3847 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3848 | #: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3849 | #: builtin/notes.c:690 builtin/tag.c:455 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3850 | msgid "message" |
| 3851 | msgstr "" |
| 3852 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3853 | #: builtin/commit.c:1367 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3854 | msgid "commit message" |
| 3855 | msgstr "" |
| 3856 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3857 | #: builtin/commit.c:1368 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3858 | msgid "reuse and edit message from specified commit" |
| 3859 | msgstr "" |
| 3860 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3861 | #: builtin/commit.c:1369 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3862 | msgid "reuse message from specified commit" |
| 3863 | msgstr "" |
| 3864 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3865 | #: builtin/commit.c:1370 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3866 | msgid "use autosquash formatted message to fixup specified commit" |
| 3867 | msgstr "" |
| 3868 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3869 | #: builtin/commit.c:1371 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3870 | msgid "use autosquash formatted message to squash specified commit" |
| 3871 | msgstr "" |
| 3872 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3873 | #: builtin/commit.c:1372 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3874 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
| 3875 | msgstr "" |
| 3876 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3877 | #: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3878 | msgid "add Signed-off-by:" |
| 3879 | msgstr "" |
| 3880 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3881 | #: builtin/commit.c:1374 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3882 | msgid "use specified template file" |
| 3883 | msgstr "" |
| 3884 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3885 | #: builtin/commit.c:1375 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3886 | msgid "force edit of commit" |
| 3887 | msgstr "" |
| 3888 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3889 | #: builtin/commit.c:1376 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3890 | msgid "default" |
| 3891 | msgstr "" |
| 3892 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3893 | #: builtin/commit.c:1376 builtin/tag.c:460 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3894 | msgid "how to strip spaces and #comments from message" |
| 3895 | msgstr "" |
| 3896 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3897 | #: builtin/commit.c:1377 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3898 | msgid "include status in commit message template" |
| 3899 | msgstr "" |
| 3900 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3901 | #: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3902 | msgid "key id" |
| 3903 | msgstr "" |
| 3904 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3905 | #: builtin/commit.c:1379 builtin/merge.c:216 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3906 | msgid "GPG sign commit" |
| 3907 | msgstr "" |
| 3908 | |
| 3909 | #. end commit message options |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3910 | #: builtin/commit.c:1382 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3911 | msgid "Commit contents options" |
| 3912 | msgstr "" |
| 3913 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3914 | #: builtin/commit.c:1383 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3915 | msgid "commit all changed files" |
| 3916 | msgstr "" |
| 3917 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3918 | #: builtin/commit.c:1384 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3919 | msgid "add specified files to index for commit" |
| 3920 | msgstr "" |
| 3921 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3922 | #: builtin/commit.c:1385 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3923 | msgid "interactively add files" |
| 3924 | msgstr "" |
| 3925 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3926 | #: builtin/commit.c:1386 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3927 | msgid "interactively add changes" |
| 3928 | msgstr "" |
| 3929 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3930 | #: builtin/commit.c:1387 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3931 | msgid "commit only specified files" |
| 3932 | msgstr "" |
| 3933 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3934 | #: builtin/commit.c:1388 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3935 | msgid "bypass pre-commit hook" |
| 3936 | msgstr "" |
| 3937 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3938 | #: builtin/commit.c:1389 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3939 | msgid "show what would be committed" |
| 3940 | msgstr "" |
| 3941 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3942 | #: builtin/commit.c:1400 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3943 | msgid "amend previous commit" |
| 3944 | msgstr "" |
| 3945 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3946 | #: builtin/commit.c:1401 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3947 | msgid "bypass post-rewrite hook" |
| 3948 | msgstr "" |
| 3949 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3950 | #: builtin/commit.c:1406 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3951 | msgid "ok to record an empty change" |
| 3952 | msgstr "" |
| 3953 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3954 | #: builtin/commit.c:1409 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3955 | msgid "ok to record a change with an empty message" |
| 3956 | msgstr "" |
| 3957 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3958 | #: builtin/commit.c:1441 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3959 | msgid "could not parse HEAD commit" |
| 3960 | msgstr "" |
| 3961 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3962 | #: builtin/commit.c:1479 builtin/merge.c:510 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3963 | #, c-format |
| 3964 | msgid "could not open '%s' for reading" |
| 3965 | msgstr "" |
| 3966 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3967 | #: builtin/commit.c:1486 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3968 | #, c-format |
| 3969 | msgid "Corrupt MERGE_HEAD file (%s)" |
| 3970 | msgstr "" |
| 3971 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3972 | #: builtin/commit.c:1493 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3973 | msgid "could not read MERGE_MODE" |
| 3974 | msgstr "" |
| 3975 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3976 | #: builtin/commit.c:1512 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3977 | #, c-format |
| 3978 | msgid "could not read commit message: %s" |
| 3979 | msgstr "" |
| 3980 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3981 | #: builtin/commit.c:1526 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 3982 | #, c-format |
| 3983 | msgid "Aborting commit; you did not edit the message.\n" |
| 3984 | msgstr "" |
| 3985 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3986 | #: builtin/commit.c:1531 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3987 | #, c-format |
| 3988 | msgid "Aborting commit due to empty commit message.\n" |
| 3989 | msgstr "" |
| 3990 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3991 | #: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3992 | msgid "failed to write commit object" |
| 3993 | msgstr "" |
| 3994 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3995 | #: builtin/commit.c:1567 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3996 | msgid "cannot lock HEAD ref" |
| 3997 | msgstr "" |
| 3998 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3999 | #: builtin/commit.c:1571 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4000 | msgid "cannot update HEAD ref" |
| 4001 | msgstr "" |
| 4002 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4003 | #: builtin/commit.c:1582 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4004 | msgid "" |
| 4005 | "Repository has been updated, but unable to write\n" |
| 4006 | "new_index file. Check that disk is not full or quota is\n" |
| 4007 | "not exceeded, and then \"git reset HEAD\" to recover." |
| 4008 | msgstr "" |
| 4009 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4010 | #: builtin/config.c:7 |
| 4011 | msgid "git config [options]" |
| 4012 | msgstr "" |
| 4013 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4014 | #: builtin/config.c:51 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4015 | msgid "Config file location" |
| 4016 | msgstr "" |
| 4017 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4018 | #: builtin/config.c:52 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4019 | msgid "use global config file" |
| 4020 | msgstr "" |
| 4021 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4022 | #: builtin/config.c:53 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4023 | msgid "use system config file" |
| 4024 | msgstr "" |
| 4025 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4026 | #: builtin/config.c:54 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4027 | msgid "use repository config file" |
| 4028 | msgstr "" |
| 4029 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4030 | #: builtin/config.c:55 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4031 | msgid "use given config file" |
| 4032 | msgstr "" |
| 4033 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4034 | #: builtin/config.c:56 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4035 | msgid "Action" |
| 4036 | msgstr "" |
| 4037 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4038 | #: builtin/config.c:57 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4039 | msgid "get value: name [value-regex]" |
| 4040 | msgstr "" |
| 4041 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4042 | #: builtin/config.c:58 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4043 | msgid "get all values: key [value-regex]" |
| 4044 | msgstr "" |
| 4045 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4046 | #: builtin/config.c:59 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4047 | msgid "get values for regexp: name-regex [value-regex]" |
| 4048 | msgstr "" |
| 4049 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4050 | #: builtin/config.c:60 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4051 | msgid "replace all matching variables: name value [value_regex]" |
| 4052 | msgstr "" |
| 4053 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4054 | #: builtin/config.c:61 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4055 | msgid "add a new variable: name value" |
| 4056 | msgstr "" |
| 4057 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4058 | #: builtin/config.c:62 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4059 | msgid "remove a variable: name [value-regex]" |
| 4060 | msgstr "" |
| 4061 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4062 | #: builtin/config.c:63 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4063 | msgid "remove all matches: name [value-regex]" |
| 4064 | msgstr "" |
| 4065 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4066 | #: builtin/config.c:64 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4067 | msgid "rename section: old-name new-name" |
| 4068 | msgstr "" |
| 4069 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4070 | #: builtin/config.c:65 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4071 | msgid "remove a section: name" |
| 4072 | msgstr "" |
| 4073 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4074 | #: builtin/config.c:66 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4075 | msgid "list all" |
| 4076 | msgstr "" |
| 4077 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4078 | #: builtin/config.c:67 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4079 | msgid "open an editor" |
| 4080 | msgstr "" |
| 4081 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4082 | #: builtin/config.c:68 builtin/config.c:69 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4083 | msgid "slot" |
| 4084 | msgstr "" |
| 4085 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4086 | #: builtin/config.c:68 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4087 | msgid "find the color configured: [default]" |
| 4088 | msgstr "" |
| 4089 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4090 | #: builtin/config.c:69 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4091 | msgid "find the color setting: [stdout-is-tty]" |
| 4092 | msgstr "" |
| 4093 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4094 | #: builtin/config.c:70 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4095 | msgid "Type" |
| 4096 | msgstr "" |
| 4097 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4098 | #: builtin/config.c:71 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4099 | msgid "value is \"true\" or \"false\"" |
| 4100 | msgstr "" |
| 4101 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4102 | #: builtin/config.c:72 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4103 | msgid "value is decimal number" |
| 4104 | msgstr "" |
| 4105 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4106 | #: builtin/config.c:73 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4107 | msgid "value is --bool or --int" |
| 4108 | msgstr "" |
| 4109 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4110 | #: builtin/config.c:74 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4111 | msgid "value is a path (file or directory name)" |
| 4112 | msgstr "" |
| 4113 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4114 | #: builtin/config.c:75 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4115 | msgid "Other" |
| 4116 | msgstr "" |
| 4117 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4118 | #: builtin/config.c:76 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4119 | msgid "terminate values with NUL byte" |
| 4120 | msgstr "" |
| 4121 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4122 | #: builtin/config.c:77 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4123 | msgid "respect include directives on lookup" |
| 4124 | msgstr "" |
| 4125 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4126 | #: builtin/count-objects.c:82 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4127 | msgid "git count-objects [-v] [-H | --human-readable]" |
| 4128 | msgstr "" |
| 4129 | |
| 4130 | #: builtin/count-objects.c:97 |
| 4131 | msgid "print sizes in human readable format" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4132 | msgstr "" |
| 4133 | |
| 4134 | #: builtin/describe.c:15 |
| 4135 | msgid "git describe [options] <committish>*" |
| 4136 | msgstr "" |
| 4137 | |
| 4138 | #: builtin/describe.c:16 |
| 4139 | msgid "git describe [options] --dirty" |
| 4140 | msgstr "" |
| 4141 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4142 | #: builtin/describe.c:233 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4143 | #, c-format |
| 4144 | msgid "annotated tag %s not available" |
| 4145 | msgstr "" |
| 4146 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4147 | #: builtin/describe.c:237 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4148 | #, c-format |
| 4149 | msgid "annotated tag %s has no embedded name" |
| 4150 | msgstr "" |
| 4151 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4152 | #: builtin/describe.c:239 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4153 | #, c-format |
| 4154 | msgid "tag '%s' is really '%s' here" |
| 4155 | msgstr "" |
| 4156 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4157 | #: builtin/describe.c:266 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4158 | #, c-format |
| 4159 | msgid "Not a valid object name %s" |
| 4160 | msgstr "" |
| 4161 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4162 | #: builtin/describe.c:269 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4163 | #, c-format |
| 4164 | msgid "%s is not a valid '%s' object" |
| 4165 | msgstr "" |
| 4166 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4167 | #: builtin/describe.c:286 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4168 | #, c-format |
| 4169 | msgid "no tag exactly matches '%s'" |
| 4170 | msgstr "" |
| 4171 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4172 | #: builtin/describe.c:288 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4173 | #, c-format |
| 4174 | msgid "searching to describe %s\n" |
| 4175 | msgstr "" |
| 4176 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4177 | #: builtin/describe.c:328 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4178 | #, c-format |
| 4179 | msgid "finished search at %s\n" |
| 4180 | msgstr "" |
| 4181 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4182 | #: builtin/describe.c:352 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4183 | #, c-format |
| 4184 | msgid "" |
| 4185 | "No annotated tags can describe '%s'.\n" |
| 4186 | "However, there were unannotated tags: try --tags." |
| 4187 | msgstr "" |
| 4188 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4189 | #: builtin/describe.c:356 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4190 | #, c-format |
| 4191 | msgid "" |
| 4192 | "No tags can describe '%s'.\n" |
| 4193 | "Try --always, or create some tags." |
| 4194 | msgstr "" |
| 4195 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4196 | #: builtin/describe.c:377 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4197 | #, c-format |
| 4198 | msgid "traversed %lu commits\n" |
| 4199 | msgstr "" |
| 4200 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4201 | #: builtin/describe.c:380 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4202 | #, c-format |
| 4203 | msgid "" |
| 4204 | "more than %i tags found; listed %i most recent\n" |
| 4205 | "gave up search at %s\n" |
| 4206 | msgstr "" |
| 4207 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4208 | #: builtin/describe.c:402 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4209 | msgid "find the tag that comes after the commit" |
| 4210 | msgstr "" |
| 4211 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4212 | #: builtin/describe.c:403 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4213 | msgid "debug search strategy on stderr" |
| 4214 | msgstr "" |
| 4215 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4216 | #: builtin/describe.c:404 |
| 4217 | msgid "use any ref" |
| 4218 | msgstr "" |
| 4219 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4220 | #: builtin/describe.c:405 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4221 | msgid "use any tag, even unannotated" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4222 | msgstr "" |
| 4223 | |
| 4224 | #: builtin/describe.c:406 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4225 | msgid "always use long format" |
| 4226 | msgstr "" |
| 4227 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4228 | #: builtin/describe.c:409 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4229 | msgid "only output exact matches" |
| 4230 | msgstr "" |
| 4231 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4232 | #: builtin/describe.c:411 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4233 | msgid "consider <n> most recent tags (default: 10)" |
| 4234 | msgstr "" |
| 4235 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4236 | #: builtin/describe.c:413 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4237 | msgid "only consider tags matching <pattern>" |
| 4238 | msgstr "" |
| 4239 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4240 | #: builtin/describe.c:415 builtin/name-rev.c:238 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4241 | msgid "show abbreviated commit object as fallback" |
| 4242 | msgstr "" |
| 4243 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4244 | #: builtin/describe.c:416 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4245 | msgid "mark" |
| 4246 | msgstr "" |
| 4247 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4248 | #: builtin/describe.c:417 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4249 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
| 4250 | msgstr "" |
| 4251 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4252 | #: builtin/describe.c:435 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4253 | msgid "--long is incompatible with --abbrev=0" |
| 4254 | msgstr "" |
| 4255 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4256 | #: builtin/describe.c:461 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4257 | msgid "No names found, cannot describe anything." |
| 4258 | msgstr "" |
| 4259 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4260 | #: builtin/describe.c:481 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4261 | msgid "--dirty is incompatible with committishes" |
| 4262 | msgstr "" |
| 4263 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 4264 | #: builtin/diff.c:79 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4265 | #, c-format |
| 4266 | msgid "'%s': not a regular file or symlink" |
| 4267 | msgstr "" |
| 4268 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4269 | #: builtin/diff.c:228 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4270 | #, c-format |
| 4271 | msgid "invalid option: %s" |
| 4272 | msgstr "" |
| 4273 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4274 | #: builtin/diff.c:305 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4275 | msgid "Not a git repository" |
| 4276 | msgstr "" |
| 4277 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4278 | #: builtin/diff.c:348 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4279 | #, c-format |
| 4280 | msgid "invalid object '%s' given." |
| 4281 | msgstr "" |
| 4282 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4283 | #: builtin/diff.c:353 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4284 | #, c-format |
| 4285 | msgid "more than %d trees given: '%s'" |
| 4286 | msgstr "" |
| 4287 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4288 | #: builtin/diff.c:363 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4289 | #, c-format |
| 4290 | msgid "more than two blobs given: '%s'" |
| 4291 | msgstr "" |
| 4292 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4293 | #: builtin/diff.c:371 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4294 | #, c-format |
| 4295 | msgid "unhandled object '%s' given." |
| 4296 | msgstr "" |
| 4297 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4298 | #: builtin/fast-export.c:22 |
| 4299 | msgid "git fast-export [rev-list-opts]" |
| 4300 | msgstr "" |
| 4301 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4302 | #: builtin/fast-export.c:658 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4303 | msgid "show progress after <n> objects" |
| 4304 | msgstr "" |
| 4305 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4306 | #: builtin/fast-export.c:660 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4307 | msgid "select handling of signed tags" |
| 4308 | msgstr "" |
| 4309 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4310 | #: builtin/fast-export.c:663 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4311 | msgid "select handling of tags that tag filtered objects" |
| 4312 | msgstr "" |
| 4313 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4314 | #: builtin/fast-export.c:666 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4315 | msgid "Dump marks to this file" |
| 4316 | msgstr "" |
| 4317 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4318 | #: builtin/fast-export.c:668 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4319 | msgid "Import marks from this file" |
| 4320 | msgstr "" |
| 4321 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4322 | #: builtin/fast-export.c:670 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4323 | msgid "Fake a tagger when tags lack one" |
| 4324 | msgstr "" |
| 4325 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4326 | #: builtin/fast-export.c:672 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4327 | msgid "Output full tree for each commit" |
| 4328 | msgstr "" |
| 4329 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4330 | #: builtin/fast-export.c:674 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4331 | msgid "Use the done feature to terminate the stream" |
| 4332 | msgstr "" |
| 4333 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4334 | #: builtin/fast-export.c:675 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4335 | msgid "Skip output of blob data" |
| 4336 | msgstr "" |
| 4337 | |
| 4338 | #: builtin/fetch.c:20 |
| 4339 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
| 4340 | msgstr "" |
| 4341 | |
| 4342 | #: builtin/fetch.c:21 |
| 4343 | msgid "git fetch [<options>] <group>" |
| 4344 | msgstr "" |
| 4345 | |
| 4346 | #: builtin/fetch.c:22 |
| 4347 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
| 4348 | msgstr "" |
| 4349 | |
| 4350 | #: builtin/fetch.c:23 |
| 4351 | msgid "git fetch --all [<options>]" |
| 4352 | msgstr "" |
| 4353 | |
| 4354 | #: builtin/fetch.c:60 |
| 4355 | msgid "fetch from all remotes" |
| 4356 | msgstr "" |
| 4357 | |
| 4358 | #: builtin/fetch.c:62 |
| 4359 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
| 4360 | msgstr "" |
| 4361 | |
| 4362 | #: builtin/fetch.c:64 |
| 4363 | msgid "path to upload pack on remote end" |
| 4364 | msgstr "" |
| 4365 | |
| 4366 | #: builtin/fetch.c:65 |
| 4367 | msgid "force overwrite of local branch" |
| 4368 | msgstr "" |
| 4369 | |
| 4370 | #: builtin/fetch.c:67 |
| 4371 | msgid "fetch from multiple remotes" |
| 4372 | msgstr "" |
| 4373 | |
| 4374 | #: builtin/fetch.c:69 |
| 4375 | msgid "fetch all tags and associated objects" |
| 4376 | msgstr "" |
| 4377 | |
| 4378 | #: builtin/fetch.c:71 |
| 4379 | msgid "do not fetch all tags (--no-tags)" |
| 4380 | msgstr "" |
| 4381 | |
| 4382 | #: builtin/fetch.c:73 |
| 4383 | msgid "prune remote-tracking branches no longer on remote" |
| 4384 | msgstr "" |
| 4385 | |
| 4386 | #: builtin/fetch.c:74 |
| 4387 | msgid "on-demand" |
| 4388 | msgstr "" |
| 4389 | |
| 4390 | #: builtin/fetch.c:75 |
| 4391 | msgid "control recursive fetching of submodules" |
| 4392 | msgstr "" |
| 4393 | |
| 4394 | #: builtin/fetch.c:79 |
| 4395 | msgid "keep downloaded pack" |
| 4396 | msgstr "" |
| 4397 | |
| 4398 | #: builtin/fetch.c:81 |
| 4399 | msgid "allow updating of HEAD ref" |
| 4400 | msgstr "" |
| 4401 | |
| 4402 | #: builtin/fetch.c:84 |
| 4403 | msgid "deepen history of shallow clone" |
| 4404 | msgstr "" |
| 4405 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4406 | #: builtin/fetch.c:86 |
| 4407 | msgid "convert to a complete repository" |
| 4408 | msgstr "" |
| 4409 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4410 | #: builtin/fetch.c:88 builtin/log.c:1130 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4411 | msgid "dir" |
| 4412 | msgstr "" |
| 4413 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4414 | #: builtin/fetch.c:89 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4415 | msgid "prepend this to submodule path output" |
| 4416 | msgstr "" |
| 4417 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4418 | #: builtin/fetch.c:92 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4419 | msgid "default mode for recursion" |
| 4420 | msgstr "" |
| 4421 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4422 | #: builtin/fetch.c:204 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4423 | msgid "Couldn't find remote ref HEAD" |
| 4424 | msgstr "" |
| 4425 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4426 | #: builtin/fetch.c:257 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4427 | #, c-format |
| 4428 | msgid "object %s not found" |
| 4429 | msgstr "" |
| 4430 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4431 | #: builtin/fetch.c:262 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4432 | msgid "[up to date]" |
| 4433 | msgstr "" |
| 4434 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4435 | #: builtin/fetch.c:276 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4436 | #, c-format |
| 4437 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" |
| 4438 | msgstr "" |
| 4439 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4440 | #: builtin/fetch.c:277 builtin/fetch.c:363 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4441 | msgid "[rejected]" |
| 4442 | msgstr "" |
| 4443 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4444 | #: builtin/fetch.c:288 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4445 | msgid "[tag update]" |
| 4446 | msgstr "" |
| 4447 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4448 | #: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4449 | msgid " (unable to update local ref)" |
| 4450 | msgstr "" |
| 4451 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4452 | #: builtin/fetch.c:308 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4453 | msgid "[new tag]" |
| 4454 | msgstr "" |
| 4455 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4456 | #: builtin/fetch.c:311 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4457 | msgid "[new branch]" |
| 4458 | msgstr "" |
| 4459 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4460 | #: builtin/fetch.c:314 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 4461 | msgid "[new ref]" |
| 4462 | msgstr "" |
| 4463 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4464 | #: builtin/fetch.c:359 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4465 | msgid "unable to update local ref" |
| 4466 | msgstr "" |
| 4467 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4468 | #: builtin/fetch.c:359 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4469 | msgid "forced update" |
| 4470 | msgstr "" |
| 4471 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4472 | #: builtin/fetch.c:365 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4473 | msgid "(non-fast-forward)" |
| 4474 | msgstr "" |
| 4475 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4476 | #: builtin/fetch.c:396 builtin/fetch.c:688 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4477 | #, c-format |
| 4478 | msgid "cannot open %s: %s\n" |
| 4479 | msgstr "" |
| 4480 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4481 | #: builtin/fetch.c:405 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4482 | #, c-format |
| 4483 | msgid "%s did not send all necessary objects\n" |
| 4484 | msgstr "" |
| 4485 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4486 | #: builtin/fetch.c:491 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4487 | #, c-format |
| 4488 | msgid "From %.*s\n" |
| 4489 | msgstr "" |
| 4490 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4491 | #: builtin/fetch.c:502 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4492 | #, c-format |
| 4493 | msgid "" |
| 4494 | "some local refs could not be updated; try running\n" |
| 4495 | " 'git remote prune %s' to remove any old, conflicting branches" |
| 4496 | msgstr "" |
| 4497 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4498 | #: builtin/fetch.c:552 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4499 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 4500 | msgid " (%s will become dangling)" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4501 | msgstr "" |
| 4502 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4503 | #: builtin/fetch.c:553 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4504 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 4505 | msgid " (%s has become dangling)" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4506 | msgstr "" |
| 4507 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4508 | #: builtin/fetch.c:560 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4509 | msgid "[deleted]" |
| 4510 | msgstr "" |
| 4511 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4512 | #: builtin/fetch.c:561 builtin/remote.c:1055 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4513 | msgid "(none)" |
| 4514 | msgstr "" |
| 4515 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4516 | #: builtin/fetch.c:678 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4517 | #, c-format |
| 4518 | msgid "Refusing to fetch into current branch %s of non-bare repository" |
| 4519 | msgstr "" |
| 4520 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4521 | #: builtin/fetch.c:712 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4522 | #, c-format |
| 4523 | msgid "Don't know how to fetch from %s" |
| 4524 | msgstr "" |
| 4525 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4526 | #: builtin/fetch.c:789 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4527 | #, c-format |
| 4528 | msgid "Option \"%s\" value \"%s\" is not valid for %s" |
| 4529 | msgstr "" |
| 4530 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4531 | #: builtin/fetch.c:792 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4532 | #, c-format |
| 4533 | msgid "Option \"%s\" is ignored for %s\n" |
| 4534 | msgstr "" |
| 4535 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4536 | #: builtin/fetch.c:894 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4537 | #, c-format |
| 4538 | msgid "Fetching %s\n" |
| 4539 | msgstr "" |
| 4540 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4541 | #: builtin/fetch.c:896 builtin/remote.c:100 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4542 | #, c-format |
| 4543 | msgid "Could not fetch %s" |
| 4544 | msgstr "" |
| 4545 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4546 | #: builtin/fetch.c:915 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4547 | msgid "" |
| 4548 | "No remote repository specified. Please, specify either a URL or a\n" |
| 4549 | "remote name from which new revisions should be fetched." |
| 4550 | msgstr "" |
| 4551 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4552 | #: builtin/fetch.c:935 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4553 | msgid "You need to specify a tag name." |
| 4554 | msgstr "" |
| 4555 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4556 | #: builtin/fetch.c:981 |
| 4557 | msgid "--depth and --unshallow cannot be used together" |
| 4558 | msgstr "" |
| 4559 | |
| 4560 | #: builtin/fetch.c:983 |
| 4561 | msgid "--unshallow on a complete repository does not make sense" |
| 4562 | msgstr "" |
| 4563 | |
| 4564 | #: builtin/fetch.c:1002 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4565 | msgid "fetch --all does not take a repository argument" |
| 4566 | msgstr "" |
| 4567 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4568 | #: builtin/fetch.c:1004 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4569 | msgid "fetch --all does not make sense with refspecs" |
| 4570 | msgstr "" |
| 4571 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4572 | #: builtin/fetch.c:1015 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4573 | #, c-format |
| 4574 | msgid "No such remote or remote group: %s" |
| 4575 | msgstr "" |
| 4576 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4577 | #: builtin/fetch.c:1023 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4578 | msgid "Fetching a group and specifying refspecs does not make sense" |
| 4579 | msgstr "" |
| 4580 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4581 | #: builtin/fmt-merge-msg.c:13 |
| 4582 | msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" |
| 4583 | msgstr "" |
| 4584 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4585 | #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 |
| 4586 | #: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4587 | #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4588 | msgid "n" |
| 4589 | msgstr "" |
| 4590 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4591 | #: builtin/fmt-merge-msg.c:664 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4592 | msgid "populate log with at most <n> entries from shortlog" |
| 4593 | msgstr "" |
| 4594 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4595 | #: builtin/fmt-merge-msg.c:667 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4596 | msgid "alias for --log (deprecated)" |
| 4597 | msgstr "" |
| 4598 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4599 | #: builtin/fmt-merge-msg.c:670 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4600 | msgid "text" |
| 4601 | msgstr "" |
| 4602 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4603 | #: builtin/fmt-merge-msg.c:671 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4604 | msgid "use <text> as start of message" |
| 4605 | msgstr "" |
| 4606 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4607 | #: builtin/fmt-merge-msg.c:672 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4608 | msgid "file to read from" |
| 4609 | msgstr "" |
| 4610 | |
| 4611 | #: builtin/for-each-ref.c:979 |
| 4612 | msgid "git for-each-ref [options] [<pattern>]" |
| 4613 | msgstr "" |
| 4614 | |
| 4615 | #: builtin/for-each-ref.c:994 |
| 4616 | msgid "quote placeholders suitably for shells" |
| 4617 | msgstr "" |
| 4618 | |
| 4619 | #: builtin/for-each-ref.c:996 |
| 4620 | msgid "quote placeholders suitably for perl" |
| 4621 | msgstr "" |
| 4622 | |
| 4623 | #: builtin/for-each-ref.c:998 |
| 4624 | msgid "quote placeholders suitably for python" |
| 4625 | msgstr "" |
| 4626 | |
| 4627 | #: builtin/for-each-ref.c:1000 |
| 4628 | msgid "quote placeholders suitably for tcl" |
| 4629 | msgstr "" |
| 4630 | |
| 4631 | #: builtin/for-each-ref.c:1003 |
| 4632 | msgid "show only <n> matched refs" |
| 4633 | msgstr "" |
| 4634 | |
| 4635 | #: builtin/for-each-ref.c:1004 |
| 4636 | msgid "format" |
| 4637 | msgstr "" |
| 4638 | |
| 4639 | #: builtin/for-each-ref.c:1004 |
| 4640 | msgid "format to use for the output" |
| 4641 | msgstr "" |
| 4642 | |
| 4643 | #: builtin/for-each-ref.c:1005 |
| 4644 | msgid "key" |
| 4645 | msgstr "" |
| 4646 | |
| 4647 | #: builtin/for-each-ref.c:1006 |
| 4648 | msgid "field name to sort on" |
| 4649 | msgstr "" |
| 4650 | |
| 4651 | #: builtin/fsck.c:608 |
| 4652 | msgid "git fsck [options] [<object>...]" |
| 4653 | msgstr "" |
| 4654 | |
| 4655 | #: builtin/fsck.c:614 |
| 4656 | msgid "show unreachable objects" |
| 4657 | msgstr "" |
| 4658 | |
| 4659 | #: builtin/fsck.c:615 |
| 4660 | msgid "show dangling objects" |
| 4661 | msgstr "" |
| 4662 | |
| 4663 | #: builtin/fsck.c:616 |
| 4664 | msgid "report tags" |
| 4665 | msgstr "" |
| 4666 | |
| 4667 | #: builtin/fsck.c:617 |
| 4668 | msgid "report root nodes" |
| 4669 | msgstr "" |
| 4670 | |
| 4671 | #: builtin/fsck.c:618 |
| 4672 | msgid "make index objects head nodes" |
| 4673 | msgstr "" |
| 4674 | |
| 4675 | #: builtin/fsck.c:619 |
| 4676 | msgid "make reflogs head nodes (default)" |
| 4677 | msgstr "" |
| 4678 | |
| 4679 | #: builtin/fsck.c:620 |
| 4680 | msgid "also consider packs and alternate objects" |
| 4681 | msgstr "" |
| 4682 | |
| 4683 | #: builtin/fsck.c:621 |
| 4684 | msgid "enable more strict checking" |
| 4685 | msgstr "" |
| 4686 | |
| 4687 | #: builtin/fsck.c:623 |
| 4688 | msgid "write dangling objects in .git/lost-found" |
| 4689 | msgstr "" |
| 4690 | |
| 4691 | #: builtin/fsck.c:624 builtin/prune.c:134 |
| 4692 | msgid "show progress" |
| 4693 | msgstr "" |
| 4694 | |
| 4695 | #: builtin/gc.c:22 |
| 4696 | msgid "git gc [options]" |
| 4697 | msgstr "" |
| 4698 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4699 | #: builtin/gc.c:63 |
| 4700 | #, c-format |
| 4701 | msgid "Invalid %s: '%s'" |
| 4702 | msgstr "" |
| 4703 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 4704 | #: builtin/gc.c:90 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4705 | #, c-format |
| 4706 | msgid "insanely long object directory %.*s" |
| 4707 | msgstr "" |
| 4708 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4709 | #: builtin/gc.c:179 |
| 4710 | msgid "prune unreferenced objects" |
| 4711 | msgstr "" |
| 4712 | |
| 4713 | #: builtin/gc.c:181 |
| 4714 | msgid "be more thorough (increased runtime)" |
| 4715 | msgstr "" |
| 4716 | |
| 4717 | #: builtin/gc.c:182 |
| 4718 | msgid "enable auto-gc mode" |
| 4719 | msgstr "" |
| 4720 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 4721 | #: builtin/gc.c:222 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4722 | #, c-format |
| 4723 | msgid "" |
| 4724 | "Auto packing the repository for optimum performance. You may also\n" |
| 4725 | "run \"git gc\" manually. See \"git help gc\" for more information.\n" |
| 4726 | msgstr "" |
| 4727 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 4728 | #: builtin/gc.c:249 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4729 | msgid "" |
| 4730 | "There are too many unreachable loose objects; run 'git prune' to remove them." |
| 4731 | msgstr "" |
| 4732 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4733 | #: builtin/grep.c:22 |
| 4734 | msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" |
| 4735 | msgstr "" |
| 4736 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 4737 | #: builtin/grep.c:217 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4738 | #, c-format |
| 4739 | msgid "grep: failed to create thread: %s" |
| 4740 | msgstr "" |
| 4741 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4742 | #: builtin/grep.c:365 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4743 | #, c-format |
| 4744 | msgid "Failed to chdir: %s" |
| 4745 | msgstr "" |
| 4746 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4747 | #: builtin/grep.c:443 builtin/grep.c:478 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4748 | #, c-format |
| 4749 | msgid "unable to read tree (%s)" |
| 4750 | msgstr "" |
| 4751 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4752 | #: builtin/grep.c:493 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4753 | #, c-format |
| 4754 | msgid "unable to grep from object of type %s" |
| 4755 | msgstr "" |
| 4756 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4757 | #: builtin/grep.c:551 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4758 | #, c-format |
| 4759 | msgid "switch `%c' expects a numerical value" |
| 4760 | msgstr "" |
| 4761 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4762 | #: builtin/grep.c:568 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4763 | #, c-format |
| 4764 | msgid "cannot open '%s'" |
| 4765 | msgstr "" |
| 4766 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4767 | #: builtin/grep.c:643 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4768 | msgid "search in index instead of in the work tree" |
| 4769 | msgstr "" |
| 4770 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4771 | #: builtin/grep.c:645 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4772 | msgid "find in contents not managed by git" |
| 4773 | msgstr "" |
| 4774 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4775 | #: builtin/grep.c:647 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4776 | msgid "search in both tracked and untracked files" |
| 4777 | msgstr "" |
| 4778 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4779 | #: builtin/grep.c:649 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4780 | msgid "search also in ignored files" |
| 4781 | msgstr "" |
| 4782 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4783 | #: builtin/grep.c:652 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4784 | msgid "show non-matching lines" |
| 4785 | msgstr "" |
| 4786 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4787 | #: builtin/grep.c:654 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4788 | msgid "case insensitive matching" |
| 4789 | msgstr "" |
| 4790 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4791 | #: builtin/grep.c:656 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4792 | msgid "match patterns only at word boundaries" |
| 4793 | msgstr "" |
| 4794 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4795 | #: builtin/grep.c:658 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4796 | msgid "process binary files as text" |
| 4797 | msgstr "" |
| 4798 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4799 | #: builtin/grep.c:660 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4800 | msgid "don't match patterns in binary files" |
| 4801 | msgstr "" |
| 4802 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4803 | #: builtin/grep.c:663 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4804 | msgid "descend at most <depth> levels" |
| 4805 | msgstr "" |
| 4806 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4807 | #: builtin/grep.c:667 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4808 | msgid "use extended POSIX regular expressions" |
| 4809 | msgstr "" |
| 4810 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4811 | #: builtin/grep.c:670 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4812 | msgid "use basic POSIX regular expressions (default)" |
| 4813 | msgstr "" |
| 4814 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4815 | #: builtin/grep.c:673 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4816 | msgid "interpret patterns as fixed strings" |
| 4817 | msgstr "" |
| 4818 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4819 | #: builtin/grep.c:676 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4820 | msgid "use Perl-compatible regular expressions" |
| 4821 | msgstr "" |
| 4822 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4823 | #: builtin/grep.c:679 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4824 | msgid "show line numbers" |
| 4825 | msgstr "" |
| 4826 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4827 | #: builtin/grep.c:680 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4828 | msgid "don't show filenames" |
| 4829 | msgstr "" |
| 4830 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4831 | #: builtin/grep.c:681 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4832 | msgid "show filenames" |
| 4833 | msgstr "" |
| 4834 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4835 | #: builtin/grep.c:683 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4836 | msgid "show filenames relative to top directory" |
| 4837 | msgstr "" |
| 4838 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4839 | #: builtin/grep.c:685 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4840 | msgid "show only filenames instead of matching lines" |
| 4841 | msgstr "" |
| 4842 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4843 | #: builtin/grep.c:687 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4844 | msgid "synonym for --files-with-matches" |
| 4845 | msgstr "" |
| 4846 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4847 | #: builtin/grep.c:690 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4848 | msgid "show only the names of files without match" |
| 4849 | msgstr "" |
| 4850 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4851 | #: builtin/grep.c:692 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4852 | msgid "print NUL after filenames" |
| 4853 | msgstr "" |
| 4854 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4855 | #: builtin/grep.c:694 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4856 | msgid "show the number of matches instead of matching lines" |
| 4857 | msgstr "" |
| 4858 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4859 | #: builtin/grep.c:695 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4860 | msgid "highlight matches" |
| 4861 | msgstr "" |
| 4862 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4863 | #: builtin/grep.c:697 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4864 | msgid "print empty line between matches from different files" |
| 4865 | msgstr "" |
| 4866 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4867 | #: builtin/grep.c:699 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4868 | msgid "show filename only once above matches from same file" |
| 4869 | msgstr "" |
| 4870 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4871 | #: builtin/grep.c:702 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4872 | msgid "show <n> context lines before and after matches" |
| 4873 | msgstr "" |
| 4874 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4875 | #: builtin/grep.c:705 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4876 | msgid "show <n> context lines before matches" |
| 4877 | msgstr "" |
| 4878 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4879 | #: builtin/grep.c:707 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4880 | msgid "show <n> context lines after matches" |
| 4881 | msgstr "" |
| 4882 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4883 | #: builtin/grep.c:708 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4884 | msgid "shortcut for -C NUM" |
| 4885 | msgstr "" |
| 4886 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4887 | #: builtin/grep.c:711 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4888 | msgid "show a line with the function name before matches" |
| 4889 | msgstr "" |
| 4890 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4891 | #: builtin/grep.c:713 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4892 | msgid "show the surrounding function" |
| 4893 | msgstr "" |
| 4894 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4895 | #: builtin/grep.c:716 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4896 | msgid "read patterns from file" |
| 4897 | msgstr "" |
| 4898 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4899 | #: builtin/grep.c:718 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4900 | msgid "match <pattern>" |
| 4901 | msgstr "" |
| 4902 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4903 | #: builtin/grep.c:720 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4904 | msgid "combine patterns specified with -e" |
| 4905 | msgstr "" |
| 4906 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4907 | #: builtin/grep.c:732 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4908 | msgid "indicate hit with exit status without output" |
| 4909 | msgstr "" |
| 4910 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4911 | #: builtin/grep.c:734 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4912 | msgid "show only matches from files that match all patterns" |
| 4913 | msgstr "" |
| 4914 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4915 | #: builtin/grep.c:736 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 4916 | msgid "show parse tree for grep expression" |
| 4917 | msgstr "" |
| 4918 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4919 | #: builtin/grep.c:740 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4920 | msgid "pager" |
| 4921 | msgstr "" |
| 4922 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4923 | #: builtin/grep.c:740 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4924 | msgid "show matching files in the pager" |
| 4925 | msgstr "" |
| 4926 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4927 | #: builtin/grep.c:743 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4928 | msgid "allow calling of grep(1) (ignored by this build)" |
| 4929 | msgstr "" |
| 4930 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4931 | #: builtin/grep.c:744 builtin/show-ref.c:184 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4932 | msgid "show usage" |
| 4933 | msgstr "" |
| 4934 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4935 | #: builtin/grep.c:811 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4936 | msgid "no pattern given." |
| 4937 | msgstr "" |
| 4938 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4939 | #: builtin/grep.c:866 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4940 | msgid "--open-files-in-pager only works on the worktree" |
| 4941 | msgstr "" |
| 4942 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4943 | #: builtin/grep.c:889 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4944 | msgid "--cached or --untracked cannot be used with --no-index." |
| 4945 | msgstr "" |
| 4946 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4947 | #: builtin/grep.c:894 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4948 | msgid "--no-index or --untracked cannot be used with revs." |
| 4949 | msgstr "" |
| 4950 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4951 | #: builtin/grep.c:897 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4952 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
| 4953 | msgstr "" |
| 4954 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4955 | #: builtin/grep.c:905 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4956 | msgid "both --cached and trees are given." |
| 4957 | msgstr "" |
| 4958 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4959 | #: builtin/hash-object.c:60 |
| 4960 | msgid "" |
| 4961 | "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " |
| 4962 | "<file>..." |
| 4963 | msgstr "" |
| 4964 | |
| 4965 | #: builtin/hash-object.c:61 |
| 4966 | msgid "git hash-object --stdin-paths < <list-of-paths>" |
| 4967 | msgstr "" |
| 4968 | |
| 4969 | #: builtin/hash-object.c:72 |
| 4970 | msgid "type" |
| 4971 | msgstr "" |
| 4972 | |
| 4973 | #: builtin/hash-object.c:72 |
| 4974 | msgid "object type" |
| 4975 | msgstr "" |
| 4976 | |
| 4977 | #: builtin/hash-object.c:73 |
| 4978 | msgid "write the object into the object database" |
| 4979 | msgstr "" |
| 4980 | |
| 4981 | #: builtin/hash-object.c:74 |
| 4982 | msgid "read the object from stdin" |
| 4983 | msgstr "" |
| 4984 | |
| 4985 | #: builtin/hash-object.c:76 |
| 4986 | msgid "store file as is without filters" |
| 4987 | msgstr "" |
| 4988 | |
| 4989 | #: builtin/hash-object.c:77 |
| 4990 | msgid "process file as it were from this path" |
| 4991 | msgstr "" |
| 4992 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4993 | #: builtin/help.c:43 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4994 | msgid "print all available commands" |
| 4995 | msgstr "" |
| 4996 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4997 | #: builtin/help.c:44 |
| 4998 | msgid "print list of useful guides" |
| 4999 | msgstr "" |
| 5000 | |
| 5001 | #: builtin/help.c:45 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5002 | msgid "show man page" |
| 5003 | msgstr "" |
| 5004 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5005 | #: builtin/help.c:46 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5006 | msgid "show manual in web browser" |
| 5007 | msgstr "" |
| 5008 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5009 | #: builtin/help.c:48 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5010 | msgid "show info page" |
| 5011 | msgstr "" |
| 5012 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5013 | #: builtin/help.c:54 |
| 5014 | msgid "git help [--all] [--guides] [--man|--web|--info] [command]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5015 | msgstr "" |
| 5016 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5017 | #: builtin/help.c:66 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5018 | #, c-format |
| 5019 | msgid "unrecognized help format '%s'" |
| 5020 | msgstr "" |
| 5021 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5022 | #: builtin/help.c:94 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5023 | msgid "Failed to start emacsclient." |
| 5024 | msgstr "" |
| 5025 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5026 | #: builtin/help.c:107 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5027 | msgid "Failed to parse emacsclient version." |
| 5028 | msgstr "" |
| 5029 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5030 | #: builtin/help.c:115 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5031 | #, c-format |
| 5032 | msgid "emacsclient version '%d' too old (< 22)." |
| 5033 | msgstr "" |
| 5034 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5035 | #: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5036 | #, c-format |
| 5037 | msgid "failed to exec '%s': %s" |
| 5038 | msgstr "" |
| 5039 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5040 | #: builtin/help.c:218 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5041 | #, c-format |
| 5042 | msgid "" |
| 5043 | "'%s': path for unsupported man viewer.\n" |
| 5044 | "Please consider using 'man.<tool>.cmd' instead." |
| 5045 | msgstr "" |
| 5046 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5047 | #: builtin/help.c:230 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5048 | #, c-format |
| 5049 | msgid "" |
| 5050 | "'%s': cmd for supported man viewer.\n" |
| 5051 | "Please consider using 'man.<tool>.path' instead." |
| 5052 | msgstr "" |
| 5053 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5054 | #: builtin/help.c:351 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5055 | #, c-format |
| 5056 | msgid "'%s': unknown man viewer." |
| 5057 | msgstr "" |
| 5058 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5059 | #: builtin/help.c:368 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5060 | msgid "no man viewer handled the request" |
| 5061 | msgstr "" |
| 5062 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5063 | #: builtin/help.c:376 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5064 | msgid "no info viewer handled the request" |
| 5065 | msgstr "" |
| 5066 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5067 | #: builtin/help.c:422 |
| 5068 | msgid "Defining attributes per path" |
| 5069 | msgstr "" |
| 5070 | |
| 5071 | #: builtin/help.c:423 |
| 5072 | msgid "A Git glossary" |
| 5073 | msgstr "" |
| 5074 | |
| 5075 | #: builtin/help.c:424 |
| 5076 | msgid "Specifies intentionally untracked files to ignore" |
| 5077 | msgstr "" |
| 5078 | |
| 5079 | #: builtin/help.c:425 |
| 5080 | msgid "Defining submodule properties" |
| 5081 | msgstr "" |
| 5082 | |
| 5083 | #: builtin/help.c:426 |
| 5084 | msgid "Specifying revisions and ranges for Git" |
| 5085 | msgstr "" |
| 5086 | |
| 5087 | #: builtin/help.c:427 |
| 5088 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
| 5089 | msgstr "" |
| 5090 | |
| 5091 | #: builtin/help.c:428 |
| 5092 | msgid "An overview of recommended workflows with Git" |
| 5093 | msgstr "" |
| 5094 | |
| 5095 | #: builtin/help.c:440 |
| 5096 | msgid "The common Git guides are:\n" |
| 5097 | msgstr "" |
| 5098 | |
| 5099 | #: builtin/help.c:462 builtin/help.c:478 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5100 | #, c-format |
| 5101 | msgid "usage: %s%s" |
| 5102 | msgstr "" |
| 5103 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5104 | #: builtin/help.c:494 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5105 | #, c-format |
| 5106 | msgid "`git %s' is aliased to `%s'" |
| 5107 | msgstr "" |
| 5108 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5109 | #: builtin/index-pack.c:182 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5110 | #, c-format |
| 5111 | msgid "object type mismatch at %s" |
| 5112 | msgstr "" |
| 5113 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5114 | #: builtin/index-pack.c:202 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5115 | msgid "object of unexpected type" |
| 5116 | msgstr "" |
| 5117 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5118 | #: builtin/index-pack.c:239 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5119 | #, c-format |
| 5120 | msgid "cannot fill %d byte" |
| 5121 | msgid_plural "cannot fill %d bytes" |
| 5122 | msgstr[0] "" |
| 5123 | msgstr[1] "" |
| 5124 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5125 | #: builtin/index-pack.c:249 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5126 | msgid "early EOF" |
| 5127 | msgstr "" |
| 5128 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5129 | #: builtin/index-pack.c:250 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5130 | msgid "read error on input" |
| 5131 | msgstr "" |
| 5132 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5133 | #: builtin/index-pack.c:262 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5134 | msgid "used more bytes than were available" |
| 5135 | msgstr "" |
| 5136 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5137 | #: builtin/index-pack.c:269 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5138 | msgid "pack too large for current definition of off_t" |
| 5139 | msgstr "" |
| 5140 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5141 | #: builtin/index-pack.c:285 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5142 | #, c-format |
| 5143 | msgid "unable to create '%s'" |
| 5144 | msgstr "" |
| 5145 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5146 | #: builtin/index-pack.c:290 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5147 | #, c-format |
| 5148 | msgid "cannot open packfile '%s'" |
| 5149 | msgstr "" |
| 5150 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5151 | #: builtin/index-pack.c:304 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5152 | msgid "pack signature mismatch" |
| 5153 | msgstr "" |
| 5154 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5155 | #: builtin/index-pack.c:306 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5156 | #, c-format |
| 5157 | msgid "pack version %<PRIu32> unsupported" |
| 5158 | msgstr "" |
| 5159 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5160 | #: builtin/index-pack.c:324 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5161 | #, c-format |
| 5162 | msgid "pack has bad object at offset %lu: %s" |
| 5163 | msgstr "" |
| 5164 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5165 | #: builtin/index-pack.c:446 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5166 | #, c-format |
| 5167 | msgid "inflate returned %d" |
| 5168 | msgstr "" |
| 5169 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5170 | #: builtin/index-pack.c:495 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5171 | msgid "offset value overflow for delta base object" |
| 5172 | msgstr "" |
| 5173 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5174 | #: builtin/index-pack.c:503 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5175 | msgid "delta base offset is out of bound" |
| 5176 | msgstr "" |
| 5177 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5178 | #: builtin/index-pack.c:511 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5179 | #, c-format |
| 5180 | msgid "unknown object type %d" |
| 5181 | msgstr "" |
| 5182 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5183 | #: builtin/index-pack.c:542 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5184 | msgid "cannot pread pack file" |
| 5185 | msgstr "" |
| 5186 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5187 | #: builtin/index-pack.c:544 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5188 | #, c-format |
| 5189 | msgid "premature end of pack file, %lu byte missing" |
| 5190 | msgid_plural "premature end of pack file, %lu bytes missing" |
| 5191 | msgstr[0] "" |
| 5192 | msgstr[1] "" |
| 5193 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5194 | #: builtin/index-pack.c:570 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5195 | msgid "serious inflate inconsistency" |
| 5196 | msgstr "" |
| 5197 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5198 | #: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 |
| 5199 | #: builtin/index-pack.c:724 builtin/index-pack.c:733 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5200 | #, c-format |
| 5201 | msgid "SHA1 COLLISION FOUND WITH %s !" |
| 5202 | msgstr "" |
| 5203 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5204 | #: builtin/index-pack.c:664 builtin/pack-objects.c:170 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 5205 | #: builtin/pack-objects.c:262 |
| 5206 | #, c-format |
| 5207 | msgid "unable to read %s" |
| 5208 | msgstr "" |
| 5209 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5210 | #: builtin/index-pack.c:730 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 5211 | #, c-format |
| 5212 | msgid "cannot read existing object %s" |
| 5213 | msgstr "" |
| 5214 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5215 | #: builtin/index-pack.c:744 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5216 | #, c-format |
| 5217 | msgid "invalid blob object %s" |
| 5218 | msgstr "" |
| 5219 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5220 | #: builtin/index-pack.c:759 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5221 | #, c-format |
| 5222 | msgid "invalid %s" |
| 5223 | msgstr "" |
| 5224 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5225 | #: builtin/index-pack.c:761 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5226 | msgid "Error in object" |
| 5227 | msgstr "" |
| 5228 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5229 | #: builtin/index-pack.c:763 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5230 | #, c-format |
| 5231 | msgid "Not all child objects of %s are reachable" |
| 5232 | msgstr "" |
| 5233 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5234 | #: builtin/index-pack.c:833 builtin/index-pack.c:863 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5235 | msgid "failed to apply delta" |
| 5236 | msgstr "" |
| 5237 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5238 | #: builtin/index-pack.c:1004 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5239 | msgid "Receiving objects" |
| 5240 | msgstr "" |
| 5241 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5242 | #: builtin/index-pack.c:1004 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5243 | msgid "Indexing objects" |
| 5244 | msgstr "" |
| 5245 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5246 | #: builtin/index-pack.c:1030 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5247 | msgid "pack is corrupted (SHA1 mismatch)" |
| 5248 | msgstr "" |
| 5249 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5250 | #: builtin/index-pack.c:1035 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5251 | msgid "cannot fstat packfile" |
| 5252 | msgstr "" |
| 5253 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5254 | #: builtin/index-pack.c:1038 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5255 | msgid "pack has junk at the end" |
| 5256 | msgstr "" |
| 5257 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5258 | #: builtin/index-pack.c:1049 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 5259 | msgid "confusion beyond insanity in parse_pack_objects()" |
| 5260 | msgstr "" |
| 5261 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5262 | #: builtin/index-pack.c:1072 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5263 | msgid "Resolving deltas" |
| 5264 | msgstr "" |
| 5265 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5266 | #: builtin/index-pack.c:1082 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5267 | #, c-format |
| 5268 | msgid "unable to create thread: %s" |
| 5269 | msgstr "" |
| 5270 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5271 | #: builtin/index-pack.c:1124 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 5272 | msgid "confusion beyond insanity" |
| 5273 | msgstr "" |
| 5274 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5275 | #: builtin/index-pack.c:1132 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5276 | #, c-format |
| 5277 | msgid "completed with %d local objects" |
| 5278 | msgstr "" |
| 5279 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5280 | #: builtin/index-pack.c:1142 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5281 | #, c-format |
| 5282 | msgid "Unexpected tail checksum for %s (disk corruption?)" |
| 5283 | msgstr "" |
| 5284 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5285 | #: builtin/index-pack.c:1146 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 5286 | #, c-format |
| 5287 | msgid "pack has %d unresolved delta" |
| 5288 | msgid_plural "pack has %d unresolved deltas" |
| 5289 | msgstr[0] "" |
| 5290 | msgstr[1] "" |
| 5291 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5292 | #: builtin/index-pack.c:1171 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5293 | #, c-format |
| 5294 | msgid "unable to deflate appended object (%d)" |
| 5295 | msgstr "" |
| 5296 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5297 | #: builtin/index-pack.c:1250 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5298 | #, c-format |
| 5299 | msgid "local object %s is corrupt" |
| 5300 | msgstr "" |
| 5301 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5302 | #: builtin/index-pack.c:1274 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5303 | msgid "error while closing pack file" |
| 5304 | msgstr "" |
| 5305 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5306 | #: builtin/index-pack.c:1287 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5307 | #, c-format |
| 5308 | msgid "cannot write keep file '%s'" |
| 5309 | msgstr "" |
| 5310 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5311 | #: builtin/index-pack.c:1295 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5312 | #, c-format |
| 5313 | msgid "cannot close written keep file '%s'" |
| 5314 | msgstr "" |
| 5315 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5316 | #: builtin/index-pack.c:1308 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5317 | msgid "cannot store pack file" |
| 5318 | msgstr "" |
| 5319 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5320 | #: builtin/index-pack.c:1319 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5321 | msgid "cannot store index file" |
| 5322 | msgstr "" |
| 5323 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5324 | #: builtin/index-pack.c:1352 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5325 | #, c-format |
| 5326 | msgid "bad pack.indexversion=%<PRIu32>" |
| 5327 | msgstr "" |
| 5328 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5329 | #: builtin/index-pack.c:1358 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5330 | #, c-format |
| 5331 | msgid "invalid number of threads specified (%d)" |
| 5332 | msgstr "" |
| 5333 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5334 | #: builtin/index-pack.c:1362 builtin/index-pack.c:1535 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5335 | #, c-format |
| 5336 | msgid "no threads support, ignoring %s" |
| 5337 | msgstr "" |
| 5338 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5339 | #: builtin/index-pack.c:1420 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5340 | #, c-format |
| 5341 | msgid "Cannot open existing pack file '%s'" |
| 5342 | msgstr "" |
| 5343 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5344 | #: builtin/index-pack.c:1422 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5345 | #, c-format |
| 5346 | msgid "Cannot open existing pack idx file for '%s'" |
| 5347 | msgstr "" |
| 5348 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5349 | #: builtin/index-pack.c:1469 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5350 | #, c-format |
| 5351 | msgid "non delta: %d object" |
| 5352 | msgid_plural "non delta: %d objects" |
| 5353 | msgstr[0] "" |
| 5354 | msgstr[1] "" |
| 5355 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5356 | #: builtin/index-pack.c:1476 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5357 | #, c-format |
| 5358 | msgid "chain length = %d: %lu object" |
| 5359 | msgid_plural "chain length = %d: %lu objects" |
| 5360 | msgstr[0] "" |
| 5361 | msgstr[1] "" |
| 5362 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5363 | #: builtin/index-pack.c:1503 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5364 | msgid "Cannot come back to cwd" |
| 5365 | msgstr "" |
| 5366 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5367 | #: builtin/index-pack.c:1547 builtin/index-pack.c:1550 |
| 5368 | #: builtin/index-pack.c:1562 builtin/index-pack.c:1566 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5369 | #, c-format |
| 5370 | msgid "bad %s" |
| 5371 | msgstr "" |
| 5372 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5373 | #: builtin/index-pack.c:1580 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5374 | msgid "--fix-thin cannot be used without --stdin" |
| 5375 | msgstr "" |
| 5376 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5377 | #: builtin/index-pack.c:1584 builtin/index-pack.c:1594 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5378 | #, c-format |
| 5379 | msgid "packfile name '%s' does not end with '.pack'" |
| 5380 | msgstr "" |
| 5381 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5382 | #: builtin/index-pack.c:1603 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5383 | msgid "--verify with no packfile name given" |
| 5384 | msgstr "" |
| 5385 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5386 | #: builtin/init-db.c:35 |
| 5387 | #, c-format |
| 5388 | msgid "Could not make %s writable by group" |
| 5389 | msgstr "" |
| 5390 | |
| 5391 | #: builtin/init-db.c:62 |
| 5392 | #, c-format |
| 5393 | msgid "insanely long template name %s" |
| 5394 | msgstr "" |
| 5395 | |
| 5396 | #: builtin/init-db.c:67 |
| 5397 | #, c-format |
| 5398 | msgid "cannot stat '%s'" |
| 5399 | msgstr "" |
| 5400 | |
| 5401 | #: builtin/init-db.c:73 |
| 5402 | #, c-format |
| 5403 | msgid "cannot stat template '%s'" |
| 5404 | msgstr "" |
| 5405 | |
| 5406 | #: builtin/init-db.c:80 |
| 5407 | #, c-format |
| 5408 | msgid "cannot opendir '%s'" |
| 5409 | msgstr "" |
| 5410 | |
| 5411 | #: builtin/init-db.c:97 |
| 5412 | #, c-format |
| 5413 | msgid "cannot readlink '%s'" |
| 5414 | msgstr "" |
| 5415 | |
| 5416 | #: builtin/init-db.c:99 |
| 5417 | #, c-format |
| 5418 | msgid "insanely long symlink %s" |
| 5419 | msgstr "" |
| 5420 | |
| 5421 | #: builtin/init-db.c:102 |
| 5422 | #, c-format |
| 5423 | msgid "cannot symlink '%s' '%s'" |
| 5424 | msgstr "" |
| 5425 | |
| 5426 | #: builtin/init-db.c:106 |
| 5427 | #, c-format |
| 5428 | msgid "cannot copy '%s' to '%s'" |
| 5429 | msgstr "" |
| 5430 | |
| 5431 | #: builtin/init-db.c:110 |
| 5432 | #, c-format |
| 5433 | msgid "ignoring template %s" |
| 5434 | msgstr "" |
| 5435 | |
| 5436 | #: builtin/init-db.c:133 |
| 5437 | #, c-format |
| 5438 | msgid "insanely long template path %s" |
| 5439 | msgstr "" |
| 5440 | |
| 5441 | #: builtin/init-db.c:141 |
| 5442 | #, c-format |
| 5443 | msgid "templates not found %s" |
| 5444 | msgstr "" |
| 5445 | |
| 5446 | #: builtin/init-db.c:154 |
| 5447 | #, c-format |
| 5448 | msgid "not copying templates of a wrong format version %d from '%s'" |
| 5449 | msgstr "" |
| 5450 | |
| 5451 | #: builtin/init-db.c:192 |
| 5452 | #, c-format |
| 5453 | msgid "insane git directory %s" |
| 5454 | msgstr "" |
| 5455 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5456 | #: builtin/init-db.c:323 builtin/init-db.c:326 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5457 | #, c-format |
| 5458 | msgid "%s already exists" |
| 5459 | msgstr "" |
| 5460 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5461 | #: builtin/init-db.c:355 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5462 | #, c-format |
| 5463 | msgid "unable to handle file type %d" |
| 5464 | msgstr "" |
| 5465 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5466 | #: builtin/init-db.c:358 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5467 | #, c-format |
| 5468 | msgid "unable to move %s to %s" |
| 5469 | msgstr "" |
| 5470 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5471 | #: builtin/init-db.c:363 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5472 | #, c-format |
| 5473 | msgid "Could not create git link %s" |
| 5474 | msgstr "" |
| 5475 | |
| 5476 | #. |
| 5477 | #. * TRANSLATORS: The first '%s' is either "Reinitialized |
| 5478 | #. * existing" or "Initialized empty", the second " shared" or |
| 5479 | #. * "", and the last '%s%s' is the verbatim directory name. |
| 5480 | #. |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5481 | #: builtin/init-db.c:420 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5482 | #, c-format |
| 5483 | msgid "%s%s Git repository in %s%s\n" |
| 5484 | msgstr "" |
| 5485 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5486 | #: builtin/init-db.c:421 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5487 | msgid "Reinitialized existing" |
| 5488 | msgstr "" |
| 5489 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5490 | #: builtin/init-db.c:421 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5491 | msgid "Initialized empty" |
| 5492 | msgstr "" |
| 5493 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5494 | #: builtin/init-db.c:422 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5495 | msgid " shared" |
| 5496 | msgstr "" |
| 5497 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5498 | #: builtin/init-db.c:441 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5499 | msgid "cannot tell cwd" |
| 5500 | msgstr "" |
| 5501 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5502 | #: builtin/init-db.c:467 |
| 5503 | msgid "" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 5504 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
| 5505 | "shared[=<permissions>]] [directory]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5506 | msgstr "" |
| 5507 | |
| 5508 | #: builtin/init-db.c:490 |
| 5509 | msgid "permissions" |
| 5510 | msgstr "" |
| 5511 | |
| 5512 | #: builtin/init-db.c:491 |
| 5513 | msgid "specify that the git repository is to be shared amongst several users" |
| 5514 | msgstr "" |
| 5515 | |
| 5516 | #: builtin/init-db.c:493 builtin/prune-packed.c:77 |
| 5517 | msgid "be quiet" |
| 5518 | msgstr "" |
| 5519 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5520 | #: builtin/init-db.c:522 builtin/init-db.c:529 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5521 | #, c-format |
| 5522 | msgid "cannot mkdir %s" |
| 5523 | msgstr "" |
| 5524 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5525 | #: builtin/init-db.c:533 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5526 | #, c-format |
| 5527 | msgid "cannot chdir to %s" |
| 5528 | msgstr "" |
| 5529 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5530 | #: builtin/init-db.c:555 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5531 | #, c-format |
| 5532 | msgid "" |
| 5533 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" |
| 5534 | "dir=<directory>)" |
| 5535 | msgstr "" |
| 5536 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5537 | #: builtin/init-db.c:579 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5538 | msgid "Cannot access current working directory" |
| 5539 | msgstr "" |
| 5540 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5541 | #: builtin/init-db.c:586 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5542 | #, c-format |
| 5543 | msgid "Cannot access work tree '%s'" |
| 5544 | msgstr "" |
| 5545 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5546 | #: builtin/log.c:40 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5547 | msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5548 | msgstr "" |
| 5549 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5550 | #: builtin/log.c:41 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5551 | msgid " or: git show [options] <object>..." |
| 5552 | msgstr "" |
| 5553 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5554 | #: builtin/log.c:103 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5555 | msgid "suppress diff output" |
| 5556 | msgstr "" |
| 5557 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5558 | #: builtin/log.c:104 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5559 | msgid "show source" |
| 5560 | msgstr "" |
| 5561 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5562 | #: builtin/log.c:105 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 5563 | msgid "Use mail map file" |
| 5564 | msgstr "" |
| 5565 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5566 | #: builtin/log.c:106 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5567 | msgid "decorate options" |
| 5568 | msgstr "" |
| 5569 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5570 | #: builtin/log.c:199 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5571 | #, c-format |
| 5572 | msgid "Final output: %d %s\n" |
| 5573 | msgstr "" |
| 5574 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5575 | #: builtin/log.c:422 builtin/log.c:514 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5576 | #, c-format |
| 5577 | msgid "Could not read object %s" |
| 5578 | msgstr "" |
| 5579 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5580 | #: builtin/log.c:538 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5581 | #, c-format |
| 5582 | msgid "Unknown type: %d" |
| 5583 | msgstr "" |
| 5584 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5585 | #: builtin/log.c:638 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5586 | msgid "format.headers without value" |
| 5587 | msgstr "" |
| 5588 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5589 | #: builtin/log.c:720 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5590 | msgid "name of output directory is too long" |
| 5591 | msgstr "" |
| 5592 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5593 | #: builtin/log.c:736 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5594 | #, c-format |
| 5595 | msgid "Cannot open patch file %s" |
| 5596 | msgstr "" |
| 5597 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5598 | #: builtin/log.c:750 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5599 | msgid "Need exactly one range." |
| 5600 | msgstr "" |
| 5601 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5602 | #: builtin/log.c:758 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5603 | msgid "Not a range." |
| 5604 | msgstr "" |
| 5605 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5606 | #: builtin/log.c:860 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5607 | msgid "Cover letter needs email format" |
| 5608 | msgstr "" |
| 5609 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5610 | #: builtin/log.c:936 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5611 | #, c-format |
| 5612 | msgid "insane in-reply-to: %s" |
| 5613 | msgstr "" |
| 5614 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5615 | #: builtin/log.c:964 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5616 | msgid "git format-patch [options] [<since> | <revision range>]" |
| 5617 | msgstr "" |
| 5618 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5619 | #: builtin/log.c:1009 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5620 | msgid "Two output directories?" |
| 5621 | msgstr "" |
| 5622 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5623 | #: builtin/log.c:1108 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5624 | msgid "use [PATCH n/m] even with a single patch" |
| 5625 | msgstr "" |
| 5626 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5627 | #: builtin/log.c:1111 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5628 | msgid "use [PATCH] even with multiple patches" |
| 5629 | msgstr "" |
| 5630 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5631 | #: builtin/log.c:1115 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5632 | msgid "print patches to standard out" |
| 5633 | msgstr "" |
| 5634 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5635 | #: builtin/log.c:1117 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5636 | msgid "generate a cover letter" |
| 5637 | msgstr "" |
| 5638 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5639 | #: builtin/log.c:1119 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5640 | msgid "use simple number sequence for output file names" |
| 5641 | msgstr "" |
| 5642 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5643 | #: builtin/log.c:1120 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5644 | msgid "sfx" |
| 5645 | msgstr "" |
| 5646 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5647 | #: builtin/log.c:1121 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5648 | msgid "use <sfx> instead of '.patch'" |
| 5649 | msgstr "" |
| 5650 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5651 | #: builtin/log.c:1123 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5652 | msgid "start numbering patches at <n> instead of 1" |
| 5653 | msgstr "" |
| 5654 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5655 | #: builtin/log.c:1125 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 5656 | msgid "mark the series as Nth re-roll" |
| 5657 | msgstr "" |
| 5658 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5659 | #: builtin/log.c:1127 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5660 | msgid "Use [<prefix>] instead of [PATCH]" |
| 5661 | msgstr "" |
| 5662 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5663 | #: builtin/log.c:1130 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5664 | msgid "store resulting files in <dir>" |
| 5665 | msgstr "" |
| 5666 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5667 | #: builtin/log.c:1133 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5668 | msgid "don't strip/add [PATCH]" |
| 5669 | msgstr "" |
| 5670 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5671 | #: builtin/log.c:1136 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5672 | msgid "don't output binary diffs" |
| 5673 | msgstr "" |
| 5674 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5675 | #: builtin/log.c:1138 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5676 | msgid "don't include a patch matching a commit upstream" |
| 5677 | msgstr "" |
| 5678 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5679 | #: builtin/log.c:1140 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5680 | msgid "show patch format instead of default (patch + stat)" |
| 5681 | msgstr "" |
| 5682 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5683 | #: builtin/log.c:1142 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5684 | msgid "Messaging" |
| 5685 | msgstr "" |
| 5686 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5687 | #: builtin/log.c:1143 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5688 | msgid "header" |
| 5689 | msgstr "" |
| 5690 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5691 | #: builtin/log.c:1144 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5692 | msgid "add email header" |
| 5693 | msgstr "" |
| 5694 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5695 | #: builtin/log.c:1145 builtin/log.c:1147 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5696 | msgid "email" |
| 5697 | msgstr "" |
| 5698 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5699 | #: builtin/log.c:1145 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5700 | msgid "add To: header" |
| 5701 | msgstr "" |
| 5702 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5703 | #: builtin/log.c:1147 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5704 | msgid "add Cc: header" |
| 5705 | msgstr "" |
| 5706 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5707 | #: builtin/log.c:1149 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5708 | msgid "message-id" |
| 5709 | msgstr "" |
| 5710 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5711 | #: builtin/log.c:1150 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5712 | msgid "make first mail a reply to <message-id>" |
| 5713 | msgstr "" |
| 5714 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5715 | #: builtin/log.c:1151 builtin/log.c:1154 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5716 | msgid "boundary" |
| 5717 | msgstr "" |
| 5718 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5719 | #: builtin/log.c:1152 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5720 | msgid "attach the patch" |
| 5721 | msgstr "" |
| 5722 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5723 | #: builtin/log.c:1155 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5724 | msgid "inline the patch" |
| 5725 | msgstr "" |
| 5726 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5727 | #: builtin/log.c:1159 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5728 | msgid "enable message threading, styles: shallow, deep" |
| 5729 | msgstr "" |
| 5730 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5731 | #: builtin/log.c:1161 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5732 | msgid "signature" |
| 5733 | msgstr "" |
| 5734 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5735 | #: builtin/log.c:1162 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5736 | msgid "add a signature" |
| 5737 | msgstr "" |
| 5738 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5739 | #: builtin/log.c:1164 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5740 | msgid "don't print the patch filenames" |
| 5741 | msgstr "" |
| 5742 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5743 | #: builtin/log.c:1248 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5744 | msgid "-n and -k are mutually exclusive." |
| 5745 | msgstr "" |
| 5746 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5747 | #: builtin/log.c:1250 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5748 | msgid "--subject-prefix and -k are mutually exclusive." |
| 5749 | msgstr "" |
| 5750 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5751 | #: builtin/log.c:1258 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5752 | msgid "--name-only does not make sense" |
| 5753 | msgstr "" |
| 5754 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5755 | #: builtin/log.c:1260 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5756 | msgid "--name-status does not make sense" |
| 5757 | msgstr "" |
| 5758 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5759 | #: builtin/log.c:1262 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5760 | msgid "--check does not make sense" |
| 5761 | msgstr "" |
| 5762 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5763 | #: builtin/log.c:1285 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5764 | msgid "standard output, or directory, which one?" |
| 5765 | msgstr "" |
| 5766 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5767 | #: builtin/log.c:1287 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5768 | #, c-format |
| 5769 | msgid "Could not create directory '%s'" |
| 5770 | msgstr "" |
| 5771 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5772 | #: builtin/log.c:1435 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5773 | msgid "Failed to create output files" |
| 5774 | msgstr "" |
| 5775 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5776 | #: builtin/log.c:1484 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5777 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
| 5778 | msgstr "" |
| 5779 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5780 | #: builtin/log.c:1539 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5781 | #, c-format |
| 5782 | msgid "" |
| 5783 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" |
| 5784 | msgstr "" |
| 5785 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5786 | #: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5787 | #, c-format |
| 5788 | msgid "Unknown commit %s" |
| 5789 | msgstr "" |
| 5790 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5791 | #: builtin/ls-files.c:402 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5792 | msgid "git ls-files [options] [<file>...]" |
| 5793 | msgstr "" |
| 5794 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5795 | #: builtin/ls-files.c:459 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5796 | msgid "identify the file status with tags" |
| 5797 | msgstr "" |
| 5798 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5799 | #: builtin/ls-files.c:461 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5800 | msgid "use lowercase letters for 'assume unchanged' files" |
| 5801 | msgstr "" |
| 5802 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5803 | #: builtin/ls-files.c:463 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5804 | msgid "show cached files in the output (default)" |
| 5805 | msgstr "" |
| 5806 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5807 | #: builtin/ls-files.c:465 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5808 | msgid "show deleted files in the output" |
| 5809 | msgstr "" |
| 5810 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5811 | #: builtin/ls-files.c:467 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5812 | msgid "show modified files in the output" |
| 5813 | msgstr "" |
| 5814 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5815 | #: builtin/ls-files.c:469 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5816 | msgid "show other files in the output" |
| 5817 | msgstr "" |
| 5818 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5819 | #: builtin/ls-files.c:471 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5820 | msgid "show ignored files in the output" |
| 5821 | msgstr "" |
| 5822 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5823 | #: builtin/ls-files.c:474 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5824 | msgid "show staged contents' object name in the output" |
| 5825 | msgstr "" |
| 5826 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5827 | #: builtin/ls-files.c:476 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5828 | msgid "show files on the filesystem that need to be removed" |
| 5829 | msgstr "" |
| 5830 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5831 | #: builtin/ls-files.c:478 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5832 | msgid "show 'other' directories' name only" |
| 5833 | msgstr "" |
| 5834 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5835 | #: builtin/ls-files.c:481 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5836 | msgid "don't show empty directories" |
| 5837 | msgstr "" |
| 5838 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5839 | #: builtin/ls-files.c:484 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5840 | msgid "show unmerged files in the output" |
| 5841 | msgstr "" |
| 5842 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5843 | #: builtin/ls-files.c:486 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5844 | msgid "show resolve-undo information" |
| 5845 | msgstr "" |
| 5846 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5847 | #: builtin/ls-files.c:488 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5848 | msgid "skip files matching pattern" |
| 5849 | msgstr "" |
| 5850 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5851 | #: builtin/ls-files.c:491 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5852 | msgid "exclude patterns are read from <file>" |
| 5853 | msgstr "" |
| 5854 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5855 | #: builtin/ls-files.c:494 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5856 | msgid "read additional per-directory exclude patterns in <file>" |
| 5857 | msgstr "" |
| 5858 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5859 | #: builtin/ls-files.c:496 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5860 | msgid "add the standard git exclusions" |
| 5861 | msgstr "" |
| 5862 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5863 | #: builtin/ls-files.c:499 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5864 | msgid "make the output relative to the project top directory" |
| 5865 | msgstr "" |
| 5866 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5867 | #: builtin/ls-files.c:502 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5868 | msgid "if any <file> is not in the index, treat this as an error" |
| 5869 | msgstr "" |
| 5870 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5871 | #: builtin/ls-files.c:503 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5872 | msgid "tree-ish" |
| 5873 | msgstr "" |
| 5874 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5875 | #: builtin/ls-files.c:504 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5876 | msgid "pretend that paths removed since <tree-ish> are still present" |
| 5877 | msgstr "" |
| 5878 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5879 | #: builtin/ls-files.c:506 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5880 | msgid "show debugging data" |
| 5881 | msgstr "" |
| 5882 | |
| 5883 | #: builtin/ls-tree.c:27 |
| 5884 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
| 5885 | msgstr "" |
| 5886 | |
| 5887 | #: builtin/ls-tree.c:125 |
| 5888 | msgid "only show trees" |
| 5889 | msgstr "" |
| 5890 | |
| 5891 | #: builtin/ls-tree.c:127 |
| 5892 | msgid "recurse into subtrees" |
| 5893 | msgstr "" |
| 5894 | |
| 5895 | #: builtin/ls-tree.c:129 |
| 5896 | msgid "show trees when recursing" |
| 5897 | msgstr "" |
| 5898 | |
| 5899 | #: builtin/ls-tree.c:132 |
| 5900 | msgid "terminate entries with NUL byte" |
| 5901 | msgstr "" |
| 5902 | |
| 5903 | #: builtin/ls-tree.c:133 |
| 5904 | msgid "include object size" |
| 5905 | msgstr "" |
| 5906 | |
| 5907 | #: builtin/ls-tree.c:135 builtin/ls-tree.c:137 |
| 5908 | msgid "list only filenames" |
| 5909 | msgstr "" |
| 5910 | |
| 5911 | #: builtin/ls-tree.c:140 |
| 5912 | msgid "use full path names" |
| 5913 | msgstr "" |
| 5914 | |
| 5915 | #: builtin/ls-tree.c:142 |
| 5916 | msgid "list entire tree; not just current directory (implies --full-name)" |
| 5917 | msgstr "" |
| 5918 | |
| 5919 | #: builtin/merge.c:43 |
| 5920 | msgid "git merge [options] [<commit>...]" |
| 5921 | msgstr "" |
| 5922 | |
| 5923 | #: builtin/merge.c:44 |
| 5924 | msgid "git merge [options] <msg> HEAD <commit>" |
| 5925 | msgstr "" |
| 5926 | |
| 5927 | #: builtin/merge.c:45 |
| 5928 | msgid "git merge --abort" |
| 5929 | msgstr "" |
| 5930 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 5931 | #: builtin/merge.c:90 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5932 | msgid "switch `m' requires a value" |
| 5933 | msgstr "" |
| 5934 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 5935 | #: builtin/merge.c:127 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5936 | #, c-format |
| 5937 | msgid "Could not find merge strategy '%s'.\n" |
| 5938 | msgstr "" |
| 5939 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 5940 | #: builtin/merge.c:128 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5941 | #, c-format |
| 5942 | msgid "Available strategies are:" |
| 5943 | msgstr "" |
| 5944 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 5945 | #: builtin/merge.c:133 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5946 | #, c-format |
| 5947 | msgid "Available custom strategies are:" |
| 5948 | msgstr "" |
| 5949 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5950 | #: builtin/merge.c:183 |
| 5951 | msgid "do not show a diffstat at the end of the merge" |
| 5952 | msgstr "" |
| 5953 | |
| 5954 | #: builtin/merge.c:186 |
| 5955 | msgid "show a diffstat at the end of the merge" |
| 5956 | msgstr "" |
| 5957 | |
| 5958 | #: builtin/merge.c:187 |
| 5959 | msgid "(synonym to --stat)" |
| 5960 | msgstr "" |
| 5961 | |
| 5962 | #: builtin/merge.c:189 |
| 5963 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
| 5964 | msgstr "" |
| 5965 | |
| 5966 | #: builtin/merge.c:192 |
| 5967 | msgid "create a single commit instead of doing a merge" |
| 5968 | msgstr "" |
| 5969 | |
| 5970 | #: builtin/merge.c:194 |
| 5971 | msgid "perform a commit if the merge succeeds (default)" |
| 5972 | msgstr "" |
| 5973 | |
| 5974 | #: builtin/merge.c:196 |
| 5975 | msgid "edit message before committing" |
| 5976 | msgstr "" |
| 5977 | |
| 5978 | #: builtin/merge.c:198 |
| 5979 | msgid "allow fast-forward (default)" |
| 5980 | msgstr "" |
| 5981 | |
| 5982 | #: builtin/merge.c:200 |
| 5983 | msgid "abort if fast-forward is not possible" |
| 5984 | msgstr "" |
| 5985 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5986 | #: builtin/merge.c:203 |
| 5987 | msgid "Verify that the named commit has a valid GPG signature" |
| 5988 | msgstr "" |
| 5989 | |
| 5990 | #: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5991 | msgid "strategy" |
| 5992 | msgstr "" |
| 5993 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5994 | #: builtin/merge.c:205 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5995 | msgid "merge strategy to use" |
| 5996 | msgstr "" |
| 5997 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5998 | #: builtin/merge.c:206 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5999 | msgid "option=value" |
| 6000 | msgstr "" |
| 6001 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6002 | #: builtin/merge.c:207 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6003 | msgid "option for selected merge strategy" |
| 6004 | msgstr "" |
| 6005 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6006 | #: builtin/merge.c:209 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6007 | msgid "merge commit message (for a non-fast-forward merge)" |
| 6008 | msgstr "" |
| 6009 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6010 | #: builtin/merge.c:213 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6011 | msgid "abort the current in-progress merge" |
| 6012 | msgstr "" |
| 6013 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6014 | #: builtin/merge.c:242 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6015 | msgid "could not run stash." |
| 6016 | msgstr "" |
| 6017 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6018 | #: builtin/merge.c:247 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6019 | msgid "stash failed" |
| 6020 | msgstr "" |
| 6021 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6022 | #: builtin/merge.c:252 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6023 | #, c-format |
| 6024 | msgid "not a valid object: %s" |
| 6025 | msgstr "" |
| 6026 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6027 | #: builtin/merge.c:271 builtin/merge.c:288 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6028 | msgid "read-tree failed" |
| 6029 | msgstr "" |
| 6030 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6031 | #: builtin/merge.c:318 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6032 | msgid " (nothing to squash)" |
| 6033 | msgstr "" |
| 6034 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6035 | #: builtin/merge.c:331 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6036 | #, c-format |
| 6037 | msgid "Squash commit -- not updating HEAD\n" |
| 6038 | msgstr "" |
| 6039 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6040 | #: builtin/merge.c:363 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6041 | msgid "Writing SQUASH_MSG" |
| 6042 | msgstr "" |
| 6043 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6044 | #: builtin/merge.c:365 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6045 | msgid "Finishing SQUASH_MSG" |
| 6046 | msgstr "" |
| 6047 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6048 | #: builtin/merge.c:388 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6049 | #, c-format |
| 6050 | msgid "No merge message -- not updating HEAD\n" |
| 6051 | msgstr "" |
| 6052 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6053 | #: builtin/merge.c:438 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6054 | #, c-format |
| 6055 | msgid "'%s' does not point to a commit" |
| 6056 | msgstr "" |
| 6057 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6058 | #: builtin/merge.c:550 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6059 | #, c-format |
| 6060 | msgid "Bad branch.%s.mergeoptions string: %s" |
| 6061 | msgstr "" |
| 6062 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6063 | #: builtin/merge.c:643 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6064 | msgid "git write-tree failed to write a tree" |
| 6065 | msgstr "" |
| 6066 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6067 | #: builtin/merge.c:671 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6068 | msgid "Not handling anything other than two heads merge." |
| 6069 | msgstr "" |
| 6070 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6071 | #: builtin/merge.c:685 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6072 | #, c-format |
| 6073 | msgid "Unknown option for merge-recursive: -X%s" |
| 6074 | msgstr "" |
| 6075 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6076 | #: builtin/merge.c:699 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6077 | #, c-format |
| 6078 | msgid "unable to write %s" |
| 6079 | msgstr "" |
| 6080 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6081 | #: builtin/merge.c:788 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6082 | #, c-format |
| 6083 | msgid "Could not read from '%s'" |
| 6084 | msgstr "" |
| 6085 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6086 | #: builtin/merge.c:797 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6087 | #, c-format |
| 6088 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" |
| 6089 | msgstr "" |
| 6090 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6091 | #: builtin/merge.c:803 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6092 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6093 | msgid "" |
| 6094 | "Please enter a commit message to explain why this merge is necessary,\n" |
| 6095 | "especially if it merges an updated upstream into a topic branch.\n" |
| 6096 | "\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6097 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6098 | "the commit.\n" |
| 6099 | msgstr "" |
| 6100 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6101 | #: builtin/merge.c:827 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6102 | msgid "Empty commit message." |
| 6103 | msgstr "" |
| 6104 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6105 | #: builtin/merge.c:839 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6106 | #, c-format |
| 6107 | msgid "Wonderful.\n" |
| 6108 | msgstr "" |
| 6109 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6110 | #: builtin/merge.c:904 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6111 | #, c-format |
| 6112 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" |
| 6113 | msgstr "" |
| 6114 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6115 | #: builtin/merge.c:920 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6116 | #, c-format |
| 6117 | msgid "'%s' is not a commit" |
| 6118 | msgstr "" |
| 6119 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6120 | #: builtin/merge.c:961 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6121 | msgid "No current branch." |
| 6122 | msgstr "" |
| 6123 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6124 | #: builtin/merge.c:963 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6125 | msgid "No remote for the current branch." |
| 6126 | msgstr "" |
| 6127 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6128 | #: builtin/merge.c:965 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6129 | msgid "No default upstream defined for the current branch." |
| 6130 | msgstr "" |
| 6131 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6132 | #: builtin/merge.c:970 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6133 | #, c-format |
| 6134 | msgid "No remote tracking branch for %s from %s" |
| 6135 | msgstr "" |
| 6136 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6137 | #: builtin/merge.c:1057 builtin/merge.c:1214 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 6138 | #, c-format |
| 6139 | msgid "%s - not something we can merge" |
| 6140 | msgstr "" |
| 6141 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6142 | #: builtin/merge.c:1125 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6143 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
| 6144 | msgstr "" |
| 6145 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6146 | #: builtin/merge.c:1141 git-pull.sh:31 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6147 | msgid "" |
| 6148 | "You have not concluded your merge (MERGE_HEAD exists).\n" |
| 6149 | "Please, commit your changes before you can merge." |
| 6150 | msgstr "" |
| 6151 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6152 | #: builtin/merge.c:1144 git-pull.sh:34 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6153 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
| 6154 | msgstr "" |
| 6155 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6156 | #: builtin/merge.c:1148 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6157 | msgid "" |
| 6158 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" |
| 6159 | "Please, commit your changes before you can merge." |
| 6160 | msgstr "" |
| 6161 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6162 | #: builtin/merge.c:1151 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6163 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
| 6164 | msgstr "" |
| 6165 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6166 | #: builtin/merge.c:1160 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6167 | msgid "You cannot combine --squash with --no-ff." |
| 6168 | msgstr "" |
| 6169 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6170 | #: builtin/merge.c:1165 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6171 | msgid "You cannot combine --no-ff with --ff-only." |
| 6172 | msgstr "" |
| 6173 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6174 | #: builtin/merge.c:1172 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6175 | msgid "No commit specified and merge.defaultToUpstream not set." |
| 6176 | msgstr "" |
| 6177 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6178 | #: builtin/merge.c:1204 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6179 | msgid "Can merge only exactly one commit into empty head" |
| 6180 | msgstr "" |
| 6181 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6182 | #: builtin/merge.c:1207 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6183 | msgid "Squash commit into empty head not supported yet" |
| 6184 | msgstr "" |
| 6185 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6186 | #: builtin/merge.c:1209 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6187 | msgid "Non-fast-forward commit does not make sense into an empty head" |
| 6188 | msgstr "" |
| 6189 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6190 | #: builtin/merge.c:1265 |
| 6191 | #, c-format |
| 6192 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." |
| 6193 | msgstr "" |
| 6194 | |
| 6195 | #: builtin/merge.c:1268 |
| 6196 | #, c-format |
| 6197 | msgid "Commit %s has a bad GPG signature allegedly by %s." |
| 6198 | msgstr "" |
| 6199 | |
| 6200 | #. 'N' |
| 6201 | #: builtin/merge.c:1271 |
| 6202 | #, c-format |
| 6203 | msgid "Commit %s does not have a GPG signature." |
| 6204 | msgstr "" |
| 6205 | |
| 6206 | #: builtin/merge.c:1274 |
| 6207 | #, c-format |
| 6208 | msgid "Commit %s has a good GPG signature by %s\n" |
| 6209 | msgstr "" |
| 6210 | |
| 6211 | #: builtin/merge.c:1358 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6212 | #, c-format |
| 6213 | msgid "Updating %s..%s\n" |
| 6214 | msgstr "" |
| 6215 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6216 | #: builtin/merge.c:1397 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6217 | #, c-format |
| 6218 | msgid "Trying really trivial in-index merge...\n" |
| 6219 | msgstr "" |
| 6220 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6221 | #: builtin/merge.c:1404 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6222 | #, c-format |
| 6223 | msgid "Nope.\n" |
| 6224 | msgstr "" |
| 6225 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6226 | #: builtin/merge.c:1436 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6227 | msgid "Not possible to fast-forward, aborting." |
| 6228 | msgstr "" |
| 6229 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6230 | #: builtin/merge.c:1459 builtin/merge.c:1538 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6231 | #, c-format |
| 6232 | msgid "Rewinding the tree to pristine...\n" |
| 6233 | msgstr "" |
| 6234 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6235 | #: builtin/merge.c:1463 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6236 | #, c-format |
| 6237 | msgid "Trying merge strategy %s...\n" |
| 6238 | msgstr "" |
| 6239 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6240 | #: builtin/merge.c:1529 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6241 | #, c-format |
| 6242 | msgid "No merge strategy handled the merge.\n" |
| 6243 | msgstr "" |
| 6244 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6245 | #: builtin/merge.c:1531 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6246 | #, c-format |
| 6247 | msgid "Merge with strategy %s failed.\n" |
| 6248 | msgstr "" |
| 6249 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6250 | #: builtin/merge.c:1540 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6251 | #, c-format |
| 6252 | msgid "Using the %s to prepare resolving by hand.\n" |
| 6253 | msgstr "" |
| 6254 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6255 | #: builtin/merge.c:1552 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6256 | #, c-format |
| 6257 | msgid "Automatic merge went well; stopped before committing as requested\n" |
| 6258 | msgstr "" |
| 6259 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6260 | #: builtin/merge-base.c:26 |
| 6261 | msgid "git merge-base [-a|--all] <commit> <commit>..." |
| 6262 | msgstr "" |
| 6263 | |
| 6264 | #: builtin/merge-base.c:27 |
| 6265 | msgid "git merge-base [-a|--all] --octopus <commit>..." |
| 6266 | msgstr "" |
| 6267 | |
| 6268 | #: builtin/merge-base.c:28 |
| 6269 | msgid "git merge-base --independent <commit>..." |
| 6270 | msgstr "" |
| 6271 | |
| 6272 | #: builtin/merge-base.c:29 |
| 6273 | msgid "git merge-base --is-ancestor <commit> <commit>" |
| 6274 | msgstr "" |
| 6275 | |
| 6276 | #: builtin/merge-base.c:98 |
| 6277 | msgid "output all common ancestors" |
| 6278 | msgstr "" |
| 6279 | |
| 6280 | #: builtin/merge-base.c:99 |
| 6281 | msgid "find ancestors for a single n-way merge" |
| 6282 | msgstr "" |
| 6283 | |
| 6284 | #: builtin/merge-base.c:100 |
| 6285 | msgid "list revs not reachable from others" |
| 6286 | msgstr "" |
| 6287 | |
| 6288 | #: builtin/merge-base.c:102 |
| 6289 | msgid "is the first one ancestor of the other?" |
| 6290 | msgstr "" |
| 6291 | |
| 6292 | #: builtin/merge-file.c:8 |
| 6293 | msgid "" |
| 6294 | "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " |
| 6295 | "file2" |
| 6296 | msgstr "" |
| 6297 | |
| 6298 | #: builtin/merge-file.c:33 |
| 6299 | msgid "send results to standard output" |
| 6300 | msgstr "" |
| 6301 | |
| 6302 | #: builtin/merge-file.c:34 |
| 6303 | msgid "use a diff3 based merge" |
| 6304 | msgstr "" |
| 6305 | |
| 6306 | #: builtin/merge-file.c:35 |
| 6307 | msgid "for conflicts, use our version" |
| 6308 | msgstr "" |
| 6309 | |
| 6310 | #: builtin/merge-file.c:37 |
| 6311 | msgid "for conflicts, use their version" |
| 6312 | msgstr "" |
| 6313 | |
| 6314 | #: builtin/merge-file.c:39 |
| 6315 | msgid "for conflicts, use a union version" |
| 6316 | msgstr "" |
| 6317 | |
| 6318 | #: builtin/merge-file.c:42 |
| 6319 | msgid "for conflicts, use this marker size" |
| 6320 | msgstr "" |
| 6321 | |
| 6322 | #: builtin/merge-file.c:43 |
| 6323 | msgid "do not warn about conflicts" |
| 6324 | msgstr "" |
| 6325 | |
| 6326 | #: builtin/merge-file.c:45 |
| 6327 | msgid "set labels for file1/orig_file/file2" |
| 6328 | msgstr "" |
| 6329 | |
| 6330 | #: builtin/mktree.c:67 |
| 6331 | msgid "git mktree [-z] [--missing] [--batch]" |
| 6332 | msgstr "" |
| 6333 | |
| 6334 | #: builtin/mktree.c:153 |
| 6335 | msgid "input is NUL terminated" |
| 6336 | msgstr "" |
| 6337 | |
| 6338 | #: builtin/mktree.c:154 builtin/write-tree.c:24 |
| 6339 | msgid "allow missing objects" |
| 6340 | msgstr "" |
| 6341 | |
| 6342 | #: builtin/mktree.c:155 |
| 6343 | msgid "allow creation of more than one tree" |
| 6344 | msgstr "" |
| 6345 | |
| 6346 | #: builtin/mv.c:14 |
| 6347 | msgid "git mv [options] <source>... <destination>" |
| 6348 | msgstr "" |
| 6349 | |
| 6350 | #: builtin/mv.c:64 |
| 6351 | msgid "force move/rename even if target exists" |
| 6352 | msgstr "" |
| 6353 | |
| 6354 | #: builtin/mv.c:65 |
| 6355 | msgid "skip move/rename errors" |
| 6356 | msgstr "" |
| 6357 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6358 | #: builtin/mv.c:108 |
| 6359 | #, c-format |
| 6360 | msgid "Checking rename of '%s' to '%s'\n" |
| 6361 | msgstr "" |
| 6362 | |
| 6363 | #: builtin/mv.c:112 |
| 6364 | msgid "bad source" |
| 6365 | msgstr "" |
| 6366 | |
| 6367 | #: builtin/mv.c:115 |
| 6368 | msgid "can not move directory into itself" |
| 6369 | msgstr "" |
| 6370 | |
| 6371 | #: builtin/mv.c:118 |
| 6372 | msgid "cannot move directory over file" |
| 6373 | msgstr "" |
| 6374 | |
| 6375 | #: builtin/mv.c:128 |
| 6376 | #, c-format |
| 6377 | msgid "Huh? %.*s is in index?" |
| 6378 | msgstr "" |
| 6379 | |
| 6380 | #: builtin/mv.c:140 |
| 6381 | msgid "source directory is empty" |
| 6382 | msgstr "" |
| 6383 | |
| 6384 | #: builtin/mv.c:171 |
| 6385 | msgid "not under version control" |
| 6386 | msgstr "" |
| 6387 | |
| 6388 | #: builtin/mv.c:173 |
| 6389 | msgid "destination exists" |
| 6390 | msgstr "" |
| 6391 | |
| 6392 | #: builtin/mv.c:181 |
| 6393 | #, c-format |
| 6394 | msgid "overwriting '%s'" |
| 6395 | msgstr "" |
| 6396 | |
| 6397 | #: builtin/mv.c:184 |
| 6398 | msgid "Cannot overwrite" |
| 6399 | msgstr "" |
| 6400 | |
| 6401 | #: builtin/mv.c:187 |
| 6402 | msgid "multiple sources for the same target" |
| 6403 | msgstr "" |
| 6404 | |
| 6405 | #: builtin/mv.c:202 |
| 6406 | #, c-format |
| 6407 | msgid "%s, source=%s, destination=%s" |
| 6408 | msgstr "" |
| 6409 | |
| 6410 | #: builtin/mv.c:212 |
| 6411 | #, c-format |
| 6412 | msgid "Renaming %s to %s\n" |
| 6413 | msgstr "" |
| 6414 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 6415 | #: builtin/mv.c:215 builtin/remote.c:731 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6416 | #, c-format |
| 6417 | msgid "renaming '%s' failed" |
| 6418 | msgstr "" |
| 6419 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6420 | #: builtin/name-rev.c:175 |
| 6421 | msgid "git name-rev [options] <commit>..." |
| 6422 | msgstr "" |
| 6423 | |
| 6424 | #: builtin/name-rev.c:176 |
| 6425 | msgid "git name-rev [options] --all" |
| 6426 | msgstr "" |
| 6427 | |
| 6428 | #: builtin/name-rev.c:177 |
| 6429 | msgid "git name-rev [options] --stdin" |
| 6430 | msgstr "" |
| 6431 | |
| 6432 | #: builtin/name-rev.c:229 |
| 6433 | msgid "print only names (no SHA-1)" |
| 6434 | msgstr "" |
| 6435 | |
| 6436 | #: builtin/name-rev.c:230 |
| 6437 | msgid "only use tags to name the commits" |
| 6438 | msgstr "" |
| 6439 | |
| 6440 | #: builtin/name-rev.c:232 |
| 6441 | msgid "only use refs matching <pattern>" |
| 6442 | msgstr "" |
| 6443 | |
| 6444 | #: builtin/name-rev.c:234 |
| 6445 | msgid "list all commits reachable from all refs" |
| 6446 | msgstr "" |
| 6447 | |
| 6448 | #: builtin/name-rev.c:235 |
| 6449 | msgid "read from stdin" |
| 6450 | msgstr "" |
| 6451 | |
| 6452 | #: builtin/name-rev.c:236 |
| 6453 | msgid "allow to print `undefined` names" |
| 6454 | msgstr "" |
| 6455 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6456 | #: builtin/notes.c:26 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6457 | msgid "git notes [--ref <notes_ref>] [list [<object>]]" |
| 6458 | msgstr "" |
| 6459 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6460 | #: builtin/notes.c:27 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6461 | msgid "" |
| 6462 | "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " |
| 6463 | "<object>] [<object>]" |
| 6464 | msgstr "" |
| 6465 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6466 | #: builtin/notes.c:28 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6467 | msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" |
| 6468 | msgstr "" |
| 6469 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6470 | #: builtin/notes.c:29 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6471 | msgid "" |
| 6472 | "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " |
| 6473 | "<object>] [<object>]" |
| 6474 | msgstr "" |
| 6475 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6476 | #: builtin/notes.c:30 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6477 | msgid "git notes [--ref <notes_ref>] edit [<object>]" |
| 6478 | msgstr "" |
| 6479 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6480 | #: builtin/notes.c:31 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6481 | msgid "git notes [--ref <notes_ref>] show [<object>]" |
| 6482 | msgstr "" |
| 6483 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6484 | #: builtin/notes.c:32 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6485 | msgid "" |
| 6486 | "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" |
| 6487 | msgstr "" |
| 6488 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6489 | #: builtin/notes.c:33 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6490 | msgid "git notes merge --commit [-v | -q]" |
| 6491 | msgstr "" |
| 6492 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6493 | #: builtin/notes.c:34 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6494 | msgid "git notes merge --abort [-v | -q]" |
| 6495 | msgstr "" |
| 6496 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6497 | #: builtin/notes.c:35 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6498 | msgid "git notes [--ref <notes_ref>] remove [<object>...]" |
| 6499 | msgstr "" |
| 6500 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6501 | #: builtin/notes.c:36 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6502 | msgid "git notes [--ref <notes_ref>] prune [-n | -v]" |
| 6503 | msgstr "" |
| 6504 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6505 | #: builtin/notes.c:37 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6506 | msgid "git notes [--ref <notes_ref>] get-ref" |
| 6507 | msgstr "" |
| 6508 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6509 | #: builtin/notes.c:42 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6510 | msgid "git notes [list [<object>]]" |
| 6511 | msgstr "" |
| 6512 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6513 | #: builtin/notes.c:47 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6514 | msgid "git notes add [<options>] [<object>]" |
| 6515 | msgstr "" |
| 6516 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6517 | #: builtin/notes.c:52 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6518 | msgid "git notes copy [<options>] <from-object> <to-object>" |
| 6519 | msgstr "" |
| 6520 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6521 | #: builtin/notes.c:53 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6522 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
| 6523 | msgstr "" |
| 6524 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6525 | #: builtin/notes.c:58 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6526 | msgid "git notes append [<options>] [<object>]" |
| 6527 | msgstr "" |
| 6528 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6529 | #: builtin/notes.c:63 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6530 | msgid "git notes edit [<object>]" |
| 6531 | msgstr "" |
| 6532 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6533 | #: builtin/notes.c:68 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6534 | msgid "git notes show [<object>]" |
| 6535 | msgstr "" |
| 6536 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6537 | #: builtin/notes.c:73 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6538 | msgid "git notes merge [<options>] <notes_ref>" |
| 6539 | msgstr "" |
| 6540 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6541 | #: builtin/notes.c:74 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6542 | msgid "git notes merge --commit [<options>]" |
| 6543 | msgstr "" |
| 6544 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6545 | #: builtin/notes.c:75 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6546 | msgid "git notes merge --abort [<options>]" |
| 6547 | msgstr "" |
| 6548 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6549 | #: builtin/notes.c:80 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6550 | msgid "git notes remove [<object>]" |
| 6551 | msgstr "" |
| 6552 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6553 | #: builtin/notes.c:85 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6554 | msgid "git notes prune [<options>]" |
| 6555 | msgstr "" |
| 6556 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6557 | #: builtin/notes.c:90 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6558 | msgid "git notes get-ref" |
| 6559 | msgstr "" |
| 6560 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6561 | #: builtin/notes.c:139 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6562 | #, c-format |
| 6563 | msgid "unable to start 'show' for object '%s'" |
| 6564 | msgstr "" |
| 6565 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6566 | #: builtin/notes.c:143 |
| 6567 | msgid "could not read 'show' output" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6568 | msgstr "" |
| 6569 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6570 | #: builtin/notes.c:151 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6571 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6572 | msgid "failed to finish 'show' for object '%s'" |
| 6573 | msgstr "" |
| 6574 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6575 | #: builtin/notes.c:169 builtin/tag.c:341 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6576 | #, c-format |
| 6577 | msgid "could not create file '%s'" |
| 6578 | msgstr "" |
| 6579 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6580 | #: builtin/notes.c:188 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6581 | msgid "Please supply the note contents using either -m or -F option" |
| 6582 | msgstr "" |
| 6583 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6584 | #: builtin/notes.c:209 builtin/notes.c:972 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6585 | #, c-format |
| 6586 | msgid "Removing note for object %s\n" |
| 6587 | msgstr "" |
| 6588 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6589 | #: builtin/notes.c:214 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6590 | msgid "unable to write note object" |
| 6591 | msgstr "" |
| 6592 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6593 | #: builtin/notes.c:216 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6594 | #, c-format |
| 6595 | msgid "The note contents has been left in %s" |
| 6596 | msgstr "" |
| 6597 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6598 | #: builtin/notes.c:250 builtin/tag.c:540 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6599 | #, c-format |
| 6600 | msgid "cannot read '%s'" |
| 6601 | msgstr "" |
| 6602 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6603 | #: builtin/notes.c:252 builtin/tag.c:543 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6604 | #, c-format |
| 6605 | msgid "could not open or read '%s'" |
| 6606 | msgstr "" |
| 6607 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6608 | #: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 |
| 6609 | #: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 |
| 6610 | #: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 |
| 6611 | #: builtin/notes.c:967 builtin/tag.c:556 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6612 | #, c-format |
| 6613 | msgid "Failed to resolve '%s' as a valid ref." |
| 6614 | msgstr "" |
| 6615 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6616 | #: builtin/notes.c:274 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6617 | #, c-format |
| 6618 | msgid "Failed to read object '%s'." |
| 6619 | msgstr "" |
| 6620 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6621 | #: builtin/notes.c:298 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6622 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
| 6623 | msgstr "" |
| 6624 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6625 | #: builtin/notes.c:339 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6626 | #, c-format |
| 6627 | msgid "Bad notes.rewriteMode value: '%s'" |
| 6628 | msgstr "" |
| 6629 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6630 | #: builtin/notes.c:349 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6631 | #, c-format |
| 6632 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
| 6633 | msgstr "" |
| 6634 | |
| 6635 | #. TRANSLATORS: The first %s is the name of the |
| 6636 | #. environment variable, the second %s is its value |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6637 | #: builtin/notes.c:376 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6638 | #, c-format |
| 6639 | msgid "Bad %s value: '%s'" |
| 6640 | msgstr "" |
| 6641 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6642 | #: builtin/notes.c:440 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6643 | #, c-format |
| 6644 | msgid "Malformed input line: '%s'." |
| 6645 | msgstr "" |
| 6646 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6647 | #: builtin/notes.c:455 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6648 | #, c-format |
| 6649 | msgid "Failed to copy notes from '%s' to '%s'" |
| 6650 | msgstr "" |
| 6651 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6652 | #: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 |
| 6653 | #: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 |
| 6654 | #: builtin/notes.c:1032 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6655 | msgid "too many parameters" |
| 6656 | msgstr "" |
| 6657 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6658 | #: builtin/notes.c:512 builtin/notes.c:771 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6659 | #, c-format |
| 6660 | msgid "No note found for object %s." |
| 6661 | msgstr "" |
| 6662 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6663 | #: builtin/notes.c:534 builtin/notes.c:691 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6664 | msgid "note contents as a string" |
| 6665 | msgstr "" |
| 6666 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6667 | #: builtin/notes.c:537 builtin/notes.c:694 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6668 | msgid "note contents in a file" |
| 6669 | msgstr "" |
| 6670 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6671 | #: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 |
| 6672 | #: builtin/notes.c:699 builtin/tag.c:474 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6673 | msgid "object" |
| 6674 | msgstr "" |
| 6675 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6676 | #: builtin/notes.c:540 builtin/notes.c:697 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6677 | msgid "reuse and edit specified note object" |
| 6678 | msgstr "" |
| 6679 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6680 | #: builtin/notes.c:543 builtin/notes.c:700 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6681 | msgid "reuse specified note object" |
| 6682 | msgstr "" |
| 6683 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6684 | #: builtin/notes.c:545 builtin/notes.c:613 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6685 | msgid "replace existing notes" |
| 6686 | msgstr "" |
| 6687 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6688 | #: builtin/notes.c:579 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6689 | #, c-format |
| 6690 | msgid "" |
| 6691 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " |
| 6692 | "existing notes" |
| 6693 | msgstr "" |
| 6694 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6695 | #: builtin/notes.c:584 builtin/notes.c:661 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6696 | #, c-format |
| 6697 | msgid "Overwriting existing notes for object %s\n" |
| 6698 | msgstr "" |
| 6699 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6700 | #: builtin/notes.c:614 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6701 | msgid "read objects from stdin" |
| 6702 | msgstr "" |
| 6703 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6704 | #: builtin/notes.c:616 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6705 | msgid "load rewriting config for <command> (implies --stdin)" |
| 6706 | msgstr "" |
| 6707 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6708 | #: builtin/notes.c:634 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6709 | msgid "too few parameters" |
| 6710 | msgstr "" |
| 6711 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6712 | #: builtin/notes.c:655 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6713 | #, c-format |
| 6714 | msgid "" |
| 6715 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " |
| 6716 | "existing notes" |
| 6717 | msgstr "" |
| 6718 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6719 | #: builtin/notes.c:667 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6720 | #, c-format |
| 6721 | msgid "Missing notes on source object %s. Cannot copy." |
| 6722 | msgstr "" |
| 6723 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6724 | #: builtin/notes.c:716 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6725 | #, c-format |
| 6726 | msgid "" |
| 6727 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" |
| 6728 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" |
| 6729 | msgstr "" |
| 6730 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6731 | #: builtin/notes.c:863 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6732 | msgid "General options" |
| 6733 | msgstr "" |
| 6734 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6735 | #: builtin/notes.c:865 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6736 | msgid "Merge options" |
| 6737 | msgstr "" |
| 6738 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6739 | #: builtin/notes.c:867 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6740 | msgid "" |
| 6741 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" |
| 6742 | "cat_sort_uniq)" |
| 6743 | msgstr "" |
| 6744 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6745 | #: builtin/notes.c:869 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6746 | msgid "Committing unmerged notes" |
| 6747 | msgstr "" |
| 6748 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6749 | #: builtin/notes.c:871 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6750 | msgid "finalize notes merge by committing unmerged notes" |
| 6751 | msgstr "" |
| 6752 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6753 | #: builtin/notes.c:873 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6754 | msgid "Aborting notes merge resolution" |
| 6755 | msgstr "" |
| 6756 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6757 | #: builtin/notes.c:875 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6758 | msgid "abort notes merge" |
| 6759 | msgstr "" |
| 6760 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6761 | #: builtin/notes.c:970 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6762 | #, c-format |
| 6763 | msgid "Object %s has no note\n" |
| 6764 | msgstr "" |
| 6765 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6766 | #: builtin/notes.c:982 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6767 | msgid "attempt to remove non-existent note is not an error" |
| 6768 | msgstr "" |
| 6769 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6770 | #: builtin/notes.c:985 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6771 | msgid "read object names from the standard input" |
| 6772 | msgstr "" |
| 6773 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6774 | #: builtin/notes.c:1066 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6775 | msgid "notes_ref" |
| 6776 | msgstr "" |
| 6777 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6778 | #: builtin/notes.c:1067 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6779 | msgid "use notes from <notes_ref>" |
| 6780 | msgstr "" |
| 6781 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6782 | #: builtin/notes.c:1102 builtin/remote.c:1598 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6783 | #, c-format |
| 6784 | msgid "Unknown subcommand: %s" |
| 6785 | msgstr "" |
| 6786 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6787 | #: builtin/pack-objects.c:23 |
| 6788 | msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" |
| 6789 | msgstr "" |
| 6790 | |
| 6791 | #: builtin/pack-objects.c:24 |
| 6792 | msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" |
| 6793 | msgstr "" |
| 6794 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 6795 | #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 |
| 6796 | #, c-format |
| 6797 | msgid "deflate error (%d)" |
| 6798 | msgstr "" |
| 6799 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6800 | #: builtin/pack-objects.c:2397 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 6801 | #, c-format |
| 6802 | msgid "unsupported index version %s" |
| 6803 | msgstr "" |
| 6804 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6805 | #: builtin/pack-objects.c:2401 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 6806 | #, c-format |
| 6807 | msgid "bad index version '%s'" |
| 6808 | msgstr "" |
| 6809 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6810 | #: builtin/pack-objects.c:2424 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 6811 | #, c-format |
| 6812 | msgid "option %s does not accept negative form" |
| 6813 | msgstr "" |
| 6814 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6815 | #: builtin/pack-objects.c:2428 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 6816 | #, c-format |
| 6817 | msgid "unable to parse value '%s' for option %s" |
| 6818 | msgstr "" |
| 6819 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6820 | #: builtin/pack-objects.c:2447 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6821 | msgid "do not show progress meter" |
| 6822 | msgstr "" |
| 6823 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6824 | #: builtin/pack-objects.c:2449 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6825 | msgid "show progress meter" |
| 6826 | msgstr "" |
| 6827 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6828 | #: builtin/pack-objects.c:2451 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6829 | msgid "show progress meter during object writing phase" |
| 6830 | msgstr "" |
| 6831 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6832 | #: builtin/pack-objects.c:2454 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6833 | msgid "similar to --all-progress when progress meter is shown" |
| 6834 | msgstr "" |
| 6835 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6836 | #: builtin/pack-objects.c:2455 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6837 | msgid "version[,offset]" |
| 6838 | msgstr "" |
| 6839 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6840 | #: builtin/pack-objects.c:2456 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6841 | msgid "write the pack index file in the specified idx format version" |
| 6842 | msgstr "" |
| 6843 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6844 | #: builtin/pack-objects.c:2459 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6845 | msgid "maximum size of each output pack file" |
| 6846 | msgstr "" |
| 6847 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6848 | #: builtin/pack-objects.c:2461 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6849 | msgid "ignore borrowed objects from alternate object store" |
| 6850 | msgstr "" |
| 6851 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6852 | #: builtin/pack-objects.c:2463 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6853 | msgid "ignore packed objects" |
| 6854 | msgstr "" |
| 6855 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6856 | #: builtin/pack-objects.c:2465 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6857 | msgid "limit pack window by objects" |
| 6858 | msgstr "" |
| 6859 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6860 | #: builtin/pack-objects.c:2467 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6861 | msgid "limit pack window by memory in addition to object limit" |
| 6862 | msgstr "" |
| 6863 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6864 | #: builtin/pack-objects.c:2469 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6865 | msgid "maximum length of delta chain allowed in the resulting pack" |
| 6866 | msgstr "" |
| 6867 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6868 | #: builtin/pack-objects.c:2471 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6869 | msgid "reuse existing deltas" |
| 6870 | msgstr "" |
| 6871 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6872 | #: builtin/pack-objects.c:2473 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6873 | msgid "reuse existing objects" |
| 6874 | msgstr "" |
| 6875 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6876 | #: builtin/pack-objects.c:2475 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6877 | msgid "use OFS_DELTA objects" |
| 6878 | msgstr "" |
| 6879 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6880 | #: builtin/pack-objects.c:2477 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6881 | msgid "use threads when searching for best delta matches" |
| 6882 | msgstr "" |
| 6883 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6884 | #: builtin/pack-objects.c:2479 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6885 | msgid "do not create an empty pack output" |
| 6886 | msgstr "" |
| 6887 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6888 | #: builtin/pack-objects.c:2481 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6889 | msgid "read revision arguments from standard input" |
| 6890 | msgstr "" |
| 6891 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6892 | #: builtin/pack-objects.c:2483 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6893 | msgid "limit the objects to those that are not yet packed" |
| 6894 | msgstr "" |
| 6895 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6896 | #: builtin/pack-objects.c:2486 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6897 | msgid "include objects reachable from any reference" |
| 6898 | msgstr "" |
| 6899 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6900 | #: builtin/pack-objects.c:2489 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6901 | msgid "include objects referred by reflog entries" |
| 6902 | msgstr "" |
| 6903 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6904 | #: builtin/pack-objects.c:2492 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6905 | msgid "output pack to stdout" |
| 6906 | msgstr "" |
| 6907 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6908 | #: builtin/pack-objects.c:2494 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6909 | msgid "include tag objects that refer to objects to be packed" |
| 6910 | msgstr "" |
| 6911 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6912 | #: builtin/pack-objects.c:2496 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6913 | msgid "keep unreachable objects" |
| 6914 | msgstr "" |
| 6915 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6916 | #: builtin/pack-objects.c:2497 parse-options.h:141 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6917 | msgid "time" |
| 6918 | msgstr "" |
| 6919 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6920 | #: builtin/pack-objects.c:2498 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6921 | msgid "unpack unreachable objects newer than <time>" |
| 6922 | msgstr "" |
| 6923 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6924 | #: builtin/pack-objects.c:2501 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6925 | msgid "create thin packs" |
| 6926 | msgstr "" |
| 6927 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6928 | #: builtin/pack-objects.c:2503 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6929 | msgid "ignore packs that have companion .keep file" |
| 6930 | msgstr "" |
| 6931 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6932 | #: builtin/pack-objects.c:2505 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6933 | msgid "pack compression level" |
| 6934 | msgstr "" |
| 6935 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6936 | #: builtin/pack-objects.c:2507 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6937 | msgid "do not hide commits by grafts" |
| 6938 | msgstr "" |
| 6939 | |
| 6940 | #: builtin/pack-refs.c:6 |
| 6941 | msgid "git pack-refs [options]" |
| 6942 | msgstr "" |
| 6943 | |
| 6944 | #: builtin/pack-refs.c:14 |
| 6945 | msgid "pack everything" |
| 6946 | msgstr "" |
| 6947 | |
| 6948 | #: builtin/pack-refs.c:15 |
| 6949 | msgid "prune loose refs (default)" |
| 6950 | msgstr "" |
| 6951 | |
| 6952 | #: builtin/prune-packed.c:7 |
| 6953 | msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" |
| 6954 | msgstr "" |
| 6955 | |
| 6956 | #: builtin/prune.c:12 |
| 6957 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
| 6958 | msgstr "" |
| 6959 | |
| 6960 | #: builtin/prune.c:132 |
| 6961 | msgid "do not remove, show only" |
| 6962 | msgstr "" |
| 6963 | |
| 6964 | #: builtin/prune.c:133 |
| 6965 | msgid "report pruned objects" |
| 6966 | msgstr "" |
| 6967 | |
| 6968 | #: builtin/prune.c:136 |
| 6969 | msgid "expire objects older than <time>" |
| 6970 | msgstr "" |
| 6971 | |
| 6972 | #: builtin/push.c:14 |
| 6973 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
| 6974 | msgstr "" |
| 6975 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 6976 | #: builtin/push.c:45 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6977 | msgid "tag shorthand without <tag>" |
| 6978 | msgstr "" |
| 6979 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 6980 | #: builtin/push.c:64 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6981 | msgid "--delete only accepts plain target ref names" |
| 6982 | msgstr "" |
| 6983 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 6984 | #: builtin/push.c:99 |
| 6985 | msgid "" |
| 6986 | "\n" |
| 6987 | "To choose either option permanently, see push.default in 'git help config'." |
| 6988 | msgstr "" |
| 6989 | |
| 6990 | #: builtin/push.c:102 |
| 6991 | #, c-format |
| 6992 | msgid "" |
| 6993 | "The upstream branch of your current branch does not match\n" |
| 6994 | "the name of your current branch. To push to the upstream branch\n" |
| 6995 | "on the remote, use\n" |
| 6996 | "\n" |
| 6997 | " git push %s HEAD:%s\n" |
| 6998 | "\n" |
| 6999 | "To push to the branch of the same name on the remote, use\n" |
| 7000 | "\n" |
| 7001 | " git push %s %s\n" |
| 7002 | "%s" |
| 7003 | msgstr "" |
| 7004 | |
| 7005 | #: builtin/push.c:121 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7006 | #, c-format |
| 7007 | msgid "" |
| 7008 | "You are not currently on a branch.\n" |
| 7009 | "To push the history leading to the current (detached HEAD)\n" |
| 7010 | "state now, use\n" |
| 7011 | "\n" |
| 7012 | " git push %s HEAD:<name-of-remote-branch>\n" |
| 7013 | msgstr "" |
| 7014 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7015 | #: builtin/push.c:128 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7016 | #, c-format |
| 7017 | msgid "" |
| 7018 | "The current branch %s has no upstream branch.\n" |
| 7019 | "To push the current branch and set the remote as upstream, use\n" |
| 7020 | "\n" |
| 7021 | " git push --set-upstream %s %s\n" |
| 7022 | msgstr "" |
| 7023 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7024 | #: builtin/push.c:136 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7025 | #, c-format |
| 7026 | msgid "The current branch %s has multiple upstream branches, refusing to push." |
| 7027 | msgstr "" |
| 7028 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7029 | #: builtin/push.c:139 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7030 | #, c-format |
| 7031 | msgid "" |
| 7032 | "You are pushing to remote '%s', which is not the upstream of\n" |
| 7033 | "your current branch '%s', without telling me what to push\n" |
| 7034 | "to update which remote branch." |
| 7035 | msgstr "" |
| 7036 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 7037 | #: builtin/push.c:151 |
| 7038 | msgid "" |
| 7039 | "push.default is unset; its implicit value is changing in\n" |
| 7040 | "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" |
| 7041 | "and maintain the current behavior after the default changes, use:\n" |
| 7042 | "\n" |
| 7043 | " git config --global push.default matching\n" |
| 7044 | "\n" |
| 7045 | "To squelch this message and adopt the new behavior now, use:\n" |
| 7046 | "\n" |
| 7047 | " git config --global push.default simple\n" |
| 7048 | "\n" |
| 7049 | "See 'git help config' and search for 'push.default' for further " |
| 7050 | "information.\n" |
| 7051 | "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" |
| 7052 | "'current' instead of 'simple' if you sometimes use older versions of Git)" |
| 7053 | msgstr "" |
| 7054 | |
| 7055 | #: builtin/push.c:199 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7056 | msgid "" |
| 7057 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." |
| 7058 | msgstr "" |
| 7059 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 7060 | #: builtin/push.c:206 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7061 | msgid "" |
| 7062 | "Updates were rejected because the tip of your current branch is behind\n" |
| 7063 | "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" |
| 7064 | "before pushing again.\n" |
| 7065 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
| 7066 | msgstr "" |
| 7067 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 7068 | #: builtin/push.c:212 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7069 | msgid "" |
| 7070 | "Updates were rejected because a pushed branch tip is behind its remote\n" |
| 7071 | "counterpart. If you did not intend to push that branch, you may want to\n" |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 7072 | "specify branches to push or set the 'push.default' configuration variable\n" |
| 7073 | "to 'simple', 'current' or 'upstream' to push only the current branch." |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7074 | msgstr "" |
| 7075 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 7076 | #: builtin/push.c:218 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7077 | msgid "" |
| 7078 | "Updates were rejected because a pushed branch tip is behind its remote\n" |
| 7079 | "counterpart. Check out this branch and merge the remote changes\n" |
| 7080 | "(e.g. 'git pull') before pushing again.\n" |
| 7081 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
| 7082 | msgstr "" |
| 7083 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7084 | #: builtin/push.c:224 |
| 7085 | msgid "" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7086 | "Updates were rejected because the remote contains work that you do\n" |
| 7087 | "not have locally. This is usually caused by another repository pushing\n" |
| 7088 | "to the same ref. You may want to first merge the remote changes (e.g.,\n" |
| 7089 | "'git pull') before pushing again.\n" |
| 7090 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7091 | msgstr "" |
| 7092 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7093 | #: builtin/push.c:231 |
| 7094 | msgid "Updates were rejected because the tag already exists in the remote." |
| 7095 | msgstr "" |
| 7096 | |
| 7097 | #: builtin/push.c:234 |
| 7098 | msgid "" |
| 7099 | "You cannot update a remote ref that points at a non-commit object,\n" |
| 7100 | "or update a remote ref to make it point at a non-commit object,\n" |
| 7101 | "without using the '--force' option.\n" |
| 7102 | msgstr "" |
| 7103 | |
| 7104 | #: builtin/push.c:294 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7105 | #, c-format |
| 7106 | msgid "Pushing to %s\n" |
| 7107 | msgstr "" |
| 7108 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7109 | #: builtin/push.c:298 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7110 | #, c-format |
| 7111 | msgid "failed to push some refs to '%s'" |
| 7112 | msgstr "" |
| 7113 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7114 | #: builtin/push.c:331 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7115 | #, c-format |
| 7116 | msgid "bad repository '%s'" |
| 7117 | msgstr "" |
| 7118 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7119 | #: builtin/push.c:332 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7120 | msgid "" |
| 7121 | "No configured push destination.\n" |
| 7122 | "Either specify the URL from the command-line or configure a remote " |
| 7123 | "repository using\n" |
| 7124 | "\n" |
| 7125 | " git remote add <name> <url>\n" |
| 7126 | "\n" |
| 7127 | "and then push using the remote name\n" |
| 7128 | "\n" |
| 7129 | " git push <name>\n" |
| 7130 | msgstr "" |
| 7131 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7132 | #: builtin/push.c:347 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7133 | msgid "--all and --tags are incompatible" |
| 7134 | msgstr "" |
| 7135 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7136 | #: builtin/push.c:348 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7137 | msgid "--all can't be combined with refspecs" |
| 7138 | msgstr "" |
| 7139 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7140 | #: builtin/push.c:353 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7141 | msgid "--mirror and --tags are incompatible" |
| 7142 | msgstr "" |
| 7143 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7144 | #: builtin/push.c:354 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7145 | msgid "--mirror can't be combined with refspecs" |
| 7146 | msgstr "" |
| 7147 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7148 | #: builtin/push.c:359 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7149 | msgid "--all and --mirror are incompatible" |
| 7150 | msgstr "" |
| 7151 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7152 | #: builtin/push.c:419 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7153 | msgid "repository" |
| 7154 | msgstr "" |
| 7155 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7156 | #: builtin/push.c:420 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7157 | msgid "push all refs" |
| 7158 | msgstr "" |
| 7159 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7160 | #: builtin/push.c:421 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7161 | msgid "mirror all refs" |
| 7162 | msgstr "" |
| 7163 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7164 | #: builtin/push.c:423 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7165 | msgid "delete refs" |
| 7166 | msgstr "" |
| 7167 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7168 | #: builtin/push.c:424 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7169 | msgid "push tags (can't be used with --all or --mirror)" |
| 7170 | msgstr "" |
| 7171 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7172 | #: builtin/push.c:427 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7173 | msgid "force updates" |
| 7174 | msgstr "" |
| 7175 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7176 | #: builtin/push.c:428 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7177 | msgid "check" |
| 7178 | msgstr "" |
| 7179 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7180 | #: builtin/push.c:429 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7181 | msgid "control recursive pushing of submodules" |
| 7182 | msgstr "" |
| 7183 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7184 | #: builtin/push.c:431 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7185 | msgid "use thin pack" |
| 7186 | msgstr "" |
| 7187 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7188 | #: builtin/push.c:432 builtin/push.c:433 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7189 | msgid "receive pack program" |
| 7190 | msgstr "" |
| 7191 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7192 | #: builtin/push.c:434 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7193 | msgid "set upstream for git pull/status" |
| 7194 | msgstr "" |
| 7195 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7196 | #: builtin/push.c:437 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7197 | msgid "prune locally removed refs" |
| 7198 | msgstr "" |
| 7199 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7200 | #: builtin/push.c:439 |
| 7201 | msgid "bypass pre-push hook" |
| 7202 | msgstr "" |
| 7203 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 7204 | #: builtin/push.c:440 |
| 7205 | msgid "push missing but relevant tags" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7206 | msgstr "" |
| 7207 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7208 | #: builtin/push.c:450 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 7209 | msgid "--delete is incompatible with --all, --mirror and --tags" |
| 7210 | msgstr "" |
| 7211 | |
| 7212 | #: builtin/push.c:452 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7213 | msgid "--delete doesn't make sense without any refs" |
| 7214 | msgstr "" |
| 7215 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7216 | #: builtin/read-tree.c:36 |
| 7217 | msgid "" |
| 7218 | "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " |
| 7219 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
| 7220 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" |
| 7221 | msgstr "" |
| 7222 | |
| 7223 | #: builtin/read-tree.c:108 |
| 7224 | msgid "write resulting index to <file>" |
| 7225 | msgstr "" |
| 7226 | |
| 7227 | #: builtin/read-tree.c:111 |
| 7228 | msgid "only empty the index" |
| 7229 | msgstr "" |
| 7230 | |
| 7231 | #: builtin/read-tree.c:113 |
| 7232 | msgid "Merging" |
| 7233 | msgstr "" |
| 7234 | |
| 7235 | #: builtin/read-tree.c:115 |
| 7236 | msgid "perform a merge in addition to a read" |
| 7237 | msgstr "" |
| 7238 | |
| 7239 | #: builtin/read-tree.c:117 |
| 7240 | msgid "3-way merge if no file level merging required" |
| 7241 | msgstr "" |
| 7242 | |
| 7243 | #: builtin/read-tree.c:119 |
| 7244 | msgid "3-way merge in presence of adds and removes" |
| 7245 | msgstr "" |
| 7246 | |
| 7247 | #: builtin/read-tree.c:121 |
| 7248 | msgid "same as -m, but discard unmerged entries" |
| 7249 | msgstr "" |
| 7250 | |
| 7251 | #: builtin/read-tree.c:122 |
| 7252 | msgid "<subdirectory>/" |
| 7253 | msgstr "" |
| 7254 | |
| 7255 | #: builtin/read-tree.c:123 |
| 7256 | msgid "read the tree into the index under <subdirectory>/" |
| 7257 | msgstr "" |
| 7258 | |
| 7259 | #: builtin/read-tree.c:126 |
| 7260 | msgid "update working tree with merge result" |
| 7261 | msgstr "" |
| 7262 | |
| 7263 | #: builtin/read-tree.c:128 |
| 7264 | msgid "gitignore" |
| 7265 | msgstr "" |
| 7266 | |
| 7267 | #: builtin/read-tree.c:129 |
| 7268 | msgid "allow explicitly ignored files to be overwritten" |
| 7269 | msgstr "" |
| 7270 | |
| 7271 | #: builtin/read-tree.c:132 |
| 7272 | msgid "don't check the working tree after merging" |
| 7273 | msgstr "" |
| 7274 | |
| 7275 | #: builtin/read-tree.c:133 |
| 7276 | msgid "don't update the index or the work tree" |
| 7277 | msgstr "" |
| 7278 | |
| 7279 | #: builtin/read-tree.c:135 |
| 7280 | msgid "skip applying sparse checkout filter" |
| 7281 | msgstr "" |
| 7282 | |
| 7283 | #: builtin/read-tree.c:137 |
| 7284 | msgid "debug unpack-trees" |
| 7285 | msgstr "" |
| 7286 | |
| 7287 | #: builtin/remote.c:11 |
| 7288 | msgid "git remote [-v | --verbose]" |
| 7289 | msgstr "" |
| 7290 | |
| 7291 | #: builtin/remote.c:12 |
| 7292 | msgid "" |
| 7293 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" |
| 7294 | "mirror=<fetch|push>] <name> <url>" |
| 7295 | msgstr "" |
| 7296 | |
| 7297 | #: builtin/remote.c:13 builtin/remote.c:32 |
| 7298 | msgid "git remote rename <old> <new>" |
| 7299 | msgstr "" |
| 7300 | |
| 7301 | #: builtin/remote.c:14 builtin/remote.c:37 |
| 7302 | msgid "git remote remove <name>" |
| 7303 | msgstr "" |
| 7304 | |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 7305 | #: builtin/remote.c:15 builtin/remote.c:42 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7306 | msgid "git remote set-head <name> (-a | -d | <branch>)" |
| 7307 | msgstr "" |
| 7308 | |
| 7309 | #: builtin/remote.c:16 |
| 7310 | msgid "git remote [-v | --verbose] show [-n] <name>" |
| 7311 | msgstr "" |
| 7312 | |
| 7313 | #: builtin/remote.c:17 |
| 7314 | msgid "git remote prune [-n | --dry-run] <name>" |
| 7315 | msgstr "" |
| 7316 | |
| 7317 | #: builtin/remote.c:18 |
| 7318 | msgid "" |
| 7319 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" |
| 7320 | msgstr "" |
| 7321 | |
| 7322 | #: builtin/remote.c:19 |
| 7323 | msgid "git remote set-branches [--add] <name> <branch>..." |
| 7324 | msgstr "" |
| 7325 | |
| 7326 | #: builtin/remote.c:20 builtin/remote.c:68 |
| 7327 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
| 7328 | msgstr "" |
| 7329 | |
| 7330 | #: builtin/remote.c:21 builtin/remote.c:69 |
| 7331 | msgid "git remote set-url --add <name> <newurl>" |
| 7332 | msgstr "" |
| 7333 | |
| 7334 | #: builtin/remote.c:22 builtin/remote.c:70 |
| 7335 | msgid "git remote set-url --delete <name> <url>" |
| 7336 | msgstr "" |
| 7337 | |
| 7338 | #: builtin/remote.c:27 |
| 7339 | msgid "git remote add [<options>] <name> <url>" |
| 7340 | msgstr "" |
| 7341 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7342 | #: builtin/remote.c:47 |
| 7343 | msgid "git remote set-branches <name> <branch>..." |
| 7344 | msgstr "" |
| 7345 | |
| 7346 | #: builtin/remote.c:48 |
| 7347 | msgid "git remote set-branches --add <name> <branch>..." |
| 7348 | msgstr "" |
| 7349 | |
| 7350 | #: builtin/remote.c:53 |
| 7351 | msgid "git remote show [<options>] <name>" |
| 7352 | msgstr "" |
| 7353 | |
| 7354 | #: builtin/remote.c:58 |
| 7355 | msgid "git remote prune [<options>] <name>" |
| 7356 | msgstr "" |
| 7357 | |
| 7358 | #: builtin/remote.c:63 |
| 7359 | msgid "git remote update [<options>] [<group> | <remote>]..." |
| 7360 | msgstr "" |
| 7361 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7362 | #: builtin/remote.c:98 |
| 7363 | #, c-format |
| 7364 | msgid "Updating %s" |
| 7365 | msgstr "" |
| 7366 | |
| 7367 | #: builtin/remote.c:130 |
| 7368 | msgid "" |
| 7369 | "--mirror is dangerous and deprecated; please\n" |
| 7370 | "\t use --mirror=fetch or --mirror=push instead" |
| 7371 | msgstr "" |
| 7372 | |
| 7373 | #: builtin/remote.c:147 |
| 7374 | #, c-format |
| 7375 | msgid "unknown mirror argument: %s" |
| 7376 | msgstr "" |
| 7377 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7378 | #: builtin/remote.c:163 |
| 7379 | msgid "fetch the remote branches" |
| 7380 | msgstr "" |
| 7381 | |
| 7382 | #: builtin/remote.c:165 |
| 7383 | msgid "import all tags and associated objects when fetching" |
| 7384 | msgstr "" |
| 7385 | |
| 7386 | #: builtin/remote.c:168 |
| 7387 | msgid "or do not fetch any tag at all (--no-tags)" |
| 7388 | msgstr "" |
| 7389 | |
| 7390 | #: builtin/remote.c:170 |
| 7391 | msgid "branch(es) to track" |
| 7392 | msgstr "" |
| 7393 | |
| 7394 | #: builtin/remote.c:171 |
| 7395 | msgid "master branch" |
| 7396 | msgstr "" |
| 7397 | |
| 7398 | #: builtin/remote.c:172 |
| 7399 | msgid "push|fetch" |
| 7400 | msgstr "" |
| 7401 | |
| 7402 | #: builtin/remote.c:173 |
| 7403 | msgid "set up remote as a mirror to push to or fetch from" |
| 7404 | msgstr "" |
| 7405 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7406 | #: builtin/remote.c:185 |
| 7407 | msgid "specifying a master branch makes no sense with --mirror" |
| 7408 | msgstr "" |
| 7409 | |
| 7410 | #: builtin/remote.c:187 |
| 7411 | msgid "specifying branches to track makes sense only with fetch mirrors" |
| 7412 | msgstr "" |
| 7413 | |
| 7414 | #: builtin/remote.c:195 builtin/remote.c:646 |
| 7415 | #, c-format |
| 7416 | msgid "remote %s already exists." |
| 7417 | msgstr "" |
| 7418 | |
| 7419 | #: builtin/remote.c:199 builtin/remote.c:650 |
| 7420 | #, c-format |
| 7421 | msgid "'%s' is not a valid remote name" |
| 7422 | msgstr "" |
| 7423 | |
| 7424 | #: builtin/remote.c:243 |
| 7425 | #, c-format |
| 7426 | msgid "Could not setup master '%s'" |
| 7427 | msgstr "" |
| 7428 | |
| 7429 | #: builtin/remote.c:299 |
| 7430 | #, c-format |
| 7431 | msgid "more than one %s" |
| 7432 | msgstr "" |
| 7433 | |
| 7434 | #: builtin/remote.c:339 |
| 7435 | #, c-format |
| 7436 | msgid "Could not get fetch map for refspec %s" |
| 7437 | msgstr "" |
| 7438 | |
| 7439 | #: builtin/remote.c:440 builtin/remote.c:448 |
| 7440 | msgid "(matching)" |
| 7441 | msgstr "" |
| 7442 | |
| 7443 | #: builtin/remote.c:452 |
| 7444 | msgid "(delete)" |
| 7445 | msgstr "" |
| 7446 | |
| 7447 | #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 |
| 7448 | #, c-format |
| 7449 | msgid "Could not append '%s' to '%s'" |
| 7450 | msgstr "" |
| 7451 | |
| 7452 | #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 |
| 7453 | #, c-format |
| 7454 | msgid "No such remote: %s" |
| 7455 | msgstr "" |
| 7456 | |
| 7457 | #: builtin/remote.c:656 |
| 7458 | #, c-format |
| 7459 | msgid "Could not rename config section '%s' to '%s'" |
| 7460 | msgstr "" |
| 7461 | |
| 7462 | #: builtin/remote.c:662 builtin/remote.c:799 |
| 7463 | #, c-format |
| 7464 | msgid "Could not remove config section '%s'" |
| 7465 | msgstr "" |
| 7466 | |
| 7467 | #: builtin/remote.c:677 |
| 7468 | #, c-format |
| 7469 | msgid "" |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 7470 | "Not updating non-default fetch refspec\n" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7471 | "\t%s\n" |
| 7472 | "\tPlease update the configuration manually if necessary." |
| 7473 | msgstr "" |
| 7474 | |
| 7475 | #: builtin/remote.c:683 |
| 7476 | #, c-format |
| 7477 | msgid "Could not append '%s'" |
| 7478 | msgstr "" |
| 7479 | |
| 7480 | #: builtin/remote.c:694 |
| 7481 | #, c-format |
| 7482 | msgid "Could not set '%s'" |
| 7483 | msgstr "" |
| 7484 | |
| 7485 | #: builtin/remote.c:716 |
| 7486 | #, c-format |
| 7487 | msgid "deleting '%s' failed" |
| 7488 | msgstr "" |
| 7489 | |
| 7490 | #: builtin/remote.c:750 |
| 7491 | #, c-format |
| 7492 | msgid "creating '%s' failed" |
| 7493 | msgstr "" |
| 7494 | |
| 7495 | #: builtin/remote.c:764 |
| 7496 | #, c-format |
| 7497 | msgid "Could not remove branch %s" |
| 7498 | msgstr "" |
| 7499 | |
| 7500 | #: builtin/remote.c:834 |
| 7501 | msgid "" |
| 7502 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" |
| 7503 | "to delete it, use:" |
| 7504 | msgid_plural "" |
| 7505 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" |
| 7506 | "to delete them, use:" |
| 7507 | msgstr[0] "" |
| 7508 | msgstr[1] "" |
| 7509 | |
| 7510 | #: builtin/remote.c:943 |
| 7511 | #, c-format |
| 7512 | msgid " new (next fetch will store in remotes/%s)" |
| 7513 | msgstr "" |
| 7514 | |
| 7515 | #: builtin/remote.c:946 |
| 7516 | msgid " tracked" |
| 7517 | msgstr "" |
| 7518 | |
| 7519 | #: builtin/remote.c:948 |
| 7520 | msgid " stale (use 'git remote prune' to remove)" |
| 7521 | msgstr "" |
| 7522 | |
| 7523 | #: builtin/remote.c:950 |
| 7524 | msgid " ???" |
| 7525 | msgstr "" |
| 7526 | |
| 7527 | #: builtin/remote.c:991 |
| 7528 | #, c-format |
| 7529 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" |
| 7530 | msgstr "" |
| 7531 | |
| 7532 | #: builtin/remote.c:998 |
| 7533 | #, c-format |
| 7534 | msgid "rebases onto remote %s" |
| 7535 | msgstr "" |
| 7536 | |
| 7537 | #: builtin/remote.c:1001 |
| 7538 | #, c-format |
| 7539 | msgid " merges with remote %s" |
| 7540 | msgstr "" |
| 7541 | |
| 7542 | #: builtin/remote.c:1002 |
| 7543 | msgid " and with remote" |
| 7544 | msgstr "" |
| 7545 | |
| 7546 | #: builtin/remote.c:1004 |
| 7547 | #, c-format |
| 7548 | msgid "merges with remote %s" |
| 7549 | msgstr "" |
| 7550 | |
| 7551 | #: builtin/remote.c:1005 |
| 7552 | msgid " and with remote" |
| 7553 | msgstr "" |
| 7554 | |
| 7555 | #: builtin/remote.c:1051 |
| 7556 | msgid "create" |
| 7557 | msgstr "" |
| 7558 | |
| 7559 | #: builtin/remote.c:1054 |
| 7560 | msgid "delete" |
| 7561 | msgstr "" |
| 7562 | |
| 7563 | #: builtin/remote.c:1058 |
| 7564 | msgid "up to date" |
| 7565 | msgstr "" |
| 7566 | |
| 7567 | #: builtin/remote.c:1061 |
| 7568 | msgid "fast-forwardable" |
| 7569 | msgstr "" |
| 7570 | |
| 7571 | #: builtin/remote.c:1064 |
| 7572 | msgid "local out of date" |
| 7573 | msgstr "" |
| 7574 | |
| 7575 | #: builtin/remote.c:1071 |
| 7576 | #, c-format |
| 7577 | msgid " %-*s forces to %-*s (%s)" |
| 7578 | msgstr "" |
| 7579 | |
| 7580 | #: builtin/remote.c:1074 |
| 7581 | #, c-format |
| 7582 | msgid " %-*s pushes to %-*s (%s)" |
| 7583 | msgstr "" |
| 7584 | |
| 7585 | #: builtin/remote.c:1078 |
| 7586 | #, c-format |
| 7587 | msgid " %-*s forces to %s" |
| 7588 | msgstr "" |
| 7589 | |
| 7590 | #: builtin/remote.c:1081 |
| 7591 | #, c-format |
| 7592 | msgid " %-*s pushes to %s" |
| 7593 | msgstr "" |
| 7594 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7595 | #: builtin/remote.c:1091 |
| 7596 | msgid "do not query remotes" |
| 7597 | msgstr "" |
| 7598 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7599 | #: builtin/remote.c:1118 |
| 7600 | #, c-format |
| 7601 | msgid "* remote %s" |
| 7602 | msgstr "" |
| 7603 | |
| 7604 | #: builtin/remote.c:1119 |
| 7605 | #, c-format |
| 7606 | msgid " Fetch URL: %s" |
| 7607 | msgstr "" |
| 7608 | |
| 7609 | #: builtin/remote.c:1120 builtin/remote.c:1285 |
| 7610 | msgid "(no URL)" |
| 7611 | msgstr "" |
| 7612 | |
| 7613 | #: builtin/remote.c:1129 builtin/remote.c:1131 |
| 7614 | #, c-format |
| 7615 | msgid " Push URL: %s" |
| 7616 | msgstr "" |
| 7617 | |
| 7618 | #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 |
| 7619 | #, c-format |
| 7620 | msgid " HEAD branch: %s" |
| 7621 | msgstr "" |
| 7622 | |
| 7623 | #: builtin/remote.c:1139 |
| 7624 | #, c-format |
| 7625 | msgid "" |
| 7626 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" |
| 7627 | msgstr "" |
| 7628 | |
| 7629 | #: builtin/remote.c:1151 |
| 7630 | #, c-format |
| 7631 | msgid " Remote branch:%s" |
| 7632 | msgid_plural " Remote branches:%s" |
| 7633 | msgstr[0] "" |
| 7634 | msgstr[1] "" |
| 7635 | |
| 7636 | #: builtin/remote.c:1154 builtin/remote.c:1181 |
| 7637 | msgid " (status not queried)" |
| 7638 | msgstr "" |
| 7639 | |
| 7640 | #: builtin/remote.c:1163 |
| 7641 | msgid " Local branch configured for 'git pull':" |
| 7642 | msgid_plural " Local branches configured for 'git pull':" |
| 7643 | msgstr[0] "" |
| 7644 | msgstr[1] "" |
| 7645 | |
| 7646 | #: builtin/remote.c:1171 |
| 7647 | msgid " Local refs will be mirrored by 'git push'" |
| 7648 | msgstr "" |
| 7649 | |
| 7650 | #: builtin/remote.c:1178 |
| 7651 | #, c-format |
| 7652 | msgid " Local ref configured for 'git push'%s:" |
| 7653 | msgid_plural " Local refs configured for 'git push'%s:" |
| 7654 | msgstr[0] "" |
| 7655 | msgstr[1] "" |
| 7656 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7657 | #: builtin/remote.c:1199 |
| 7658 | msgid "set refs/remotes/<name>/HEAD according to remote" |
| 7659 | msgstr "" |
| 7660 | |
| 7661 | #: builtin/remote.c:1201 |
| 7662 | msgid "delete refs/remotes/<name>/HEAD" |
| 7663 | msgstr "" |
| 7664 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7665 | #: builtin/remote.c:1216 |
| 7666 | msgid "Cannot determine remote HEAD" |
| 7667 | msgstr "" |
| 7668 | |
| 7669 | #: builtin/remote.c:1218 |
| 7670 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
| 7671 | msgstr "" |
| 7672 | |
| 7673 | #: builtin/remote.c:1228 |
| 7674 | #, c-format |
| 7675 | msgid "Could not delete %s" |
| 7676 | msgstr "" |
| 7677 | |
| 7678 | #: builtin/remote.c:1236 |
| 7679 | #, c-format |
| 7680 | msgid "Not a valid ref: %s" |
| 7681 | msgstr "" |
| 7682 | |
| 7683 | #: builtin/remote.c:1238 |
| 7684 | #, c-format |
| 7685 | msgid "Could not setup %s" |
| 7686 | msgstr "" |
| 7687 | |
| 7688 | #: builtin/remote.c:1274 |
| 7689 | #, c-format |
| 7690 | msgid " %s will become dangling!" |
| 7691 | msgstr "" |
| 7692 | |
| 7693 | #: builtin/remote.c:1275 |
| 7694 | #, c-format |
| 7695 | msgid " %s has become dangling!" |
| 7696 | msgstr "" |
| 7697 | |
| 7698 | #: builtin/remote.c:1281 |
| 7699 | #, c-format |
| 7700 | msgid "Pruning %s" |
| 7701 | msgstr "" |
| 7702 | |
| 7703 | #: builtin/remote.c:1282 |
| 7704 | #, c-format |
| 7705 | msgid "URL: %s" |
| 7706 | msgstr "" |
| 7707 | |
| 7708 | #: builtin/remote.c:1295 |
| 7709 | #, c-format |
| 7710 | msgid " * [would prune] %s" |
| 7711 | msgstr "" |
| 7712 | |
| 7713 | #: builtin/remote.c:1298 |
| 7714 | #, c-format |
| 7715 | msgid " * [pruned] %s" |
| 7716 | msgstr "" |
| 7717 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7718 | #: builtin/remote.c:1321 |
| 7719 | msgid "prune remotes after fetching" |
| 7720 | msgstr "" |
| 7721 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7722 | #: builtin/remote.c:1387 builtin/remote.c:1461 |
| 7723 | #, c-format |
| 7724 | msgid "No such remote '%s'" |
| 7725 | msgstr "" |
| 7726 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7727 | #: builtin/remote.c:1407 |
| 7728 | msgid "add branch" |
| 7729 | msgstr "" |
| 7730 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7731 | #: builtin/remote.c:1414 |
| 7732 | msgid "no remote specified" |
| 7733 | msgstr "" |
| 7734 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7735 | #: builtin/remote.c:1436 |
| 7736 | msgid "manipulate push URLs" |
| 7737 | msgstr "" |
| 7738 | |
| 7739 | #: builtin/remote.c:1438 |
| 7740 | msgid "add URL" |
| 7741 | msgstr "" |
| 7742 | |
| 7743 | #: builtin/remote.c:1440 |
| 7744 | msgid "delete URLs" |
| 7745 | msgstr "" |
| 7746 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7747 | #: builtin/remote.c:1447 |
| 7748 | msgid "--add --delete doesn't make sense" |
| 7749 | msgstr "" |
| 7750 | |
| 7751 | #: builtin/remote.c:1487 |
| 7752 | #, c-format |
| 7753 | msgid "Invalid old URL pattern: %s" |
| 7754 | msgstr "" |
| 7755 | |
| 7756 | #: builtin/remote.c:1495 |
| 7757 | #, c-format |
| 7758 | msgid "No such URL found: %s" |
| 7759 | msgstr "" |
| 7760 | |
| 7761 | #: builtin/remote.c:1497 |
| 7762 | msgid "Will not delete all non-push URLs" |
| 7763 | msgstr "" |
| 7764 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7765 | #: builtin/remote.c:1569 |
| 7766 | msgid "be verbose; must be placed before a subcommand" |
| 7767 | msgstr "" |
| 7768 | |
| 7769 | #: builtin/replace.c:17 |
| 7770 | msgid "git replace [-f] <object> <replacement>" |
| 7771 | msgstr "" |
| 7772 | |
| 7773 | #: builtin/replace.c:18 |
| 7774 | msgid "git replace -d <object>..." |
| 7775 | msgstr "" |
| 7776 | |
| 7777 | #: builtin/replace.c:19 |
| 7778 | msgid "git replace -l [<pattern>]" |
| 7779 | msgstr "" |
| 7780 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7781 | #: builtin/replace.c:121 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7782 | msgid "list replace refs" |
| 7783 | msgstr "" |
| 7784 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7785 | #: builtin/replace.c:122 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7786 | msgid "delete replace refs" |
| 7787 | msgstr "" |
| 7788 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7789 | #: builtin/replace.c:123 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7790 | msgid "replace the ref if it exists" |
| 7791 | msgstr "" |
| 7792 | |
| 7793 | #: builtin/rerere.c:11 |
| 7794 | msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" |
| 7795 | msgstr "" |
| 7796 | |
| 7797 | #: builtin/rerere.c:56 |
| 7798 | msgid "register clean resolutions in index" |
| 7799 | msgstr "" |
| 7800 | |
| 7801 | #: builtin/reset.c:25 |
| 7802 | msgid "" |
| 7803 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" |
| 7804 | msgstr "" |
| 7805 | |
| 7806 | #: builtin/reset.c:26 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7807 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7808 | msgstr "" |
| 7809 | |
| 7810 | #: builtin/reset.c:27 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7811 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7812 | msgstr "" |
| 7813 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7814 | #: builtin/reset.c:33 |
| 7815 | msgid "mixed" |
| 7816 | msgstr "" |
| 7817 | |
| 7818 | #: builtin/reset.c:33 |
| 7819 | msgid "soft" |
| 7820 | msgstr "" |
| 7821 | |
| 7822 | #: builtin/reset.c:33 |
| 7823 | msgid "hard" |
| 7824 | msgstr "" |
| 7825 | |
| 7826 | #: builtin/reset.c:33 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7827 | msgid "merge" |
| 7828 | msgstr "" |
| 7829 | |
| 7830 | #: builtin/reset.c:33 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7831 | msgid "keep" |
| 7832 | msgstr "" |
| 7833 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7834 | #: builtin/reset.c:73 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7835 | msgid "You do not have a valid HEAD." |
| 7836 | msgstr "" |
| 7837 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7838 | #: builtin/reset.c:75 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7839 | msgid "Failed to find tree of HEAD." |
| 7840 | msgstr "" |
| 7841 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7842 | #: builtin/reset.c:81 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7843 | #, c-format |
| 7844 | msgid "Failed to find tree of %s." |
| 7845 | msgstr "" |
| 7846 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7847 | #: builtin/reset.c:98 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7848 | #, c-format |
| 7849 | msgid "HEAD is now at %s" |
| 7850 | msgstr "" |
| 7851 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7852 | #: builtin/reset.c:169 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7853 | #, c-format |
| 7854 | msgid "Cannot do a %s reset in the middle of a merge." |
| 7855 | msgstr "" |
| 7856 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7857 | #: builtin/reset.c:248 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7858 | msgid "be quiet, only report errors" |
| 7859 | msgstr "" |
| 7860 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7861 | #: builtin/reset.c:250 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7862 | msgid "reset HEAD and index" |
| 7863 | msgstr "" |
| 7864 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7865 | #: builtin/reset.c:251 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7866 | msgid "reset only HEAD" |
| 7867 | msgstr "" |
| 7868 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7869 | #: builtin/reset.c:253 builtin/reset.c:255 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7870 | msgid "reset HEAD, index and working tree" |
| 7871 | msgstr "" |
| 7872 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7873 | #: builtin/reset.c:257 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7874 | msgid "reset HEAD but keep local changes" |
| 7875 | msgstr "" |
| 7876 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7877 | #: builtin/reset.c:275 |
| 7878 | #, c-format |
| 7879 | msgid "Failed to resolve '%s' as a valid revision." |
| 7880 | msgstr "" |
| 7881 | |
| 7882 | #: builtin/reset.c:278 builtin/reset.c:286 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7883 | #, c-format |
| 7884 | msgid "Could not parse object '%s'." |
| 7885 | msgstr "" |
| 7886 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7887 | #: builtin/reset.c:283 |
| 7888 | #, c-format |
| 7889 | msgid "Failed to resolve '%s' as a valid tree." |
| 7890 | msgstr "" |
| 7891 | |
| 7892 | #: builtin/reset.c:292 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7893 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
| 7894 | msgstr "" |
| 7895 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7896 | #: builtin/reset.c:301 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7897 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
| 7898 | msgstr "" |
| 7899 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7900 | #: builtin/reset.c:303 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7901 | #, c-format |
| 7902 | msgid "Cannot do %s reset with paths." |
| 7903 | msgstr "" |
| 7904 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7905 | #: builtin/reset.c:313 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7906 | #, c-format |
| 7907 | msgid "%s reset is not allowed in a bare repository" |
| 7908 | msgstr "" |
| 7909 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7910 | #: builtin/reset.c:333 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7911 | #, c-format |
| 7912 | msgid "Could not reset index file to revision '%s'." |
| 7913 | msgstr "" |
| 7914 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7915 | #: builtin/reset.c:339 |
| 7916 | msgid "Unstaged changes after reset:" |
| 7917 | msgstr "" |
| 7918 | |
| 7919 | #: builtin/reset.c:344 |
| 7920 | msgid "Could not write new index file." |
| 7921 | msgstr "" |
| 7922 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7923 | #: builtin/rev-parse.c:339 |
| 7924 | msgid "git rev-parse --parseopt [options] -- [<args>...]" |
| 7925 | msgstr "" |
| 7926 | |
| 7927 | #: builtin/rev-parse.c:344 |
| 7928 | msgid "keep the `--` passed as an arg" |
| 7929 | msgstr "" |
| 7930 | |
| 7931 | #: builtin/rev-parse.c:346 |
| 7932 | msgid "stop parsing after the first non-option argument" |
| 7933 | msgstr "" |
| 7934 | |
| 7935 | #: builtin/rev-parse.c:464 |
| 7936 | msgid "" |
| 7937 | "git rev-parse --parseopt [options] -- [<args>...]\n" |
| 7938 | " or: git rev-parse --sq-quote [<arg>...]\n" |
| 7939 | " or: git rev-parse [options] [<arg>...]\n" |
| 7940 | "\n" |
| 7941 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." |
| 7942 | msgstr "" |
| 7943 | |
| 7944 | #: builtin/revert.c:22 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 7945 | msgid "git revert [options] <commit-ish>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7946 | msgstr "" |
| 7947 | |
| 7948 | #: builtin/revert.c:23 |
| 7949 | msgid "git revert <subcommand>" |
| 7950 | msgstr "" |
| 7951 | |
| 7952 | #: builtin/revert.c:28 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 7953 | msgid "git cherry-pick [options] <commit-ish>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7954 | msgstr "" |
| 7955 | |
| 7956 | #: builtin/revert.c:29 |
| 7957 | msgid "git cherry-pick <subcommand>" |
| 7958 | msgstr "" |
| 7959 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7960 | #: builtin/revert.c:70 builtin/revert.c:92 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7961 | #, c-format |
| 7962 | msgid "%s: %s cannot be used with %s" |
| 7963 | msgstr "" |
| 7964 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7965 | #: builtin/revert.c:103 |
| 7966 | msgid "end revert or cherry-pick sequence" |
| 7967 | msgstr "" |
| 7968 | |
| 7969 | #: builtin/revert.c:104 |
| 7970 | msgid "resume revert or cherry-pick sequence" |
| 7971 | msgstr "" |
| 7972 | |
| 7973 | #: builtin/revert.c:105 |
| 7974 | msgid "cancel revert or cherry-pick sequence" |
| 7975 | msgstr "" |
| 7976 | |
| 7977 | #: builtin/revert.c:106 |
| 7978 | msgid "don't automatically commit" |
| 7979 | msgstr "" |
| 7980 | |
| 7981 | #: builtin/revert.c:107 |
| 7982 | msgid "edit the commit message" |
| 7983 | msgstr "" |
| 7984 | |
| 7985 | #: builtin/revert.c:110 |
| 7986 | msgid "parent number" |
| 7987 | msgstr "" |
| 7988 | |
| 7989 | #: builtin/revert.c:112 |
| 7990 | msgid "merge strategy" |
| 7991 | msgstr "" |
| 7992 | |
| 7993 | #: builtin/revert.c:113 |
| 7994 | msgid "option" |
| 7995 | msgstr "" |
| 7996 | |
| 7997 | #: builtin/revert.c:114 |
| 7998 | msgid "option for merge strategy" |
| 7999 | msgstr "" |
| 8000 | |
| 8001 | #: builtin/revert.c:125 |
| 8002 | msgid "append commit name" |
| 8003 | msgstr "" |
| 8004 | |
| 8005 | #: builtin/revert.c:126 |
| 8006 | msgid "allow fast-forward" |
| 8007 | msgstr "" |
| 8008 | |
| 8009 | #: builtin/revert.c:127 |
| 8010 | msgid "preserve initially empty commits" |
| 8011 | msgstr "" |
| 8012 | |
| 8013 | #: builtin/revert.c:128 |
| 8014 | msgid "allow commits with empty messages" |
| 8015 | msgstr "" |
| 8016 | |
| 8017 | #: builtin/revert.c:129 |
| 8018 | msgid "keep redundant, empty commits" |
| 8019 | msgstr "" |
| 8020 | |
| 8021 | #: builtin/revert.c:133 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8022 | msgid "program error" |
| 8023 | msgstr "" |
| 8024 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8025 | #: builtin/revert.c:223 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8026 | msgid "revert failed" |
| 8027 | msgstr "" |
| 8028 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8029 | #: builtin/revert.c:238 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8030 | msgid "cherry-pick failed" |
| 8031 | msgstr "" |
| 8032 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8033 | #: builtin/rm.c:15 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8034 | msgid "git rm [options] [--] <file>..." |
| 8035 | msgstr "" |
| 8036 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8037 | #: builtin/rm.c:64 builtin/rm.c:186 |
| 8038 | #, c-format |
| 8039 | msgid "" |
| 8040 | "submodule '%s' (or one of its nested submodules) uses a .git directory\n" |
| 8041 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
| 8042 | msgstr "" |
| 8043 | |
| 8044 | #: builtin/rm.c:174 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8045 | #, c-format |
| 8046 | msgid "" |
| 8047 | "'%s' has staged content different from both the file and the HEAD\n" |
| 8048 | "(use -f to force removal)" |
| 8049 | msgstr "" |
| 8050 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8051 | #: builtin/rm.c:180 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8052 | #, c-format |
| 8053 | msgid "" |
| 8054 | "'%s' has changes staged in the index\n" |
| 8055 | "(use --cached to keep the file, or -f to force removal)" |
| 8056 | msgstr "" |
| 8057 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8058 | #: builtin/rm.c:191 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8059 | #, c-format |
| 8060 | msgid "" |
| 8061 | "'%s' has local modifications\n" |
| 8062 | "(use --cached to keep the file, or -f to force removal)" |
| 8063 | msgstr "" |
| 8064 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8065 | #: builtin/rm.c:207 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8066 | msgid "do not list removed files" |
| 8067 | msgstr "" |
| 8068 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8069 | #: builtin/rm.c:208 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8070 | msgid "only remove from the index" |
| 8071 | msgstr "" |
| 8072 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8073 | #: builtin/rm.c:209 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8074 | msgid "override the up-to-date check" |
| 8075 | msgstr "" |
| 8076 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8077 | #: builtin/rm.c:210 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8078 | msgid "allow recursive removal" |
| 8079 | msgstr "" |
| 8080 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8081 | #: builtin/rm.c:212 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8082 | msgid "exit with a zero status even if nothing matched" |
| 8083 | msgstr "" |
| 8084 | |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 8085 | #: builtin/rm.c:283 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8086 | #, c-format |
| 8087 | msgid "not removing '%s' recursively without -r" |
| 8088 | msgstr "" |
| 8089 | |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 8090 | #: builtin/rm.c:322 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8091 | #, c-format |
| 8092 | msgid "git rm: unable to remove %s" |
| 8093 | msgstr "" |
| 8094 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8095 | #: builtin/shortlog.c:13 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8096 | msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8097 | msgstr "" |
| 8098 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8099 | #: builtin/shortlog.c:131 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8100 | #, c-format |
| 8101 | msgid "Missing author: %s" |
| 8102 | msgstr "" |
| 8103 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8104 | #: builtin/shortlog.c:227 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8105 | msgid "sort output according to the number of commits per author" |
| 8106 | msgstr "" |
| 8107 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8108 | #: builtin/shortlog.c:229 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8109 | msgid "Suppress commit descriptions, only provides commit count" |
| 8110 | msgstr "" |
| 8111 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8112 | #: builtin/shortlog.c:231 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8113 | msgid "Show the email address of each author" |
| 8114 | msgstr "" |
| 8115 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8116 | #: builtin/shortlog.c:232 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8117 | msgid "w[,i1[,i2]]" |
| 8118 | msgstr "" |
| 8119 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8120 | #: builtin/shortlog.c:233 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8121 | msgid "Linewrap output" |
| 8122 | msgstr "" |
| 8123 | |
| 8124 | #: builtin/show-branch.c:9 |
| 8125 | msgid "" |
| 8126 | "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" |
| 8127 | "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" |
| 8128 | "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " |
| 8129 | "<glob>)...]" |
| 8130 | msgstr "" |
| 8131 | |
| 8132 | #: builtin/show-branch.c:10 |
| 8133 | msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" |
| 8134 | msgstr "" |
| 8135 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8136 | #: builtin/show-branch.c:650 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8137 | msgid "show remote-tracking and local branches" |
| 8138 | msgstr "" |
| 8139 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8140 | #: builtin/show-branch.c:652 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8141 | msgid "show remote-tracking branches" |
| 8142 | msgstr "" |
| 8143 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8144 | #: builtin/show-branch.c:654 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8145 | msgid "color '*!+-' corresponding to the branch" |
| 8146 | msgstr "" |
| 8147 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8148 | #: builtin/show-branch.c:656 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8149 | msgid "show <n> more commits after the common ancestor" |
| 8150 | msgstr "" |
| 8151 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8152 | #: builtin/show-branch.c:658 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8153 | msgid "synonym to more=-1" |
| 8154 | msgstr "" |
| 8155 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8156 | #: builtin/show-branch.c:659 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8157 | msgid "suppress naming strings" |
| 8158 | msgstr "" |
| 8159 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8160 | #: builtin/show-branch.c:661 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8161 | msgid "include the current branch" |
| 8162 | msgstr "" |
| 8163 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8164 | #: builtin/show-branch.c:663 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8165 | msgid "name commits with their object names" |
| 8166 | msgstr "" |
| 8167 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8168 | #: builtin/show-branch.c:665 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8169 | msgid "show possible merge bases" |
| 8170 | msgstr "" |
| 8171 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8172 | #: builtin/show-branch.c:667 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8173 | msgid "show refs unreachable from any other ref" |
| 8174 | msgstr "" |
| 8175 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8176 | #: builtin/show-branch.c:669 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8177 | msgid "show commits in topological order" |
| 8178 | msgstr "" |
| 8179 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8180 | #: builtin/show-branch.c:671 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8181 | msgid "show only commits not on the first branch" |
| 8182 | msgstr "" |
| 8183 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8184 | #: builtin/show-branch.c:673 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8185 | msgid "show merges reachable from only one tip" |
| 8186 | msgstr "" |
| 8187 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8188 | #: builtin/show-branch.c:675 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8189 | msgid "show commits where no parent comes before its children" |
| 8190 | msgstr "" |
| 8191 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8192 | #: builtin/show-branch.c:677 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8193 | msgid "<n>[,<base>]" |
| 8194 | msgstr "" |
| 8195 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8196 | #: builtin/show-branch.c:678 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8197 | msgid "show <n> most recent ref-log entries starting at base" |
| 8198 | msgstr "" |
| 8199 | |
| 8200 | #: builtin/show-ref.c:10 |
| 8201 | msgid "" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8202 | "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" |
| 8203 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8204 | msgstr "" |
| 8205 | |
| 8206 | #: builtin/show-ref.c:11 |
| 8207 | msgid "git show-ref --exclude-existing[=pattern] < ref-list" |
| 8208 | msgstr "" |
| 8209 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8210 | #: builtin/show-ref.c:165 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8211 | msgid "only show tags (can be combined with heads)" |
| 8212 | msgstr "" |
| 8213 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8214 | #: builtin/show-ref.c:166 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8215 | msgid "only show heads (can be combined with tags)" |
| 8216 | msgstr "" |
| 8217 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8218 | #: builtin/show-ref.c:167 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8219 | msgid "stricter reference checking, requires exact ref path" |
| 8220 | msgstr "" |
| 8221 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8222 | #: builtin/show-ref.c:170 builtin/show-ref.c:172 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8223 | msgid "show the HEAD reference" |
| 8224 | msgstr "" |
| 8225 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8226 | #: builtin/show-ref.c:174 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8227 | msgid "dereference tags into object IDs" |
| 8228 | msgstr "" |
| 8229 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8230 | #: builtin/show-ref.c:176 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8231 | msgid "only show SHA1 hash using <n> digits" |
| 8232 | msgstr "" |
| 8233 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8234 | #: builtin/show-ref.c:180 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8235 | msgid "do not print results to stdout (useful with --verify)" |
| 8236 | msgstr "" |
| 8237 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8238 | #: builtin/show-ref.c:182 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8239 | msgid "show refs from stdin that aren't in local repository" |
| 8240 | msgstr "" |
| 8241 | |
| 8242 | #: builtin/symbolic-ref.c:7 |
| 8243 | msgid "git symbolic-ref [options] name [ref]" |
| 8244 | msgstr "" |
| 8245 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8246 | #: builtin/symbolic-ref.c:8 |
| 8247 | msgid "git symbolic-ref -d [-q] name" |
| 8248 | msgstr "" |
| 8249 | |
| 8250 | #: builtin/symbolic-ref.c:40 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8251 | msgid "suppress error message for non-symbolic (detached) refs" |
| 8252 | msgstr "" |
| 8253 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8254 | #: builtin/symbolic-ref.c:41 |
| 8255 | msgid "delete symbolic ref" |
| 8256 | msgstr "" |
| 8257 | |
| 8258 | #: builtin/symbolic-ref.c:42 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8259 | msgid "shorten ref output" |
| 8260 | msgstr "" |
| 8261 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8262 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8263 | msgid "reason" |
| 8264 | msgstr "" |
| 8265 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8266 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8267 | msgid "reason of the update" |
| 8268 | msgstr "" |
| 8269 | |
| 8270 | #: builtin/tag.c:22 |
| 8271 | msgid "" |
| 8272 | "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" |
| 8273 | msgstr "" |
| 8274 | |
| 8275 | #: builtin/tag.c:23 |
| 8276 | msgid "git tag -d <tagname>..." |
| 8277 | msgstr "" |
| 8278 | |
| 8279 | #: builtin/tag.c:24 |
| 8280 | msgid "" |
| 8281 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" |
| 8282 | "\t\t[<pattern>...]" |
| 8283 | msgstr "" |
| 8284 | |
| 8285 | #: builtin/tag.c:26 |
| 8286 | msgid "git tag -v <tagname>..." |
| 8287 | msgstr "" |
| 8288 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8289 | #: builtin/tag.c:60 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 8290 | #, c-format |
| 8291 | msgid "malformed object at '%s'" |
| 8292 | msgstr "" |
| 8293 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8294 | #: builtin/tag.c:207 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8295 | #, c-format |
| 8296 | msgid "tag name too long: %.*s..." |
| 8297 | msgstr "" |
| 8298 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8299 | #: builtin/tag.c:212 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8300 | #, c-format |
| 8301 | msgid "tag '%s' not found." |
| 8302 | msgstr "" |
| 8303 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8304 | #: builtin/tag.c:227 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8305 | #, c-format |
| 8306 | msgid "Deleted tag '%s' (was %s)\n" |
| 8307 | msgstr "" |
| 8308 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8309 | #: builtin/tag.c:239 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8310 | #, c-format |
| 8311 | msgid "could not verify the tag '%s'" |
| 8312 | msgstr "" |
| 8313 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8314 | #: builtin/tag.c:249 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8315 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8316 | msgid "" |
| 8317 | "\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8318 | "Write a tag message\n" |
| 8319 | "Lines starting with '%c' will be ignored.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8320 | msgstr "" |
| 8321 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8322 | #: builtin/tag.c:253 |
| 8323 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8324 | msgid "" |
| 8325 | "\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8326 | "Write a tag message\n" |
| 8327 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8328 | "want to.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8329 | msgstr "" |
| 8330 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8331 | #: builtin/tag.c:292 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8332 | msgid "unable to sign the tag" |
| 8333 | msgstr "" |
| 8334 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8335 | #: builtin/tag.c:294 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8336 | msgid "unable to write tag file" |
| 8337 | msgstr "" |
| 8338 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8339 | #: builtin/tag.c:319 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8340 | msgid "bad object type." |
| 8341 | msgstr "" |
| 8342 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8343 | #: builtin/tag.c:332 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8344 | msgid "tag header too big." |
| 8345 | msgstr "" |
| 8346 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8347 | #: builtin/tag.c:368 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8348 | msgid "no tag message?" |
| 8349 | msgstr "" |
| 8350 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8351 | #: builtin/tag.c:374 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8352 | #, c-format |
| 8353 | msgid "The tag message has been left in %s\n" |
| 8354 | msgstr "" |
| 8355 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8356 | #: builtin/tag.c:423 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 8357 | msgid "switch 'points-at' requires an object" |
| 8358 | msgstr "" |
| 8359 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8360 | #: builtin/tag.c:425 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 8361 | #, c-format |
| 8362 | msgid "malformed object name '%s'" |
| 8363 | msgstr "" |
| 8364 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8365 | #: builtin/tag.c:445 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8366 | msgid "list tag names" |
| 8367 | msgstr "" |
| 8368 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8369 | #: builtin/tag.c:447 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8370 | msgid "print <n> lines of each tag message" |
| 8371 | msgstr "" |
| 8372 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8373 | #: builtin/tag.c:449 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8374 | msgid "delete tags" |
| 8375 | msgstr "" |
| 8376 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8377 | #: builtin/tag.c:450 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8378 | msgid "verify tags" |
| 8379 | msgstr "" |
| 8380 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8381 | #: builtin/tag.c:452 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8382 | msgid "Tag creation options" |
| 8383 | msgstr "" |
| 8384 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8385 | #: builtin/tag.c:454 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8386 | msgid "annotated tag, needs a message" |
| 8387 | msgstr "" |
| 8388 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8389 | #: builtin/tag.c:456 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8390 | msgid "tag message" |
| 8391 | msgstr "" |
| 8392 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8393 | #: builtin/tag.c:458 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8394 | msgid "annotated and GPG-signed tag" |
| 8395 | msgstr "" |
| 8396 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8397 | #: builtin/tag.c:462 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8398 | msgid "use another key to sign the tag" |
| 8399 | msgstr "" |
| 8400 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8401 | #: builtin/tag.c:463 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8402 | msgid "replace the tag if exists" |
| 8403 | msgstr "" |
| 8404 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8405 | #: builtin/tag.c:464 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8406 | msgid "show tag list in columns" |
| 8407 | msgstr "" |
| 8408 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8409 | #: builtin/tag.c:466 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8410 | msgid "Tag listing options" |
| 8411 | msgstr "" |
| 8412 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8413 | #: builtin/tag.c:469 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8414 | msgid "print only tags that contain the commit" |
| 8415 | msgstr "" |
| 8416 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8417 | #: builtin/tag.c:475 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8418 | msgid "print only tags of the object" |
| 8419 | msgstr "" |
| 8420 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8421 | #: builtin/tag.c:504 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8422 | msgid "--column and -n are incompatible" |
| 8423 | msgstr "" |
| 8424 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8425 | #: builtin/tag.c:521 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8426 | msgid "-n option is only allowed with -l." |
| 8427 | msgstr "" |
| 8428 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8429 | #: builtin/tag.c:523 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8430 | msgid "--contains option is only allowed with -l." |
| 8431 | msgstr "" |
| 8432 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8433 | #: builtin/tag.c:525 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 8434 | msgid "--points-at option is only allowed with -l." |
| 8435 | msgstr "" |
| 8436 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8437 | #: builtin/tag.c:533 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8438 | msgid "only one -F or -m option is allowed." |
| 8439 | msgstr "" |
| 8440 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8441 | #: builtin/tag.c:553 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8442 | msgid "too many params" |
| 8443 | msgstr "" |
| 8444 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8445 | #: builtin/tag.c:559 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8446 | #, c-format |
| 8447 | msgid "'%s' is not a valid tag name." |
| 8448 | msgstr "" |
| 8449 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8450 | #: builtin/tag.c:564 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8451 | #, c-format |
| 8452 | msgid "tag '%s' already exists" |
| 8453 | msgstr "" |
| 8454 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8455 | #: builtin/tag.c:582 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8456 | #, c-format |
| 8457 | msgid "%s: cannot lock the ref" |
| 8458 | msgstr "" |
| 8459 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8460 | #: builtin/tag.c:584 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8461 | #, c-format |
| 8462 | msgid "%s: cannot update the ref" |
| 8463 | msgstr "" |
| 8464 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8465 | #: builtin/tag.c:586 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8466 | #, c-format |
| 8467 | msgid "Updated tag '%s' (was %s)\n" |
| 8468 | msgstr "" |
| 8469 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8470 | #: builtin/update-index.c:401 |
| 8471 | msgid "git update-index [options] [--] [<file>...]" |
| 8472 | msgstr "" |
| 8473 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8474 | #: builtin/update-index.c:718 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8475 | msgid "continue refresh even when index needs update" |
| 8476 | msgstr "" |
| 8477 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8478 | #: builtin/update-index.c:721 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8479 | msgid "refresh: ignore submodules" |
| 8480 | msgstr "" |
| 8481 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8482 | #: builtin/update-index.c:724 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8483 | msgid "do not ignore new files" |
| 8484 | msgstr "" |
| 8485 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8486 | #: builtin/update-index.c:726 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8487 | msgid "let files replace directories and vice-versa" |
| 8488 | msgstr "" |
| 8489 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8490 | #: builtin/update-index.c:728 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8491 | msgid "notice files missing from worktree" |
| 8492 | msgstr "" |
| 8493 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8494 | #: builtin/update-index.c:730 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8495 | msgid "refresh even if index contains unmerged entries" |
| 8496 | msgstr "" |
| 8497 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8498 | #: builtin/update-index.c:733 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8499 | msgid "refresh stat information" |
| 8500 | msgstr "" |
| 8501 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8502 | #: builtin/update-index.c:737 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8503 | msgid "like --refresh, but ignore assume-unchanged setting" |
| 8504 | msgstr "" |
| 8505 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8506 | #: builtin/update-index.c:741 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8507 | msgid "<mode> <object> <path>" |
| 8508 | msgstr "" |
| 8509 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8510 | #: builtin/update-index.c:742 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8511 | msgid "add the specified entry to the index" |
| 8512 | msgstr "" |
| 8513 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8514 | #: builtin/update-index.c:746 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8515 | msgid "(+/-)x" |
| 8516 | msgstr "" |
| 8517 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8518 | #: builtin/update-index.c:747 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8519 | msgid "override the executable bit of the listed files" |
| 8520 | msgstr "" |
| 8521 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8522 | #: builtin/update-index.c:751 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8523 | msgid "mark files as \"not changing\"" |
| 8524 | msgstr "" |
| 8525 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8526 | #: builtin/update-index.c:754 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8527 | msgid "clear assumed-unchanged bit" |
| 8528 | msgstr "" |
| 8529 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8530 | #: builtin/update-index.c:757 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8531 | msgid "mark files as \"index-only\"" |
| 8532 | msgstr "" |
| 8533 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8534 | #: builtin/update-index.c:760 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8535 | msgid "clear skip-worktree bit" |
| 8536 | msgstr "" |
| 8537 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8538 | #: builtin/update-index.c:763 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8539 | msgid "add to index only; do not add content to object database" |
| 8540 | msgstr "" |
| 8541 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8542 | #: builtin/update-index.c:765 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8543 | msgid "remove named paths even if present in worktree" |
| 8544 | msgstr "" |
| 8545 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8546 | #: builtin/update-index.c:767 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8547 | msgid "with --stdin: input lines are terminated by null bytes" |
| 8548 | msgstr "" |
| 8549 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8550 | #: builtin/update-index.c:769 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8551 | msgid "read list of paths to be updated from standard input" |
| 8552 | msgstr "" |
| 8553 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8554 | #: builtin/update-index.c:773 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8555 | msgid "add entries from standard input to the index" |
| 8556 | msgstr "" |
| 8557 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8558 | #: builtin/update-index.c:777 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8559 | msgid "repopulate stages #2 and #3 for the listed paths" |
| 8560 | msgstr "" |
| 8561 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8562 | #: builtin/update-index.c:781 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8563 | msgid "only update entries that differ from HEAD" |
| 8564 | msgstr "" |
| 8565 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8566 | #: builtin/update-index.c:785 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8567 | msgid "ignore files missing from worktree" |
| 8568 | msgstr "" |
| 8569 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8570 | #: builtin/update-index.c:788 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8571 | msgid "report actions to standard output" |
| 8572 | msgstr "" |
| 8573 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8574 | #: builtin/update-index.c:790 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8575 | msgid "(for porcelains) forget saved unresolved conflicts" |
| 8576 | msgstr "" |
| 8577 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8578 | #: builtin/update-index.c:794 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8579 | msgid "write index in this format" |
| 8580 | msgstr "" |
| 8581 | |
| 8582 | #: builtin/update-ref.c:7 |
| 8583 | msgid "git update-ref [options] -d <refname> [<oldval>]" |
| 8584 | msgstr "" |
| 8585 | |
| 8586 | #: builtin/update-ref.c:8 |
| 8587 | msgid "git update-ref [options] <refname> <newval> [<oldval>]" |
| 8588 | msgstr "" |
| 8589 | |
| 8590 | #: builtin/update-ref.c:19 |
| 8591 | msgid "delete the reference" |
| 8592 | msgstr "" |
| 8593 | |
| 8594 | #: builtin/update-ref.c:21 |
| 8595 | msgid "update <refname> not the one it points to" |
| 8596 | msgstr "" |
| 8597 | |
| 8598 | #: builtin/update-server-info.c:6 |
| 8599 | msgid "git update-server-info [--force]" |
| 8600 | msgstr "" |
| 8601 | |
| 8602 | #: builtin/update-server-info.c:14 |
| 8603 | msgid "update the info files from scratch" |
| 8604 | msgstr "" |
| 8605 | |
| 8606 | #: builtin/verify-pack.c:56 |
| 8607 | msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." |
| 8608 | msgstr "" |
| 8609 | |
| 8610 | #: builtin/verify-pack.c:66 |
| 8611 | msgid "verbose" |
| 8612 | msgstr "" |
| 8613 | |
| 8614 | #: builtin/verify-pack.c:68 |
| 8615 | msgid "show statistics only" |
| 8616 | msgstr "" |
| 8617 | |
| 8618 | #: builtin/verify-tag.c:17 |
| 8619 | msgid "git verify-tag [-v|--verbose] <tag>..." |
| 8620 | msgstr "" |
| 8621 | |
| 8622 | #: builtin/verify-tag.c:73 |
| 8623 | msgid "print tag contents" |
| 8624 | msgstr "" |
| 8625 | |
| 8626 | #: builtin/write-tree.c:13 |
| 8627 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
| 8628 | msgstr "" |
| 8629 | |
| 8630 | #: builtin/write-tree.c:26 |
| 8631 | msgid "<prefix>/" |
| 8632 | msgstr "" |
| 8633 | |
| 8634 | #: builtin/write-tree.c:27 |
| 8635 | msgid "write tree object for a subdirectory <prefix>" |
| 8636 | msgstr "" |
| 8637 | |
| 8638 | #: builtin/write-tree.c:30 |
| 8639 | msgid "only useful for debugging" |
| 8640 | msgstr "" |
| 8641 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8642 | #: git.c:16 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8643 | msgid "" |
| 8644 | "'git help -a' and 'git help -g' lists available subcommands and some\n" |
| 8645 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
| 8646 | "to read about a specific subcommand or concept." |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8647 | msgstr "" |
| 8648 | |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 8649 | #: parse-options.h:156 |
| 8650 | msgid "no-op (backward compatibility)" |
| 8651 | msgstr "" |
| 8652 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8653 | #: parse-options.h:232 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 8654 | msgid "be more verbose" |
| 8655 | msgstr "" |
| 8656 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8657 | #: parse-options.h:234 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 8658 | msgid "be more quiet" |
| 8659 | msgstr "" |
| 8660 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8661 | #: parse-options.h:240 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 8662 | msgid "use <n> digits to display SHA-1s" |
| 8663 | msgstr "" |
| 8664 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8665 | #: common-cmds.h:8 |
| 8666 | msgid "Add file contents to the index" |
| 8667 | msgstr "" |
| 8668 | |
| 8669 | #: common-cmds.h:9 |
| 8670 | msgid "Find by binary search the change that introduced a bug" |
| 8671 | msgstr "" |
| 8672 | |
| 8673 | #: common-cmds.h:10 |
| 8674 | msgid "List, create, or delete branches" |
| 8675 | msgstr "" |
| 8676 | |
| 8677 | #: common-cmds.h:11 |
| 8678 | msgid "Checkout a branch or paths to the working tree" |
| 8679 | msgstr "" |
| 8680 | |
| 8681 | #: common-cmds.h:12 |
| 8682 | msgid "Clone a repository into a new directory" |
| 8683 | msgstr "" |
| 8684 | |
| 8685 | #: common-cmds.h:13 |
| 8686 | msgid "Record changes to the repository" |
| 8687 | msgstr "" |
| 8688 | |
| 8689 | #: common-cmds.h:14 |
| 8690 | msgid "Show changes between commits, commit and working tree, etc" |
| 8691 | msgstr "" |
| 8692 | |
| 8693 | #: common-cmds.h:15 |
| 8694 | msgid "Download objects and refs from another repository" |
| 8695 | msgstr "" |
| 8696 | |
| 8697 | #: common-cmds.h:16 |
| 8698 | msgid "Print lines matching a pattern" |
| 8699 | msgstr "" |
| 8700 | |
| 8701 | #: common-cmds.h:17 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8702 | msgid "Create an empty Git repository or reinitialize an existing one" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8703 | msgstr "" |
| 8704 | |
| 8705 | #: common-cmds.h:18 |
| 8706 | msgid "Show commit logs" |
| 8707 | msgstr "" |
| 8708 | |
| 8709 | #: common-cmds.h:19 |
| 8710 | msgid "Join two or more development histories together" |
| 8711 | msgstr "" |
| 8712 | |
| 8713 | #: common-cmds.h:20 |
| 8714 | msgid "Move or rename a file, a directory, or a symlink" |
| 8715 | msgstr "" |
| 8716 | |
| 8717 | #: common-cmds.h:21 |
| 8718 | msgid "Fetch from and merge with another repository or a local branch" |
| 8719 | msgstr "" |
| 8720 | |
| 8721 | #: common-cmds.h:22 |
| 8722 | msgid "Update remote refs along with associated objects" |
| 8723 | msgstr "" |
| 8724 | |
| 8725 | #: common-cmds.h:23 |
| 8726 | msgid "Forward-port local commits to the updated upstream head" |
| 8727 | msgstr "" |
| 8728 | |
| 8729 | #: common-cmds.h:24 |
| 8730 | msgid "Reset current HEAD to the specified state" |
| 8731 | msgstr "" |
| 8732 | |
| 8733 | #: common-cmds.h:25 |
| 8734 | msgid "Remove files from the working tree and from the index" |
| 8735 | msgstr "" |
| 8736 | |
| 8737 | #: common-cmds.h:26 |
| 8738 | msgid "Show various types of objects" |
| 8739 | msgstr "" |
| 8740 | |
| 8741 | #: common-cmds.h:27 |
| 8742 | msgid "Show the working tree status" |
| 8743 | msgstr "" |
| 8744 | |
| 8745 | #: common-cmds.h:28 |
| 8746 | msgid "Create, list, delete or verify a tag object signed with GPG" |
| 8747 | msgstr "" |
| 8748 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 8749 | #: git-am.sh:50 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8750 | msgid "You need to set your committer info first" |
| 8751 | msgstr "" |
| 8752 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8753 | #: git-am.sh:95 |
| 8754 | msgid "" |
| 8755 | "You seem to have moved HEAD since the last 'am' failure.\n" |
| 8756 | "Not rewinding to ORIG_HEAD" |
| 8757 | msgstr "" |
| 8758 | |
| 8759 | #: git-am.sh:105 |
| 8760 | #, sh-format |
| 8761 | msgid "" |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8762 | "When you have resolved this problem, run \"$cmdline --resolved\".\n" |
| 8763 | "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" |
| 8764 | "To restore the original branch and stop patching, run \"$cmdline --abort\"." |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8765 | msgstr "" |
| 8766 | |
| 8767 | #: git-am.sh:121 |
| 8768 | msgid "Cannot fall back to three-way merge." |
| 8769 | msgstr "" |
| 8770 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 8771 | #: git-am.sh:137 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8772 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
| 8773 | msgstr "" |
| 8774 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8775 | #: git-am.sh:139 |
| 8776 | msgid "Using index info to reconstruct a base tree..." |
| 8777 | msgstr "" |
| 8778 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 8779 | #: git-am.sh:154 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8780 | msgid "" |
| 8781 | "Did you hand edit your patch?\n" |
| 8782 | "It does not apply to blobs recorded in its index." |
| 8783 | msgstr "" |
| 8784 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 8785 | #: git-am.sh:163 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8786 | msgid "Falling back to patching base and 3-way merge..." |
| 8787 | msgstr "" |
| 8788 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8789 | #: git-am.sh:179 |
| 8790 | msgid "Failed to merge in the changes." |
| 8791 | msgstr "" |
| 8792 | |
| 8793 | #: git-am.sh:274 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8794 | msgid "Only one StGIT patch series can be applied at once" |
| 8795 | msgstr "" |
| 8796 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8797 | #: git-am.sh:361 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8798 | #, sh-format |
| 8799 | msgid "Patch format $patch_format is not supported." |
| 8800 | msgstr "" |
| 8801 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8802 | #: git-am.sh:363 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8803 | msgid "Patch format detection failed." |
| 8804 | msgstr "" |
| 8805 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8806 | #: git-am.sh:389 |
| 8807 | msgid "" |
| 8808 | "The -b/--binary option has been a no-op for long time, and\n" |
| 8809 | "it will be removed. Please do not use it anymore." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8810 | msgstr "" |
| 8811 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8812 | #: git-am.sh:477 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8813 | #, sh-format |
| 8814 | msgid "previous rebase directory $dotest still exists but mbox given." |
| 8815 | msgstr "" |
| 8816 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8817 | #: git-am.sh:482 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8818 | msgid "Please make up your mind. --skip or --abort?" |
| 8819 | msgstr "" |
| 8820 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8821 | #: git-am.sh:509 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8822 | msgid "Resolve operation not in progress, we are not resuming." |
| 8823 | msgstr "" |
| 8824 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8825 | #: git-am.sh:575 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8826 | #, sh-format |
| 8827 | msgid "Dirty index: cannot apply patches (dirty: $files)" |
| 8828 | msgstr "" |
| 8829 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8830 | #: git-am.sh:679 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8831 | #, sh-format |
| 8832 | msgid "" |
| 8833 | "Patch is empty. Was it split wrong?\n" |
| 8834 | "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" |
| 8835 | "To restore the original branch and stop patching run \"$cmdline --abort\"." |
| 8836 | msgstr "" |
| 8837 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8838 | #: git-am.sh:706 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8839 | msgid "Patch does not have a valid e-mail address." |
| 8840 | msgstr "" |
| 8841 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8842 | #: git-am.sh:753 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8843 | msgid "cannot be interactive without stdin connected to a terminal." |
| 8844 | msgstr "" |
| 8845 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8846 | #: git-am.sh:757 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8847 | msgid "Commit Body is:" |
| 8848 | msgstr "" |
| 8849 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8850 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
| 8851 | #. in your translation. The program will only accept English |
| 8852 | #. input at this point. |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8853 | #: git-am.sh:764 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8854 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
| 8855 | msgstr "" |
| 8856 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8857 | #: git-am.sh:800 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8858 | #, sh-format |
| 8859 | msgid "Applying: $FIRSTLINE" |
| 8860 | msgstr "" |
| 8861 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8862 | #: git-am.sh:821 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8863 | msgid "" |
| 8864 | "No changes - did you forget to use 'git add'?\n" |
| 8865 | "If there is nothing left to stage, chances are that something else\n" |
| 8866 | "already introduced the same changes; you might want to skip this patch." |
| 8867 | msgstr "" |
| 8868 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8869 | #: git-am.sh:829 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8870 | msgid "" |
| 8871 | "You still have unmerged paths in your index\n" |
| 8872 | "did you forget to use 'git add'?" |
| 8873 | msgstr "" |
| 8874 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8875 | #: git-am.sh:845 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8876 | msgid "No changes -- Patch already applied." |
| 8877 | msgstr "" |
| 8878 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8879 | #: git-am.sh:855 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8880 | #, sh-format |
| 8881 | msgid "Patch failed at $msgnum $FIRSTLINE" |
| 8882 | msgstr "" |
| 8883 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8884 | #: git-am.sh:858 |
| 8885 | #, sh-format |
| 8886 | msgid "" |
| 8887 | "The copy of the patch that failed is found in:\n" |
| 8888 | " $dotest/patch" |
| 8889 | msgstr "" |
| 8890 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8891 | #: git-am.sh:876 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8892 | msgid "applying to an empty history" |
| 8893 | msgstr "" |
| 8894 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8895 | #: git-bisect.sh:48 |
| 8896 | msgid "You need to start by \"git bisect start\"" |
| 8897 | msgstr "" |
| 8898 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8899 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
| 8900 | #. translation. The program will only accept English input |
| 8901 | #. at this point. |
| 8902 | #: git-bisect.sh:54 |
| 8903 | msgid "Do you want me to do it for you [Y/n]? " |
| 8904 | msgstr "" |
| 8905 | |
| 8906 | #: git-bisect.sh:95 |
| 8907 | #, sh-format |
| 8908 | msgid "unrecognised option: '$arg'" |
| 8909 | msgstr "" |
| 8910 | |
| 8911 | #: git-bisect.sh:99 |
| 8912 | #, sh-format |
| 8913 | msgid "'$arg' does not appear to be a valid revision" |
| 8914 | msgstr "" |
| 8915 | |
| 8916 | #: git-bisect.sh:117 |
| 8917 | msgid "Bad HEAD - I need a HEAD" |
| 8918 | msgstr "" |
| 8919 | |
| 8920 | #: git-bisect.sh:130 |
| 8921 | #, sh-format |
| 8922 | msgid "" |
| 8923 | "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." |
| 8924 | msgstr "" |
| 8925 | |
| 8926 | #: git-bisect.sh:140 |
| 8927 | msgid "won't bisect on seeked tree" |
| 8928 | msgstr "" |
| 8929 | |
| 8930 | #: git-bisect.sh:144 |
| 8931 | msgid "Bad HEAD - strange symbolic ref" |
| 8932 | msgstr "" |
| 8933 | |
| 8934 | #: git-bisect.sh:189 |
| 8935 | #, sh-format |
| 8936 | msgid "Bad bisect_write argument: $state" |
| 8937 | msgstr "" |
| 8938 | |
| 8939 | #: git-bisect.sh:218 |
| 8940 | #, sh-format |
| 8941 | msgid "Bad rev input: $arg" |
| 8942 | msgstr "" |
| 8943 | |
| 8944 | #: git-bisect.sh:232 |
| 8945 | msgid "Please call 'bisect_state' with at least one argument." |
| 8946 | msgstr "" |
| 8947 | |
| 8948 | #: git-bisect.sh:244 |
| 8949 | #, sh-format |
| 8950 | msgid "Bad rev input: $rev" |
| 8951 | msgstr "" |
| 8952 | |
| 8953 | #: git-bisect.sh:250 |
| 8954 | msgid "'git bisect bad' can take only one argument." |
| 8955 | msgstr "" |
| 8956 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8957 | #. have bad but not good. we could bisect although |
| 8958 | #. this is less optimum. |
| 8959 | #: git-bisect.sh:273 |
| 8960 | msgid "Warning: bisecting only with a bad commit." |
| 8961 | msgstr "" |
| 8962 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8963 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
| 8964 | #. translation. The program will only accept English input |
| 8965 | #. at this point. |
| 8966 | #: git-bisect.sh:279 |
| 8967 | msgid "Are you sure [Y/n]? " |
| 8968 | msgstr "" |
| 8969 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8970 | #: git-bisect.sh:289 |
| 8971 | msgid "" |
| 8972 | "You need to give me at least one good and one bad revisions.\n" |
| 8973 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
| 8974 | msgstr "" |
| 8975 | |
| 8976 | #: git-bisect.sh:292 |
| 8977 | msgid "" |
| 8978 | "You need to start by \"git bisect start\".\n" |
| 8979 | "You then need to give me at least one good and one bad revisions.\n" |
| 8980 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
| 8981 | msgstr "" |
| 8982 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8983 | #: git-bisect.sh:363 git-bisect.sh:490 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8984 | msgid "We are not bisecting." |
| 8985 | msgstr "" |
| 8986 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8987 | #: git-bisect.sh:370 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8988 | #, sh-format |
| 8989 | msgid "'$invalid' is not a valid commit" |
| 8990 | msgstr "" |
| 8991 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8992 | #: git-bisect.sh:379 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8993 | #, sh-format |
| 8994 | msgid "" |
| 8995 | "Could not check out original HEAD '$branch'.\n" |
| 8996 | "Try 'git bisect reset <commit>'." |
| 8997 | msgstr "" |
| 8998 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8999 | #: git-bisect.sh:406 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9000 | msgid "No logfile given" |
| 9001 | msgstr "" |
| 9002 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9003 | #: git-bisect.sh:407 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9004 | #, sh-format |
| 9005 | msgid "cannot read $file for replaying" |
| 9006 | msgstr "" |
| 9007 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9008 | #: git-bisect.sh:424 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9009 | msgid "?? what are you talking about?" |
| 9010 | msgstr "" |
| 9011 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9012 | #: git-bisect.sh:436 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9013 | #, sh-format |
| 9014 | msgid "running $command" |
| 9015 | msgstr "" |
| 9016 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9017 | #: git-bisect.sh:443 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9018 | #, sh-format |
| 9019 | msgid "" |
| 9020 | "bisect run failed:\n" |
| 9021 | "exit code $res from '$command' is < 0 or >= 128" |
| 9022 | msgstr "" |
| 9023 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9024 | #: git-bisect.sh:469 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9025 | msgid "bisect run cannot continue any more" |
| 9026 | msgstr "" |
| 9027 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9028 | #: git-bisect.sh:475 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9029 | #, sh-format |
| 9030 | msgid "" |
| 9031 | "bisect run failed:\n" |
| 9032 | "'bisect_state $state' exited with error code $res" |
| 9033 | msgstr "" |
| 9034 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9035 | #: git-bisect.sh:482 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9036 | msgid "bisect run success" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9037 | msgstr "" |
| 9038 | |
| 9039 | #: git-pull.sh:21 |
| 9040 | msgid "" |
| 9041 | "Pull is not possible because you have unmerged files.\n" |
| 9042 | "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" |
| 9043 | "as appropriate to mark resolution, or use 'git commit -a'." |
| 9044 | msgstr "" |
| 9045 | |
| 9046 | #: git-pull.sh:25 |
| 9047 | msgid "Pull is not possible because you have unmerged files." |
| 9048 | msgstr "" |
| 9049 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9050 | #: git-pull.sh:203 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9051 | msgid "updating an unborn branch with changes added to the index" |
| 9052 | msgstr "" |
| 9053 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9054 | #. The fetch involved updating the current branch. |
| 9055 | #. The working tree and the index file is still based on the |
| 9056 | #. $orig_head commit, but we are merging into $curr_head. |
| 9057 | #. First update the working tree to match $curr_head. |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9058 | #: git-pull.sh:235 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9059 | #, sh-format |
| 9060 | msgid "" |
| 9061 | "Warning: fetch updated the current branch head.\n" |
| 9062 | "Warning: fast-forwarding your working tree from\n" |
| 9063 | "Warning: commit $orig_head." |
| 9064 | msgstr "" |
| 9065 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9066 | #: git-pull.sh:260 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9067 | msgid "Cannot merge multiple branches into empty head" |
| 9068 | msgstr "" |
| 9069 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9070 | #: git-pull.sh:264 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9071 | msgid "Cannot rebase onto multiple branches" |
| 9072 | msgstr "" |
| 9073 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9074 | #: git-rebase.sh:53 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9075 | msgid "" |
| 9076 | "When you have resolved this problem, run \"git rebase --continue\".\n" |
| 9077 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" |
| 9078 | "To check out the original branch and stop rebasing, run \"git rebase --abort" |
| 9079 | "\"." |
| 9080 | msgstr "" |
| 9081 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9082 | #: git-rebase.sh:160 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9083 | msgid "The pre-rebase hook refused to rebase." |
| 9084 | msgstr "" |
| 9085 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9086 | #: git-rebase.sh:165 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9087 | msgid "It looks like git-am is in progress. Cannot rebase." |
| 9088 | msgstr "" |
| 9089 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9090 | #: git-rebase.sh:296 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9091 | msgid "The --exec option must be used with the --interactive option" |
| 9092 | msgstr "" |
| 9093 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9094 | #: git-rebase.sh:301 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9095 | msgid "No rebase in progress?" |
| 9096 | msgstr "" |
| 9097 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9098 | #: git-rebase.sh:312 |
| 9099 | msgid "The --edit-todo action can only be used during interactive rebase." |
| 9100 | msgstr "" |
| 9101 | |
| 9102 | #: git-rebase.sh:319 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9103 | msgid "Cannot read HEAD" |
| 9104 | msgstr "" |
| 9105 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9106 | #: git-rebase.sh:322 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9107 | msgid "" |
| 9108 | "You must edit all merge conflicts and then\n" |
| 9109 | "mark them as resolved using git add" |
| 9110 | msgstr "" |
| 9111 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9112 | #: git-rebase.sh:340 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9113 | #, sh-format |
| 9114 | msgid "Could not move back to $head_name" |
| 9115 | msgstr "" |
| 9116 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9117 | #: git-rebase.sh:359 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9118 | #, sh-format |
| 9119 | msgid "" |
| 9120 | "It seems that there is already a $state_dir_base directory, and\n" |
| 9121 | "I wonder if you are in the middle of another rebase. If that is the\n" |
| 9122 | "case, please try\n" |
| 9123 | "\t$cmd_live_rebase\n" |
| 9124 | "If that is not the case, please\n" |
| 9125 | "\t$cmd_clear_stale_rebase\n" |
| 9126 | "and run me again. I am stopping in case you still have something\n" |
| 9127 | "valuable there." |
| 9128 | msgstr "" |
| 9129 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9130 | #: git-rebase.sh:404 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9131 | #, sh-format |
| 9132 | msgid "invalid upstream $upstream_name" |
| 9133 | msgstr "" |
| 9134 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9135 | #: git-rebase.sh:428 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9136 | #, sh-format |
| 9137 | msgid "$onto_name: there are more than one merge bases" |
| 9138 | msgstr "" |
| 9139 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9140 | #: git-rebase.sh:431 git-rebase.sh:435 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9141 | #, sh-format |
| 9142 | msgid "$onto_name: there is no merge base" |
| 9143 | msgstr "" |
| 9144 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9145 | #: git-rebase.sh:440 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9146 | #, sh-format |
| 9147 | msgid "Does not point to a valid commit: $onto_name" |
| 9148 | msgstr "" |
| 9149 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9150 | #: git-rebase.sh:463 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9151 | #, sh-format |
| 9152 | msgid "fatal: no such branch: $branch_name" |
| 9153 | msgstr "" |
| 9154 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9155 | #: git-rebase.sh:483 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9156 | msgid "Please commit or stash them." |
| 9157 | msgstr "" |
| 9158 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9159 | #: git-rebase.sh:501 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9160 | #, sh-format |
| 9161 | msgid "Current branch $branch_name is up to date." |
| 9162 | msgstr "" |
| 9163 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9164 | #: git-rebase.sh:504 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9165 | #, sh-format |
| 9166 | msgid "Current branch $branch_name is up to date, rebase forced." |
| 9167 | msgstr "" |
| 9168 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9169 | #: git-rebase.sh:515 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9170 | #, sh-format |
| 9171 | msgid "Changes from $mb to $onto:" |
| 9172 | msgstr "" |
| 9173 | |
| 9174 | #. Detach HEAD and reset the tree |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9175 | #: git-rebase.sh:524 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9176 | msgid "First, rewinding head to replay your work on top of it..." |
| 9177 | msgstr "" |
| 9178 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9179 | #: git-rebase.sh:532 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9180 | #, sh-format |
| 9181 | msgid "Fast-forwarded $branch_name to $onto_name." |
| 9182 | msgstr "" |
| 9183 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9184 | #: git-stash.sh:51 |
| 9185 | msgid "git stash clear with parameters is unimplemented" |
| 9186 | msgstr "" |
| 9187 | |
| 9188 | #: git-stash.sh:74 |
| 9189 | msgid "You do not have the initial commit yet" |
| 9190 | msgstr "" |
| 9191 | |
| 9192 | #: git-stash.sh:89 |
| 9193 | msgid "Cannot save the current index state" |
| 9194 | msgstr "" |
| 9195 | |
| 9196 | #: git-stash.sh:123 git-stash.sh:136 |
| 9197 | msgid "Cannot save the current worktree state" |
| 9198 | msgstr "" |
| 9199 | |
| 9200 | #: git-stash.sh:140 |
| 9201 | msgid "No changes selected" |
| 9202 | msgstr "" |
| 9203 | |
| 9204 | #: git-stash.sh:143 |
| 9205 | msgid "Cannot remove temporary index (can't happen)" |
| 9206 | msgstr "" |
| 9207 | |
| 9208 | #: git-stash.sh:156 |
| 9209 | msgid "Cannot record working tree state" |
| 9210 | msgstr "" |
| 9211 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9212 | #. TRANSLATORS: $option is an invalid option, like |
| 9213 | #. `--blah-blah'. The 7 spaces at the beginning of the |
| 9214 | #. second line correspond to "error: ". So you should line |
| 9215 | #. up the second line with however many characters the |
| 9216 | #. translation of "error: " takes in your language. E.g. in |
| 9217 | #. English this is: |
| 9218 | #. |
| 9219 | #. $ git stash save --blah-blah 2>&1 | head -n 2 |
| 9220 | #. error: unknown option for 'stash save': --blah-blah |
| 9221 | #. To provide a message, use git stash save -- '--blah-blah' |
| 9222 | #: git-stash.sh:202 |
| 9223 | #, sh-format |
| 9224 | msgid "" |
| 9225 | "error: unknown option for 'stash save': $option\n" |
| 9226 | " To provide a message, use git stash save -- '$option'" |
| 9227 | msgstr "" |
| 9228 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9229 | #: git-stash.sh:223 |
| 9230 | msgid "No local changes to save" |
| 9231 | msgstr "" |
| 9232 | |
| 9233 | #: git-stash.sh:227 |
| 9234 | msgid "Cannot initialize stash" |
| 9235 | msgstr "" |
| 9236 | |
| 9237 | #: git-stash.sh:235 |
| 9238 | msgid "Cannot save the current status" |
| 9239 | msgstr "" |
| 9240 | |
| 9241 | #: git-stash.sh:253 |
| 9242 | msgid "Cannot remove worktree changes" |
| 9243 | msgstr "" |
| 9244 | |
| 9245 | #: git-stash.sh:352 |
| 9246 | msgid "No stash found." |
| 9247 | msgstr "" |
| 9248 | |
| 9249 | #: git-stash.sh:359 |
| 9250 | #, sh-format |
| 9251 | msgid "Too many revisions specified: $REV" |
| 9252 | msgstr "" |
| 9253 | |
| 9254 | #: git-stash.sh:365 |
| 9255 | #, sh-format |
| 9256 | msgid "$reference is not valid reference" |
| 9257 | msgstr "" |
| 9258 | |
| 9259 | #: git-stash.sh:393 |
| 9260 | #, sh-format |
| 9261 | msgid "'$args' is not a stash-like commit" |
| 9262 | msgstr "" |
| 9263 | |
| 9264 | #: git-stash.sh:404 |
| 9265 | #, sh-format |
| 9266 | msgid "'$args' is not a stash reference" |
| 9267 | msgstr "" |
| 9268 | |
| 9269 | #: git-stash.sh:412 |
| 9270 | msgid "unable to refresh index" |
| 9271 | msgstr "" |
| 9272 | |
| 9273 | #: git-stash.sh:416 |
| 9274 | msgid "Cannot apply a stash in the middle of a merge" |
| 9275 | msgstr "" |
| 9276 | |
| 9277 | #: git-stash.sh:424 |
| 9278 | msgid "Conflicts in index. Try without --index." |
| 9279 | msgstr "" |
| 9280 | |
| 9281 | #: git-stash.sh:426 |
| 9282 | msgid "Could not save index tree" |
| 9283 | msgstr "" |
| 9284 | |
| 9285 | #: git-stash.sh:460 |
| 9286 | msgid "Cannot unstage modified files" |
| 9287 | msgstr "" |
| 9288 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 9289 | #: git-stash.sh:475 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9290 | msgid "Index was not unstashed." |
| 9291 | msgstr "" |
| 9292 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9293 | #: git-stash.sh:492 |
| 9294 | #, sh-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 9295 | msgid "Dropped ${REV} ($s)" |
| 9296 | msgstr "" |
| 9297 | |
| 9298 | #: git-stash.sh:493 |
| 9299 | #, sh-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9300 | msgid "${REV}: Could not drop stash entry" |
| 9301 | msgstr "" |
| 9302 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 9303 | #: git-stash.sh:500 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9304 | msgid "No branch name specified" |
| 9305 | msgstr "" |
| 9306 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 9307 | #: git-stash.sh:571 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9308 | msgid "(To restore them type \"git stash apply\")" |
| 9309 | msgstr "" |
| 9310 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9311 | #: git-submodule.sh:91 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9312 | #, sh-format |
| 9313 | msgid "cannot strip one component off url '$remoteurl'" |
| 9314 | msgstr "" |
| 9315 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9316 | #: git-submodule.sh:196 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9317 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9318 | msgid "No submodule mapping found in .gitmodules for path '$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9319 | msgstr "" |
| 9320 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9321 | #: git-submodule.sh:239 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9322 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9323 | msgid "Clone of '$url' into submodule path '$sm_path' failed" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9324 | msgstr "" |
| 9325 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9326 | #: git-submodule.sh:251 |
Jiang Xin | a2c01b5 | 2012-03-16 20:28:05 +0800 | [diff] [blame] | 9327 | #, sh-format |
| 9328 | msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" |
| 9329 | msgstr "" |
| 9330 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9331 | #: git-submodule.sh:349 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9332 | #, sh-format |
| 9333 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" |
| 9334 | msgstr "" |
| 9335 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9336 | #: git-submodule.sh:366 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9337 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9338 | msgid "'$sm_path' already exists in the index" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9339 | msgstr "" |
| 9340 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9341 | #: git-submodule.sh:370 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9342 | #, sh-format |
| 9343 | msgid "" |
| 9344 | "The following path is ignored by one of your .gitignore files:\n" |
| 9345 | "$sm_path\n" |
| 9346 | "Use -f if you really want to add it." |
| 9347 | msgstr "" |
| 9348 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9349 | #: git-submodule.sh:388 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9350 | #, sh-format |
| 9351 | msgid "Adding existing repo at '$sm_path' to the index" |
| 9352 | msgstr "" |
| 9353 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9354 | #: git-submodule.sh:390 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9355 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9356 | msgid "'$sm_path' already exists and is not a valid git repo" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9357 | msgstr "" |
| 9358 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9359 | #: git-submodule.sh:398 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9360 | #, sh-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9361 | msgid "A git directory for '$sm_name' is found locally with remote(s):" |
| 9362 | msgstr "" |
| 9363 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9364 | #: git-submodule.sh:400 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9365 | #, sh-format |
| 9366 | msgid "" |
| 9367 | "If you want to reuse this local git directory instead of cloning again from" |
| 9368 | msgstr "" |
| 9369 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9370 | #: git-submodule.sh:402 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9371 | #, sh-format |
| 9372 | msgid "" |
| 9373 | "use the '--force' option. If the local git directory is not the correct repo" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9374 | msgstr "" |
| 9375 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9376 | #: git-submodule.sh:403 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9377 | #, sh-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9378 | msgid "" |
| 9379 | "or you are unsure what this means choose another name with the '--name' " |
| 9380 | "option." |
| 9381 | msgstr "" |
| 9382 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9383 | #: git-submodule.sh:405 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9384 | #, sh-format |
| 9385 | msgid "Reactivating local git directory for submodule '$sm_name'." |
| 9386 | msgstr "" |
| 9387 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9388 | #: git-submodule.sh:417 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9389 | #, sh-format |
| 9390 | msgid "Unable to checkout submodule '$sm_path'" |
| 9391 | msgstr "" |
| 9392 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9393 | #: git-submodule.sh:422 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9394 | #, sh-format |
| 9395 | msgid "Failed to add submodule '$sm_path'" |
| 9396 | msgstr "" |
| 9397 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9398 | #: git-submodule.sh:431 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9399 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9400 | msgid "Failed to register submodule '$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9401 | msgstr "" |
| 9402 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9403 | #: git-submodule.sh:474 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9404 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9405 | msgid "Entering '$prefix$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9406 | msgstr "" |
| 9407 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9408 | #: git-submodule.sh:488 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9409 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9410 | msgid "Stopping at '$sm_path'; script returned non-zero status." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9411 | msgstr "" |
| 9412 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9413 | #: git-submodule.sh:532 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9414 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9415 | msgid "No url found for submodule path '$sm_path' in .gitmodules" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9416 | msgstr "" |
| 9417 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9418 | #: git-submodule.sh:541 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9419 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9420 | msgid "Failed to register url for submodule path '$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9421 | msgstr "" |
| 9422 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9423 | #: git-submodule.sh:543 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9424 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9425 | msgid "Submodule '$name' ($url) registered for path '$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9426 | msgstr "" |
| 9427 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9428 | #: git-submodule.sh:551 |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 9429 | #, sh-format |
| 9430 | msgid "Failed to register update mode for submodule path '$sm_path'" |
| 9431 | msgstr "" |
| 9432 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9433 | #: git-submodule.sh:588 |
| 9434 | #, sh-format |
| 9435 | msgid "Use '.' if you really want to deinitialize all submodules" |
| 9436 | msgstr "" |
| 9437 | |
| 9438 | #: git-submodule.sh:603 |
| 9439 | #, sh-format |
| 9440 | msgid "Submodule work tree '$sm_path' contains a .git directory" |
| 9441 | msgstr "" |
| 9442 | |
| 9443 | #: git-submodule.sh:604 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9444 | #, sh-format |
| 9445 | msgid "" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9446 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
| 9447 | msgstr "" |
| 9448 | |
| 9449 | #: git-submodule.sh:610 |
| 9450 | #, sh-format |
| 9451 | msgid "" |
| 9452 | "Submodule work tree '$sm_path' contains local modifications; use '-f' to " |
| 9453 | "discard them" |
| 9454 | msgstr "" |
| 9455 | |
| 9456 | #: git-submodule.sh:613 |
| 9457 | #, sh-format |
| 9458 | msgid "Cleared directory '$sm_path'" |
| 9459 | msgstr "" |
| 9460 | |
| 9461 | #: git-submodule.sh:614 |
| 9462 | #, sh-format |
| 9463 | msgid "Could not remove submodule work tree '$sm_path'" |
| 9464 | msgstr "" |
| 9465 | |
| 9466 | #: git-submodule.sh:617 |
| 9467 | #, sh-format |
| 9468 | msgid "Could not create empty submodule directory '$sm_path'" |
| 9469 | msgstr "" |
| 9470 | |
| 9471 | #: git-submodule.sh:626 |
| 9472 | #, sh-format |
| 9473 | msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" |
| 9474 | msgstr "" |
| 9475 | |
| 9476 | #: git-submodule.sh:731 |
| 9477 | #, sh-format |
| 9478 | msgid "" |
| 9479 | "Submodule path '$prefix$sm_path' not initialized\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9480 | "Maybe you want to use 'update --init'?" |
| 9481 | msgstr "" |
| 9482 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9483 | #: git-submodule.sh:744 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9484 | #, sh-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9485 | msgid "Unable to find current revision in submodule path '$prefix$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9486 | msgstr "" |
| 9487 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9488 | #: git-submodule.sh:753 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9489 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9490 | msgid "Unable to fetch in submodule path '$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9491 | msgstr "" |
| 9492 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9493 | #: git-submodule.sh:777 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9494 | #, sh-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9495 | msgid "Unable to fetch in submodule path '$prefix$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9496 | msgstr "" |
| 9497 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9498 | #: git-submodule.sh:791 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9499 | #, sh-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9500 | msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9501 | msgstr "" |
| 9502 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9503 | #: git-submodule.sh:792 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9504 | #, sh-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9505 | msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9506 | msgstr "" |
| 9507 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9508 | #: git-submodule.sh:797 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9509 | #, sh-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9510 | msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9511 | msgstr "" |
| 9512 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9513 | #: git-submodule.sh:798 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9514 | #, sh-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9515 | msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9516 | msgstr "" |
| 9517 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9518 | #: git-submodule.sh:803 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9519 | #, sh-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9520 | msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9521 | msgstr "" |
| 9522 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9523 | #: git-submodule.sh:804 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9524 | #, sh-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9525 | msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9526 | msgstr "" |
| 9527 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9528 | #: git-submodule.sh:831 |
| 9529 | #, sh-format |
| 9530 | msgid "Failed to recurse into submodule path '$prefix$sm_path'" |
| 9531 | msgstr "" |
| 9532 | |
| 9533 | #: git-submodule.sh:939 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9534 | msgid "The --cached option cannot be used with the --files option" |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9535 | msgstr "" |
| 9536 | |
| 9537 | #. unexpected type |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9538 | #: git-submodule.sh:979 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9539 | #, sh-format |
| 9540 | msgid "unexpected mode $mod_dst" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9541 | msgstr "" |
| 9542 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9543 | #: git-submodule.sh:997 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9544 | #, sh-format |
| 9545 | msgid " Warn: $name doesn't contain commit $sha1_src" |
| 9546 | msgstr "" |
| 9547 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9548 | #: git-submodule.sh:1000 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9549 | #, sh-format |
| 9550 | msgid " Warn: $name doesn't contain commit $sha1_dst" |
| 9551 | msgstr "" |
| 9552 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9553 | #: git-submodule.sh:1003 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9554 | #, sh-format |
| 9555 | msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" |
| 9556 | msgstr "" |
| 9557 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9558 | #: git-submodule.sh:1028 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9559 | msgid "blob" |
| 9560 | msgstr "" |
| 9561 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9562 | #: git-submodule.sh:1066 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 9563 | msgid "Submodules changed but not updated:" |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9564 | msgstr "" |
| 9565 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9566 | #: git-submodule.sh:1068 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 9567 | msgid "Submodule changes to be committed:" |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9568 | msgstr "" |
| 9569 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9570 | #: git-submodule.sh:1153 |
| 9571 | #, sh-format |
| 9572 | msgid "Failed to recurse into submodule path '$sm_path'" |
| 9573 | msgstr "" |
| 9574 | |
| 9575 | #: git-submodule.sh:1216 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9576 | #, sh-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9577 | msgid "Synchronizing submodule url for '$prefix$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9578 | msgstr "" |