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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 11 | "POT-Creation-Date: 2013-08-06 14:10+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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 21 | #: advice.c:57 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 30 | #: advice.c:87 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 63 | #: archive.c:324 builtin/log.c:1173 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 71 | #: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292 |
| 72 | #: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673 |
| 73 | #: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77 |
| 74 | #: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408 |
| 75 | #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 107 | #: archive.c:345 builtin/archive.c:90 builtin/clone.c:85 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 115 | #: archive.c:347 builtin/archive.c:92 builtin/notes.c:487 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 198 | #: branch.c:216 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 199 | #, c-format |
| 200 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
| 201 | msgstr "" |
| 202 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 203 | #: branch.c:218 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 204 | #, c-format |
| 205 | msgid "the requested upstream branch '%s' does not exist" |
| 206 | msgstr "" |
| 207 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 208 | #: branch.c:220 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 220 | #: branch.c:265 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 221 | #, c-format |
| 222 | msgid "Not a valid object name: '%s'." |
| 223 | msgstr "" |
| 224 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 225 | #: branch.c:285 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 226 | #, c-format |
| 227 | msgid "Ambiguous object name: '%s'." |
| 228 | msgstr "" |
| 229 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 230 | #: branch.c:290 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 231 | #, c-format |
| 232 | msgid "Not a valid branch point: '%s'." |
| 233 | msgstr "" |
| 234 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 235 | #: branch.c:296 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 236 | msgid "Failed to lock ref for update" |
| 237 | msgstr "" |
| 238 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 239 | #: branch.c:314 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 253 | #: bundle.c:89 builtin/commit.c:697 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 262 | #: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331 |
| 263 | #: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364 |
| 264 | #: builtin/shortlog.c:156 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 290 | #: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 321 | #: commit.c:53 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 326 | #: commit.c:55 |
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 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 335 | #: connected.c:60 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 336 | msgid "Could not run 'git rev-list'" |
| 337 | msgstr "" |
| 338 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 339 | #: connected.c:80 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 340 | #, c-format |
| 341 | msgid "failed write to rev-list: %s" |
| 342 | msgstr "" |
| 343 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 344 | #: connected.c:88 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 438 | #: diff.c:3487 |
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 | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 445 | #: diff.c:3501 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 487 | #: help.c:210 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 492 | #: help.c:217 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 496 | #: help.c:233 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 497 | msgid "The most commonly used git commands are:" |
| 498 | msgstr "" |
| 499 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 500 | #: help.c:290 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 507 | #: help.c:347 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 511 | #: help.c:369 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 518 | #: help.c:374 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 523 | #: help.c:381 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 528 | #: help.c:385 help.c:444 |
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 | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 538 | #: help.c:440 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 539 | #, c-format |
| 540 | msgid "%s: %s - %s" |
| 541 | msgstr "" |
| 542 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 543 | #: merge.c:56 |
| 544 | msgid "failed to read the cache" |
| 545 | msgstr "" |
| 546 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 547 | #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 548 | #: builtin/clone.c:656 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 549 | msgid "unable to write new index file" |
| 550 | msgstr "" |
| 551 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 552 | #: merge-recursive.c:190 |
| 553 | #, c-format |
| 554 | msgid "(bad commit)\n" |
| 555 | msgstr "" |
| 556 | |
| 557 | #: merge-recursive.c:206 |
| 558 | #, c-format |
| 559 | msgid "addinfo_cache failed for path '%s'" |
| 560 | msgstr "" |
| 561 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 562 | #: merge-recursive.c:269 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 563 | msgid "error building trees" |
| 564 | msgstr "" |
| 565 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 566 | #: merge-recursive.c:673 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 567 | #, c-format |
| 568 | msgid "failed to create path '%s'%s" |
| 569 | msgstr "" |
| 570 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 571 | #: merge-recursive.c:684 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 572 | #, c-format |
| 573 | msgid "Removing %s to make room for subdirectory\n" |
| 574 | msgstr "" |
| 575 | |
| 576 | #. something else exists |
| 577 | #. .. but not some other error (who really cares what?) |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 578 | #: merge-recursive.c:698 merge-recursive.c:719 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 579 | msgid ": perhaps a D/F conflict?" |
| 580 | msgstr "" |
| 581 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 582 | #: merge-recursive.c:709 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 583 | #, c-format |
| 584 | msgid "refusing to lose untracked file at '%s'" |
| 585 | msgstr "" |
| 586 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 587 | #: merge-recursive.c:749 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 588 | #, c-format |
| 589 | msgid "cannot read object %s '%s'" |
| 590 | msgstr "" |
| 591 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 592 | #: merge-recursive.c:751 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 593 | #, c-format |
| 594 | msgid "blob expected for %s '%s'" |
| 595 | msgstr "" |
| 596 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 597 | #: merge-recursive.c:774 builtin/clone.c:312 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 598 | #, c-format |
| 599 | msgid "failed to open '%s'" |
| 600 | msgstr "" |
| 601 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 602 | #: merge-recursive.c:782 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 603 | #, c-format |
| 604 | msgid "failed to symlink '%s'" |
| 605 | msgstr "" |
| 606 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 607 | #: merge-recursive.c:785 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 608 | #, c-format |
| 609 | msgid "do not know what to do with %06o %s '%s'" |
| 610 | msgstr "" |
| 611 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 612 | #: merge-recursive.c:923 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 613 | msgid "Failed to execute internal merge" |
| 614 | msgstr "" |
| 615 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 616 | #: merge-recursive.c:927 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 617 | #, c-format |
| 618 | msgid "Unable to add %s to database" |
| 619 | msgstr "" |
| 620 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 621 | #: merge-recursive.c:943 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 622 | msgid "unsupported object type in the tree" |
| 623 | msgstr "" |
| 624 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 625 | #: merge-recursive.c:1022 merge-recursive.c:1036 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 626 | #, c-format |
| 627 | msgid "" |
| 628 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
| 629 | "in tree." |
| 630 | msgstr "" |
| 631 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 632 | #: merge-recursive.c:1028 merge-recursive.c:1041 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 633 | #, c-format |
| 634 | msgid "" |
| 635 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
| 636 | "in tree at %s." |
| 637 | msgstr "" |
| 638 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 639 | #: merge-recursive.c:1082 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 640 | msgid "rename" |
| 641 | msgstr "" |
| 642 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 643 | #: merge-recursive.c:1082 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 644 | msgid "renamed" |
| 645 | msgstr "" |
| 646 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 647 | #: merge-recursive.c:1138 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 648 | #, c-format |
| 649 | msgid "%s is a directory in %s adding as %s instead" |
| 650 | msgstr "" |
| 651 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 652 | #: merge-recursive.c:1160 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 653 | #, c-format |
| 654 | msgid "" |
| 655 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
| 656 | "\"->\"%s\" in \"%s\"%s" |
| 657 | msgstr "" |
| 658 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 659 | #: merge-recursive.c:1165 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 660 | msgid " (left unresolved)" |
| 661 | msgstr "" |
| 662 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 663 | #: merge-recursive.c:1219 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 664 | #, c-format |
| 665 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
| 666 | msgstr "" |
| 667 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 668 | #: merge-recursive.c:1249 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 669 | #, c-format |
| 670 | msgid "Renaming %s to %s and %s to %s instead" |
| 671 | msgstr "" |
| 672 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 673 | #: merge-recursive.c:1448 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 674 | #, c-format |
| 675 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
| 676 | msgstr "" |
| 677 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 678 | #: merge-recursive.c:1458 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 679 | #, c-format |
| 680 | msgid "Adding merged %s" |
| 681 | msgstr "" |
| 682 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 683 | #: merge-recursive.c:1463 merge-recursive.c:1661 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 684 | #, c-format |
| 685 | msgid "Adding as %s instead" |
| 686 | msgstr "" |
| 687 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 688 | #: merge-recursive.c:1514 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 689 | #, c-format |
| 690 | msgid "cannot read object %s" |
| 691 | msgstr "" |
| 692 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 693 | #: merge-recursive.c:1517 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 694 | #, c-format |
| 695 | msgid "object %s is not a blob" |
| 696 | msgstr "" |
| 697 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 698 | #: merge-recursive.c:1565 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 699 | msgid "modify" |
| 700 | msgstr "" |
| 701 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 702 | #: merge-recursive.c:1565 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 703 | msgid "modified" |
| 704 | msgstr "" |
| 705 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 706 | #: merge-recursive.c:1575 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 707 | msgid "content" |
| 708 | msgstr "" |
| 709 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 710 | #: merge-recursive.c:1582 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 711 | msgid "add/add" |
| 712 | msgstr "" |
| 713 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 714 | #: merge-recursive.c:1616 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 715 | #, c-format |
| 716 | msgid "Skipped %s (merged same as existing)" |
| 717 | msgstr "" |
| 718 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 719 | #: merge-recursive.c:1630 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 720 | #, c-format |
| 721 | msgid "Auto-merging %s" |
| 722 | msgstr "" |
| 723 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 724 | #: merge-recursive.c:1634 git-submodule.sh:1118 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 725 | msgid "submodule" |
| 726 | msgstr "" |
| 727 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 728 | #: merge-recursive.c:1635 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 729 | #, c-format |
| 730 | msgid "CONFLICT (%s): Merge conflict in %s" |
| 731 | msgstr "" |
| 732 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 733 | #: merge-recursive.c:1725 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 734 | #, c-format |
| 735 | msgid "Removing %s" |
| 736 | msgstr "" |
| 737 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 738 | #: merge-recursive.c:1750 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 739 | msgid "file/directory" |
| 740 | msgstr "" |
| 741 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 742 | #: merge-recursive.c:1756 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 743 | msgid "directory/file" |
| 744 | msgstr "" |
| 745 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 746 | #: merge-recursive.c:1761 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 747 | #, c-format |
| 748 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
| 749 | msgstr "" |
| 750 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 751 | #: merge-recursive.c:1771 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 752 | #, c-format |
| 753 | msgid "Adding %s" |
| 754 | msgstr "" |
| 755 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 756 | #: merge-recursive.c:1788 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 757 | msgid "Fatal merge failure, shouldn't happen." |
| 758 | msgstr "" |
| 759 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 760 | #: merge-recursive.c:1807 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 761 | msgid "Already up-to-date!" |
| 762 | msgstr "" |
| 763 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 764 | #: merge-recursive.c:1816 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 765 | #, c-format |
| 766 | msgid "merging of trees %s and %s failed" |
| 767 | msgstr "" |
| 768 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 769 | #: merge-recursive.c:1846 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 770 | #, c-format |
| 771 | msgid "Unprocessed path??? %s" |
| 772 | msgstr "" |
| 773 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 774 | #: merge-recursive.c:1891 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 775 | msgid "Merging:" |
| 776 | msgstr "" |
| 777 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 778 | #: merge-recursive.c:1904 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 779 | #, c-format |
Jiang Xin | bb2ba06 | 2012-08-06 23:48:08 +0800 | [diff] [blame] | 780 | msgid "found %u common ancestor:" |
| 781 | msgid_plural "found %u common ancestors:" |
| 782 | msgstr[0] "" |
| 783 | msgstr[1] "" |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 784 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 785 | #: merge-recursive.c:1941 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 786 | msgid "merge returned no commit" |
| 787 | msgstr "" |
| 788 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 789 | #: merge-recursive.c:1998 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 790 | #, c-format |
| 791 | msgid "Could not parse object '%s'" |
| 792 | msgstr "" |
| 793 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 794 | #: merge-recursive.c:2010 builtin/merge.c:672 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 795 | msgid "Unable to write index." |
| 796 | msgstr "" |
| 797 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 798 | #: notes-utils.c:40 |
| 799 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
| 800 | msgstr "" |
| 801 | |
| 802 | #: notes-utils.c:81 |
| 803 | #, c-format |
| 804 | msgid "Bad notes.rewriteMode value: '%s'" |
| 805 | msgstr "" |
| 806 | |
| 807 | #: notes-utils.c:91 |
| 808 | #, c-format |
| 809 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
| 810 | msgstr "" |
| 811 | |
| 812 | #. TRANSLATORS: The first %s is the name of the |
| 813 | #. environment variable, the second %s is its value |
| 814 | #: notes-utils.c:118 |
| 815 | #, c-format |
| 816 | msgid "Bad %s value: '%s'" |
| 817 | msgstr "" |
| 818 | |
| 819 | #: object.c:204 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 820 | #, c-format |
| 821 | msgid "unable to parse object: %s" |
| 822 | msgstr "" |
| 823 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 824 | #: parse-options.c:489 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 825 | msgid "..." |
| 826 | msgstr "" |
| 827 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 828 | #: parse-options.c:507 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 829 | #, c-format |
| 830 | msgid "usage: %s" |
| 831 | msgstr "" |
| 832 | |
| 833 | #. TRANSLATORS: the colon here should align with the |
| 834 | #. one in "usage: %s" translation |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 835 | #: parse-options.c:511 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 836 | #, c-format |
| 837 | msgid " or: %s" |
| 838 | msgstr "" |
| 839 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 840 | #: parse-options.c:514 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 841 | #, c-format |
| 842 | msgid " %s" |
| 843 | msgstr "" |
| 844 | |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 845 | #: parse-options.c:548 |
| 846 | msgid "-NUM" |
| 847 | msgstr "" |
| 848 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 849 | #: pathspec.c:83 |
| 850 | #, c-format |
| 851 | msgid "Path '%s' is in submodule '%.*s'" |
| 852 | msgstr "" |
| 853 | |
| 854 | #: pathspec.c:99 |
| 855 | #, c-format |
| 856 | msgid "'%s' is beyond a symbolic link" |
| 857 | msgstr "" |
| 858 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 859 | #: remote.c:1788 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 860 | #, c-format |
| 861 | msgid "Your branch is ahead of '%s' by %d commit.\n" |
| 862 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" |
| 863 | msgstr[0] "" |
| 864 | msgstr[1] "" |
| 865 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 866 | #: remote.c:1794 |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 867 | msgid " (use \"git push\" to publish your local commits)\n" |
| 868 | msgstr "" |
| 869 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 870 | #: remote.c:1797 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 871 | #, c-format |
| 872 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" |
| 873 | msgid_plural "" |
| 874 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" |
| 875 | msgstr[0] "" |
| 876 | msgstr[1] "" |
| 877 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 878 | #: remote.c:1805 |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 879 | msgid " (use \"git pull\" to update your local branch)\n" |
| 880 | msgstr "" |
| 881 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 882 | #: remote.c:1808 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 883 | #, c-format |
| 884 | msgid "" |
| 885 | "Your branch and '%s' have diverged,\n" |
| 886 | "and have %d and %d different commit each, respectively.\n" |
| 887 | msgid_plural "" |
| 888 | "Your branch and '%s' have diverged,\n" |
| 889 | "and have %d and %d different commits each, respectively.\n" |
| 890 | msgstr[0] "" |
| 891 | msgstr[1] "" |
| 892 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 893 | #: remote.c:1818 |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 894 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
| 895 | msgstr "" |
| 896 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 897 | #: run-command.c:80 |
| 898 | msgid "open /dev/null failed" |
| 899 | msgstr "" |
| 900 | |
| 901 | #: run-command.c:82 |
| 902 | #, c-format |
| 903 | msgid "dup2(%d,%d) failed" |
| 904 | msgstr "" |
| 905 | |
| 906 | #: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 |
| 907 | #: builtin/merge.c:1013 builtin/merge.c:1023 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 908 | #, c-format |
| 909 | msgid "Could not open '%s' for writing" |
| 910 | msgstr "" |
| 911 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 912 | #: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 |
| 913 | #: builtin/merge.c:1015 builtin/merge.c:1028 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 914 | #, c-format |
| 915 | msgid "Could not write to '%s'" |
| 916 | msgstr "" |
| 917 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 918 | #: sequencer.c:229 |
Jiang Xin | 2b911f8 | 2012-03-08 10:20:20 +0800 | [diff] [blame] | 919 | msgid "" |
| 920 | "after resolving the conflicts, mark the corrected paths\n" |
| 921 | "with 'git add <paths>' or 'git rm <paths>'" |
| 922 | msgstr "" |
| 923 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 924 | #: sequencer.c:232 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 925 | msgid "" |
| 926 | "after resolving the conflicts, mark the corrected paths\n" |
| 927 | "with 'git add <paths>' or 'git rm <paths>'\n" |
| 928 | "and commit the result with 'git commit'" |
| 929 | msgstr "" |
| 930 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 931 | #: sequencer.c:245 sequencer.c:869 sequencer.c:952 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 932 | #, c-format |
| 933 | msgid "Could not write to %s" |
| 934 | msgstr "" |
| 935 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 936 | #: sequencer.c:248 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 937 | #, c-format |
| 938 | msgid "Error wrapping up %s" |
| 939 | msgstr "" |
| 940 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 941 | #: sequencer.c:263 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 942 | msgid "Your local changes would be overwritten by cherry-pick." |
| 943 | msgstr "" |
| 944 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 945 | #: sequencer.c:265 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 946 | msgid "Your local changes would be overwritten by revert." |
| 947 | msgstr "" |
| 948 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 949 | #: sequencer.c:268 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 950 | msgid "Commit your changes or stash them to proceed." |
| 951 | msgstr "" |
| 952 | |
| 953 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 954 | #: sequencer.c:324 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 955 | #, c-format |
| 956 | msgid "%s: Unable to write new index file" |
| 957 | msgstr "" |
| 958 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 959 | #: sequencer.c:355 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 960 | msgid "Could not resolve HEAD commit\n" |
| 961 | msgstr "" |
| 962 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 963 | #: sequencer.c:377 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 964 | msgid "Unable to update cache tree\n" |
| 965 | msgstr "" |
| 966 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 967 | #: sequencer.c:422 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 968 | #, c-format |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 969 | msgid "Could not parse commit %s\n" |
| 970 | msgstr "" |
| 971 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 972 | #: sequencer.c:427 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 973 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 974 | msgid "Could not parse parent commit %s\n" |
| 975 | msgstr "" |
| 976 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 977 | #: sequencer.c:493 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 978 | msgid "Your index file is unmerged." |
| 979 | msgstr "" |
| 980 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 981 | #: sequencer.c:512 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 982 | #, c-format |
| 983 | msgid "Commit %s is a merge but no -m option was given." |
| 984 | msgstr "" |
| 985 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 986 | #: sequencer.c:520 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 987 | #, c-format |
| 988 | msgid "Commit %s does not have parent %d" |
| 989 | msgstr "" |
| 990 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 991 | #: sequencer.c:524 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 992 | #, c-format |
| 993 | msgid "Mainline was specified but commit %s is not a merge." |
| 994 | msgstr "" |
| 995 | |
| 996 | #. TRANSLATORS: The first %s will be "revert" or |
| 997 | #. "cherry-pick", the second %s a SHA1 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 998 | #: sequencer.c:537 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 999 | #, c-format |
| 1000 | msgid "%s: cannot parse parent commit %s" |
| 1001 | msgstr "" |
| 1002 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1003 | #: sequencer.c:541 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1004 | #, c-format |
| 1005 | msgid "Cannot get commit message for %s" |
| 1006 | msgstr "" |
| 1007 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1008 | #: sequencer.c:627 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1009 | #, c-format |
| 1010 | msgid "could not revert %s... %s" |
| 1011 | msgstr "" |
| 1012 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1013 | #: sequencer.c:628 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1014 | #, c-format |
| 1015 | msgid "could not apply %s... %s" |
| 1016 | msgstr "" |
| 1017 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1018 | #: sequencer.c:664 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1019 | msgid "empty commit set passed" |
| 1020 | msgstr "" |
| 1021 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1022 | #: sequencer.c:672 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1023 | #, c-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1024 | msgid "git %s: failed to read the index" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1025 | msgstr "" |
| 1026 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1027 | #: sequencer.c:677 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1028 | #, c-format |
| 1029 | msgid "git %s: failed to refresh the index" |
| 1030 | msgstr "" |
| 1031 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1032 | #: sequencer.c:735 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1033 | #, c-format |
| 1034 | msgid "Cannot %s during a %s" |
| 1035 | msgstr "" |
| 1036 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1037 | #: sequencer.c:757 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1038 | #, c-format |
| 1039 | msgid "Could not parse line %d." |
| 1040 | msgstr "" |
| 1041 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1042 | #: sequencer.c:762 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1043 | msgid "No commits parsed." |
| 1044 | msgstr "" |
| 1045 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1046 | #: sequencer.c:775 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1047 | #, c-format |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 1048 | msgid "Could not open %s" |
| 1049 | msgstr "" |
| 1050 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1051 | #: sequencer.c:779 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 1052 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1053 | msgid "Could not read %s." |
| 1054 | msgstr "" |
| 1055 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1056 | #: sequencer.c:786 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1057 | #, c-format |
| 1058 | msgid "Unusable instruction sheet: %s" |
| 1059 | msgstr "" |
| 1060 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1061 | #: sequencer.c:814 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1062 | #, c-format |
| 1063 | msgid "Invalid key: %s" |
| 1064 | msgstr "" |
| 1065 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1066 | #: sequencer.c:817 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1067 | #, c-format |
| 1068 | msgid "Invalid value for %s: %s" |
| 1069 | msgstr "" |
| 1070 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1071 | #: sequencer.c:829 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1072 | #, c-format |
| 1073 | msgid "Malformed options sheet: %s" |
| 1074 | msgstr "" |
| 1075 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1076 | #: sequencer.c:850 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1077 | msgid "a cherry-pick or revert is already in progress" |
| 1078 | msgstr "" |
| 1079 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1080 | #: sequencer.c:851 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1081 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
| 1082 | msgstr "" |
| 1083 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1084 | #: sequencer.c:855 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1085 | #, c-format |
| 1086 | msgid "Could not create sequencer directory %s" |
| 1087 | msgstr "" |
| 1088 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1089 | #: sequencer.c:871 sequencer.c:956 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1090 | #, c-format |
| 1091 | msgid "Error wrapping up %s." |
| 1092 | msgstr "" |
| 1093 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1094 | #: sequencer.c:890 sequencer.c:1024 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1095 | msgid "no cherry-pick or revert in progress" |
| 1096 | msgstr "" |
| 1097 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1098 | #: sequencer.c:892 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1099 | msgid "cannot resolve HEAD" |
| 1100 | msgstr "" |
| 1101 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1102 | #: sequencer.c:894 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1103 | msgid "cannot abort from a branch yet to be born" |
| 1104 | msgstr "" |
| 1105 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1106 | #: sequencer.c:916 builtin/apply.c:4061 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1107 | #, c-format |
| 1108 | msgid "cannot open %s: %s" |
| 1109 | msgstr "" |
| 1110 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1111 | #: sequencer.c:919 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1112 | #, c-format |
| 1113 | msgid "cannot read %s: %s" |
| 1114 | msgstr "" |
| 1115 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1116 | #: sequencer.c:920 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1117 | msgid "unexpected end of file" |
| 1118 | msgstr "" |
| 1119 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1120 | #: sequencer.c:926 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1121 | #, c-format |
| 1122 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" |
| 1123 | msgstr "" |
| 1124 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1125 | #: sequencer.c:949 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1126 | #, c-format |
| 1127 | msgid "Could not format %s." |
| 1128 | msgstr "" |
| 1129 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1130 | #: sequencer.c:1092 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1131 | #, c-format |
| 1132 | msgid "%s: can't cherry-pick a %s" |
| 1133 | msgstr "" |
| 1134 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1135 | #: sequencer.c:1095 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1136 | #, c-format |
| 1137 | msgid "%s: bad revision" |
| 1138 | msgstr "" |
| 1139 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1140 | #: sequencer.c:1129 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1141 | msgid "Can't revert as initial commit" |
| 1142 | msgstr "" |
| 1143 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1144 | #: sequencer.c:1130 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1145 | msgid "Can't cherry-pick into empty head" |
| 1146 | msgstr "" |
| 1147 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1148 | #: sha1_name.c:440 |
| 1149 | msgid "" |
| 1150 | "Git normally never creates a ref that ends with 40 hex characters\n" |
| 1151 | "because it will be ignored when you just specify 40-hex. These refs\n" |
| 1152 | "may be created by mistake. For example,\n" |
| 1153 | "\n" |
| 1154 | " git checkout -b $br $(git rev-parse ...)\n" |
| 1155 | "\n" |
| 1156 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" |
| 1157 | "examine these refs and maybe delete them. Turn this message off by\n" |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 1158 | "running \"git config advice.objectNameWarning false\"" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1159 | msgstr "" |
| 1160 | |
| 1161 | #: sha1_name.c:1097 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 1162 | msgid "HEAD does not point to a branch" |
| 1163 | msgstr "" |
| 1164 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1165 | #: sha1_name.c:1100 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 1166 | #, c-format |
| 1167 | msgid "No such branch: '%s'" |
| 1168 | msgstr "" |
| 1169 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1170 | #: sha1_name.c:1102 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 1171 | #, c-format |
| 1172 | msgid "No upstream configured for branch '%s'" |
| 1173 | msgstr "" |
| 1174 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1175 | #: sha1_name.c:1106 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 1176 | #, c-format |
| 1177 | msgid "Upstream branch '%s' not stored as a remote-tracking branch" |
| 1178 | msgstr "" |
| 1179 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1180 | #: wrapper.c:408 |
| 1181 | #, c-format |
| 1182 | msgid "unable to access '%s': %s" |
| 1183 | msgstr "" |
| 1184 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1185 | #: wrapper.c:429 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 1186 | #, c-format |
| 1187 | msgid "unable to access '%s'" |
| 1188 | msgstr "" |
| 1189 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1190 | #: wrapper.c:440 |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 1191 | #, c-format |
| 1192 | msgid "unable to look up current user in the passwd file: %s" |
| 1193 | msgstr "" |
| 1194 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1195 | #: wrapper.c:441 |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 1196 | msgid "no such user" |
| 1197 | msgstr "" |
| 1198 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1199 | #: wt-status.c:141 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1200 | msgid "Unmerged paths:" |
| 1201 | msgstr "" |
| 1202 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1203 | #: wt-status.c:168 wt-status.c:195 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1204 | #, c-format |
| 1205 | msgid " (use \"git reset %s <file>...\" to unstage)" |
| 1206 | msgstr "" |
| 1207 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1208 | #: wt-status.c:170 wt-status.c:197 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1209 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
| 1210 | msgstr "" |
| 1211 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1212 | #: wt-status.c:174 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1213 | msgid " (use \"git add <file>...\" to mark resolution)" |
| 1214 | msgstr "" |
| 1215 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1216 | #: wt-status.c:176 wt-status.c:180 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1217 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
| 1218 | msgstr "" |
| 1219 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1220 | #: wt-status.c:178 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1221 | msgid " (use \"git rm <file>...\" to mark resolution)" |
| 1222 | msgstr "" |
| 1223 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1224 | #: wt-status.c:189 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1225 | msgid "Changes to be committed:" |
| 1226 | msgstr "" |
| 1227 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1228 | #: wt-status.c:207 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1229 | msgid "Changes not staged for commit:" |
| 1230 | msgstr "" |
| 1231 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1232 | #: wt-status.c:211 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1233 | msgid " (use \"git add <file>...\" to update what will be committed)" |
| 1234 | msgstr "" |
| 1235 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1236 | #: wt-status.c:213 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1237 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
| 1238 | msgstr "" |
| 1239 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1240 | #: wt-status.c:214 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1241 | msgid "" |
| 1242 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" |
| 1243 | msgstr "" |
| 1244 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1245 | #: wt-status.c:216 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1246 | msgid " (commit or discard the untracked or modified content in submodules)" |
| 1247 | msgstr "" |
| 1248 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1249 | #: wt-status.c:228 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1250 | #, c-format |
| 1251 | msgid " (use \"git %s <file>...\" to include in what will be committed)" |
| 1252 | msgstr "" |
| 1253 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1254 | #: wt-status.c:245 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1255 | msgid "bug" |
| 1256 | msgstr "" |
| 1257 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1258 | #: wt-status.c:250 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1259 | msgid "both deleted:" |
| 1260 | msgstr "" |
| 1261 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1262 | #: wt-status.c:251 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1263 | msgid "added by us:" |
| 1264 | msgstr "" |
| 1265 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1266 | #: wt-status.c:252 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1267 | msgid "deleted by them:" |
| 1268 | msgstr "" |
| 1269 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1270 | #: wt-status.c:253 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1271 | msgid "added by them:" |
| 1272 | msgstr "" |
| 1273 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1274 | #: wt-status.c:254 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1275 | msgid "deleted by us:" |
| 1276 | msgstr "" |
| 1277 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1278 | #: wt-status.c:255 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1279 | msgid "both added:" |
| 1280 | msgstr "" |
| 1281 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1282 | #: wt-status.c:256 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1283 | msgid "both modified:" |
| 1284 | msgstr "" |
| 1285 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1286 | #: wt-status.c:286 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1287 | msgid "new commits, " |
| 1288 | msgstr "" |
| 1289 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1290 | #: wt-status.c:288 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1291 | msgid "modified content, " |
| 1292 | msgstr "" |
| 1293 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1294 | #: wt-status.c:290 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1295 | msgid "untracked content, " |
| 1296 | msgstr "" |
| 1297 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1298 | #: wt-status.c:307 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1299 | #, c-format |
| 1300 | msgid "new file: %s" |
| 1301 | msgstr "" |
| 1302 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1303 | #: wt-status.c:310 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1304 | #, c-format |
| 1305 | msgid "copied: %s -> %s" |
| 1306 | msgstr "" |
| 1307 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1308 | #: wt-status.c:313 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1309 | #, c-format |
| 1310 | msgid "deleted: %s" |
| 1311 | msgstr "" |
| 1312 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1313 | #: wt-status.c:316 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1314 | #, c-format |
| 1315 | msgid "modified: %s" |
| 1316 | msgstr "" |
| 1317 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1318 | #: wt-status.c:319 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1319 | #, c-format |
| 1320 | msgid "renamed: %s -> %s" |
| 1321 | msgstr "" |
| 1322 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1323 | #: wt-status.c:322 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1324 | #, c-format |
| 1325 | msgid "typechange: %s" |
| 1326 | msgstr "" |
| 1327 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1328 | #: wt-status.c:325 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1329 | #, c-format |
| 1330 | msgid "unknown: %s" |
| 1331 | msgstr "" |
| 1332 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1333 | #: wt-status.c:328 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1334 | #, c-format |
| 1335 | msgid "unmerged: %s" |
| 1336 | msgstr "" |
| 1337 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1338 | #: wt-status.c:331 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1339 | #, c-format |
| 1340 | msgid "bug: unhandled diff status %c" |
| 1341 | msgstr "" |
| 1342 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1343 | #: wt-status.c:803 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1344 | msgid "You have unmerged paths." |
| 1345 | msgstr "" |
| 1346 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1347 | #: wt-status.c:806 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1348 | msgid " (fix conflicts and run \"git commit\")" |
| 1349 | msgstr "" |
| 1350 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1351 | #: wt-status.c:809 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1352 | msgid "All conflicts fixed but you are still merging." |
| 1353 | msgstr "" |
| 1354 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1355 | #: wt-status.c:812 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1356 | msgid " (use \"git commit\" to conclude merge)" |
| 1357 | msgstr "" |
| 1358 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1359 | #: wt-status.c:822 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1360 | msgid "You are in the middle of an am session." |
| 1361 | msgstr "" |
| 1362 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1363 | #: wt-status.c:825 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1364 | msgid "The current patch is empty." |
| 1365 | msgstr "" |
| 1366 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1367 | #: wt-status.c:829 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1368 | msgid " (fix conflicts and then run \"git am --continue\")" |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1369 | msgstr "" |
| 1370 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1371 | #: wt-status.c:831 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1372 | msgid " (use \"git am --skip\" to skip this patch)" |
| 1373 | msgstr "" |
| 1374 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1375 | #: wt-status.c:833 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1376 | msgid " (use \"git am --abort\" to restore the original branch)" |
| 1377 | msgstr "" |
| 1378 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1379 | #: wt-status.c:893 wt-status.c:910 |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1380 | #, c-format |
| 1381 | msgid "You are currently rebasing branch '%s' on '%s'." |
| 1382 | msgstr "" |
| 1383 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1384 | #: wt-status.c:898 wt-status.c:915 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1385 | msgid "You are currently rebasing." |
| 1386 | msgstr "" |
| 1387 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1388 | #: wt-status.c:901 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1389 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
| 1390 | msgstr "" |
| 1391 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1392 | #: wt-status.c:903 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1393 | msgid " (use \"git rebase --skip\" to skip this patch)" |
| 1394 | msgstr "" |
| 1395 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1396 | #: wt-status.c:905 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1397 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
| 1398 | msgstr "" |
| 1399 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1400 | #: wt-status.c:918 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1401 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
| 1402 | msgstr "" |
| 1403 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1404 | #: wt-status.c:922 |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1405 | #, c-format |
| 1406 | msgid "" |
| 1407 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
| 1408 | msgstr "" |
| 1409 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1410 | #: wt-status.c:927 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1411 | msgid "You are currently splitting a commit during a rebase." |
| 1412 | msgstr "" |
| 1413 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1414 | #: wt-status.c:930 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1415 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
| 1416 | msgstr "" |
| 1417 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1418 | #: wt-status.c:934 |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1419 | #, c-format |
| 1420 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." |
| 1421 | msgstr "" |
| 1422 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1423 | #: wt-status.c:939 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1424 | msgid "You are currently editing a commit during a rebase." |
| 1425 | msgstr "" |
| 1426 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1427 | #: wt-status.c:942 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1428 | msgid " (use \"git commit --amend\" to amend the current commit)" |
| 1429 | msgstr "" |
| 1430 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1431 | #: wt-status.c:944 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1432 | msgid "" |
| 1433 | " (use \"git rebase --continue\" once you are satisfied with your changes)" |
| 1434 | msgstr "" |
| 1435 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1436 | #: wt-status.c:954 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1437 | msgid "You are currently cherry-picking." |
| 1438 | msgstr "" |
| 1439 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1440 | #: wt-status.c:958 |
| 1441 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1442 | msgstr "" |
| 1443 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1444 | #: wt-status.c:961 |
| 1445 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
| 1446 | msgstr "" |
| 1447 | |
| 1448 | #: wt-status.c:963 |
| 1449 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
| 1450 | msgstr "" |
| 1451 | |
| 1452 | #: wt-status.c:972 |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1453 | #, c-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1454 | msgid "You are currently reverting commit %s." |
Jiang Xin | 235537a | 2013-02-19 13:36:11 +0800 | [diff] [blame] | 1455 | msgstr "" |
| 1456 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1457 | #: wt-status.c:977 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1458 | msgid " (fix conflicts and run \"git revert --continue\")" |
| 1459 | msgstr "" |
| 1460 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1461 | #: wt-status.c:980 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1462 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
| 1463 | msgstr "" |
| 1464 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1465 | #: wt-status.c:982 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1466 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
| 1467 | msgstr "" |
| 1468 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1469 | #: wt-status.c:993 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1470 | #, c-format |
| 1471 | msgid "You are currently bisecting, started from branch '%s'." |
| 1472 | msgstr "" |
| 1473 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1474 | #: wt-status.c:997 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1475 | msgid "You are currently bisecting." |
| 1476 | msgstr "" |
| 1477 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1478 | #: wt-status.c:1000 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 1479 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
| 1480 | msgstr "" |
| 1481 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1482 | #: wt-status.c:1173 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1483 | msgid "On branch " |
| 1484 | msgstr "" |
| 1485 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1486 | #: wt-status.c:1180 |
| 1487 | msgid "rebase in progress; onto " |
| 1488 | msgstr "" |
| 1489 | |
| 1490 | #: wt-status.c:1187 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1491 | msgid "HEAD detached at " |
| 1492 | msgstr "" |
| 1493 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1494 | #: wt-status.c:1189 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1495 | msgid "HEAD detached from " |
| 1496 | msgstr "" |
| 1497 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1498 | #: wt-status.c:1192 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1499 | msgid "Not currently on any branch." |
| 1500 | msgstr "" |
| 1501 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1502 | #: wt-status.c:1209 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1503 | msgid "Initial commit" |
| 1504 | msgstr "" |
| 1505 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1506 | #: wt-status.c:1223 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1507 | msgid "Untracked files" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1508 | msgstr "" |
| 1509 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1510 | #: wt-status.c:1225 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1511 | msgid "Ignored files" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1512 | msgstr "" |
| 1513 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1514 | #: wt-status.c:1229 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1515 | #, c-format |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1516 | msgid "" |
| 1517 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" |
| 1518 | "may speed it up, but you have to be careful not to forget to add\n" |
| 1519 | "new files yourself (see 'git help status')." |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1520 | msgstr "" |
| 1521 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1522 | #: wt-status.c:1235 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1523 | #, c-format |
| 1524 | msgid "Untracked files not listed%s" |
| 1525 | msgstr "" |
| 1526 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1527 | #: wt-status.c:1237 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1528 | msgid " (use -u option to show untracked files)" |
| 1529 | msgstr "" |
| 1530 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1531 | #: wt-status.c:1243 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1532 | msgid "No changes" |
| 1533 | msgstr "" |
| 1534 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1535 | #: wt-status.c:1248 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1536 | #, c-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1537 | 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] | 1538 | msgstr "" |
| 1539 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1540 | #: wt-status.c:1251 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1541 | #, c-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1542 | msgid "no changes added to commit\n" |
| 1543 | msgstr "" |
| 1544 | |
| 1545 | #: wt-status.c:1254 |
| 1546 | #, c-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1547 | msgid "" |
| 1548 | "nothing added to commit but untracked files present (use \"git add\" to " |
| 1549 | "track)\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1550 | msgstr "" |
| 1551 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1552 | #: wt-status.c:1257 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1553 | #, c-format |
| 1554 | msgid "nothing added to commit but untracked files present\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1555 | msgstr "" |
| 1556 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1557 | #: wt-status.c:1260 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1558 | #, c-format |
| 1559 | 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] | 1560 | msgstr "" |
| 1561 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1562 | #: wt-status.c:1263 wt-status.c:1268 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1563 | #, c-format |
| 1564 | msgid "nothing to commit\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1565 | msgstr "" |
| 1566 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1567 | #: wt-status.c:1266 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1568 | #, c-format |
| 1569 | msgid "nothing to commit (use -u to show untracked files)\n" |
| 1570 | msgstr "" |
| 1571 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1572 | #: wt-status.c:1270 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1573 | #, c-format |
| 1574 | msgid "nothing to commit, working directory clean\n" |
| 1575 | msgstr "" |
| 1576 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1577 | #: wt-status.c:1378 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1578 | msgid "HEAD (no branch)" |
| 1579 | msgstr "" |
| 1580 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1581 | #: wt-status.c:1384 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1582 | msgid "Initial commit on " |
| 1583 | msgstr "" |
| 1584 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1585 | #: wt-status.c:1399 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1586 | msgid "behind " |
| 1587 | msgstr "" |
| 1588 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1589 | #: wt-status.c:1402 wt-status.c:1405 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1590 | msgid "ahead " |
| 1591 | msgstr "" |
| 1592 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1593 | #: wt-status.c:1407 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1594 | msgid ", behind " |
| 1595 | msgstr "" |
| 1596 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1597 | #: compat/precompose_utf8.c:58 builtin/clone.c:351 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1598 | #, c-format |
| 1599 | msgid "failed to unlink '%s'" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1600 | msgstr "" |
| 1601 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1602 | #: builtin/add.c:20 |
| 1603 | msgid "git add [options] [--] <pathspec>..." |
| 1604 | msgstr "" |
| 1605 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1606 | #. |
| 1607 | #. * To be consistent with "git add -p" and most Git |
| 1608 | #. * commands, we should default to being tree-wide, but |
| 1609 | #. * this is not the original behavior and can't be |
| 1610 | #. * changed until users trained themselves not to type |
| 1611 | #. * "git add -u" or "git add -A". For now, we warn and |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1612 | #. * keep the old behavior. Later, the behavior can be changed |
| 1613 | #. * to tree-wide, keeping the warning for a while, and |
| 1614 | #. * eventually we can drop the warning. |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1615 | #. |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1616 | #: builtin/add.c:58 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1617 | #, c-format |
| 1618 | msgid "" |
| 1619 | "The behavior of 'git add %s (or %s)' with no path argument from a\n" |
| 1620 | "subdirectory of the tree will change in Git 2.0 and should not be used " |
| 1621 | "anymore.\n" |
| 1622 | "To add content for the whole tree, run:\n" |
| 1623 | "\n" |
| 1624 | " git add %s :/\n" |
| 1625 | " (or git add %s :/)\n" |
| 1626 | "\n" |
| 1627 | "To restrict the command to the current directory, run:\n" |
| 1628 | "\n" |
| 1629 | " git add %s .\n" |
| 1630 | " (or git add %s .)\n" |
| 1631 | "\n" |
| 1632 | "With the current Git version, the command is restricted to the current " |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1633 | "directory.\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1634 | msgstr "" |
| 1635 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1636 | #: builtin/add.c:100 |
| 1637 | #, c-format |
| 1638 | msgid "" |
| 1639 | "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" |
| 1640 | "whose behaviour will change in Git 2.0 with respect to paths you removed.\n" |
| 1641 | "Paths like '%s' that are\n" |
| 1642 | "removed from your working tree are ignored with this version of Git.\n" |
| 1643 | "\n" |
| 1644 | "* 'git add --ignore-removal <pathspec>', which is the current default,\n" |
| 1645 | " ignores paths you removed from your working tree.\n" |
| 1646 | "\n" |
| 1647 | "* 'git add --all <pathspec>' will let you also record the removals.\n" |
| 1648 | "\n" |
| 1649 | "Run 'git status' to check the paths you removed from your working tree.\n" |
| 1650 | msgstr "" |
| 1651 | |
| 1652 | #: builtin/add.c:144 |
| 1653 | #, c-format |
| 1654 | msgid "unexpected diff status %c" |
| 1655 | msgstr "" |
| 1656 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 1657 | #: builtin/add.c:149 builtin/commit.c:252 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1658 | msgid "updating files failed" |
| 1659 | msgstr "" |
| 1660 | |
| 1661 | #: builtin/add.c:163 |
| 1662 | #, c-format |
| 1663 | msgid "remove '%s'\n" |
| 1664 | msgstr "" |
| 1665 | |
| 1666 | #: builtin/add.c:253 |
| 1667 | msgid "Unstaged changes after refreshing the index:" |
| 1668 | msgstr "" |
| 1669 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1670 | #: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1671 | #, c-format |
| 1672 | msgid "pathspec '%s' did not match any files" |
| 1673 | msgstr "" |
| 1674 | |
| 1675 | #: builtin/add.c:339 |
| 1676 | msgid "Could not read the index" |
| 1677 | msgstr "" |
| 1678 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1679 | #: builtin/add.c:350 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1680 | #, c-format |
| 1681 | msgid "Could not open '%s' for writing." |
| 1682 | msgstr "" |
| 1683 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1684 | #: builtin/add.c:354 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1685 | msgid "Could not write patch" |
| 1686 | msgstr "" |
| 1687 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1688 | #: builtin/add.c:359 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1689 | #, c-format |
| 1690 | msgid "Could not stat '%s'" |
| 1691 | msgstr "" |
| 1692 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1693 | #: builtin/add.c:361 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1694 | msgid "Empty patch. Aborted." |
| 1695 | msgstr "" |
| 1696 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1697 | #: builtin/add.c:367 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1698 | #, c-format |
| 1699 | msgid "Could not apply '%s'" |
| 1700 | msgstr "" |
| 1701 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1702 | #: builtin/add.c:377 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1703 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
| 1704 | msgstr "" |
| 1705 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 1706 | #: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1707 | #: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253 |
| 1708 | #: builtin/rm.c:268 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1709 | msgid "dry run" |
| 1710 | msgstr "" |
| 1711 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1712 | #: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19 |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 1713 | #: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1714 | #: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1715 | msgid "be verbose" |
| 1716 | msgstr "" |
| 1717 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1718 | #: builtin/add.c:397 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1719 | msgid "interactive picking" |
| 1720 | msgstr "" |
| 1721 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1722 | #: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1723 | msgid "select hunks interactively" |
| 1724 | msgstr "" |
| 1725 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1726 | #: builtin/add.c:399 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1727 | msgid "edit current diff and apply" |
| 1728 | msgstr "" |
| 1729 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1730 | #: builtin/add.c:400 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1731 | msgid "allow adding otherwise ignored files" |
| 1732 | msgstr "" |
| 1733 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1734 | #: builtin/add.c:401 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1735 | msgid "update tracked files" |
| 1736 | msgstr "" |
| 1737 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1738 | #: builtin/add.c:402 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1739 | msgid "record only the fact that the path will be added later" |
| 1740 | msgstr "" |
| 1741 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1742 | #: builtin/add.c:403 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1743 | msgid "add changes from all tracked and untracked files" |
| 1744 | msgstr "" |
| 1745 | |
| 1746 | #. takes no arguments |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1747 | #: builtin/add.c:406 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1748 | msgid "ignore paths removed in the working tree (same as --no-all)" |
| 1749 | msgstr "" |
| 1750 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1751 | #: builtin/add.c:408 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1752 | msgid "don't add, only refresh the index" |
| 1753 | msgstr "" |
| 1754 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1755 | #: builtin/add.c:409 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1756 | msgid "just skip files which cannot be added because of errors" |
| 1757 | msgstr "" |
| 1758 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1759 | #: builtin/add.c:410 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1760 | msgid "check if - even missing - files are ignored in dry run" |
| 1761 | msgstr "" |
| 1762 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1763 | #: builtin/add.c:432 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1764 | #, c-format |
| 1765 | msgid "Use -f if you really want to add them.\n" |
| 1766 | msgstr "" |
| 1767 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1768 | #: builtin/add.c:433 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1769 | msgid "no files added" |
| 1770 | msgstr "" |
| 1771 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1772 | #: builtin/add.c:439 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1773 | msgid "adding files failed" |
| 1774 | msgstr "" |
| 1775 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1776 | #: builtin/add.c:478 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1777 | msgid "-A and -u are mutually incompatible" |
| 1778 | msgstr "" |
| 1779 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1780 | #: builtin/add.c:496 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1781 | msgid "Option --ignore-missing can only be used together with --dry-run" |
| 1782 | msgstr "" |
| 1783 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 1784 | #: builtin/add.c:526 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 1785 | #, c-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1786 | msgid "Nothing specified, nothing added.\n" |
| 1787 | msgstr "" |
| 1788 | |
| 1789 | #: builtin/add.c:527 |
| 1790 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1791 | msgid "Maybe you wanted to say 'git add .'?\n" |
| 1792 | msgstr "" |
| 1793 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 1794 | #: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919 |
| 1795 | #: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1796 | msgid "index file corrupt" |
| 1797 | msgstr "" |
| 1798 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1799 | #: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 1800 | msgid "Unable to write new index file" |
| 1801 | msgstr "" |
| 1802 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1803 | #: builtin/apply.c:57 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 1804 | msgid "git apply [options] [<patch>...]" |
| 1805 | msgstr "" |
| 1806 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1807 | #: builtin/apply.c:110 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1808 | #, c-format |
| 1809 | msgid "unrecognized whitespace option '%s'" |
| 1810 | msgstr "" |
| 1811 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1812 | #: builtin/apply.c:125 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1813 | #, c-format |
| 1814 | msgid "unrecognized whitespace ignore option '%s'" |
| 1815 | msgstr "" |
| 1816 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1817 | #: builtin/apply.c:823 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1818 | #, c-format |
| 1819 | msgid "Cannot prepare timestamp regexp %s" |
| 1820 | msgstr "" |
| 1821 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1822 | #: builtin/apply.c:832 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1823 | #, c-format |
| 1824 | msgid "regexec returned %d for input: %s" |
| 1825 | msgstr "" |
| 1826 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1827 | #: builtin/apply.c:913 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1828 | #, c-format |
| 1829 | msgid "unable to find filename in patch at line %d" |
| 1830 | msgstr "" |
| 1831 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1832 | #: builtin/apply.c:945 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1833 | #, c-format |
| 1834 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" |
| 1835 | msgstr "" |
| 1836 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1837 | #: builtin/apply.c:949 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1838 | #, c-format |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 1839 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1840 | msgstr "" |
| 1841 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1842 | #: builtin/apply.c:950 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 1843 | #, c-format |
| 1844 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" |
| 1845 | msgstr "" |
| 1846 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 1847 | #: builtin/apply.c:957 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1848 | #, c-format |
| 1849 | msgid "git apply: bad git-diff - expected /dev/null on line %d" |
| 1850 | msgstr "" |
| 1851 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1852 | #: builtin/apply.c:1422 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1853 | #, c-format |
| 1854 | msgid "recount: unexpected line: %.*s" |
| 1855 | msgstr "" |
| 1856 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1857 | #: builtin/apply.c:1479 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1858 | #, c-format |
| 1859 | msgid "patch fragment without header at line %d: %.*s" |
| 1860 | msgstr "" |
| 1861 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1862 | #: builtin/apply.c:1496 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1863 | #, c-format |
| 1864 | msgid "" |
| 1865 | "git diff header lacks filename information when removing %d leading pathname " |
| 1866 | "component (line %d)" |
| 1867 | msgid_plural "" |
| 1868 | "git diff header lacks filename information when removing %d leading pathname " |
| 1869 | "components (line %d)" |
| 1870 | msgstr[0] "" |
| 1871 | msgstr[1] "" |
| 1872 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1873 | #: builtin/apply.c:1656 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1874 | msgid "new file depends on old contents" |
| 1875 | msgstr "" |
| 1876 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1877 | #: builtin/apply.c:1658 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1878 | msgid "deleted file still has contents" |
| 1879 | msgstr "" |
| 1880 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1881 | #: builtin/apply.c:1684 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1882 | #, c-format |
| 1883 | msgid "corrupt patch at line %d" |
| 1884 | msgstr "" |
| 1885 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1886 | #: builtin/apply.c:1720 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1887 | #, c-format |
| 1888 | msgid "new file %s depends on old contents" |
| 1889 | msgstr "" |
| 1890 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1891 | #: builtin/apply.c:1722 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1892 | #, c-format |
| 1893 | msgid "deleted file %s still has contents" |
| 1894 | msgstr "" |
| 1895 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1896 | #: builtin/apply.c:1725 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1897 | #, c-format |
| 1898 | msgid "** warning: file %s becomes empty but is not deleted" |
| 1899 | msgstr "" |
| 1900 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1901 | #: builtin/apply.c:1871 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1902 | #, c-format |
| 1903 | msgid "corrupt binary patch at line %d: %.*s" |
| 1904 | msgstr "" |
| 1905 | |
| 1906 | #. there has to be one hunk (forward hunk) |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1907 | #: builtin/apply.c:1900 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1908 | #, c-format |
| 1909 | msgid "unrecognized binary patch at line %d" |
| 1910 | msgstr "" |
| 1911 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1912 | #: builtin/apply.c:1986 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1913 | #, c-format |
| 1914 | msgid "patch with only garbage at line %d" |
| 1915 | msgstr "" |
| 1916 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1917 | #: builtin/apply.c:2076 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1918 | #, c-format |
| 1919 | msgid "unable to read symlink %s" |
| 1920 | msgstr "" |
| 1921 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 1922 | #: builtin/apply.c:2080 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1923 | #, c-format |
| 1924 | msgid "unable to open or read %s" |
| 1925 | msgstr "" |
| 1926 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1927 | #: builtin/apply.c:2688 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1928 | #, c-format |
| 1929 | msgid "invalid start of line: '%c'" |
| 1930 | msgstr "" |
| 1931 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1932 | #: builtin/apply.c:2806 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1933 | #, c-format |
| 1934 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
| 1935 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." |
| 1936 | msgstr[0] "" |
| 1937 | msgstr[1] "" |
| 1938 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1939 | #: builtin/apply.c:2818 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1940 | #, c-format |
| 1941 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
| 1942 | msgstr "" |
| 1943 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1944 | #: builtin/apply.c:2824 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1945 | #, c-format |
| 1946 | msgid "" |
| 1947 | "while searching for:\n" |
| 1948 | "%.*s" |
| 1949 | msgstr "" |
| 1950 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1951 | #: builtin/apply.c:2843 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1952 | #, c-format |
| 1953 | msgid "missing binary patch data for '%s'" |
| 1954 | msgstr "" |
| 1955 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1956 | #: builtin/apply.c:2946 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1957 | #, c-format |
| 1958 | msgid "binary patch does not apply to '%s'" |
| 1959 | msgstr "" |
| 1960 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1961 | #: builtin/apply.c:2952 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1962 | #, c-format |
| 1963 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
| 1964 | msgstr "" |
| 1965 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1966 | #: builtin/apply.c:2973 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1967 | #, c-format |
| 1968 | msgid "patch failed: %s:%ld" |
| 1969 | msgstr "" |
| 1970 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 1971 | #: builtin/apply.c:3095 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1972 | #, c-format |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1973 | msgid "cannot checkout %s" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1974 | msgstr "" |
| 1975 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1976 | #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1977 | #, c-format |
| 1978 | msgid "read of %s failed" |
| 1979 | msgstr "" |
| 1980 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1981 | #: builtin/apply.c:3174 builtin/apply.c:3396 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1982 | #, c-format |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1983 | msgid "path %s has been renamed/deleted" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1984 | msgstr "" |
| 1985 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1986 | #: builtin/apply.c:3255 builtin/apply.c:3410 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1987 | #, c-format |
| 1988 | msgid "%s: does not exist in index" |
| 1989 | msgstr "" |
| 1990 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1991 | #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 1992 | #, c-format |
| 1993 | msgid "%s: %s" |
| 1994 | msgstr "" |
| 1995 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 1996 | #: builtin/apply.c:3264 builtin/apply.c:3418 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 1997 | #, c-format |
| 1998 | msgid "%s: does not match index" |
| 1999 | msgstr "" |
| 2000 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2001 | #: builtin/apply.c:3366 |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 2002 | msgid "removal patch leaves file contents" |
| 2003 | msgstr "" |
| 2004 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2005 | #: builtin/apply.c:3435 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2006 | #, c-format |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2007 | msgid "%s: wrong type" |
| 2008 | msgstr "" |
| 2009 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2010 | #: builtin/apply.c:3437 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2011 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2012 | msgid "%s has type %o, expected %o" |
| 2013 | msgstr "" |
| 2014 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2015 | #: builtin/apply.c:3538 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2016 | #, c-format |
| 2017 | msgid "%s: already exists in index" |
| 2018 | msgstr "" |
| 2019 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2020 | #: builtin/apply.c:3541 |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 2021 | #, c-format |
| 2022 | msgid "%s: already exists in working directory" |
| 2023 | msgstr "" |
| 2024 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2025 | #: builtin/apply.c:3561 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2026 | #, c-format |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 2027 | msgid "new mode (%o) of %s does not match old mode (%o)" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2028 | msgstr "" |
| 2029 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2030 | #: builtin/apply.c:3566 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2031 | #, c-format |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 2032 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
| 2033 | msgstr "" |
| 2034 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2035 | #: builtin/apply.c:3574 |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 2036 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2037 | msgid "%s: patch does not apply" |
| 2038 | msgstr "" |
| 2039 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2040 | #: builtin/apply.c:3587 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2041 | #, c-format |
| 2042 | msgid "Checking patch %s..." |
| 2043 | msgstr "" |
| 2044 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2045 | #: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2046 | #, c-format |
| 2047 | msgid "make_cache_entry failed for path '%s'" |
| 2048 | msgstr "" |
| 2049 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2050 | #: builtin/apply.c:3823 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2051 | #, c-format |
| 2052 | msgid "unable to remove %s from index" |
| 2053 | msgstr "" |
| 2054 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2055 | #: builtin/apply.c:3851 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2056 | #, c-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2057 | msgid "corrupt patch for submodule %s" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2058 | msgstr "" |
| 2059 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2060 | #: builtin/apply.c:3855 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2061 | #, c-format |
| 2062 | msgid "unable to stat newly created file '%s'" |
| 2063 | msgstr "" |
| 2064 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2065 | #: builtin/apply.c:3860 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2066 | #, c-format |
| 2067 | msgid "unable to create backing store for newly created file %s" |
| 2068 | msgstr "" |
| 2069 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2070 | #: builtin/apply.c:3863 builtin/apply.c:3971 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2071 | #, c-format |
| 2072 | msgid "unable to add cache entry for %s" |
| 2073 | msgstr "" |
| 2074 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2075 | #: builtin/apply.c:3896 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2076 | #, c-format |
| 2077 | msgid "closing file '%s'" |
| 2078 | msgstr "" |
| 2079 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2080 | #: builtin/apply.c:3945 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2081 | #, c-format |
| 2082 | msgid "unable to write file '%s' mode %o" |
| 2083 | msgstr "" |
| 2084 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2085 | #: builtin/apply.c:4032 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2086 | #, c-format |
| 2087 | msgid "Applied patch %s cleanly." |
| 2088 | msgstr "" |
| 2089 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2090 | #: builtin/apply.c:4040 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2091 | msgid "internal error" |
| 2092 | msgstr "" |
| 2093 | |
| 2094 | #. Say this even without --verbose |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2095 | #: builtin/apply.c:4043 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2096 | #, c-format |
| 2097 | msgid "Applying patch %%s with %d reject..." |
| 2098 | msgid_plural "Applying patch %%s with %d rejects..." |
| 2099 | msgstr[0] "" |
| 2100 | msgstr[1] "" |
| 2101 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2102 | #: builtin/apply.c:4053 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2103 | #, c-format |
| 2104 | msgid "truncating .rej filename to %.*s.rej" |
| 2105 | msgstr "" |
| 2106 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2107 | #: builtin/apply.c:4074 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2108 | #, c-format |
| 2109 | msgid "Hunk #%d applied cleanly." |
| 2110 | msgstr "" |
| 2111 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2112 | #: builtin/apply.c:4077 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2113 | #, c-format |
| 2114 | msgid "Rejected hunk #%d." |
| 2115 | msgstr "" |
| 2116 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2117 | #: builtin/apply.c:4227 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2118 | msgid "unrecognized input" |
| 2119 | msgstr "" |
| 2120 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2121 | #: builtin/apply.c:4238 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2122 | msgid "unable to read index file" |
| 2123 | msgstr "" |
| 2124 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2125 | #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2126 | #: builtin/fetch.c:63 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2127 | msgid "path" |
| 2128 | msgstr "" |
| 2129 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2130 | #: builtin/apply.c:4358 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2131 | msgid "don't apply changes matching the given path" |
| 2132 | msgstr "" |
| 2133 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2134 | #: builtin/apply.c:4361 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2135 | msgid "apply changes matching the given path" |
| 2136 | msgstr "" |
| 2137 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2138 | #: builtin/apply.c:4363 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2139 | msgid "num" |
| 2140 | msgstr "" |
| 2141 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2142 | #: builtin/apply.c:4364 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2143 | msgid "remove <num> leading slashes from traditional diff paths" |
| 2144 | msgstr "" |
| 2145 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2146 | #: builtin/apply.c:4367 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2147 | msgid "ignore additions made by the patch" |
| 2148 | msgstr "" |
| 2149 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2150 | #: builtin/apply.c:4369 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2151 | msgid "instead of applying the patch, output diffstat for the input" |
| 2152 | msgstr "" |
| 2153 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2154 | #: builtin/apply.c:4373 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2155 | msgid "show number of added and deleted lines in decimal notation" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2156 | msgstr "" |
| 2157 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2158 | #: builtin/apply.c:4375 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2159 | msgid "instead of applying the patch, output a summary for the input" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2160 | msgstr "" |
| 2161 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2162 | #: builtin/apply.c:4377 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2163 | msgid "instead of applying the patch, see if the patch is applicable" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2164 | msgstr "" |
| 2165 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2166 | #: builtin/apply.c:4379 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2167 | msgid "make sure the patch is applicable to the current index" |
| 2168 | msgstr "" |
| 2169 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2170 | #: builtin/apply.c:4381 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2171 | msgid "apply a patch without touching the working tree" |
| 2172 | msgstr "" |
| 2173 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2174 | #: builtin/apply.c:4383 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2175 | msgid "also apply the patch (use with --stat/--summary/--check)" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2176 | msgstr "" |
| 2177 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2178 | #: builtin/apply.c:4385 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2179 | msgid "attempt three-way merge if a patch does not apply" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2180 | msgstr "" |
| 2181 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2182 | #: builtin/apply.c:4387 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2183 | msgid "build a temporary index based on embedded index information" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2184 | msgstr "" |
| 2185 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2186 | #: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2187 | msgid "paths are separated with NUL character" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2188 | msgstr "" |
| 2189 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2190 | #: builtin/apply.c:4392 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2191 | msgid "ensure at least <n> lines of context match" |
| 2192 | msgstr "" |
| 2193 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2194 | #: builtin/apply.c:4393 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2195 | msgid "action" |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2196 | msgstr "" |
| 2197 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2198 | #: builtin/apply.c:4394 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2199 | msgid "detect new or modified lines that have whitespace errors" |
| 2200 | msgstr "" |
| 2201 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2202 | #: builtin/apply.c:4397 builtin/apply.c:4400 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2203 | msgid "ignore changes in whitespace when finding context" |
| 2204 | msgstr "" |
| 2205 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2206 | #: builtin/apply.c:4403 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2207 | msgid "apply the patch in reverse" |
| 2208 | msgstr "" |
| 2209 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2210 | #: builtin/apply.c:4405 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2211 | msgid "don't expect at least one line of context" |
| 2212 | msgstr "" |
| 2213 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2214 | #: builtin/apply.c:4407 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2215 | msgid "leave the rejected hunks in corresponding *.rej files" |
| 2216 | msgstr "" |
| 2217 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2218 | #: builtin/apply.c:4409 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2219 | msgid "allow overlapping hunks" |
| 2220 | msgstr "" |
| 2221 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2222 | #: builtin/apply.c:4412 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2223 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
| 2224 | msgstr "" |
| 2225 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2226 | #: builtin/apply.c:4415 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2227 | msgid "do not trust the line counts in the hunk headers" |
| 2228 | msgstr "" |
| 2229 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2230 | #: builtin/apply.c:4417 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2231 | msgid "root" |
| 2232 | msgstr "" |
| 2233 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2234 | #: builtin/apply.c:4418 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 2235 | msgid "prepend <root> to all filenames" |
| 2236 | msgstr "" |
| 2237 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2238 | #: builtin/apply.c:4440 |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 2239 | msgid "--3way outside a repository" |
| 2240 | msgstr "" |
| 2241 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2242 | #: builtin/apply.c:4448 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2243 | msgid "--index outside a repository" |
| 2244 | msgstr "" |
| 2245 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2246 | #: builtin/apply.c:4451 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2247 | msgid "--cached outside a repository" |
| 2248 | msgstr "" |
| 2249 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2250 | #: builtin/apply.c:4467 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2251 | #, c-format |
| 2252 | msgid "can't open patch '%s'" |
| 2253 | msgstr "" |
| 2254 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2255 | #: builtin/apply.c:4481 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2256 | #, c-format |
| 2257 | msgid "squelched %d whitespace error" |
| 2258 | msgid_plural "squelched %d whitespace errors" |
| 2259 | msgstr[0] "" |
| 2260 | msgstr[1] "" |
| 2261 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2262 | #: builtin/apply.c:4487 builtin/apply.c:4497 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2263 | #, c-format |
| 2264 | msgid "%d line adds whitespace errors." |
| 2265 | msgid_plural "%d lines add whitespace errors." |
| 2266 | msgstr[0] "" |
| 2267 | msgstr[1] "" |
| 2268 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2269 | #: builtin/archive.c:17 |
| 2270 | #, c-format |
| 2271 | msgid "could not create archive file '%s'" |
| 2272 | msgstr "" |
| 2273 | |
| 2274 | #: builtin/archive.c:20 |
| 2275 | msgid "could not redirect output" |
| 2276 | msgstr "" |
| 2277 | |
| 2278 | #: builtin/archive.c:37 |
| 2279 | msgid "git archive: Remote with no URL" |
| 2280 | msgstr "" |
| 2281 | |
| 2282 | #: builtin/archive.c:58 |
| 2283 | msgid "git archive: expected ACK/NAK, got EOF" |
| 2284 | msgstr "" |
| 2285 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2286 | #: builtin/archive.c:61 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2287 | #, c-format |
| 2288 | msgid "git archive: NACK %s" |
| 2289 | msgstr "" |
| 2290 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2291 | #: builtin/archive.c:63 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2292 | #, c-format |
| 2293 | msgid "remote error: %s" |
| 2294 | msgstr "" |
| 2295 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2296 | #: builtin/archive.c:64 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2297 | msgid "git archive: protocol error" |
| 2298 | msgstr "" |
| 2299 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2300 | #: builtin/archive.c:68 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2301 | msgid "git archive: expected a flush" |
| 2302 | msgstr "" |
| 2303 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2304 | #: builtin/bisect--helper.c:7 |
| 2305 | msgid "git bisect--helper --next-all [--no-checkout]" |
| 2306 | msgstr "" |
| 2307 | |
| 2308 | #: builtin/bisect--helper.c:17 |
| 2309 | msgid "perform 'git bisect next'" |
| 2310 | msgstr "" |
| 2311 | |
| 2312 | #: builtin/bisect--helper.c:19 |
| 2313 | msgid "update BISECT_HEAD instead of checking out the current commit" |
| 2314 | msgstr "" |
| 2315 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2316 | #: builtin/blame.c:26 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2317 | msgid "git blame [options] [rev-opts] [rev] [--] file" |
| 2318 | msgstr "" |
| 2319 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2320 | #: builtin/blame.c:31 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2321 | msgid "[rev-opts] are documented in git-rev-list(1)" |
| 2322 | msgstr "" |
| 2323 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2324 | #: builtin/blame.c:2276 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2325 | msgid "Show blame entries as we find them, incrementally" |
| 2326 | msgstr "" |
| 2327 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2328 | #: builtin/blame.c:2277 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2329 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
| 2330 | msgstr "" |
| 2331 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2332 | #: builtin/blame.c:2278 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2333 | msgid "Do not treat root commits as boundaries (Default: off)" |
| 2334 | msgstr "" |
| 2335 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2336 | #: builtin/blame.c:2279 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2337 | msgid "Show work cost statistics" |
| 2338 | msgstr "" |
| 2339 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2340 | #: builtin/blame.c:2280 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2341 | msgid "Show output score for blame entries" |
| 2342 | msgstr "" |
| 2343 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2344 | #: builtin/blame.c:2281 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2345 | msgid "Show original filename (Default: auto)" |
| 2346 | msgstr "" |
| 2347 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2348 | #: builtin/blame.c:2282 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2349 | msgid "Show original linenumber (Default: off)" |
| 2350 | msgstr "" |
| 2351 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2352 | #: builtin/blame.c:2283 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2353 | msgid "Show in a format designed for machine consumption" |
| 2354 | msgstr "" |
| 2355 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2356 | #: builtin/blame.c:2284 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2357 | msgid "Show porcelain format with per-line commit information" |
| 2358 | msgstr "" |
| 2359 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2360 | #: builtin/blame.c:2285 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2361 | msgid "Use the same output mode as git-annotate (Default: off)" |
| 2362 | msgstr "" |
| 2363 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2364 | #: builtin/blame.c:2286 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2365 | msgid "Show raw timestamp (Default: off)" |
| 2366 | msgstr "" |
| 2367 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2368 | #: builtin/blame.c:2287 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2369 | msgid "Show long commit SHA1 (Default: off)" |
| 2370 | msgstr "" |
| 2371 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2372 | #: builtin/blame.c:2288 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2373 | msgid "Suppress author name and timestamp (Default: off)" |
| 2374 | msgstr "" |
| 2375 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2376 | #: builtin/blame.c:2289 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2377 | msgid "Show author email instead of name (Default: off)" |
| 2378 | msgstr "" |
| 2379 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2380 | #: builtin/blame.c:2290 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2381 | msgid "Ignore whitespace differences" |
| 2382 | msgstr "" |
| 2383 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2384 | #: builtin/blame.c:2291 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2385 | msgid "Spend extra cycles to find better match" |
| 2386 | msgstr "" |
| 2387 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2388 | #: builtin/blame.c:2292 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2389 | msgid "Use revisions from <file> instead of calling git-rev-list" |
| 2390 | msgstr "" |
| 2391 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2392 | #: builtin/blame.c:2293 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2393 | msgid "Use <file>'s contents as the final image" |
| 2394 | msgstr "" |
| 2395 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2396 | #: builtin/blame.c:2294 builtin/blame.c:2295 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2397 | msgid "score" |
| 2398 | msgstr "" |
| 2399 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2400 | #: builtin/blame.c:2294 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2401 | msgid "Find line copies within and across files" |
| 2402 | msgstr "" |
| 2403 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2404 | #: builtin/blame.c:2295 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2405 | msgid "Find line movements within and across files" |
| 2406 | msgstr "" |
| 2407 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2408 | #: builtin/blame.c:2296 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2409 | msgid "n,m" |
| 2410 | msgstr "" |
| 2411 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2412 | #: builtin/blame.c:2296 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2413 | msgid "Process only line range n,m, counting from 1" |
| 2414 | msgstr "" |
| 2415 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2416 | #: builtin/branch.c:24 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2417 | msgid "git branch [options] [-r | -a] [--merged | --no-merged]" |
| 2418 | msgstr "" |
| 2419 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2420 | #: builtin/branch.c:25 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2421 | msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" |
| 2422 | msgstr "" |
| 2423 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2424 | #: builtin/branch.c:26 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2425 | msgid "git branch [options] [-r] (-d | -D) <branchname>..." |
| 2426 | msgstr "" |
| 2427 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2428 | #: builtin/branch.c:27 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2429 | msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" |
| 2430 | msgstr "" |
| 2431 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2432 | #: builtin/branch.c:150 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2433 | #, c-format |
| 2434 | msgid "" |
| 2435 | "deleting branch '%s' that has been merged to\n" |
| 2436 | " '%s', but not yet merged to HEAD." |
| 2437 | msgstr "" |
| 2438 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2439 | #: builtin/branch.c:154 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2440 | #, c-format |
| 2441 | msgid "" |
| 2442 | "not deleting branch '%s' that is not yet merged to\n" |
| 2443 | " '%s', even though it is merged to HEAD." |
| 2444 | msgstr "" |
| 2445 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2446 | #: builtin/branch.c:168 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2447 | #, c-format |
| 2448 | msgid "Couldn't look up commit object for '%s'" |
| 2449 | msgstr "" |
| 2450 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2451 | #: builtin/branch.c:172 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2452 | #, c-format |
| 2453 | msgid "" |
| 2454 | "The branch '%s' is not fully merged.\n" |
| 2455 | "If you are sure you want to delete it, run 'git branch -D %s'." |
| 2456 | msgstr "" |
| 2457 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2458 | #: builtin/branch.c:185 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2459 | msgid "Update of config-file failed" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2460 | msgstr "" |
| 2461 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2462 | #: builtin/branch.c:213 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2463 | msgid "cannot use -a with -d" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2464 | msgstr "" |
| 2465 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2466 | #: builtin/branch.c:219 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2467 | msgid "Couldn't look up commit object for HEAD" |
| 2468 | msgstr "" |
| 2469 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2470 | #: builtin/branch.c:227 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2471 | #, c-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2472 | msgid "Cannot delete the branch '%s' which you are currently on." |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2473 | msgstr "" |
| 2474 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2475 | #: builtin/branch.c:240 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2476 | #, c-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2477 | msgid "remote branch '%s' not found." |
| 2478 | msgstr "" |
| 2479 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2480 | #: builtin/branch.c:241 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2481 | #, c-format |
| 2482 | msgid "branch '%s' not found." |
| 2483 | msgstr "" |
| 2484 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2485 | #: builtin/branch.c:255 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2486 | #, c-format |
| 2487 | msgid "Error deleting remote branch '%s'" |
| 2488 | msgstr "" |
| 2489 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2490 | #: builtin/branch.c:256 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2491 | #, c-format |
| 2492 | msgid "Error deleting branch '%s'" |
| 2493 | msgstr "" |
| 2494 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2495 | #: builtin/branch.c:263 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2496 | #, c-format |
| 2497 | msgid "Deleted remote branch %s (was %s).\n" |
| 2498 | msgstr "" |
| 2499 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2500 | #: builtin/branch.c:264 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2501 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2502 | msgid "Deleted branch %s (was %s).\n" |
| 2503 | msgstr "" |
| 2504 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2505 | #: builtin/branch.c:366 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2506 | #, c-format |
| 2507 | msgid "branch '%s' does not point at a commit" |
| 2508 | msgstr "" |
| 2509 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2510 | #: builtin/branch.c:453 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2511 | #, c-format |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2512 | msgid "[%s: behind %d]" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2513 | msgstr "" |
| 2514 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2515 | #: builtin/branch.c:455 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2516 | #, c-format |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2517 | msgid "[behind %d]" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2518 | msgstr "" |
| 2519 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2520 | #: builtin/branch.c:459 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2521 | #, c-format |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2522 | msgid "[%s: ahead %d]" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2523 | msgstr "" |
| 2524 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2525 | #: builtin/branch.c:461 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2526 | #, c-format |
| 2527 | msgid "[ahead %d]" |
| 2528 | msgstr "" |
| 2529 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2530 | #: builtin/branch.c:464 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2531 | #, c-format |
| 2532 | msgid "[%s: ahead %d, behind %d]" |
| 2533 | msgstr "" |
| 2534 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2535 | #: builtin/branch.c:467 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 2536 | #, c-format |
| 2537 | msgid "[ahead %d, behind %d]" |
| 2538 | msgstr "" |
| 2539 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2540 | #: builtin/branch.c:490 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2541 | msgid " **** invalid ref ****" |
| 2542 | msgstr "" |
| 2543 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2544 | #: builtin/branch.c:582 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2545 | #, c-format |
| 2546 | msgid "(no branch, rebasing %s)" |
| 2547 | msgstr "" |
| 2548 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2549 | #: builtin/branch.c:585 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2550 | #, c-format |
| 2551 | msgid "(no branch, bisect started on %s)" |
| 2552 | msgstr "" |
| 2553 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2554 | #: builtin/branch.c:588 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2555 | #, c-format |
| 2556 | msgid "(detached from %s)" |
| 2557 | msgstr "" |
| 2558 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2559 | #: builtin/branch.c:591 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2560 | msgid "(no branch)" |
| 2561 | msgstr "" |
| 2562 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2563 | #: builtin/branch.c:637 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2564 | #, c-format |
| 2565 | msgid "object '%s' does not point to a commit" |
| 2566 | msgstr "" |
| 2567 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2568 | #: builtin/branch.c:669 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2569 | msgid "some refs could not be read" |
| 2570 | msgstr "" |
| 2571 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2572 | #: builtin/branch.c:682 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2573 | msgid "cannot rename the current branch while not on any." |
| 2574 | msgstr "" |
| 2575 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2576 | #: builtin/branch.c:692 |
Jiang Xin | 2b911f8 | 2012-03-08 10:20:20 +0800 | [diff] [blame] | 2577 | #, c-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2578 | msgid "Invalid branch name: '%s'" |
| 2579 | msgstr "" |
| 2580 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2581 | #: builtin/branch.c:707 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2582 | msgid "Branch rename failed" |
| 2583 | msgstr "" |
| 2584 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2585 | #: builtin/branch.c:711 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2586 | #, c-format |
| 2587 | msgid "Renamed a misnamed branch '%s' away" |
| 2588 | msgstr "" |
| 2589 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2590 | #: builtin/branch.c:715 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 2591 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2592 | msgid "Branch renamed to %s, but HEAD is not updated!" |
| 2593 | msgstr "" |
| 2594 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2595 | #: builtin/branch.c:722 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2596 | msgid "Branch is renamed, but update of config-file failed" |
| 2597 | msgstr "" |
| 2598 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2599 | #: builtin/branch.c:737 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2600 | #, c-format |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2601 | msgid "malformed object name %s" |
| 2602 | msgstr "" |
| 2603 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2604 | #: builtin/branch.c:761 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2605 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2606 | msgid "could not write branch description template: %s" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2607 | msgstr "" |
| 2608 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2609 | #: builtin/branch.c:791 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2610 | msgid "Generic options" |
| 2611 | msgstr "" |
| 2612 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2613 | #: builtin/branch.c:793 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2614 | msgid "show hash and subject, give twice for upstream branch" |
| 2615 | msgstr "" |
| 2616 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2617 | #: builtin/branch.c:794 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2618 | msgid "suppress informational messages" |
| 2619 | msgstr "" |
| 2620 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2621 | #: builtin/branch.c:795 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2622 | msgid "set up tracking mode (see git-pull(1))" |
| 2623 | msgstr "" |
| 2624 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2625 | #: builtin/branch.c:797 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2626 | msgid "change upstream info" |
| 2627 | msgstr "" |
| 2628 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2629 | #: builtin/branch.c:801 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2630 | msgid "use colored output" |
| 2631 | msgstr "" |
| 2632 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2633 | #: builtin/branch.c:802 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2634 | msgid "act on remote-tracking branches" |
| 2635 | msgstr "" |
| 2636 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2637 | #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2638 | #: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434 |
| 2639 | #: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2640 | msgid "commit" |
| 2641 | msgstr "" |
| 2642 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2643 | #: builtin/branch.c:806 builtin/branch.c:812 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2644 | msgid "print only branches that contain the commit" |
| 2645 | msgstr "" |
| 2646 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2647 | #: builtin/branch.c:818 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2648 | msgid "Specific git-branch actions:" |
| 2649 | msgstr "" |
| 2650 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2651 | #: builtin/branch.c:819 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2652 | msgid "list both remote-tracking and local branches" |
| 2653 | msgstr "" |
| 2654 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2655 | #: builtin/branch.c:821 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2656 | msgid "delete fully merged branch" |
| 2657 | msgstr "" |
| 2658 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2659 | #: builtin/branch.c:822 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2660 | msgid "delete branch (even if not merged)" |
| 2661 | msgstr "" |
| 2662 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2663 | #: builtin/branch.c:823 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2664 | msgid "move/rename a branch and its reflog" |
| 2665 | msgstr "" |
| 2666 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2667 | #: builtin/branch.c:824 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2668 | msgid "move/rename a branch, even if target exists" |
| 2669 | msgstr "" |
| 2670 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2671 | #: builtin/branch.c:825 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2672 | msgid "list branch names" |
| 2673 | msgstr "" |
| 2674 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2675 | #: builtin/branch.c:826 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2676 | msgid "create the branch's reflog" |
| 2677 | msgstr "" |
| 2678 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2679 | #: builtin/branch.c:828 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2680 | msgid "edit the description for the branch" |
| 2681 | msgstr "" |
| 2682 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2683 | #: builtin/branch.c:829 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2684 | msgid "force creation (when already exists)" |
| 2685 | msgstr "" |
| 2686 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2687 | #: builtin/branch.c:832 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2688 | msgid "print only not merged branches" |
| 2689 | msgstr "" |
| 2690 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2691 | #: builtin/branch.c:838 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2692 | msgid "print only merged branches" |
| 2693 | msgstr "" |
| 2694 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2695 | #: builtin/branch.c:842 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2696 | msgid "list branches in columns" |
| 2697 | msgstr "" |
| 2698 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2699 | #: builtin/branch.c:855 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2700 | msgid "Failed to resolve HEAD as a valid ref." |
| 2701 | msgstr "" |
| 2702 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2703 | #: builtin/branch.c:860 builtin/clone.c:630 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2704 | msgid "HEAD not found below refs/heads!" |
| 2705 | msgstr "" |
| 2706 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2707 | #: builtin/branch.c:883 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 2708 | msgid "--column and --verbose are incompatible" |
| 2709 | msgstr "" |
| 2710 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2711 | #: builtin/branch.c:889 builtin/branch.c:928 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2712 | msgid "branch name required" |
| 2713 | msgstr "" |
| 2714 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2715 | #: builtin/branch.c:904 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2716 | msgid "Cannot give description to detached HEAD" |
| 2717 | msgstr "" |
| 2718 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2719 | #: builtin/branch.c:909 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2720 | msgid "cannot edit description of more than one branch" |
| 2721 | msgstr "" |
| 2722 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2723 | #: builtin/branch.c:916 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2724 | #, c-format |
| 2725 | msgid "No commit on branch '%s' yet." |
| 2726 | msgstr "" |
| 2727 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2728 | #: builtin/branch.c:919 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2729 | #, c-format |
| 2730 | msgid "No branch named '%s'." |
| 2731 | msgstr "" |
| 2732 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2733 | #: builtin/branch.c:934 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2734 | msgid "too many branches for a rename operation" |
| 2735 | msgstr "" |
| 2736 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2737 | #: builtin/branch.c:939 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2738 | msgid "too many branches to set new upstream" |
| 2739 | msgstr "" |
| 2740 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2741 | #: builtin/branch.c:943 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2742 | #, c-format |
| 2743 | msgid "" |
| 2744 | "could not set upstream of HEAD to %s when it does not point to any branch." |
| 2745 | msgstr "" |
| 2746 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2747 | #: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2748 | #, c-format |
| 2749 | msgid "no such branch '%s'" |
| 2750 | msgstr "" |
| 2751 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2752 | #: builtin/branch.c:950 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2753 | #, c-format |
| 2754 | msgid "branch '%s' does not exist" |
| 2755 | msgstr "" |
| 2756 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2757 | #: builtin/branch.c:962 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2758 | msgid "too many branches to unset upstream" |
| 2759 | msgstr "" |
| 2760 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2761 | #: builtin/branch.c:966 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2762 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
| 2763 | msgstr "" |
| 2764 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2765 | #: builtin/branch.c:972 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2766 | #, c-format |
| 2767 | msgid "Branch '%s' has no upstream information" |
| 2768 | msgstr "" |
| 2769 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2770 | #: builtin/branch.c:987 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 2771 | msgid "it does not make sense to create 'HEAD' manually" |
| 2772 | msgstr "" |
| 2773 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2774 | #: builtin/branch.c:993 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2775 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
| 2776 | msgstr "" |
| 2777 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2778 | #: builtin/branch.c:996 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2779 | #, c-format |
| 2780 | msgid "" |
| 2781 | "The --set-upstream flag is deprecated and will be removed. Consider using --" |
| 2782 | "track or --set-upstream-to\n" |
| 2783 | msgstr "" |
| 2784 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2785 | #: builtin/branch.c:1013 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2786 | #, c-format |
| 2787 | msgid "" |
| 2788 | "\n" |
| 2789 | "If you wanted to make '%s' track '%s', do this:\n" |
| 2790 | "\n" |
| 2791 | msgstr "" |
| 2792 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2793 | #: builtin/branch.c:1014 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2794 | #, c-format |
| 2795 | msgid " git branch -d %s\n" |
| 2796 | msgstr "" |
| 2797 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2798 | #: builtin/branch.c:1015 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2799 | #, c-format |
| 2800 | msgid " git branch --set-upstream-to %s\n" |
| 2801 | msgstr "" |
| 2802 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2803 | #: builtin/bundle.c:47 |
| 2804 | #, c-format |
| 2805 | msgid "%s is okay\n" |
| 2806 | msgstr "" |
| 2807 | |
| 2808 | #: builtin/bundle.c:56 |
| 2809 | msgid "Need a repository to create a bundle." |
| 2810 | msgstr "" |
| 2811 | |
| 2812 | #: builtin/bundle.c:60 |
| 2813 | msgid "Need a repository to unbundle." |
| 2814 | msgstr "" |
| 2815 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2816 | #: builtin/cat-file.c:285 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2817 | msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" |
| 2818 | msgstr "" |
| 2819 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2820 | #: builtin/cat-file.c:286 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2821 | msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" |
| 2822 | msgstr "" |
| 2823 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2824 | #: builtin/cat-file.c:323 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2825 | msgid "<type> can be one of: blob, tree, commit, tag" |
| 2826 | msgstr "" |
| 2827 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2828 | #: builtin/cat-file.c:324 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2829 | msgid "show object type" |
| 2830 | msgstr "" |
| 2831 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2832 | #: builtin/cat-file.c:325 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2833 | msgid "show object size" |
| 2834 | msgstr "" |
| 2835 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2836 | #: builtin/cat-file.c:327 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2837 | msgid "exit with zero when there's no error" |
| 2838 | msgstr "" |
| 2839 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2840 | #: builtin/cat-file.c:328 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2841 | msgid "pretty-print object's content" |
| 2842 | msgstr "" |
| 2843 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2844 | #: builtin/cat-file.c:330 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2845 | msgid "for blob objects, run textconv on object's content" |
| 2846 | msgstr "" |
| 2847 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2848 | #: builtin/cat-file.c:332 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2849 | msgid "show info and content of objects fed from the standard input" |
| 2850 | msgstr "" |
| 2851 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 2852 | #: builtin/cat-file.c:335 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2853 | msgid "show info about objects fed from the standard input" |
| 2854 | msgstr "" |
| 2855 | |
| 2856 | #: builtin/check-attr.c:11 |
| 2857 | msgid "git check-attr [-a | --all | attr...] [--] pathname..." |
| 2858 | msgstr "" |
| 2859 | |
| 2860 | #: builtin/check-attr.c:12 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 2861 | msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2862 | msgstr "" |
| 2863 | |
| 2864 | #: builtin/check-attr.c:19 |
| 2865 | msgid "report all attributes set on file" |
| 2866 | msgstr "" |
| 2867 | |
| 2868 | #: builtin/check-attr.c:20 |
| 2869 | msgid "use .gitattributes only from the index" |
| 2870 | msgstr "" |
| 2871 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2872 | #: 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] | 2873 | msgid "read file names from stdin" |
| 2874 | msgstr "" |
| 2875 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2876 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2877 | msgid "input paths are terminated by a null character" |
| 2878 | msgstr "" |
| 2879 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2880 | #: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2881 | msgid "suppress progress reporting" |
| 2882 | msgstr "" |
| 2883 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2884 | #: builtin/check-ignore.c:26 |
| 2885 | msgid "show non-matching input paths" |
| 2886 | msgstr "" |
| 2887 | |
| 2888 | #: builtin/check-ignore.c:143 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2889 | msgid "cannot specify pathnames with --stdin" |
| 2890 | msgstr "" |
| 2891 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2892 | #: builtin/check-ignore.c:146 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2893 | msgid "-z only makes sense with --stdin" |
| 2894 | msgstr "" |
| 2895 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2896 | #: builtin/check-ignore.c:148 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2897 | msgid "no path specified" |
| 2898 | msgstr "" |
| 2899 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2900 | #: builtin/check-ignore.c:152 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2901 | msgid "--quiet is only valid with a single pathname" |
| 2902 | msgstr "" |
| 2903 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2904 | #: builtin/check-ignore.c:154 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 2905 | msgid "cannot have both --quiet and --verbose" |
| 2906 | msgstr "" |
| 2907 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 2908 | #: builtin/check-ignore.c:157 |
| 2909 | msgid "--non-matching is only valid with --verbose" |
| 2910 | msgstr "" |
| 2911 | |
| 2912 | #: builtin/check-mailmap.c:8 |
| 2913 | msgid "git check-mailmap [options] <contact>..." |
| 2914 | msgstr "" |
| 2915 | |
| 2916 | #: builtin/check-mailmap.c:13 |
| 2917 | msgid "also read contacts from stdin" |
| 2918 | msgstr "" |
| 2919 | |
| 2920 | #: builtin/check-mailmap.c:24 |
| 2921 | #, c-format |
| 2922 | msgid "unable to parse contact: %s" |
| 2923 | msgstr "" |
| 2924 | |
| 2925 | #: builtin/check-mailmap.c:47 |
| 2926 | msgid "no contacts specified" |
| 2927 | msgstr "" |
| 2928 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2929 | #: builtin/checkout-index.c:126 |
| 2930 | msgid "git checkout-index [options] [--] [<file>...]" |
| 2931 | msgstr "" |
| 2932 | |
| 2933 | #: builtin/checkout-index.c:187 |
| 2934 | msgid "check out all files in the index" |
| 2935 | msgstr "" |
| 2936 | |
| 2937 | #: builtin/checkout-index.c:188 |
| 2938 | msgid "force overwrite of existing files" |
| 2939 | msgstr "" |
| 2940 | |
| 2941 | #: builtin/checkout-index.c:190 |
| 2942 | msgid "no warning for existing files and files not in index" |
| 2943 | msgstr "" |
| 2944 | |
| 2945 | #: builtin/checkout-index.c:192 |
| 2946 | msgid "don't checkout new files" |
| 2947 | msgstr "" |
| 2948 | |
| 2949 | #: builtin/checkout-index.c:194 |
| 2950 | msgid "update stat information in the index file" |
| 2951 | msgstr "" |
| 2952 | |
| 2953 | #: builtin/checkout-index.c:200 |
| 2954 | msgid "read list of paths from the standard input" |
| 2955 | msgstr "" |
| 2956 | |
| 2957 | #: builtin/checkout-index.c:202 |
| 2958 | msgid "write the content to temporary files" |
| 2959 | msgstr "" |
| 2960 | |
| 2961 | #: builtin/checkout-index.c:203 builtin/column.c:30 |
| 2962 | msgid "string" |
| 2963 | msgstr "" |
| 2964 | |
| 2965 | #: builtin/checkout-index.c:204 |
| 2966 | msgid "when creating files, prepend <string>" |
| 2967 | msgstr "" |
| 2968 | |
| 2969 | #: builtin/checkout-index.c:207 |
| 2970 | msgid "copy out the files from named stage" |
| 2971 | msgstr "" |
| 2972 | |
| 2973 | #: builtin/checkout.c:25 |
| 2974 | msgid "git checkout [options] <branch>" |
| 2975 | msgstr "" |
| 2976 | |
| 2977 | #: builtin/checkout.c:26 |
| 2978 | msgid "git checkout [options] [<branch>] -- <file>..." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2979 | msgstr "" |
| 2980 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2981 | #: builtin/checkout.c:117 builtin/checkout.c:150 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2982 | #, c-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2983 | msgid "path '%s' does not have our version" |
| 2984 | msgstr "" |
| 2985 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2986 | #: builtin/checkout.c:119 builtin/checkout.c:152 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 2987 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2988 | msgid "path '%s' does not have their version" |
| 2989 | msgstr "" |
| 2990 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2991 | #: builtin/checkout.c:135 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2992 | #, c-format |
| 2993 | msgid "path '%s' does not have all necessary versions" |
| 2994 | msgstr "" |
| 2995 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 2996 | #: builtin/checkout.c:179 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 2997 | #, c-format |
| 2998 | msgid "path '%s' does not have necessary versions" |
| 2999 | msgstr "" |
| 3000 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3001 | #: builtin/checkout.c:196 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3002 | #, c-format |
| 3003 | msgid "path '%s': cannot merge" |
| 3004 | msgstr "" |
| 3005 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3006 | #: builtin/checkout.c:213 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3007 | #, c-format |
| 3008 | msgid "Unable to add merge result for '%s'" |
| 3009 | msgstr "" |
| 3010 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3011 | #: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243 |
| 3012 | #: builtin/checkout.c:246 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3013 | #, c-format |
| 3014 | msgid "'%s' cannot be used with updating paths" |
| 3015 | msgstr "" |
| 3016 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3017 | #: builtin/checkout.c:249 builtin/checkout.c:252 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3018 | #, c-format |
| 3019 | msgid "'%s' cannot be used with %s" |
| 3020 | msgstr "" |
| 3021 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3022 | #: builtin/checkout.c:255 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3023 | #, c-format |
| 3024 | msgid "Cannot update paths and switch to branch '%s' at the same time." |
| 3025 | msgstr "" |
| 3026 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3027 | #: builtin/checkout.c:266 builtin/checkout.c:458 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3028 | msgid "corrupt index file" |
| 3029 | msgstr "" |
| 3030 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3031 | #: builtin/checkout.c:329 builtin/checkout.c:336 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3032 | #, c-format |
| 3033 | msgid "path '%s' is unmerged" |
| 3034 | msgstr "" |
| 3035 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3036 | #: builtin/checkout.c:480 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3037 | msgid "you need to resolve your current index first" |
| 3038 | msgstr "" |
| 3039 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3040 | #: builtin/checkout.c:601 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3041 | #, c-format |
| 3042 | msgid "Can not do reflog for '%s'\n" |
| 3043 | msgstr "" |
| 3044 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3045 | #: builtin/checkout.c:639 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3046 | msgid "HEAD is now at" |
| 3047 | msgstr "" |
| 3048 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3049 | #: builtin/checkout.c:646 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3050 | #, c-format |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3051 | msgid "Reset branch '%s'\n" |
| 3052 | msgstr "" |
| 3053 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3054 | #: builtin/checkout.c:649 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3055 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3056 | msgid "Already on '%s'\n" |
| 3057 | msgstr "" |
| 3058 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3059 | #: builtin/checkout.c:653 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3060 | #, c-format |
| 3061 | msgid "Switched to and reset branch '%s'\n" |
| 3062 | msgstr "" |
| 3063 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3064 | #: builtin/checkout.c:655 builtin/checkout.c:997 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3065 | #, c-format |
| 3066 | msgid "Switched to a new branch '%s'\n" |
| 3067 | msgstr "" |
| 3068 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3069 | #: builtin/checkout.c:657 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3070 | #, c-format |
| 3071 | msgid "Switched to branch '%s'\n" |
| 3072 | msgstr "" |
| 3073 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3074 | #: builtin/checkout.c:713 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3075 | #, c-format |
| 3076 | msgid " ... and %d more.\n" |
| 3077 | msgstr "" |
| 3078 | |
| 3079 | #. The singular version |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3080 | #: builtin/checkout.c:719 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3081 | #, c-format |
| 3082 | msgid "" |
| 3083 | "Warning: you are leaving %d commit behind, not connected to\n" |
| 3084 | "any of your branches:\n" |
| 3085 | "\n" |
| 3086 | "%s\n" |
| 3087 | msgid_plural "" |
| 3088 | "Warning: you are leaving %d commits behind, not connected to\n" |
| 3089 | "any of your branches:\n" |
| 3090 | "\n" |
| 3091 | "%s\n" |
| 3092 | msgstr[0] "" |
| 3093 | msgstr[1] "" |
| 3094 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3095 | #: builtin/checkout.c:737 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3096 | #, c-format |
| 3097 | msgid "" |
| 3098 | "If you want to keep them by creating a new branch, this may be a good time\n" |
| 3099 | "to do so with:\n" |
| 3100 | "\n" |
| 3101 | " git branch new_branch_name %s\n" |
| 3102 | "\n" |
| 3103 | msgstr "" |
| 3104 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3105 | #: builtin/checkout.c:767 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3106 | msgid "internal error in revision walk" |
| 3107 | msgstr "" |
| 3108 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3109 | #: builtin/checkout.c:771 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3110 | msgid "Previous HEAD position was" |
| 3111 | msgstr "" |
| 3112 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3113 | #: builtin/checkout.c:798 builtin/checkout.c:992 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3114 | msgid "You are on a branch yet to be born" |
| 3115 | msgstr "" |
| 3116 | |
| 3117 | #. case (1) |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3118 | #: builtin/checkout.c:928 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3119 | #, c-format |
| 3120 | msgid "invalid reference: %s" |
| 3121 | msgstr "" |
| 3122 | |
| 3123 | #. case (1): want a tree |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3124 | #: builtin/checkout.c:967 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3125 | #, c-format |
| 3126 | msgid "reference is not a tree: %s" |
| 3127 | msgstr "" |
| 3128 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3129 | #: builtin/checkout.c:1006 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3130 | msgid "paths cannot be used with switching branches" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3131 | msgstr "" |
| 3132 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3133 | #: builtin/checkout.c:1009 builtin/checkout.c:1013 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3134 | #, c-format |
| 3135 | msgid "'%s' cannot be used with switching branches" |
| 3136 | msgstr "" |
| 3137 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3138 | #: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025 |
| 3139 | #: builtin/checkout.c:1028 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3140 | #, c-format |
| 3141 | msgid "'%s' cannot be used with '%s'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3142 | msgstr "" |
| 3143 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3144 | #: builtin/checkout.c:1033 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3145 | #, c-format |
| 3146 | msgid "Cannot switch branch to a non-commit '%s'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3147 | msgstr "" |
| 3148 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3149 | #: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3150 | #: builtin/remote.c:169 builtin/remote.c:171 |
| 3151 | msgid "branch" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3152 | msgstr "" |
| 3153 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3154 | #: builtin/checkout.c:1056 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3155 | msgid "create and checkout a new branch" |
| 3156 | msgstr "" |
| 3157 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3158 | #: builtin/checkout.c:1058 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3159 | msgid "create/reset and checkout a branch" |
| 3160 | msgstr "" |
| 3161 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3162 | #: builtin/checkout.c:1059 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3163 | msgid "create reflog for new branch" |
| 3164 | msgstr "" |
| 3165 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3166 | #: builtin/checkout.c:1060 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3167 | msgid "detach the HEAD at named commit" |
| 3168 | msgstr "" |
| 3169 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3170 | #: builtin/checkout.c:1061 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3171 | msgid "set upstream info for new branch" |
| 3172 | msgstr "" |
| 3173 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3174 | #: builtin/checkout.c:1063 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3175 | msgid "new branch" |
| 3176 | msgstr "" |
| 3177 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3178 | #: builtin/checkout.c:1063 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3179 | msgid "new unparented branch" |
| 3180 | msgstr "" |
| 3181 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3182 | #: builtin/checkout.c:1064 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3183 | msgid "checkout our version for unmerged files" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3184 | msgstr "" |
| 3185 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3186 | #: builtin/checkout.c:1066 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3187 | msgid "checkout their version for unmerged files" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3188 | msgstr "" |
| 3189 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3190 | #: builtin/checkout.c:1068 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3191 | msgid "force checkout (throw away local modifications)" |
| 3192 | msgstr "" |
| 3193 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3194 | #: builtin/checkout.c:1069 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3195 | msgid "perform a 3-way merge with the new branch" |
| 3196 | msgstr "" |
| 3197 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3198 | #: builtin/checkout.c:1070 builtin/merge.c:232 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3199 | msgid "update ignored files (default)" |
| 3200 | msgstr "" |
| 3201 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3202 | #: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3203 | msgid "style" |
| 3204 | msgstr "" |
| 3205 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3206 | #: builtin/checkout.c:1072 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3207 | msgid "conflict style (merge or diff3)" |
| 3208 | msgstr "" |
| 3209 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3210 | #: builtin/checkout.c:1075 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3211 | msgid "do not limit pathspecs to sparse entries only" |
| 3212 | msgstr "" |
| 3213 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3214 | #: builtin/checkout.c:1077 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3215 | msgid "second guess 'git checkout no-such-branch'" |
| 3216 | msgstr "" |
| 3217 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3218 | #: builtin/checkout.c:1101 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3219 | msgid "-b, -B and --orphan are mutually exclusive" |
| 3220 | msgstr "" |
| 3221 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3222 | #: builtin/checkout.c:1118 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3223 | msgid "--track needs a branch name" |
| 3224 | msgstr "" |
| 3225 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3226 | #: builtin/checkout.c:1125 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3227 | msgid "Missing branch name; try -b" |
| 3228 | msgstr "" |
| 3229 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3230 | #: builtin/checkout.c:1160 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3231 | msgid "invalid path specification" |
| 3232 | msgstr "" |
| 3233 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3234 | #: builtin/checkout.c:1167 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3235 | #, c-format |
| 3236 | msgid "" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3237 | "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] | 3238 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
| 3239 | msgstr "" |
| 3240 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3241 | #: builtin/checkout.c:1172 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3242 | #, c-format |
| 3243 | msgid "git checkout: --detach does not take a path argument '%s'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3244 | msgstr "" |
| 3245 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3246 | #: builtin/checkout.c:1176 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3247 | msgid "" |
| 3248 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" |
| 3249 | "checking out of the index." |
| 3250 | msgstr "" |
| 3251 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3252 | #: builtin/clean.c:25 |
| 3253 | msgid "" |
| 3254 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3255 | msgstr "" |
| 3256 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3257 | #: builtin/clean.c:29 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3258 | #, c-format |
| 3259 | msgid "Removing %s\n" |
| 3260 | msgstr "" |
| 3261 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3262 | #: builtin/clean.c:30 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3263 | #, c-format |
| 3264 | msgid "Would remove %s\n" |
| 3265 | msgstr "" |
| 3266 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3267 | #: builtin/clean.c:31 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3268 | #, c-format |
| 3269 | msgid "Skipping repository %s\n" |
| 3270 | msgstr "" |
| 3271 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3272 | #: builtin/clean.c:32 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3273 | #, c-format |
| 3274 | msgid "Would skip repository %s\n" |
| 3275 | msgstr "" |
| 3276 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3277 | #: builtin/clean.c:33 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3278 | #, c-format |
| 3279 | msgid "failed to remove %s" |
| 3280 | msgstr "" |
| 3281 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3282 | #: builtin/clean.c:293 |
| 3283 | msgid "" |
| 3284 | "Prompt help:\n" |
| 3285 | "1 - select a numbered item\n" |
| 3286 | "foo - select item based on unique prefix\n" |
| 3287 | " - (empty) select nothing" |
| 3288 | msgstr "" |
| 3289 | |
| 3290 | #: builtin/clean.c:297 |
| 3291 | msgid "" |
| 3292 | "Prompt help:\n" |
| 3293 | "1 - select a single item\n" |
| 3294 | "3-5 - select a range of items\n" |
| 3295 | "2-3,6-9 - select multiple ranges\n" |
| 3296 | "foo - select item based on unique prefix\n" |
| 3297 | "-... - unselect specified items\n" |
| 3298 | "* - choose all items\n" |
| 3299 | " - (empty) finish selecting" |
| 3300 | msgstr "" |
| 3301 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3302 | #: builtin/clean.c:515 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3303 | #, c-format |
| 3304 | msgid "Huh (%s)?" |
| 3305 | msgstr "" |
| 3306 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3307 | #: builtin/clean.c:658 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3308 | #, c-format |
| 3309 | msgid "Input ignore patterns>> " |
| 3310 | msgstr "" |
| 3311 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3312 | #: builtin/clean.c:695 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3313 | #, c-format |
| 3314 | msgid "WARNING: Cannot find items matched by: %s" |
| 3315 | msgstr "" |
| 3316 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3317 | #: builtin/clean.c:716 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3318 | msgid "Select items to delete" |
| 3319 | msgstr "" |
| 3320 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3321 | #: builtin/clean.c:756 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3322 | #, c-format |
| 3323 | msgid "remove %s? " |
| 3324 | msgstr "" |
| 3325 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3326 | #: builtin/clean.c:781 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3327 | msgid "Bye." |
| 3328 | msgstr "" |
| 3329 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3330 | #: builtin/clean.c:789 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3331 | msgid "" |
| 3332 | "clean - start cleaning\n" |
| 3333 | "filter by pattern - exclude items from deletion\n" |
| 3334 | "select by numbers - select items to be deleted by numbers\n" |
| 3335 | "ask each - confirm each deletion (like \"rm -i\")\n" |
| 3336 | "quit - stop cleaning\n" |
| 3337 | "help - this screen\n" |
| 3338 | "? - help for prompt selection" |
| 3339 | msgstr "" |
| 3340 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3341 | #: builtin/clean.c:816 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3342 | msgid "*** Commands ***" |
| 3343 | msgstr "" |
| 3344 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3345 | #: builtin/clean.c:817 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3346 | msgid "What now" |
| 3347 | msgstr "" |
| 3348 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3349 | #: builtin/clean.c:825 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3350 | msgid "Would remove the following item:" |
| 3351 | msgid_plural "Would remove the following items:" |
| 3352 | msgstr[0] "" |
| 3353 | msgstr[1] "" |
| 3354 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3355 | #: builtin/clean.c:842 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3356 | msgid "No more files to clean, exiting." |
| 3357 | msgstr "" |
| 3358 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3359 | #: builtin/clean.c:874 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3360 | msgid "do not print names of files removed" |
| 3361 | msgstr "" |
| 3362 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3363 | #: builtin/clean.c:876 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3364 | msgid "force" |
| 3365 | msgstr "" |
| 3366 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3367 | #: builtin/clean.c:877 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3368 | msgid "interactive cleaning" |
| 3369 | msgstr "" |
| 3370 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3371 | #: builtin/clean.c:879 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3372 | msgid "remove whole directories" |
| 3373 | msgstr "" |
| 3374 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3375 | #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3376 | #: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3377 | msgid "pattern" |
| 3378 | msgstr "" |
| 3379 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3380 | #: builtin/clean.c:881 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3381 | msgid "add <pattern> to ignore rules" |
| 3382 | msgstr "" |
| 3383 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3384 | #: builtin/clean.c:882 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3385 | msgid "remove ignored files, too" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3386 | msgstr "" |
| 3387 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3388 | #: builtin/clean.c:884 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3389 | msgid "remove only ignored files" |
| 3390 | msgstr "" |
| 3391 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3392 | #: builtin/clean.c:902 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3393 | msgid "-x and -X cannot be used together" |
| 3394 | msgstr "" |
| 3395 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3396 | #: builtin/clean.c:906 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3397 | msgid "" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3398 | "clean.requireForce set to true and neither -i, -n nor -f given; refusing to " |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3399 | "clean" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3400 | msgstr "" |
| 3401 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3402 | #: builtin/clean.c:909 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3403 | msgid "" |
| 3404 | "clean.requireForce defaults to true and neither -i, -n nor -f given; " |
| 3405 | "refusing to clean" |
| 3406 | msgstr "" |
| 3407 | |
| 3408 | #: builtin/clone.c:36 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3409 | msgid "git clone [options] [--] <repo> [<dir>]" |
| 3410 | msgstr "" |
| 3411 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3412 | #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229 |
| 3413 | #: builtin/push.c:462 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3414 | msgid "force progress reporting" |
| 3415 | msgstr "" |
| 3416 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3417 | #: builtin/clone.c:66 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3418 | msgid "don't create a checkout" |
| 3419 | msgstr "" |
| 3420 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3421 | #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3422 | msgid "create a bare repository" |
| 3423 | msgstr "" |
| 3424 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3425 | #: builtin/clone.c:72 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3426 | msgid "create a mirror repository (implies bare)" |
| 3427 | msgstr "" |
| 3428 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3429 | #: builtin/clone.c:74 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3430 | msgid "to clone from a local repository" |
| 3431 | msgstr "" |
| 3432 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3433 | #: builtin/clone.c:76 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3434 | msgid "don't use local hardlinks, always copy" |
| 3435 | msgstr "" |
| 3436 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3437 | #: builtin/clone.c:78 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3438 | msgid "setup as shared repository" |
| 3439 | msgstr "" |
| 3440 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3441 | #: builtin/clone.c:80 builtin/clone.c:82 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3442 | msgid "initialize submodules in the clone" |
| 3443 | msgstr "" |
| 3444 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3445 | #: builtin/clone.c:83 builtin/init-db.c:485 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3446 | msgid "template-directory" |
| 3447 | msgstr "" |
| 3448 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3449 | #: builtin/clone.c:84 builtin/init-db.c:486 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3450 | msgid "directory from which templates will be used" |
| 3451 | msgstr "" |
| 3452 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3453 | #: builtin/clone.c:86 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3454 | msgid "reference repository" |
| 3455 | msgstr "" |
| 3456 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3457 | #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3458 | msgid "name" |
| 3459 | msgstr "" |
| 3460 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3461 | #: builtin/clone.c:88 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3462 | msgid "use <name> instead of 'origin' to track upstream" |
| 3463 | msgstr "" |
| 3464 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3465 | #: builtin/clone.c:90 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3466 | msgid "checkout <branch> instead of the remote's HEAD" |
| 3467 | msgstr "" |
| 3468 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3469 | #: builtin/clone.c:92 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3470 | msgid "path to git-upload-pack on the remote" |
| 3471 | msgstr "" |
| 3472 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3473 | #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3474 | msgid "depth" |
| 3475 | msgstr "" |
| 3476 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3477 | #: builtin/clone.c:94 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3478 | msgid "create a shallow clone of that depth" |
| 3479 | msgstr "" |
| 3480 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3481 | #: builtin/clone.c:96 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3482 | msgid "clone only one branch, HEAD or --branch" |
| 3483 | msgstr "" |
| 3484 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3485 | #: builtin/clone.c:97 builtin/init-db.c:494 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3486 | msgid "gitdir" |
| 3487 | msgstr "" |
| 3488 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3489 | #: builtin/clone.c:98 builtin/init-db.c:495 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3490 | msgid "separate git dir from working tree" |
| 3491 | msgstr "" |
| 3492 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3493 | #: builtin/clone.c:99 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3494 | msgid "key=value" |
| 3495 | msgstr "" |
| 3496 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3497 | #: builtin/clone.c:100 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3498 | msgid "set config inside the new repository" |
| 3499 | msgstr "" |
| 3500 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3501 | #: builtin/clone.c:253 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3502 | #, c-format |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3503 | msgid "reference repository '%s' is not a local repository." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3504 | msgstr "" |
| 3505 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3506 | #: builtin/clone.c:316 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3507 | #, c-format |
| 3508 | msgid "failed to create directory '%s'" |
| 3509 | msgstr "" |
| 3510 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3511 | #: builtin/clone.c:318 builtin/diff.c:77 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3512 | #, c-format |
| 3513 | msgid "failed to stat '%s'" |
| 3514 | msgstr "" |
| 3515 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3516 | #: builtin/clone.c:320 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3517 | #, c-format |
| 3518 | msgid "%s exists and is not a directory" |
| 3519 | msgstr "" |
| 3520 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3521 | #: builtin/clone.c:334 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3522 | #, c-format |
| 3523 | msgid "failed to stat %s\n" |
| 3524 | msgstr "" |
| 3525 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3526 | #: builtin/clone.c:356 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3527 | #, c-format |
| 3528 | msgid "failed to create link '%s'" |
| 3529 | msgstr "" |
| 3530 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3531 | #: builtin/clone.c:360 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3532 | #, c-format |
| 3533 | msgid "failed to copy file to '%s'" |
| 3534 | msgstr "" |
| 3535 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3536 | #: builtin/clone.c:383 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3537 | #, c-format |
| 3538 | msgid "done.\n" |
| 3539 | msgstr "" |
| 3540 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3541 | #: builtin/clone.c:396 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3542 | msgid "" |
| 3543 | "Clone succeeded, but checkout failed.\n" |
| 3544 | "You can inspect what was checked out with 'git status'\n" |
| 3545 | "and retry the checkout with 'git checkout -f HEAD'\n" |
| 3546 | msgstr "" |
| 3547 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3548 | #: builtin/clone.c:475 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3549 | #, c-format |
| 3550 | msgid "Could not find remote branch %s to clone." |
| 3551 | msgstr "" |
| 3552 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3553 | #: builtin/clone.c:555 |
| 3554 | #, c-format |
| 3555 | msgid "Checking connectivity... " |
| 3556 | msgstr "" |
| 3557 | |
| 3558 | #: builtin/clone.c:558 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3559 | msgid "remote did not send all necessary objects" |
| 3560 | msgstr "" |
| 3561 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3562 | #: builtin/clone.c:560 |
| 3563 | #, c-format |
| 3564 | msgid "done\n" |
| 3565 | msgstr "" |
| 3566 | |
| 3567 | #: builtin/clone.c:621 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3568 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
| 3569 | msgstr "" |
| 3570 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3571 | #: builtin/clone.c:652 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 3572 | msgid "unable to checkout working tree" |
| 3573 | msgstr "" |
| 3574 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3575 | #: builtin/clone.c:760 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3576 | msgid "Too many arguments." |
| 3577 | msgstr "" |
| 3578 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3579 | #: builtin/clone.c:764 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3580 | msgid "You must specify a repository to clone." |
| 3581 | msgstr "" |
| 3582 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3583 | #: builtin/clone.c:775 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3584 | #, c-format |
| 3585 | msgid "--bare and --origin %s options are incompatible." |
| 3586 | msgstr "" |
| 3587 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3588 | #: builtin/clone.c:778 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 3589 | msgid "--bare and --separate-git-dir are incompatible." |
| 3590 | msgstr "" |
| 3591 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3592 | #: builtin/clone.c:791 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3593 | #, c-format |
| 3594 | msgid "repository '%s' does not exist" |
| 3595 | msgstr "" |
| 3596 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3597 | #: builtin/clone.c:796 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3598 | msgid "--depth is ignored in local clones; use file:// instead." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3599 | msgstr "" |
| 3600 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3601 | #: builtin/clone.c:798 |
| 3602 | msgid "--local is ignored" |
| 3603 | msgstr "" |
| 3604 | |
| 3605 | #: builtin/clone.c:808 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3606 | #, c-format |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3607 | msgid "destination path '%s' already exists and is not an empty directory." |
| 3608 | msgstr "" |
| 3609 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3610 | #: builtin/clone.c:818 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 3611 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3612 | msgid "working tree '%s' already exists." |
| 3613 | msgstr "" |
| 3614 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3615 | #: builtin/clone.c:831 builtin/clone.c:843 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3616 | #, c-format |
| 3617 | msgid "could not create leading directories of '%s'" |
| 3618 | msgstr "" |
| 3619 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3620 | #: builtin/clone.c:834 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3621 | #, c-format |
| 3622 | msgid "could not create work tree dir '%s'." |
| 3623 | msgstr "" |
| 3624 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3625 | #: builtin/clone.c:853 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3626 | #, c-format |
| 3627 | msgid "Cloning into bare repository '%s'...\n" |
| 3628 | msgstr "" |
| 3629 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3630 | #: builtin/clone.c:855 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3631 | #, c-format |
| 3632 | msgid "Cloning into '%s'...\n" |
| 3633 | msgstr "" |
| 3634 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3635 | #: builtin/clone.c:890 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3636 | #, c-format |
| 3637 | msgid "Don't know how to clone %s" |
| 3638 | msgstr "" |
| 3639 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3640 | #: builtin/clone.c:942 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3641 | #, c-format |
| 3642 | msgid "Remote branch %s not found in upstream %s" |
| 3643 | msgstr "" |
| 3644 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3645 | #: builtin/clone.c:949 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3646 | msgid "You appear to have cloned an empty repository." |
| 3647 | msgstr "" |
| 3648 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3649 | #: builtin/column.c:9 |
| 3650 | msgid "git column [options]" |
| 3651 | msgstr "" |
| 3652 | |
| 3653 | #: builtin/column.c:26 |
| 3654 | msgid "lookup config vars" |
| 3655 | msgstr "" |
| 3656 | |
| 3657 | #: builtin/column.c:27 builtin/column.c:28 |
| 3658 | msgid "layout to use" |
| 3659 | msgstr "" |
| 3660 | |
| 3661 | #: builtin/column.c:29 |
| 3662 | msgid "Maximum width" |
| 3663 | msgstr "" |
| 3664 | |
| 3665 | #: builtin/column.c:30 |
| 3666 | msgid "Padding space on left border" |
| 3667 | msgstr "" |
| 3668 | |
| 3669 | #: builtin/column.c:31 |
| 3670 | msgid "Padding space on right border" |
| 3671 | msgstr "" |
| 3672 | |
| 3673 | #: builtin/column.c:32 |
| 3674 | msgid "Padding space between columns" |
| 3675 | msgstr "" |
| 3676 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3677 | #: builtin/column.c:51 |
| 3678 | msgid "--command must be the first argument" |
| 3679 | msgstr "" |
| 3680 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3681 | #: builtin/commit.c:35 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3682 | msgid "git commit [options] [--] <pathspec>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3683 | msgstr "" |
| 3684 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3685 | #: builtin/commit.c:40 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3686 | msgid "git status [options] [--] <pathspec>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3687 | msgstr "" |
| 3688 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3689 | #: builtin/commit.c:45 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3690 | msgid "" |
| 3691 | "Your name and email address were configured automatically based\n" |
| 3692 | "on your username and hostname. Please check that they are accurate.\n" |
| 3693 | "You can suppress this message by setting them explicitly:\n" |
| 3694 | "\n" |
| 3695 | " git config --global user.name \"Your Name\"\n" |
| 3696 | " git config --global user.email you@example.com\n" |
| 3697 | "\n" |
| 3698 | "After doing this, you may fix the identity used for this commit with:\n" |
| 3699 | "\n" |
| 3700 | " git commit --amend --reset-author\n" |
| 3701 | msgstr "" |
| 3702 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3703 | #: builtin/commit.c:57 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3704 | msgid "" |
| 3705 | "You asked to amend the most recent commit, but doing so would make\n" |
| 3706 | "it empty. You can repeat your command with --allow-empty, or you can\n" |
| 3707 | "remove the commit entirely with \"git reset HEAD^\".\n" |
| 3708 | msgstr "" |
| 3709 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3710 | #: builtin/commit.c:62 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3711 | msgid "" |
| 3712 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" |
| 3713 | "If you wish to commit it anyway, use:\n" |
| 3714 | "\n" |
| 3715 | " git commit --allow-empty\n" |
| 3716 | "\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3717 | msgstr "" |
| 3718 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3719 | #: builtin/commit.c:69 |
| 3720 | msgid "Otherwise, please use 'git reset'\n" |
| 3721 | msgstr "" |
| 3722 | |
| 3723 | #: builtin/commit.c:72 |
| 3724 | msgid "" |
| 3725 | "If you wish to skip this commit, use:\n" |
| 3726 | "\n" |
| 3727 | " git reset\n" |
| 3728 | "\n" |
| 3729 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" |
| 3730 | "the remaining commits.\n" |
| 3731 | msgstr "" |
| 3732 | |
| 3733 | #: builtin/commit.c:279 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3734 | msgid "failed to unpack HEAD tree object" |
| 3735 | msgstr "" |
| 3736 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3737 | #: builtin/commit.c:321 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3738 | msgid "unable to create temporary index" |
| 3739 | msgstr "" |
| 3740 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3741 | #: builtin/commit.c:327 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3742 | msgid "interactive add failed" |
| 3743 | msgstr "" |
| 3744 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3745 | #: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3746 | msgid "unable to write new_index file" |
| 3747 | msgstr "" |
| 3748 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3749 | #: builtin/commit.c:412 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3750 | msgid "cannot do a partial commit during a merge." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3751 | msgstr "" |
| 3752 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3753 | #: builtin/commit.c:414 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3754 | msgid "cannot do a partial commit during a cherry-pick." |
| 3755 | msgstr "" |
| 3756 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3757 | #: builtin/commit.c:424 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3758 | msgid "cannot read the index" |
| 3759 | msgstr "" |
| 3760 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3761 | #: builtin/commit.c:444 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3762 | msgid "unable to write temporary index file" |
| 3763 | msgstr "" |
| 3764 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3765 | #: builtin/commit.c:535 builtin/commit.c:541 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3766 | #, c-format |
| 3767 | msgid "invalid commit: %s" |
| 3768 | msgstr "" |
| 3769 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3770 | #: builtin/commit.c:563 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3771 | msgid "malformed --author parameter" |
| 3772 | msgstr "" |
| 3773 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3774 | #: builtin/commit.c:583 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3775 | #, c-format |
| 3776 | msgid "Malformed ident string: '%s'" |
| 3777 | msgstr "" |
| 3778 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3779 | #: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3780 | #, c-format |
| 3781 | msgid "could not lookup commit %s" |
| 3782 | msgstr "" |
| 3783 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3784 | #: builtin/commit.c:633 builtin/shortlog.c:271 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3785 | #, c-format |
| 3786 | msgid "(reading log message from standard input)\n" |
| 3787 | msgstr "" |
| 3788 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3789 | #: builtin/commit.c:635 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3790 | msgid "could not read log from standard input" |
| 3791 | msgstr "" |
| 3792 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3793 | #: builtin/commit.c:639 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3794 | #, c-format |
| 3795 | msgid "could not read log file '%s'" |
| 3796 | msgstr "" |
| 3797 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3798 | #: builtin/commit.c:645 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3799 | msgid "commit has empty message" |
| 3800 | msgstr "" |
| 3801 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3802 | #: builtin/commit.c:661 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3803 | msgid "could not read MERGE_MSG" |
| 3804 | msgstr "" |
| 3805 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3806 | #: builtin/commit.c:665 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3807 | msgid "could not read SQUASH_MSG" |
| 3808 | msgstr "" |
| 3809 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3810 | #: builtin/commit.c:669 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3811 | #, c-format |
| 3812 | msgid "could not read '%s'" |
| 3813 | msgstr "" |
| 3814 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3815 | #: builtin/commit.c:730 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3816 | msgid "could not write commit template" |
| 3817 | msgstr "" |
| 3818 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3819 | #: builtin/commit.c:741 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3820 | #, c-format |
| 3821 | msgid "" |
| 3822 | "\n" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3823 | "It looks like you may be committing a merge.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3824 | "If this is not correct, please remove the file\n" |
| 3825 | "\t%s\n" |
| 3826 | "and try again.\n" |
| 3827 | msgstr "" |
| 3828 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3829 | #: builtin/commit.c:746 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3830 | #, c-format |
| 3831 | msgid "" |
| 3832 | "\n" |
| 3833 | "It looks like you may be committing a cherry-pick.\n" |
| 3834 | "If this is not correct, please remove the file\n" |
| 3835 | "\t%s\n" |
| 3836 | "and try again.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3837 | msgstr "" |
| 3838 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3839 | #: builtin/commit.c:758 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3840 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3841 | msgid "" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3842 | "Please enter the commit message for your changes. Lines starting\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3843 | "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] | 3844 | msgstr "" |
| 3845 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3846 | #: builtin/commit.c:763 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3847 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3848 | msgid "" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3849 | "Please enter the commit message for your changes. Lines starting\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 3850 | "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] | 3851 | "An empty message aborts the commit.\n" |
| 3852 | msgstr "" |
| 3853 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3854 | #: builtin/commit.c:776 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3855 | #, c-format |
| 3856 | msgid "%sAuthor: %s" |
| 3857 | msgstr "" |
| 3858 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3859 | #: builtin/commit.c:783 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3860 | #, c-format |
| 3861 | msgid "%sCommitter: %s" |
| 3862 | msgstr "" |
| 3863 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3864 | #: builtin/commit.c:803 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3865 | msgid "Cannot read index" |
| 3866 | msgstr "" |
| 3867 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3868 | #: builtin/commit.c:845 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3869 | msgid "Error building trees" |
| 3870 | msgstr "" |
| 3871 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3872 | #: builtin/commit.c:860 builtin/tag.c:359 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3873 | #, c-format |
| 3874 | msgid "Please supply the message using either -m or -F option.\n" |
| 3875 | msgstr "" |
| 3876 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3877 | #: builtin/commit.c:957 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3878 | #, c-format |
| 3879 | msgid "No existing author found with '%s'" |
| 3880 | msgstr "" |
| 3881 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3882 | #: builtin/commit.c:972 builtin/commit.c:1208 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3883 | #, c-format |
| 3884 | msgid "Invalid untracked files mode '%s'" |
| 3885 | msgstr "" |
| 3886 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3887 | #: builtin/commit.c:1009 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3888 | msgid "--long and -z are incompatible" |
| 3889 | msgstr "" |
| 3890 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3891 | #: builtin/commit.c:1039 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3892 | msgid "Using both --reset-author and --author does not make sense" |
| 3893 | msgstr "" |
| 3894 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3895 | #: builtin/commit.c:1050 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3896 | msgid "You have nothing to amend." |
| 3897 | msgstr "" |
| 3898 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3899 | #: builtin/commit.c:1053 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3900 | msgid "You are in the middle of a merge -- cannot amend." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3901 | msgstr "" |
| 3902 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3903 | #: builtin/commit.c:1055 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 3904 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
| 3905 | msgstr "" |
| 3906 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3907 | #: builtin/commit.c:1058 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3908 | msgid "Options --squash and --fixup cannot be used together" |
| 3909 | msgstr "" |
| 3910 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3911 | #: builtin/commit.c:1068 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3912 | msgid "Only one of -c/-C/-F/--fixup can be used." |
| 3913 | msgstr "" |
| 3914 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3915 | #: builtin/commit.c:1070 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3916 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
| 3917 | msgstr "" |
| 3918 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3919 | #: builtin/commit.c:1078 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3920 | msgid "--reset-author can be used only with -C, -c or --amend." |
| 3921 | msgstr "" |
| 3922 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3923 | #: builtin/commit.c:1095 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3924 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
| 3925 | msgstr "" |
| 3926 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3927 | #: builtin/commit.c:1097 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3928 | msgid "No paths with --include/--only does not make sense." |
| 3929 | msgstr "" |
| 3930 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3931 | #: builtin/commit.c:1099 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3932 | msgid "Clever... amending the last one with dirty index." |
| 3933 | msgstr "" |
| 3934 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3935 | #: builtin/commit.c:1101 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3936 | msgid "Explicit paths specified without -i nor -o; assuming --only paths..." |
| 3937 | msgstr "" |
| 3938 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3939 | #: builtin/commit.c:1111 builtin/tag.c:575 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3940 | #, c-format |
| 3941 | msgid "Invalid cleanup mode %s" |
| 3942 | msgstr "" |
| 3943 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3944 | #: builtin/commit.c:1116 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3945 | msgid "Paths with -a does not make sense." |
| 3946 | msgstr "" |
| 3947 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3948 | #: builtin/commit.c:1222 builtin/commit.c:1455 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3949 | msgid "show status concisely" |
| 3950 | msgstr "" |
| 3951 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3952 | #: builtin/commit.c:1224 builtin/commit.c:1457 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3953 | msgid "show branch information" |
| 3954 | msgstr "" |
| 3955 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3956 | #: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3957 | msgid "machine-readable output" |
| 3958 | msgstr "" |
| 3959 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3960 | #: builtin/commit.c:1229 builtin/commit.c:1461 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 3961 | msgid "show status in long format (default)" |
| 3962 | msgstr "" |
| 3963 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3964 | #: builtin/commit.c:1232 builtin/commit.c:1464 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3965 | msgid "terminate entries with NUL" |
| 3966 | msgstr "" |
| 3967 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3968 | #: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 3969 | #: builtin/fast-export.c:670 builtin/tag.c:459 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3970 | msgid "mode" |
| 3971 | msgstr "" |
| 3972 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3973 | #: builtin/commit.c:1235 builtin/commit.c:1467 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3974 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
| 3975 | msgstr "" |
| 3976 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3977 | #: builtin/commit.c:1238 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3978 | msgid "show ignored files" |
| 3979 | msgstr "" |
| 3980 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3981 | #: builtin/commit.c:1239 parse-options.h:154 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3982 | msgid "when" |
| 3983 | msgstr "" |
| 3984 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3985 | #: builtin/commit.c:1240 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3986 | msgid "" |
| 3987 | "ignore changes to submodules, optional when: all, dirty, untracked. " |
| 3988 | "(Default: all)" |
| 3989 | msgstr "" |
| 3990 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3991 | #: builtin/commit.c:1242 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 3992 | msgid "list untracked files in columns" |
| 3993 | msgstr "" |
| 3994 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3995 | #: builtin/commit.c:1313 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 3996 | msgid "couldn't look up newly created commit" |
| 3997 | msgstr "" |
| 3998 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 3999 | #: builtin/commit.c:1315 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4000 | msgid "could not parse newly created commit" |
| 4001 | msgstr "" |
| 4002 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4003 | #: builtin/commit.c:1356 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4004 | msgid "detached HEAD" |
| 4005 | msgstr "" |
| 4006 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4007 | #: builtin/commit.c:1358 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4008 | msgid " (root-commit)" |
| 4009 | msgstr "" |
| 4010 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4011 | #: builtin/commit.c:1425 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4012 | msgid "suppress summary after successful commit" |
| 4013 | msgstr "" |
| 4014 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4015 | #: builtin/commit.c:1426 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4016 | msgid "show diff in commit message template" |
| 4017 | msgstr "" |
| 4018 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4019 | #: builtin/commit.c:1428 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4020 | msgid "Commit message options" |
| 4021 | msgstr "" |
| 4022 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4023 | #: builtin/commit.c:1429 builtin/tag.c:457 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4024 | msgid "read message from file" |
| 4025 | msgstr "" |
| 4026 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4027 | #: builtin/commit.c:1430 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4028 | msgid "author" |
| 4029 | msgstr "" |
| 4030 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4031 | #: builtin/commit.c:1430 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4032 | msgid "override author for commit" |
| 4033 | msgstr "" |
| 4034 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4035 | #: builtin/commit.c:1431 builtin/gc.c:178 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4036 | msgid "date" |
| 4037 | msgstr "" |
| 4038 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4039 | #: builtin/commit.c:1431 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4040 | msgid "override date for commit" |
| 4041 | msgstr "" |
| 4042 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4043 | #: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4044 | #: builtin/notes.c:562 builtin/tag.c:455 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4045 | msgid "message" |
| 4046 | msgstr "" |
| 4047 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4048 | #: builtin/commit.c:1432 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4049 | msgid "commit message" |
| 4050 | msgstr "" |
| 4051 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4052 | #: builtin/commit.c:1433 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4053 | msgid "reuse and edit message from specified commit" |
| 4054 | msgstr "" |
| 4055 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4056 | #: builtin/commit.c:1434 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4057 | msgid "reuse message from specified commit" |
| 4058 | msgstr "" |
| 4059 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4060 | #: builtin/commit.c:1435 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4061 | msgid "use autosquash formatted message to fixup specified commit" |
| 4062 | msgstr "" |
| 4063 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4064 | #: builtin/commit.c:1436 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4065 | msgid "use autosquash formatted message to squash specified commit" |
| 4066 | msgstr "" |
| 4067 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4068 | #: builtin/commit.c:1437 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4069 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
| 4070 | msgstr "" |
| 4071 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4072 | #: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4073 | msgid "add Signed-off-by:" |
| 4074 | msgstr "" |
| 4075 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4076 | #: builtin/commit.c:1439 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4077 | msgid "use specified template file" |
| 4078 | msgstr "" |
| 4079 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4080 | #: builtin/commit.c:1440 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4081 | msgid "force edit of commit" |
| 4082 | msgstr "" |
| 4083 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4084 | #: builtin/commit.c:1441 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4085 | msgid "default" |
| 4086 | msgstr "" |
| 4087 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4088 | #: builtin/commit.c:1441 builtin/tag.c:460 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4089 | msgid "how to strip spaces and #comments from message" |
| 4090 | msgstr "" |
| 4091 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4092 | #: builtin/commit.c:1442 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4093 | msgid "include status in commit message template" |
| 4094 | msgstr "" |
| 4095 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4096 | #: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4097 | msgid "key id" |
| 4098 | msgstr "" |
| 4099 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4100 | #: builtin/commit.c:1444 builtin/merge.c:231 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4101 | msgid "GPG sign commit" |
| 4102 | msgstr "" |
| 4103 | |
| 4104 | #. end commit message options |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4105 | #: builtin/commit.c:1447 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4106 | msgid "Commit contents options" |
| 4107 | msgstr "" |
| 4108 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4109 | #: builtin/commit.c:1448 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4110 | msgid "commit all changed files" |
| 4111 | msgstr "" |
| 4112 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4113 | #: builtin/commit.c:1449 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4114 | msgid "add specified files to index for commit" |
| 4115 | msgstr "" |
| 4116 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4117 | #: builtin/commit.c:1450 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4118 | msgid "interactively add files" |
| 4119 | msgstr "" |
| 4120 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4121 | #: builtin/commit.c:1451 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4122 | msgid "interactively add changes" |
| 4123 | msgstr "" |
| 4124 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4125 | #: builtin/commit.c:1452 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4126 | msgid "commit only specified files" |
| 4127 | msgstr "" |
| 4128 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4129 | #: builtin/commit.c:1453 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4130 | msgid "bypass pre-commit hook" |
| 4131 | msgstr "" |
| 4132 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4133 | #: builtin/commit.c:1454 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4134 | msgid "show what would be committed" |
| 4135 | msgstr "" |
| 4136 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4137 | #: builtin/commit.c:1465 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4138 | msgid "amend previous commit" |
| 4139 | msgstr "" |
| 4140 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4141 | #: builtin/commit.c:1466 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4142 | msgid "bypass post-rewrite hook" |
| 4143 | msgstr "" |
| 4144 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4145 | #: builtin/commit.c:1471 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4146 | msgid "ok to record an empty change" |
| 4147 | msgstr "" |
| 4148 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4149 | #: builtin/commit.c:1474 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4150 | msgid "ok to record a change with an empty message" |
| 4151 | msgstr "" |
| 4152 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4153 | #: builtin/commit.c:1507 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4154 | msgid "could not parse HEAD commit" |
| 4155 | msgstr "" |
| 4156 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4157 | #: builtin/commit.c:1545 builtin/merge.c:525 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4158 | #, c-format |
| 4159 | msgid "could not open '%s' for reading" |
| 4160 | msgstr "" |
| 4161 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4162 | #: builtin/commit.c:1552 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4163 | #, c-format |
| 4164 | msgid "Corrupt MERGE_HEAD file (%s)" |
| 4165 | msgstr "" |
| 4166 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4167 | #: builtin/commit.c:1559 |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4168 | msgid "could not read MERGE_MODE" |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 4169 | msgstr "" |
| 4170 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4171 | #: builtin/commit.c:1578 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4172 | #, c-format |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4173 | msgid "could not read commit message: %s" |
| 4174 | msgstr "" |
| 4175 | |
| 4176 | #: builtin/commit.c:1592 |
| 4177 | #, c-format |
| 4178 | msgid "Aborting commit; you did not edit the message.\n" |
| 4179 | msgstr "" |
| 4180 | |
| 4181 | #: builtin/commit.c:1597 |
| 4182 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4183 | msgid "Aborting commit due to empty commit message.\n" |
| 4184 | msgstr "" |
| 4185 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4186 | #: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4187 | msgid "failed to write commit object" |
| 4188 | msgstr "" |
| 4189 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4190 | #: builtin/commit.c:1633 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4191 | msgid "cannot lock HEAD ref" |
| 4192 | msgstr "" |
| 4193 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4194 | #: builtin/commit.c:1637 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4195 | msgid "cannot update HEAD ref" |
| 4196 | msgstr "" |
| 4197 | |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 4198 | #: builtin/commit.c:1648 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4199 | msgid "" |
| 4200 | "Repository has been updated, but unable to write\n" |
| 4201 | "new_index file. Check that disk is not full or quota is\n" |
| 4202 | "not exceeded, and then \"git reset HEAD\" to recover." |
| 4203 | msgstr "" |
| 4204 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4205 | #: builtin/config.c:7 |
| 4206 | msgid "git config [options]" |
| 4207 | msgstr "" |
| 4208 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4209 | #: builtin/config.c:52 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4210 | msgid "Config file location" |
| 4211 | msgstr "" |
| 4212 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4213 | #: builtin/config.c:53 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4214 | msgid "use global config file" |
| 4215 | msgstr "" |
| 4216 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4217 | #: builtin/config.c:54 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4218 | msgid "use system config file" |
| 4219 | msgstr "" |
| 4220 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4221 | #: builtin/config.c:55 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4222 | msgid "use repository config file" |
| 4223 | msgstr "" |
| 4224 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4225 | #: builtin/config.c:56 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4226 | msgid "use given config file" |
| 4227 | msgstr "" |
| 4228 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4229 | #: builtin/config.c:57 |
| 4230 | msgid "blob-id" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4231 | msgstr "" |
| 4232 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4233 | #: builtin/config.c:57 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4234 | msgid "read config from given blob object" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4235 | msgstr "" |
| 4236 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4237 | #: builtin/config.c:58 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4238 | msgid "Action" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4239 | msgstr "" |
| 4240 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4241 | #: builtin/config.c:59 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4242 | msgid "get value: name [value-regex]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4243 | msgstr "" |
| 4244 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4245 | #: builtin/config.c:60 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4246 | msgid "get all values: key [value-regex]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4247 | msgstr "" |
| 4248 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4249 | #: builtin/config.c:61 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4250 | msgid "get values for regexp: name-regex [value-regex]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4251 | msgstr "" |
| 4252 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4253 | #: builtin/config.c:62 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4254 | msgid "replace all matching variables: name value [value_regex]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4255 | msgstr "" |
| 4256 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4257 | #: builtin/config.c:63 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4258 | msgid "add a new variable: name value" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4259 | msgstr "" |
| 4260 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4261 | #: builtin/config.c:64 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4262 | msgid "remove a variable: name [value-regex]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4263 | msgstr "" |
| 4264 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4265 | #: builtin/config.c:65 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4266 | msgid "remove all matches: name [value-regex]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4267 | msgstr "" |
| 4268 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4269 | #: builtin/config.c:66 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4270 | msgid "rename section: old-name new-name" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4271 | msgstr "" |
| 4272 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4273 | #: builtin/config.c:67 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4274 | msgid "remove a section: name" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4275 | msgstr "" |
| 4276 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4277 | #: builtin/config.c:68 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4278 | msgid "list all" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4279 | msgstr "" |
| 4280 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4281 | #: builtin/config.c:69 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4282 | msgid "open an editor" |
| 4283 | msgstr "" |
| 4284 | |
| 4285 | #: builtin/config.c:70 builtin/config.c:71 |
| 4286 | msgid "slot" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4287 | msgstr "" |
| 4288 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4289 | #: builtin/config.c:70 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4290 | msgid "find the color configured: [default]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4291 | msgstr "" |
| 4292 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4293 | #: builtin/config.c:71 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4294 | msgid "find the color setting: [stdout-is-tty]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4295 | msgstr "" |
| 4296 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4297 | #: builtin/config.c:72 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4298 | msgid "Type" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4299 | msgstr "" |
| 4300 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4301 | #: builtin/config.c:73 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4302 | msgid "value is \"true\" or \"false\"" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4303 | msgstr "" |
| 4304 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4305 | #: builtin/config.c:74 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4306 | msgid "value is decimal number" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4307 | msgstr "" |
| 4308 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4309 | #: builtin/config.c:75 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4310 | msgid "value is --bool or --int" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4311 | msgstr "" |
| 4312 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4313 | #: builtin/config.c:76 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4314 | msgid "value is a path (file or directory name)" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4315 | msgstr "" |
| 4316 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 4317 | #: builtin/config.c:77 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4318 | msgid "Other" |
| 4319 | msgstr "" |
| 4320 | |
| 4321 | #: builtin/config.c:78 |
| 4322 | msgid "terminate values with NUL byte" |
| 4323 | msgstr "" |
| 4324 | |
| 4325 | #: builtin/config.c:79 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4326 | msgid "respect include directives on lookup" |
| 4327 | msgstr "" |
| 4328 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4329 | #: builtin/count-objects.c:82 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4330 | msgid "git count-objects [-v] [-H | --human-readable]" |
| 4331 | msgstr "" |
| 4332 | |
| 4333 | #: builtin/count-objects.c:97 |
| 4334 | msgid "print sizes in human readable format" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4335 | msgstr "" |
| 4336 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4337 | #: builtin/describe.c:16 |
Richard Hansen | a8a5406 | 2013-09-04 15:04:31 -0400 | [diff] [blame] | 4338 | msgid "git describe [options] <commit-ish>*" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4339 | msgstr "" |
| 4340 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4341 | #: builtin/describe.c:17 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4342 | msgid "git describe [options] --dirty" |
| 4343 | msgstr "" |
| 4344 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4345 | #: builtin/describe.c:237 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4346 | #, c-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4347 | msgid "annotated tag %s not available" |
| 4348 | msgstr "" |
| 4349 | |
| 4350 | #: builtin/describe.c:241 |
| 4351 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4352 | msgid "annotated tag %s has no embedded name" |
| 4353 | msgstr "" |
| 4354 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4355 | #: builtin/describe.c:243 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4356 | #, c-format |
| 4357 | msgid "tag '%s' is really '%s' here" |
| 4358 | msgstr "" |
| 4359 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4360 | #: builtin/describe.c:270 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4361 | #, c-format |
| 4362 | msgid "Not a valid object name %s" |
| 4363 | msgstr "" |
| 4364 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4365 | #: builtin/describe.c:273 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4366 | #, c-format |
| 4367 | msgid "%s is not a valid '%s' object" |
| 4368 | msgstr "" |
| 4369 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4370 | #: builtin/describe.c:290 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4371 | #, c-format |
| 4372 | msgid "no tag exactly matches '%s'" |
| 4373 | msgstr "" |
| 4374 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4375 | #: builtin/describe.c:292 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4376 | #, c-format |
| 4377 | msgid "searching to describe %s\n" |
| 4378 | msgstr "" |
| 4379 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4380 | #: builtin/describe.c:332 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4381 | #, c-format |
| 4382 | msgid "finished search at %s\n" |
| 4383 | msgstr "" |
| 4384 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4385 | #: builtin/describe.c:359 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4386 | #, c-format |
| 4387 | msgid "" |
| 4388 | "No annotated tags can describe '%s'.\n" |
| 4389 | "However, there were unannotated tags: try --tags." |
| 4390 | msgstr "" |
| 4391 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4392 | #: builtin/describe.c:363 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4393 | #, c-format |
| 4394 | msgid "" |
| 4395 | "No tags can describe '%s'.\n" |
| 4396 | "Try --always, or create some tags." |
| 4397 | msgstr "" |
| 4398 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4399 | #: builtin/describe.c:384 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4400 | #, c-format |
| 4401 | msgid "traversed %lu commits\n" |
| 4402 | msgstr "" |
| 4403 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4404 | #: builtin/describe.c:387 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4405 | #, c-format |
| 4406 | msgid "" |
| 4407 | "more than %i tags found; listed %i most recent\n" |
| 4408 | "gave up search at %s\n" |
| 4409 | msgstr "" |
| 4410 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4411 | #: builtin/describe.c:409 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4412 | msgid "find the tag that comes after the commit" |
| 4413 | msgstr "" |
| 4414 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4415 | #: builtin/describe.c:410 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4416 | msgid "debug search strategy on stderr" |
| 4417 | msgstr "" |
| 4418 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4419 | #: builtin/describe.c:411 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4420 | msgid "use any ref" |
| 4421 | msgstr "" |
| 4422 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4423 | #: builtin/describe.c:412 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4424 | msgid "use any tag, even unannotated" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4425 | msgstr "" |
| 4426 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4427 | #: builtin/describe.c:413 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4428 | msgid "always use long format" |
| 4429 | msgstr "" |
| 4430 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4431 | #: builtin/describe.c:414 |
| 4432 | msgid "only follow first parent" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4433 | msgstr "" |
| 4434 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 4435 | #: builtin/describe.c:417 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4436 | msgid "only output exact matches" |
| 4437 | msgstr "" |
| 4438 | |
| 4439 | #: builtin/describe.c:419 |
| 4440 | msgid "consider <n> most recent tags (default: 10)" |
| 4441 | msgstr "" |
| 4442 | |
| 4443 | #: builtin/describe.c:421 |
| 4444 | msgid "only consider tags matching <pattern>" |
| 4445 | msgstr "" |
| 4446 | |
| 4447 | #: builtin/describe.c:423 builtin/name-rev.c:322 |
| 4448 | msgid "show abbreviated commit object as fallback" |
| 4449 | msgstr "" |
| 4450 | |
| 4451 | #: builtin/describe.c:424 |
| 4452 | msgid "mark" |
| 4453 | msgstr "" |
| 4454 | |
| 4455 | #: builtin/describe.c:425 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4456 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
| 4457 | msgstr "" |
| 4458 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4459 | #: builtin/describe.c:443 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4460 | msgid "--long is incompatible with --abbrev=0" |
| 4461 | msgstr "" |
| 4462 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4463 | #: builtin/describe.c:469 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4464 | msgid "No names found, cannot describe anything." |
| 4465 | msgstr "" |
| 4466 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4467 | #: builtin/describe.c:489 |
Richard Hansen | a8a5406 | 2013-09-04 15:04:31 -0400 | [diff] [blame] | 4468 | msgid "--dirty is incompatible with commit-ishes" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4469 | msgstr "" |
| 4470 | |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 4471 | #: builtin/diff.c:79 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4472 | #, c-format |
| 4473 | msgid "'%s': not a regular file or symlink" |
| 4474 | msgstr "" |
| 4475 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4476 | #: builtin/diff.c:230 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4477 | #, c-format |
| 4478 | msgid "invalid option: %s" |
| 4479 | msgstr "" |
| 4480 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4481 | #: builtin/diff.c:307 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4482 | msgid "Not a git repository" |
| 4483 | msgstr "" |
| 4484 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4485 | #: builtin/diff.c:350 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4486 | #, c-format |
| 4487 | msgid "invalid object '%s' given." |
| 4488 | msgstr "" |
| 4489 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4490 | #: builtin/diff.c:359 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4491 | #, c-format |
| 4492 | msgid "more than two blobs given: '%s'" |
| 4493 | msgstr "" |
| 4494 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4495 | #: builtin/diff.c:366 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4496 | #, c-format |
| 4497 | msgid "unhandled object '%s' given." |
| 4498 | msgstr "" |
| 4499 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4500 | #: builtin/fast-export.c:22 |
| 4501 | msgid "git fast-export [rev-list-opts]" |
| 4502 | msgstr "" |
| 4503 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4504 | #: builtin/fast-export.c:666 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4505 | msgid "show progress after <n> objects" |
| 4506 | msgstr "" |
| 4507 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4508 | #: builtin/fast-export.c:668 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4509 | msgid "select handling of signed tags" |
| 4510 | msgstr "" |
| 4511 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4512 | #: builtin/fast-export.c:671 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4513 | msgid "select handling of tags that tag filtered objects" |
| 4514 | msgstr "" |
| 4515 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4516 | #: builtin/fast-export.c:674 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4517 | msgid "Dump marks to this file" |
| 4518 | msgstr "" |
| 4519 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4520 | #: builtin/fast-export.c:676 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4521 | msgid "Import marks from this file" |
| 4522 | msgstr "" |
| 4523 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4524 | #: builtin/fast-export.c:678 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4525 | msgid "Fake a tagger when tags lack one" |
| 4526 | msgstr "" |
| 4527 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4528 | #: builtin/fast-export.c:680 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4529 | msgid "Output full tree for each commit" |
| 4530 | msgstr "" |
| 4531 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4532 | #: builtin/fast-export.c:682 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4533 | msgid "Use the done feature to terminate the stream" |
| 4534 | msgstr "" |
| 4535 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4536 | #: builtin/fast-export.c:683 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4537 | msgid "Skip output of blob data" |
| 4538 | msgstr "" |
| 4539 | |
| 4540 | #: builtin/fetch.c:20 |
| 4541 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
| 4542 | msgstr "" |
| 4543 | |
| 4544 | #: builtin/fetch.c:21 |
| 4545 | msgid "git fetch [<options>] <group>" |
| 4546 | msgstr "" |
| 4547 | |
| 4548 | #: builtin/fetch.c:22 |
| 4549 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
| 4550 | msgstr "" |
| 4551 | |
| 4552 | #: builtin/fetch.c:23 |
| 4553 | msgid "git fetch --all [<options>]" |
| 4554 | msgstr "" |
| 4555 | |
| 4556 | #: builtin/fetch.c:60 |
| 4557 | msgid "fetch from all remotes" |
| 4558 | msgstr "" |
| 4559 | |
| 4560 | #: builtin/fetch.c:62 |
| 4561 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
| 4562 | msgstr "" |
| 4563 | |
| 4564 | #: builtin/fetch.c:64 |
| 4565 | msgid "path to upload pack on remote end" |
| 4566 | msgstr "" |
| 4567 | |
| 4568 | #: builtin/fetch.c:65 |
| 4569 | msgid "force overwrite of local branch" |
| 4570 | msgstr "" |
| 4571 | |
| 4572 | #: builtin/fetch.c:67 |
| 4573 | msgid "fetch from multiple remotes" |
| 4574 | msgstr "" |
| 4575 | |
| 4576 | #: builtin/fetch.c:69 |
| 4577 | msgid "fetch all tags and associated objects" |
| 4578 | msgstr "" |
| 4579 | |
| 4580 | #: builtin/fetch.c:71 |
| 4581 | msgid "do not fetch all tags (--no-tags)" |
| 4582 | msgstr "" |
| 4583 | |
| 4584 | #: builtin/fetch.c:73 |
| 4585 | msgid "prune remote-tracking branches no longer on remote" |
| 4586 | msgstr "" |
| 4587 | |
| 4588 | #: builtin/fetch.c:74 |
| 4589 | msgid "on-demand" |
| 4590 | msgstr "" |
| 4591 | |
| 4592 | #: builtin/fetch.c:75 |
| 4593 | msgid "control recursive fetching of submodules" |
| 4594 | msgstr "" |
| 4595 | |
| 4596 | #: builtin/fetch.c:79 |
| 4597 | msgid "keep downloaded pack" |
| 4598 | msgstr "" |
| 4599 | |
| 4600 | #: builtin/fetch.c:81 |
| 4601 | msgid "allow updating of HEAD ref" |
| 4602 | msgstr "" |
| 4603 | |
| 4604 | #: builtin/fetch.c:84 |
| 4605 | msgid "deepen history of shallow clone" |
| 4606 | msgstr "" |
| 4607 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4608 | #: builtin/fetch.c:86 |
| 4609 | msgid "convert to a complete repository" |
| 4610 | msgstr "" |
| 4611 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4612 | #: builtin/fetch.c:88 builtin/log.c:1177 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4613 | msgid "dir" |
| 4614 | msgstr "" |
| 4615 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4616 | #: builtin/fetch.c:89 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4617 | msgid "prepend this to submodule path output" |
| 4618 | msgstr "" |
| 4619 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4620 | #: builtin/fetch.c:92 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4621 | msgid "default mode for recursion" |
| 4622 | msgstr "" |
| 4623 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4624 | #: builtin/fetch.c:220 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4625 | msgid "Couldn't find remote ref HEAD" |
| 4626 | msgstr "" |
| 4627 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4628 | #: builtin/fetch.c:273 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4629 | #, c-format |
| 4630 | msgid "object %s not found" |
| 4631 | msgstr "" |
| 4632 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4633 | #: builtin/fetch.c:278 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4634 | msgid "[up to date]" |
| 4635 | msgstr "" |
| 4636 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4637 | #: builtin/fetch.c:292 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4638 | #, c-format |
| 4639 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" |
| 4640 | msgstr "" |
| 4641 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4642 | #: builtin/fetch.c:293 builtin/fetch.c:379 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4643 | msgid "[rejected]" |
| 4644 | msgstr "" |
| 4645 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4646 | #: builtin/fetch.c:304 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4647 | msgid "[tag update]" |
| 4648 | msgstr "" |
| 4649 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4650 | #: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4651 | msgid " (unable to update local ref)" |
| 4652 | msgstr "" |
| 4653 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4654 | #: builtin/fetch.c:324 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4655 | msgid "[new tag]" |
| 4656 | msgstr "" |
| 4657 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4658 | #: builtin/fetch.c:327 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4659 | msgid "[new branch]" |
| 4660 | msgstr "" |
| 4661 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4662 | #: builtin/fetch.c:330 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 4663 | msgid "[new ref]" |
| 4664 | msgstr "" |
| 4665 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4666 | #: builtin/fetch.c:375 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4667 | msgid "unable to update local ref" |
| 4668 | msgstr "" |
| 4669 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4670 | #: builtin/fetch.c:375 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4671 | msgid "forced update" |
| 4672 | msgstr "" |
| 4673 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4674 | #: builtin/fetch.c:381 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4675 | msgid "(non-fast-forward)" |
| 4676 | msgstr "" |
| 4677 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4678 | #: builtin/fetch.c:412 builtin/fetch.c:718 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4679 | #, c-format |
| 4680 | msgid "cannot open %s: %s\n" |
| 4681 | msgstr "" |
| 4682 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4683 | #: builtin/fetch.c:421 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4684 | #, c-format |
| 4685 | msgid "%s did not send all necessary objects\n" |
| 4686 | msgstr "" |
| 4687 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4688 | #: builtin/fetch.c:520 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4689 | #, c-format |
| 4690 | msgid "From %.*s\n" |
| 4691 | msgstr "" |
| 4692 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4693 | #: builtin/fetch.c:531 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4694 | #, c-format |
| 4695 | msgid "" |
| 4696 | "some local refs could not be updated; try running\n" |
| 4697 | " 'git remote prune %s' to remove any old, conflicting branches" |
| 4698 | msgstr "" |
| 4699 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4700 | #: builtin/fetch.c:581 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4701 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 4702 | msgid " (%s will become dangling)" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4703 | msgstr "" |
| 4704 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4705 | #: builtin/fetch.c:582 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4706 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 4707 | msgid " (%s has become dangling)" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4708 | msgstr "" |
| 4709 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4710 | #: builtin/fetch.c:589 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4711 | msgid "[deleted]" |
| 4712 | msgstr "" |
| 4713 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4714 | #: builtin/fetch.c:590 builtin/remote.c:1055 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4715 | msgid "(none)" |
| 4716 | msgstr "" |
| 4717 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4718 | #: builtin/fetch.c:708 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4719 | #, c-format |
| 4720 | msgid "Refusing to fetch into current branch %s of non-bare repository" |
| 4721 | msgstr "" |
| 4722 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4723 | #: builtin/fetch.c:742 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4724 | #, c-format |
| 4725 | msgid "Don't know how to fetch from %s" |
| 4726 | msgstr "" |
| 4727 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4728 | #: builtin/fetch.c:823 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4729 | #, c-format |
| 4730 | msgid "Option \"%s\" value \"%s\" is not valid for %s" |
| 4731 | msgstr "" |
| 4732 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4733 | #: builtin/fetch.c:826 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4734 | #, c-format |
| 4735 | msgid "Option \"%s\" is ignored for %s\n" |
| 4736 | msgstr "" |
| 4737 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4738 | #: builtin/fetch.c:928 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4739 | #, c-format |
| 4740 | msgid "Fetching %s\n" |
| 4741 | msgstr "" |
| 4742 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4743 | #: builtin/fetch.c:930 builtin/remote.c:100 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4744 | #, c-format |
| 4745 | msgid "Could not fetch %s" |
| 4746 | msgstr "" |
| 4747 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4748 | #: builtin/fetch.c:949 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4749 | msgid "" |
| 4750 | "No remote repository specified. Please, specify either a URL or a\n" |
| 4751 | "remote name from which new revisions should be fetched." |
| 4752 | msgstr "" |
| 4753 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4754 | #: builtin/fetch.c:969 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4755 | msgid "You need to specify a tag name." |
| 4756 | msgstr "" |
| 4757 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4758 | #: builtin/fetch.c:1015 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4759 | msgid "--depth and --unshallow cannot be used together" |
| 4760 | msgstr "" |
| 4761 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4762 | #: builtin/fetch.c:1017 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 4763 | msgid "--unshallow on a complete repository does not make sense" |
| 4764 | msgstr "" |
| 4765 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4766 | #: builtin/fetch.c:1036 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4767 | msgid "fetch --all does not take a repository argument" |
| 4768 | msgstr "" |
| 4769 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4770 | #: builtin/fetch.c:1038 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4771 | msgid "fetch --all does not make sense with refspecs" |
| 4772 | msgstr "" |
| 4773 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4774 | #: builtin/fetch.c:1049 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4775 | #, c-format |
| 4776 | msgid "No such remote or remote group: %s" |
| 4777 | msgstr "" |
| 4778 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4779 | #: builtin/fetch.c:1057 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4780 | msgid "Fetching a group and specifying refspecs does not make sense" |
| 4781 | msgstr "" |
| 4782 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4783 | #: builtin/fmt-merge-msg.c:13 |
| 4784 | msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" |
| 4785 | msgstr "" |
| 4786 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4787 | #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700 |
| 4788 | #: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179 |
| 4789 | #: builtin/tag.c:446 parse-options.h:133 parse-options.h:243 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4790 | msgid "n" |
| 4791 | msgstr "" |
| 4792 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4793 | #: builtin/fmt-merge-msg.c:664 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4794 | msgid "populate log with at most <n> entries from shortlog" |
| 4795 | msgstr "" |
| 4796 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4797 | #: builtin/fmt-merge-msg.c:667 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4798 | msgid "alias for --log (deprecated)" |
| 4799 | msgstr "" |
| 4800 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4801 | #: builtin/fmt-merge-msg.c:670 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4802 | msgid "text" |
| 4803 | msgstr "" |
| 4804 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4805 | #: builtin/fmt-merge-msg.c:671 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4806 | msgid "use <text> as start of message" |
| 4807 | msgstr "" |
| 4808 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 4809 | #: builtin/fmt-merge-msg.c:672 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4810 | msgid "file to read from" |
| 4811 | msgstr "" |
| 4812 | |
| 4813 | #: builtin/for-each-ref.c:979 |
| 4814 | msgid "git for-each-ref [options] [<pattern>]" |
| 4815 | msgstr "" |
| 4816 | |
| 4817 | #: builtin/for-each-ref.c:994 |
| 4818 | msgid "quote placeholders suitably for shells" |
| 4819 | msgstr "" |
| 4820 | |
| 4821 | #: builtin/for-each-ref.c:996 |
| 4822 | msgid "quote placeholders suitably for perl" |
| 4823 | msgstr "" |
| 4824 | |
| 4825 | #: builtin/for-each-ref.c:998 |
| 4826 | msgid "quote placeholders suitably for python" |
| 4827 | msgstr "" |
| 4828 | |
| 4829 | #: builtin/for-each-ref.c:1000 |
| 4830 | msgid "quote placeholders suitably for tcl" |
| 4831 | msgstr "" |
| 4832 | |
| 4833 | #: builtin/for-each-ref.c:1003 |
| 4834 | msgid "show only <n> matched refs" |
| 4835 | msgstr "" |
| 4836 | |
| 4837 | #: builtin/for-each-ref.c:1004 |
| 4838 | msgid "format" |
| 4839 | msgstr "" |
| 4840 | |
| 4841 | #: builtin/for-each-ref.c:1004 |
| 4842 | msgid "format to use for the output" |
| 4843 | msgstr "" |
| 4844 | |
| 4845 | #: builtin/for-each-ref.c:1005 |
| 4846 | msgid "key" |
| 4847 | msgstr "" |
| 4848 | |
| 4849 | #: builtin/for-each-ref.c:1006 |
| 4850 | msgid "field name to sort on" |
| 4851 | msgstr "" |
| 4852 | |
| 4853 | #: builtin/fsck.c:608 |
| 4854 | msgid "git fsck [options] [<object>...]" |
| 4855 | msgstr "" |
| 4856 | |
| 4857 | #: builtin/fsck.c:614 |
| 4858 | msgid "show unreachable objects" |
| 4859 | msgstr "" |
| 4860 | |
| 4861 | #: builtin/fsck.c:615 |
| 4862 | msgid "show dangling objects" |
| 4863 | msgstr "" |
| 4864 | |
| 4865 | #: builtin/fsck.c:616 |
| 4866 | msgid "report tags" |
| 4867 | msgstr "" |
| 4868 | |
| 4869 | #: builtin/fsck.c:617 |
| 4870 | msgid "report root nodes" |
| 4871 | msgstr "" |
| 4872 | |
| 4873 | #: builtin/fsck.c:618 |
| 4874 | msgid "make index objects head nodes" |
| 4875 | msgstr "" |
| 4876 | |
| 4877 | #: builtin/fsck.c:619 |
| 4878 | msgid "make reflogs head nodes (default)" |
| 4879 | msgstr "" |
| 4880 | |
| 4881 | #: builtin/fsck.c:620 |
| 4882 | msgid "also consider packs and alternate objects" |
| 4883 | msgstr "" |
| 4884 | |
| 4885 | #: builtin/fsck.c:621 |
| 4886 | msgid "enable more strict checking" |
| 4887 | msgstr "" |
| 4888 | |
| 4889 | #: builtin/fsck.c:623 |
| 4890 | msgid "write dangling objects in .git/lost-found" |
| 4891 | msgstr "" |
| 4892 | |
| 4893 | #: builtin/fsck.c:624 builtin/prune.c:134 |
| 4894 | msgid "show progress" |
| 4895 | msgstr "" |
| 4896 | |
| 4897 | #: builtin/gc.c:22 |
| 4898 | msgid "git gc [options]" |
| 4899 | msgstr "" |
| 4900 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4901 | #: builtin/gc.c:63 |
| 4902 | #, c-format |
| 4903 | msgid "Invalid %s: '%s'" |
| 4904 | msgstr "" |
| 4905 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 4906 | #: builtin/gc.c:90 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4907 | #, c-format |
| 4908 | msgid "insanely long object directory %.*s" |
| 4909 | msgstr "" |
| 4910 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4911 | #: builtin/gc.c:179 |
| 4912 | msgid "prune unreferenced objects" |
| 4913 | msgstr "" |
| 4914 | |
| 4915 | #: builtin/gc.c:181 |
| 4916 | msgid "be more thorough (increased runtime)" |
| 4917 | msgstr "" |
| 4918 | |
| 4919 | #: builtin/gc.c:182 |
| 4920 | msgid "enable auto-gc mode" |
| 4921 | msgstr "" |
| 4922 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 4923 | #: builtin/gc.c:222 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4924 | #, c-format |
| 4925 | msgid "" |
| 4926 | "Auto packing the repository for optimum performance. You may also\n" |
| 4927 | "run \"git gc\" manually. See \"git help gc\" for more information.\n" |
| 4928 | msgstr "" |
| 4929 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 4930 | #: builtin/gc.c:249 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4931 | msgid "" |
| 4932 | "There are too many unreachable loose objects; run 'git prune' to remove them." |
| 4933 | msgstr "" |
| 4934 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4935 | #: builtin/grep.c:22 |
| 4936 | msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" |
| 4937 | msgstr "" |
| 4938 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 4939 | #: builtin/grep.c:217 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4940 | #, c-format |
| 4941 | msgid "grep: failed to create thread: %s" |
| 4942 | msgstr "" |
| 4943 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4944 | #: builtin/grep.c:364 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4945 | #, c-format |
| 4946 | msgid "Failed to chdir: %s" |
| 4947 | msgstr "" |
| 4948 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4949 | #: builtin/grep.c:442 builtin/grep.c:477 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4950 | #, c-format |
| 4951 | msgid "unable to read tree (%s)" |
| 4952 | msgstr "" |
| 4953 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4954 | #: builtin/grep.c:492 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4955 | #, c-format |
| 4956 | msgid "unable to grep from object of type %s" |
| 4957 | msgstr "" |
| 4958 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4959 | #: builtin/grep.c:550 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4960 | #, c-format |
| 4961 | msgid "switch `%c' expects a numerical value" |
| 4962 | msgstr "" |
| 4963 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4964 | #: builtin/grep.c:567 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 4965 | #, c-format |
| 4966 | msgid "cannot open '%s'" |
| 4967 | msgstr "" |
| 4968 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4969 | #: builtin/grep.c:642 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4970 | msgid "search in index instead of in the work tree" |
| 4971 | msgstr "" |
| 4972 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4973 | #: builtin/grep.c:644 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4974 | msgid "find in contents not managed by git" |
| 4975 | msgstr "" |
| 4976 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4977 | #: builtin/grep.c:646 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4978 | msgid "search in both tracked and untracked files" |
| 4979 | msgstr "" |
| 4980 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4981 | #: builtin/grep.c:648 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4982 | msgid "search also in ignored files" |
| 4983 | msgstr "" |
| 4984 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4985 | #: builtin/grep.c:651 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4986 | msgid "show non-matching lines" |
| 4987 | msgstr "" |
| 4988 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4989 | #: builtin/grep.c:653 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4990 | msgid "case insensitive matching" |
| 4991 | msgstr "" |
| 4992 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4993 | #: builtin/grep.c:655 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4994 | msgid "match patterns only at word boundaries" |
| 4995 | msgstr "" |
| 4996 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 4997 | #: builtin/grep.c:657 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 4998 | msgid "process binary files as text" |
| 4999 | msgstr "" |
| 5000 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5001 | #: builtin/grep.c:659 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5002 | msgid "don't match patterns in binary files" |
| 5003 | msgstr "" |
| 5004 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5005 | #: builtin/grep.c:662 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5006 | msgid "descend at most <depth> levels" |
| 5007 | msgstr "" |
| 5008 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5009 | #: builtin/grep.c:666 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5010 | msgid "use extended POSIX regular expressions" |
| 5011 | msgstr "" |
| 5012 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5013 | #: builtin/grep.c:669 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5014 | msgid "use basic POSIX regular expressions (default)" |
| 5015 | msgstr "" |
| 5016 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5017 | #: builtin/grep.c:672 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5018 | msgid "interpret patterns as fixed strings" |
| 5019 | msgstr "" |
| 5020 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5021 | #: builtin/grep.c:675 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5022 | msgid "use Perl-compatible regular expressions" |
| 5023 | msgstr "" |
| 5024 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5025 | #: builtin/grep.c:678 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5026 | msgid "show line numbers" |
| 5027 | msgstr "" |
| 5028 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5029 | #: builtin/grep.c:679 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5030 | msgid "don't show filenames" |
| 5031 | msgstr "" |
| 5032 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5033 | #: builtin/grep.c:680 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5034 | msgid "show filenames" |
| 5035 | msgstr "" |
| 5036 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5037 | #: builtin/grep.c:682 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5038 | msgid "show filenames relative to top directory" |
| 5039 | msgstr "" |
| 5040 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5041 | #: builtin/grep.c:684 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5042 | msgid "show only filenames instead of matching lines" |
| 5043 | msgstr "" |
| 5044 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5045 | #: builtin/grep.c:686 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5046 | msgid "synonym for --files-with-matches" |
| 5047 | msgstr "" |
| 5048 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5049 | #: builtin/grep.c:689 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5050 | msgid "show only the names of files without match" |
| 5051 | msgstr "" |
| 5052 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5053 | #: builtin/grep.c:691 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5054 | msgid "print NUL after filenames" |
| 5055 | msgstr "" |
| 5056 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5057 | #: builtin/grep.c:693 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5058 | msgid "show the number of matches instead of matching lines" |
| 5059 | msgstr "" |
| 5060 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5061 | #: builtin/grep.c:694 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5062 | msgid "highlight matches" |
| 5063 | msgstr "" |
| 5064 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5065 | #: builtin/grep.c:696 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5066 | msgid "print empty line between matches from different files" |
| 5067 | msgstr "" |
| 5068 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5069 | #: builtin/grep.c:698 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5070 | msgid "show filename only once above matches from same file" |
| 5071 | msgstr "" |
| 5072 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5073 | #: builtin/grep.c:701 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5074 | msgid "show <n> context lines before and after matches" |
| 5075 | msgstr "" |
| 5076 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5077 | #: builtin/grep.c:704 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5078 | msgid "show <n> context lines before matches" |
| 5079 | msgstr "" |
| 5080 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5081 | #: builtin/grep.c:706 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5082 | msgid "show <n> context lines after matches" |
| 5083 | msgstr "" |
| 5084 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5085 | #: builtin/grep.c:707 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5086 | msgid "shortcut for -C NUM" |
| 5087 | msgstr "" |
| 5088 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5089 | #: builtin/grep.c:710 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5090 | msgid "show a line with the function name before matches" |
| 5091 | msgstr "" |
| 5092 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5093 | #: builtin/grep.c:712 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5094 | msgid "show the surrounding function" |
| 5095 | msgstr "" |
| 5096 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5097 | #: builtin/grep.c:715 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5098 | msgid "read patterns from file" |
| 5099 | msgstr "" |
| 5100 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5101 | #: builtin/grep.c:717 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5102 | msgid "match <pattern>" |
| 5103 | msgstr "" |
| 5104 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5105 | #: builtin/grep.c:719 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5106 | msgid "combine patterns specified with -e" |
| 5107 | msgstr "" |
| 5108 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5109 | #: builtin/grep.c:731 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5110 | msgid "indicate hit with exit status without output" |
| 5111 | msgstr "" |
| 5112 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5113 | #: builtin/grep.c:733 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5114 | msgid "show only matches from files that match all patterns" |
| 5115 | msgstr "" |
| 5116 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5117 | #: builtin/grep.c:735 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 5118 | msgid "show parse tree for grep expression" |
| 5119 | msgstr "" |
| 5120 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5121 | #: builtin/grep.c:739 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5122 | msgid "pager" |
| 5123 | msgstr "" |
| 5124 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5125 | #: builtin/grep.c:739 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5126 | msgid "show matching files in the pager" |
| 5127 | msgstr "" |
| 5128 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5129 | #: builtin/grep.c:742 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5130 | msgid "allow calling of grep(1) (ignored by this build)" |
| 5131 | msgstr "" |
| 5132 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5133 | #: builtin/grep.c:743 builtin/show-ref.c:188 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5134 | msgid "show usage" |
| 5135 | msgstr "" |
| 5136 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5137 | #: builtin/grep.c:810 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5138 | msgid "no pattern given." |
| 5139 | msgstr "" |
| 5140 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5141 | #: builtin/grep.c:865 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5142 | msgid "--open-files-in-pager only works on the worktree" |
| 5143 | msgstr "" |
| 5144 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5145 | #: builtin/grep.c:888 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5146 | msgid "--cached or --untracked cannot be used with --no-index." |
| 5147 | msgstr "" |
| 5148 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5149 | #: builtin/grep.c:893 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5150 | msgid "--no-index or --untracked cannot be used with revs." |
| 5151 | msgstr "" |
| 5152 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5153 | #: builtin/grep.c:896 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5154 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
| 5155 | msgstr "" |
| 5156 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5157 | #: builtin/grep.c:904 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5158 | msgid "both --cached and trees are given." |
| 5159 | msgstr "" |
| 5160 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5161 | #: builtin/hash-object.c:60 |
| 5162 | msgid "" |
| 5163 | "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " |
| 5164 | "<file>..." |
| 5165 | msgstr "" |
| 5166 | |
| 5167 | #: builtin/hash-object.c:61 |
| 5168 | msgid "git hash-object --stdin-paths < <list-of-paths>" |
| 5169 | msgstr "" |
| 5170 | |
| 5171 | #: builtin/hash-object.c:72 |
| 5172 | msgid "type" |
| 5173 | msgstr "" |
| 5174 | |
| 5175 | #: builtin/hash-object.c:72 |
| 5176 | msgid "object type" |
| 5177 | msgstr "" |
| 5178 | |
| 5179 | #: builtin/hash-object.c:73 |
| 5180 | msgid "write the object into the object database" |
| 5181 | msgstr "" |
| 5182 | |
| 5183 | #: builtin/hash-object.c:74 |
| 5184 | msgid "read the object from stdin" |
| 5185 | msgstr "" |
| 5186 | |
| 5187 | #: builtin/hash-object.c:76 |
| 5188 | msgid "store file as is without filters" |
| 5189 | msgstr "" |
| 5190 | |
| 5191 | #: builtin/hash-object.c:77 |
| 5192 | msgid "process file as it were from this path" |
| 5193 | msgstr "" |
| 5194 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5195 | #: builtin/help.c:41 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5196 | msgid "print all available commands" |
| 5197 | msgstr "" |
| 5198 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5199 | #: builtin/help.c:42 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5200 | msgid "print list of useful guides" |
| 5201 | msgstr "" |
| 5202 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5203 | #: builtin/help.c:43 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5204 | msgid "show man page" |
| 5205 | msgstr "" |
| 5206 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5207 | #: builtin/help.c:44 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5208 | msgid "show manual in web browser" |
| 5209 | msgstr "" |
| 5210 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5211 | #: builtin/help.c:46 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5212 | msgid "show info page" |
| 5213 | msgstr "" |
| 5214 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5215 | #: builtin/help.c:52 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5216 | msgid "git help [--all] [--guides] [--man|--web|--info] [command]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5217 | msgstr "" |
| 5218 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5219 | #: builtin/help.c:64 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5220 | #, c-format |
| 5221 | msgid "unrecognized help format '%s'" |
| 5222 | msgstr "" |
| 5223 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5224 | #: builtin/help.c:92 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5225 | msgid "Failed to start emacsclient." |
| 5226 | msgstr "" |
| 5227 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5228 | #: builtin/help.c:105 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5229 | msgid "Failed to parse emacsclient version." |
| 5230 | msgstr "" |
| 5231 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5232 | #: builtin/help.c:113 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5233 | #, c-format |
| 5234 | msgid "emacsclient version '%d' too old (< 22)." |
| 5235 | msgstr "" |
| 5236 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5237 | #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5238 | #, c-format |
| 5239 | msgid "failed to exec '%s': %s" |
| 5240 | msgstr "" |
| 5241 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5242 | #: builtin/help.c:216 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5243 | #, c-format |
| 5244 | msgid "" |
| 5245 | "'%s': path for unsupported man viewer.\n" |
| 5246 | "Please consider using 'man.<tool>.cmd' instead." |
| 5247 | msgstr "" |
| 5248 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5249 | #: builtin/help.c:228 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5250 | #, c-format |
| 5251 | msgid "" |
| 5252 | "'%s': cmd for supported man viewer.\n" |
| 5253 | "Please consider using 'man.<tool>.path' instead." |
| 5254 | msgstr "" |
| 5255 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5256 | #: builtin/help.c:349 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5257 | #, c-format |
| 5258 | msgid "'%s': unknown man viewer." |
| 5259 | msgstr "" |
| 5260 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5261 | #: builtin/help.c:366 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5262 | msgid "no man viewer handled the request" |
| 5263 | msgstr "" |
| 5264 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5265 | #: builtin/help.c:374 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5266 | msgid "no info viewer handled the request" |
| 5267 | msgstr "" |
| 5268 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5269 | #: builtin/help.c:420 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5270 | msgid "Defining attributes per path" |
| 5271 | msgstr "" |
| 5272 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5273 | #: builtin/help.c:421 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5274 | msgid "A Git glossary" |
| 5275 | msgstr "" |
| 5276 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5277 | #: builtin/help.c:422 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5278 | msgid "Specifies intentionally untracked files to ignore" |
| 5279 | msgstr "" |
| 5280 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5281 | #: builtin/help.c:423 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5282 | msgid "Defining submodule properties" |
| 5283 | msgstr "" |
| 5284 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5285 | #: builtin/help.c:424 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5286 | msgid "Specifying revisions and ranges for Git" |
| 5287 | msgstr "" |
| 5288 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5289 | #: builtin/help.c:425 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5290 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
| 5291 | msgstr "" |
| 5292 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5293 | #: builtin/help.c:426 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5294 | msgid "An overview of recommended workflows with Git" |
| 5295 | msgstr "" |
| 5296 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5297 | #: builtin/help.c:438 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5298 | msgid "The common Git guides are:\n" |
| 5299 | msgstr "" |
| 5300 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5301 | #: builtin/help.c:460 builtin/help.c:476 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5302 | #, c-format |
| 5303 | msgid "usage: %s%s" |
| 5304 | msgstr "" |
| 5305 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5306 | #: builtin/help.c:492 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5307 | #, c-format |
| 5308 | msgid "`git %s' is aliased to `%s'" |
| 5309 | msgstr "" |
| 5310 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5311 | #: builtin/index-pack.c:184 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5312 | #, c-format |
| 5313 | msgid "object type mismatch at %s" |
| 5314 | msgstr "" |
| 5315 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5316 | #: builtin/index-pack.c:204 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5317 | msgid "object of unexpected type" |
| 5318 | msgstr "" |
| 5319 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5320 | #: builtin/index-pack.c:244 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5321 | #, c-format |
| 5322 | msgid "cannot fill %d byte" |
| 5323 | msgid_plural "cannot fill %d bytes" |
| 5324 | msgstr[0] "" |
| 5325 | msgstr[1] "" |
| 5326 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5327 | #: builtin/index-pack.c:254 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5328 | msgid "early EOF" |
| 5329 | msgstr "" |
| 5330 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5331 | #: builtin/index-pack.c:255 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5332 | msgid "read error on input" |
| 5333 | msgstr "" |
| 5334 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5335 | #: builtin/index-pack.c:267 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5336 | msgid "used more bytes than were available" |
| 5337 | msgstr "" |
| 5338 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5339 | #: builtin/index-pack.c:274 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5340 | msgid "pack too large for current definition of off_t" |
| 5341 | msgstr "" |
| 5342 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 5343 | #: builtin/index-pack.c:290 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5344 | #, c-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5345 | msgid "unable to create '%s'" |
| 5346 | msgstr "" |
| 5347 | |
| 5348 | #: builtin/index-pack.c:295 |
| 5349 | #, c-format |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5350 | msgid "cannot open packfile '%s'" |
| 5351 | msgstr "" |
| 5352 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5353 | #: builtin/index-pack.c:309 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5354 | msgid "pack signature mismatch" |
| 5355 | msgstr "" |
| 5356 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5357 | #: builtin/index-pack.c:311 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5358 | #, c-format |
| 5359 | msgid "pack version %<PRIu32> unsupported" |
| 5360 | msgstr "" |
| 5361 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5362 | #: builtin/index-pack.c:329 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5363 | #, c-format |
| 5364 | msgid "pack has bad object at offset %lu: %s" |
| 5365 | msgstr "" |
| 5366 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5367 | #: builtin/index-pack.c:451 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5368 | #, c-format |
| 5369 | msgid "inflate returned %d" |
| 5370 | msgstr "" |
| 5371 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5372 | #: builtin/index-pack.c:500 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5373 | msgid "offset value overflow for delta base object" |
| 5374 | msgstr "" |
| 5375 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5376 | #: builtin/index-pack.c:508 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5377 | msgid "delta base offset is out of bound" |
| 5378 | msgstr "" |
| 5379 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5380 | #: builtin/index-pack.c:516 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5381 | #, c-format |
| 5382 | msgid "unknown object type %d" |
| 5383 | msgstr "" |
| 5384 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5385 | #: builtin/index-pack.c:547 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5386 | msgid "cannot pread pack file" |
| 5387 | msgstr "" |
| 5388 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5389 | #: builtin/index-pack.c:549 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5390 | #, c-format |
| 5391 | msgid "premature end of pack file, %lu byte missing" |
| 5392 | msgid_plural "premature end of pack file, %lu bytes missing" |
| 5393 | msgstr[0] "" |
| 5394 | msgstr[1] "" |
| 5395 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5396 | #: builtin/index-pack.c:575 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5397 | msgid "serious inflate inconsistency" |
| 5398 | msgstr "" |
| 5399 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5400 | #: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 |
| 5401 | #: builtin/index-pack.c:729 builtin/index-pack.c:738 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5402 | #, c-format |
| 5403 | msgid "SHA1 COLLISION FOUND WITH %s !" |
| 5404 | msgstr "" |
| 5405 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5406 | #: builtin/index-pack.c:669 builtin/pack-objects.c:170 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 5407 | #: builtin/pack-objects.c:262 |
| 5408 | #, c-format |
| 5409 | msgid "unable to read %s" |
| 5410 | msgstr "" |
| 5411 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5412 | #: builtin/index-pack.c:735 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 5413 | #, c-format |
| 5414 | msgid "cannot read existing object %s" |
| 5415 | msgstr "" |
| 5416 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5417 | #: builtin/index-pack.c:749 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5418 | #, c-format |
| 5419 | msgid "invalid blob object %s" |
| 5420 | msgstr "" |
| 5421 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5422 | #: builtin/index-pack.c:763 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5423 | #, c-format |
| 5424 | msgid "invalid %s" |
| 5425 | msgstr "" |
| 5426 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5427 | #: builtin/index-pack.c:766 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5428 | msgid "Error in object" |
| 5429 | msgstr "" |
| 5430 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5431 | #: builtin/index-pack.c:768 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5432 | #, c-format |
| 5433 | msgid "Not all child objects of %s are reachable" |
| 5434 | msgstr "" |
| 5435 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5436 | #: builtin/index-pack.c:838 builtin/index-pack.c:868 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5437 | msgid "failed to apply delta" |
| 5438 | msgstr "" |
| 5439 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5440 | #: builtin/index-pack.c:1009 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5441 | msgid "Receiving objects" |
| 5442 | msgstr "" |
| 5443 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5444 | #: builtin/index-pack.c:1009 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5445 | msgid "Indexing objects" |
| 5446 | msgstr "" |
| 5447 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5448 | #: builtin/index-pack.c:1035 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5449 | msgid "pack is corrupted (SHA1 mismatch)" |
| 5450 | msgstr "" |
| 5451 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5452 | #: builtin/index-pack.c:1040 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5453 | msgid "cannot fstat packfile" |
| 5454 | msgstr "" |
| 5455 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5456 | #: builtin/index-pack.c:1043 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5457 | msgid "pack has junk at the end" |
| 5458 | msgstr "" |
| 5459 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5460 | #: builtin/index-pack.c:1054 |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 5461 | msgid "confusion beyond insanity in parse_pack_objects()" |
| 5462 | msgstr "" |
| 5463 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5464 | #: builtin/index-pack.c:1077 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5465 | msgid "Resolving deltas" |
| 5466 | msgstr "" |
| 5467 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5468 | #: builtin/index-pack.c:1087 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5469 | #, c-format |
| 5470 | msgid "unable to create thread: %s" |
| 5471 | msgstr "" |
| 5472 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5473 | #: builtin/index-pack.c:1129 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 5474 | msgid "confusion beyond insanity" |
| 5475 | msgstr "" |
| 5476 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5477 | #: builtin/index-pack.c:1137 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5478 | #, c-format |
| 5479 | msgid "completed with %d local objects" |
| 5480 | msgstr "" |
| 5481 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5482 | #: builtin/index-pack.c:1147 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5483 | #, c-format |
| 5484 | msgid "Unexpected tail checksum for %s (disk corruption?)" |
| 5485 | msgstr "" |
| 5486 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5487 | #: builtin/index-pack.c:1151 |
Jiang Xin | 9332972 | 2012-05-15 06:43:03 +0800 | [diff] [blame] | 5488 | #, c-format |
| 5489 | msgid "pack has %d unresolved delta" |
| 5490 | msgid_plural "pack has %d unresolved deltas" |
| 5491 | msgstr[0] "" |
| 5492 | msgstr[1] "" |
| 5493 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5494 | #: builtin/index-pack.c:1176 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5495 | #, c-format |
| 5496 | msgid "unable to deflate appended object (%d)" |
| 5497 | msgstr "" |
| 5498 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5499 | #: builtin/index-pack.c:1255 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5500 | #, c-format |
| 5501 | msgid "local object %s is corrupt" |
| 5502 | msgstr "" |
| 5503 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5504 | #: builtin/index-pack.c:1279 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5505 | msgid "error while closing pack file" |
| 5506 | msgstr "" |
| 5507 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5508 | #: builtin/index-pack.c:1292 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5509 | #, c-format |
| 5510 | msgid "cannot write keep file '%s'" |
| 5511 | msgstr "" |
| 5512 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5513 | #: builtin/index-pack.c:1300 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5514 | #, c-format |
| 5515 | msgid "cannot close written keep file '%s'" |
| 5516 | msgstr "" |
| 5517 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5518 | #: builtin/index-pack.c:1313 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5519 | msgid "cannot store pack file" |
| 5520 | msgstr "" |
| 5521 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5522 | #: builtin/index-pack.c:1324 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5523 | msgid "cannot store index file" |
| 5524 | msgstr "" |
| 5525 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5526 | #: builtin/index-pack.c:1357 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5527 | #, c-format |
| 5528 | msgid "bad pack.indexversion=%<PRIu32>" |
| 5529 | msgstr "" |
| 5530 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5531 | #: builtin/index-pack.c:1363 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5532 | #, c-format |
| 5533 | msgid "invalid number of threads specified (%d)" |
| 5534 | msgstr "" |
| 5535 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5536 | #: builtin/index-pack.c:1367 builtin/index-pack.c:1545 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5537 | #, c-format |
| 5538 | msgid "no threads support, ignoring %s" |
| 5539 | msgstr "" |
| 5540 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5541 | #: builtin/index-pack.c:1425 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5542 | #, c-format |
| 5543 | msgid "Cannot open existing pack file '%s'" |
| 5544 | msgstr "" |
| 5545 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5546 | #: builtin/index-pack.c:1427 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5547 | #, c-format |
| 5548 | msgid "Cannot open existing pack idx file for '%s'" |
| 5549 | msgstr "" |
| 5550 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5551 | #: builtin/index-pack.c:1474 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5552 | #, c-format |
| 5553 | msgid "non delta: %d object" |
| 5554 | msgid_plural "non delta: %d objects" |
| 5555 | msgstr[0] "" |
| 5556 | msgstr[1] "" |
| 5557 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5558 | #: builtin/index-pack.c:1481 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5559 | #, c-format |
| 5560 | msgid "chain length = %d: %lu object" |
| 5561 | msgid_plural "chain length = %d: %lu objects" |
| 5562 | msgstr[0] "" |
| 5563 | msgstr[1] "" |
| 5564 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5565 | #: builtin/index-pack.c:1509 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5566 | msgid "Cannot come back to cwd" |
| 5567 | msgstr "" |
| 5568 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5569 | #: builtin/index-pack.c:1557 builtin/index-pack.c:1560 |
| 5570 | #: builtin/index-pack.c:1572 builtin/index-pack.c:1576 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5571 | #, c-format |
| 5572 | msgid "bad %s" |
| 5573 | msgstr "" |
| 5574 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5575 | #: builtin/index-pack.c:1590 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5576 | msgid "--fix-thin cannot be used without --stdin" |
| 5577 | msgstr "" |
| 5578 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5579 | #: builtin/index-pack.c:1594 builtin/index-pack.c:1604 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5580 | #, c-format |
| 5581 | msgid "packfile name '%s' does not end with '.pack'" |
| 5582 | msgstr "" |
| 5583 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5584 | #: builtin/index-pack.c:1613 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 5585 | msgid "--verify with no packfile name given" |
| 5586 | msgstr "" |
| 5587 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5588 | #: builtin/init-db.c:35 |
| 5589 | #, c-format |
| 5590 | msgid "Could not make %s writable by group" |
| 5591 | msgstr "" |
| 5592 | |
| 5593 | #: builtin/init-db.c:62 |
| 5594 | #, c-format |
| 5595 | msgid "insanely long template name %s" |
| 5596 | msgstr "" |
| 5597 | |
| 5598 | #: builtin/init-db.c:67 |
| 5599 | #, c-format |
| 5600 | msgid "cannot stat '%s'" |
| 5601 | msgstr "" |
| 5602 | |
| 5603 | #: builtin/init-db.c:73 |
| 5604 | #, c-format |
| 5605 | msgid "cannot stat template '%s'" |
| 5606 | msgstr "" |
| 5607 | |
| 5608 | #: builtin/init-db.c:80 |
| 5609 | #, c-format |
| 5610 | msgid "cannot opendir '%s'" |
| 5611 | msgstr "" |
| 5612 | |
| 5613 | #: builtin/init-db.c:97 |
| 5614 | #, c-format |
| 5615 | msgid "cannot readlink '%s'" |
| 5616 | msgstr "" |
| 5617 | |
| 5618 | #: builtin/init-db.c:99 |
| 5619 | #, c-format |
| 5620 | msgid "insanely long symlink %s" |
| 5621 | msgstr "" |
| 5622 | |
| 5623 | #: builtin/init-db.c:102 |
| 5624 | #, c-format |
| 5625 | msgid "cannot symlink '%s' '%s'" |
| 5626 | msgstr "" |
| 5627 | |
| 5628 | #: builtin/init-db.c:106 |
| 5629 | #, c-format |
| 5630 | msgid "cannot copy '%s' to '%s'" |
| 5631 | msgstr "" |
| 5632 | |
| 5633 | #: builtin/init-db.c:110 |
| 5634 | #, c-format |
| 5635 | msgid "ignoring template %s" |
| 5636 | msgstr "" |
| 5637 | |
| 5638 | #: builtin/init-db.c:133 |
| 5639 | #, c-format |
| 5640 | msgid "insanely long template path %s" |
| 5641 | msgstr "" |
| 5642 | |
| 5643 | #: builtin/init-db.c:141 |
| 5644 | #, c-format |
| 5645 | msgid "templates not found %s" |
| 5646 | msgstr "" |
| 5647 | |
| 5648 | #: builtin/init-db.c:154 |
| 5649 | #, c-format |
| 5650 | msgid "not copying templates of a wrong format version %d from '%s'" |
| 5651 | msgstr "" |
| 5652 | |
| 5653 | #: builtin/init-db.c:192 |
| 5654 | #, c-format |
| 5655 | msgid "insane git directory %s" |
| 5656 | msgstr "" |
| 5657 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5658 | #: builtin/init-db.c:323 builtin/init-db.c:326 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5659 | #, c-format |
| 5660 | msgid "%s already exists" |
| 5661 | msgstr "" |
| 5662 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5663 | #: builtin/init-db.c:355 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5664 | #, c-format |
| 5665 | msgid "unable to handle file type %d" |
| 5666 | msgstr "" |
| 5667 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5668 | #: builtin/init-db.c:358 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5669 | #, c-format |
| 5670 | msgid "unable to move %s to %s" |
| 5671 | msgstr "" |
| 5672 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5673 | #: builtin/init-db.c:363 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5674 | #, c-format |
| 5675 | msgid "Could not create git link %s" |
| 5676 | msgstr "" |
| 5677 | |
| 5678 | #. |
| 5679 | #. * TRANSLATORS: The first '%s' is either "Reinitialized |
| 5680 | #. * existing" or "Initialized empty", the second " shared" or |
| 5681 | #. * "", and the last '%s%s' is the verbatim directory name. |
| 5682 | #. |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5683 | #: builtin/init-db.c:420 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5684 | #, c-format |
| 5685 | msgid "%s%s Git repository in %s%s\n" |
| 5686 | msgstr "" |
| 5687 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5688 | #: builtin/init-db.c:421 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5689 | msgid "Reinitialized existing" |
| 5690 | msgstr "" |
| 5691 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5692 | #: builtin/init-db.c:421 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5693 | msgid "Initialized empty" |
| 5694 | msgstr "" |
| 5695 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5696 | #: builtin/init-db.c:422 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5697 | msgid " shared" |
| 5698 | msgstr "" |
| 5699 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5700 | #: builtin/init-db.c:441 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5701 | msgid "cannot tell cwd" |
| 5702 | msgstr "" |
| 5703 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5704 | #: builtin/init-db.c:467 |
| 5705 | msgid "" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 5706 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
| 5707 | "shared[=<permissions>]] [directory]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5708 | msgstr "" |
| 5709 | |
| 5710 | #: builtin/init-db.c:490 |
| 5711 | msgid "permissions" |
| 5712 | msgstr "" |
| 5713 | |
| 5714 | #: builtin/init-db.c:491 |
| 5715 | msgid "specify that the git repository is to be shared amongst several users" |
| 5716 | msgstr "" |
| 5717 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5718 | #: builtin/init-db.c:493 builtin/prune-packed.c:75 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5719 | msgid "be quiet" |
| 5720 | msgstr "" |
| 5721 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5722 | #: builtin/init-db.c:522 builtin/init-db.c:529 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5723 | #, c-format |
| 5724 | msgid "cannot mkdir %s" |
| 5725 | msgstr "" |
| 5726 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5727 | #: builtin/init-db.c:533 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5728 | #, c-format |
| 5729 | msgid "cannot chdir to %s" |
| 5730 | msgstr "" |
| 5731 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5732 | #: builtin/init-db.c:555 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5733 | #, c-format |
| 5734 | msgid "" |
| 5735 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" |
| 5736 | "dir=<directory>)" |
| 5737 | msgstr "" |
| 5738 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5739 | #: builtin/init-db.c:579 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5740 | msgid "Cannot access current working directory" |
| 5741 | msgstr "" |
| 5742 | |
Jiang Xin | 0bbe5b4 | 2012-07-30 10:24:47 +0800 | [diff] [blame] | 5743 | #: builtin/init-db.c:586 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5744 | #, c-format |
| 5745 | msgid "Cannot access work tree '%s'" |
| 5746 | msgstr "" |
| 5747 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5748 | #: builtin/log.c:41 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 5749 | msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5750 | msgstr "" |
| 5751 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5752 | #: builtin/log.c:42 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5753 | msgid " or: git show [options] <object>..." |
| 5754 | msgstr "" |
| 5755 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5756 | #: builtin/log.c:124 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5757 | msgid "suppress diff output" |
| 5758 | msgstr "" |
| 5759 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5760 | #: builtin/log.c:125 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5761 | msgid "show source" |
| 5762 | msgstr "" |
| 5763 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5764 | #: builtin/log.c:126 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 5765 | msgid "Use mail map file" |
| 5766 | msgstr "" |
| 5767 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5768 | #: builtin/log.c:127 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5769 | msgid "decorate options" |
| 5770 | msgstr "" |
| 5771 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5772 | #: builtin/log.c:230 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5773 | #, c-format |
| 5774 | msgid "Final output: %d %s\n" |
| 5775 | msgstr "" |
| 5776 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5777 | #: builtin/log.c:453 builtin/log.c:545 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5778 | #, c-format |
| 5779 | msgid "Could not read object %s" |
| 5780 | msgstr "" |
| 5781 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5782 | #: builtin/log.c:569 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5783 | #, c-format |
| 5784 | msgid "Unknown type: %d" |
| 5785 | msgstr "" |
| 5786 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5787 | #: builtin/log.c:669 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5788 | msgid "format.headers without value" |
| 5789 | msgstr "" |
| 5790 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5791 | #: builtin/log.c:751 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5792 | msgid "name of output directory is too long" |
| 5793 | msgstr "" |
| 5794 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5795 | #: builtin/log.c:767 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5796 | #, c-format |
| 5797 | msgid "Cannot open patch file %s" |
| 5798 | msgstr "" |
| 5799 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5800 | #: builtin/log.c:781 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5801 | msgid "Need exactly one range." |
| 5802 | msgstr "" |
| 5803 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5804 | #: builtin/log.c:789 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5805 | msgid "Not a range." |
| 5806 | msgstr "" |
| 5807 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5808 | #: builtin/log.c:891 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5809 | msgid "Cover letter needs email format" |
| 5810 | msgstr "" |
| 5811 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5812 | #: builtin/log.c:967 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5813 | #, c-format |
| 5814 | msgid "insane in-reply-to: %s" |
| 5815 | msgstr "" |
| 5816 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5817 | #: builtin/log.c:995 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5818 | msgid "git format-patch [options] [<since> | <revision range>]" |
| 5819 | msgstr "" |
| 5820 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5821 | #: builtin/log.c:1040 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5822 | msgid "Two output directories?" |
| 5823 | msgstr "" |
| 5824 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5825 | #: builtin/log.c:1155 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5826 | msgid "use [PATCH n/m] even with a single patch" |
| 5827 | msgstr "" |
| 5828 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5829 | #: builtin/log.c:1158 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5830 | msgid "use [PATCH] even with multiple patches" |
| 5831 | msgstr "" |
| 5832 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5833 | #: builtin/log.c:1162 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5834 | msgid "print patches to standard out" |
| 5835 | msgstr "" |
| 5836 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5837 | #: builtin/log.c:1164 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5838 | msgid "generate a cover letter" |
| 5839 | msgstr "" |
| 5840 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5841 | #: builtin/log.c:1166 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5842 | msgid "use simple number sequence for output file names" |
| 5843 | msgstr "" |
| 5844 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5845 | #: builtin/log.c:1167 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5846 | msgid "sfx" |
| 5847 | msgstr "" |
| 5848 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5849 | #: builtin/log.c:1168 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5850 | msgid "use <sfx> instead of '.patch'" |
| 5851 | msgstr "" |
| 5852 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5853 | #: builtin/log.c:1170 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5854 | msgid "start numbering patches at <n> instead of 1" |
| 5855 | msgstr "" |
| 5856 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5857 | #: builtin/log.c:1172 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 5858 | msgid "mark the series as Nth re-roll" |
| 5859 | msgstr "" |
| 5860 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5861 | #: builtin/log.c:1174 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5862 | msgid "Use [<prefix>] instead of [PATCH]" |
| 5863 | msgstr "" |
| 5864 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5865 | #: builtin/log.c:1177 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5866 | msgid "store resulting files in <dir>" |
| 5867 | msgstr "" |
| 5868 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5869 | #: builtin/log.c:1180 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5870 | msgid "don't strip/add [PATCH]" |
| 5871 | msgstr "" |
| 5872 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5873 | #: builtin/log.c:1183 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5874 | msgid "don't output binary diffs" |
| 5875 | msgstr "" |
| 5876 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5877 | #: builtin/log.c:1185 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5878 | msgid "don't include a patch matching a commit upstream" |
| 5879 | msgstr "" |
| 5880 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5881 | #: builtin/log.c:1187 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5882 | msgid "show patch format instead of default (patch + stat)" |
| 5883 | msgstr "" |
| 5884 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5885 | #: builtin/log.c:1189 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5886 | msgid "Messaging" |
| 5887 | msgstr "" |
| 5888 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5889 | #: builtin/log.c:1190 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5890 | msgid "header" |
| 5891 | msgstr "" |
| 5892 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5893 | #: builtin/log.c:1191 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5894 | msgid "add email header" |
| 5895 | msgstr "" |
| 5896 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5897 | #: builtin/log.c:1192 builtin/log.c:1194 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5898 | msgid "email" |
| 5899 | msgstr "" |
| 5900 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5901 | #: builtin/log.c:1192 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5902 | msgid "add To: header" |
| 5903 | msgstr "" |
| 5904 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5905 | #: builtin/log.c:1194 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5906 | msgid "add Cc: header" |
| 5907 | msgstr "" |
| 5908 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5909 | #: builtin/log.c:1196 |
| 5910 | msgid "ident" |
| 5911 | msgstr "" |
| 5912 | |
| 5913 | #: builtin/log.c:1197 |
| 5914 | msgid "set From address to <ident> (or committer ident if absent)" |
| 5915 | msgstr "" |
| 5916 | |
| 5917 | #: builtin/log.c:1199 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5918 | msgid "message-id" |
| 5919 | msgstr "" |
| 5920 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5921 | #: builtin/log.c:1200 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5922 | msgid "make first mail a reply to <message-id>" |
| 5923 | msgstr "" |
| 5924 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5925 | #: builtin/log.c:1201 builtin/log.c:1204 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5926 | msgid "boundary" |
| 5927 | msgstr "" |
| 5928 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5929 | #: builtin/log.c:1202 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5930 | msgid "attach the patch" |
| 5931 | msgstr "" |
| 5932 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5933 | #: builtin/log.c:1205 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5934 | msgid "inline the patch" |
| 5935 | msgstr "" |
| 5936 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5937 | #: builtin/log.c:1209 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5938 | msgid "enable message threading, styles: shallow, deep" |
| 5939 | msgstr "" |
| 5940 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5941 | #: builtin/log.c:1211 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5942 | msgid "signature" |
| 5943 | msgstr "" |
| 5944 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5945 | #: builtin/log.c:1212 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5946 | msgid "add a signature" |
| 5947 | msgstr "" |
| 5948 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5949 | #: builtin/log.c:1214 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5950 | msgid "don't print the patch filenames" |
| 5951 | msgstr "" |
| 5952 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5953 | #: builtin/log.c:1288 |
| 5954 | #, c-format |
| 5955 | msgid "invalid ident line: %s" |
| 5956 | msgstr "" |
| 5957 | |
| 5958 | #: builtin/log.c:1303 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5959 | msgid "-n and -k are mutually exclusive." |
| 5960 | msgstr "" |
| 5961 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5962 | #: builtin/log.c:1305 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5963 | msgid "--subject-prefix and -k are mutually exclusive." |
| 5964 | msgstr "" |
| 5965 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5966 | #: builtin/log.c:1313 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5967 | msgid "--name-only does not make sense" |
| 5968 | msgstr "" |
| 5969 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5970 | #: builtin/log.c:1315 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5971 | msgid "--name-status does not make sense" |
| 5972 | msgstr "" |
| 5973 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5974 | #: builtin/log.c:1317 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5975 | msgid "--check does not make sense" |
| 5976 | msgstr "" |
| 5977 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5978 | #: builtin/log.c:1340 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5979 | msgid "standard output, or directory, which one?" |
| 5980 | msgstr "" |
| 5981 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5982 | #: builtin/log.c:1342 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5983 | #, c-format |
| 5984 | msgid "Could not create directory '%s'" |
| 5985 | msgstr "" |
| 5986 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5987 | #: builtin/log.c:1490 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5988 | msgid "Failed to create output files" |
| 5989 | msgstr "" |
| 5990 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5991 | #: builtin/log.c:1539 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 5992 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
| 5993 | msgstr "" |
| 5994 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 5995 | #: builtin/log.c:1594 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 5996 | #, c-format |
| 5997 | msgid "" |
| 5998 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" |
| 5999 | msgstr "" |
| 6000 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6001 | #: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6002 | #, c-format |
| 6003 | msgid "Unknown commit %s" |
| 6004 | msgstr "" |
| 6005 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6006 | #: builtin/ls-files.c:408 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6007 | msgid "git ls-files [options] [<file>...]" |
| 6008 | msgstr "" |
| 6009 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6010 | #: builtin/ls-files.c:465 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6011 | msgid "identify the file status with tags" |
| 6012 | msgstr "" |
| 6013 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6014 | #: builtin/ls-files.c:467 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6015 | msgid "use lowercase letters for 'assume unchanged' files" |
| 6016 | msgstr "" |
| 6017 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6018 | #: builtin/ls-files.c:469 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6019 | msgid "show cached files in the output (default)" |
| 6020 | msgstr "" |
| 6021 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6022 | #: builtin/ls-files.c:471 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6023 | msgid "show deleted files in the output" |
| 6024 | msgstr "" |
| 6025 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6026 | #: builtin/ls-files.c:473 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6027 | msgid "show modified files in the output" |
| 6028 | msgstr "" |
| 6029 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6030 | #: builtin/ls-files.c:475 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6031 | msgid "show other files in the output" |
| 6032 | msgstr "" |
| 6033 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6034 | #: builtin/ls-files.c:477 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6035 | msgid "show ignored files in the output" |
| 6036 | msgstr "" |
| 6037 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6038 | #: builtin/ls-files.c:480 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6039 | msgid "show staged contents' object name in the output" |
| 6040 | msgstr "" |
| 6041 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6042 | #: builtin/ls-files.c:482 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6043 | msgid "show files on the filesystem that need to be removed" |
| 6044 | msgstr "" |
| 6045 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6046 | #: builtin/ls-files.c:484 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6047 | msgid "show 'other' directories' name only" |
| 6048 | msgstr "" |
| 6049 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6050 | #: builtin/ls-files.c:487 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6051 | msgid "don't show empty directories" |
| 6052 | msgstr "" |
| 6053 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6054 | #: builtin/ls-files.c:490 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6055 | msgid "show unmerged files in the output" |
| 6056 | msgstr "" |
| 6057 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6058 | #: builtin/ls-files.c:492 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6059 | msgid "show resolve-undo information" |
| 6060 | msgstr "" |
| 6061 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6062 | #: builtin/ls-files.c:494 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6063 | msgid "skip files matching pattern" |
| 6064 | msgstr "" |
| 6065 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6066 | #: builtin/ls-files.c:497 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6067 | msgid "exclude patterns are read from <file>" |
| 6068 | msgstr "" |
| 6069 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6070 | #: builtin/ls-files.c:500 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6071 | msgid "read additional per-directory exclude patterns in <file>" |
| 6072 | msgstr "" |
| 6073 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6074 | #: builtin/ls-files.c:502 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6075 | msgid "add the standard git exclusions" |
| 6076 | msgstr "" |
| 6077 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6078 | #: builtin/ls-files.c:505 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6079 | msgid "make the output relative to the project top directory" |
| 6080 | msgstr "" |
| 6081 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6082 | #: builtin/ls-files.c:508 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6083 | msgid "if any <file> is not in the index, treat this as an error" |
| 6084 | msgstr "" |
| 6085 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6086 | #: builtin/ls-files.c:509 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6087 | msgid "tree-ish" |
| 6088 | msgstr "" |
| 6089 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6090 | #: builtin/ls-files.c:510 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6091 | msgid "pretend that paths removed since <tree-ish> are still present" |
| 6092 | msgstr "" |
| 6093 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6094 | #: builtin/ls-files.c:512 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6095 | msgid "show debugging data" |
| 6096 | msgstr "" |
| 6097 | |
| 6098 | #: builtin/ls-tree.c:27 |
| 6099 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
| 6100 | msgstr "" |
| 6101 | |
| 6102 | #: builtin/ls-tree.c:125 |
| 6103 | msgid "only show trees" |
| 6104 | msgstr "" |
| 6105 | |
| 6106 | #: builtin/ls-tree.c:127 |
| 6107 | msgid "recurse into subtrees" |
| 6108 | msgstr "" |
| 6109 | |
| 6110 | #: builtin/ls-tree.c:129 |
| 6111 | msgid "show trees when recursing" |
| 6112 | msgstr "" |
| 6113 | |
| 6114 | #: builtin/ls-tree.c:132 |
| 6115 | msgid "terminate entries with NUL byte" |
| 6116 | msgstr "" |
| 6117 | |
| 6118 | #: builtin/ls-tree.c:133 |
| 6119 | msgid "include object size" |
| 6120 | msgstr "" |
| 6121 | |
| 6122 | #: builtin/ls-tree.c:135 builtin/ls-tree.c:137 |
| 6123 | msgid "list only filenames" |
| 6124 | msgstr "" |
| 6125 | |
| 6126 | #: builtin/ls-tree.c:140 |
| 6127 | msgid "use full path names" |
| 6128 | msgstr "" |
| 6129 | |
| 6130 | #: builtin/ls-tree.c:142 |
| 6131 | msgid "list entire tree; not just current directory (implies --full-name)" |
| 6132 | msgstr "" |
| 6133 | |
| 6134 | #: builtin/merge.c:43 |
| 6135 | msgid "git merge [options] [<commit>...]" |
| 6136 | msgstr "" |
| 6137 | |
| 6138 | #: builtin/merge.c:44 |
| 6139 | msgid "git merge [options] <msg> HEAD <commit>" |
| 6140 | msgstr "" |
| 6141 | |
| 6142 | #: builtin/merge.c:45 |
| 6143 | msgid "git merge --abort" |
| 6144 | msgstr "" |
| 6145 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6146 | #: builtin/merge.c:98 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6147 | msgid "switch `m' requires a value" |
| 6148 | msgstr "" |
| 6149 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6150 | #: builtin/merge.c:135 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6151 | #, c-format |
| 6152 | msgid "Could not find merge strategy '%s'.\n" |
| 6153 | msgstr "" |
| 6154 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6155 | #: builtin/merge.c:136 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6156 | #, c-format |
| 6157 | msgid "Available strategies are:" |
| 6158 | msgstr "" |
| 6159 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6160 | #: builtin/merge.c:141 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6161 | #, c-format |
| 6162 | msgid "Available custom strategies are:" |
| 6163 | msgstr "" |
| 6164 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6165 | #: builtin/merge.c:198 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6166 | msgid "do not show a diffstat at the end of the merge" |
| 6167 | msgstr "" |
| 6168 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6169 | #: builtin/merge.c:201 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6170 | msgid "show a diffstat at the end of the merge" |
| 6171 | msgstr "" |
| 6172 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6173 | #: builtin/merge.c:202 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6174 | msgid "(synonym to --stat)" |
| 6175 | msgstr "" |
| 6176 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6177 | #: builtin/merge.c:204 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6178 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
| 6179 | msgstr "" |
| 6180 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6181 | #: builtin/merge.c:207 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6182 | msgid "create a single commit instead of doing a merge" |
| 6183 | msgstr "" |
| 6184 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6185 | #: builtin/merge.c:209 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6186 | msgid "perform a commit if the merge succeeds (default)" |
| 6187 | msgstr "" |
| 6188 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6189 | #: builtin/merge.c:211 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6190 | msgid "edit message before committing" |
| 6191 | msgstr "" |
| 6192 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6193 | #: builtin/merge.c:212 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6194 | msgid "allow fast-forward (default)" |
| 6195 | msgstr "" |
| 6196 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6197 | #: builtin/merge.c:214 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6198 | msgid "abort if fast-forward is not possible" |
| 6199 | msgstr "" |
| 6200 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6201 | #: builtin/merge.c:218 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6202 | msgid "Verify that the named commit has a valid GPG signature" |
| 6203 | msgstr "" |
| 6204 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6205 | #: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6206 | msgid "strategy" |
| 6207 | msgstr "" |
| 6208 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6209 | #: builtin/merge.c:220 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6210 | msgid "merge strategy to use" |
| 6211 | msgstr "" |
| 6212 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6213 | #: builtin/merge.c:221 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6214 | msgid "option=value" |
| 6215 | msgstr "" |
| 6216 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6217 | #: builtin/merge.c:222 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6218 | msgid "option for selected merge strategy" |
| 6219 | msgstr "" |
| 6220 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6221 | #: builtin/merge.c:224 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6222 | msgid "merge commit message (for a non-fast-forward merge)" |
| 6223 | msgstr "" |
| 6224 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6225 | #: builtin/merge.c:228 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6226 | msgid "abort the current in-progress merge" |
| 6227 | msgstr "" |
| 6228 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6229 | #: builtin/merge.c:257 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6230 | msgid "could not run stash." |
| 6231 | msgstr "" |
| 6232 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6233 | #: builtin/merge.c:262 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6234 | msgid "stash failed" |
| 6235 | msgstr "" |
| 6236 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6237 | #: builtin/merge.c:267 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6238 | #, c-format |
| 6239 | msgid "not a valid object: %s" |
| 6240 | msgstr "" |
| 6241 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6242 | #: builtin/merge.c:286 builtin/merge.c:303 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6243 | msgid "read-tree failed" |
| 6244 | msgstr "" |
| 6245 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6246 | #: builtin/merge.c:333 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6247 | msgid " (nothing to squash)" |
| 6248 | msgstr "" |
| 6249 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6250 | #: builtin/merge.c:346 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6251 | #, c-format |
| 6252 | msgid "Squash commit -- not updating HEAD\n" |
| 6253 | msgstr "" |
| 6254 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6255 | #: builtin/merge.c:378 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6256 | msgid "Writing SQUASH_MSG" |
| 6257 | msgstr "" |
| 6258 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6259 | #: builtin/merge.c:380 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6260 | msgid "Finishing SQUASH_MSG" |
| 6261 | msgstr "" |
| 6262 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6263 | #: builtin/merge.c:403 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6264 | #, c-format |
| 6265 | msgid "No merge message -- not updating HEAD\n" |
| 6266 | msgstr "" |
| 6267 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6268 | #: builtin/merge.c:453 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6269 | #, c-format |
| 6270 | msgid "'%s' does not point to a commit" |
| 6271 | msgstr "" |
| 6272 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6273 | #: builtin/merge.c:565 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6274 | #, c-format |
| 6275 | msgid "Bad branch.%s.mergeoptions string: %s" |
| 6276 | msgstr "" |
| 6277 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6278 | #: builtin/merge.c:657 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6279 | msgid "git write-tree failed to write a tree" |
| 6280 | msgstr "" |
| 6281 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6282 | #: builtin/merge.c:685 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6283 | msgid "Not handling anything other than two heads merge." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6284 | msgstr "" |
| 6285 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6286 | #: builtin/merge.c:699 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6287 | #, c-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6288 | msgid "Unknown option for merge-recursive: -X%s" |
| 6289 | msgstr "" |
| 6290 | |
| 6291 | #: builtin/merge.c:713 |
| 6292 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6293 | msgid "unable to write %s" |
| 6294 | msgstr "" |
| 6295 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6296 | #: builtin/merge.c:802 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6297 | #, c-format |
| 6298 | msgid "Could not read from '%s'" |
| 6299 | msgstr "" |
| 6300 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6301 | #: builtin/merge.c:811 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6302 | #, c-format |
| 6303 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" |
| 6304 | msgstr "" |
| 6305 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6306 | #: builtin/merge.c:817 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6307 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6308 | msgid "" |
| 6309 | "Please enter a commit message to explain why this merge is necessary,\n" |
| 6310 | "especially if it merges an updated upstream into a topic branch.\n" |
| 6311 | "\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6312 | "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] | 6313 | "the commit.\n" |
| 6314 | msgstr "" |
| 6315 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6316 | #: builtin/merge.c:841 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6317 | msgid "Empty commit message." |
| 6318 | msgstr "" |
| 6319 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6320 | #: builtin/merge.c:853 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6321 | #, c-format |
| 6322 | msgid "Wonderful.\n" |
| 6323 | msgstr "" |
| 6324 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6325 | #: builtin/merge.c:918 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6326 | #, c-format |
| 6327 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" |
| 6328 | msgstr "" |
| 6329 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6330 | #: builtin/merge.c:934 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6331 | #, c-format |
| 6332 | msgid "'%s' is not a commit" |
| 6333 | msgstr "" |
| 6334 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6335 | #: builtin/merge.c:975 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6336 | msgid "No current branch." |
| 6337 | msgstr "" |
| 6338 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6339 | #: builtin/merge.c:977 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6340 | msgid "No remote for the current branch." |
| 6341 | msgstr "" |
| 6342 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6343 | #: builtin/merge.c:979 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6344 | msgid "No default upstream defined for the current branch." |
| 6345 | msgstr "" |
| 6346 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6347 | #: builtin/merge.c:984 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6348 | #, c-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6349 | msgid "No remote-tracking branch for %s from %s" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6350 | msgstr "" |
| 6351 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6352 | #: builtin/merge.c:1140 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6353 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
| 6354 | msgstr "" |
| 6355 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6356 | #: builtin/merge.c:1156 git-pull.sh:31 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6357 | msgid "" |
| 6358 | "You have not concluded your merge (MERGE_HEAD exists).\n" |
| 6359 | "Please, commit your changes before you can merge." |
| 6360 | msgstr "" |
| 6361 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6362 | #: builtin/merge.c:1159 git-pull.sh:34 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6363 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
| 6364 | msgstr "" |
| 6365 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6366 | #: builtin/merge.c:1163 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6367 | msgid "" |
| 6368 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" |
| 6369 | "Please, commit your changes before you can merge." |
| 6370 | msgstr "" |
| 6371 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6372 | #: builtin/merge.c:1166 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6373 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
| 6374 | msgstr "" |
| 6375 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6376 | #: builtin/merge.c:1175 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6377 | msgid "You cannot combine --squash with --no-ff." |
| 6378 | msgstr "" |
| 6379 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6380 | #: builtin/merge.c:1184 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6381 | msgid "No commit specified and merge.defaultToUpstream not set." |
| 6382 | msgstr "" |
| 6383 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6384 | #: builtin/merge.c:1216 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6385 | msgid "Can merge only exactly one commit into empty head" |
| 6386 | msgstr "" |
| 6387 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6388 | #: builtin/merge.c:1219 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6389 | msgid "Squash commit into empty head not supported yet" |
| 6390 | msgstr "" |
| 6391 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6392 | #: builtin/merge.c:1221 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6393 | msgid "Non-fast-forward commit does not make sense into an empty head" |
| 6394 | msgstr "" |
| 6395 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6396 | #: builtin/merge.c:1226 |
| 6397 | #, c-format |
| 6398 | msgid "%s - not something we can merge" |
| 6399 | msgstr "" |
| 6400 | |
| 6401 | #: builtin/merge.c:1277 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6402 | #, c-format |
| 6403 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." |
| 6404 | msgstr "" |
| 6405 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6406 | #: builtin/merge.c:1280 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6407 | #, c-format |
| 6408 | msgid "Commit %s has a bad GPG signature allegedly by %s." |
| 6409 | msgstr "" |
| 6410 | |
| 6411 | #. 'N' |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6412 | #: builtin/merge.c:1283 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6413 | #, c-format |
| 6414 | msgid "Commit %s does not have a GPG signature." |
| 6415 | msgstr "" |
| 6416 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6417 | #: builtin/merge.c:1286 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 6418 | #, c-format |
| 6419 | msgid "Commit %s has a good GPG signature by %s\n" |
| 6420 | msgstr "" |
| 6421 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6422 | #: builtin/merge.c:1370 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6423 | #, c-format |
| 6424 | msgid "Updating %s..%s\n" |
| 6425 | msgstr "" |
| 6426 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6427 | #: builtin/merge.c:1409 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6428 | #, c-format |
| 6429 | msgid "Trying really trivial in-index merge...\n" |
| 6430 | msgstr "" |
| 6431 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6432 | #: builtin/merge.c:1416 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6433 | #, c-format |
| 6434 | msgid "Nope.\n" |
| 6435 | msgstr "" |
| 6436 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6437 | #: builtin/merge.c:1448 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6438 | msgid "Not possible to fast-forward, aborting." |
| 6439 | msgstr "" |
| 6440 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6441 | #: builtin/merge.c:1471 builtin/merge.c:1550 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6442 | #, c-format |
| 6443 | msgid "Rewinding the tree to pristine...\n" |
| 6444 | msgstr "" |
| 6445 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6446 | #: builtin/merge.c:1475 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6447 | #, c-format |
| 6448 | msgid "Trying merge strategy %s...\n" |
| 6449 | msgstr "" |
| 6450 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6451 | #: builtin/merge.c:1541 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6452 | #, c-format |
| 6453 | msgid "No merge strategy handled the merge.\n" |
| 6454 | msgstr "" |
| 6455 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6456 | #: builtin/merge.c:1543 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6457 | #, c-format |
| 6458 | msgid "Merge with strategy %s failed.\n" |
| 6459 | msgstr "" |
| 6460 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6461 | #: builtin/merge.c:1552 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6462 | #, c-format |
| 6463 | msgid "Using the %s to prepare resolving by hand.\n" |
| 6464 | msgstr "" |
| 6465 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6466 | #: builtin/merge.c:1564 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6467 | #, c-format |
| 6468 | msgid "Automatic merge went well; stopped before committing as requested\n" |
| 6469 | msgstr "" |
| 6470 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6471 | #: builtin/merge-base.c:26 |
| 6472 | msgid "git merge-base [-a|--all] <commit> <commit>..." |
| 6473 | msgstr "" |
| 6474 | |
| 6475 | #: builtin/merge-base.c:27 |
| 6476 | msgid "git merge-base [-a|--all] --octopus <commit>..." |
| 6477 | msgstr "" |
| 6478 | |
| 6479 | #: builtin/merge-base.c:28 |
| 6480 | msgid "git merge-base --independent <commit>..." |
| 6481 | msgstr "" |
| 6482 | |
| 6483 | #: builtin/merge-base.c:29 |
| 6484 | msgid "git merge-base --is-ancestor <commit> <commit>" |
| 6485 | msgstr "" |
| 6486 | |
| 6487 | #: builtin/merge-base.c:98 |
| 6488 | msgid "output all common ancestors" |
| 6489 | msgstr "" |
| 6490 | |
| 6491 | #: builtin/merge-base.c:99 |
| 6492 | msgid "find ancestors for a single n-way merge" |
| 6493 | msgstr "" |
| 6494 | |
| 6495 | #: builtin/merge-base.c:100 |
| 6496 | msgid "list revs not reachable from others" |
| 6497 | msgstr "" |
| 6498 | |
| 6499 | #: builtin/merge-base.c:102 |
| 6500 | msgid "is the first one ancestor of the other?" |
| 6501 | msgstr "" |
| 6502 | |
| 6503 | #: builtin/merge-file.c:8 |
| 6504 | msgid "" |
| 6505 | "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " |
| 6506 | "file2" |
| 6507 | msgstr "" |
| 6508 | |
| 6509 | #: builtin/merge-file.c:33 |
| 6510 | msgid "send results to standard output" |
| 6511 | msgstr "" |
| 6512 | |
| 6513 | #: builtin/merge-file.c:34 |
| 6514 | msgid "use a diff3 based merge" |
| 6515 | msgstr "" |
| 6516 | |
| 6517 | #: builtin/merge-file.c:35 |
| 6518 | msgid "for conflicts, use our version" |
| 6519 | msgstr "" |
| 6520 | |
| 6521 | #: builtin/merge-file.c:37 |
| 6522 | msgid "for conflicts, use their version" |
| 6523 | msgstr "" |
| 6524 | |
| 6525 | #: builtin/merge-file.c:39 |
| 6526 | msgid "for conflicts, use a union version" |
| 6527 | msgstr "" |
| 6528 | |
| 6529 | #: builtin/merge-file.c:42 |
| 6530 | msgid "for conflicts, use this marker size" |
| 6531 | msgstr "" |
| 6532 | |
| 6533 | #: builtin/merge-file.c:43 |
| 6534 | msgid "do not warn about conflicts" |
| 6535 | msgstr "" |
| 6536 | |
| 6537 | #: builtin/merge-file.c:45 |
| 6538 | msgid "set labels for file1/orig_file/file2" |
| 6539 | msgstr "" |
| 6540 | |
| 6541 | #: builtin/mktree.c:67 |
| 6542 | msgid "git mktree [-z] [--missing] [--batch]" |
| 6543 | msgstr "" |
| 6544 | |
| 6545 | #: builtin/mktree.c:153 |
| 6546 | msgid "input is NUL terminated" |
| 6547 | msgstr "" |
| 6548 | |
| 6549 | #: builtin/mktree.c:154 builtin/write-tree.c:24 |
| 6550 | msgid "allow missing objects" |
| 6551 | msgstr "" |
| 6552 | |
| 6553 | #: builtin/mktree.c:155 |
| 6554 | msgid "allow creation of more than one tree" |
| 6555 | msgstr "" |
| 6556 | |
| 6557 | #: builtin/mv.c:14 |
| 6558 | msgid "git mv [options] <source>... <destination>" |
| 6559 | msgstr "" |
| 6560 | |
| 6561 | #: builtin/mv.c:64 |
| 6562 | msgid "force move/rename even if target exists" |
| 6563 | msgstr "" |
| 6564 | |
| 6565 | #: builtin/mv.c:65 |
| 6566 | msgid "skip move/rename errors" |
| 6567 | msgstr "" |
| 6568 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6569 | #: builtin/mv.c:108 |
| 6570 | #, c-format |
| 6571 | msgid "Checking rename of '%s' to '%s'\n" |
| 6572 | msgstr "" |
| 6573 | |
| 6574 | #: builtin/mv.c:112 |
| 6575 | msgid "bad source" |
| 6576 | msgstr "" |
| 6577 | |
| 6578 | #: builtin/mv.c:115 |
| 6579 | msgid "can not move directory into itself" |
| 6580 | msgstr "" |
| 6581 | |
| 6582 | #: builtin/mv.c:118 |
| 6583 | msgid "cannot move directory over file" |
| 6584 | msgstr "" |
| 6585 | |
| 6586 | #: builtin/mv.c:128 |
| 6587 | #, c-format |
| 6588 | msgid "Huh? %.*s is in index?" |
| 6589 | msgstr "" |
| 6590 | |
| 6591 | #: builtin/mv.c:140 |
| 6592 | msgid "source directory is empty" |
| 6593 | msgstr "" |
| 6594 | |
| 6595 | #: builtin/mv.c:171 |
| 6596 | msgid "not under version control" |
| 6597 | msgstr "" |
| 6598 | |
| 6599 | #: builtin/mv.c:173 |
| 6600 | msgid "destination exists" |
| 6601 | msgstr "" |
| 6602 | |
| 6603 | #: builtin/mv.c:181 |
| 6604 | #, c-format |
| 6605 | msgid "overwriting '%s'" |
| 6606 | msgstr "" |
| 6607 | |
| 6608 | #: builtin/mv.c:184 |
| 6609 | msgid "Cannot overwrite" |
| 6610 | msgstr "" |
| 6611 | |
| 6612 | #: builtin/mv.c:187 |
| 6613 | msgid "multiple sources for the same target" |
| 6614 | msgstr "" |
| 6615 | |
| 6616 | #: builtin/mv.c:202 |
| 6617 | #, c-format |
| 6618 | msgid "%s, source=%s, destination=%s" |
| 6619 | msgstr "" |
| 6620 | |
| 6621 | #: builtin/mv.c:212 |
| 6622 | #, c-format |
| 6623 | msgid "Renaming %s to %s\n" |
| 6624 | msgstr "" |
| 6625 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 6626 | #: builtin/mv.c:215 builtin/remote.c:731 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6627 | #, c-format |
| 6628 | msgid "renaming '%s' failed" |
| 6629 | msgstr "" |
| 6630 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6631 | #: builtin/name-rev.c:259 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6632 | msgid "git name-rev [options] <commit>..." |
| 6633 | msgstr "" |
| 6634 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6635 | #: builtin/name-rev.c:260 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6636 | msgid "git name-rev [options] --all" |
| 6637 | msgstr "" |
| 6638 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6639 | #: builtin/name-rev.c:261 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6640 | msgid "git name-rev [options] --stdin" |
| 6641 | msgstr "" |
| 6642 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6643 | #: builtin/name-rev.c:313 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6644 | msgid "print only names (no SHA-1)" |
| 6645 | msgstr "" |
| 6646 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6647 | #: builtin/name-rev.c:314 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6648 | msgid "only use tags to name the commits" |
| 6649 | msgstr "" |
| 6650 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6651 | #: builtin/name-rev.c:316 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6652 | msgid "only use refs matching <pattern>" |
| 6653 | msgstr "" |
| 6654 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6655 | #: builtin/name-rev.c:318 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6656 | msgid "list all commits reachable from all refs" |
| 6657 | msgstr "" |
| 6658 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6659 | #: builtin/name-rev.c:319 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6660 | msgid "read from stdin" |
| 6661 | msgstr "" |
| 6662 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6663 | #: builtin/name-rev.c:320 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6664 | msgid "allow to print `undefined` names" |
| 6665 | msgstr "" |
| 6666 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6667 | #: builtin/name-rev.c:326 |
| 6668 | msgid "dereference tags in the input (internal use)" |
| 6669 | msgstr "" |
| 6670 | |
| 6671 | #: builtin/notes.c:24 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6672 | msgid "git notes [--ref <notes_ref>] [list [<object>]]" |
| 6673 | msgstr "" |
| 6674 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6675 | #: builtin/notes.c:25 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6676 | msgid "" |
| 6677 | "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " |
| 6678 | "<object>] [<object>]" |
| 6679 | msgstr "" |
| 6680 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6681 | #: builtin/notes.c:26 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6682 | msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" |
| 6683 | msgstr "" |
| 6684 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6685 | #: builtin/notes.c:27 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6686 | msgid "" |
| 6687 | "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " |
| 6688 | "<object>] [<object>]" |
| 6689 | msgstr "" |
| 6690 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6691 | #: builtin/notes.c:28 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6692 | msgid "git notes [--ref <notes_ref>] edit [<object>]" |
| 6693 | msgstr "" |
| 6694 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6695 | #: builtin/notes.c:29 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6696 | msgid "git notes [--ref <notes_ref>] show [<object>]" |
| 6697 | msgstr "" |
| 6698 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6699 | #: builtin/notes.c:30 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6700 | msgid "" |
| 6701 | "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" |
| 6702 | msgstr "" |
| 6703 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6704 | #: builtin/notes.c:31 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6705 | msgid "git notes merge --commit [-v | -q]" |
| 6706 | msgstr "" |
| 6707 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6708 | #: builtin/notes.c:32 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6709 | msgid "git notes merge --abort [-v | -q]" |
| 6710 | msgstr "" |
| 6711 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6712 | #: builtin/notes.c:33 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6713 | msgid "git notes [--ref <notes_ref>] remove [<object>...]" |
| 6714 | msgstr "" |
| 6715 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6716 | #: builtin/notes.c:34 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6717 | msgid "git notes [--ref <notes_ref>] prune [-n | -v]" |
| 6718 | msgstr "" |
| 6719 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6720 | #: builtin/notes.c:35 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6721 | msgid "git notes [--ref <notes_ref>] get-ref" |
| 6722 | msgstr "" |
| 6723 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6724 | #: builtin/notes.c:40 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6725 | msgid "git notes [list [<object>]]" |
| 6726 | msgstr "" |
| 6727 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6728 | #: builtin/notes.c:45 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6729 | msgid "git notes add [<options>] [<object>]" |
| 6730 | msgstr "" |
| 6731 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6732 | #: builtin/notes.c:50 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6733 | msgid "git notes copy [<options>] <from-object> <to-object>" |
| 6734 | msgstr "" |
| 6735 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6736 | #: builtin/notes.c:51 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6737 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
| 6738 | msgstr "" |
| 6739 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6740 | #: builtin/notes.c:56 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6741 | msgid "git notes append [<options>] [<object>]" |
| 6742 | msgstr "" |
| 6743 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6744 | #: builtin/notes.c:61 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6745 | msgid "git notes edit [<object>]" |
| 6746 | msgstr "" |
| 6747 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6748 | #: builtin/notes.c:66 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6749 | msgid "git notes show [<object>]" |
| 6750 | msgstr "" |
| 6751 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6752 | #: builtin/notes.c:71 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6753 | msgid "git notes merge [<options>] <notes_ref>" |
| 6754 | msgstr "" |
| 6755 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6756 | #: builtin/notes.c:72 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6757 | msgid "git notes merge --commit [<options>]" |
| 6758 | msgstr "" |
| 6759 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6760 | #: builtin/notes.c:73 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6761 | msgid "git notes merge --abort [<options>]" |
| 6762 | msgstr "" |
| 6763 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6764 | #: builtin/notes.c:78 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6765 | msgid "git notes remove [<object>]" |
| 6766 | msgstr "" |
| 6767 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6768 | #: builtin/notes.c:83 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6769 | msgid "git notes prune [<options>]" |
| 6770 | msgstr "" |
| 6771 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6772 | #: builtin/notes.c:88 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6773 | msgid "git notes get-ref" |
| 6774 | msgstr "" |
| 6775 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6776 | #: builtin/notes.c:137 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6777 | #, c-format |
| 6778 | msgid "unable to start 'show' for object '%s'" |
| 6779 | msgstr "" |
| 6780 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6781 | #: builtin/notes.c:141 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 6782 | msgid "could not read 'show' output" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6783 | msgstr "" |
| 6784 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6785 | #: builtin/notes.c:149 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 6786 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6787 | msgid "failed to finish 'show' for object '%s'" |
| 6788 | msgstr "" |
| 6789 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6790 | #: builtin/notes.c:167 builtin/tag.c:341 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6791 | #, c-format |
| 6792 | msgid "could not create file '%s'" |
| 6793 | msgstr "" |
| 6794 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6795 | #: builtin/notes.c:186 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6796 | msgid "Please supply the note contents using either -m or -F option" |
| 6797 | msgstr "" |
| 6798 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6799 | #: builtin/notes.c:207 builtin/notes.c:844 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6800 | #, c-format |
| 6801 | msgid "Removing note for object %s\n" |
| 6802 | msgstr "" |
| 6803 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6804 | #: builtin/notes.c:212 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6805 | msgid "unable to write note object" |
| 6806 | msgstr "" |
| 6807 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6808 | #: builtin/notes.c:214 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6809 | #, c-format |
| 6810 | msgid "The note contents has been left in %s" |
| 6811 | msgstr "" |
| 6812 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6813 | #: builtin/notes.c:248 builtin/tag.c:540 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6814 | #, c-format |
| 6815 | msgid "cannot read '%s'" |
| 6816 | msgstr "" |
| 6817 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6818 | #: builtin/notes.c:250 builtin/tag.c:543 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6819 | #, c-format |
| 6820 | msgid "could not open or read '%s'" |
| 6821 | msgstr "" |
| 6822 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6823 | #: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 |
| 6824 | #: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 |
| 6825 | #: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 |
| 6826 | #: builtin/notes.c:839 builtin/tag.c:556 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6827 | #, c-format |
| 6828 | msgid "Failed to resolve '%s' as a valid ref." |
| 6829 | msgstr "" |
| 6830 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6831 | #: builtin/notes.c:272 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6832 | #, c-format |
| 6833 | msgid "Failed to read object '%s'." |
| 6834 | msgstr "" |
| 6835 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6836 | #: builtin/notes.c:312 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6837 | #, c-format |
| 6838 | msgid "Malformed input line: '%s'." |
| 6839 | msgstr "" |
| 6840 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6841 | #: builtin/notes.c:327 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6842 | #, c-format |
| 6843 | msgid "Failed to copy notes from '%s' to '%s'" |
| 6844 | msgstr "" |
| 6845 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6846 | #: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 |
| 6847 | #: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 |
| 6848 | #: builtin/notes.c:904 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6849 | msgid "too many parameters" |
| 6850 | msgstr "" |
| 6851 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6852 | #: builtin/notes.c:384 builtin/notes.c:643 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6853 | #, c-format |
| 6854 | msgid "No note found for object %s." |
| 6855 | msgstr "" |
| 6856 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6857 | #: builtin/notes.c:406 builtin/notes.c:563 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6858 | msgid "note contents as a string" |
| 6859 | msgstr "" |
| 6860 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6861 | #: builtin/notes.c:409 builtin/notes.c:566 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6862 | msgid "note contents in a file" |
| 6863 | msgstr "" |
| 6864 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6865 | #: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 |
| 6866 | #: builtin/notes.c:571 builtin/tag.c:474 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6867 | msgid "object" |
| 6868 | msgstr "" |
| 6869 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6870 | #: builtin/notes.c:412 builtin/notes.c:569 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6871 | msgid "reuse and edit specified note object" |
| 6872 | msgstr "" |
| 6873 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6874 | #: builtin/notes.c:415 builtin/notes.c:572 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6875 | msgid "reuse specified note object" |
| 6876 | msgstr "" |
| 6877 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6878 | #: builtin/notes.c:417 builtin/notes.c:485 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6879 | msgid "replace existing notes" |
| 6880 | msgstr "" |
| 6881 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6882 | #: builtin/notes.c:451 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6883 | #, c-format |
| 6884 | msgid "" |
| 6885 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " |
| 6886 | "existing notes" |
| 6887 | msgstr "" |
| 6888 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6889 | #: builtin/notes.c:456 builtin/notes.c:533 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6890 | #, c-format |
| 6891 | msgid "Overwriting existing notes for object %s\n" |
| 6892 | msgstr "" |
| 6893 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6894 | #: builtin/notes.c:486 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6895 | msgid "read objects from stdin" |
| 6896 | msgstr "" |
| 6897 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6898 | #: builtin/notes.c:488 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6899 | msgid "load rewriting config for <command> (implies --stdin)" |
| 6900 | msgstr "" |
| 6901 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6902 | #: builtin/notes.c:506 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6903 | msgid "too few parameters" |
| 6904 | msgstr "" |
| 6905 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6906 | #: builtin/notes.c:527 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6907 | #, c-format |
| 6908 | msgid "" |
| 6909 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " |
| 6910 | "existing notes" |
| 6911 | msgstr "" |
| 6912 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6913 | #: builtin/notes.c:539 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6914 | #, c-format |
| 6915 | msgid "Missing notes on source object %s. Cannot copy." |
| 6916 | msgstr "" |
| 6917 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6918 | #: builtin/notes.c:588 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6919 | #, c-format |
| 6920 | msgid "" |
| 6921 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" |
| 6922 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" |
| 6923 | msgstr "" |
| 6924 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6925 | #: builtin/notes.c:735 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6926 | msgid "General options" |
| 6927 | msgstr "" |
| 6928 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6929 | #: builtin/notes.c:737 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6930 | msgid "Merge options" |
| 6931 | msgstr "" |
| 6932 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6933 | #: builtin/notes.c:739 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6934 | msgid "" |
| 6935 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" |
| 6936 | "cat_sort_uniq)" |
| 6937 | msgstr "" |
| 6938 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6939 | #: builtin/notes.c:741 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6940 | msgid "Committing unmerged notes" |
| 6941 | msgstr "" |
| 6942 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6943 | #: builtin/notes.c:743 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6944 | msgid "finalize notes merge by committing unmerged notes" |
| 6945 | msgstr "" |
| 6946 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6947 | #: builtin/notes.c:745 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6948 | msgid "Aborting notes merge resolution" |
| 6949 | msgstr "" |
| 6950 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6951 | #: builtin/notes.c:747 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6952 | msgid "abort notes merge" |
| 6953 | msgstr "" |
| 6954 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6955 | #: builtin/notes.c:842 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6956 | #, c-format |
| 6957 | msgid "Object %s has no note\n" |
| 6958 | msgstr "" |
| 6959 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6960 | #: builtin/notes.c:854 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6961 | msgid "attempt to remove non-existent note is not an error" |
| 6962 | msgstr "" |
| 6963 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6964 | #: builtin/notes.c:857 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6965 | msgid "read object names from the standard input" |
| 6966 | msgstr "" |
| 6967 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6968 | #: builtin/notes.c:938 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6969 | msgid "notes_ref" |
| 6970 | msgstr "" |
| 6971 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6972 | #: builtin/notes.c:939 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6973 | msgid "use notes from <notes_ref>" |
| 6974 | msgstr "" |
| 6975 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 6976 | #: builtin/notes.c:974 builtin/remote.c:1598 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 6977 | #, c-format |
| 6978 | msgid "Unknown subcommand: %s" |
| 6979 | msgstr "" |
| 6980 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 6981 | #: builtin/pack-objects.c:23 |
| 6982 | msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" |
| 6983 | msgstr "" |
| 6984 | |
| 6985 | #: builtin/pack-objects.c:24 |
| 6986 | msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" |
| 6987 | msgstr "" |
| 6988 | |
Jiang Xin | 11b9017 | 2012-07-03 10:31:59 +0800 | [diff] [blame] | 6989 | #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 |
| 6990 | #, c-format |
| 6991 | msgid "deflate error (%d)" |
| 6992 | msgstr "" |
| 6993 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6994 | #: builtin/pack-objects.c:2397 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 6995 | #, c-format |
| 6996 | msgid "unsupported index version %s" |
| 6997 | msgstr "" |
| 6998 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 6999 | #: builtin/pack-objects.c:2401 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 7000 | #, c-format |
| 7001 | msgid "bad index version '%s'" |
| 7002 | msgstr "" |
| 7003 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7004 | #: builtin/pack-objects.c:2424 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 7005 | #, c-format |
| 7006 | msgid "option %s does not accept negative form" |
| 7007 | msgstr "" |
| 7008 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7009 | #: builtin/pack-objects.c:2428 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 7010 | #, c-format |
| 7011 | msgid "unable to parse value '%s' for option %s" |
| 7012 | msgstr "" |
| 7013 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7014 | #: builtin/pack-objects.c:2447 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7015 | msgid "do not show progress meter" |
| 7016 | msgstr "" |
| 7017 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7018 | #: builtin/pack-objects.c:2449 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7019 | msgid "show progress meter" |
| 7020 | msgstr "" |
| 7021 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7022 | #: builtin/pack-objects.c:2451 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7023 | msgid "show progress meter during object writing phase" |
| 7024 | msgstr "" |
| 7025 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7026 | #: builtin/pack-objects.c:2454 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7027 | msgid "similar to --all-progress when progress meter is shown" |
| 7028 | msgstr "" |
| 7029 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7030 | #: builtin/pack-objects.c:2455 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7031 | msgid "version[,offset]" |
| 7032 | msgstr "" |
| 7033 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7034 | #: builtin/pack-objects.c:2456 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7035 | msgid "write the pack index file in the specified idx format version" |
| 7036 | msgstr "" |
| 7037 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7038 | #: builtin/pack-objects.c:2459 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7039 | msgid "maximum size of each output pack file" |
| 7040 | msgstr "" |
| 7041 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7042 | #: builtin/pack-objects.c:2461 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7043 | msgid "ignore borrowed objects from alternate object store" |
| 7044 | msgstr "" |
| 7045 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7046 | #: builtin/pack-objects.c:2463 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7047 | msgid "ignore packed objects" |
| 7048 | msgstr "" |
| 7049 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7050 | #: builtin/pack-objects.c:2465 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7051 | msgid "limit pack window by objects" |
| 7052 | msgstr "" |
| 7053 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7054 | #: builtin/pack-objects.c:2467 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7055 | msgid "limit pack window by memory in addition to object limit" |
| 7056 | msgstr "" |
| 7057 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7058 | #: builtin/pack-objects.c:2469 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7059 | msgid "maximum length of delta chain allowed in the resulting pack" |
| 7060 | msgstr "" |
| 7061 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7062 | #: builtin/pack-objects.c:2471 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7063 | msgid "reuse existing deltas" |
| 7064 | msgstr "" |
| 7065 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7066 | #: builtin/pack-objects.c:2473 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7067 | msgid "reuse existing objects" |
| 7068 | msgstr "" |
| 7069 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7070 | #: builtin/pack-objects.c:2475 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7071 | msgid "use OFS_DELTA objects" |
| 7072 | msgstr "" |
| 7073 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7074 | #: builtin/pack-objects.c:2477 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7075 | msgid "use threads when searching for best delta matches" |
| 7076 | msgstr "" |
| 7077 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7078 | #: builtin/pack-objects.c:2479 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7079 | msgid "do not create an empty pack output" |
| 7080 | msgstr "" |
| 7081 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7082 | #: builtin/pack-objects.c:2481 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7083 | msgid "read revision arguments from standard input" |
| 7084 | msgstr "" |
| 7085 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7086 | #: builtin/pack-objects.c:2483 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7087 | msgid "limit the objects to those that are not yet packed" |
| 7088 | msgstr "" |
| 7089 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7090 | #: builtin/pack-objects.c:2486 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7091 | msgid "include objects reachable from any reference" |
| 7092 | msgstr "" |
| 7093 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7094 | #: builtin/pack-objects.c:2489 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7095 | msgid "include objects referred by reflog entries" |
| 7096 | msgstr "" |
| 7097 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7098 | #: builtin/pack-objects.c:2492 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7099 | msgid "output pack to stdout" |
| 7100 | msgstr "" |
| 7101 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7102 | #: builtin/pack-objects.c:2494 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7103 | msgid "include tag objects that refer to objects to be packed" |
| 7104 | msgstr "" |
| 7105 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7106 | #: builtin/pack-objects.c:2496 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7107 | msgid "keep unreachable objects" |
| 7108 | msgstr "" |
| 7109 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7110 | #: builtin/pack-objects.c:2497 parse-options.h:141 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7111 | msgid "time" |
| 7112 | msgstr "" |
| 7113 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7114 | #: builtin/pack-objects.c:2498 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7115 | msgid "unpack unreachable objects newer than <time>" |
| 7116 | msgstr "" |
| 7117 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7118 | #: builtin/pack-objects.c:2501 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7119 | msgid "create thin packs" |
| 7120 | msgstr "" |
| 7121 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7122 | #: builtin/pack-objects.c:2503 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7123 | msgid "ignore packs that have companion .keep file" |
| 7124 | msgstr "" |
| 7125 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7126 | #: builtin/pack-objects.c:2505 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7127 | msgid "pack compression level" |
| 7128 | msgstr "" |
| 7129 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7130 | #: builtin/pack-objects.c:2507 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7131 | msgid "do not hide commits by grafts" |
| 7132 | msgstr "" |
| 7133 | |
| 7134 | #: builtin/pack-refs.c:6 |
| 7135 | msgid "git pack-refs [options]" |
| 7136 | msgstr "" |
| 7137 | |
| 7138 | #: builtin/pack-refs.c:14 |
| 7139 | msgid "pack everything" |
| 7140 | msgstr "" |
| 7141 | |
| 7142 | #: builtin/pack-refs.c:15 |
| 7143 | msgid "prune loose refs (default)" |
| 7144 | msgstr "" |
| 7145 | |
| 7146 | #: builtin/prune-packed.c:7 |
| 7147 | msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" |
| 7148 | msgstr "" |
| 7149 | |
| 7150 | #: builtin/prune.c:12 |
| 7151 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
| 7152 | msgstr "" |
| 7153 | |
| 7154 | #: builtin/prune.c:132 |
| 7155 | msgid "do not remove, show only" |
| 7156 | msgstr "" |
| 7157 | |
| 7158 | #: builtin/prune.c:133 |
| 7159 | msgid "report pruned objects" |
| 7160 | msgstr "" |
| 7161 | |
| 7162 | #: builtin/prune.c:136 |
| 7163 | msgid "expire objects older than <time>" |
| 7164 | msgstr "" |
| 7165 | |
| 7166 | #: builtin/push.c:14 |
| 7167 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
| 7168 | msgstr "" |
| 7169 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7170 | #: builtin/push.c:45 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7171 | msgid "tag shorthand without <tag>" |
| 7172 | msgstr "" |
| 7173 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7174 | #: builtin/push.c:64 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7175 | msgid "--delete only accepts plain target ref names" |
| 7176 | msgstr "" |
| 7177 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7178 | #: builtin/push.c:99 |
| 7179 | msgid "" |
| 7180 | "\n" |
| 7181 | "To choose either option permanently, see push.default in 'git help config'." |
| 7182 | msgstr "" |
| 7183 | |
| 7184 | #: builtin/push.c:102 |
| 7185 | #, c-format |
| 7186 | msgid "" |
| 7187 | "The upstream branch of your current branch does not match\n" |
| 7188 | "the name of your current branch. To push to the upstream branch\n" |
| 7189 | "on the remote, use\n" |
| 7190 | "\n" |
| 7191 | " git push %s HEAD:%s\n" |
| 7192 | "\n" |
| 7193 | "To push to the branch of the same name on the remote, use\n" |
| 7194 | "\n" |
| 7195 | " git push %s %s\n" |
| 7196 | "%s" |
| 7197 | msgstr "" |
| 7198 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7199 | #: builtin/push.c:117 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7200 | #, c-format |
| 7201 | msgid "" |
| 7202 | "You are not currently on a branch.\n" |
| 7203 | "To push the history leading to the current (detached HEAD)\n" |
| 7204 | "state now, use\n" |
| 7205 | "\n" |
| 7206 | " git push %s HEAD:<name-of-remote-branch>\n" |
| 7207 | msgstr "" |
| 7208 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7209 | #: builtin/push.c:131 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7210 | #, c-format |
| 7211 | msgid "" |
| 7212 | "The current branch %s has no upstream branch.\n" |
| 7213 | "To push the current branch and set the remote as upstream, use\n" |
| 7214 | "\n" |
| 7215 | " git push --set-upstream %s %s\n" |
| 7216 | msgstr "" |
| 7217 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7218 | #: builtin/push.c:139 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7219 | #, c-format |
| 7220 | msgid "The current branch %s has multiple upstream branches, refusing to push." |
| 7221 | msgstr "" |
| 7222 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7223 | #: builtin/push.c:142 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7224 | #, c-format |
| 7225 | msgid "" |
| 7226 | "You are pushing to remote '%s', which is not the upstream of\n" |
| 7227 | "your current branch '%s', without telling me what to push\n" |
| 7228 | "to update which remote branch." |
| 7229 | msgstr "" |
| 7230 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7231 | #: builtin/push.c:165 |
Jiang Xin | ccfca8d | 2012-09-05 06:20:57 +0800 | [diff] [blame] | 7232 | msgid "" |
| 7233 | "push.default is unset; its implicit value is changing in\n" |
| 7234 | "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" |
| 7235 | "and maintain the current behavior after the default changes, use:\n" |
| 7236 | "\n" |
| 7237 | " git config --global push.default matching\n" |
| 7238 | "\n" |
| 7239 | "To squelch this message and adopt the new behavior now, use:\n" |
| 7240 | "\n" |
| 7241 | " git config --global push.default simple\n" |
| 7242 | "\n" |
| 7243 | "See 'git help config' and search for 'push.default' for further " |
| 7244 | "information.\n" |
| 7245 | "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" |
| 7246 | "'current' instead of 'simple' if you sometimes use older versions of Git)" |
| 7247 | msgstr "" |
| 7248 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7249 | #: builtin/push.c:225 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7250 | msgid "" |
| 7251 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." |
| 7252 | msgstr "" |
| 7253 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7254 | #: builtin/push.c:232 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7255 | msgid "" |
| 7256 | "Updates were rejected because the tip of your current branch is behind\n" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7257 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
| 7258 | "'git pull ...') before pushing again.\n" |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7259 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
| 7260 | msgstr "" |
| 7261 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7262 | #: builtin/push.c:238 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7263 | msgid "" |
| 7264 | "Updates were rejected because a pushed branch tip is behind its remote\n" |
| 7265 | "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] | 7266 | "specify branches to push or set the 'push.default' configuration variable\n" |
| 7267 | "to 'simple', 'current' or 'upstream' to push only the current branch." |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7268 | msgstr "" |
| 7269 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7270 | #: builtin/push.c:244 |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7271 | msgid "" |
| 7272 | "Updates were rejected because a pushed branch tip is behind its remote\n" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7273 | "counterpart. Check out this branch and integrate the remote changes\n" |
| 7274 | "(e.g. 'git pull ...') before pushing again.\n" |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 7275 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
| 7276 | msgstr "" |
| 7277 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7278 | #: builtin/push.c:250 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7279 | msgid "" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7280 | "Updates were rejected because the remote contains work that you do\n" |
| 7281 | "not have locally. This is usually caused by another repository pushing\n" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7282 | "to the same ref. You may want to first integrate the remote changes\n" |
| 7283 | "(e.g., 'git pull ...') before pushing again.\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7284 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 7285 | msgstr "" |
| 7286 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7287 | #: builtin/push.c:257 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7288 | msgid "Updates were rejected because the tag already exists in the remote." |
| 7289 | msgstr "" |
| 7290 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7291 | #: builtin/push.c:260 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7292 | msgid "" |
| 7293 | "You cannot update a remote ref that points at a non-commit object,\n" |
| 7294 | "or update a remote ref to make it point at a non-commit object,\n" |
| 7295 | "without using the '--force' option.\n" |
| 7296 | msgstr "" |
| 7297 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7298 | #: builtin/push.c:320 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7299 | #, c-format |
| 7300 | msgid "Pushing to %s\n" |
| 7301 | msgstr "" |
| 7302 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7303 | #: builtin/push.c:324 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7304 | #, c-format |
| 7305 | msgid "failed to push some refs to '%s'" |
| 7306 | msgstr "" |
| 7307 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7308 | #: builtin/push.c:357 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7309 | #, c-format |
| 7310 | msgid "bad repository '%s'" |
| 7311 | msgstr "" |
| 7312 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7313 | #: builtin/push.c:358 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7314 | msgid "" |
| 7315 | "No configured push destination.\n" |
| 7316 | "Either specify the URL from the command-line or configure a remote " |
| 7317 | "repository using\n" |
| 7318 | "\n" |
| 7319 | " git remote add <name> <url>\n" |
| 7320 | "\n" |
| 7321 | "and then push using the remote name\n" |
| 7322 | "\n" |
| 7323 | " git push <name>\n" |
| 7324 | msgstr "" |
| 7325 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7326 | #: builtin/push.c:373 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7327 | msgid "--all and --tags are incompatible" |
| 7328 | msgstr "" |
| 7329 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7330 | #: builtin/push.c:374 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7331 | msgid "--all can't be combined with refspecs" |
| 7332 | msgstr "" |
| 7333 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7334 | #: builtin/push.c:379 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7335 | msgid "--mirror and --tags are incompatible" |
| 7336 | msgstr "" |
| 7337 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7338 | #: builtin/push.c:380 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7339 | msgid "--mirror can't be combined with refspecs" |
| 7340 | msgstr "" |
| 7341 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7342 | #: builtin/push.c:385 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7343 | msgid "--all and --mirror are incompatible" |
| 7344 | msgstr "" |
| 7345 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7346 | #: builtin/push.c:445 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7347 | msgid "repository" |
| 7348 | msgstr "" |
| 7349 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7350 | #: builtin/push.c:446 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7351 | msgid "push all refs" |
| 7352 | msgstr "" |
| 7353 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7354 | #: builtin/push.c:447 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7355 | msgid "mirror all refs" |
| 7356 | msgstr "" |
| 7357 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7358 | #: builtin/push.c:449 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7359 | msgid "delete refs" |
| 7360 | msgstr "" |
| 7361 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7362 | #: builtin/push.c:450 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7363 | msgid "push tags (can't be used with --all or --mirror)" |
| 7364 | msgstr "" |
| 7365 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7366 | #: builtin/push.c:453 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7367 | msgid "force updates" |
| 7368 | msgstr "" |
| 7369 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7370 | #: builtin/push.c:454 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7371 | msgid "check" |
| 7372 | msgstr "" |
| 7373 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7374 | #: builtin/push.c:455 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7375 | msgid "control recursive pushing of submodules" |
| 7376 | msgstr "" |
| 7377 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7378 | #: builtin/push.c:457 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7379 | msgid "use thin pack" |
| 7380 | msgstr "" |
| 7381 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7382 | #: builtin/push.c:458 builtin/push.c:459 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7383 | msgid "receive pack program" |
| 7384 | msgstr "" |
| 7385 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7386 | #: builtin/push.c:460 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7387 | msgid "set upstream for git pull/status" |
| 7388 | msgstr "" |
| 7389 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7390 | #: builtin/push.c:463 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7391 | msgid "prune locally removed refs" |
| 7392 | msgstr "" |
| 7393 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7394 | #: builtin/push.c:465 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 7395 | msgid "bypass pre-push hook" |
| 7396 | msgstr "" |
| 7397 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7398 | #: builtin/push.c:466 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 7399 | msgid "push missing but relevant tags" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7400 | msgstr "" |
| 7401 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7402 | #: builtin/push.c:476 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 7403 | msgid "--delete is incompatible with --all, --mirror and --tags" |
| 7404 | msgstr "" |
| 7405 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7406 | #: builtin/push.c:478 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 7407 | msgid "--delete doesn't make sense without any refs" |
| 7408 | msgstr "" |
| 7409 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7410 | #: builtin/read-tree.c:36 |
| 7411 | msgid "" |
| 7412 | "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " |
| 7413 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
| 7414 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" |
| 7415 | msgstr "" |
| 7416 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7417 | #: builtin/read-tree.c:109 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7418 | msgid "write resulting index to <file>" |
| 7419 | msgstr "" |
| 7420 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7421 | #: builtin/read-tree.c:112 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7422 | msgid "only empty the index" |
| 7423 | msgstr "" |
| 7424 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7425 | #: builtin/read-tree.c:114 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7426 | msgid "Merging" |
| 7427 | msgstr "" |
| 7428 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7429 | #: builtin/read-tree.c:116 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7430 | msgid "perform a merge in addition to a read" |
| 7431 | msgstr "" |
| 7432 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7433 | #: builtin/read-tree.c:118 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7434 | msgid "3-way merge if no file level merging required" |
| 7435 | msgstr "" |
| 7436 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7437 | #: builtin/read-tree.c:120 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7438 | msgid "3-way merge in presence of adds and removes" |
| 7439 | msgstr "" |
| 7440 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7441 | #: builtin/read-tree.c:122 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7442 | msgid "same as -m, but discard unmerged entries" |
| 7443 | msgstr "" |
| 7444 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7445 | #: builtin/read-tree.c:123 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7446 | msgid "<subdirectory>/" |
| 7447 | msgstr "" |
| 7448 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7449 | #: builtin/read-tree.c:124 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7450 | msgid "read the tree into the index under <subdirectory>/" |
| 7451 | msgstr "" |
| 7452 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7453 | #: builtin/read-tree.c:127 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7454 | msgid "update working tree with merge result" |
| 7455 | msgstr "" |
| 7456 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7457 | #: builtin/read-tree.c:129 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7458 | msgid "gitignore" |
| 7459 | msgstr "" |
| 7460 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7461 | #: builtin/read-tree.c:130 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7462 | msgid "allow explicitly ignored files to be overwritten" |
| 7463 | msgstr "" |
| 7464 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7465 | #: builtin/read-tree.c:133 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7466 | msgid "don't check the working tree after merging" |
| 7467 | msgstr "" |
| 7468 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7469 | #: builtin/read-tree.c:134 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7470 | msgid "don't update the index or the work tree" |
| 7471 | msgstr "" |
| 7472 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7473 | #: builtin/read-tree.c:136 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7474 | msgid "skip applying sparse checkout filter" |
| 7475 | msgstr "" |
| 7476 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7477 | #: builtin/read-tree.c:138 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7478 | msgid "debug unpack-trees" |
| 7479 | msgstr "" |
| 7480 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 7481 | #: builtin/reflog.c:500 |
| 7482 | #, c-format |
| 7483 | msgid "%s' for '%s' is not a valid timestamp" |
| 7484 | msgstr "" |
| 7485 | |
| 7486 | #: builtin/reflog.c:616 builtin/reflog.c:621 |
| 7487 | #, c-format |
| 7488 | msgid "'%s' is not a valid timestamp" |
| 7489 | msgstr "" |
| 7490 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7491 | #: builtin/remote.c:11 |
| 7492 | msgid "git remote [-v | --verbose]" |
| 7493 | msgstr "" |
| 7494 | |
| 7495 | #: builtin/remote.c:12 |
| 7496 | msgid "" |
| 7497 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" |
| 7498 | "mirror=<fetch|push>] <name> <url>" |
| 7499 | msgstr "" |
| 7500 | |
| 7501 | #: builtin/remote.c:13 builtin/remote.c:32 |
| 7502 | msgid "git remote rename <old> <new>" |
| 7503 | msgstr "" |
| 7504 | |
| 7505 | #: builtin/remote.c:14 builtin/remote.c:37 |
| 7506 | msgid "git remote remove <name>" |
| 7507 | msgstr "" |
| 7508 | |
Jiang Xin | f9472e3 | 2012-11-30 12:41:47 +0800 | [diff] [blame] | 7509 | #: builtin/remote.c:15 builtin/remote.c:42 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7510 | msgid "git remote set-head <name> (-a | -d | <branch>)" |
| 7511 | msgstr "" |
| 7512 | |
| 7513 | #: builtin/remote.c:16 |
| 7514 | msgid "git remote [-v | --verbose] show [-n] <name>" |
| 7515 | msgstr "" |
| 7516 | |
| 7517 | #: builtin/remote.c:17 |
| 7518 | msgid "git remote prune [-n | --dry-run] <name>" |
| 7519 | msgstr "" |
| 7520 | |
| 7521 | #: builtin/remote.c:18 |
| 7522 | msgid "" |
| 7523 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" |
| 7524 | msgstr "" |
| 7525 | |
| 7526 | #: builtin/remote.c:19 |
| 7527 | msgid "git remote set-branches [--add] <name> <branch>..." |
| 7528 | msgstr "" |
| 7529 | |
| 7530 | #: builtin/remote.c:20 builtin/remote.c:68 |
| 7531 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
| 7532 | msgstr "" |
| 7533 | |
| 7534 | #: builtin/remote.c:21 builtin/remote.c:69 |
| 7535 | msgid "git remote set-url --add <name> <newurl>" |
| 7536 | msgstr "" |
| 7537 | |
| 7538 | #: builtin/remote.c:22 builtin/remote.c:70 |
| 7539 | msgid "git remote set-url --delete <name> <url>" |
| 7540 | msgstr "" |
| 7541 | |
| 7542 | #: builtin/remote.c:27 |
| 7543 | msgid "git remote add [<options>] <name> <url>" |
| 7544 | msgstr "" |
| 7545 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7546 | #: builtin/remote.c:47 |
| 7547 | msgid "git remote set-branches <name> <branch>..." |
| 7548 | msgstr "" |
| 7549 | |
| 7550 | #: builtin/remote.c:48 |
| 7551 | msgid "git remote set-branches --add <name> <branch>..." |
| 7552 | msgstr "" |
| 7553 | |
| 7554 | #: builtin/remote.c:53 |
| 7555 | msgid "git remote show [<options>] <name>" |
| 7556 | msgstr "" |
| 7557 | |
| 7558 | #: builtin/remote.c:58 |
| 7559 | msgid "git remote prune [<options>] <name>" |
| 7560 | msgstr "" |
| 7561 | |
| 7562 | #: builtin/remote.c:63 |
| 7563 | msgid "git remote update [<options>] [<group> | <remote>]..." |
| 7564 | msgstr "" |
| 7565 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7566 | #: builtin/remote.c:98 |
| 7567 | #, c-format |
| 7568 | msgid "Updating %s" |
| 7569 | msgstr "" |
| 7570 | |
| 7571 | #: builtin/remote.c:130 |
| 7572 | msgid "" |
| 7573 | "--mirror is dangerous and deprecated; please\n" |
| 7574 | "\t use --mirror=fetch or --mirror=push instead" |
| 7575 | msgstr "" |
| 7576 | |
| 7577 | #: builtin/remote.c:147 |
| 7578 | #, c-format |
| 7579 | msgid "unknown mirror argument: %s" |
| 7580 | msgstr "" |
| 7581 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7582 | #: builtin/remote.c:163 |
| 7583 | msgid "fetch the remote branches" |
| 7584 | msgstr "" |
| 7585 | |
| 7586 | #: builtin/remote.c:165 |
| 7587 | msgid "import all tags and associated objects when fetching" |
| 7588 | msgstr "" |
| 7589 | |
| 7590 | #: builtin/remote.c:168 |
| 7591 | msgid "or do not fetch any tag at all (--no-tags)" |
| 7592 | msgstr "" |
| 7593 | |
| 7594 | #: builtin/remote.c:170 |
| 7595 | msgid "branch(es) to track" |
| 7596 | msgstr "" |
| 7597 | |
| 7598 | #: builtin/remote.c:171 |
| 7599 | msgid "master branch" |
| 7600 | msgstr "" |
| 7601 | |
| 7602 | #: builtin/remote.c:172 |
| 7603 | msgid "push|fetch" |
| 7604 | msgstr "" |
| 7605 | |
| 7606 | #: builtin/remote.c:173 |
| 7607 | msgid "set up remote as a mirror to push to or fetch from" |
| 7608 | msgstr "" |
| 7609 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7610 | #: builtin/remote.c:185 |
| 7611 | msgid "specifying a master branch makes no sense with --mirror" |
| 7612 | msgstr "" |
| 7613 | |
| 7614 | #: builtin/remote.c:187 |
| 7615 | msgid "specifying branches to track makes sense only with fetch mirrors" |
| 7616 | msgstr "" |
| 7617 | |
| 7618 | #: builtin/remote.c:195 builtin/remote.c:646 |
| 7619 | #, c-format |
| 7620 | msgid "remote %s already exists." |
| 7621 | msgstr "" |
| 7622 | |
| 7623 | #: builtin/remote.c:199 builtin/remote.c:650 |
| 7624 | #, c-format |
| 7625 | msgid "'%s' is not a valid remote name" |
| 7626 | msgstr "" |
| 7627 | |
| 7628 | #: builtin/remote.c:243 |
| 7629 | #, c-format |
| 7630 | msgid "Could not setup master '%s'" |
| 7631 | msgstr "" |
| 7632 | |
| 7633 | #: builtin/remote.c:299 |
| 7634 | #, c-format |
| 7635 | msgid "more than one %s" |
| 7636 | msgstr "" |
| 7637 | |
| 7638 | #: builtin/remote.c:339 |
| 7639 | #, c-format |
| 7640 | msgid "Could not get fetch map for refspec %s" |
| 7641 | msgstr "" |
| 7642 | |
| 7643 | #: builtin/remote.c:440 builtin/remote.c:448 |
| 7644 | msgid "(matching)" |
| 7645 | msgstr "" |
| 7646 | |
| 7647 | #: builtin/remote.c:452 |
| 7648 | msgid "(delete)" |
| 7649 | msgstr "" |
| 7650 | |
| 7651 | #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 |
| 7652 | #, c-format |
| 7653 | msgid "Could not append '%s' to '%s'" |
| 7654 | msgstr "" |
| 7655 | |
| 7656 | #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 |
| 7657 | #, c-format |
| 7658 | msgid "No such remote: %s" |
| 7659 | msgstr "" |
| 7660 | |
| 7661 | #: builtin/remote.c:656 |
| 7662 | #, c-format |
| 7663 | msgid "Could not rename config section '%s' to '%s'" |
| 7664 | msgstr "" |
| 7665 | |
| 7666 | #: builtin/remote.c:662 builtin/remote.c:799 |
| 7667 | #, c-format |
| 7668 | msgid "Could not remove config section '%s'" |
| 7669 | msgstr "" |
| 7670 | |
| 7671 | #: builtin/remote.c:677 |
| 7672 | #, c-format |
| 7673 | msgid "" |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 7674 | "Not updating non-default fetch refspec\n" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7675 | "\t%s\n" |
| 7676 | "\tPlease update the configuration manually if necessary." |
| 7677 | msgstr "" |
| 7678 | |
| 7679 | #: builtin/remote.c:683 |
| 7680 | #, c-format |
| 7681 | msgid "Could not append '%s'" |
| 7682 | msgstr "" |
| 7683 | |
| 7684 | #: builtin/remote.c:694 |
| 7685 | #, c-format |
| 7686 | msgid "Could not set '%s'" |
| 7687 | msgstr "" |
| 7688 | |
| 7689 | #: builtin/remote.c:716 |
| 7690 | #, c-format |
| 7691 | msgid "deleting '%s' failed" |
| 7692 | msgstr "" |
| 7693 | |
| 7694 | #: builtin/remote.c:750 |
| 7695 | #, c-format |
| 7696 | msgid "creating '%s' failed" |
| 7697 | msgstr "" |
| 7698 | |
| 7699 | #: builtin/remote.c:764 |
| 7700 | #, c-format |
| 7701 | msgid "Could not remove branch %s" |
| 7702 | msgstr "" |
| 7703 | |
| 7704 | #: builtin/remote.c:834 |
| 7705 | msgid "" |
| 7706 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" |
| 7707 | "to delete it, use:" |
| 7708 | msgid_plural "" |
| 7709 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" |
| 7710 | "to delete them, use:" |
| 7711 | msgstr[0] "" |
| 7712 | msgstr[1] "" |
| 7713 | |
| 7714 | #: builtin/remote.c:943 |
| 7715 | #, c-format |
| 7716 | msgid " new (next fetch will store in remotes/%s)" |
| 7717 | msgstr "" |
| 7718 | |
| 7719 | #: builtin/remote.c:946 |
| 7720 | msgid " tracked" |
| 7721 | msgstr "" |
| 7722 | |
| 7723 | #: builtin/remote.c:948 |
| 7724 | msgid " stale (use 'git remote prune' to remove)" |
| 7725 | msgstr "" |
| 7726 | |
| 7727 | #: builtin/remote.c:950 |
| 7728 | msgid " ???" |
| 7729 | msgstr "" |
| 7730 | |
| 7731 | #: builtin/remote.c:991 |
| 7732 | #, c-format |
| 7733 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" |
| 7734 | msgstr "" |
| 7735 | |
| 7736 | #: builtin/remote.c:998 |
| 7737 | #, c-format |
| 7738 | msgid "rebases onto remote %s" |
| 7739 | msgstr "" |
| 7740 | |
| 7741 | #: builtin/remote.c:1001 |
| 7742 | #, c-format |
| 7743 | msgid " merges with remote %s" |
| 7744 | msgstr "" |
| 7745 | |
| 7746 | #: builtin/remote.c:1002 |
| 7747 | msgid " and with remote" |
| 7748 | msgstr "" |
| 7749 | |
| 7750 | #: builtin/remote.c:1004 |
| 7751 | #, c-format |
| 7752 | msgid "merges with remote %s" |
| 7753 | msgstr "" |
| 7754 | |
| 7755 | #: builtin/remote.c:1005 |
| 7756 | msgid " and with remote" |
| 7757 | msgstr "" |
| 7758 | |
| 7759 | #: builtin/remote.c:1051 |
| 7760 | msgid "create" |
| 7761 | msgstr "" |
| 7762 | |
| 7763 | #: builtin/remote.c:1054 |
| 7764 | msgid "delete" |
| 7765 | msgstr "" |
| 7766 | |
| 7767 | #: builtin/remote.c:1058 |
| 7768 | msgid "up to date" |
| 7769 | msgstr "" |
| 7770 | |
| 7771 | #: builtin/remote.c:1061 |
| 7772 | msgid "fast-forwardable" |
| 7773 | msgstr "" |
| 7774 | |
| 7775 | #: builtin/remote.c:1064 |
| 7776 | msgid "local out of date" |
| 7777 | msgstr "" |
| 7778 | |
| 7779 | #: builtin/remote.c:1071 |
| 7780 | #, c-format |
| 7781 | msgid " %-*s forces to %-*s (%s)" |
| 7782 | msgstr "" |
| 7783 | |
| 7784 | #: builtin/remote.c:1074 |
| 7785 | #, c-format |
| 7786 | msgid " %-*s pushes to %-*s (%s)" |
| 7787 | msgstr "" |
| 7788 | |
| 7789 | #: builtin/remote.c:1078 |
| 7790 | #, c-format |
| 7791 | msgid " %-*s forces to %s" |
| 7792 | msgstr "" |
| 7793 | |
| 7794 | #: builtin/remote.c:1081 |
| 7795 | #, c-format |
| 7796 | msgid " %-*s pushes to %s" |
| 7797 | msgstr "" |
| 7798 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7799 | #: builtin/remote.c:1091 |
| 7800 | msgid "do not query remotes" |
| 7801 | msgstr "" |
| 7802 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7803 | #: builtin/remote.c:1118 |
| 7804 | #, c-format |
| 7805 | msgid "* remote %s" |
| 7806 | msgstr "" |
| 7807 | |
| 7808 | #: builtin/remote.c:1119 |
| 7809 | #, c-format |
| 7810 | msgid " Fetch URL: %s" |
| 7811 | msgstr "" |
| 7812 | |
| 7813 | #: builtin/remote.c:1120 builtin/remote.c:1285 |
| 7814 | msgid "(no URL)" |
| 7815 | msgstr "" |
| 7816 | |
| 7817 | #: builtin/remote.c:1129 builtin/remote.c:1131 |
| 7818 | #, c-format |
| 7819 | msgid " Push URL: %s" |
| 7820 | msgstr "" |
| 7821 | |
| 7822 | #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 |
| 7823 | #, c-format |
| 7824 | msgid " HEAD branch: %s" |
| 7825 | msgstr "" |
| 7826 | |
| 7827 | #: builtin/remote.c:1139 |
| 7828 | #, c-format |
| 7829 | msgid "" |
| 7830 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" |
| 7831 | msgstr "" |
| 7832 | |
| 7833 | #: builtin/remote.c:1151 |
| 7834 | #, c-format |
| 7835 | msgid " Remote branch:%s" |
| 7836 | msgid_plural " Remote branches:%s" |
| 7837 | msgstr[0] "" |
| 7838 | msgstr[1] "" |
| 7839 | |
| 7840 | #: builtin/remote.c:1154 builtin/remote.c:1181 |
| 7841 | msgid " (status not queried)" |
| 7842 | msgstr "" |
| 7843 | |
| 7844 | #: builtin/remote.c:1163 |
| 7845 | msgid " Local branch configured for 'git pull':" |
| 7846 | msgid_plural " Local branches configured for 'git pull':" |
| 7847 | msgstr[0] "" |
| 7848 | msgstr[1] "" |
| 7849 | |
| 7850 | #: builtin/remote.c:1171 |
| 7851 | msgid " Local refs will be mirrored by 'git push'" |
| 7852 | msgstr "" |
| 7853 | |
| 7854 | #: builtin/remote.c:1178 |
| 7855 | #, c-format |
| 7856 | msgid " Local ref configured for 'git push'%s:" |
| 7857 | msgid_plural " Local refs configured for 'git push'%s:" |
| 7858 | msgstr[0] "" |
| 7859 | msgstr[1] "" |
| 7860 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7861 | #: builtin/remote.c:1199 |
| 7862 | msgid "set refs/remotes/<name>/HEAD according to remote" |
| 7863 | msgstr "" |
| 7864 | |
| 7865 | #: builtin/remote.c:1201 |
| 7866 | msgid "delete refs/remotes/<name>/HEAD" |
| 7867 | msgstr "" |
| 7868 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7869 | #: builtin/remote.c:1216 |
| 7870 | msgid "Cannot determine remote HEAD" |
| 7871 | msgstr "" |
| 7872 | |
| 7873 | #: builtin/remote.c:1218 |
| 7874 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
| 7875 | msgstr "" |
| 7876 | |
| 7877 | #: builtin/remote.c:1228 |
| 7878 | #, c-format |
| 7879 | msgid "Could not delete %s" |
| 7880 | msgstr "" |
| 7881 | |
| 7882 | #: builtin/remote.c:1236 |
| 7883 | #, c-format |
| 7884 | msgid "Not a valid ref: %s" |
| 7885 | msgstr "" |
| 7886 | |
| 7887 | #: builtin/remote.c:1238 |
| 7888 | #, c-format |
| 7889 | msgid "Could not setup %s" |
| 7890 | msgstr "" |
| 7891 | |
| 7892 | #: builtin/remote.c:1274 |
| 7893 | #, c-format |
| 7894 | msgid " %s will become dangling!" |
| 7895 | msgstr "" |
| 7896 | |
| 7897 | #: builtin/remote.c:1275 |
| 7898 | #, c-format |
| 7899 | msgid " %s has become dangling!" |
| 7900 | msgstr "" |
| 7901 | |
| 7902 | #: builtin/remote.c:1281 |
| 7903 | #, c-format |
| 7904 | msgid "Pruning %s" |
| 7905 | msgstr "" |
| 7906 | |
| 7907 | #: builtin/remote.c:1282 |
| 7908 | #, c-format |
| 7909 | msgid "URL: %s" |
| 7910 | msgstr "" |
| 7911 | |
| 7912 | #: builtin/remote.c:1295 |
| 7913 | #, c-format |
| 7914 | msgid " * [would prune] %s" |
| 7915 | msgstr "" |
| 7916 | |
| 7917 | #: builtin/remote.c:1298 |
| 7918 | #, c-format |
| 7919 | msgid " * [pruned] %s" |
| 7920 | msgstr "" |
| 7921 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7922 | #: builtin/remote.c:1321 |
| 7923 | msgid "prune remotes after fetching" |
| 7924 | msgstr "" |
| 7925 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7926 | #: builtin/remote.c:1387 builtin/remote.c:1461 |
| 7927 | #, c-format |
| 7928 | msgid "No such remote '%s'" |
| 7929 | msgstr "" |
| 7930 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7931 | #: builtin/remote.c:1407 |
| 7932 | msgid "add branch" |
| 7933 | msgstr "" |
| 7934 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7935 | #: builtin/remote.c:1414 |
| 7936 | msgid "no remote specified" |
| 7937 | msgstr "" |
| 7938 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7939 | #: builtin/remote.c:1436 |
| 7940 | msgid "manipulate push URLs" |
| 7941 | msgstr "" |
| 7942 | |
| 7943 | #: builtin/remote.c:1438 |
| 7944 | msgid "add URL" |
| 7945 | msgstr "" |
| 7946 | |
| 7947 | #: builtin/remote.c:1440 |
| 7948 | msgid "delete URLs" |
| 7949 | msgstr "" |
| 7950 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 7951 | #: builtin/remote.c:1447 |
| 7952 | msgid "--add --delete doesn't make sense" |
| 7953 | msgstr "" |
| 7954 | |
| 7955 | #: builtin/remote.c:1487 |
| 7956 | #, c-format |
| 7957 | msgid "Invalid old URL pattern: %s" |
| 7958 | msgstr "" |
| 7959 | |
| 7960 | #: builtin/remote.c:1495 |
| 7961 | #, c-format |
| 7962 | msgid "No such URL found: %s" |
| 7963 | msgstr "" |
| 7964 | |
| 7965 | #: builtin/remote.c:1497 |
| 7966 | msgid "Will not delete all non-push URLs" |
| 7967 | msgstr "" |
| 7968 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7969 | #: builtin/remote.c:1569 |
| 7970 | msgid "be verbose; must be placed before a subcommand" |
| 7971 | msgstr "" |
| 7972 | |
| 7973 | #: builtin/replace.c:17 |
| 7974 | msgid "git replace [-f] <object> <replacement>" |
| 7975 | msgstr "" |
| 7976 | |
| 7977 | #: builtin/replace.c:18 |
| 7978 | msgid "git replace -d <object>..." |
| 7979 | msgstr "" |
| 7980 | |
| 7981 | #: builtin/replace.c:19 |
| 7982 | msgid "git replace -l [<pattern>]" |
| 7983 | msgstr "" |
| 7984 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7985 | #: builtin/replace.c:121 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7986 | msgid "list replace refs" |
| 7987 | msgstr "" |
| 7988 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7989 | #: builtin/replace.c:122 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7990 | msgid "delete replace refs" |
| 7991 | msgstr "" |
| 7992 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 7993 | #: builtin/replace.c:123 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 7994 | msgid "replace the ref if it exists" |
| 7995 | msgstr "" |
| 7996 | |
| 7997 | #: builtin/rerere.c:11 |
| 7998 | msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" |
| 7999 | msgstr "" |
| 8000 | |
| 8001 | #: builtin/rerere.c:56 |
| 8002 | msgid "register clean resolutions in index" |
| 8003 | msgstr "" |
| 8004 | |
| 8005 | #: builtin/reset.c:25 |
| 8006 | msgid "" |
| 8007 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" |
| 8008 | msgstr "" |
| 8009 | |
| 8010 | #: builtin/reset.c:26 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8011 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8012 | msgstr "" |
| 8013 | |
| 8014 | #: builtin/reset.c:27 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8015 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8016 | msgstr "" |
| 8017 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8018 | #: builtin/reset.c:33 |
| 8019 | msgid "mixed" |
| 8020 | msgstr "" |
| 8021 | |
| 8022 | #: builtin/reset.c:33 |
| 8023 | msgid "soft" |
| 8024 | msgstr "" |
| 8025 | |
| 8026 | #: builtin/reset.c:33 |
| 8027 | msgid "hard" |
| 8028 | msgstr "" |
| 8029 | |
| 8030 | #: builtin/reset.c:33 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8031 | msgid "merge" |
| 8032 | msgstr "" |
| 8033 | |
| 8034 | #: builtin/reset.c:33 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8035 | msgid "keep" |
| 8036 | msgstr "" |
| 8037 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8038 | #: builtin/reset.c:73 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8039 | msgid "You do not have a valid HEAD." |
| 8040 | msgstr "" |
| 8041 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8042 | #: builtin/reset.c:75 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8043 | msgid "Failed to find tree of HEAD." |
| 8044 | msgstr "" |
| 8045 | |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8046 | #: builtin/reset.c:81 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8047 | #, c-format |
| 8048 | msgid "Failed to find tree of %s." |
| 8049 | msgstr "" |
| 8050 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8051 | #: builtin/reset.c:99 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8052 | #, c-format |
| 8053 | msgid "HEAD is now at %s" |
| 8054 | msgstr "" |
| 8055 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8056 | #: builtin/reset.c:172 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8057 | #, c-format |
| 8058 | msgid "Cannot do a %s reset in the middle of a merge." |
| 8059 | msgstr "" |
| 8060 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8061 | #: builtin/reset.c:251 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8062 | msgid "be quiet, only report errors" |
| 8063 | msgstr "" |
| 8064 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8065 | #: builtin/reset.c:253 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8066 | msgid "reset HEAD and index" |
| 8067 | msgstr "" |
| 8068 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8069 | #: builtin/reset.c:254 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8070 | msgid "reset only HEAD" |
| 8071 | msgstr "" |
| 8072 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8073 | #: builtin/reset.c:256 builtin/reset.c:258 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8074 | msgid "reset HEAD, index and working tree" |
| 8075 | msgstr "" |
| 8076 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8077 | #: builtin/reset.c:260 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8078 | msgid "reset HEAD but keep local changes" |
| 8079 | msgstr "" |
| 8080 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8081 | #: builtin/reset.c:278 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8082 | #, c-format |
| 8083 | msgid "Failed to resolve '%s' as a valid revision." |
| 8084 | msgstr "" |
| 8085 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8086 | #: builtin/reset.c:281 builtin/reset.c:289 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8087 | #, c-format |
| 8088 | msgid "Could not parse object '%s'." |
| 8089 | msgstr "" |
| 8090 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8091 | #: builtin/reset.c:286 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8092 | #, c-format |
| 8093 | msgid "Failed to resolve '%s' as a valid tree." |
| 8094 | msgstr "" |
| 8095 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8096 | #: builtin/reset.c:295 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8097 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
| 8098 | msgstr "" |
| 8099 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8100 | #: builtin/reset.c:304 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8101 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
| 8102 | msgstr "" |
| 8103 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8104 | #: builtin/reset.c:306 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8105 | #, c-format |
| 8106 | msgid "Cannot do %s reset with paths." |
| 8107 | msgstr "" |
| 8108 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8109 | #: builtin/reset.c:316 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8110 | #, c-format |
| 8111 | msgid "%s reset is not allowed in a bare repository" |
| 8112 | msgstr "" |
| 8113 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8114 | #: builtin/reset.c:336 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8115 | #, c-format |
| 8116 | msgid "Could not reset index file to revision '%s'." |
| 8117 | msgstr "" |
| 8118 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8119 | #: builtin/reset.c:342 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8120 | msgid "Unstaged changes after reset:" |
| 8121 | msgstr "" |
| 8122 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8123 | #: builtin/reset.c:347 |
Jiang Xin | 46bc403 | 2013-01-25 12:33:58 +0800 | [diff] [blame] | 8124 | msgid "Could not write new index file." |
| 8125 | msgstr "" |
| 8126 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8127 | #: builtin/rev-parse.c:345 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8128 | msgid "git rev-parse --parseopt [options] -- [<args>...]" |
| 8129 | msgstr "" |
| 8130 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8131 | #: builtin/rev-parse.c:350 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8132 | msgid "keep the `--` passed as an arg" |
| 8133 | msgstr "" |
| 8134 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8135 | #: builtin/rev-parse.c:352 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8136 | msgid "stop parsing after the first non-option argument" |
| 8137 | msgstr "" |
| 8138 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8139 | #: builtin/rev-parse.c:470 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8140 | msgid "" |
| 8141 | "git rev-parse --parseopt [options] -- [<args>...]\n" |
| 8142 | " or: git rev-parse --sq-quote [<arg>...]\n" |
| 8143 | " or: git rev-parse [options] [<arg>...]\n" |
| 8144 | "\n" |
| 8145 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." |
| 8146 | msgstr "" |
| 8147 | |
| 8148 | #: builtin/revert.c:22 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8149 | msgid "git revert [options] <commit-ish>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8150 | msgstr "" |
| 8151 | |
| 8152 | #: builtin/revert.c:23 |
| 8153 | msgid "git revert <subcommand>" |
| 8154 | msgstr "" |
| 8155 | |
| 8156 | #: builtin/revert.c:28 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8157 | msgid "git cherry-pick [options] <commit-ish>..." |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8158 | msgstr "" |
| 8159 | |
| 8160 | #: builtin/revert.c:29 |
| 8161 | msgid "git cherry-pick <subcommand>" |
| 8162 | msgstr "" |
| 8163 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8164 | #: builtin/revert.c:71 builtin/revert.c:94 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8165 | #, c-format |
| 8166 | msgid "%s: %s cannot be used with %s" |
| 8167 | msgstr "" |
| 8168 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8169 | #: builtin/revert.c:105 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8170 | msgid "end revert or cherry-pick sequence" |
| 8171 | msgstr "" |
| 8172 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8173 | #: builtin/revert.c:106 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8174 | msgid "resume revert or cherry-pick sequence" |
| 8175 | msgstr "" |
| 8176 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8177 | #: builtin/revert.c:107 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8178 | msgid "cancel revert or cherry-pick sequence" |
| 8179 | msgstr "" |
| 8180 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8181 | #: builtin/revert.c:108 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8182 | msgid "don't automatically commit" |
| 8183 | msgstr "" |
| 8184 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8185 | #: builtin/revert.c:109 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8186 | msgid "edit the commit message" |
| 8187 | msgstr "" |
| 8188 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8189 | #: builtin/revert.c:112 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8190 | msgid "parent number" |
| 8191 | msgstr "" |
| 8192 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8193 | #: builtin/revert.c:114 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8194 | msgid "merge strategy" |
| 8195 | msgstr "" |
| 8196 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8197 | #: builtin/revert.c:115 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8198 | msgid "option" |
| 8199 | msgstr "" |
| 8200 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8201 | #: builtin/revert.c:116 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8202 | msgid "option for merge strategy" |
| 8203 | msgstr "" |
| 8204 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8205 | #: builtin/revert.c:127 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8206 | msgid "append commit name" |
| 8207 | msgstr "" |
| 8208 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8209 | #: builtin/revert.c:128 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8210 | msgid "allow fast-forward" |
| 8211 | msgstr "" |
| 8212 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8213 | #: builtin/revert.c:129 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8214 | msgid "preserve initially empty commits" |
| 8215 | msgstr "" |
| 8216 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8217 | #: builtin/revert.c:130 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8218 | msgid "allow commits with empty messages" |
| 8219 | msgstr "" |
| 8220 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8221 | #: builtin/revert.c:131 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8222 | msgid "keep redundant, empty commits" |
| 8223 | msgstr "" |
| 8224 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8225 | #: builtin/revert.c:135 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8226 | msgid "program error" |
| 8227 | msgstr "" |
| 8228 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8229 | #: builtin/revert.c:225 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8230 | msgid "revert failed" |
| 8231 | msgstr "" |
| 8232 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8233 | #: builtin/revert.c:240 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8234 | msgid "cherry-pick failed" |
| 8235 | msgstr "" |
| 8236 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8237 | #: builtin/rm.c:16 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8238 | msgid "git rm [options] [--] <file>..." |
| 8239 | msgstr "" |
| 8240 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8241 | #: builtin/rm.c:64 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8242 | msgid "" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8243 | "the following submodule (or one of its nested submodules)\n" |
| 8244 | "uses a .git directory:" |
| 8245 | msgid_plural "" |
| 8246 | "the following submodules (or one of its nested submodules)\n" |
| 8247 | "use a .git directory:" |
| 8248 | msgstr[0] "" |
| 8249 | msgstr[1] "" |
| 8250 | |
| 8251 | #: builtin/rm.c:70 |
| 8252 | msgid "" |
| 8253 | "\n" |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8254 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
| 8255 | msgstr "" |
| 8256 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8257 | #: builtin/rm.c:230 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8258 | msgid "" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8259 | "the following file has staged content different from both the\n" |
| 8260 | "file and the HEAD:" |
| 8261 | msgid_plural "" |
| 8262 | "the following files have staged content different from both the\n" |
| 8263 | "file and the HEAD:" |
| 8264 | msgstr[0] "" |
| 8265 | msgstr[1] "" |
| 8266 | |
| 8267 | #: builtin/rm.c:235 |
| 8268 | msgid "" |
| 8269 | "\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8270 | "(use -f to force removal)" |
| 8271 | msgstr "" |
| 8272 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8273 | #: builtin/rm.c:239 |
| 8274 | msgid "the following file has changes staged in the index:" |
| 8275 | msgid_plural "the following files have changes staged in the index:" |
| 8276 | msgstr[0] "" |
| 8277 | msgstr[1] "" |
| 8278 | |
| 8279 | #: builtin/rm.c:243 builtin/rm.c:254 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8280 | msgid "" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8281 | "\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8282 | "(use --cached to keep the file, or -f to force removal)" |
| 8283 | msgstr "" |
| 8284 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8285 | #: builtin/rm.c:251 |
| 8286 | msgid "the following file has local modifications:" |
| 8287 | msgid_plural "the following files have local modifications:" |
| 8288 | msgstr[0] "" |
| 8289 | msgstr[1] "" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8290 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8291 | #: builtin/rm.c:269 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8292 | msgid "do not list removed files" |
| 8293 | msgstr "" |
| 8294 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8295 | #: builtin/rm.c:270 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8296 | msgid "only remove from the index" |
| 8297 | msgstr "" |
| 8298 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8299 | #: builtin/rm.c:271 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8300 | msgid "override the up-to-date check" |
| 8301 | msgstr "" |
| 8302 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8303 | #: builtin/rm.c:272 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8304 | msgid "allow recursive removal" |
| 8305 | msgstr "" |
| 8306 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8307 | #: builtin/rm.c:274 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8308 | msgid "exit with a zero status even if nothing matched" |
| 8309 | msgstr "" |
| 8310 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8311 | #: builtin/rm.c:345 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8312 | #, c-format |
| 8313 | msgid "not removing '%s' recursively without -r" |
| 8314 | msgstr "" |
| 8315 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8316 | #: builtin/rm.c:384 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8317 | #, c-format |
| 8318 | msgid "git rm: unable to remove %s" |
| 8319 | msgstr "" |
| 8320 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8321 | #: builtin/shortlog.c:13 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8322 | msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8323 | msgstr "" |
| 8324 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8325 | #: builtin/shortlog.c:131 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8326 | #, c-format |
| 8327 | msgid "Missing author: %s" |
| 8328 | msgstr "" |
| 8329 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8330 | #: builtin/shortlog.c:228 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8331 | msgid "sort output according to the number of commits per author" |
| 8332 | msgstr "" |
| 8333 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8334 | #: builtin/shortlog.c:230 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8335 | msgid "Suppress commit descriptions, only provides commit count" |
| 8336 | msgstr "" |
| 8337 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8338 | #: builtin/shortlog.c:232 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8339 | msgid "Show the email address of each author" |
| 8340 | msgstr "" |
| 8341 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8342 | #: builtin/shortlog.c:233 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8343 | msgid "w[,i1[,i2]]" |
| 8344 | msgstr "" |
| 8345 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8346 | #: builtin/shortlog.c:234 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8347 | msgid "Linewrap output" |
| 8348 | msgstr "" |
| 8349 | |
| 8350 | #: builtin/show-branch.c:9 |
| 8351 | msgid "" |
| 8352 | "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" |
| 8353 | "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" |
| 8354 | "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " |
| 8355 | "<glob>)...]" |
| 8356 | msgstr "" |
| 8357 | |
| 8358 | #: builtin/show-branch.c:10 |
| 8359 | msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" |
| 8360 | msgstr "" |
| 8361 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8362 | #: builtin/show-branch.c:650 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8363 | msgid "show remote-tracking and local branches" |
| 8364 | msgstr "" |
| 8365 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8366 | #: builtin/show-branch.c:652 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8367 | msgid "show remote-tracking branches" |
| 8368 | msgstr "" |
| 8369 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8370 | #: builtin/show-branch.c:654 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8371 | msgid "color '*!+-' corresponding to the branch" |
| 8372 | msgstr "" |
| 8373 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8374 | #: builtin/show-branch.c:656 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8375 | msgid "show <n> more commits after the common ancestor" |
| 8376 | msgstr "" |
| 8377 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8378 | #: builtin/show-branch.c:658 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8379 | msgid "synonym to more=-1" |
| 8380 | msgstr "" |
| 8381 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8382 | #: builtin/show-branch.c:659 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8383 | msgid "suppress naming strings" |
| 8384 | msgstr "" |
| 8385 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8386 | #: builtin/show-branch.c:661 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8387 | msgid "include the current branch" |
| 8388 | msgstr "" |
| 8389 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8390 | #: builtin/show-branch.c:663 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8391 | msgid "name commits with their object names" |
| 8392 | msgstr "" |
| 8393 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8394 | #: builtin/show-branch.c:665 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8395 | msgid "show possible merge bases" |
| 8396 | msgstr "" |
| 8397 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8398 | #: builtin/show-branch.c:667 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8399 | msgid "show refs unreachable from any other ref" |
| 8400 | msgstr "" |
| 8401 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8402 | #: builtin/show-branch.c:669 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8403 | msgid "show commits in topological order" |
| 8404 | msgstr "" |
| 8405 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8406 | #: builtin/show-branch.c:672 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8407 | msgid "show only commits not on the first branch" |
| 8408 | msgstr "" |
| 8409 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8410 | #: builtin/show-branch.c:674 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8411 | msgid "show merges reachable from only one tip" |
| 8412 | msgstr "" |
| 8413 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8414 | #: builtin/show-branch.c:676 |
| 8415 | msgid "topologically sort, maintaining date order where possible" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8416 | msgstr "" |
| 8417 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8418 | #: builtin/show-branch.c:679 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8419 | msgid "<n>[,<base>]" |
| 8420 | msgstr "" |
| 8421 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8422 | #: builtin/show-branch.c:680 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8423 | msgid "show <n> most recent ref-log entries starting at base" |
| 8424 | msgstr "" |
| 8425 | |
| 8426 | #: builtin/show-ref.c:10 |
| 8427 | msgid "" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8428 | "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" |
| 8429 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8430 | msgstr "" |
| 8431 | |
| 8432 | #: builtin/show-ref.c:11 |
| 8433 | msgid "git show-ref --exclude-existing[=pattern] < ref-list" |
| 8434 | msgstr "" |
| 8435 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8436 | #: builtin/show-ref.c:168 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8437 | msgid "only show tags (can be combined with heads)" |
| 8438 | msgstr "" |
| 8439 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8440 | #: builtin/show-ref.c:169 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8441 | msgid "only show heads (can be combined with tags)" |
| 8442 | msgstr "" |
| 8443 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8444 | #: builtin/show-ref.c:170 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8445 | msgid "stricter reference checking, requires exact ref path" |
| 8446 | msgstr "" |
| 8447 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8448 | #: builtin/show-ref.c:173 builtin/show-ref.c:176 |
| 8449 | msgid "show the HEAD reference, even if it would be filtered out" |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8450 | msgstr "" |
| 8451 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8452 | #: builtin/show-ref.c:178 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8453 | msgid "dereference tags into object IDs" |
| 8454 | msgstr "" |
| 8455 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8456 | #: builtin/show-ref.c:180 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8457 | msgid "only show SHA1 hash using <n> digits" |
| 8458 | msgstr "" |
| 8459 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8460 | #: builtin/show-ref.c:184 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8461 | msgid "do not print results to stdout (useful with --verify)" |
| 8462 | msgstr "" |
| 8463 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8464 | #: builtin/show-ref.c:186 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8465 | msgid "show refs from stdin that aren't in local repository" |
| 8466 | msgstr "" |
| 8467 | |
| 8468 | #: builtin/symbolic-ref.c:7 |
| 8469 | msgid "git symbolic-ref [options] name [ref]" |
| 8470 | msgstr "" |
| 8471 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8472 | #: builtin/symbolic-ref.c:8 |
| 8473 | msgid "git symbolic-ref -d [-q] name" |
| 8474 | msgstr "" |
| 8475 | |
| 8476 | #: builtin/symbolic-ref.c:40 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8477 | msgid "suppress error message for non-symbolic (detached) refs" |
| 8478 | msgstr "" |
| 8479 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8480 | #: builtin/symbolic-ref.c:41 |
| 8481 | msgid "delete symbolic ref" |
| 8482 | msgstr "" |
| 8483 | |
| 8484 | #: builtin/symbolic-ref.c:42 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8485 | msgid "shorten ref output" |
| 8486 | msgstr "" |
| 8487 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8488 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8489 | msgid "reason" |
| 8490 | msgstr "" |
| 8491 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8492 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8493 | msgid "reason of the update" |
| 8494 | msgstr "" |
| 8495 | |
| 8496 | #: builtin/tag.c:22 |
| 8497 | msgid "" |
| 8498 | "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" |
| 8499 | msgstr "" |
| 8500 | |
| 8501 | #: builtin/tag.c:23 |
| 8502 | msgid "git tag -d <tagname>..." |
| 8503 | msgstr "" |
| 8504 | |
| 8505 | #: builtin/tag.c:24 |
| 8506 | msgid "" |
| 8507 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" |
| 8508 | "\t\t[<pattern>...]" |
| 8509 | msgstr "" |
| 8510 | |
| 8511 | #: builtin/tag.c:26 |
| 8512 | msgid "git tag -v <tagname>..." |
| 8513 | msgstr "" |
| 8514 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8515 | #: builtin/tag.c:60 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 8516 | #, c-format |
| 8517 | msgid "malformed object at '%s'" |
| 8518 | msgstr "" |
| 8519 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8520 | #: builtin/tag.c:207 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8521 | #, c-format |
| 8522 | msgid "tag name too long: %.*s..." |
| 8523 | msgstr "" |
| 8524 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8525 | #: builtin/tag.c:212 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8526 | #, c-format |
| 8527 | msgid "tag '%s' not found." |
| 8528 | msgstr "" |
| 8529 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8530 | #: builtin/tag.c:227 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8531 | #, c-format |
| 8532 | msgid "Deleted tag '%s' (was %s)\n" |
| 8533 | msgstr "" |
| 8534 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8535 | #: builtin/tag.c:239 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8536 | #, c-format |
| 8537 | msgid "could not verify the tag '%s'" |
| 8538 | msgstr "" |
| 8539 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8540 | #: builtin/tag.c:249 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8541 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8542 | msgid "" |
| 8543 | "\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8544 | "Write a tag message\n" |
| 8545 | "Lines starting with '%c' will be ignored.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8546 | msgstr "" |
| 8547 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8548 | #: builtin/tag.c:253 |
| 8549 | #, c-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8550 | msgid "" |
| 8551 | "\n" |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8552 | "Write a tag message\n" |
| 8553 | "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] | 8554 | "want to.\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8555 | msgstr "" |
| 8556 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8557 | #: builtin/tag.c:292 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8558 | msgid "unable to sign the tag" |
| 8559 | msgstr "" |
| 8560 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8561 | #: builtin/tag.c:294 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8562 | msgid "unable to write tag file" |
| 8563 | msgstr "" |
| 8564 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8565 | #: builtin/tag.c:319 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8566 | msgid "bad object type." |
| 8567 | msgstr "" |
| 8568 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8569 | #: builtin/tag.c:332 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8570 | msgid "tag header too big." |
| 8571 | msgstr "" |
| 8572 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8573 | #: builtin/tag.c:368 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8574 | msgid "no tag message?" |
| 8575 | msgstr "" |
| 8576 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8577 | #: builtin/tag.c:374 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8578 | #, c-format |
| 8579 | msgid "The tag message has been left in %s\n" |
| 8580 | msgstr "" |
| 8581 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8582 | #: builtin/tag.c:423 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 8583 | msgid "switch 'points-at' requires an object" |
| 8584 | msgstr "" |
| 8585 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8586 | #: builtin/tag.c:425 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 8587 | #, c-format |
| 8588 | msgid "malformed object name '%s'" |
| 8589 | msgstr "" |
| 8590 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8591 | #: builtin/tag.c:445 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8592 | msgid "list tag names" |
| 8593 | msgstr "" |
| 8594 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8595 | #: builtin/tag.c:447 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8596 | msgid "print <n> lines of each tag message" |
| 8597 | msgstr "" |
| 8598 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8599 | #: builtin/tag.c:449 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8600 | msgid "delete tags" |
| 8601 | msgstr "" |
| 8602 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8603 | #: builtin/tag.c:450 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8604 | msgid "verify tags" |
| 8605 | msgstr "" |
| 8606 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8607 | #: builtin/tag.c:452 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8608 | msgid "Tag creation options" |
| 8609 | msgstr "" |
| 8610 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8611 | #: builtin/tag.c:454 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8612 | msgid "annotated tag, needs a message" |
| 8613 | msgstr "" |
| 8614 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8615 | #: builtin/tag.c:456 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8616 | msgid "tag message" |
| 8617 | msgstr "" |
| 8618 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8619 | #: builtin/tag.c:458 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8620 | msgid "annotated and GPG-signed tag" |
| 8621 | msgstr "" |
| 8622 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8623 | #: builtin/tag.c:462 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8624 | msgid "use another key to sign the tag" |
| 8625 | msgstr "" |
| 8626 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8627 | #: builtin/tag.c:463 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8628 | msgid "replace the tag if exists" |
| 8629 | msgstr "" |
| 8630 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8631 | #: builtin/tag.c:464 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8632 | msgid "show tag list in columns" |
| 8633 | msgstr "" |
| 8634 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8635 | #: builtin/tag.c:466 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8636 | msgid "Tag listing options" |
| 8637 | msgstr "" |
| 8638 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8639 | #: builtin/tag.c:469 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8640 | msgid "print only tags that contain the commit" |
| 8641 | msgstr "" |
| 8642 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8643 | #: builtin/tag.c:475 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8644 | msgid "print only tags of the object" |
| 8645 | msgstr "" |
| 8646 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8647 | #: builtin/tag.c:504 |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8648 | msgid "--column and -n are incompatible" |
| 8649 | msgstr "" |
| 8650 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8651 | #: builtin/tag.c:521 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8652 | msgid "-n option is only allowed with -l." |
| 8653 | msgstr "" |
| 8654 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8655 | #: builtin/tag.c:523 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8656 | msgid "--contains option is only allowed with -l." |
| 8657 | msgstr "" |
| 8658 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8659 | #: builtin/tag.c:525 |
Jiang Xin | 1d4ac88 | 2012-02-28 12:24:20 +0800 | [diff] [blame] | 8660 | msgid "--points-at option is only allowed with -l." |
| 8661 | msgstr "" |
| 8662 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8663 | #: builtin/tag.c:533 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8664 | msgid "only one -F or -m option is allowed." |
| 8665 | msgstr "" |
| 8666 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8667 | #: builtin/tag.c:553 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8668 | msgid "too many params" |
| 8669 | msgstr "" |
| 8670 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8671 | #: builtin/tag.c:559 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8672 | #, c-format |
| 8673 | msgid "'%s' is not a valid tag name." |
| 8674 | msgstr "" |
| 8675 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8676 | #: builtin/tag.c:564 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8677 | #, c-format |
| 8678 | msgid "tag '%s' already exists" |
| 8679 | msgstr "" |
| 8680 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8681 | #: builtin/tag.c:582 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8682 | #, c-format |
| 8683 | msgid "%s: cannot lock the ref" |
| 8684 | msgstr "" |
| 8685 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8686 | #: builtin/tag.c:584 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8687 | #, c-format |
| 8688 | msgid "%s: cannot update the ref" |
| 8689 | msgstr "" |
| 8690 | |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8691 | #: builtin/tag.c:586 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8692 | #, c-format |
| 8693 | msgid "Updated tag '%s' (was %s)\n" |
| 8694 | msgstr "" |
| 8695 | |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8696 | #: builtin/update-index.c:401 |
| 8697 | msgid "git update-index [options] [--] [<file>...]" |
| 8698 | msgstr "" |
| 8699 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8700 | #: builtin/update-index.c:718 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8701 | msgid "continue refresh even when index needs update" |
| 8702 | msgstr "" |
| 8703 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8704 | #: builtin/update-index.c:721 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8705 | msgid "refresh: ignore submodules" |
| 8706 | msgstr "" |
| 8707 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8708 | #: builtin/update-index.c:724 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8709 | msgid "do not ignore new files" |
| 8710 | msgstr "" |
| 8711 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8712 | #: builtin/update-index.c:726 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8713 | msgid "let files replace directories and vice-versa" |
| 8714 | msgstr "" |
| 8715 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8716 | #: builtin/update-index.c:728 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8717 | msgid "notice files missing from worktree" |
| 8718 | msgstr "" |
| 8719 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8720 | #: builtin/update-index.c:730 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8721 | msgid "refresh even if index contains unmerged entries" |
| 8722 | msgstr "" |
| 8723 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8724 | #: builtin/update-index.c:733 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8725 | msgid "refresh stat information" |
| 8726 | msgstr "" |
| 8727 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8728 | #: builtin/update-index.c:737 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8729 | msgid "like --refresh, but ignore assume-unchanged setting" |
| 8730 | msgstr "" |
| 8731 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8732 | #: builtin/update-index.c:741 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8733 | msgid "<mode> <object> <path>" |
| 8734 | msgstr "" |
| 8735 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8736 | #: builtin/update-index.c:742 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8737 | msgid "add the specified entry to the index" |
| 8738 | msgstr "" |
| 8739 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8740 | #: builtin/update-index.c:746 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8741 | msgid "(+/-)x" |
| 8742 | msgstr "" |
| 8743 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8744 | #: builtin/update-index.c:747 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8745 | msgid "override the executable bit of the listed files" |
| 8746 | msgstr "" |
| 8747 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8748 | #: builtin/update-index.c:751 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8749 | msgid "mark files as \"not changing\"" |
| 8750 | msgstr "" |
| 8751 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8752 | #: builtin/update-index.c:754 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8753 | msgid "clear assumed-unchanged bit" |
| 8754 | msgstr "" |
| 8755 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8756 | #: builtin/update-index.c:757 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8757 | msgid "mark files as \"index-only\"" |
| 8758 | msgstr "" |
| 8759 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8760 | #: builtin/update-index.c:760 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8761 | msgid "clear skip-worktree bit" |
| 8762 | msgstr "" |
| 8763 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8764 | #: builtin/update-index.c:763 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8765 | msgid "add to index only; do not add content to object database" |
| 8766 | msgstr "" |
| 8767 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8768 | #: builtin/update-index.c:765 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8769 | msgid "remove named paths even if present in worktree" |
| 8770 | msgstr "" |
| 8771 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8772 | #: builtin/update-index.c:767 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8773 | msgid "with --stdin: input lines are terminated by null bytes" |
| 8774 | msgstr "" |
| 8775 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8776 | #: builtin/update-index.c:769 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8777 | msgid "read list of paths to be updated from standard input" |
| 8778 | msgstr "" |
| 8779 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8780 | #: builtin/update-index.c:773 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8781 | msgid "add entries from standard input to the index" |
| 8782 | msgstr "" |
| 8783 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8784 | #: builtin/update-index.c:777 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8785 | msgid "repopulate stages #2 and #3 for the listed paths" |
| 8786 | msgstr "" |
| 8787 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8788 | #: builtin/update-index.c:781 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8789 | msgid "only update entries that differ from HEAD" |
| 8790 | msgstr "" |
| 8791 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8792 | #: builtin/update-index.c:785 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8793 | msgid "ignore files missing from worktree" |
| 8794 | msgstr "" |
| 8795 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8796 | #: builtin/update-index.c:788 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8797 | msgid "report actions to standard output" |
| 8798 | msgstr "" |
| 8799 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8800 | #: builtin/update-index.c:790 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8801 | msgid "(for porcelains) forget saved unresolved conflicts" |
| 8802 | msgstr "" |
| 8803 | |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 8804 | #: builtin/update-index.c:794 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 8805 | msgid "write index in this format" |
| 8806 | msgstr "" |
| 8807 | |
| 8808 | #: builtin/update-ref.c:7 |
| 8809 | msgid "git update-ref [options] -d <refname> [<oldval>]" |
| 8810 | msgstr "" |
| 8811 | |
| 8812 | #: builtin/update-ref.c:8 |
| 8813 | msgid "git update-ref [options] <refname> <newval> [<oldval>]" |
| 8814 | msgstr "" |
| 8815 | |
| 8816 | #: builtin/update-ref.c:19 |
| 8817 | msgid "delete the reference" |
| 8818 | msgstr "" |
| 8819 | |
| 8820 | #: builtin/update-ref.c:21 |
| 8821 | msgid "update <refname> not the one it points to" |
| 8822 | msgstr "" |
| 8823 | |
| 8824 | #: builtin/update-server-info.c:6 |
| 8825 | msgid "git update-server-info [--force]" |
| 8826 | msgstr "" |
| 8827 | |
| 8828 | #: builtin/update-server-info.c:14 |
| 8829 | msgid "update the info files from scratch" |
| 8830 | msgstr "" |
| 8831 | |
| 8832 | #: builtin/verify-pack.c:56 |
| 8833 | msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." |
| 8834 | msgstr "" |
| 8835 | |
| 8836 | #: builtin/verify-pack.c:66 |
| 8837 | msgid "verbose" |
| 8838 | msgstr "" |
| 8839 | |
| 8840 | #: builtin/verify-pack.c:68 |
| 8841 | msgid "show statistics only" |
| 8842 | msgstr "" |
| 8843 | |
| 8844 | #: builtin/verify-tag.c:17 |
| 8845 | msgid "git verify-tag [-v|--verbose] <tag>..." |
| 8846 | msgstr "" |
| 8847 | |
| 8848 | #: builtin/verify-tag.c:73 |
| 8849 | msgid "print tag contents" |
| 8850 | msgstr "" |
| 8851 | |
| 8852 | #: builtin/write-tree.c:13 |
| 8853 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
| 8854 | msgstr "" |
| 8855 | |
| 8856 | #: builtin/write-tree.c:26 |
| 8857 | msgid "<prefix>/" |
| 8858 | msgstr "" |
| 8859 | |
| 8860 | #: builtin/write-tree.c:27 |
| 8861 | msgid "write tree object for a subdirectory <prefix>" |
| 8862 | msgstr "" |
| 8863 | |
| 8864 | #: builtin/write-tree.c:30 |
| 8865 | msgid "only useful for debugging" |
| 8866 | msgstr "" |
| 8867 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8868 | #: git.c:17 |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 8869 | msgid "" |
| 8870 | "'git help -a' and 'git help -g' lists available subcommands and some\n" |
| 8871 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
| 8872 | "to read about a specific subcommand or concept." |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8873 | msgstr "" |
| 8874 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8875 | #: parse-options.h:144 |
| 8876 | msgid "expiry date" |
| 8877 | msgstr "" |
| 8878 | |
| 8879 | #: parse-options.h:159 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 8880 | msgid "no-op (backward compatibility)" |
| 8881 | msgstr "" |
| 8882 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8883 | #: parse-options.h:236 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 8884 | msgid "be more verbose" |
| 8885 | msgstr "" |
| 8886 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8887 | #: parse-options.h:238 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 8888 | msgid "be more quiet" |
| 8889 | msgstr "" |
| 8890 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8891 | #: parse-options.h:244 |
Jiang Xin | 6f6731e | 2012-05-21 09:00:39 +0800 | [diff] [blame] | 8892 | msgid "use <n> digits to display SHA-1s" |
| 8893 | msgstr "" |
| 8894 | |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8895 | #: common-cmds.h:8 |
| 8896 | msgid "Add file contents to the index" |
| 8897 | msgstr "" |
| 8898 | |
| 8899 | #: common-cmds.h:9 |
| 8900 | msgid "Find by binary search the change that introduced a bug" |
| 8901 | msgstr "" |
| 8902 | |
| 8903 | #: common-cmds.h:10 |
| 8904 | msgid "List, create, or delete branches" |
| 8905 | msgstr "" |
| 8906 | |
| 8907 | #: common-cmds.h:11 |
| 8908 | msgid "Checkout a branch or paths to the working tree" |
| 8909 | msgstr "" |
| 8910 | |
| 8911 | #: common-cmds.h:12 |
| 8912 | msgid "Clone a repository into a new directory" |
| 8913 | msgstr "" |
| 8914 | |
| 8915 | #: common-cmds.h:13 |
| 8916 | msgid "Record changes to the repository" |
| 8917 | msgstr "" |
| 8918 | |
| 8919 | #: common-cmds.h:14 |
| 8920 | msgid "Show changes between commits, commit and working tree, etc" |
| 8921 | msgstr "" |
| 8922 | |
| 8923 | #: common-cmds.h:15 |
| 8924 | msgid "Download objects and refs from another repository" |
| 8925 | msgstr "" |
| 8926 | |
| 8927 | #: common-cmds.h:16 |
| 8928 | msgid "Print lines matching a pattern" |
| 8929 | msgstr "" |
| 8930 | |
| 8931 | #: common-cmds.h:17 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 8932 | msgid "Create an empty Git repository or reinitialize an existing one" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8933 | msgstr "" |
| 8934 | |
| 8935 | #: common-cmds.h:18 |
| 8936 | msgid "Show commit logs" |
| 8937 | msgstr "" |
| 8938 | |
| 8939 | #: common-cmds.h:19 |
| 8940 | msgid "Join two or more development histories together" |
| 8941 | msgstr "" |
| 8942 | |
| 8943 | #: common-cmds.h:20 |
| 8944 | msgid "Move or rename a file, a directory, or a symlink" |
| 8945 | msgstr "" |
| 8946 | |
| 8947 | #: common-cmds.h:21 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8948 | msgid "Fetch from and integrate with another repository or a local branch" |
Jiang Xin | 822e4a6 | 2012-05-08 16:10:22 +0800 | [diff] [blame] | 8949 | msgstr "" |
| 8950 | |
| 8951 | #: common-cmds.h:22 |
| 8952 | msgid "Update remote refs along with associated objects" |
| 8953 | msgstr "" |
| 8954 | |
| 8955 | #: common-cmds.h:23 |
| 8956 | msgid "Forward-port local commits to the updated upstream head" |
| 8957 | msgstr "" |
| 8958 | |
| 8959 | #: common-cmds.h:24 |
| 8960 | msgid "Reset current HEAD to the specified state" |
| 8961 | msgstr "" |
| 8962 | |
| 8963 | #: common-cmds.h:25 |
| 8964 | msgid "Remove files from the working tree and from the index" |
| 8965 | msgstr "" |
| 8966 | |
| 8967 | #: common-cmds.h:26 |
| 8968 | msgid "Show various types of objects" |
| 8969 | msgstr "" |
| 8970 | |
| 8971 | #: common-cmds.h:27 |
| 8972 | msgid "Show the working tree status" |
| 8973 | msgstr "" |
| 8974 | |
| 8975 | #: common-cmds.h:28 |
| 8976 | msgid "Create, list, delete or verify a tag object signed with GPG" |
| 8977 | msgstr "" |
| 8978 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 8979 | #: git-am.sh:50 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 8980 | msgid "You need to set your committer info first" |
| 8981 | msgstr "" |
| 8982 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8983 | #: git-am.sh:95 |
| 8984 | msgid "" |
| 8985 | "You seem to have moved HEAD since the last 'am' failure.\n" |
| 8986 | "Not rewinding to ORIG_HEAD" |
| 8987 | msgstr "" |
| 8988 | |
| 8989 | #: git-am.sh:105 |
| 8990 | #, sh-format |
| 8991 | msgid "" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 8992 | "When you have resolved this problem, run \"$cmdline --continue\".\n" |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 8993 | "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" |
| 8994 | "To restore the original branch and stop patching, run \"$cmdline --abort\"." |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 8995 | msgstr "" |
| 8996 | |
| 8997 | #: git-am.sh:121 |
| 8998 | msgid "Cannot fall back to three-way merge." |
| 8999 | msgstr "" |
| 9000 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9001 | #: git-am.sh:137 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9002 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
| 9003 | msgstr "" |
| 9004 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9005 | #: git-am.sh:139 |
| 9006 | msgid "Using index info to reconstruct a base tree..." |
| 9007 | msgstr "" |
| 9008 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9009 | #: git-am.sh:154 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9010 | msgid "" |
| 9011 | "Did you hand edit your patch?\n" |
| 9012 | "It does not apply to blobs recorded in its index." |
| 9013 | msgstr "" |
| 9014 | |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9015 | #: git-am.sh:163 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9016 | msgid "Falling back to patching base and 3-way merge..." |
| 9017 | msgstr "" |
| 9018 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9019 | #: git-am.sh:179 |
| 9020 | msgid "Failed to merge in the changes." |
| 9021 | msgstr "" |
| 9022 | |
| 9023 | #: git-am.sh:274 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9024 | msgid "Only one StGIT patch series can be applied at once" |
| 9025 | msgstr "" |
| 9026 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9027 | #: git-am.sh:361 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9028 | #, sh-format |
| 9029 | msgid "Patch format $patch_format is not supported." |
| 9030 | msgstr "" |
| 9031 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9032 | #: git-am.sh:363 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9033 | msgid "Patch format detection failed." |
| 9034 | msgstr "" |
| 9035 | |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9036 | #: git-am.sh:389 |
| 9037 | msgid "" |
| 9038 | "The -b/--binary option has been a no-op for long time, and\n" |
| 9039 | "it will be removed. Please do not use it anymore." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9040 | msgstr "" |
| 9041 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9042 | #: git-am.sh:479 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9043 | #, sh-format |
| 9044 | msgid "previous rebase directory $dotest still exists but mbox given." |
| 9045 | msgstr "" |
| 9046 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9047 | #: git-am.sh:484 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9048 | msgid "Please make up your mind. --skip or --abort?" |
| 9049 | msgstr "" |
| 9050 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9051 | #: git-am.sh:520 |
| 9052 | #, sh-format |
| 9053 | msgid "" |
| 9054 | "Stray $dotest directory found.\n" |
| 9055 | "Use \"git am --abort\" to remove it." |
| 9056 | msgstr "" |
| 9057 | |
| 9058 | #: git-am.sh:528 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9059 | msgid "Resolve operation not in progress, we are not resuming." |
| 9060 | msgstr "" |
| 9061 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9062 | #: git-am.sh:594 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9063 | #, sh-format |
| 9064 | msgid "Dirty index: cannot apply patches (dirty: $files)" |
| 9065 | msgstr "" |
| 9066 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9067 | #: git-am.sh:698 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9068 | #, sh-format |
| 9069 | msgid "" |
| 9070 | "Patch is empty. Was it split wrong?\n" |
| 9071 | "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" |
| 9072 | "To restore the original branch and stop patching run \"$cmdline --abort\"." |
| 9073 | msgstr "" |
| 9074 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9075 | #: git-am.sh:725 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9076 | msgid "Patch does not have a valid e-mail address." |
| 9077 | msgstr "" |
| 9078 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9079 | #: git-am.sh:772 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9080 | msgid "cannot be interactive without stdin connected to a terminal." |
| 9081 | msgstr "" |
| 9082 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9083 | #: git-am.sh:776 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9084 | msgid "Commit Body is:" |
| 9085 | msgstr "" |
| 9086 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9087 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
| 9088 | #. in your translation. The program will only accept English |
| 9089 | #. input at this point. |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9090 | #: git-am.sh:783 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9091 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
| 9092 | msgstr "" |
| 9093 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9094 | #: git-am.sh:819 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9095 | #, sh-format |
| 9096 | msgid "Applying: $FIRSTLINE" |
| 9097 | msgstr "" |
| 9098 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9099 | #: git-am.sh:840 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9100 | msgid "" |
| 9101 | "No changes - did you forget to use 'git add'?\n" |
| 9102 | "If there is nothing left to stage, chances are that something else\n" |
| 9103 | "already introduced the same changes; you might want to skip this patch." |
| 9104 | msgstr "" |
| 9105 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9106 | #: git-am.sh:848 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9107 | msgid "" |
| 9108 | "You still have unmerged paths in your index\n" |
| 9109 | "did you forget to use 'git add'?" |
| 9110 | msgstr "" |
| 9111 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9112 | #: git-am.sh:864 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9113 | msgid "No changes -- Patch already applied." |
| 9114 | msgstr "" |
| 9115 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9116 | #: git-am.sh:874 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9117 | #, sh-format |
| 9118 | msgid "Patch failed at $msgnum $FIRSTLINE" |
| 9119 | msgstr "" |
| 9120 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9121 | #: git-am.sh:877 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 9122 | #, sh-format |
| 9123 | msgid "" |
| 9124 | "The copy of the patch that failed is found in:\n" |
| 9125 | " $dotest/patch" |
| 9126 | msgstr "" |
| 9127 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9128 | #: git-am.sh:895 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9129 | msgid "applying to an empty history" |
| 9130 | msgstr "" |
| 9131 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9132 | #: git-bisect.sh:48 |
| 9133 | msgid "You need to start by \"git bisect start\"" |
| 9134 | msgstr "" |
| 9135 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9136 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
| 9137 | #. translation. The program will only accept English input |
| 9138 | #. at this point. |
| 9139 | #: git-bisect.sh:54 |
| 9140 | msgid "Do you want me to do it for you [Y/n]? " |
| 9141 | msgstr "" |
| 9142 | |
| 9143 | #: git-bisect.sh:95 |
| 9144 | #, sh-format |
| 9145 | msgid "unrecognised option: '$arg'" |
| 9146 | msgstr "" |
| 9147 | |
| 9148 | #: git-bisect.sh:99 |
| 9149 | #, sh-format |
| 9150 | msgid "'$arg' does not appear to be a valid revision" |
| 9151 | msgstr "" |
| 9152 | |
| 9153 | #: git-bisect.sh:117 |
| 9154 | msgid "Bad HEAD - I need a HEAD" |
| 9155 | msgstr "" |
| 9156 | |
| 9157 | #: git-bisect.sh:130 |
| 9158 | #, sh-format |
| 9159 | msgid "" |
| 9160 | "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." |
| 9161 | msgstr "" |
| 9162 | |
| 9163 | #: git-bisect.sh:140 |
| 9164 | msgid "won't bisect on seeked tree" |
| 9165 | msgstr "" |
| 9166 | |
| 9167 | #: git-bisect.sh:144 |
| 9168 | msgid "Bad HEAD - strange symbolic ref" |
| 9169 | msgstr "" |
| 9170 | |
| 9171 | #: git-bisect.sh:189 |
| 9172 | #, sh-format |
| 9173 | msgid "Bad bisect_write argument: $state" |
| 9174 | msgstr "" |
| 9175 | |
| 9176 | #: git-bisect.sh:218 |
| 9177 | #, sh-format |
| 9178 | msgid "Bad rev input: $arg" |
| 9179 | msgstr "" |
| 9180 | |
| 9181 | #: git-bisect.sh:232 |
| 9182 | msgid "Please call 'bisect_state' with at least one argument." |
| 9183 | msgstr "" |
| 9184 | |
| 9185 | #: git-bisect.sh:244 |
| 9186 | #, sh-format |
| 9187 | msgid "Bad rev input: $rev" |
| 9188 | msgstr "" |
| 9189 | |
| 9190 | #: git-bisect.sh:250 |
| 9191 | msgid "'git bisect bad' can take only one argument." |
| 9192 | msgstr "" |
| 9193 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9194 | #. have bad but not good. we could bisect although |
| 9195 | #. this is less optimum. |
| 9196 | #: git-bisect.sh:273 |
| 9197 | msgid "Warning: bisecting only with a bad commit." |
| 9198 | msgstr "" |
| 9199 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9200 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
| 9201 | #. translation. The program will only accept English input |
| 9202 | #. at this point. |
| 9203 | #: git-bisect.sh:279 |
| 9204 | msgid "Are you sure [Y/n]? " |
| 9205 | msgstr "" |
| 9206 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9207 | #: git-bisect.sh:289 |
| 9208 | msgid "" |
| 9209 | "You need to give me at least one good and one bad revisions.\n" |
| 9210 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
| 9211 | msgstr "" |
| 9212 | |
| 9213 | #: git-bisect.sh:292 |
| 9214 | msgid "" |
| 9215 | "You need to start by \"git bisect start\".\n" |
| 9216 | "You then need to give me at least one good and one bad revisions.\n" |
| 9217 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
| 9218 | msgstr "" |
| 9219 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9220 | #: git-bisect.sh:363 git-bisect.sh:490 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9221 | msgid "We are not bisecting." |
| 9222 | msgstr "" |
| 9223 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9224 | #: git-bisect.sh:370 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9225 | #, sh-format |
| 9226 | msgid "'$invalid' is not a valid commit" |
| 9227 | msgstr "" |
| 9228 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9229 | #: git-bisect.sh:379 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9230 | #, sh-format |
| 9231 | msgid "" |
| 9232 | "Could not check out original HEAD '$branch'.\n" |
| 9233 | "Try 'git bisect reset <commit>'." |
| 9234 | msgstr "" |
| 9235 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9236 | #: git-bisect.sh:406 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9237 | msgid "No logfile given" |
| 9238 | msgstr "" |
| 9239 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9240 | #: git-bisect.sh:407 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9241 | #, sh-format |
| 9242 | msgid "cannot read $file for replaying" |
| 9243 | msgstr "" |
| 9244 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9245 | #: git-bisect.sh:424 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9246 | msgid "?? what are you talking about?" |
| 9247 | msgstr "" |
| 9248 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9249 | #: git-bisect.sh:436 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9250 | #, sh-format |
| 9251 | msgid "running $command" |
| 9252 | msgstr "" |
| 9253 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9254 | #: git-bisect.sh:443 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9255 | #, sh-format |
| 9256 | msgid "" |
| 9257 | "bisect run failed:\n" |
| 9258 | "exit code $res from '$command' is < 0 or >= 128" |
| 9259 | msgstr "" |
| 9260 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9261 | #: git-bisect.sh:469 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9262 | msgid "bisect run cannot continue any more" |
| 9263 | msgstr "" |
| 9264 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9265 | #: git-bisect.sh:475 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9266 | #, sh-format |
| 9267 | msgid "" |
| 9268 | "bisect run failed:\n" |
| 9269 | "'bisect_state $state' exited with error code $res" |
| 9270 | msgstr "" |
| 9271 | |
Jiang Xin | c6bc7d4 | 2013-04-30 08:31:19 +0800 | [diff] [blame] | 9272 | #: git-bisect.sh:482 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9273 | msgid "bisect run success" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9274 | msgstr "" |
| 9275 | |
| 9276 | #: git-pull.sh:21 |
| 9277 | msgid "" |
| 9278 | "Pull is not possible because you have unmerged files.\n" |
| 9279 | "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" |
| 9280 | "as appropriate to mark resolution, or use 'git commit -a'." |
| 9281 | msgstr "" |
| 9282 | |
| 9283 | #: git-pull.sh:25 |
| 9284 | msgid "Pull is not possible because you have unmerged files." |
| 9285 | msgstr "" |
| 9286 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9287 | #: git-pull.sh:203 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9288 | msgid "updating an unborn branch with changes added to the index" |
| 9289 | msgstr "" |
| 9290 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9291 | #. The fetch involved updating the current branch. |
| 9292 | #. The working tree and the index file is still based on the |
| 9293 | #. $orig_head commit, but we are merging into $curr_head. |
| 9294 | #. First update the working tree to match $curr_head. |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9295 | #: git-pull.sh:235 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9296 | #, sh-format |
| 9297 | msgid "" |
| 9298 | "Warning: fetch updated the current branch head.\n" |
| 9299 | "Warning: fast-forwarding your working tree from\n" |
| 9300 | "Warning: commit $orig_head." |
| 9301 | msgstr "" |
| 9302 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9303 | #: git-pull.sh:260 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9304 | msgid "Cannot merge multiple branches into empty head" |
| 9305 | msgstr "" |
| 9306 | |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9307 | #: git-pull.sh:264 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9308 | msgid "Cannot rebase onto multiple branches" |
| 9309 | msgstr "" |
| 9310 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9311 | #: git-rebase.sh:54 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9312 | msgid "" |
| 9313 | "When you have resolved this problem, run \"git rebase --continue\".\n" |
| 9314 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" |
| 9315 | "To check out the original branch and stop rebasing, run \"git rebase --abort" |
| 9316 | "\"." |
| 9317 | msgstr "" |
| 9318 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9319 | #: git-rebase.sh:156 |
| 9320 | msgid "Applied autostash." |
| 9321 | msgstr "" |
| 9322 | |
| 9323 | #: git-rebase.sh:159 |
| 9324 | #, sh-format |
| 9325 | msgid "Cannot store $stash_sha1" |
| 9326 | msgstr "" |
| 9327 | |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9328 | #: git-rebase.sh:160 |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9329 | msgid "" |
| 9330 | "Applying autostash resulted in conflicts.\n" |
| 9331 | "Your changes are safe in the stash.\n" |
Jiang Xin | b8ecf23 | 2013-08-06 14:13:23 +0800 | [diff] [blame] | 9332 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9333 | msgstr "" |
| 9334 | |
| 9335 | #: git-rebase.sh:190 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9336 | msgid "The pre-rebase hook refused to rebase." |
| 9337 | msgstr "" |
| 9338 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9339 | #: git-rebase.sh:195 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9340 | msgid "It looks like git-am is in progress. Cannot rebase." |
| 9341 | msgstr "" |
| 9342 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9343 | #: git-rebase.sh:329 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9344 | msgid "The --exec option must be used with the --interactive option" |
| 9345 | msgstr "" |
| 9346 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9347 | #: git-rebase.sh:334 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9348 | msgid "No rebase in progress?" |
| 9349 | msgstr "" |
| 9350 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9351 | #: git-rebase.sh:345 |
Jiang Xin | 9306b5b | 2012-10-16 08:39:10 +0800 | [diff] [blame] | 9352 | msgid "The --edit-todo action can only be used during interactive rebase." |
| 9353 | msgstr "" |
| 9354 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9355 | #: git-rebase.sh:352 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9356 | msgid "Cannot read HEAD" |
| 9357 | msgstr "" |
| 9358 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9359 | #: git-rebase.sh:355 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9360 | msgid "" |
| 9361 | "You must edit all merge conflicts and then\n" |
| 9362 | "mark them as resolved using git add" |
| 9363 | msgstr "" |
| 9364 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9365 | #: git-rebase.sh:373 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9366 | #, sh-format |
| 9367 | msgid "Could not move back to $head_name" |
| 9368 | msgstr "" |
| 9369 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9370 | #: git-rebase.sh:392 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9371 | #, sh-format |
| 9372 | msgid "" |
| 9373 | "It seems that there is already a $state_dir_base directory, and\n" |
| 9374 | "I wonder if you are in the middle of another rebase. If that is the\n" |
| 9375 | "case, please try\n" |
| 9376 | "\t$cmd_live_rebase\n" |
| 9377 | "If that is not the case, please\n" |
| 9378 | "\t$cmd_clear_stale_rebase\n" |
| 9379 | "and run me again. I am stopping in case you still have something\n" |
| 9380 | "valuable there." |
| 9381 | msgstr "" |
| 9382 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9383 | #: git-rebase.sh:437 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9384 | #, sh-format |
| 9385 | msgid "invalid upstream $upstream_name" |
| 9386 | msgstr "" |
| 9387 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9388 | #: git-rebase.sh:461 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9389 | #, sh-format |
| 9390 | msgid "$onto_name: there are more than one merge bases" |
| 9391 | msgstr "" |
| 9392 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9393 | #: git-rebase.sh:464 git-rebase.sh:468 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9394 | #, sh-format |
| 9395 | msgid "$onto_name: there is no merge base" |
| 9396 | msgstr "" |
| 9397 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9398 | #: git-rebase.sh:473 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9399 | #, sh-format |
| 9400 | msgid "Does not point to a valid commit: $onto_name" |
| 9401 | msgstr "" |
| 9402 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9403 | #: git-rebase.sh:496 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9404 | #, sh-format |
| 9405 | msgid "fatal: no such branch: $branch_name" |
| 9406 | msgstr "" |
| 9407 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9408 | #: git-rebase.sh:519 |
| 9409 | msgid "Cannot autostash" |
| 9410 | msgstr "" |
| 9411 | |
| 9412 | #: git-rebase.sh:524 |
| 9413 | #, sh-format |
| 9414 | msgid "Created autostash: $stash_abbrev" |
| 9415 | msgstr "" |
| 9416 | |
| 9417 | #: git-rebase.sh:528 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9418 | msgid "Please commit or stash them." |
| 9419 | msgstr "" |
| 9420 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9421 | #: git-rebase.sh:548 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9422 | #, sh-format |
| 9423 | msgid "Current branch $branch_name is up to date." |
| 9424 | msgstr "" |
| 9425 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9426 | #: git-rebase.sh:552 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9427 | #, sh-format |
| 9428 | msgid "Current branch $branch_name is up to date, rebase forced." |
| 9429 | msgstr "" |
| 9430 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9431 | #: git-rebase.sh:563 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9432 | #, sh-format |
| 9433 | msgid "Changes from $mb to $onto:" |
| 9434 | msgstr "" |
| 9435 | |
| 9436 | #. Detach HEAD and reset the tree |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9437 | #: git-rebase.sh:572 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9438 | msgid "First, rewinding head to replay your work on top of it..." |
| 9439 | msgstr "" |
| 9440 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9441 | #: git-rebase.sh:582 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9442 | #, sh-format |
| 9443 | msgid "Fast-forwarded $branch_name to $onto_name." |
| 9444 | msgstr "" |
| 9445 | |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9446 | #: git-stash.sh:51 |
| 9447 | msgid "git stash clear with parameters is unimplemented" |
| 9448 | msgstr "" |
| 9449 | |
| 9450 | #: git-stash.sh:74 |
| 9451 | msgid "You do not have the initial commit yet" |
| 9452 | msgstr "" |
| 9453 | |
| 9454 | #: git-stash.sh:89 |
| 9455 | msgid "Cannot save the current index state" |
| 9456 | msgstr "" |
| 9457 | |
| 9458 | #: git-stash.sh:123 git-stash.sh:136 |
| 9459 | msgid "Cannot save the current worktree state" |
| 9460 | msgstr "" |
| 9461 | |
| 9462 | #: git-stash.sh:140 |
| 9463 | msgid "No changes selected" |
| 9464 | msgstr "" |
| 9465 | |
| 9466 | #: git-stash.sh:143 |
| 9467 | msgid "Cannot remove temporary index (can't happen)" |
| 9468 | msgstr "" |
| 9469 | |
| 9470 | #: git-stash.sh:156 |
| 9471 | msgid "Cannot record working tree state" |
| 9472 | msgstr "" |
| 9473 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9474 | #: git-stash.sh:190 |
| 9475 | #, sh-format |
| 9476 | msgid "Cannot update $ref_stash with $w_commit" |
| 9477 | msgstr "" |
| 9478 | |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9479 | #. TRANSLATORS: $option is an invalid option, like |
| 9480 | #. `--blah-blah'. The 7 spaces at the beginning of the |
| 9481 | #. second line correspond to "error: ". So you should line |
| 9482 | #. up the second line with however many characters the |
| 9483 | #. translation of "error: " takes in your language. E.g. in |
| 9484 | #. English this is: |
| 9485 | #. |
| 9486 | #. $ git stash save --blah-blah 2>&1 | head -n 2 |
| 9487 | #. error: unknown option for 'stash save': --blah-blah |
| 9488 | #. To provide a message, use git stash save -- '--blah-blah' |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9489 | #: git-stash.sh:241 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9490 | #, sh-format |
| 9491 | msgid "" |
| 9492 | "error: unknown option for 'stash save': $option\n" |
| 9493 | " To provide a message, use git stash save -- '$option'" |
| 9494 | msgstr "" |
| 9495 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9496 | #: git-stash.sh:262 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9497 | msgid "No local changes to save" |
| 9498 | msgstr "" |
| 9499 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9500 | #: git-stash.sh:268 |
| 9501 | msgid "" |
| 9502 | "The following untracked files would NOT be saved but need to be removed by " |
| 9503 | "stash save:" |
| 9504 | msgstr "" |
| 9505 | |
| 9506 | #: git-stash.sh:270 |
| 9507 | msgid "" |
| 9508 | "Aborting. Consider using either the --force or --include-untracked option." |
| 9509 | msgstr "" |
| 9510 | |
| 9511 | #: git-stash.sh:274 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9512 | msgid "Cannot initialize stash" |
| 9513 | msgstr "" |
| 9514 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9515 | #: git-stash.sh:278 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9516 | msgid "Cannot save the current status" |
| 9517 | msgstr "" |
| 9518 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9519 | #: git-stash.sh:296 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9520 | msgid "Cannot remove worktree changes" |
| 9521 | msgstr "" |
| 9522 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9523 | #: git-stash.sh:395 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9524 | msgid "No stash found." |
| 9525 | msgstr "" |
| 9526 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9527 | #: git-stash.sh:402 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9528 | #, sh-format |
| 9529 | msgid "Too many revisions specified: $REV" |
| 9530 | msgstr "" |
| 9531 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9532 | #: git-stash.sh:408 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9533 | #, sh-format |
| 9534 | msgid "$reference is not valid reference" |
| 9535 | msgstr "" |
| 9536 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9537 | #: git-stash.sh:436 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9538 | #, sh-format |
| 9539 | msgid "'$args' is not a stash-like commit" |
| 9540 | msgstr "" |
| 9541 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9542 | #: git-stash.sh:447 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9543 | #, sh-format |
| 9544 | msgid "'$args' is not a stash reference" |
| 9545 | msgstr "" |
| 9546 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9547 | #: git-stash.sh:455 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9548 | msgid "unable to refresh index" |
| 9549 | msgstr "" |
| 9550 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9551 | #: git-stash.sh:459 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9552 | msgid "Cannot apply a stash in the middle of a merge" |
| 9553 | msgstr "" |
| 9554 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9555 | #: git-stash.sh:467 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9556 | msgid "Conflicts in index. Try without --index." |
| 9557 | msgstr "" |
| 9558 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9559 | #: git-stash.sh:469 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9560 | msgid "Could not save index tree" |
| 9561 | msgstr "" |
| 9562 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9563 | #: git-stash.sh:503 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9564 | msgid "Cannot unstage modified files" |
| 9565 | msgstr "" |
| 9566 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9567 | #: git-stash.sh:518 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9568 | msgid "Index was not unstashed." |
| 9569 | msgstr "" |
| 9570 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9571 | #: git-stash.sh:535 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9572 | #, sh-format |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 9573 | msgid "Dropped ${REV} ($s)" |
| 9574 | msgstr "" |
| 9575 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9576 | #: git-stash.sh:536 |
Jiang Xin | cc76011 | 2012-09-15 10:26:13 +0800 | [diff] [blame] | 9577 | #, sh-format |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9578 | msgid "${REV}: Could not drop stash entry" |
| 9579 | msgstr "" |
| 9580 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9581 | #: git-stash.sh:543 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9582 | msgid "No branch name specified" |
| 9583 | msgstr "" |
| 9584 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9585 | #: git-stash.sh:615 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9586 | msgid "(To restore them type \"git stash apply\")" |
| 9587 | msgstr "" |
| 9588 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9589 | #: git-submodule.sh:95 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9590 | #, sh-format |
| 9591 | msgid "cannot strip one component off url '$remoteurl'" |
| 9592 | msgstr "" |
| 9593 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9594 | #: git-submodule.sh:237 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9595 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9596 | msgid "No submodule mapping found in .gitmodules for path '$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9597 | msgstr "" |
| 9598 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9599 | #: git-submodule.sh:281 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9600 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9601 | msgid "Clone of '$url' into submodule path '$sm_path' failed" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9602 | msgstr "" |
| 9603 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9604 | #: git-submodule.sh:293 |
Jiang Xin | a2c01b5 | 2012-03-16 20:28:05 +0800 | [diff] [blame] | 9605 | #, sh-format |
| 9606 | msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" |
| 9607 | msgstr "" |
| 9608 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9609 | #: git-submodule.sh:403 |
| 9610 | msgid "Relative path can only be used from the toplevel of the working tree" |
| 9611 | msgstr "" |
| 9612 | |
| 9613 | #: git-submodule.sh:413 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9614 | #, sh-format |
| 9615 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" |
| 9616 | msgstr "" |
| 9617 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9618 | #: git-submodule.sh:430 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9619 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9620 | msgid "'$sm_path' already exists in the index" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9621 | msgstr "" |
| 9622 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9623 | #: git-submodule.sh:434 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9624 | #, sh-format |
| 9625 | msgid "" |
| 9626 | "The following path is ignored by one of your .gitignore files:\n" |
| 9627 | "$sm_path\n" |
| 9628 | "Use -f if you really want to add it." |
| 9629 | msgstr "" |
| 9630 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9631 | #: git-submodule.sh:452 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9632 | #, sh-format |
| 9633 | msgid "Adding existing repo at '$sm_path' to the index" |
| 9634 | msgstr "" |
| 9635 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9636 | #: git-submodule.sh:454 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9637 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9638 | msgid "'$sm_path' already exists and is not a valid git repo" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9639 | msgstr "" |
| 9640 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9641 | #: git-submodule.sh:462 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9642 | #, sh-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9643 | msgid "A git directory for '$sm_name' is found locally with remote(s):" |
| 9644 | msgstr "" |
| 9645 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9646 | #: git-submodule.sh:464 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9647 | #, sh-format |
| 9648 | msgid "" |
| 9649 | "If you want to reuse this local git directory instead of cloning again from" |
| 9650 | msgstr "" |
| 9651 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9652 | #: git-submodule.sh:466 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9653 | #, sh-format |
| 9654 | msgid "" |
| 9655 | "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] | 9656 | msgstr "" |
| 9657 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9658 | #: git-submodule.sh:467 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9659 | #, sh-format |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9660 | msgid "" |
| 9661 | "or you are unsure what this means choose another name with the '--name' " |
| 9662 | "option." |
| 9663 | msgstr "" |
| 9664 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9665 | #: git-submodule.sh:469 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9666 | #, sh-format |
| 9667 | msgid "Reactivating local git directory for submodule '$sm_name'." |
| 9668 | msgstr "" |
| 9669 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9670 | #: git-submodule.sh:481 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9671 | #, sh-format |
| 9672 | msgid "Unable to checkout submodule '$sm_path'" |
| 9673 | msgstr "" |
| 9674 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9675 | #: git-submodule.sh:486 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9676 | #, sh-format |
| 9677 | msgid "Failed to add submodule '$sm_path'" |
| 9678 | msgstr "" |
| 9679 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9680 | #: git-submodule.sh:495 |
Jiang Xin | fe52cd6 | 2012-11-23 14:29:02 +0800 | [diff] [blame] | 9681 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9682 | msgid "Failed to register submodule '$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9683 | msgstr "" |
| 9684 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9685 | #: git-submodule.sh:539 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9686 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9687 | msgid "Entering '$prefix$displaypath'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9688 | msgstr "" |
| 9689 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9690 | #: git-submodule.sh:554 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9691 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9692 | msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9693 | msgstr "" |
| 9694 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9695 | #: git-submodule.sh:600 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9696 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9697 | msgid "No url found for submodule path '$displaypath' in .gitmodules" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9698 | msgstr "" |
| 9699 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9700 | #: git-submodule.sh:609 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9701 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9702 | msgid "Failed to register url for submodule path '$displaypath'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9703 | msgstr "" |
| 9704 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9705 | #: git-submodule.sh:611 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9706 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9707 | msgid "Submodule '$name' ($url) registered for path '$displaypath'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9708 | msgstr "" |
| 9709 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9710 | #: git-submodule.sh:619 |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 9711 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9712 | msgid "Failed to register update mode for submodule path '$displaypath'" |
Jiang Xin | 75f7b4b | 2012-06-02 07:07:27 +0800 | [diff] [blame] | 9713 | msgstr "" |
| 9714 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9715 | #: git-submodule.sh:656 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9716 | #, sh-format |
| 9717 | msgid "Use '.' if you really want to deinitialize all submodules" |
| 9718 | msgstr "" |
| 9719 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9720 | #: git-submodule.sh:673 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9721 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9722 | msgid "Submodule work tree '$displaypath' contains a .git directory" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9723 | msgstr "" |
| 9724 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9725 | #: git-submodule.sh:674 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9726 | #, sh-format |
| 9727 | msgid "" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9728 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
| 9729 | msgstr "" |
| 9730 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9731 | #: git-submodule.sh:680 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9732 | #, sh-format |
| 9733 | msgid "" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9734 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9735 | "discard them" |
| 9736 | msgstr "" |
| 9737 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9738 | #: git-submodule.sh:683 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9739 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9740 | msgid "Cleared directory '$displaypath'" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9741 | msgstr "" |
| 9742 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9743 | #: git-submodule.sh:684 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9744 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9745 | msgid "Could not remove submodule work tree '$displaypath'" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9746 | msgstr "" |
| 9747 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9748 | #: git-submodule.sh:687 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9749 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9750 | msgid "Could not create empty submodule directory '$displaypath'" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9751 | msgstr "" |
| 9752 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9753 | #: git-submodule.sh:696 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9754 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9755 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9756 | msgstr "" |
| 9757 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9758 | #: git-submodule.sh:811 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9759 | #, sh-format |
| 9760 | msgid "" |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9761 | "Submodule path '$displaypath' not initialized\n" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9762 | "Maybe you want to use 'update --init'?" |
| 9763 | msgstr "" |
| 9764 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9765 | #: git-submodule.sh:824 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9766 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9767 | msgid "Unable to find current revision in submodule path '$displaypath'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9768 | msgstr "" |
| 9769 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9770 | #: git-submodule.sh:833 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9771 | #, sh-format |
Jiang Xin | cd1e748 | 2012-04-28 20:27:01 +0800 | [diff] [blame] | 9772 | msgid "Unable to fetch in submodule path '$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9773 | msgstr "" |
| 9774 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9775 | #: git-submodule.sh:857 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9776 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9777 | msgid "Unable to fetch in submodule path '$displaypath'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9778 | msgstr "" |
| 9779 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9780 | #: git-submodule.sh:871 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9781 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9782 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9783 | msgstr "" |
| 9784 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9785 | #: git-submodule.sh:872 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9786 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9787 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9788 | msgstr "" |
| 9789 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9790 | #: git-submodule.sh:877 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9791 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9792 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9793 | msgstr "" |
| 9794 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9795 | #: git-submodule.sh:878 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9796 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9797 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9798 | msgstr "" |
| 9799 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9800 | #: git-submodule.sh:883 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9801 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9802 | msgid "" |
| 9803 | "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9804 | msgstr "" |
| 9805 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9806 | #: git-submodule.sh:884 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9807 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9808 | msgid "Submodule path '$prefix$sm_path': '$command $sha1'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9809 | msgstr "" |
| 9810 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9811 | #: git-submodule.sh:889 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9812 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9813 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9814 | msgstr "" |
| 9815 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9816 | #: git-submodule.sh:890 |
| 9817 | #, sh-format |
| 9818 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
| 9819 | msgstr "" |
| 9820 | |
| 9821 | #: git-submodule.sh:917 |
| 9822 | #, sh-format |
| 9823 | msgid "Failed to recurse into submodule path '$displaypath'" |
| 9824 | msgstr "" |
| 9825 | |
| 9826 | #: git-submodule.sh:1025 |
Jiang Xin | 3b6137f | 2012-08-02 09:35:23 +0800 | [diff] [blame] | 9827 | msgid "The --cached option cannot be used with the --files option" |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9828 | msgstr "" |
| 9829 | |
| 9830 | #. unexpected type |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9831 | #: git-submodule.sh:1066 |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9832 | #, sh-format |
| 9833 | msgid "unexpected mode $mod_dst" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9834 | msgstr "" |
| 9835 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9836 | #: git-submodule.sh:1086 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9837 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9838 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9839 | msgstr "" |
| 9840 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9841 | #: git-submodule.sh:1089 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9842 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9843 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9844 | msgstr "" |
| 9845 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9846 | #: git-submodule.sh:1092 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9847 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9848 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9849 | msgstr "" |
| 9850 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9851 | #: git-submodule.sh:1117 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9852 | msgid "blob" |
| 9853 | msgstr "" |
| 9854 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9855 | #: git-submodule.sh:1155 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 9856 | msgid "Submodules changed but not updated:" |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9857 | msgstr "" |
| 9858 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9859 | #: git-submodule.sh:1157 |
Jiang Xin | 9caaf23 | 2013-02-14 14:49:45 +0800 | [diff] [blame] | 9860 | msgid "Submodule changes to be committed:" |
Jiang Xin | 7256fd7 | 2012-06-08 10:40:20 +0800 | [diff] [blame] | 9861 | msgstr "" |
| 9862 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9863 | #: git-submodule.sh:1242 |
Jiang Xin | c138af5 | 2013-04-10 15:19:54 +0800 | [diff] [blame] | 9864 | #, sh-format |
| 9865 | msgid "Failed to recurse into submodule path '$sm_path'" |
| 9866 | msgstr "" |
| 9867 | |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9868 | #: git-submodule.sh:1306 |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9869 | #, sh-format |
Jiang Xin | 28b3cff | 2013-07-26 08:56:45 +0800 | [diff] [blame] | 9870 | msgid "Synchronizing submodule url for '$displaypath'" |
Jiang Xin | dce37b6 | 2012-02-13 14:37:59 +0800 | [diff] [blame] | 9871 | msgstr "" |