Merge lp:~jr/bzr/i18n-topic-help into lp:bzr
- i18n-topic-help
- Merge into bzr.dev
Proposed by
Jonathan Riddell
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6135 |
Proposed branch: | lp:~jr/bzr/i18n-topic-help |
Merge into: | lp:bzr |
Prerequisite: | lp:~jr/bzr/i18n-errors |
Diff against target: |
10852 lines (+6566/-818) 4 files modified
bzrlib/export_pot.py (+7/-3) bzrlib/help_topics/__init__.py (+3/-0) bzrlib/tests/test_i18n.py (+9/-0) po/bzr.pot (+6547/-815) |
To merge this branch: | bzr merge lp:~jr/bzr/i18n-topic-help |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Review via email: mp+73653@code.launchpad.net |
This proposal supersedes a proposal from 2011-09-01.
Commit message
Turn on translations for help topics.
Description of the change
Add topic help to translations (bzr.pot will be updated before sending to PQM)
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
Revision history for this message
Jonathan Riddell (jr) wrote : | # |
> Should this also be guarded against initializing i18n twice?
No need since https:/
Revision history for this message
Jelmer Vernooij (jelmer) : | # |
review:
Approve
Revision history for this message
Jelmer Vernooij (jelmer) wrote : | # |
sent to pqm by email
Revision history for this message
Jonathan Riddell (jr) wrote : | # |
sent to pqm by email
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'bzrlib/export_pot.py' | |||
2 | --- bzrlib/export_pot.py 2011-05-28 12:17:22 +0000 | |||
3 | +++ bzrlib/export_pot.py 2011-09-07 14:35:33 +0000 | |||
4 | @@ -28,6 +28,7 @@ | |||
5 | 28 | errors, | 28 | errors, |
6 | 29 | help_topics, | 29 | help_topics, |
7 | 30 | plugin, | 30 | plugin, |
8 | 31 | help, | ||
9 | 31 | ) | 32 | ) |
10 | 32 | from bzrlib.trace import ( | 33 | from bzrlib.trace import ( |
11 | 33 | mutter, | 34 | mutter, |
12 | @@ -234,7 +235,11 @@ | |||
13 | 234 | outf, | 235 | outf, |
14 | 235 | 'dummy/help_topics/'+key+'/detail.txt', | 236 | 'dummy/help_topics/'+key+'/detail.txt', |
15 | 236 | 1, doc) | 237 | 1, doc) |
17 | 237 | 238 | elif callable(doc): # help topics from files | |
18 | 239 | _poentry_per_paragraph( | ||
19 | 240 | outf, | ||
20 | 241 | 'en/help_topics/'+key+'.txt', | ||
21 | 242 | 1, doc(key)) | ||
22 | 238 | summary = topic_registry.get_summary(key) | 243 | summary = topic_registry.get_summary(key) |
23 | 239 | if summary is not None: | 244 | if summary is not None: |
24 | 240 | _poentry(outf, 'dummy/help_topics/'+key+'/summary.txt', | 245 | _poentry(outf, 'dummy/help_topics/'+key+'/summary.txt', |
25 | @@ -246,5 +251,4 @@ | |||
26 | 246 | _standard_options(outf) | 251 | _standard_options(outf) |
27 | 247 | _command_helps(outf) | 252 | _command_helps(outf) |
28 | 248 | _error_messages(outf) | 253 | _error_messages(outf) |
31 | 249 | # disable exporting help topics until we decide how to translate it. | 254 | _help_topics(outf) |
30 | 250 | #_help_topics(outf) | ||
32 | 251 | 255 | ||
33 | === modified file 'bzrlib/help_topics/__init__.py' | |||
34 | --- bzrlib/help_topics/__init__.py 2011-08-24 18:42:15 +0000 | |||
35 | +++ bzrlib/help_topics/__init__.py 2011-09-07 14:35:33 +0000 | |||
36 | @@ -40,6 +40,7 @@ | |||
37 | 40 | config, | 40 | config, |
38 | 41 | osutils, | 41 | osutils, |
39 | 42 | registry, | 42 | registry, |
40 | 43 | i18n, | ||
41 | 43 | ) | 44 | ) |
42 | 44 | 45 | ||
43 | 45 | 46 | ||
44 | @@ -879,6 +880,8 @@ | |||
45 | 879 | result += _format_see_also(additional_see_also) | 880 | result += _format_see_also(additional_see_also) |
46 | 880 | if plain: | 881 | if plain: |
47 | 881 | result = help_as_plain_text(result) | 882 | result = help_as_plain_text(result) |
48 | 883 | i18n.install() | ||
49 | 884 | result = i18n.gettext_per_paragraph(result) | ||
50 | 882 | return result | 885 | return result |
51 | 883 | 886 | ||
52 | 884 | def get_help_topic(self): | 887 | def get_help_topic(self): |
53 | 885 | 888 | ||
54 | === modified file 'bzrlib/tests/test_i18n.py' | |||
55 | --- bzrlib/tests/test_i18n.py 2011-09-07 10:50:09 +0000 | |||
56 | +++ bzrlib/tests/test_i18n.py 2011-09-07 14:35:33 +0000 | |||
57 | @@ -125,3 +125,12 @@ | |||
58 | 125 | except errors.NotBranchError,e: | 125 | except errors.NotBranchError,e: |
59 | 126 | err = str(e) | 126 | err = str(e) |
60 | 127 | self.assertContainsRe(err, u"zz\xe5{{Not a branch: .*}}".encode("utf-8")) | 127 | self.assertContainsRe(err, u"zz\xe5{{Not a branch: .*}}".encode("utf-8")) |
61 | 128 | def test_topic_help_translation(self): | ||
62 | 129 | """does topic help get translated?""" | ||
63 | 130 | from bzrlib import help | ||
64 | 131 | i18n.install() | ||
65 | 132 | self.overrideAttr(i18n, '_translations', ZzzTranslations()) | ||
66 | 133 | from StringIO import StringIO | ||
67 | 134 | out = StringIO() | ||
68 | 135 | help.help("authentication", out) | ||
69 | 136 | self.assertContainsRe(out.getvalue(), "zz\xe5{{Authentication Settings") | ||
70 | 128 | 137 | ||
71 | === modified file 'po/bzr.pot' | |||
72 | --- po/bzr.pot 2011-08-24 14:14:42 +0000 | |||
73 | +++ po/bzr.pot 2011-09-07 14:35:33 +0000 | |||
74 | @@ -8,7 +8,7 @@ | |||
75 | 8 | msgstr "" | 8 | msgstr "" |
76 | 9 | "Project-Id-Version: bzr\n" | 9 | "Project-Id-Version: bzr\n" |
77 | 10 | "Report-Msgid-Bugs-To: <bazaar@canonical.com>\n" | 10 | "Report-Msgid-Bugs-To: <bazaar@canonical.com>\n" |
79 | 11 | "POT-Creation-Date: 2011-08-24 15:14+0100\n" | 11 | "POT-Creation-Date: 2011-09-07 15:32+0100\n" |
80 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
81 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
82 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
83 | @@ -327,7 +327,7 @@ | |||
84 | 327 | #: bzrlib/builtins.py:979 | 327 | #: bzrlib/builtins.py:979 |
85 | 328 | msgid "" | 328 | msgid "" |
86 | 329 | "If there is no default location set, the first pull will set it (use\n" | 329 | "If there is no default location set, the first pull will set it (use\n" |
88 | 330 | "--no-remember to avoid settting it). After that, you can omit the\n" | 330 | "--no-remember to avoid setting it). After that, you can omit the\n" |
89 | 331 | "location to use the default. To change the default, use --remember. The\n" | 331 | "location to use the default. To change the default, use --remember. The\n" |
90 | 332 | "value will only be saved if the remote location can be accessed." | 332 | "value will only be saved if the remote location can be accessed." |
91 | 333 | msgstr "" | 333 | msgstr "" |
92 | @@ -357,72 +357,72 @@ | |||
93 | 357 | "master branch." | 357 | "master branch." |
94 | 358 | msgstr "" | 358 | msgstr "" |
95 | 359 | 359 | ||
97 | 360 | #: bzrlib/builtins.py:1097 | 360 | #: bzrlib/builtins.py:1096 |
98 | 361 | msgid "Update a mirror of this branch." | 361 | msgid "Update a mirror of this branch." |
99 | 362 | msgstr "" | 362 | msgstr "" |
100 | 363 | 363 | ||
102 | 364 | #: bzrlib/builtins.py:1099 | 364 | #: bzrlib/builtins.py:1098 |
103 | 365 | msgid "" | 365 | msgid "" |
104 | 366 | "The target branch will not have its working tree populated because this\n" | 366 | "The target branch will not have its working tree populated because this\n" |
105 | 367 | "is both expensive, and is not supported on remote file systems." | 367 | "is both expensive, and is not supported on remote file systems." |
106 | 368 | msgstr "" | 368 | msgstr "" |
107 | 369 | 369 | ||
109 | 370 | #: bzrlib/builtins.py:1102 | 370 | #: bzrlib/builtins.py:1101 |
110 | 371 | msgid "" | 371 | msgid "" |
111 | 372 | "Some smart servers or protocols *may* put the working tree in place in\n" | 372 | "Some smart servers or protocols *may* put the working tree in place in\n" |
112 | 373 | "the future." | 373 | "the future." |
113 | 374 | msgstr "" | 374 | msgstr "" |
114 | 375 | 375 | ||
116 | 376 | #: bzrlib/builtins.py:1105 | 376 | #: bzrlib/builtins.py:1104 |
117 | 377 | msgid "" | 377 | msgid "" |
118 | 378 | "This command only works on branches that have not diverged. Branches are\n" | 378 | "This command only works on branches that have not diverged. Branches are\n" |
119 | 379 | "considered diverged if the destination branch's most recent commit is one\n" | 379 | "considered diverged if the destination branch's most recent commit is one\n" |
120 | 380 | "that has not been merged (directly or indirectly) by the source branch." | 380 | "that has not been merged (directly or indirectly) by the source branch." |
121 | 381 | msgstr "" | 381 | msgstr "" |
122 | 382 | 382 | ||
124 | 383 | #: bzrlib/builtins.py:1109 | 383 | #: bzrlib/builtins.py:1108 |
125 | 384 | msgid "" | 384 | msgid "" |
126 | 385 | "If branches have diverged, you can use 'bzr push --overwrite' to replace\n" | 385 | "If branches have diverged, you can use 'bzr push --overwrite' to replace\n" |
127 | 386 | "the other branch completely, discarding its unmerged changes." | 386 | "the other branch completely, discarding its unmerged changes." |
128 | 387 | msgstr "" | 387 | msgstr "" |
129 | 388 | 388 | ||
131 | 389 | #: bzrlib/builtins.py:1112 | 389 | #: bzrlib/builtins.py:1111 |
132 | 390 | msgid "" | 390 | msgid "" |
133 | 391 | "If you want to ensure you have the different changes in the other branch,\n" | 391 | "If you want to ensure you have the different changes in the other branch,\n" |
134 | 392 | "do a merge (see bzr help merge) from the other branch, and commit that.\n" | 392 | "do a merge (see bzr help merge) from the other branch, and commit that.\n" |
135 | 393 | "After that you will be able to do a push without '--overwrite'." | 393 | "After that you will be able to do a push without '--overwrite'." |
136 | 394 | msgstr "" | 394 | msgstr "" |
137 | 395 | 395 | ||
139 | 396 | #: bzrlib/builtins.py:1116 | 396 | #: bzrlib/builtins.py:1115 |
140 | 397 | msgid "" | 397 | msgid "" |
141 | 398 | "If there is no default push location set, the first push will set it (use\n" | 398 | "If there is no default push location set, the first push will set it (use\n" |
143 | 399 | "--no-remember to avoid settting it). After that, you can omit the\n" | 399 | "--no-remember to avoid setting it). After that, you can omit the\n" |
144 | 400 | "location to use the default. To change the default, use --remember. The\n" | 400 | "location to use the default. To change the default, use --remember. The\n" |
145 | 401 | "value will only be saved if the remote location can be accessed." | 401 | "value will only be saved if the remote location can be accessed." |
146 | 402 | msgstr "" | 402 | msgstr "" |
147 | 403 | 403 | ||
148 | 404 | # help of 'directory' option of 'push' command | 404 | # help of 'directory' option of 'push' command |
150 | 405 | #: bzrlib/builtins.py:1128 | 405 | #: bzrlib/builtins.py:1127 |
151 | 406 | msgid "" | 406 | msgid "" |
152 | 407 | "Branch to push from, rather than the one containing the working directory." | 407 | "Branch to push from, rather than the one containing the working directory." |
153 | 408 | msgstr "" | 408 | msgstr "" |
154 | 409 | 409 | ||
155 | 410 | # help of 'use-existing-dir' option of 'push' command | 410 | # help of 'use-existing-dir' option of 'push' command |
157 | 411 | #: bzrlib/builtins.py:1131 | 411 | #: bzrlib/builtins.py:1130 |
158 | 412 | msgid "" | 412 | msgid "" |
159 | 413 | "By default push will fail if the target directory exists, but does not " | 413 | "By default push will fail if the target directory exists, but does not " |
160 | 414 | "already have a control directory. This flag will allow push to proceed." | 414 | "already have a control directory. This flag will allow push to proceed." |
161 | 415 | msgstr "" | 415 | msgstr "" |
162 | 416 | 416 | ||
163 | 417 | # help of 'stacked' option of 'push' command | 417 | # help of 'stacked' option of 'push' command |
165 | 418 | #: bzrlib/builtins.py:1136 | 418 | #: bzrlib/builtins.py:1135 |
166 | 419 | msgid "" | 419 | msgid "" |
167 | 420 | "Create a stacked branch that references the public location of the parent " | 420 | "Create a stacked branch that references the public location of the parent " |
168 | 421 | "branch." | 421 | "branch." |
169 | 422 | msgstr "" | 422 | msgstr "" |
170 | 423 | 423 | ||
171 | 424 | # help of 'stacked-on' option of 'push' command | 424 | # help of 'stacked-on' option of 'push' command |
173 | 425 | #: bzrlib/builtins.py:1139 | 425 | #: bzrlib/builtins.py:1138 |
174 | 426 | msgid "" | 426 | msgid "" |
175 | 427 | "Create a stacked branch that refers to another branch for the commit " | 427 | "Create a stacked branch that refers to another branch for the commit " |
176 | 428 | "history. Only the work not present in the referenced branch is included in " | 428 | "history. Only the work not present in the referenced branch is included in " |
177 | @@ -430,22 +430,22 @@ | |||
178 | 430 | msgstr "" | 430 | msgstr "" |
179 | 431 | 431 | ||
180 | 432 | # help of 'strict' option of 'push' command | 432 | # help of 'strict' option of 'push' command |
182 | 433 | #: bzrlib/builtins.py:1144 | 433 | #: bzrlib/builtins.py:1143 |
183 | 434 | msgid "" | 434 | msgid "" |
184 | 435 | "Refuse to push if there are uncommitted changes in the working tree, --no-" | 435 | "Refuse to push if there are uncommitted changes in the working tree, --no-" |
185 | 436 | "strict disables the check." | 436 | "strict disables the check." |
186 | 437 | msgstr "" | 437 | msgstr "" |
187 | 438 | 438 | ||
188 | 439 | # help of 'no-tree' option of 'push' command | 439 | # help of 'no-tree' option of 'push' command |
190 | 440 | #: bzrlib/builtins.py:1147 | 440 | #: bzrlib/builtins.py:1146 |
191 | 441 | msgid "Don't populate the working tree, even for protocols that support it." | 441 | msgid "Don't populate the working tree, even for protocols that support it." |
192 | 442 | msgstr "" | 442 | msgstr "" |
193 | 443 | 443 | ||
195 | 444 | #: bzrlib/builtins.py:1212 | 444 | #: bzrlib/builtins.py:1211 |
196 | 445 | msgid "Create a new branch that is a copy of an existing branch." | 445 | msgid "Create a new branch that is a copy of an existing branch." |
197 | 446 | msgstr "" | 446 | msgstr "" |
198 | 447 | 447 | ||
200 | 448 | #: bzrlib/builtins.py:1214 | 448 | #: bzrlib/builtins.py:1213 |
201 | 449 | msgid "" | 449 | msgid "" |
202 | 450 | "If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n" | 450 | "If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n" |
203 | 451 | "be used. In other words, \"branch ../foo/bar\" will attempt to create ./" | 451 | "be used. In other words, \"branch ../foo/bar\" will attempt to create ./" |
204 | @@ -456,65 +456,65 @@ | |||
205 | 456 | "create ./foo-bar." | 456 | "create ./foo-bar." |
206 | 457 | msgstr "" | 457 | msgstr "" |
207 | 458 | 458 | ||
209 | 459 | #: bzrlib/builtins.py:1221 | 459 | #: bzrlib/builtins.py:1220 |
210 | 460 | msgid "" | 460 | msgid "" |
211 | 461 | "To retrieve the branch as of a particular revision, supply the --revision\n" | 461 | "To retrieve the branch as of a particular revision, supply the --revision\n" |
212 | 462 | "parameter, as in \"branch foo/bar -r 5\"." | 462 | "parameter, as in \"branch foo/bar -r 5\"." |
213 | 463 | msgstr "" | 463 | msgstr "" |
214 | 464 | 464 | ||
216 | 465 | #: bzrlib/builtins.py:1224 | 465 | #: bzrlib/builtins.py:1223 |
217 | 466 | msgid "The synonyms 'clone' and 'get' for this command are deprecated." | 466 | msgid "The synonyms 'clone' and 'get' for this command are deprecated." |
218 | 467 | msgstr "" | 467 | msgstr "" |
219 | 468 | 468 | ||
220 | 469 | # help of 'no-tree' option of 'branch' command | 469 | # help of 'no-tree' option of 'branch' command |
222 | 470 | #: bzrlib/builtins.py:1234 | 470 | #: bzrlib/builtins.py:1233 |
223 | 471 | msgid "Create a branch without a working-tree." | 471 | msgid "Create a branch without a working-tree." |
224 | 472 | msgstr "" | 472 | msgstr "" |
225 | 473 | 473 | ||
226 | 474 | # help of 'switch' option of 'branch' command | 474 | # help of 'switch' option of 'branch' command |
228 | 475 | #: bzrlib/builtins.py:1236 | 475 | #: bzrlib/builtins.py:1235 |
229 | 476 | msgid "Switch the checkout in the current directory to the new branch." | 476 | msgid "Switch the checkout in the current directory to the new branch." |
230 | 477 | msgstr "" | 477 | msgstr "" |
231 | 478 | 478 | ||
232 | 479 | # help of 'stacked' option of 'branch' command | 479 | # help of 'stacked' option of 'branch' command |
234 | 480 | #: bzrlib/builtins.py:1239 | 480 | #: bzrlib/builtins.py:1238 |
235 | 481 | msgid "" | 481 | msgid "" |
236 | 482 | "Create a stacked branch referring to the source branch. The new branch will " | 482 | "Create a stacked branch referring to the source branch. The new branch will " |
237 | 483 | "depend on the availability of the source branch for all operations." | 483 | "depend on the availability of the source branch for all operations." |
238 | 484 | msgstr "" | 484 | msgstr "" |
239 | 485 | 485 | ||
240 | 486 | # help of 'standalone' option of 'branch' command | 486 | # help of 'standalone' option of 'branch' command |
242 | 487 | #: bzrlib/builtins.py:1243 | 487 | #: bzrlib/builtins.py:1242 |
243 | 488 | msgid "Do not use a shared repository, even if available." | 488 | msgid "Do not use a shared repository, even if available." |
244 | 489 | msgstr "" | 489 | msgstr "" |
245 | 490 | 490 | ||
246 | 491 | # help of 'use-existing-dir' option of 'branch' command | 491 | # help of 'use-existing-dir' option of 'branch' command |
248 | 492 | #: bzrlib/builtins.py:1245 | 492 | #: bzrlib/builtins.py:1244 |
249 | 493 | msgid "" | 493 | msgid "" |
250 | 494 | "By default branch will fail if the target directory exists, but does not " | 494 | "By default branch will fail if the target directory exists, but does not " |
251 | 495 | "already have a control directory. This flag will allow branch to proceed." | 495 | "already have a control directory. This flag will allow branch to proceed." |
252 | 496 | msgstr "" | 496 | msgstr "" |
253 | 497 | 497 | ||
254 | 498 | # help of 'bind' option of 'branch' command | 498 | # help of 'bind' option of 'branch' command |
256 | 499 | #: bzrlib/builtins.py:1250 | 499 | #: bzrlib/builtins.py:1249 |
257 | 500 | msgid "Bind new branch to from location." | 500 | msgid "Bind new branch to from location." |
258 | 501 | msgstr "" | 501 | msgstr "" |
259 | 502 | 502 | ||
261 | 503 | #: bzrlib/builtins.py:1342 | 503 | #: bzrlib/builtins.py:1341 |
262 | 504 | msgid "List the branches available at the current location." | 504 | msgid "List the branches available at the current location." |
263 | 505 | msgstr "" | 505 | msgstr "" |
264 | 506 | 506 | ||
266 | 507 | #: bzrlib/builtins.py:1344 | 507 | #: bzrlib/builtins.py:1343 |
267 | 508 | msgid "" | 508 | msgid "" |
268 | 509 | "This command will print the names of all the branches at the current " | 509 | "This command will print the names of all the branches at the current " |
269 | 510 | "location." | 510 | "location." |
270 | 511 | msgstr "" | 511 | msgstr "" |
271 | 512 | 512 | ||
273 | 513 | #: bzrlib/builtins.py:1359 | 513 | #: bzrlib/builtins.py:1358 |
274 | 514 | msgid "Create a new checkout of an existing branch." | 514 | msgid "Create a new checkout of an existing branch." |
275 | 515 | msgstr "" | 515 | msgstr "" |
276 | 516 | 516 | ||
278 | 517 | #: bzrlib/builtins.py:1361 | 517 | #: bzrlib/builtins.py:1360 |
279 | 518 | msgid "" | 518 | msgid "" |
280 | 519 | "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree " | 519 | "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree " |
281 | 520 | "for\n" | 520 | "for\n" |
282 | @@ -524,7 +524,7 @@ | |||
283 | 524 | "location using SFTP." | 524 | "location using SFTP." |
284 | 525 | msgstr "" | 525 | msgstr "" |
285 | 526 | 526 | ||
287 | 527 | #: bzrlib/builtins.py:1366 | 527 | #: bzrlib/builtins.py:1365 |
288 | 528 | msgid "" | 528 | msgid "" |
289 | 529 | "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION " | 529 | "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION " |
290 | 530 | "will\n" | 530 | "will\n" |
291 | @@ -536,7 +536,7 @@ | |||
292 | 536 | "create ./foo-bar." | 536 | "create ./foo-bar." |
293 | 537 | msgstr "" | 537 | msgstr "" |
294 | 538 | 538 | ||
296 | 539 | #: bzrlib/builtins.py:1373 | 539 | #: bzrlib/builtins.py:1372 |
297 | 540 | msgid "" | 540 | msgid "" |
298 | 541 | "To retrieve the branch as of a particular revision, supply the --revision\n" | 541 | "To retrieve the branch as of a particular revision, supply the --revision\n" |
299 | 542 | "parameter, as in \"checkout foo/bar -r 5\". Note that this will be " | 542 | "parameter, as in \"checkout foo/bar -r 5\". Note that this will be " |
300 | @@ -547,7 +547,7 @@ | |||
301 | 547 | msgstr "" | 547 | msgstr "" |
302 | 548 | 548 | ||
303 | 549 | # help of 'lightweight' option of 'checkout' command | 549 | # help of 'lightweight' option of 'checkout' command |
305 | 550 | #: bzrlib/builtins.py:1383 | 550 | #: bzrlib/builtins.py:1382 |
306 | 551 | msgid "" | 551 | msgid "" |
307 | 552 | "Perform a lightweight checkout. Lightweight checkouts depend on access to " | 552 | "Perform a lightweight checkout. Lightweight checkouts depend on access to " |
308 | 553 | "the branch for every operation. Normal checkouts can perform common " | 553 | "the branch for every operation. Normal checkouts can perform common " |
309 | @@ -556,103 +556,103 @@ | |||
310 | 556 | msgstr "" | 556 | msgstr "" |
311 | 557 | 557 | ||
312 | 558 | # help of 'files-from' option of 'branch' command | 558 | # help of 'files-from' option of 'branch' command |
314 | 559 | #: bzrlib/builtins.py:1390 | 559 | #: bzrlib/builtins.py:1389 |
315 | 560 | msgid "Get file contents from this tree." | 560 | msgid "Get file contents from this tree." |
316 | 561 | msgstr "" | 561 | msgstr "" |
317 | 562 | 562 | ||
318 | 563 | # help of 'hardlink' option of 'branch' command | 563 | # help of 'hardlink' option of 'branch' command |
320 | 564 | #: bzrlib/builtins.py:1392 | 564 | #: bzrlib/builtins.py:1391 |
321 | 565 | msgid "Hard-link working tree files where possible." | 565 | msgid "Hard-link working tree files where possible." |
322 | 566 | msgstr "" | 566 | msgstr "" |
323 | 567 | 567 | ||
325 | 568 | #: bzrlib/builtins.py:1433 | 568 | #: bzrlib/builtins.py:1432 |
326 | 569 | msgid "" | 569 | msgid "" |
327 | 570 | "Show list of renamed files.\n" | 570 | "Show list of renamed files.\n" |
328 | 571 | " " | 571 | " " |
329 | 572 | msgstr "" | 572 | msgstr "" |
330 | 573 | 573 | ||
332 | 574 | #: bzrlib/builtins.py:1463 | 574 | #: bzrlib/builtins.py:1462 |
333 | 575 | msgid "Update a tree to have the latest code committed to its branch." | 575 | msgid "Update a tree to have the latest code committed to its branch." |
334 | 576 | msgstr "" | 576 | msgstr "" |
335 | 577 | 577 | ||
337 | 578 | #: bzrlib/builtins.py:1465 | 578 | #: bzrlib/builtins.py:1464 |
338 | 579 | msgid "" | 579 | msgid "" |
339 | 580 | "This will perform a merge into the working tree, and may generate\n" | 580 | "This will perform a merge into the working tree, and may generate\n" |
340 | 581 | "conflicts. If you have any local changes, you will still\n" | 581 | "conflicts. If you have any local changes, you will still\n" |
341 | 582 | "need to commit them after the update for the update to be complete." | 582 | "need to commit them after the update for the update to be complete." |
342 | 583 | msgstr "" | 583 | msgstr "" |
343 | 584 | 584 | ||
345 | 585 | #: bzrlib/builtins.py:1469 | 585 | #: bzrlib/builtins.py:1468 |
346 | 586 | msgid "" | 586 | msgid "" |
347 | 587 | "If you want to discard your local changes, you can just do a\n" | 587 | "If you want to discard your local changes, you can just do a\n" |
348 | 588 | "'bzr revert' instead of 'bzr commit' after the update." | 588 | "'bzr revert' instead of 'bzr commit' after the update." |
349 | 589 | msgstr "" | 589 | msgstr "" |
350 | 590 | 590 | ||
352 | 591 | #: bzrlib/builtins.py:1472 | 591 | #: bzrlib/builtins.py:1471 |
353 | 592 | msgid "" | 592 | msgid "" |
354 | 593 | "If you want to restore a file that has been removed locally, use\n" | 593 | "If you want to restore a file that has been removed locally, use\n" |
355 | 594 | "'bzr revert' instead of 'bzr update'." | 594 | "'bzr revert' instead of 'bzr update'." |
356 | 595 | msgstr "" | 595 | msgstr "" |
357 | 596 | 596 | ||
359 | 597 | #: bzrlib/builtins.py:1475 | 597 | #: bzrlib/builtins.py:1474 |
360 | 598 | msgid "" | 598 | msgid "" |
361 | 599 | "If the tree's branch is bound to a master branch, it will also update\n" | 599 | "If the tree's branch is bound to a master branch, it will also update\n" |
362 | 600 | "the branch from the master." | 600 | "the branch from the master." |
363 | 601 | msgstr "" | 601 | msgstr "" |
364 | 602 | 602 | ||
366 | 603 | #: bzrlib/builtins.py:1556 | 603 | #: bzrlib/builtins.py:1555 |
367 | 604 | msgid "Show information about a working tree, branch or repository." | 604 | msgid "Show information about a working tree, branch or repository." |
368 | 605 | msgstr "" | 605 | msgstr "" |
369 | 606 | 606 | ||
371 | 607 | #: bzrlib/builtins.py:1558 | 607 | #: bzrlib/builtins.py:1557 |
372 | 608 | msgid "" | 608 | msgid "" |
373 | 609 | "This command will show all known locations and formats associated to the\n" | 609 | "This command will show all known locations and formats associated to the\n" |
374 | 610 | "tree, branch or repository." | 610 | "tree, branch or repository." |
375 | 611 | msgstr "" | 611 | msgstr "" |
376 | 612 | 612 | ||
378 | 613 | #: bzrlib/builtins.py:1561 | 613 | #: bzrlib/builtins.py:1560 |
379 | 614 | msgid "" | 614 | msgid "" |
380 | 615 | "In verbose mode, statistical information is included with each report.\n" | 615 | "In verbose mode, statistical information is included with each report.\n" |
381 | 616 | "To see extended statistic information, use a verbosity level of 2 or\n" | 616 | "To see extended statistic information, use a verbosity level of 2 or\n" |
382 | 617 | "higher by specifying the verbose option multiple times, e.g. -vv." | 617 | "higher by specifying the verbose option multiple times, e.g. -vv." |
383 | 618 | msgstr "" | 618 | msgstr "" |
384 | 619 | 619 | ||
386 | 620 | #: bzrlib/builtins.py:1565 | 620 | #: bzrlib/builtins.py:1564 |
387 | 621 | msgid "Branches and working trees will also report any missing revisions." | 621 | msgid "Branches and working trees will also report any missing revisions." |
388 | 622 | msgstr "" | 622 | msgstr "" |
389 | 623 | 623 | ||
391 | 624 | #: bzrlib/builtins.py:1569 | 624 | #: bzrlib/builtins.py:1568 |
392 | 625 | msgid " Display information on the format and related locations:" | 625 | msgid " Display information on the format and related locations:" |
393 | 626 | msgstr "" | 626 | msgstr "" |
394 | 627 | 627 | ||
396 | 628 | #: bzrlib/builtins.py:1571 | 628 | #: bzrlib/builtins.py:1570 |
397 | 629 | msgid " bzr info" | 629 | msgid " bzr info" |
398 | 630 | msgstr "" | 630 | msgstr "" |
399 | 631 | 631 | ||
401 | 632 | #: bzrlib/builtins.py:1573 | 632 | #: bzrlib/builtins.py:1572 |
402 | 633 | msgid "" | 633 | msgid "" |
403 | 634 | " Display the above together with extended format information and\n" | 634 | " Display the above together with extended format information and\n" |
404 | 635 | " basic statistics (like the number of files in the working tree and\n" | 635 | " basic statistics (like the number of files in the working tree and\n" |
405 | 636 | " number of revisions in the branch and repository):" | 636 | " number of revisions in the branch and repository):" |
406 | 637 | msgstr "" | 637 | msgstr "" |
407 | 638 | 638 | ||
409 | 639 | #: bzrlib/builtins.py:1577 | 639 | #: bzrlib/builtins.py:1576 |
410 | 640 | msgid " bzr info -v" | 640 | msgid " bzr info -v" |
411 | 641 | msgstr "" | 641 | msgstr "" |
412 | 642 | 642 | ||
414 | 643 | #: bzrlib/builtins.py:1579 | 643 | #: bzrlib/builtins.py:1578 |
415 | 644 | msgid " Display the above together with number of committers to the branch:" | 644 | msgid " Display the above together with number of committers to the branch:" |
416 | 645 | msgstr "" | 645 | msgstr "" |
417 | 646 | 646 | ||
419 | 647 | #: bzrlib/builtins.py:1581 | 647 | #: bzrlib/builtins.py:1580 |
420 | 648 | msgid " bzr info -vv" | 648 | msgid " bzr info -vv" |
421 | 649 | msgstr "" | 649 | msgstr "" |
422 | 650 | 650 | ||
424 | 651 | #: bzrlib/builtins.py:1600 | 651 | #: bzrlib/builtins.py:1599 |
425 | 652 | msgid "Remove files or directories." | 652 | msgid "Remove files or directories." |
426 | 653 | msgstr "" | 653 | msgstr "" |
427 | 654 | 654 | ||
429 | 655 | #: bzrlib/builtins.py:1602 | 655 | #: bzrlib/builtins.py:1601 |
430 | 656 | msgid "" | 656 | msgid "" |
431 | 657 | "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n" | 657 | "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n" |
432 | 658 | "delete them if they can easily be recovered using revert otherwise they\n" | 658 | "delete them if they can easily be recovered using revert otherwise they\n" |
433 | @@ -662,25 +662,25 @@ | |||
434 | 662 | msgstr "" | 662 | msgstr "" |
435 | 663 | 663 | ||
436 | 664 | # help of 'new' option of 'remove' command | 664 | # help of 'new' option of 'remove' command |
438 | 665 | #: bzrlib/builtins.py:1610 | 665 | #: bzrlib/builtins.py:1609 |
439 | 666 | msgid "Only remove files that have never been committed." | 666 | msgid "Only remove files that have never been committed." |
440 | 667 | msgstr "" | 667 | msgstr "" |
441 | 668 | 668 | ||
442 | 669 | # help of 'file-deletion-strategy' option of 'remove' command | 669 | # help of 'file-deletion-strategy' option of 'remove' command |
444 | 670 | #: bzrlib/builtins.py:1612 | 670 | #: bzrlib/builtins.py:1611 |
445 | 671 | msgid "The file deletion mode to be used." | 671 | msgid "The file deletion mode to be used." |
446 | 672 | msgstr "" | 672 | msgstr "" |
447 | 673 | 673 | ||
448 | 674 | # title of 'file-deletion-strategy' option of 'remove' command | 674 | # title of 'file-deletion-strategy' option of 'remove' command |
450 | 675 | #: bzrlib/builtins.py:1613 | 675 | #: bzrlib/builtins.py:1612 |
451 | 676 | msgid "Deletion Strategy" | 676 | msgid "Deletion Strategy" |
452 | 677 | msgstr "" | 677 | msgstr "" |
453 | 678 | 678 | ||
455 | 679 | #: bzrlib/builtins.py:1704 | 679 | #: bzrlib/builtins.py:1703 |
456 | 680 | msgid "Reconcile bzr metadata in a branch." | 680 | msgid "Reconcile bzr metadata in a branch." |
457 | 681 | msgstr "" | 681 | msgstr "" |
458 | 682 | 682 | ||
460 | 683 | #: bzrlib/builtins.py:1706 | 683 | #: bzrlib/builtins.py:1705 |
461 | 684 | msgid "" | 684 | msgid "" |
462 | 685 | "This can correct data mismatches that may have been caused by\n" | 685 | "This can correct data mismatches that may have been caused by\n" |
463 | 686 | "previous ghost operations or bzr upgrades. You should only\n" | 686 | "previous ghost operations or bzr upgrades. You should only\n" |
464 | @@ -688,7 +688,7 @@ | |||
465 | 688 | "advises you to run it." | 688 | "advises you to run it." |
466 | 689 | msgstr "" | 689 | msgstr "" |
467 | 690 | 690 | ||
469 | 691 | #: bzrlib/builtins.py:1711 | 691 | #: bzrlib/builtins.py:1710 |
470 | 692 | msgid "" | 692 | msgid "" |
471 | 693 | "If a second branch is provided, cross-branch reconciliation is\n" | 693 | "If a second branch is provided, cross-branch reconciliation is\n" |
472 | 694 | "also attempted, which will check that data like the tree root\n" | 694 | "also attempted, which will check that data like the tree root\n" |
473 | @@ -696,27 +696,27 @@ | |||
474 | 696 | "correctly in both branches." | 696 | "correctly in both branches." |
475 | 697 | msgstr "" | 697 | msgstr "" |
476 | 698 | 698 | ||
478 | 699 | #: bzrlib/builtins.py:1716 | 699 | #: bzrlib/builtins.py:1715 |
479 | 700 | msgid "" | 700 | msgid "" |
480 | 701 | "At the same time it is run it may recompress data resulting in\n" | 701 | "At the same time it is run it may recompress data resulting in\n" |
481 | 702 | "a potential saving in disk space or performance gain." | 702 | "a potential saving in disk space or performance gain." |
482 | 703 | msgstr "" | 703 | msgstr "" |
483 | 704 | 704 | ||
485 | 705 | #: bzrlib/builtins.py:1719 | 705 | #: bzrlib/builtins.py:1718 |
486 | 706 | msgid "The branch *MUST* be on a listable system such as local disk or sftp." | 706 | msgid "The branch *MUST* be on a listable system such as local disk or sftp." |
487 | 707 | msgstr "" | 707 | msgstr "" |
488 | 708 | 708 | ||
490 | 709 | #: bzrlib/builtins.py:1783 | 709 | #: bzrlib/builtins.py:1782 |
491 | 710 | msgid "Make a directory into a versioned branch." | 710 | msgid "Make a directory into a versioned branch." |
492 | 711 | msgstr "" | 711 | msgstr "" |
493 | 712 | 712 | ||
495 | 713 | #: bzrlib/builtins.py:1785 | 713 | #: bzrlib/builtins.py:1784 |
496 | 714 | msgid "" | 714 | msgid "" |
497 | 715 | "Use this to create an empty branch, or before importing an\n" | 715 | "Use this to create an empty branch, or before importing an\n" |
498 | 716 | "existing project." | 716 | "existing project." |
499 | 717 | msgstr "" | 717 | msgstr "" |
500 | 718 | 718 | ||
502 | 719 | #: bzrlib/builtins.py:1788 | 719 | #: bzrlib/builtins.py:1787 |
503 | 720 | msgid "" | 720 | msgid "" |
504 | 721 | "If there is a repository in a parent directory of the location, then\n" | 721 | "If there is a repository in a parent directory of the location, then\n" |
505 | 722 | "the history of the branch will be stored in the repository. Otherwise\n" | 722 | "the history of the branch will be stored in the repository. Otherwise\n" |
506 | @@ -724,17 +724,17 @@ | |||
507 | 724 | "in the .bzr directory." | 724 | "in the .bzr directory." |
508 | 725 | msgstr "" | 725 | msgstr "" |
509 | 726 | 726 | ||
511 | 727 | #: bzrlib/builtins.py:1793 | 727 | #: bzrlib/builtins.py:1792 |
512 | 728 | msgid "" | 728 | msgid "" |
513 | 729 | "If there is already a branch at the location but it has no working tree,\n" | 729 | "If there is already a branch at the location but it has no working tree,\n" |
514 | 730 | "the tree can be populated with 'bzr checkout'." | 730 | "the tree can be populated with 'bzr checkout'." |
515 | 731 | msgstr "" | 731 | msgstr "" |
516 | 732 | 732 | ||
518 | 733 | #: bzrlib/builtins.py:1796 | 733 | #: bzrlib/builtins.py:1795 |
519 | 734 | msgid "Recipe for importing a tree of files::" | 734 | msgid "Recipe for importing a tree of files::" |
520 | 735 | msgstr "" | 735 | msgstr "" |
521 | 736 | 736 | ||
523 | 737 | #: bzrlib/builtins.py:1798 | 737 | #: bzrlib/builtins.py:1797 |
524 | 738 | msgid "" | 738 | msgid "" |
525 | 739 | " cd ~/project\n" | 739 | " cd ~/project\n" |
526 | 740 | " bzr init\n" | 740 | " bzr init\n" |
527 | @@ -744,30 +744,30 @@ | |||
528 | 744 | msgstr "" | 744 | msgstr "" |
529 | 745 | 745 | ||
530 | 746 | # help of 'create-prefix' option of 'init' command | 746 | # help of 'create-prefix' option of 'init' command |
532 | 747 | #: bzrlib/builtins.py:1809 | 747 | #: bzrlib/builtins.py:1808 |
533 | 748 | msgid "Create the path leading up to the branch if it does not already exist." | 748 | msgid "Create the path leading up to the branch if it does not already exist." |
534 | 749 | msgstr "" | 749 | msgstr "" |
535 | 750 | 750 | ||
536 | 751 | # help of 'format' option of 'init' command | 751 | # help of 'format' option of 'init' command |
538 | 752 | #: bzrlib/builtins.py:1812 | 752 | #: bzrlib/builtins.py:1811 |
539 | 753 | msgid "Specify a format for this branch. See \"help formats\"." | 753 | msgid "Specify a format for this branch. See \"help formats\"." |
540 | 754 | msgstr "" | 754 | msgstr "" |
541 | 755 | 755 | ||
542 | 756 | # help of 'append-revisions-only' option of 'init' command | 756 | # help of 'append-revisions-only' option of 'init' command |
544 | 757 | #: bzrlib/builtins.py:1820 | 757 | #: bzrlib/builtins.py:1819 |
545 | 758 | msgid "Never change revnos or the existing log. Append revisions to it only." | 758 | msgid "Never change revnos or the existing log. Append revisions to it only." |
546 | 759 | msgstr "" | 759 | msgstr "" |
547 | 760 | 760 | ||
548 | 761 | # help of 'no-tree' option of 'init' command | 761 | # help of 'no-tree' option of 'init' command |
550 | 762 | #: bzrlib/builtins.py:1823 | 762 | #: bzrlib/builtins.py:1822 |
551 | 763 | msgid "Create a branch without a working tree." | 763 | msgid "Create a branch without a working tree." |
552 | 764 | msgstr "" | 764 | msgstr "" |
553 | 765 | 765 | ||
555 | 766 | #: bzrlib/builtins.py:1900 | 766 | #: bzrlib/builtins.py:1899 |
556 | 767 | msgid "Create a shared repository for branches to share storage space." | 767 | msgid "Create a shared repository for branches to share storage space." |
557 | 768 | msgstr "" | 768 | msgstr "" |
558 | 769 | 769 | ||
560 | 770 | #: bzrlib/builtins.py:1902 | 770 | #: bzrlib/builtins.py:1901 |
561 | 771 | msgid "" | 771 | msgid "" |
562 | 772 | "New branches created under the repository directory will store their\n" | 772 | "New branches created under the repository directory will store their\n" |
563 | 773 | "revisions in the repository, not in the branch directory. For branches\n" | 773 | "revisions in the repository, not in the branch directory. For branches\n" |
564 | @@ -775,7 +775,7 @@ | |||
565 | 775 | "speeds up the creation of new branches." | 775 | "speeds up the creation of new branches." |
566 | 776 | msgstr "" | 776 | msgstr "" |
567 | 777 | 777 | ||
569 | 778 | #: bzrlib/builtins.py:1907 | 778 | #: bzrlib/builtins.py:1906 |
570 | 779 | msgid "" | 779 | msgid "" |
571 | 780 | "If the --no-trees option is given then the branches in the repository\n" | 780 | "If the --no-trees option is given then the branches in the repository\n" |
572 | 781 | "will not have working trees by default. They will still exist as \n" | 781 | "will not have working trees by default. They will still exist as \n" |
573 | @@ -785,23 +785,23 @@ | |||
574 | 785 | "branches, such as on a server." | 785 | "branches, such as on a server." |
575 | 786 | msgstr "" | 786 | msgstr "" |
576 | 787 | 787 | ||
578 | 788 | #: bzrlib/builtins.py:1914 | 788 | #: bzrlib/builtins.py:1913 |
579 | 789 | msgid "" | 789 | msgid "" |
580 | 790 | ":Examples:\n" | 790 | ":Examples:\n" |
581 | 791 | " Create a shared repository holding just branches::" | 791 | " Create a shared repository holding just branches::" |
582 | 792 | msgstr "" | 792 | msgstr "" |
583 | 793 | 793 | ||
585 | 794 | #: bzrlib/builtins.py:1917 | 794 | #: bzrlib/builtins.py:1916 |
586 | 795 | msgid "" | 795 | msgid "" |
587 | 796 | " bzr init-repo --no-trees repo\n" | 796 | " bzr init-repo --no-trees repo\n" |
588 | 797 | " bzr init repo/trunk" | 797 | " bzr init repo/trunk" |
589 | 798 | msgstr "" | 798 | msgstr "" |
590 | 799 | 799 | ||
592 | 800 | #: bzrlib/builtins.py:1920 | 800 | #: bzrlib/builtins.py:1919 |
593 | 801 | msgid " Make a lightweight checkout elsewhere::" | 801 | msgid " Make a lightweight checkout elsewhere::" |
594 | 802 | msgstr "" | 802 | msgstr "" |
595 | 803 | 803 | ||
597 | 804 | #: bzrlib/builtins.py:1922 | 804 | #: bzrlib/builtins.py:1921 |
598 | 805 | msgid "" | 805 | msgid "" |
599 | 806 | " bzr checkout --lightweight repo/trunk trunk-checkout\n" | 806 | " bzr checkout --lightweight repo/trunk trunk-checkout\n" |
600 | 807 | " cd trunk-checkout\n" | 807 | " cd trunk-checkout\n" |
601 | @@ -809,26 +809,26 @@ | |||
602 | 809 | msgstr "" | 809 | msgstr "" |
603 | 810 | 810 | ||
604 | 811 | # help of 'format' option of 'init-repository' command | 811 | # help of 'format' option of 'init-repository' command |
606 | 812 | #: bzrlib/builtins.py:1930 | 812 | #: bzrlib/builtins.py:1929 |
607 | 813 | msgid "" | 813 | msgid "" |
608 | 814 | "Specify a format for this repository. See \"bzr help formats\" for details." | 814 | "Specify a format for this repository. See \"bzr help formats\" for details." |
609 | 815 | msgstr "" | 815 | msgstr "" |
610 | 816 | 816 | ||
611 | 817 | # title of 'format' option of 'init-repository' command | 817 | # title of 'format' option of 'init-repository' command |
613 | 818 | #: bzrlib/builtins.py:1934 | 818 | #: bzrlib/builtins.py:1933 |
614 | 819 | msgid "Repository format" | 819 | msgid "Repository format" |
615 | 820 | msgstr "" | 820 | msgstr "" |
616 | 821 | 821 | ||
617 | 822 | # help of 'no-trees' option of 'init-repository' command | 822 | # help of 'no-trees' option of 'init-repository' command |
619 | 823 | #: bzrlib/builtins.py:1936 | 823 | #: bzrlib/builtins.py:1935 |
620 | 824 | msgid "Branches in the repository will default to not having a working tree." | 824 | msgid "Branches in the repository will default to not having a working tree." |
621 | 825 | msgstr "" | 825 | msgstr "" |
622 | 826 | 826 | ||
624 | 827 | #: bzrlib/builtins.py:1960 | 827 | #: bzrlib/builtins.py:1959 |
625 | 828 | msgid "Show differences in the working tree, between revisions or branches." | 828 | msgid "Show differences in the working tree, between revisions or branches." |
626 | 829 | msgstr "" | 829 | msgstr "" |
627 | 830 | 830 | ||
629 | 831 | #: bzrlib/builtins.py:1962 | 831 | #: bzrlib/builtins.py:1961 |
630 | 832 | msgid "" | 832 | msgid "" |
631 | 833 | "If no arguments are given, all changes for the current tree are listed.\n" | 833 | "If no arguments are given, all changes for the current tree are listed.\n" |
632 | 834 | "If files are given, only the changes in those files are listed.\n" | 834 | "If files are given, only the changes in those files are listed.\n" |
633 | @@ -838,13 +838,13 @@ | |||
634 | 838 | "given." | 838 | "given." |
635 | 839 | msgstr "" | 839 | msgstr "" |
636 | 840 | 840 | ||
638 | 841 | #: bzrlib/builtins.py:1969 | 841 | #: bzrlib/builtins.py:1968 |
639 | 842 | msgid "" | 842 | msgid "" |
640 | 843 | "\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n" | 843 | "\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n" |
641 | 844 | "produces patches suitable for \"patch -p1\"." | 844 | "produces patches suitable for \"patch -p1\"." |
642 | 845 | msgstr "" | 845 | msgstr "" |
643 | 846 | 846 | ||
645 | 847 | #: bzrlib/builtins.py:1972 | 847 | #: bzrlib/builtins.py:1971 |
646 | 848 | msgid "" | 848 | msgid "" |
647 | 849 | "Note that when using the -r argument with a range of revisions, the\n" | 849 | "Note that when using the -r argument with a range of revisions, the\n" |
648 | 850 | "differences are computed between the two specified revisions. That\n" | 850 | "differences are computed between the two specified revisions. That\n" |
649 | @@ -854,7 +854,7 @@ | |||
650 | 854 | "in the range." | 854 | "in the range." |
651 | 855 | msgstr "" | 855 | msgstr "" |
652 | 856 | 856 | ||
654 | 857 | #: bzrlib/builtins.py:1979 | 857 | #: bzrlib/builtins.py:1978 |
655 | 858 | msgid "" | 858 | msgid "" |
656 | 859 | ":Exit values:\n" | 859 | ":Exit values:\n" |
657 | 860 | " 1 - changed\n" | 860 | " 1 - changed\n" |
658 | @@ -863,113 +863,113 @@ | |||
659 | 863 | " 0 - no change" | 863 | " 0 - no change" |
660 | 864 | msgstr "" | 864 | msgstr "" |
661 | 865 | 865 | ||
663 | 866 | #: bzrlib/builtins.py:1985 | 866 | #: bzrlib/builtins.py:1984 |
664 | 867 | msgid "" | 867 | msgid "" |
665 | 868 | ":Examples:\n" | 868 | ":Examples:\n" |
666 | 869 | " Shows the difference in the working tree versus the last commit::" | 869 | " Shows the difference in the working tree versus the last commit::" |
667 | 870 | msgstr "" | 870 | msgstr "" |
668 | 871 | 871 | ||
670 | 872 | #: bzrlib/builtins.py:1988 | 872 | #: bzrlib/builtins.py:1987 |
671 | 873 | msgid " bzr diff" | 873 | msgid " bzr diff" |
672 | 874 | msgstr "" | 874 | msgstr "" |
673 | 875 | 875 | ||
675 | 876 | #: bzrlib/builtins.py:1990 | 876 | #: bzrlib/builtins.py:1989 |
676 | 877 | msgid " Difference between the working tree and revision 1::" | 877 | msgid " Difference between the working tree and revision 1::" |
677 | 878 | msgstr "" | 878 | msgstr "" |
678 | 879 | 879 | ||
680 | 880 | #: bzrlib/builtins.py:1992 | 880 | #: bzrlib/builtins.py:1991 |
681 | 881 | msgid " bzr diff -r1" | 881 | msgid " bzr diff -r1" |
682 | 882 | msgstr "" | 882 | msgstr "" |
683 | 883 | 883 | ||
685 | 884 | #: bzrlib/builtins.py:1994 | 884 | #: bzrlib/builtins.py:1993 |
686 | 885 | msgid " Difference between revision 3 and revision 1::" | 885 | msgid " Difference between revision 3 and revision 1::" |
687 | 886 | msgstr "" | 886 | msgstr "" |
688 | 887 | 887 | ||
690 | 888 | #: bzrlib/builtins.py:1996 | 888 | #: bzrlib/builtins.py:1995 |
691 | 889 | msgid " bzr diff -r1..3" | 889 | msgid " bzr diff -r1..3" |
692 | 890 | msgstr "" | 890 | msgstr "" |
693 | 891 | 891 | ||
695 | 892 | #: bzrlib/builtins.py:1998 | 892 | #: bzrlib/builtins.py:1997 |
696 | 893 | msgid " Difference between revision 3 and revision 1 for branch xxx::" | 893 | msgid " Difference between revision 3 and revision 1 for branch xxx::" |
697 | 894 | msgstr "" | 894 | msgstr "" |
698 | 895 | 895 | ||
700 | 896 | #: bzrlib/builtins.py:2000 | 896 | #: bzrlib/builtins.py:1999 |
701 | 897 | msgid " bzr diff -r1..3 xxx" | 897 | msgid " bzr diff -r1..3 xxx" |
702 | 898 | msgstr "" | 898 | msgstr "" |
703 | 899 | 899 | ||
705 | 900 | #: bzrlib/builtins.py:2002 | 900 | #: bzrlib/builtins.py:2001 |
706 | 901 | msgid " The changes introduced by revision 2 (equivalent to -r1..2)::" | 901 | msgid " The changes introduced by revision 2 (equivalent to -r1..2)::" |
707 | 902 | msgstr "" | 902 | msgstr "" |
708 | 903 | 903 | ||
710 | 904 | #: bzrlib/builtins.py:2004 | 904 | #: bzrlib/builtins.py:2003 |
711 | 905 | msgid " bzr diff -c2" | 905 | msgid " bzr diff -c2" |
712 | 906 | msgstr "" | 906 | msgstr "" |
713 | 907 | 907 | ||
715 | 908 | #: bzrlib/builtins.py:2006 | 908 | #: bzrlib/builtins.py:2005 |
716 | 909 | msgid "" | 909 | msgid "" |
717 | 910 | " To see the changes introduced by revision X::\n" | 910 | " To see the changes introduced by revision X::\n" |
718 | 911 | " \n" | 911 | " \n" |
719 | 912 | " bzr diff -cX" | 912 | " bzr diff -cX" |
720 | 913 | msgstr "" | 913 | msgstr "" |
721 | 914 | 914 | ||
723 | 915 | #: bzrlib/builtins.py:2010 | 915 | #: bzrlib/builtins.py:2009 |
724 | 916 | msgid "" | 916 | msgid "" |
725 | 917 | " Note that in the case of a merge, the -c option shows the changes\n" | 917 | " Note that in the case of a merge, the -c option shows the changes\n" |
726 | 918 | " compared to the left hand parent. To see the changes against\n" | 918 | " compared to the left hand parent. To see the changes against\n" |
727 | 919 | " another parent, use::" | 919 | " another parent, use::" |
728 | 920 | msgstr "" | 920 | msgstr "" |
729 | 921 | 921 | ||
731 | 922 | #: bzrlib/builtins.py:2014 | 922 | #: bzrlib/builtins.py:2013 |
732 | 923 | msgid " bzr diff -r<chosen_parent>..X" | 923 | msgid " bzr diff -r<chosen_parent>..X" |
733 | 924 | msgstr "" | 924 | msgstr "" |
734 | 925 | 925 | ||
736 | 926 | #: bzrlib/builtins.py:2016 | 926 | #: bzrlib/builtins.py:2015 |
737 | 927 | msgid "" | 927 | msgid "" |
738 | 928 | " The changes between the current revision and the previous revision\n" | 928 | " The changes between the current revision and the previous revision\n" |
739 | 929 | " (equivalent to -c-1 and -r-2..-1)" | 929 | " (equivalent to -c-1 and -r-2..-1)" |
740 | 930 | msgstr "" | 930 | msgstr "" |
741 | 931 | 931 | ||
743 | 932 | #: bzrlib/builtins.py:2019 | 932 | #: bzrlib/builtins.py:2018 |
744 | 933 | msgid " bzr diff -r-2.." | 933 | msgid " bzr diff -r-2.." |
745 | 934 | msgstr "" | 934 | msgstr "" |
746 | 935 | 935 | ||
748 | 936 | #: bzrlib/builtins.py:2021 | 936 | #: bzrlib/builtins.py:2020 |
749 | 937 | msgid " Show just the differences for file NEWS::" | 937 | msgid " Show just the differences for file NEWS::" |
750 | 938 | msgstr "" | 938 | msgstr "" |
751 | 939 | 939 | ||
753 | 940 | #: bzrlib/builtins.py:2023 | 940 | #: bzrlib/builtins.py:2022 |
754 | 941 | msgid " bzr diff NEWS" | 941 | msgid " bzr diff NEWS" |
755 | 942 | msgstr "" | 942 | msgstr "" |
756 | 943 | 943 | ||
758 | 944 | #: bzrlib/builtins.py:2025 | 944 | #: bzrlib/builtins.py:2024 |
759 | 945 | msgid " Show the differences in working tree xxx for file NEWS::" | 945 | msgid " Show the differences in working tree xxx for file NEWS::" |
760 | 946 | msgstr "" | 946 | msgstr "" |
761 | 947 | 947 | ||
763 | 948 | #: bzrlib/builtins.py:2027 | 948 | #: bzrlib/builtins.py:2026 |
764 | 949 | msgid " bzr diff xxx/NEWS" | 949 | msgid " bzr diff xxx/NEWS" |
765 | 950 | msgstr "" | 950 | msgstr "" |
766 | 951 | 951 | ||
768 | 952 | #: bzrlib/builtins.py:2029 | 952 | #: bzrlib/builtins.py:2028 |
769 | 953 | msgid " Show the differences from branch xxx to this working tree:" | 953 | msgid " Show the differences from branch xxx to this working tree:" |
770 | 954 | msgstr "" | 954 | msgstr "" |
771 | 955 | 955 | ||
773 | 956 | #: bzrlib/builtins.py:2031 | 956 | #: bzrlib/builtins.py:2030 |
774 | 957 | msgid " bzr diff --old xxx" | 957 | msgid " bzr diff --old xxx" |
775 | 958 | msgstr "" | 958 | msgstr "" |
776 | 959 | 959 | ||
778 | 960 | #: bzrlib/builtins.py:2033 | 960 | #: bzrlib/builtins.py:2032 |
779 | 961 | msgid " Show the differences between two branches for file NEWS::" | 961 | msgid " Show the differences between two branches for file NEWS::" |
780 | 962 | msgstr "" | 962 | msgstr "" |
781 | 963 | 963 | ||
783 | 964 | #: bzrlib/builtins.py:2035 | 964 | #: bzrlib/builtins.py:2034 |
784 | 965 | msgid " bzr diff --old xxx --new yyy NEWS" | 965 | msgid " bzr diff --old xxx --new yyy NEWS" |
785 | 966 | msgstr "" | 966 | msgstr "" |
786 | 967 | 967 | ||
788 | 968 | #: bzrlib/builtins.py:2037 | 968 | #: bzrlib/builtins.py:2036 |
789 | 969 | msgid " Same as 'bzr diff' but prefix paths with old/ and new/::" | 969 | msgid " Same as 'bzr diff' but prefix paths with old/ and new/::" |
790 | 970 | msgstr "" | 970 | msgstr "" |
791 | 971 | 971 | ||
793 | 972 | #: bzrlib/builtins.py:2039 | 972 | #: bzrlib/builtins.py:2038 |
794 | 973 | msgid "" | 973 | msgid "" |
795 | 974 | " bzr diff --prefix old/:new/\n" | 974 | " bzr diff --prefix old/:new/\n" |
796 | 975 | " \n" | 975 | " \n" |
797 | @@ -979,63 +979,63 @@ | |||
798 | 979 | msgstr "" | 979 | msgstr "" |
799 | 980 | 980 | ||
800 | 981 | # help of 'diff-options' option of 'diff' command | 981 | # help of 'diff-options' option of 'diff' command |
802 | 982 | #: bzrlib/builtins.py:2049 | 982 | #: bzrlib/builtins.py:2048 |
803 | 983 | msgid "Pass these options to the external diff program." | 983 | msgid "Pass these options to the external diff program." |
804 | 984 | msgstr "" | 984 | msgstr "" |
805 | 985 | 985 | ||
806 | 986 | # help of 'prefix' option of 'diff' command | 986 | # help of 'prefix' option of 'diff' command |
808 | 987 | #: bzrlib/builtins.py:2052 | 987 | #: bzrlib/builtins.py:2051 |
809 | 988 | msgid "" | 988 | msgid "" |
810 | 989 | "Set prefixes added to old and new filenames, as two values separated by a " | 989 | "Set prefixes added to old and new filenames, as two values separated by a " |
811 | 990 | "colon. (eg \"old/:new/\")." | 990 | "colon. (eg \"old/:new/\")." |
812 | 991 | msgstr "" | 991 | msgstr "" |
813 | 992 | 992 | ||
814 | 993 | # help of 'old' option of 'diff' command | 993 | # help of 'old' option of 'diff' command |
816 | 994 | #: bzrlib/builtins.py:2055 | 994 | #: bzrlib/builtins.py:2054 |
817 | 995 | msgid "Branch/tree to compare from." | 995 | msgid "Branch/tree to compare from." |
818 | 996 | msgstr "" | 996 | msgstr "" |
819 | 997 | 997 | ||
820 | 998 | # help of 'new' option of 'diff' command | 998 | # help of 'new' option of 'diff' command |
822 | 999 | #: bzrlib/builtins.py:2059 | 999 | #: bzrlib/builtins.py:2058 |
823 | 1000 | msgid "Branch/tree to compare to." | 1000 | msgid "Branch/tree to compare to." |
824 | 1001 | msgstr "" | 1001 | msgstr "" |
825 | 1002 | 1002 | ||
826 | 1003 | # help of 'using' option of 'diff' command | 1003 | # help of 'using' option of 'diff' command |
828 | 1004 | #: bzrlib/builtins.py:2065 | 1004 | #: bzrlib/builtins.py:2064 |
829 | 1005 | msgid "Use this command to compare files." | 1005 | msgid "Use this command to compare files." |
830 | 1006 | msgstr "" | 1006 | msgstr "" |
831 | 1007 | 1007 | ||
832 | 1008 | # help of 'format' option of 'diff' command | 1008 | # help of 'format' option of 'diff' command |
834 | 1009 | #: bzrlib/builtins.py:2070 | 1009 | #: bzrlib/builtins.py:2069 |
835 | 1010 | msgid "Diff format to use." | 1010 | msgid "Diff format to use." |
836 | 1011 | msgstr "" | 1011 | msgstr "" |
837 | 1012 | 1012 | ||
838 | 1013 | # title of 'format' option of 'diff' command | 1013 | # title of 'format' option of 'diff' command |
840 | 1014 | #: bzrlib/builtins.py:2072 | 1014 | #: bzrlib/builtins.py:2071 |
841 | 1015 | msgid "Diff format" | 1015 | msgid "Diff format" |
842 | 1016 | msgstr "" | 1016 | msgstr "" |
843 | 1017 | 1017 | ||
845 | 1018 | #: bzrlib/builtins.py:2122 | 1018 | #: bzrlib/builtins.py:2121 |
846 | 1019 | msgid "" | 1019 | msgid "" |
847 | 1020 | "List files deleted in the working tree.\n" | 1020 | "List files deleted in the working tree.\n" |
848 | 1021 | " " | 1021 | " " |
849 | 1022 | msgstr "" | 1022 | msgstr "" |
850 | 1023 | 1023 | ||
852 | 1024 | #: bzrlib/builtins.py:2200 | 1024 | #: bzrlib/builtins.py:2199 |
853 | 1025 | msgid "Show the tree root directory." | 1025 | msgid "Show the tree root directory." |
854 | 1026 | msgstr "" | 1026 | msgstr "" |
855 | 1027 | 1027 | ||
857 | 1028 | #: bzrlib/builtins.py:2202 | 1028 | #: bzrlib/builtins.py:2201 |
858 | 1029 | msgid "" | 1029 | msgid "" |
859 | 1030 | "The root is the nearest enclosing directory with a .bzr control\n" | 1030 | "The root is the nearest enclosing directory with a .bzr control\n" |
860 | 1031 | "directory." | 1031 | "directory." |
861 | 1032 | msgstr "" | 1032 | msgstr "" |
862 | 1033 | 1033 | ||
864 | 1034 | #: bzrlib/builtins.py:2230 | 1034 | #: bzrlib/builtins.py:2229 |
865 | 1035 | msgid "Show historical log for a branch or subset of a branch." | 1035 | msgid "Show historical log for a branch or subset of a branch." |
866 | 1036 | msgstr "" | 1036 | msgstr "" |
867 | 1037 | 1037 | ||
869 | 1038 | #: bzrlib/builtins.py:2232 | 1038 | #: bzrlib/builtins.py:2231 |
870 | 1039 | msgid "" | 1039 | msgid "" |
871 | 1040 | "log is bzr's default tool for exploring the history of a branch.\n" | 1040 | "log is bzr's default tool for exploring the history of a branch.\n" |
872 | 1041 | "The branch to use is taken from the first parameter. If no parameters\n" | 1041 | "The branch to use is taken from the first parameter. If no parameters\n" |
873 | @@ -1043,14 +1043,14 @@ | |||
874 | 1043 | "Here are some simple examples::" | 1043 | "Here are some simple examples::" |
875 | 1044 | msgstr "" | 1044 | msgstr "" |
876 | 1045 | 1045 | ||
878 | 1046 | #: bzrlib/builtins.py:2237 | 1046 | #: bzrlib/builtins.py:2236 |
879 | 1047 | msgid "" | 1047 | msgid "" |
880 | 1048 | " bzr log log the current branch\n" | 1048 | " bzr log log the current branch\n" |
881 | 1049 | " bzr log foo.py log a file in its branch\n" | 1049 | " bzr log foo.py log a file in its branch\n" |
882 | 1050 | " bzr log http://server/branch log a branch on a server" | 1050 | " bzr log http://server/branch log a branch on a server" |
883 | 1051 | msgstr "" | 1051 | msgstr "" |
884 | 1052 | 1052 | ||
886 | 1053 | #: bzrlib/builtins.py:2241 | 1053 | #: bzrlib/builtins.py:2240 |
887 | 1054 | msgid "" | 1054 | msgid "" |
888 | 1055 | "The filtering, ordering and information shown for each revision can\n" | 1055 | "The filtering, ordering and information shown for each revision can\n" |
889 | 1056 | "be controlled as explained below. By default, all revisions are\n" | 1056 | "be controlled as explained below. By default, all revisions are\n" |
890 | @@ -1060,11 +1060,11 @@ | |||
891 | 1060 | "were merged." | 1060 | "were merged." |
892 | 1061 | msgstr "" | 1061 | msgstr "" |
893 | 1062 | 1062 | ||
895 | 1063 | #: bzrlib/builtins.py:2248 | 1063 | #: bzrlib/builtins.py:2247 |
896 | 1064 | msgid ":Output control:" | 1064 | msgid ":Output control:" |
897 | 1065 | msgstr "" | 1065 | msgstr "" |
898 | 1066 | 1066 | ||
900 | 1067 | #: bzrlib/builtins.py:2250 | 1067 | #: bzrlib/builtins.py:2249 |
901 | 1068 | msgid "" | 1068 | msgid "" |
902 | 1069 | " The log format controls how information about each revision is\n" | 1069 | " The log format controls how information about each revision is\n" |
903 | 1070 | " displayed. The standard log formats are called ``long``, ``short``\n" | 1070 | " displayed. The standard log formats are called ``long``, ``short``\n" |
904 | @@ -1072,13 +1072,13 @@ | |||
905 | 1072 | " for more details on log formats." | 1072 | " for more details on log formats." |
906 | 1073 | msgstr "" | 1073 | msgstr "" |
907 | 1074 | 1074 | ||
909 | 1075 | #: bzrlib/builtins.py:2255 | 1075 | #: bzrlib/builtins.py:2254 |
910 | 1076 | msgid "" | 1076 | msgid "" |
911 | 1077 | " The following options can be used to control what information is\n" | 1077 | " The following options can be used to control what information is\n" |
912 | 1078 | " displayed::" | 1078 | " displayed::" |
913 | 1079 | msgstr "" | 1079 | msgstr "" |
914 | 1080 | 1080 | ||
916 | 1081 | #: bzrlib/builtins.py:2258 | 1081 | #: bzrlib/builtins.py:2257 |
917 | 1082 | msgid "" | 1082 | msgid "" |
918 | 1083 | " -l N display a maximum of N revisions\n" | 1083 | " -l N display a maximum of N revisions\n" |
919 | 1084 | " -n N display N levels of revisions (0 for all, 1 for collapsed)\n" | 1084 | " -n N display N levels of revisions (0 for all, 1 for collapsed)\n" |
920 | @@ -1087,25 +1087,25 @@ | |||
921 | 1087 | " --show-ids display revision-ids (and file-ids), not just revnos" | 1087 | " --show-ids display revision-ids (and file-ids), not just revnos" |
922 | 1088 | msgstr "" | 1088 | msgstr "" |
923 | 1089 | 1089 | ||
925 | 1090 | #: bzrlib/builtins.py:2264 | 1090 | #: bzrlib/builtins.py:2263 |
926 | 1091 | msgid "" | 1091 | msgid "" |
927 | 1092 | " Note that the default number of levels to display is a function of the\n" | 1092 | " Note that the default number of levels to display is a function of the\n" |
928 | 1093 | " log format. If the -n option is not used, the standard log formats show\n" | 1093 | " log format. If the -n option is not used, the standard log formats show\n" |
929 | 1094 | " just the top level (mainline)." | 1094 | " just the top level (mainline)." |
930 | 1095 | msgstr "" | 1095 | msgstr "" |
931 | 1096 | 1096 | ||
933 | 1097 | #: bzrlib/builtins.py:2268 | 1097 | #: bzrlib/builtins.py:2267 |
934 | 1098 | msgid "" | 1098 | msgid "" |
935 | 1099 | " Status summaries are shown using status flags like A, M, etc. To see\n" | 1099 | " Status summaries are shown using status flags like A, M, etc. To see\n" |
936 | 1100 | " the changes explained using words like ``added`` and ``modified``\n" | 1100 | " the changes explained using words like ``added`` and ``modified``\n" |
937 | 1101 | " instead, use the -vv option." | 1101 | " instead, use the -vv option." |
938 | 1102 | msgstr "" | 1102 | msgstr "" |
939 | 1103 | 1103 | ||
941 | 1104 | #: bzrlib/builtins.py:2272 | 1104 | #: bzrlib/builtins.py:2271 |
942 | 1105 | msgid ":Ordering control:" | 1105 | msgid ":Ordering control:" |
943 | 1106 | msgstr "" | 1106 | msgstr "" |
944 | 1107 | 1107 | ||
946 | 1108 | #: bzrlib/builtins.py:2274 | 1108 | #: bzrlib/builtins.py:2273 |
947 | 1109 | msgid "" | 1109 | msgid "" |
948 | 1110 | " To display revisions from oldest to newest, use the --forward option.\n" | 1110 | " To display revisions from oldest to newest, use the --forward option.\n" |
949 | 1111 | " In most cases, using this option will have little impact on the total\n" | 1111 | " In most cases, using this option will have little impact on the total\n" |
950 | @@ -1113,17 +1113,17 @@ | |||
951 | 1113 | " display revisions like --reverse does when it can." | 1113 | " display revisions like --reverse does when it can." |
952 | 1114 | msgstr "" | 1114 | msgstr "" |
953 | 1115 | 1115 | ||
955 | 1116 | #: bzrlib/builtins.py:2279 | 1116 | #: bzrlib/builtins.py:2278 |
956 | 1117 | msgid ":Revision filtering:" | 1117 | msgid ":Revision filtering:" |
957 | 1118 | msgstr "" | 1118 | msgstr "" |
958 | 1119 | 1119 | ||
960 | 1120 | #: bzrlib/builtins.py:2281 | 1120 | #: bzrlib/builtins.py:2280 |
961 | 1121 | msgid "" | 1121 | msgid "" |
962 | 1122 | " The -r option can be used to specify what revision or range of revisions\n" | 1122 | " The -r option can be used to specify what revision or range of revisions\n" |
963 | 1123 | " to filter against. The various forms are shown below::" | 1123 | " to filter against. The various forms are shown below::" |
964 | 1124 | msgstr "" | 1124 | msgstr "" |
965 | 1125 | 1125 | ||
967 | 1126 | #: bzrlib/builtins.py:2284 | 1126 | #: bzrlib/builtins.py:2283 |
968 | 1127 | msgid "" | 1127 | msgid "" |
969 | 1128 | " -rX display revision X\n" | 1128 | " -rX display revision X\n" |
970 | 1129 | " -rX.. display revision X and later\n" | 1129 | " -rX.. display revision X and later\n" |
971 | @@ -1131,13 +1131,13 @@ | |||
972 | 1131 | " -rX..Y display from X to Y inclusive" | 1131 | " -rX..Y display from X to Y inclusive" |
973 | 1132 | msgstr "" | 1132 | msgstr "" |
974 | 1133 | 1133 | ||
976 | 1134 | #: bzrlib/builtins.py:2289 | 1134 | #: bzrlib/builtins.py:2288 |
977 | 1135 | msgid "" | 1135 | msgid "" |
978 | 1136 | " See ``bzr help revisionspec`` for details on how to specify X and Y.\n" | 1136 | " See ``bzr help revisionspec`` for details on how to specify X and Y.\n" |
979 | 1137 | " Some common examples are given below::" | 1137 | " Some common examples are given below::" |
980 | 1138 | msgstr "" | 1138 | msgstr "" |
981 | 1139 | 1139 | ||
983 | 1140 | #: bzrlib/builtins.py:2292 | 1140 | #: bzrlib/builtins.py:2291 |
984 | 1141 | msgid "" | 1141 | msgid "" |
985 | 1142 | " -r-1 show just the tip\n" | 1142 | " -r-1 show just the tip\n" |
986 | 1143 | " -r-10.. show the last 10 mainline revisions\n" | 1143 | " -r-10.. show the last 10 mainline revisions\n" |
987 | @@ -1147,7 +1147,7 @@ | |||
988 | 1147 | " -rdate:yesterday.. show changes since yesterday" | 1147 | " -rdate:yesterday.. show changes since yesterday" |
989 | 1148 | msgstr "" | 1148 | msgstr "" |
990 | 1149 | 1149 | ||
992 | 1150 | #: bzrlib/builtins.py:2299 | 1150 | #: bzrlib/builtins.py:2298 |
993 | 1151 | msgid "" | 1151 | msgid "" |
994 | 1152 | " When logging a range of revisions using -rX..Y, log starts at\n" | 1152 | " When logging a range of revisions using -rX..Y, log starts at\n" |
995 | 1153 | " revision Y and searches back in history through the primary\n" | 1153 | " revision Y and searches back in history through the primary\n" |
996 | @@ -1157,73 +1157,73 @@ | |||
997 | 1157 | " a nested merge revision and the log will be truncated accordingly." | 1157 | " a nested merge revision and the log will be truncated accordingly." |
998 | 1158 | msgstr "" | 1158 | msgstr "" |
999 | 1159 | 1159 | ||
1001 | 1160 | #: bzrlib/builtins.py:2306 | 1160 | #: bzrlib/builtins.py:2305 |
1002 | 1161 | msgid ":Path filtering:" | 1161 | msgid ":Path filtering:" |
1003 | 1162 | msgstr "" | 1162 | msgstr "" |
1004 | 1163 | 1163 | ||
1006 | 1164 | #: bzrlib/builtins.py:2308 | 1164 | #: bzrlib/builtins.py:2307 |
1007 | 1165 | msgid "" | 1165 | msgid "" |
1008 | 1166 | " If parameters are given and the first one is not a branch, the log\n" | 1166 | " If parameters are given and the first one is not a branch, the log\n" |
1009 | 1167 | " will be filtered to show only those revisions that changed the\n" | 1167 | " will be filtered to show only those revisions that changed the\n" |
1010 | 1168 | " nominated files or directories." | 1168 | " nominated files or directories." |
1011 | 1169 | msgstr "" | 1169 | msgstr "" |
1012 | 1170 | 1170 | ||
1014 | 1171 | #: bzrlib/builtins.py:2312 | 1171 | #: bzrlib/builtins.py:2311 |
1015 | 1172 | msgid "" | 1172 | msgid "" |
1016 | 1173 | " Filenames are interpreted within their historical context. To log a\n" | 1173 | " Filenames are interpreted within their historical context. To log a\n" |
1017 | 1174 | " deleted file, specify a revision range so that the file existed at\n" | 1174 | " deleted file, specify a revision range so that the file existed at\n" |
1018 | 1175 | " the end or start of the range." | 1175 | " the end or start of the range." |
1019 | 1176 | msgstr "" | 1176 | msgstr "" |
1020 | 1177 | 1177 | ||
1022 | 1178 | #: bzrlib/builtins.py:2316 | 1178 | #: bzrlib/builtins.py:2315 |
1023 | 1179 | msgid "" | 1179 | msgid "" |
1024 | 1180 | " Historical context is also important when interpreting pathnames of\n" | 1180 | " Historical context is also important when interpreting pathnames of\n" |
1025 | 1181 | " renamed files/directories. Consider the following example:" | 1181 | " renamed files/directories. Consider the following example:" |
1026 | 1182 | msgstr "" | 1182 | msgstr "" |
1027 | 1183 | 1183 | ||
1029 | 1184 | #: bzrlib/builtins.py:2319 | 1184 | #: bzrlib/builtins.py:2318 |
1030 | 1185 | msgid "" | 1185 | msgid "" |
1031 | 1186 | " * revision 1: add tutorial.txt\n" | 1186 | " * revision 1: add tutorial.txt\n" |
1032 | 1187 | " * revision 2: modify tutorial.txt\n" | 1187 | " * revision 2: modify tutorial.txt\n" |
1033 | 1188 | " * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt" | 1188 | " * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt" |
1034 | 1189 | msgstr "" | 1189 | msgstr "" |
1035 | 1190 | 1190 | ||
1037 | 1191 | #: bzrlib/builtins.py:2323 | 1191 | #: bzrlib/builtins.py:2322 |
1038 | 1192 | msgid " In this case:" | 1192 | msgid " In this case:" |
1039 | 1193 | msgstr "" | 1193 | msgstr "" |
1040 | 1194 | 1194 | ||
1042 | 1195 | #: bzrlib/builtins.py:2325 | 1195 | #: bzrlib/builtins.py:2324 |
1043 | 1196 | msgid " * ``bzr log guide.txt`` will log the file added in revision 1" | 1196 | msgid " * ``bzr log guide.txt`` will log the file added in revision 1" |
1044 | 1197 | msgstr "" | 1197 | msgstr "" |
1045 | 1198 | 1198 | ||
1047 | 1199 | #: bzrlib/builtins.py:2327 | 1199 | #: bzrlib/builtins.py:2326 |
1048 | 1200 | msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3" | 1200 | msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3" |
1049 | 1201 | msgstr "" | 1201 | msgstr "" |
1050 | 1202 | 1202 | ||
1052 | 1203 | #: bzrlib/builtins.py:2329 | 1203 | #: bzrlib/builtins.py:2328 |
1053 | 1204 | msgid "" | 1204 | msgid "" |
1054 | 1205 | " * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n" | 1205 | " * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n" |
1055 | 1206 | " the original file in revision 2." | 1206 | " the original file in revision 2." |
1056 | 1207 | msgstr "" | 1207 | msgstr "" |
1057 | 1208 | 1208 | ||
1059 | 1209 | #: bzrlib/builtins.py:2332 | 1209 | #: bzrlib/builtins.py:2331 |
1060 | 1210 | msgid "" | 1210 | msgid "" |
1061 | 1211 | " * ``bzr log -r2 -p guide.txt`` will display an error message as there\n" | 1211 | " * ``bzr log -r2 -p guide.txt`` will display an error message as there\n" |
1062 | 1212 | " was no file called guide.txt in revision 2." | 1212 | " was no file called guide.txt in revision 2." |
1063 | 1213 | msgstr "" | 1213 | msgstr "" |
1064 | 1214 | 1214 | ||
1066 | 1215 | #: bzrlib/builtins.py:2335 | 1215 | #: bzrlib/builtins.py:2334 |
1067 | 1216 | msgid "" | 1216 | msgid "" |
1068 | 1217 | " Renames are always followed by log. By design, there is no need to\n" | 1217 | " Renames are always followed by log. By design, there is no need to\n" |
1069 | 1218 | " explicitly ask for this (and no way to stop logging a file back\n" | 1218 | " explicitly ask for this (and no way to stop logging a file back\n" |
1070 | 1219 | " until it was last renamed)." | 1219 | " until it was last renamed)." |
1071 | 1220 | msgstr "" | 1220 | msgstr "" |
1072 | 1221 | 1221 | ||
1074 | 1222 | #: bzrlib/builtins.py:2339 | 1222 | #: bzrlib/builtins.py:2338 |
1075 | 1223 | msgid ":Other filtering:" | 1223 | msgid ":Other filtering:" |
1076 | 1224 | msgstr "" | 1224 | msgstr "" |
1077 | 1225 | 1225 | ||
1079 | 1226 | #: bzrlib/builtins.py:2341 | 1226 | #: bzrlib/builtins.py:2340 |
1080 | 1227 | msgid "" | 1227 | msgid "" |
1081 | 1228 | " The --match option can be used for finding revisions that match a\n" | 1228 | " The --match option can be used for finding revisions that match a\n" |
1082 | 1229 | " regular expression in a commit message, committer, author or bug.\n" | 1229 | " regular expression in a commit message, committer, author or bug.\n" |
1083 | @@ -1232,11 +1232,11 @@ | |||
1084 | 1232 | " --match-message can be used to only match a specific field." | 1232 | " --match-message can be used to only match a specific field." |
1085 | 1233 | msgstr "" | 1233 | msgstr "" |
1086 | 1234 | 1234 | ||
1088 | 1235 | #: bzrlib/builtins.py:2347 | 1235 | #: bzrlib/builtins.py:2346 |
1089 | 1236 | msgid ":Tips & tricks:" | 1236 | msgid ":Tips & tricks:" |
1090 | 1237 | msgstr "" | 1237 | msgstr "" |
1091 | 1238 | 1238 | ||
1093 | 1239 | #: bzrlib/builtins.py:2349 | 1239 | #: bzrlib/builtins.py:2348 |
1094 | 1240 | msgid "" | 1240 | msgid "" |
1095 | 1241 | " GUI tools and IDEs are often better at exploring history than command\n" | 1241 | " GUI tools and IDEs are often better at exploring history than command\n" |
1096 | 1242 | " line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n" | 1242 | " line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n" |
1097 | @@ -1245,11 +1245,11 @@ | |||
1098 | 1245 | " <http://wiki.bazaar.canonical.com/IDEIntegration>. " | 1245 | " <http://wiki.bazaar.canonical.com/IDEIntegration>. " |
1099 | 1246 | msgstr "" | 1246 | msgstr "" |
1100 | 1247 | 1247 | ||
1102 | 1248 | #: bzrlib/builtins.py:2355 | 1248 | #: bzrlib/builtins.py:2354 |
1103 | 1249 | msgid " You may find it useful to add the aliases below to ``bazaar.conf``::" | 1249 | msgid " You may find it useful to add the aliases below to ``bazaar.conf``::" |
1104 | 1250 | msgstr "" | 1250 | msgstr "" |
1105 | 1251 | 1251 | ||
1107 | 1252 | #: bzrlib/builtins.py:2357 | 1252 | #: bzrlib/builtins.py:2356 |
1108 | 1253 | msgid "" | 1253 | msgid "" |
1109 | 1254 | " [ALIASES]\n" | 1254 | " [ALIASES]\n" |
1110 | 1255 | " tip = log -r-1\n" | 1255 | " tip = log -r-1\n" |
1111 | @@ -1257,20 +1257,20 @@ | |||
1112 | 1257 | " show = log -v -p" | 1257 | " show = log -v -p" |
1113 | 1258 | msgstr "" | 1258 | msgstr "" |
1114 | 1259 | 1259 | ||
1116 | 1260 | #: bzrlib/builtins.py:2362 | 1260 | #: bzrlib/builtins.py:2361 |
1117 | 1261 | msgid "" | 1261 | msgid "" |
1118 | 1262 | " ``bzr tip`` will then show the latest revision while ``bzr top``\n" | 1262 | " ``bzr tip`` will then show the latest revision while ``bzr top``\n" |
1119 | 1263 | " will show the last 10 mainline revisions. To see the details of a\n" | 1263 | " will show the last 10 mainline revisions. To see the details of a\n" |
1120 | 1264 | " particular revision X, ``bzr show -rX``." | 1264 | " particular revision X, ``bzr show -rX``." |
1121 | 1265 | msgstr "" | 1265 | msgstr "" |
1122 | 1266 | 1266 | ||
1124 | 1267 | #: bzrlib/builtins.py:2366 | 1267 | #: bzrlib/builtins.py:2365 |
1125 | 1268 | msgid "" | 1268 | msgid "" |
1126 | 1269 | " If you are interested in looking deeper into a particular merge X,\n" | 1269 | " If you are interested in looking deeper into a particular merge X,\n" |
1127 | 1270 | " use ``bzr log -n0 -rX``." | 1270 | " use ``bzr log -n0 -rX``." |
1128 | 1271 | msgstr "" | 1271 | msgstr "" |
1129 | 1272 | 1272 | ||
1131 | 1273 | #: bzrlib/builtins.py:2369 | 1273 | #: bzrlib/builtins.py:2368 |
1132 | 1274 | msgid "" | 1274 | msgid "" |
1133 | 1275 | " ``bzr log -v`` on a branch with lots of history is currently\n" | 1275 | " ``bzr log -v`` on a branch with lots of history is currently\n" |
1134 | 1276 | " very slow. A fix for this issue is currently under development.\n" | 1276 | " very slow. A fix for this issue is currently under development.\n" |
1135 | @@ -1278,7 +1278,7 @@ | |||
1136 | 1278 | " be given when using the -v option." | 1278 | " be given when using the -v option." |
1137 | 1279 | msgstr "" | 1279 | msgstr "" |
1138 | 1280 | 1280 | ||
1140 | 1281 | #: bzrlib/builtins.py:2374 | 1281 | #: bzrlib/builtins.py:2373 |
1141 | 1282 | msgid "" | 1282 | msgid "" |
1142 | 1283 | " bzr has a generic full-text matching plugin, bzr-search, that can be\n" | 1283 | " bzr has a generic full-text matching plugin, bzr-search, that can be\n" |
1143 | 1284 | " used to find revisions matching user names, commit messages, etc.\n" | 1284 | " used to find revisions matching user names, commit messages, etc.\n" |
1144 | @@ -1286,7 +1286,7 @@ | |||
1145 | 1286 | " a list of words but not others." | 1286 | " a list of words but not others." |
1146 | 1287 | msgstr "" | 1287 | msgstr "" |
1147 | 1288 | 1288 | ||
1149 | 1289 | #: bzrlib/builtins.py:2379 | 1289 | #: bzrlib/builtins.py:2378 |
1150 | 1290 | msgid "" | 1290 | msgid "" |
1151 | 1291 | " When exploring non-mainline history on large projects with deep\n" | 1291 | " When exploring non-mainline history on large projects with deep\n" |
1152 | 1292 | " history, the performance of log can be greatly improved by installing\n" | 1292 | " history, the performance of log can be greatly improved by installing\n" |
1153 | @@ -1295,132 +1295,132 @@ | |||
1154 | 1295 | msgstr "" | 1295 | msgstr "" |
1155 | 1296 | 1296 | ||
1156 | 1297 | # help of 'forward' option of 'log' command | 1297 | # help of 'forward' option of 'log' command |
1158 | 1298 | #: bzrlib/builtins.py:2388 | 1298 | #: bzrlib/builtins.py:2387 |
1159 | 1299 | msgid "Show from oldest to newest." | 1299 | msgid "Show from oldest to newest." |
1160 | 1300 | msgstr "" | 1300 | msgstr "" |
1161 | 1301 | 1301 | ||
1162 | 1302 | # help of 'verbose' option of 'log' command | 1302 | # help of 'verbose' option of 'log' command |
1164 | 1303 | #: bzrlib/builtins.py:2391 | 1303 | #: bzrlib/builtins.py:2390 |
1165 | 1304 | msgid "Show files changed in each revision." | 1304 | msgid "Show files changed in each revision." |
1166 | 1305 | msgstr "" | 1305 | msgstr "" |
1167 | 1306 | 1306 | ||
1168 | 1307 | # help of 'change' option of 'log' command | 1307 | # help of 'change' option of 'log' command |
1170 | 1308 | #: bzrlib/builtins.py:2397 | 1308 | #: bzrlib/builtins.py:2396 |
1171 | 1309 | msgid "Show just the specified revision. See also \"help revisionspec\"." | 1309 | msgid "Show just the specified revision. See also \"help revisionspec\"." |
1172 | 1310 | msgstr "" | 1310 | msgstr "" |
1173 | 1311 | 1311 | ||
1174 | 1312 | # help of 'authors' option of 'log' command | 1312 | # help of 'authors' option of 'log' command |
1176 | 1313 | #: bzrlib/builtins.py:2401 | 1313 | #: bzrlib/builtins.py:2400 |
1177 | 1314 | msgid "What names to list as authors - first, all or committer." | 1314 | msgid "What names to list as authors - first, all or committer." |
1178 | 1315 | msgstr "" | 1315 | msgstr "" |
1179 | 1316 | 1316 | ||
1180 | 1317 | # title of 'authors' option of 'log' command | 1317 | # title of 'authors' option of 'log' command |
1182 | 1318 | #: bzrlib/builtins.py:2402 | 1318 | #: bzrlib/builtins.py:2401 |
1183 | 1319 | msgid "Authors" | 1319 | msgid "Authors" |
1184 | 1320 | msgstr "" | 1320 | msgstr "" |
1185 | 1321 | 1321 | ||
1186 | 1322 | # help of 'levels' option of 'log' command | 1322 | # help of 'levels' option of 'log' command |
1188 | 1323 | #: bzrlib/builtins.py:2407 | 1323 | #: bzrlib/builtins.py:2406 |
1189 | 1324 | msgid "Number of levels to display - 0 for all, 1 for flat." | 1324 | msgid "Number of levels to display - 0 for all, 1 for flat." |
1190 | 1325 | msgstr "" | 1325 | msgstr "" |
1191 | 1326 | 1326 | ||
1192 | 1327 | # help of 'limit' option of 'log' command | 1327 | # help of 'limit' option of 'log' command |
1194 | 1328 | #: bzrlib/builtins.py:2417 | 1328 | #: bzrlib/builtins.py:2416 |
1195 | 1329 | msgid "Limit the output to the first N revisions." | 1329 | msgid "Limit the output to the first N revisions." |
1196 | 1330 | msgstr "" | 1330 | msgstr "" |
1197 | 1331 | 1331 | ||
1198 | 1332 | # help of 'show-diff' option of 'log' command | 1332 | # help of 'show-diff' option of 'log' command |
1200 | 1333 | #: bzrlib/builtins.py:2422 | 1333 | #: bzrlib/builtins.py:2421 |
1201 | 1334 | msgid "Show changes made in each revision as a patch." | 1334 | msgid "Show changes made in each revision as a patch." |
1202 | 1335 | msgstr "" | 1335 | msgstr "" |
1203 | 1336 | 1336 | ||
1204 | 1337 | # help of 'include-merges' option of 'log' command | 1337 | # help of 'include-merges' option of 'log' command |
1206 | 1338 | #: bzrlib/builtins.py:2424 | 1338 | #: bzrlib/builtins.py:2423 |
1207 | 1339 | msgid "Show merged revisions like --levels 0 does." | 1339 | msgid "Show merged revisions like --levels 0 does." |
1208 | 1340 | msgstr "" | 1340 | msgstr "" |
1209 | 1341 | 1341 | ||
1210 | 1342 | # help of 'exclude-common-ancestry' option of 'log' command | 1342 | # help of 'exclude-common-ancestry' option of 'log' command |
1212 | 1343 | #: bzrlib/builtins.py:2426 | 1343 | #: bzrlib/builtins.py:2425 |
1213 | 1344 | msgid "" | 1344 | msgid "" |
1214 | 1345 | "Display only the revisions that are not part of both ancestries (require -" | 1345 | "Display only the revisions that are not part of both ancestries (require -" |
1215 | 1346 | "rX..Y)" | 1346 | "rX..Y)" |
1216 | 1347 | msgstr "" | 1347 | msgstr "" |
1217 | 1348 | 1348 | ||
1218 | 1349 | # help of 'signatures' option of 'log' command | 1349 | # help of 'signatures' option of 'log' command |
1220 | 1350 | #: bzrlib/builtins.py:2430 | 1350 | #: bzrlib/builtins.py:2429 |
1221 | 1351 | msgid "Show digital signature validity" | 1351 | msgid "Show digital signature validity" |
1222 | 1352 | msgstr "" | 1352 | msgstr "" |
1223 | 1353 | 1353 | ||
1224 | 1354 | # help of 'match' option of 'log' command | 1354 | # help of 'match' option of 'log' command |
1226 | 1355 | #: bzrlib/builtins.py:2433 | 1355 | #: bzrlib/builtins.py:2432 |
1227 | 1356 | msgid "Show revisions whose properties match this expression." | 1356 | msgid "Show revisions whose properties match this expression." |
1228 | 1357 | msgstr "" | 1357 | msgstr "" |
1229 | 1358 | 1358 | ||
1230 | 1359 | # help of 'match-message' option of 'log' command | 1359 | # help of 'match-message' option of 'log' command |
1232 | 1360 | #: bzrlib/builtins.py:2437 | 1360 | #: bzrlib/builtins.py:2436 |
1233 | 1361 | msgid "Show revisions whose message matches this expression." | 1361 | msgid "Show revisions whose message matches this expression." |
1234 | 1362 | msgstr "" | 1362 | msgstr "" |
1235 | 1363 | 1363 | ||
1236 | 1364 | # help of 'match-committer' option of 'log' command | 1364 | # help of 'match-committer' option of 'log' command |
1238 | 1365 | #: bzrlib/builtins.py:2441 | 1365 | #: bzrlib/builtins.py:2440 |
1239 | 1366 | msgid "Show revisions whose committer matches this expression." | 1366 | msgid "Show revisions whose committer matches this expression." |
1240 | 1367 | msgstr "" | 1367 | msgstr "" |
1241 | 1368 | 1368 | ||
1242 | 1369 | # help of 'match-author' option of 'log' command | 1369 | # help of 'match-author' option of 'log' command |
1244 | 1370 | #: bzrlib/builtins.py:2445 | 1370 | #: bzrlib/builtins.py:2444 |
1245 | 1371 | msgid "Show revisions whose authors match this expression." | 1371 | msgid "Show revisions whose authors match this expression." |
1246 | 1372 | msgstr "" | 1372 | msgstr "" |
1247 | 1373 | 1373 | ||
1248 | 1374 | # help of 'match-bugs' option of 'log' command | 1374 | # help of 'match-bugs' option of 'log' command |
1250 | 1375 | #: bzrlib/builtins.py:2449 | 1375 | #: bzrlib/builtins.py:2448 |
1251 | 1376 | msgid "Show revisions whose bugs match this expression." | 1376 | msgid "Show revisions whose bugs match this expression." |
1252 | 1377 | msgstr "" | 1377 | msgstr "" |
1253 | 1378 | 1378 | ||
1255 | 1379 | #: bzrlib/builtins.py:2690 | 1379 | #: bzrlib/builtins.py:2689 |
1256 | 1380 | msgid "" | 1380 | msgid "" |
1257 | 1381 | "List files in a tree.\n" | 1381 | "List files in a tree.\n" |
1258 | 1382 | " " | 1382 | " " |
1259 | 1383 | msgstr "" | 1383 | msgstr "" |
1260 | 1384 | 1384 | ||
1261 | 1385 | # help of 'recursive' option of 'ls' command | 1385 | # help of 'recursive' option of 'ls' command |
1263 | 1386 | #: bzrlib/builtins.py:2699 | 1386 | #: bzrlib/builtins.py:2698 |
1264 | 1387 | msgid "Recurse into subdirectories." | 1387 | msgid "Recurse into subdirectories." |
1265 | 1388 | msgstr "" | 1388 | msgstr "" |
1266 | 1389 | 1389 | ||
1267 | 1390 | # help of 'from-root' option of 'ls' command | 1390 | # help of 'from-root' option of 'ls' command |
1269 | 1391 | #: bzrlib/builtins.py:2701 | 1391 | #: bzrlib/builtins.py:2700 |
1270 | 1392 | msgid "Print paths relative to the root of the branch." | 1392 | msgid "Print paths relative to the root of the branch." |
1271 | 1393 | msgstr "" | 1393 | msgstr "" |
1272 | 1394 | 1394 | ||
1273 | 1395 | # help of 'unknown' option of 'ls' command | 1395 | # help of 'unknown' option of 'ls' command |
1275 | 1396 | #: bzrlib/builtins.py:2703 | 1396 | #: bzrlib/builtins.py:2702 |
1276 | 1397 | msgid "Print unknown files." | 1397 | msgid "Print unknown files." |
1277 | 1398 | msgstr "" | 1398 | msgstr "" |
1278 | 1399 | 1399 | ||
1279 | 1400 | # help of 'versioned' option of 'ls' command | 1400 | # help of 'versioned' option of 'ls' command |
1281 | 1401 | #: bzrlib/builtins.py:2704 | 1401 | #: bzrlib/builtins.py:2703 |
1282 | 1402 | msgid "Print versioned files." | 1402 | msgid "Print versioned files." |
1283 | 1403 | msgstr "" | 1403 | msgstr "" |
1284 | 1404 | 1404 | ||
1285 | 1405 | # help of 'ignored' option of 'ls' command | 1405 | # help of 'ignored' option of 'ls' command |
1287 | 1406 | #: bzrlib/builtins.py:2707 | 1406 | #: bzrlib/builtins.py:2706 |
1288 | 1407 | msgid "Print ignored files." | 1407 | msgid "Print ignored files." |
1289 | 1408 | msgstr "" | 1408 | msgstr "" |
1290 | 1409 | 1409 | ||
1291 | 1410 | # help of 'kind' option of 'ls' command | 1410 | # help of 'kind' option of 'ls' command |
1293 | 1411 | #: bzrlib/builtins.py:2709 | 1411 | #: bzrlib/builtins.py:2708 |
1294 | 1412 | msgid "List entries of a particular kind: file, directory, symlink." | 1412 | msgid "List entries of a particular kind: file, directory, symlink." |
1295 | 1413 | msgstr "" | 1413 | msgstr "" |
1296 | 1414 | 1414 | ||
1298 | 1415 | #: bzrlib/builtins.py:2821 | 1415 | #: bzrlib/builtins.py:2820 |
1299 | 1416 | msgid "Ignore specified files or patterns." | 1416 | msgid "Ignore specified files or patterns." |
1300 | 1417 | msgstr "" | 1417 | msgstr "" |
1301 | 1418 | 1418 | ||
1303 | 1419 | #: bzrlib/builtins.py:2823 | 1419 | #: bzrlib/builtins.py:2822 |
1304 | 1420 | msgid "See ``bzr help patterns`` for details on the syntax of patterns." | 1420 | msgid "See ``bzr help patterns`` for details on the syntax of patterns." |
1305 | 1421 | msgstr "" | 1421 | msgstr "" |
1306 | 1422 | 1422 | ||
1308 | 1423 | #: bzrlib/builtins.py:2825 | 1423 | #: bzrlib/builtins.py:2824 |
1309 | 1424 | msgid "" | 1424 | msgid "" |
1310 | 1425 | "If a .bzrignore file does not exist, the ignore command\n" | 1425 | "If a .bzrignore file does not exist, the ignore command\n" |
1311 | 1426 | "will create one and add the specified files or patterns to the newly\n" | 1426 | "will create one and add the specified files or patterns to the newly\n" |
1312 | @@ -1429,7 +1429,7 @@ | |||
1313 | 1429 | "the use of the ignore command will require an explicit add command." | 1429 | "the use of the ignore command will require an explicit add command." |
1314 | 1430 | msgstr "" | 1430 | msgstr "" |
1315 | 1431 | 1431 | ||
1317 | 1432 | #: bzrlib/builtins.py:2831 | 1432 | #: bzrlib/builtins.py:2830 |
1318 | 1433 | msgid "" | 1433 | msgid "" |
1319 | 1434 | "To remove patterns from the ignore list, edit the .bzrignore file.\n" | 1434 | "To remove patterns from the ignore list, edit the .bzrignore file.\n" |
1320 | 1435 | "After adding, editing or deleting that file either indirectly by\n" | 1435 | "After adding, editing or deleting that file either indirectly by\n" |
1321 | @@ -1437,7 +1437,7 @@ | |||
1322 | 1437 | "it." | 1437 | "it." |
1323 | 1438 | msgstr "" | 1438 | msgstr "" |
1324 | 1439 | 1439 | ||
1326 | 1440 | #: bzrlib/builtins.py:2836 | 1440 | #: bzrlib/builtins.py:2835 |
1327 | 1441 | msgid "" | 1441 | msgid "" |
1328 | 1442 | "Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n" | 1442 | "Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n" |
1329 | 1443 | "the global ignore file can be found in the application data directory as\n" | 1443 | "the global ignore file can be found in the application data directory as\n" |
1330 | @@ -1446,20 +1446,20 @@ | |||
1331 | 1446 | "can be edited directly using an editor." | 1446 | "can be edited directly using an editor." |
1332 | 1447 | msgstr "" | 1447 | msgstr "" |
1333 | 1448 | 1448 | ||
1335 | 1449 | #: bzrlib/builtins.py:2842 | 1449 | #: bzrlib/builtins.py:2841 |
1336 | 1450 | msgid "" | 1450 | msgid "" |
1337 | 1451 | "Patterns prefixed with '!' are exceptions to ignore patterns and take\n" | 1451 | "Patterns prefixed with '!' are exceptions to ignore patterns and take\n" |
1338 | 1452 | "precedence over regular ignores. Such exceptions are used to specify\n" | 1452 | "precedence over regular ignores. Such exceptions are used to specify\n" |
1339 | 1453 | "files that should be versioned which would otherwise be ignored." | 1453 | "files that should be versioned which would otherwise be ignored." |
1340 | 1454 | msgstr "" | 1454 | msgstr "" |
1341 | 1455 | 1455 | ||
1343 | 1456 | #: bzrlib/builtins.py:2846 | 1456 | #: bzrlib/builtins.py:2845 |
1344 | 1457 | msgid "" | 1457 | msgid "" |
1345 | 1458 | "Patterns prefixed with '!!' act as regular ignore patterns, but have\n" | 1458 | "Patterns prefixed with '!!' act as regular ignore patterns, but have\n" |
1346 | 1459 | "precedence over the '!' exception patterns." | 1459 | "precedence over the '!' exception patterns." |
1347 | 1460 | msgstr "" | 1460 | msgstr "" |
1348 | 1461 | 1461 | ||
1350 | 1462 | #: bzrlib/builtins.py:2849 | 1462 | #: bzrlib/builtins.py:2848 |
1351 | 1463 | msgid "" | 1463 | msgid "" |
1352 | 1464 | ":Notes: \n" | 1464 | ":Notes: \n" |
1353 | 1465 | " \n" | 1465 | " \n" |
1354 | @@ -1467,63 +1467,63 @@ | |||
1355 | 1467 | " the shell on Unix." | 1467 | " the shell on Unix." |
1356 | 1468 | msgstr "" | 1468 | msgstr "" |
1357 | 1469 | 1469 | ||
1359 | 1470 | #: bzrlib/builtins.py:2854 | 1470 | #: bzrlib/builtins.py:2853 |
1360 | 1471 | msgid "" | 1471 | msgid "" |
1361 | 1472 | "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n" | 1472 | "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n" |
1362 | 1473 | " To ignore patterns that begin with that character, use the \"RE:\" prefix." | 1473 | " To ignore patterns that begin with that character, use the \"RE:\" prefix." |
1363 | 1474 | msgstr "" | 1474 | msgstr "" |
1364 | 1475 | 1475 | ||
1366 | 1476 | #: bzrlib/builtins.py:2857 | 1476 | #: bzrlib/builtins.py:2856 |
1367 | 1477 | msgid "" | 1477 | msgid "" |
1368 | 1478 | ":Examples:\n" | 1478 | ":Examples:\n" |
1369 | 1479 | " Ignore the top level Makefile::" | 1479 | " Ignore the top level Makefile::" |
1370 | 1480 | msgstr "" | 1480 | msgstr "" |
1371 | 1481 | 1481 | ||
1373 | 1482 | #: bzrlib/builtins.py:2860 | 1482 | #: bzrlib/builtins.py:2859 |
1374 | 1483 | msgid " bzr ignore ./Makefile" | 1483 | msgid " bzr ignore ./Makefile" |
1375 | 1484 | msgstr "" | 1484 | msgstr "" |
1376 | 1485 | 1485 | ||
1378 | 1486 | #: bzrlib/builtins.py:2862 | 1486 | #: bzrlib/builtins.py:2861 |
1379 | 1487 | msgid " Ignore .class files in all directories...::" | 1487 | msgid " Ignore .class files in all directories...::" |
1380 | 1488 | msgstr "" | 1488 | msgstr "" |
1381 | 1489 | 1489 | ||
1383 | 1490 | #: bzrlib/builtins.py:2864 | 1490 | #: bzrlib/builtins.py:2863 |
1384 | 1491 | msgid " bzr ignore \"*.class\"" | 1491 | msgid " bzr ignore \"*.class\"" |
1385 | 1492 | msgstr "" | 1492 | msgstr "" |
1386 | 1493 | 1493 | ||
1388 | 1494 | #: bzrlib/builtins.py:2866 | 1494 | #: bzrlib/builtins.py:2865 |
1389 | 1495 | msgid " ...but do not ignore \"special.class\"::" | 1495 | msgid " ...but do not ignore \"special.class\"::" |
1390 | 1496 | msgstr "" | 1496 | msgstr "" |
1391 | 1497 | 1497 | ||
1393 | 1498 | #: bzrlib/builtins.py:2868 | 1498 | #: bzrlib/builtins.py:2867 |
1394 | 1499 | msgid " bzr ignore \"!special.class\"" | 1499 | msgid " bzr ignore \"!special.class\"" |
1395 | 1500 | msgstr "" | 1500 | msgstr "" |
1396 | 1501 | 1501 | ||
1398 | 1502 | #: bzrlib/builtins.py:2870 | 1502 | #: bzrlib/builtins.py:2869 |
1399 | 1503 | msgid " Ignore files whose name begins with the \"#\" character::" | 1503 | msgid " Ignore files whose name begins with the \"#\" character::" |
1400 | 1504 | msgstr "" | 1504 | msgstr "" |
1401 | 1505 | 1505 | ||
1403 | 1506 | #: bzrlib/builtins.py:2872 | 1506 | #: bzrlib/builtins.py:2871 |
1404 | 1507 | msgid " bzr ignore \"RE:^#\"" | 1507 | msgid " bzr ignore \"RE:^#\"" |
1405 | 1508 | msgstr "" | 1508 | msgstr "" |
1406 | 1509 | 1509 | ||
1408 | 1510 | #: bzrlib/builtins.py:2874 | 1510 | #: bzrlib/builtins.py:2873 |
1409 | 1511 | msgid " Ignore .o files under the lib directory::" | 1511 | msgid " Ignore .o files under the lib directory::" |
1410 | 1512 | msgstr "" | 1512 | msgstr "" |
1411 | 1513 | 1513 | ||
1413 | 1514 | #: bzrlib/builtins.py:2876 | 1514 | #: bzrlib/builtins.py:2875 |
1414 | 1515 | msgid " bzr ignore \"lib/**/*.o\"" | 1515 | msgid " bzr ignore \"lib/**/*.o\"" |
1415 | 1516 | msgstr "" | 1516 | msgstr "" |
1416 | 1517 | 1517 | ||
1418 | 1518 | #: bzrlib/builtins.py:2880 | 1518 | #: bzrlib/builtins.py:2879 |
1419 | 1519 | msgid " bzr ignore \"RE:lib/.*\\.o\"" | 1519 | msgid " bzr ignore \"RE:lib/.*\\.o\"" |
1420 | 1520 | msgstr "" | 1520 | msgstr "" |
1421 | 1521 | 1521 | ||
1423 | 1522 | #: bzrlib/builtins.py:2882 | 1522 | #: bzrlib/builtins.py:2881 |
1424 | 1523 | msgid " Ignore everything but the \"debian\" toplevel directory::" | 1523 | msgid " Ignore everything but the \"debian\" toplevel directory::" |
1425 | 1524 | msgstr "" | 1524 | msgstr "" |
1426 | 1525 | 1525 | ||
1428 | 1526 | #: bzrlib/builtins.py:2884 | 1526 | #: bzrlib/builtins.py:2883 |
1429 | 1527 | msgid "" | 1527 | msgid "" |
1430 | 1528 | " bzr ignore \"RE:(?!debian/).*\"\n" | 1528 | " bzr ignore \"RE:(?!debian/).*\"\n" |
1431 | 1529 | " \n" | 1529 | " \n" |
1432 | @@ -1536,61 +1536,61 @@ | |||
1433 | 1536 | msgstr "" | 1536 | msgstr "" |
1434 | 1537 | 1537 | ||
1435 | 1538 | # help of 'default-rules' option of 'ignore' command | 1538 | # help of 'default-rules' option of 'ignore' command |
1437 | 1539 | #: bzrlib/builtins.py:2898 | 1539 | #: bzrlib/builtins.py:2897 |
1438 | 1540 | msgid "Display the default ignore rules that bzr uses." | 1540 | msgid "Display the default ignore rules that bzr uses." |
1439 | 1541 | msgstr "" | 1541 | msgstr "" |
1440 | 1542 | 1542 | ||
1442 | 1543 | #: bzrlib/builtins.py:2946 | 1543 | #: bzrlib/builtins.py:2945 |
1443 | 1544 | msgid "List ignored files and the patterns that matched them." | 1544 | msgid "List ignored files and the patterns that matched them." |
1444 | 1545 | msgstr "" | 1545 | msgstr "" |
1445 | 1546 | 1546 | ||
1447 | 1547 | #: bzrlib/builtins.py:2948 | 1547 | #: bzrlib/builtins.py:2947 |
1448 | 1548 | msgid "" | 1548 | msgid "" |
1449 | 1549 | "List all the ignored files and the ignore pattern that caused the file to\n" | 1549 | "List all the ignored files and the ignore pattern that caused the file to\n" |
1450 | 1550 | "be ignored." | 1550 | "be ignored." |
1451 | 1551 | msgstr "" | 1551 | msgstr "" |
1452 | 1552 | 1552 | ||
1454 | 1553 | #: bzrlib/builtins.py:2951 | 1553 | #: bzrlib/builtins.py:2950 |
1455 | 1554 | msgid "Alternatively, to list just the files::" | 1554 | msgid "Alternatively, to list just the files::" |
1456 | 1555 | msgstr "" | 1555 | msgstr "" |
1457 | 1556 | 1556 | ||
1459 | 1557 | #: bzrlib/builtins.py:2953 | 1557 | #: bzrlib/builtins.py:2952 |
1460 | 1558 | msgid " bzr ls --ignored" | 1558 | msgid " bzr ls --ignored" |
1461 | 1559 | msgstr "" | 1559 | msgstr "" |
1462 | 1560 | 1560 | ||
1464 | 1561 | #: bzrlib/builtins.py:2994 | 1561 | #: bzrlib/builtins.py:2993 |
1465 | 1562 | msgid "Export current or past revision to a destination directory or archive." | 1562 | msgid "Export current or past revision to a destination directory or archive." |
1466 | 1563 | msgstr "" | 1563 | msgstr "" |
1467 | 1564 | 1564 | ||
1469 | 1565 | #: bzrlib/builtins.py:2996 | 1565 | #: bzrlib/builtins.py:2995 |
1470 | 1566 | msgid "If no revision is specified this exports the last committed revision." | 1566 | msgid "If no revision is specified this exports the last committed revision." |
1471 | 1567 | msgstr "" | 1567 | msgstr "" |
1472 | 1568 | 1568 | ||
1474 | 1569 | #: bzrlib/builtins.py:2998 | 1569 | #: bzrlib/builtins.py:2997 |
1475 | 1570 | msgid "" | 1570 | msgid "" |
1476 | 1571 | "Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n" | 1571 | "Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n" |
1477 | 1572 | "given, try to find the format with the extension. If no extension\n" | 1572 | "given, try to find the format with the extension. If no extension\n" |
1478 | 1573 | "is found exports to a directory (equivalent to --format=dir)." | 1573 | "is found exports to a directory (equivalent to --format=dir)." |
1479 | 1574 | msgstr "" | 1574 | msgstr "" |
1480 | 1575 | 1575 | ||
1482 | 1576 | #: bzrlib/builtins.py:3002 | 1576 | #: bzrlib/builtins.py:3001 |
1483 | 1577 | msgid "" | 1577 | msgid "" |
1484 | 1578 | "If root is supplied, it will be used as the root directory inside\n" | 1578 | "If root is supplied, it will be used as the root directory inside\n" |
1485 | 1579 | "container formats (tar, zip, etc). If it is not supplied it will default\n" | 1579 | "container formats (tar, zip, etc). If it is not supplied it will default\n" |
1486 | 1580 | "to the exported filename. The root option has no effect for 'dir' format." | 1580 | "to the exported filename. The root option has no effect for 'dir' format." |
1487 | 1581 | msgstr "" | 1581 | msgstr "" |
1488 | 1582 | 1582 | ||
1490 | 1583 | #: bzrlib/builtins.py:3006 | 1583 | #: bzrlib/builtins.py:3005 |
1491 | 1584 | msgid "" | 1584 | msgid "" |
1492 | 1585 | "If branch is omitted then the branch containing the current working\n" | 1585 | "If branch is omitted then the branch containing the current working\n" |
1493 | 1586 | "directory will be used." | 1586 | "directory will be used." |
1494 | 1587 | msgstr "" | 1587 | msgstr "" |
1495 | 1588 | 1588 | ||
1497 | 1589 | #: bzrlib/builtins.py:3009 | 1589 | #: bzrlib/builtins.py:3008 |
1498 | 1590 | msgid "Note: Export of tree with non-ASCII filenames to zip is not supported." | 1590 | msgid "Note: Export of tree with non-ASCII filenames to zip is not supported." |
1499 | 1591 | msgstr "" | 1591 | msgstr "" |
1500 | 1592 | 1592 | ||
1502 | 1593 | #: bzrlib/builtins.py:3011 | 1593 | #: bzrlib/builtins.py:3010 |
1503 | 1594 | msgid "" | 1594 | msgid "" |
1504 | 1595 | " ================= =========================\n" | 1595 | " ================= =========================\n" |
1505 | 1596 | " Supported formats Autodetected by extension\n" | 1596 | " Supported formats Autodetected by extension\n" |
1506 | @@ -1604,51 +1604,51 @@ | |||
1507 | 1604 | msgstr "" | 1604 | msgstr "" |
1508 | 1605 | 1605 | ||
1509 | 1606 | # help of 'format' option of 'export' command | 1606 | # help of 'format' option of 'export' command |
1511 | 1607 | #: bzrlib/builtins.py:3025 | 1607 | #: bzrlib/builtins.py:3024 |
1512 | 1608 | msgid "Type of file to export to." | 1608 | msgid "Type of file to export to." |
1513 | 1609 | msgstr "" | 1609 | msgstr "" |
1514 | 1610 | 1610 | ||
1515 | 1611 | # help of 'filters' option of 'export' command | 1611 | # help of 'filters' option of 'export' command |
1517 | 1612 | #: bzrlib/builtins.py:3028 | 1612 | #: bzrlib/builtins.py:3027 |
1518 | 1613 | msgid "Apply content filters to export the convenient form." | 1613 | msgid "Apply content filters to export the convenient form." |
1519 | 1614 | msgstr "" | 1614 | msgstr "" |
1520 | 1615 | 1615 | ||
1521 | 1616 | # help of 'root' option of 'export' command | 1616 | # help of 'root' option of 'export' command |
1523 | 1617 | #: bzrlib/builtins.py:3032 | 1617 | #: bzrlib/builtins.py:3031 |
1524 | 1618 | msgid "Name of the root directory inside the exported file." | 1618 | msgid "Name of the root directory inside the exported file." |
1525 | 1619 | msgstr "" | 1619 | msgstr "" |
1526 | 1620 | 1620 | ||
1527 | 1621 | # help of 'per-file-timestamps' option of 'export' command | 1621 | # help of 'per-file-timestamps' option of 'export' command |
1529 | 1622 | #: bzrlib/builtins.py:3034 | 1622 | #: bzrlib/builtins.py:3033 |
1530 | 1623 | msgid "" | 1623 | msgid "" |
1531 | 1624 | "Set modification time of files to that of the last revision in which it was " | 1624 | "Set modification time of files to that of the last revision in which it was " |
1532 | 1625 | "changed." | 1625 | "changed." |
1533 | 1626 | msgstr "" | 1626 | msgstr "" |
1534 | 1627 | 1627 | ||
1536 | 1628 | #: bzrlib/builtins.py:3058 | 1628 | #: bzrlib/builtins.py:3057 |
1537 | 1629 | msgid "Write the contents of a file as of a given revision to standard output." | 1629 | msgid "Write the contents of a file as of a given revision to standard output." |
1538 | 1630 | msgstr "" | 1630 | msgstr "" |
1539 | 1631 | 1631 | ||
1541 | 1632 | #: bzrlib/builtins.py:3060 | 1632 | #: bzrlib/builtins.py:3059 |
1542 | 1633 | msgid "If no revision is nominated, the last revision is used." | 1633 | msgid "If no revision is nominated, the last revision is used." |
1543 | 1634 | msgstr "" | 1634 | msgstr "" |
1544 | 1635 | 1635 | ||
1546 | 1636 | #: bzrlib/builtins.py:3062 | 1636 | #: bzrlib/builtins.py:3061 |
1547 | 1637 | msgid "" | 1637 | msgid "" |
1548 | 1638 | "Note: Take care to redirect standard output when using this command on a\n" | 1638 | "Note: Take care to redirect standard output when using this command on a\n" |
1549 | 1639 | "binary file." | 1639 | "binary file." |
1550 | 1640 | msgstr "" | 1640 | msgstr "" |
1551 | 1641 | 1641 | ||
1552 | 1642 | # help of 'filters' option of 'cat' command | 1642 | # help of 'filters' option of 'cat' command |
1554 | 1643 | #: bzrlib/builtins.py:3069 | 1643 | #: bzrlib/builtins.py:3068 |
1555 | 1644 | msgid "Apply content filters to display the convenience form." | 1644 | msgid "Apply content filters to display the convenience form." |
1556 | 1645 | msgstr "" | 1645 | msgstr "" |
1557 | 1646 | 1646 | ||
1559 | 1647 | #: bzrlib/builtins.py:3140 | 1647 | #: bzrlib/builtins.py:3139 |
1560 | 1648 | msgid "Commit changes into a new revision." | 1648 | msgid "Commit changes into a new revision." |
1561 | 1649 | msgstr "" | 1649 | msgstr "" |
1562 | 1650 | 1650 | ||
1564 | 1651 | #: bzrlib/builtins.py:3142 | 1651 | #: bzrlib/builtins.py:3141 |
1565 | 1652 | msgid "" | 1652 | msgid "" |
1566 | 1653 | "An explanatory message needs to be given for each commit. This is\n" | 1653 | "An explanatory message needs to be given for each commit. This is\n" |
1567 | 1654 | "often done by using the --message option (getting the message from the\n" | 1654 | "often done by using the --message option (getting the message from the\n" |
1568 | @@ -1658,44 +1658,44 @@ | |||
1569 | 1658 | "boilerplate text loaded into the editor, use the --show-diff option." | 1658 | "boilerplate text loaded into the editor, use the --show-diff option." |
1570 | 1659 | msgstr "" | 1659 | msgstr "" |
1571 | 1660 | 1660 | ||
1573 | 1661 | #: bzrlib/builtins.py:3149 | 1661 | #: bzrlib/builtins.py:3148 |
1574 | 1662 | msgid "" | 1662 | msgid "" |
1575 | 1663 | "By default, the entire tree is committed and the person doing the\n" | 1663 | "By default, the entire tree is committed and the person doing the\n" |
1576 | 1664 | "commit is assumed to be the author. These defaults can be overridden\n" | 1664 | "commit is assumed to be the author. These defaults can be overridden\n" |
1577 | 1665 | "as explained below." | 1665 | "as explained below." |
1578 | 1666 | msgstr "" | 1666 | msgstr "" |
1579 | 1667 | 1667 | ||
1581 | 1668 | #: bzrlib/builtins.py:3153 | 1668 | #: bzrlib/builtins.py:3152 |
1582 | 1669 | msgid ":Selective commits:" | 1669 | msgid ":Selective commits:" |
1583 | 1670 | msgstr "" | 1670 | msgstr "" |
1584 | 1671 | 1671 | ||
1586 | 1672 | #: bzrlib/builtins.py:3155 | 1672 | #: bzrlib/builtins.py:3154 |
1587 | 1673 | msgid "" | 1673 | msgid "" |
1588 | 1674 | " If selected files are specified, only changes to those files are\n" | 1674 | " If selected files are specified, only changes to those files are\n" |
1589 | 1675 | " committed. If a directory is specified then the directory and\n" | 1675 | " committed. If a directory is specified then the directory and\n" |
1590 | 1676 | " everything within it is committed." | 1676 | " everything within it is committed." |
1591 | 1677 | msgstr "" | 1677 | msgstr "" |
1592 | 1678 | 1678 | ||
1594 | 1679 | #: bzrlib/builtins.py:3159 | 1679 | #: bzrlib/builtins.py:3158 |
1595 | 1680 | msgid "" | 1680 | msgid "" |
1596 | 1681 | " When excludes are given, they take precedence over selected files.\n" | 1681 | " When excludes are given, they take precedence over selected files.\n" |
1597 | 1682 | " For example, to commit only changes within foo, but not changes\n" | 1682 | " For example, to commit only changes within foo, but not changes\n" |
1598 | 1683 | " within foo/bar::" | 1683 | " within foo/bar::" |
1599 | 1684 | msgstr "" | 1684 | msgstr "" |
1600 | 1685 | 1685 | ||
1602 | 1686 | #: bzrlib/builtins.py:3163 | 1686 | #: bzrlib/builtins.py:3162 |
1603 | 1687 | msgid " bzr commit foo -x foo/bar" | 1687 | msgid " bzr commit foo -x foo/bar" |
1604 | 1688 | msgstr "" | 1688 | msgstr "" |
1605 | 1689 | 1689 | ||
1607 | 1690 | #: bzrlib/builtins.py:3165 | 1690 | #: bzrlib/builtins.py:3164 |
1608 | 1691 | msgid " A selective commit after a merge is not yet supported." | 1691 | msgid " A selective commit after a merge is not yet supported." |
1609 | 1692 | msgstr "" | 1692 | msgstr "" |
1610 | 1693 | 1693 | ||
1612 | 1694 | #: bzrlib/builtins.py:3167 | 1694 | #: bzrlib/builtins.py:3166 |
1613 | 1695 | msgid ":Custom authors:" | 1695 | msgid ":Custom authors:" |
1614 | 1696 | msgstr "" | 1696 | msgstr "" |
1615 | 1697 | 1697 | ||
1617 | 1698 | #: bzrlib/builtins.py:3169 | 1698 | #: bzrlib/builtins.py:3168 |
1618 | 1699 | msgid "" | 1699 | msgid "" |
1619 | 1700 | " If the author of the change is not the same person as the committer,\n" | 1700 | " If the author of the change is not the same person as the committer,\n" |
1620 | 1701 | " you can specify the author's name using the --author option. The\n" | 1701 | " you can specify the author's name using the --author option. The\n" |
1621 | @@ -1705,11 +1705,11 @@ | |||
1622 | 1705 | " author." | 1705 | " author." |
1623 | 1706 | msgstr "" | 1706 | msgstr "" |
1624 | 1707 | 1707 | ||
1626 | 1708 | #: bzrlib/builtins.py:3176 | 1708 | #: bzrlib/builtins.py:3175 |
1627 | 1709 | msgid ":Checks:" | 1709 | msgid ":Checks:" |
1628 | 1710 | msgstr "" | 1710 | msgstr "" |
1629 | 1711 | 1711 | ||
1631 | 1712 | #: bzrlib/builtins.py:3178 | 1712 | #: bzrlib/builtins.py:3177 |
1632 | 1713 | msgid "" | 1713 | msgid "" |
1633 | 1714 | " A common mistake is to forget to add a new file or directory before\n" | 1714 | " A common mistake is to forget to add a new file or directory before\n" |
1634 | 1715 | " running the commit command. The --strict option checks for unknown\n" | 1715 | " running the commit command. The --strict option checks for unknown\n" |
1635 | @@ -1718,18 +1718,18 @@ | |||
1636 | 1718 | " for details." | 1718 | " for details." |
1637 | 1719 | msgstr "" | 1719 | msgstr "" |
1638 | 1720 | 1720 | ||
1640 | 1721 | #: bzrlib/builtins.py:3184 | 1721 | #: bzrlib/builtins.py:3183 |
1641 | 1722 | msgid ":Things to note:" | 1722 | msgid ":Things to note:" |
1642 | 1723 | msgstr "" | 1723 | msgstr "" |
1643 | 1724 | 1724 | ||
1645 | 1725 | #: bzrlib/builtins.py:3186 | 1725 | #: bzrlib/builtins.py:3185 |
1646 | 1726 | msgid "" | 1726 | msgid "" |
1647 | 1727 | " If you accidentially commit the wrong changes or make a spelling\n" | 1727 | " If you accidentially commit the wrong changes or make a spelling\n" |
1648 | 1728 | " mistake in the commit message say, you can use the uncommit command\n" | 1728 | " mistake in the commit message say, you can use the uncommit command\n" |
1649 | 1729 | " to undo it. See ``bzr help uncommit`` for details." | 1729 | " to undo it. See ``bzr help uncommit`` for details." |
1650 | 1730 | msgstr "" | 1730 | msgstr "" |
1651 | 1731 | 1731 | ||
1653 | 1732 | #: bzrlib/builtins.py:3190 | 1732 | #: bzrlib/builtins.py:3189 |
1654 | 1733 | msgid "" | 1733 | msgid "" |
1655 | 1734 | " Hooks can also be configured to run after a commit. This allows you\n" | 1734 | " Hooks can also be configured to run after a commit. This allows you\n" |
1656 | 1735 | " to trigger updates to external systems like bug trackers. The --fixes\n" | 1735 | " to trigger updates to external systems like bug trackers. The --fixes\n" |
1657 | @@ -1738,100 +1738,100 @@ | |||
1658 | 1738 | msgstr "" | 1738 | msgstr "" |
1659 | 1739 | 1739 | ||
1660 | 1740 | # help of 'exclude' option of 'commit' command | 1740 | # help of 'exclude' option of 'commit' command |
1662 | 1741 | #: bzrlib/builtins.py:3200 | 1741 | #: bzrlib/builtins.py:3199 |
1663 | 1742 | msgid "Do not consider changes made to a given path." | 1742 | msgid "Do not consider changes made to a given path." |
1664 | 1743 | msgstr "" | 1743 | msgstr "" |
1665 | 1744 | 1744 | ||
1666 | 1745 | # help of 'message' option of 'commit' command | 1745 | # help of 'message' option of 'commit' command |
1668 | 1746 | #: bzrlib/builtins.py:3203 | 1746 | #: bzrlib/builtins.py:3202 |
1669 | 1747 | msgid "Description of the new revision." | 1747 | msgid "Description of the new revision." |
1670 | 1748 | msgstr "" | 1748 | msgstr "" |
1671 | 1749 | 1749 | ||
1672 | 1750 | # help of 'unchanged' option of 'commit' command | 1750 | # help of 'unchanged' option of 'commit' command |
1674 | 1751 | #: bzrlib/builtins.py:3206 | 1751 | #: bzrlib/builtins.py:3205 |
1675 | 1752 | msgid "Commit even if nothing has changed." | 1752 | msgid "Commit even if nothing has changed." |
1676 | 1753 | msgstr "" | 1753 | msgstr "" |
1677 | 1754 | 1754 | ||
1678 | 1755 | # help of 'file' option of 'commit' command | 1755 | # help of 'file' option of 'commit' command |
1680 | 1756 | #: bzrlib/builtins.py:3210 | 1756 | #: bzrlib/builtins.py:3209 |
1681 | 1757 | msgid "Take commit message from this file." | 1757 | msgid "Take commit message from this file." |
1682 | 1758 | msgstr "" | 1758 | msgstr "" |
1683 | 1759 | 1759 | ||
1684 | 1760 | # help of 'strict' option of 'commit' command | 1760 | # help of 'strict' option of 'commit' command |
1686 | 1761 | #: bzrlib/builtins.py:3212 | 1761 | #: bzrlib/builtins.py:3211 |
1687 | 1762 | msgid "Refuse to commit if there are unknown files in the working tree." | 1762 | msgid "Refuse to commit if there are unknown files in the working tree." |
1688 | 1763 | msgstr "" | 1763 | msgstr "" |
1689 | 1764 | 1764 | ||
1690 | 1765 | # help of 'commit-time' option of 'commit' command | 1765 | # help of 'commit-time' option of 'commit' command |
1692 | 1766 | #: bzrlib/builtins.py:3215 | 1766 | #: bzrlib/builtins.py:3214 |
1693 | 1767 | msgid "" | 1767 | msgid "" |
1694 | 1768 | "Manually set a commit time using commit date format, e.g. '2009-10-10 " | 1768 | "Manually set a commit time using commit date format, e.g. '2009-10-10 " |
1695 | 1769 | "08:00:00 +0100'." | 1769 | "08:00:00 +0100'." |
1696 | 1770 | msgstr "" | 1770 | msgstr "" |
1697 | 1771 | 1771 | ||
1698 | 1772 | # help of 'fixes' option of 'commit' command | 1772 | # help of 'fixes' option of 'commit' command |
1700 | 1773 | #: bzrlib/builtins.py:3218 | 1773 | #: bzrlib/builtins.py:3217 |
1701 | 1774 | msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")." | 1774 | msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")." |
1702 | 1775 | msgstr "" | 1775 | msgstr "" |
1703 | 1776 | 1776 | ||
1704 | 1777 | # help of 'author' option of 'commit' command | 1777 | # help of 'author' option of 'commit' command |
1706 | 1778 | #: bzrlib/builtins.py:3221 | 1778 | #: bzrlib/builtins.py:3220 |
1707 | 1779 | msgid "Set the author's name, if it's different from the committer." | 1779 | msgid "Set the author's name, if it's different from the committer." |
1708 | 1780 | msgstr "" | 1780 | msgstr "" |
1709 | 1781 | 1781 | ||
1710 | 1782 | # help of 'local' option of 'commit' command | 1782 | # help of 'local' option of 'commit' command |
1712 | 1783 | #: bzrlib/builtins.py:3224 | 1783 | #: bzrlib/builtins.py:3223 |
1713 | 1784 | msgid "" | 1784 | msgid "" |
1714 | 1785 | "Perform a local commit in a bound branch. Local commits are not pushed to " | 1785 | "Perform a local commit in a bound branch. Local commits are not pushed to " |
1715 | 1786 | "the master branch until a normal commit is performed." | 1786 | "the master branch until a normal commit is performed." |
1716 | 1787 | msgstr "" | 1787 | msgstr "" |
1717 | 1788 | 1788 | ||
1718 | 1789 | # help of 'show-diff' option of 'commit' command | 1789 | # help of 'show-diff' option of 'commit' command |
1720 | 1790 | #: bzrlib/builtins.py:3230 | 1790 | #: bzrlib/builtins.py:3229 |
1721 | 1791 | msgid "" | 1791 | msgid "" |
1722 | 1792 | "When no message is supplied, show the diff along with the status summary in " | 1792 | "When no message is supplied, show the diff along with the status summary in " |
1723 | 1793 | "the message editor." | 1793 | "the message editor." |
1724 | 1794 | msgstr "" | 1794 | msgstr "" |
1725 | 1795 | 1795 | ||
1726 | 1796 | # help of 'lossy' option of 'commit' command | 1796 | # help of 'lossy' option of 'commit' command |
1728 | 1797 | #: bzrlib/builtins.py:3233 | 1797 | #: bzrlib/builtins.py:3232 |
1729 | 1798 | msgid "" | 1798 | msgid "" |
1730 | 1799 | "When committing to a foreign version control system do not push data that " | 1799 | "When committing to a foreign version control system do not push data that " |
1731 | 1800 | "can not be natively represented." | 1800 | "can not be natively represented." |
1732 | 1801 | msgstr "" | 1801 | msgstr "" |
1733 | 1802 | 1802 | ||
1735 | 1803 | #: bzrlib/builtins.py:3391 | 1803 | #: bzrlib/builtins.py:3406 |
1736 | 1804 | msgid "" | 1804 | msgid "" |
1737 | 1805 | "Validate working tree structure, branch consistency and repository history." | 1805 | "Validate working tree structure, branch consistency and repository history." |
1738 | 1806 | msgstr "" | 1806 | msgstr "" |
1739 | 1807 | 1807 | ||
1741 | 1808 | #: bzrlib/builtins.py:3393 | 1808 | #: bzrlib/builtins.py:3408 |
1742 | 1809 | msgid "" | 1809 | msgid "" |
1743 | 1810 | "This command checks various invariants about branch and repository storage\n" | 1810 | "This command checks various invariants about branch and repository storage\n" |
1744 | 1811 | "to detect data corruption or bzr bugs." | 1811 | "to detect data corruption or bzr bugs." |
1745 | 1812 | msgstr "" | 1812 | msgstr "" |
1746 | 1813 | 1813 | ||
1748 | 1814 | #: bzrlib/builtins.py:3396 | 1814 | #: bzrlib/builtins.py:3411 |
1749 | 1815 | msgid "" | 1815 | msgid "" |
1750 | 1816 | "The working tree and branch checks will only give output if a problem is\n" | 1816 | "The working tree and branch checks will only give output if a problem is\n" |
1751 | 1817 | "detected. The output fields of the repository check are:" | 1817 | "detected. The output fields of the repository check are:" |
1752 | 1818 | msgstr "" | 1818 | msgstr "" |
1753 | 1819 | 1819 | ||
1755 | 1820 | #: bzrlib/builtins.py:3399 | 1820 | #: bzrlib/builtins.py:3414 |
1756 | 1821 | msgid "" | 1821 | msgid "" |
1757 | 1822 | "revisions\n" | 1822 | "revisions\n" |
1758 | 1823 | " This is just the number of revisions checked. It doesn't\n" | 1823 | " This is just the number of revisions checked. It doesn't\n" |
1759 | 1824 | " indicate a problem." | 1824 | " indicate a problem." |
1760 | 1825 | msgstr "" | 1825 | msgstr "" |
1761 | 1826 | 1826 | ||
1763 | 1827 | #: bzrlib/builtins.py:3403 | 1827 | #: bzrlib/builtins.py:3418 |
1764 | 1828 | msgid "" | 1828 | msgid "" |
1765 | 1829 | "versionedfiles\n" | 1829 | "versionedfiles\n" |
1766 | 1830 | " This is just the number of versionedfiles checked. It\n" | 1830 | " This is just the number of versionedfiles checked. It\n" |
1767 | 1831 | " doesn't indicate a problem." | 1831 | " doesn't indicate a problem." |
1768 | 1832 | msgstr "" | 1832 | msgstr "" |
1769 | 1833 | 1833 | ||
1771 | 1834 | #: bzrlib/builtins.py:3407 | 1834 | #: bzrlib/builtins.py:3422 |
1772 | 1835 | msgid "" | 1835 | msgid "" |
1773 | 1836 | "unreferenced ancestors\n" | 1836 | "unreferenced ancestors\n" |
1774 | 1837 | " Texts that are ancestors of other texts, but\n" | 1837 | " Texts that are ancestors of other texts, but\n" |
1775 | @@ -1839,14 +1839,14 @@ | |||
1776 | 1839 | " subtle problem that Bazaar can work around." | 1839 | " subtle problem that Bazaar can work around." |
1777 | 1840 | msgstr "" | 1840 | msgstr "" |
1778 | 1841 | 1841 | ||
1780 | 1842 | #: bzrlib/builtins.py:3412 | 1842 | #: bzrlib/builtins.py:3427 |
1781 | 1843 | msgid "" | 1843 | msgid "" |
1782 | 1844 | "unique file texts\n" | 1844 | "unique file texts\n" |
1783 | 1845 | " This is the total number of unique file contents\n" | 1845 | " This is the total number of unique file contents\n" |
1784 | 1846 | " seen in the checked revisions. It does not indicate a problem." | 1846 | " seen in the checked revisions. It does not indicate a problem." |
1785 | 1847 | msgstr "" | 1847 | msgstr "" |
1786 | 1848 | 1848 | ||
1788 | 1849 | #: bzrlib/builtins.py:3416 | 1849 | #: bzrlib/builtins.py:3431 |
1789 | 1850 | msgid "" | 1850 | msgid "" |
1790 | 1851 | "repeated file texts\n" | 1851 | "repeated file texts\n" |
1791 | 1852 | " This is the total number of repeated texts seen\n" | 1852 | " This is the total number of repeated texts seen\n" |
1792 | @@ -1855,61 +1855,61 @@ | |||
1793 | 1855 | " indicate a problem." | 1855 | " indicate a problem." |
1794 | 1856 | msgstr "" | 1856 | msgstr "" |
1795 | 1857 | 1857 | ||
1797 | 1858 | #: bzrlib/builtins.py:3422 | 1858 | #: bzrlib/builtins.py:3437 |
1798 | 1859 | msgid "" | 1859 | msgid "" |
1799 | 1860 | "If no restrictions are specified, all Bazaar data that is found at the " | 1860 | "If no restrictions are specified, all Bazaar data that is found at the " |
1800 | 1861 | "given\n" | 1861 | "given\n" |
1801 | 1862 | "location will be checked." | 1862 | "location will be checked." |
1802 | 1863 | msgstr "" | 1863 | msgstr "" |
1803 | 1864 | 1864 | ||
1805 | 1865 | #: bzrlib/builtins.py:3425 | 1865 | #: bzrlib/builtins.py:3440 |
1806 | 1866 | msgid ":Examples:" | 1866 | msgid ":Examples:" |
1807 | 1867 | msgstr "" | 1867 | msgstr "" |
1808 | 1868 | 1868 | ||
1810 | 1869 | #: bzrlib/builtins.py:3427 | 1869 | #: bzrlib/builtins.py:3442 |
1811 | 1870 | msgid " Check the tree and branch at 'foo'::" | 1870 | msgid " Check the tree and branch at 'foo'::" |
1812 | 1871 | msgstr "" | 1871 | msgstr "" |
1813 | 1872 | 1872 | ||
1815 | 1873 | #: bzrlib/builtins.py:3429 | 1873 | #: bzrlib/builtins.py:3444 |
1816 | 1874 | msgid " bzr check --tree --branch foo" | 1874 | msgid " bzr check --tree --branch foo" |
1817 | 1875 | msgstr "" | 1875 | msgstr "" |
1818 | 1876 | 1876 | ||
1820 | 1877 | #: bzrlib/builtins.py:3431 | 1877 | #: bzrlib/builtins.py:3446 |
1821 | 1878 | msgid " Check only the repository at 'bar'::" | 1878 | msgid " Check only the repository at 'bar'::" |
1822 | 1879 | msgstr "" | 1879 | msgstr "" |
1823 | 1880 | 1880 | ||
1825 | 1881 | #: bzrlib/builtins.py:3433 | 1881 | #: bzrlib/builtins.py:3448 |
1826 | 1882 | msgid " bzr check --repo bar" | 1882 | msgid " bzr check --repo bar" |
1827 | 1883 | msgstr "" | 1883 | msgstr "" |
1828 | 1884 | 1884 | ||
1830 | 1885 | #: bzrlib/builtins.py:3435 | 1885 | #: bzrlib/builtins.py:3450 |
1831 | 1886 | msgid " Check everything at 'baz'::" | 1886 | msgid " Check everything at 'baz'::" |
1832 | 1887 | msgstr "" | 1887 | msgstr "" |
1833 | 1888 | 1888 | ||
1835 | 1889 | #: bzrlib/builtins.py:3437 | 1889 | #: bzrlib/builtins.py:3452 |
1836 | 1890 | msgid " bzr check baz" | 1890 | msgid " bzr check baz" |
1837 | 1891 | msgstr "" | 1891 | msgstr "" |
1838 | 1892 | 1892 | ||
1839 | 1893 | # help of 'branch' option of 'check' command | 1893 | # help of 'branch' option of 'check' command |
1841 | 1894 | #: bzrlib/builtins.py:3443 | 1894 | #: bzrlib/builtins.py:3458 |
1842 | 1895 | msgid "Check the branch related to the current directory." | 1895 | msgid "Check the branch related to the current directory." |
1843 | 1896 | msgstr "" | 1896 | msgstr "" |
1844 | 1897 | 1897 | ||
1845 | 1898 | # help of 'repo' option of 'check' command | 1898 | # help of 'repo' option of 'check' command |
1847 | 1899 | #: bzrlib/builtins.py:3445 | 1899 | #: bzrlib/builtins.py:3460 |
1848 | 1900 | msgid "Check the repository related to the current directory." | 1900 | msgid "Check the repository related to the current directory." |
1849 | 1901 | msgstr "" | 1901 | msgstr "" |
1850 | 1902 | 1902 | ||
1851 | 1903 | # help of 'tree' option of 'check' command | 1903 | # help of 'tree' option of 'check' command |
1853 | 1904 | #: bzrlib/builtins.py:3447 | 1904 | #: bzrlib/builtins.py:3462 |
1854 | 1905 | msgid "Check the working tree related to the current directory." | 1905 | msgid "Check the working tree related to the current directory." |
1855 | 1906 | msgstr "" | 1906 | msgstr "" |
1856 | 1907 | 1907 | ||
1858 | 1908 | #: bzrlib/builtins.py:3461 | 1908 | #: bzrlib/builtins.py:3476 |
1859 | 1909 | msgid "Upgrade a repository, branch or working tree to a newer format." | 1909 | msgid "Upgrade a repository, branch or working tree to a newer format." |
1860 | 1910 | msgstr "" | 1910 | msgstr "" |
1861 | 1911 | 1911 | ||
1863 | 1912 | #: bzrlib/builtins.py:3463 | 1912 | #: bzrlib/builtins.py:3478 |
1864 | 1913 | msgid "" | 1913 | msgid "" |
1865 | 1914 | "When the default format has changed after a major new release of\n" | 1914 | "When the default format has changed after a major new release of\n" |
1866 | 1915 | "Bazaar, you may be informed during certain operations that you\n" | 1915 | "Bazaar, you may be informed during certain operations that you\n" |
1867 | @@ -1918,7 +1918,7 @@ | |||
1868 | 1918 | "with older repositories or with older versions of Bazaar." | 1918 | "with older repositories or with older versions of Bazaar." |
1869 | 1919 | msgstr "" | 1919 | msgstr "" |
1870 | 1920 | 1920 | ||
1872 | 1921 | #: bzrlib/builtins.py:3469 | 1921 | #: bzrlib/builtins.py:3484 |
1873 | 1922 | msgid "" | 1922 | msgid "" |
1874 | 1923 | "If you wish to upgrade to a particular format rather than the\n" | 1923 | "If you wish to upgrade to a particular format rather than the\n" |
1875 | 1924 | "current default, that can be specified using the --format option.\n" | 1924 | "current default, that can be specified using the --format option.\n" |
1876 | @@ -1928,7 +1928,7 @@ | |||
1877 | 1928 | "2.x default) so downgrading is not always possible." | 1928 | "2.x default) so downgrading is not always possible." |
1878 | 1929 | msgstr "" | 1929 | msgstr "" |
1879 | 1930 | 1930 | ||
1881 | 1931 | #: bzrlib/builtins.py:3476 | 1931 | #: bzrlib/builtins.py:3491 |
1882 | 1932 | msgid "" | 1932 | msgid "" |
1883 | 1933 | "A backup.bzr.~#~ directory is created at the start of the conversion\n" | 1933 | "A backup.bzr.~#~ directory is created at the start of the conversion\n" |
1884 | 1934 | "process (where # is a number). By default, this is left there on\n" | 1934 | "process (where # is a number). By default, this is left there on\n" |
1885 | @@ -1939,7 +1939,7 @@ | |||
1886 | 1939 | "afterwards." | 1939 | "afterwards." |
1887 | 1940 | msgstr "" | 1940 | msgstr "" |
1888 | 1941 | 1941 | ||
1890 | 1942 | #: bzrlib/builtins.py:3484 | 1942 | #: bzrlib/builtins.py:3499 |
1891 | 1943 | msgid "" | 1943 | msgid "" |
1892 | 1944 | "If the location given is a shared repository, dependent branches\n" | 1944 | "If the location given is a shared repository, dependent branches\n" |
1893 | 1945 | "are also converted provided the repository converts successfully.\n" | 1945 | "are also converted provided the repository converts successfully.\n" |
1894 | @@ -1947,132 +1947,132 @@ | |||
1895 | 1947 | "tried." | 1947 | "tried." |
1896 | 1948 | msgstr "" | 1948 | msgstr "" |
1897 | 1949 | 1949 | ||
1899 | 1950 | #: bzrlib/builtins.py:3489 | 1950 | #: bzrlib/builtins.py:3504 |
1900 | 1951 | msgid "" | 1951 | msgid "" |
1901 | 1952 | "For more information on upgrades, see the Bazaar Upgrade Guide,\n" | 1952 | "For more information on upgrades, see the Bazaar Upgrade Guide,\n" |
1902 | 1953 | "http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." | 1953 | "http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." |
1903 | 1954 | msgstr "" | 1954 | msgstr "" |
1904 | 1955 | 1955 | ||
1905 | 1956 | # help of 'format' option of 'upgrade' command | 1956 | # help of 'format' option of 'upgrade' command |
1907 | 1957 | #: bzrlib/builtins.py:3497 | 1957 | #: bzrlib/builtins.py:3512 |
1908 | 1958 | msgid "Upgrade to a specific format. See \"bzr help formats\" for details." | 1958 | msgid "Upgrade to a specific format. See \"bzr help formats\" for details." |
1909 | 1959 | msgstr "" | 1959 | msgstr "" |
1910 | 1960 | 1960 | ||
1911 | 1961 | # title of 'format' option of 'init' command | 1961 | # title of 'format' option of 'init' command |
1913 | 1962 | #: bzrlib/builtins.py:3501 | 1962 | #: bzrlib/builtins.py:3516 |
1914 | 1963 | msgid "Branch format" | 1963 | msgid "Branch format" |
1915 | 1964 | msgstr "" | 1964 | msgstr "" |
1916 | 1965 | 1965 | ||
1917 | 1966 | # help of 'clean' option of 'upgrade' command | 1966 | # help of 'clean' option of 'upgrade' command |
1919 | 1967 | #: bzrlib/builtins.py:3503 | 1967 | #: bzrlib/builtins.py:3518 |
1920 | 1968 | msgid "Remove the backup.bzr directory if successful." | 1968 | msgid "Remove the backup.bzr directory if successful." |
1921 | 1969 | msgstr "" | 1969 | msgstr "" |
1922 | 1970 | 1970 | ||
1924 | 1971 | #: bzrlib/builtins.py:3520 | 1971 | #: bzrlib/builtins.py:3535 |
1925 | 1972 | msgid "Show or set bzr user id." | 1972 | msgid "Show or set bzr user id." |
1926 | 1973 | msgstr "" | 1973 | msgstr "" |
1927 | 1974 | 1974 | ||
1929 | 1975 | #: bzrlib/builtins.py:3522 | 1975 | #: bzrlib/builtins.py:3537 |
1930 | 1976 | msgid "" | 1976 | msgid "" |
1931 | 1977 | ":Examples:\n" | 1977 | ":Examples:\n" |
1932 | 1978 | " Show the email of the current user::" | 1978 | " Show the email of the current user::" |
1933 | 1979 | msgstr "" | 1979 | msgstr "" |
1934 | 1980 | 1980 | ||
1936 | 1981 | #: bzrlib/builtins.py:3525 | 1981 | #: bzrlib/builtins.py:3540 |
1937 | 1982 | msgid " bzr whoami --email" | 1982 | msgid " bzr whoami --email" |
1938 | 1983 | msgstr "" | 1983 | msgstr "" |
1939 | 1984 | 1984 | ||
1941 | 1985 | #: bzrlib/builtins.py:3527 | 1985 | #: bzrlib/builtins.py:3542 |
1942 | 1986 | msgid " Set the current user::" | 1986 | msgid " Set the current user::" |
1943 | 1987 | msgstr "" | 1987 | msgstr "" |
1944 | 1988 | 1988 | ||
1946 | 1989 | #: bzrlib/builtins.py:3529 | 1989 | #: bzrlib/builtins.py:3544 |
1947 | 1990 | msgid " bzr whoami \"Frank Chu <fchu@example.com>\"" | 1990 | msgid " bzr whoami \"Frank Chu <fchu@example.com>\"" |
1948 | 1991 | msgstr "" | 1991 | msgstr "" |
1949 | 1992 | 1992 | ||
1950 | 1993 | # help of 'email' option of 'whoami' command | 1993 | # help of 'email' option of 'whoami' command |
1952 | 1994 | #: bzrlib/builtins.py:3533 | 1994 | #: bzrlib/builtins.py:3548 |
1953 | 1995 | msgid "Display email address only." | 1995 | msgid "Display email address only." |
1954 | 1996 | msgstr "" | 1996 | msgstr "" |
1955 | 1997 | 1997 | ||
1956 | 1998 | # help of 'branch' option of 'whoami' command | 1998 | # help of 'branch' option of 'whoami' command |
1958 | 1999 | #: bzrlib/builtins.py:3535 | 1999 | #: bzrlib/builtins.py:3550 |
1959 | 2000 | msgid "Set identity for the current branch instead of globally." | 2000 | msgid "Set identity for the current branch instead of globally." |
1960 | 2001 | msgstr "" | 2001 | msgstr "" |
1961 | 2002 | 2002 | ||
1963 | 2003 | #: bzrlib/builtins.py:3581 | 2003 | #: bzrlib/builtins.py:3596 |
1964 | 2004 | msgid "Print or set the branch nickname." | 2004 | msgid "Print or set the branch nickname." |
1965 | 2005 | msgstr "" | 2005 | msgstr "" |
1966 | 2006 | 2006 | ||
1968 | 2007 | #: bzrlib/builtins.py:3583 | 2007 | #: bzrlib/builtins.py:3598 |
1969 | 2008 | msgid "" | 2008 | msgid "" |
1970 | 2009 | "If unset, the tree root directory name is used as the nickname.\n" | 2009 | "If unset, the tree root directory name is used as the nickname.\n" |
1971 | 2010 | "To print the current nickname, execute with no argument." | 2010 | "To print the current nickname, execute with no argument." |
1972 | 2011 | msgstr "" | 2011 | msgstr "" |
1973 | 2012 | 2012 | ||
1975 | 2013 | #: bzrlib/builtins.py:3586 | 2013 | #: bzrlib/builtins.py:3601 |
1976 | 2014 | msgid "" | 2014 | msgid "" |
1977 | 2015 | "Bound branches use the nickname of its master branch unless it is set\n" | 2015 | "Bound branches use the nickname of its master branch unless it is set\n" |
1978 | 2016 | "locally." | 2016 | "locally." |
1979 | 2017 | msgstr "" | 2017 | msgstr "" |
1980 | 2018 | 2018 | ||
1982 | 2019 | #: bzrlib/builtins.py:3606 | 2019 | #: bzrlib/builtins.py:3621 |
1983 | 2020 | msgid "Set/unset and display aliases." | 2020 | msgid "Set/unset and display aliases." |
1984 | 2021 | msgstr "" | 2021 | msgstr "" |
1985 | 2022 | 2022 | ||
1987 | 2023 | #: bzrlib/builtins.py:3608 | 2023 | #: bzrlib/builtins.py:3623 |
1988 | 2024 | msgid "" | 2024 | msgid "" |
1989 | 2025 | ":Examples:\n" | 2025 | ":Examples:\n" |
1990 | 2026 | " Show the current aliases::" | 2026 | " Show the current aliases::" |
1991 | 2027 | msgstr "" | 2027 | msgstr "" |
1992 | 2028 | 2028 | ||
1994 | 2029 | #: bzrlib/builtins.py:3611 | 2029 | #: bzrlib/builtins.py:3626 |
1995 | 2030 | msgid " bzr alias" | 2030 | msgid " bzr alias" |
1996 | 2031 | msgstr "" | 2031 | msgstr "" |
1997 | 2032 | 2032 | ||
1999 | 2033 | #: bzrlib/builtins.py:3613 | 2033 | #: bzrlib/builtins.py:3628 |
2000 | 2034 | msgid " Show the alias specified for 'll'::" | 2034 | msgid " Show the alias specified for 'll'::" |
2001 | 2035 | msgstr "" | 2035 | msgstr "" |
2002 | 2036 | 2036 | ||
2004 | 2037 | #: bzrlib/builtins.py:3615 | 2037 | #: bzrlib/builtins.py:3630 |
2005 | 2038 | msgid " bzr alias ll" | 2038 | msgid " bzr alias ll" |
2006 | 2039 | msgstr "" | 2039 | msgstr "" |
2007 | 2040 | 2040 | ||
2009 | 2041 | #: bzrlib/builtins.py:3617 | 2041 | #: bzrlib/builtins.py:3632 |
2010 | 2042 | msgid " Set an alias for 'll'::" | 2042 | msgid " Set an alias for 'll'::" |
2011 | 2043 | msgstr "" | 2043 | msgstr "" |
2012 | 2044 | 2044 | ||
2014 | 2045 | #: bzrlib/builtins.py:3619 | 2045 | #: bzrlib/builtins.py:3634 |
2015 | 2046 | msgid " bzr alias ll=\"log --line -r-10..-1\"" | 2046 | msgid " bzr alias ll=\"log --line -r-10..-1\"" |
2016 | 2047 | msgstr "" | 2047 | msgstr "" |
2017 | 2048 | 2048 | ||
2019 | 2049 | #: bzrlib/builtins.py:3621 | 2049 | #: bzrlib/builtins.py:3636 |
2020 | 2050 | msgid " To remove an alias for 'll'::" | 2050 | msgid " To remove an alias for 'll'::" |
2021 | 2051 | msgstr "" | 2051 | msgstr "" |
2022 | 2052 | 2052 | ||
2024 | 2053 | #: bzrlib/builtins.py:3623 | 2053 | #: bzrlib/builtins.py:3638 |
2025 | 2054 | msgid " bzr alias --remove ll" | 2054 | msgid " bzr alias --remove ll" |
2026 | 2055 | msgstr "" | 2055 | msgstr "" |
2027 | 2056 | 2056 | ||
2028 | 2057 | # help of 'remove' option of 'alias' command | 2057 | # help of 'remove' option of 'alias' command |
2030 | 2058 | #: bzrlib/builtins.py:3628 | 2058 | #: bzrlib/builtins.py:3643 |
2031 | 2059 | msgid "Remove the alias." | 2059 | msgid "Remove the alias." |
2032 | 2060 | msgstr "" | 2060 | msgstr "" |
2033 | 2061 | 2061 | ||
2035 | 2062 | #: bzrlib/builtins.py:3867 | 2062 | #: bzrlib/builtins.py:3897 |
2036 | 2063 | msgid "Show version of bzr." | 2063 | msgid "Show version of bzr." |
2037 | 2064 | msgstr "" | 2064 | msgstr "" |
2038 | 2065 | 2065 | ||
2039 | 2066 | # help of 'short' option of 'version' command | 2066 | # help of 'short' option of 'version' command |
2041 | 2067 | #: bzrlib/builtins.py:3871 | 2067 | #: bzrlib/builtins.py:3901 |
2042 | 2068 | msgid "Print just the version number." | 2068 | msgid "Print just the version number." |
2043 | 2069 | msgstr "" | 2069 | msgstr "" |
2044 | 2070 | 2070 | ||
2046 | 2071 | #: bzrlib/builtins.py:3918 | 2071 | #: bzrlib/builtins.py:3948 |
2047 | 2072 | msgid "Perform a three-way merge." | 2072 | msgid "Perform a three-way merge." |
2048 | 2073 | msgstr "" | 2073 | msgstr "" |
2049 | 2074 | 2074 | ||
2051 | 2075 | #: bzrlib/builtins.py:3920 | 2075 | #: bzrlib/builtins.py:3950 |
2052 | 2076 | msgid "" | 2076 | msgid "" |
2053 | 2077 | "The source of the merge can be specified either in the form of a branch,\n" | 2077 | "The source of the merge can be specified either in the form of a branch,\n" |
2054 | 2078 | "or in the form of a path to a file containing a merge directive generated\n" | 2078 | "or in the form of a path to a file containing a merge directive generated\n" |
2055 | @@ -2083,20 +2083,20 @@ | |||
2056 | 2083 | "the current working tree." | 2083 | "the current working tree." |
2057 | 2084 | msgstr "" | 2084 | msgstr "" |
2058 | 2085 | 2085 | ||
2060 | 2086 | #: bzrlib/builtins.py:3928 | 2086 | #: bzrlib/builtins.py:3958 |
2061 | 2087 | msgid "" | 2087 | msgid "" |
2062 | 2088 | "When merging from a branch, by default bzr will try to merge in all new\n" | 2088 | "When merging from a branch, by default bzr will try to merge in all new\n" |
2063 | 2089 | "work from the other branch, automatically determining an appropriate base\n" | 2089 | "work from the other branch, automatically determining an appropriate base\n" |
2064 | 2090 | "revision. If this fails, you may need to give an explicit base." | 2090 | "revision. If this fails, you may need to give an explicit base." |
2065 | 2091 | msgstr "" | 2091 | msgstr "" |
2066 | 2092 | 2092 | ||
2068 | 2093 | #: bzrlib/builtins.py:3932 | 2093 | #: bzrlib/builtins.py:3962 |
2069 | 2094 | msgid "" | 2094 | msgid "" |
2070 | 2095 | "To pick a different ending revision, pass \"--revision OTHER\". bzr will\n" | 2095 | "To pick a different ending revision, pass \"--revision OTHER\". bzr will\n" |
2071 | 2096 | "try to merge in all new work up to and including revision OTHER." | 2096 | "try to merge in all new work up to and including revision OTHER." |
2072 | 2097 | msgstr "" | 2097 | msgstr "" |
2073 | 2098 | 2098 | ||
2075 | 2099 | #: bzrlib/builtins.py:3935 | 2099 | #: bzrlib/builtins.py:3965 |
2076 | 2100 | msgid "" | 2100 | msgid "" |
2077 | 2101 | "If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n" | 2101 | "If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n" |
2078 | 2102 | "through OTHER, excluding BASE but including OTHER, will be merged. If this\n" | 2102 | "through OTHER, excluding BASE but including OTHER, will be merged. If this\n" |
2079 | @@ -2107,30 +2107,30 @@ | |||
2080 | 2107 | "changes from the other branch is not stored in the commit." | 2107 | "changes from the other branch is not stored in the commit." |
2081 | 2108 | msgstr "" | 2108 | msgstr "" |
2082 | 2109 | 2109 | ||
2084 | 2110 | #: bzrlib/builtins.py:3943 | 2110 | #: bzrlib/builtins.py:3973 |
2085 | 2111 | msgid "Revision numbers are always relative to the source branch." | 2111 | msgid "Revision numbers are always relative to the source branch." |
2086 | 2112 | msgstr "" | 2112 | msgstr "" |
2087 | 2113 | 2113 | ||
2089 | 2114 | #: bzrlib/builtins.py:3950 | 2114 | #: bzrlib/builtins.py:3980 |
2090 | 2115 | msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts." | 2115 | msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts." |
2091 | 2116 | msgstr "" | 2116 | msgstr "" |
2092 | 2117 | 2117 | ||
2094 | 2118 | #: bzrlib/builtins.py:3952 | 2118 | #: bzrlib/builtins.py:3982 |
2095 | 2119 | msgid "" | 2119 | msgid "" |
2096 | 2120 | "If there is no default branch set, the first merge will set it (use\n" | 2120 | "If there is no default branch set, the first merge will set it (use\n" |
2098 | 2121 | "--no-remember to avoid settting it). After that, you can omit the branch\n" | 2121 | "--no-remember to avoid setting it). After that, you can omit the branch\n" |
2099 | 2122 | "to use the default. To change the default, use --remember. The value will\n" | 2122 | "to use the default. To change the default, use --remember. The value will\n" |
2100 | 2123 | "only be saved if the remote location can be accessed." | 2123 | "only be saved if the remote location can be accessed." |
2101 | 2124 | msgstr "" | 2124 | msgstr "" |
2102 | 2125 | 2125 | ||
2104 | 2126 | #: bzrlib/builtins.py:3957 | 2126 | #: bzrlib/builtins.py:3987 |
2105 | 2127 | msgid "" | 2127 | msgid "" |
2106 | 2128 | "The results of the merge are placed into the destination working\n" | 2128 | "The results of the merge are placed into the destination working\n" |
2107 | 2129 | "directory, where they can be reviewed (with bzr diff), tested, and then\n" | 2129 | "directory, where they can be reviewed (with bzr diff), tested, and then\n" |
2108 | 2130 | "committed to record the result of the merge." | 2130 | "committed to record the result of the merge." |
2109 | 2131 | msgstr "" | 2131 | msgstr "" |
2110 | 2132 | 2132 | ||
2112 | 2133 | #: bzrlib/builtins.py:3961 | 2133 | #: bzrlib/builtins.py:3991 |
2113 | 2134 | msgid "" | 2134 | msgid "" |
2114 | 2135 | "merge refuses to run if there are any uncommitted changes, unless\n" | 2135 | "merge refuses to run if there are any uncommitted changes, unless\n" |
2115 | 2136 | "--force is given. If --force is given, then the changes from the source \n" | 2136 | "--force is given. If --force is given, then the changes from the source \n" |
2116 | @@ -2139,60 +2139,60 @@ | |||
2117 | 2139 | "merge revision which has more than two parents." | 2139 | "merge revision which has more than two parents." |
2118 | 2140 | msgstr "" | 2140 | msgstr "" |
2119 | 2141 | 2141 | ||
2121 | 2142 | #: bzrlib/builtins.py:3967 | 2142 | #: bzrlib/builtins.py:3997 |
2122 | 2143 | msgid "" | 2143 | msgid "" |
2123 | 2144 | "If one would like to merge changes from the working tree of the other\n" | 2144 | "If one would like to merge changes from the working tree of the other\n" |
2124 | 2145 | "branch without merging any committed revisions, the --uncommitted option\n" | 2145 | "branch without merging any committed revisions, the --uncommitted option\n" |
2125 | 2146 | "can be given." | 2146 | "can be given." |
2126 | 2147 | msgstr "" | 2147 | msgstr "" |
2127 | 2148 | 2148 | ||
2129 | 2149 | #: bzrlib/builtins.py:3971 | 2149 | #: bzrlib/builtins.py:4001 |
2130 | 2150 | msgid "" | 2150 | msgid "" |
2131 | 2151 | "To select only some changes to merge, use \"merge -i\", which will prompt\n" | 2151 | "To select only some changes to merge, use \"merge -i\", which will prompt\n" |
2132 | 2152 | "you to apply each diff hunk and file change, similar to \"shelve\"." | 2152 | "you to apply each diff hunk and file change, similar to \"shelve\"." |
2133 | 2153 | msgstr "" | 2153 | msgstr "" |
2134 | 2154 | 2154 | ||
2136 | 2155 | #: bzrlib/builtins.py:3974 | 2155 | #: bzrlib/builtins.py:4004 |
2137 | 2156 | msgid "" | 2156 | msgid "" |
2138 | 2157 | ":Examples:\n" | 2157 | ":Examples:\n" |
2139 | 2158 | " To merge all new revisions from bzr.dev::" | 2158 | " To merge all new revisions from bzr.dev::" |
2140 | 2159 | msgstr "" | 2159 | msgstr "" |
2141 | 2160 | 2160 | ||
2143 | 2161 | #: bzrlib/builtins.py:3977 | 2161 | #: bzrlib/builtins.py:4007 |
2144 | 2162 | msgid " bzr merge ../bzr.dev" | 2162 | msgid " bzr merge ../bzr.dev" |
2145 | 2163 | msgstr "" | 2163 | msgstr "" |
2146 | 2164 | 2164 | ||
2148 | 2165 | #: bzrlib/builtins.py:3979 | 2165 | #: bzrlib/builtins.py:4009 |
2149 | 2166 | msgid " To merge changes up to and including revision 82 from bzr.dev::" | 2166 | msgid " To merge changes up to and including revision 82 from bzr.dev::" |
2150 | 2167 | msgstr "" | 2167 | msgstr "" |
2151 | 2168 | 2168 | ||
2153 | 2169 | #: bzrlib/builtins.py:3981 | 2169 | #: bzrlib/builtins.py:4011 |
2154 | 2170 | msgid " bzr merge -r 82 ../bzr.dev" | 2170 | msgid " bzr merge -r 82 ../bzr.dev" |
2155 | 2171 | msgstr "" | 2171 | msgstr "" |
2156 | 2172 | 2172 | ||
2158 | 2173 | #: bzrlib/builtins.py:3983 | 2173 | #: bzrlib/builtins.py:4013 |
2159 | 2174 | msgid " To merge the changes introduced by 82, without previous changes::" | 2174 | msgid " To merge the changes introduced by 82, without previous changes::" |
2160 | 2175 | msgstr "" | 2175 | msgstr "" |
2161 | 2176 | 2176 | ||
2163 | 2177 | #: bzrlib/builtins.py:3985 | 2177 | #: bzrlib/builtins.py:4015 |
2164 | 2178 | msgid " bzr merge -r 81..82 ../bzr.dev" | 2178 | msgid " bzr merge -r 81..82 ../bzr.dev" |
2165 | 2179 | msgstr "" | 2179 | msgstr "" |
2166 | 2180 | 2180 | ||
2168 | 2181 | #: bzrlib/builtins.py:3987 | 2181 | #: bzrlib/builtins.py:4017 |
2169 | 2182 | msgid " To apply a merge directive contained in /tmp/merge::" | 2182 | msgid " To apply a merge directive contained in /tmp/merge::" |
2170 | 2183 | msgstr "" | 2183 | msgstr "" |
2171 | 2184 | 2184 | ||
2173 | 2185 | #: bzrlib/builtins.py:3989 | 2185 | #: bzrlib/builtins.py:4019 |
2174 | 2186 | msgid " bzr merge /tmp/merge" | 2186 | msgid " bzr merge /tmp/merge" |
2175 | 2187 | msgstr "" | 2187 | msgstr "" |
2176 | 2188 | 2188 | ||
2178 | 2189 | #: bzrlib/builtins.py:3991 | 2189 | #: bzrlib/builtins.py:4021 |
2179 | 2190 | msgid "" | 2190 | msgid "" |
2180 | 2191 | " To create a merge revision with three parents from two branches\n" | 2191 | " To create a merge revision with three parents from two branches\n" |
2181 | 2192 | " feature1a and feature1b:" | 2192 | " feature1a and feature1b:" |
2182 | 2193 | msgstr "" | 2193 | msgstr "" |
2183 | 2194 | 2194 | ||
2185 | 2195 | #: bzrlib/builtins.py:3994 | 2195 | #: bzrlib/builtins.py:4024 |
2186 | 2196 | msgid "" | 2196 | msgid "" |
2187 | 2197 | " bzr merge ../feature1a\n" | 2197 | " bzr merge ../feature1a\n" |
2188 | 2198 | " bzr merge ../feature1b --force\n" | 2198 | " bzr merge ../feature1b --force\n" |
2189 | @@ -2200,18 +2200,18 @@ | |||
2190 | 2200 | msgstr "" | 2200 | msgstr "" |
2191 | 2201 | 2201 | ||
2192 | 2202 | # help of 'force' option of 'merge' command | 2202 | # help of 'force' option of 'merge' command |
2194 | 2203 | #: bzrlib/builtins.py:4006 | 2203 | #: bzrlib/builtins.py:4036 |
2195 | 2204 | msgid "Merge even if the destination tree has uncommitted changes." | 2204 | msgid "Merge even if the destination tree has uncommitted changes." |
2196 | 2205 | msgstr "" | 2205 | msgstr "" |
2197 | 2206 | 2206 | ||
2198 | 2207 | # help of 'uncommitted' option of 'merge' command | 2207 | # help of 'uncommitted' option of 'merge' command |
2200 | 2208 | #: bzrlib/builtins.py:4012 | 2208 | #: bzrlib/builtins.py:4042 |
2201 | 2209 | msgid "" | 2209 | msgid "" |
2202 | 2210 | "Apply uncommitted changes from a working copy, instead of branch changes." | 2210 | "Apply uncommitted changes from a working copy, instead of branch changes." |
2203 | 2211 | msgstr "" | 2211 | msgstr "" |
2204 | 2212 | 2212 | ||
2205 | 2213 | # help of 'pull' option of 'merge' command | 2213 | # help of 'pull' option of 'merge' command |
2207 | 2214 | #: bzrlib/builtins.py:4014 | 2214 | #: bzrlib/builtins.py:4044 |
2208 | 2215 | msgid "" | 2215 | msgid "" |
2209 | 2216 | "If the destination is already completely merged into the source, pull from " | 2216 | "If the destination is already completely merged into the source, pull from " |
2210 | 2217 | "the source rather than merging. When this happens, you do not need to " | 2217 | "the source rather than merging. When this happens, you do not need to " |
2211 | @@ -2219,77 +2219,77 @@ | |||
2212 | 2219 | msgstr "" | 2219 | msgstr "" |
2213 | 2220 | 2220 | ||
2214 | 2221 | # help of 'directory' option of 'merge' command | 2221 | # help of 'directory' option of 'merge' command |
2216 | 2222 | #: bzrlib/builtins.py:4019 | 2222 | #: bzrlib/builtins.py:4049 |
2217 | 2223 | msgid "" | 2223 | msgid "" |
2218 | 2224 | "Branch to merge into, rather than the one containing the working directory." | 2224 | "Branch to merge into, rather than the one containing the working directory." |
2219 | 2225 | msgstr "" | 2225 | msgstr "" |
2220 | 2226 | 2226 | ||
2221 | 2227 | # help of 'preview' option of 'merge' command | 2227 | # help of 'preview' option of 'merge' command |
2223 | 2228 | #: bzrlib/builtins.py:4021 | 2228 | #: bzrlib/builtins.py:4051 |
2224 | 2229 | msgid "Instead of merging, show a diff of the merge." | 2229 | msgid "Instead of merging, show a diff of the merge." |
2225 | 2230 | msgstr "" | 2230 | msgstr "" |
2226 | 2231 | 2231 | ||
2227 | 2232 | # help of 'interactive' option of 'merge' command | 2232 | # help of 'interactive' option of 'merge' command |
2229 | 2233 | #: bzrlib/builtins.py:4023 | 2233 | #: bzrlib/builtins.py:4053 |
2230 | 2234 | msgid "Select changes interactively." | 2234 | msgid "Select changes interactively." |
2231 | 2235 | msgstr "" | 2235 | msgstr "" |
2232 | 2236 | 2236 | ||
2234 | 2237 | #: bzrlib/builtins.py:4307 | 2237 | #: bzrlib/builtins.py:4337 |
2235 | 2238 | msgid "Redo a merge." | 2238 | msgid "Redo a merge." |
2236 | 2239 | msgstr "" | 2239 | msgstr "" |
2237 | 2240 | 2240 | ||
2239 | 2241 | #: bzrlib/builtins.py:4309 | 2241 | #: bzrlib/builtins.py:4339 |
2240 | 2242 | msgid "" | 2242 | msgid "" |
2241 | 2243 | "Use this if you want to try a different merge technique while resolving\n" | 2243 | "Use this if you want to try a different merge technique while resolving\n" |
2242 | 2244 | "conflicts. Some merge techniques are better than others, and remerge\n" | 2244 | "conflicts. Some merge techniques are better than others, and remerge\n" |
2243 | 2245 | "lets you try different ones on different files." | 2245 | "lets you try different ones on different files." |
2244 | 2246 | msgstr "" | 2246 | msgstr "" |
2245 | 2247 | 2247 | ||
2247 | 2248 | #: bzrlib/builtins.py:4313 | 2248 | #: bzrlib/builtins.py:4343 |
2248 | 2249 | msgid "" | 2249 | msgid "" |
2249 | 2250 | "The options for remerge have the same meaning and defaults as the ones for\n" | 2250 | "The options for remerge have the same meaning and defaults as the ones for\n" |
2250 | 2251 | "merge. The difference is that remerge can (only) be run when there is a\n" | 2251 | "merge. The difference is that remerge can (only) be run when there is a\n" |
2251 | 2252 | "pending merge, and it lets you specify particular files." | 2252 | "pending merge, and it lets you specify particular files." |
2252 | 2253 | msgstr "" | 2253 | msgstr "" |
2253 | 2254 | 2254 | ||
2255 | 2255 | #: bzrlib/builtins.py:4317 | 2255 | #: bzrlib/builtins.py:4347 |
2256 | 2256 | msgid "" | 2256 | msgid "" |
2257 | 2257 | ":Examples:\n" | 2257 | ":Examples:\n" |
2258 | 2258 | " Re-do the merge of all conflicted files, and show the base text in\n" | 2258 | " Re-do the merge of all conflicted files, and show the base text in\n" |
2259 | 2259 | " conflict regions, in addition to the usual THIS and OTHER texts::" | 2259 | " conflict regions, in addition to the usual THIS and OTHER texts::" |
2260 | 2260 | msgstr "" | 2260 | msgstr "" |
2261 | 2261 | 2261 | ||
2263 | 2262 | #: bzrlib/builtins.py:4321 | 2262 | #: bzrlib/builtins.py:4351 |
2264 | 2263 | msgid " bzr remerge --show-base" | 2263 | msgid " bzr remerge --show-base" |
2265 | 2264 | msgstr "" | 2264 | msgstr "" |
2266 | 2265 | 2265 | ||
2268 | 2266 | #: bzrlib/builtins.py:4323 | 2266 | #: bzrlib/builtins.py:4353 |
2269 | 2267 | msgid "" | 2267 | msgid "" |
2270 | 2268 | " Re-do the merge of \"foobar\", using the weave merge algorithm, with\n" | 2268 | " Re-do the merge of \"foobar\", using the weave merge algorithm, with\n" |
2271 | 2269 | " additional processing to reduce the size of conflict regions::" | 2269 | " additional processing to reduce the size of conflict regions::" |
2272 | 2270 | msgstr "" | 2270 | msgstr "" |
2273 | 2271 | 2271 | ||
2275 | 2272 | #: bzrlib/builtins.py:4326 | 2272 | #: bzrlib/builtins.py:4356 |
2276 | 2273 | msgid " bzr remerge --merge-type weave --reprocess foobar" | 2273 | msgid " bzr remerge --merge-type weave --reprocess foobar" |
2277 | 2274 | msgstr "" | 2274 | msgstr "" |
2278 | 2275 | 2275 | ||
2279 | 2276 | # help of 'show-base' option of 'merge' command | 2276 | # help of 'show-base' option of 'merge' command |
2281 | 2277 | #: bzrlib/builtins.py:4333 | 2277 | #: bzrlib/builtins.py:4363 |
2282 | 2278 | msgid "Show base revision text in conflicts." | 2278 | msgid "Show base revision text in conflicts." |
2283 | 2279 | msgstr "" | 2279 | msgstr "" |
2284 | 2280 | 2280 | ||
2286 | 2281 | #: bzrlib/builtins.py:4401 | 2281 | #: bzrlib/builtins.py:4431 |
2287 | 2282 | msgid "Revert files to a previous revision." | 2282 | msgid "Revert files to a previous revision." |
2288 | 2283 | msgstr "" | 2283 | msgstr "" |
2289 | 2284 | 2284 | ||
2291 | 2285 | #: bzrlib/builtins.py:4403 | 2285 | #: bzrlib/builtins.py:4433 |
2292 | 2286 | msgid "" | 2286 | msgid "" |
2293 | 2287 | "Giving a list of files will revert only those files. Otherwise, all files\n" | 2287 | "Giving a list of files will revert only those files. Otherwise, all files\n" |
2294 | 2288 | "will be reverted. If the revision is not specified with '--revision', the\n" | 2288 | "will be reverted. If the revision is not specified with '--revision', the\n" |
2295 | 2289 | "last committed revision is used." | 2289 | "last committed revision is used." |
2296 | 2290 | msgstr "" | 2290 | msgstr "" |
2297 | 2291 | 2291 | ||
2299 | 2292 | #: bzrlib/builtins.py:4407 | 2292 | #: bzrlib/builtins.py:4437 |
2300 | 2293 | msgid "" | 2293 | msgid "" |
2301 | 2294 | "To remove only some changes, without reverting to a prior version, use\n" | 2294 | "To remove only some changes, without reverting to a prior version, use\n" |
2302 | 2295 | "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n" | 2295 | "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n" |
2303 | @@ -2298,14 +2298,14 @@ | |||
2304 | 2298 | "certain changes on a hunk-by-hunk basis, see the shelve command." | 2298 | "certain changes on a hunk-by-hunk basis, see the shelve command." |
2305 | 2299 | msgstr "" | 2299 | msgstr "" |
2306 | 2300 | 2300 | ||
2308 | 2301 | #: bzrlib/builtins.py:4413 | 2301 | #: bzrlib/builtins.py:4443 |
2309 | 2302 | msgid "" | 2302 | msgid "" |
2310 | 2303 | "By default, any files that have been manually changed will be backed up\n" | 2303 | "By default, any files that have been manually changed will be backed up\n" |
2311 | 2304 | "first. (Files changed only by merge are not backed up.) Backup files have\n" | 2304 | "first. (Files changed only by merge are not backed up.) Backup files have\n" |
2312 | 2305 | "'.~#~' appended to their name, where # is a number." | 2305 | "'.~#~' appended to their name, where # is a number." |
2313 | 2306 | msgstr "" | 2306 | msgstr "" |
2314 | 2307 | 2307 | ||
2316 | 2308 | #: bzrlib/builtins.py:4417 | 2308 | #: bzrlib/builtins.py:4447 |
2317 | 2309 | msgid "" | 2309 | msgid "" |
2318 | 2310 | "When you provide files, you can use their current pathname or the pathname\n" | 2310 | "When you provide files, you can use their current pathname or the pathname\n" |
2319 | 2311 | "from the target revision. So you can use revert to \"undelete\" a file by\n" | 2311 | "from the target revision. So you can use revert to \"undelete\" a file by\n" |
2320 | @@ -2313,7 +2313,7 @@ | |||
2321 | 2313 | "reverted." | 2313 | "reverted." |
2322 | 2314 | msgstr "" | 2314 | msgstr "" |
2323 | 2315 | 2315 | ||
2325 | 2316 | #: bzrlib/builtins.py:4422 | 2316 | #: bzrlib/builtins.py:4452 |
2326 | 2317 | msgid "" | 2317 | msgid "" |
2327 | 2318 | "If you have newly added files since the target revision, they will be\n" | 2318 | "If you have newly added files since the target revision, they will be\n" |
2328 | 2319 | "removed. If the files to be removed have been changed, backups will be\n" | 2319 | "removed. If the files to be removed have been changed, backups will be\n" |
2329 | @@ -2321,7 +2321,7 @@ | |||
2330 | 2321 | "deleted." | 2321 | "deleted." |
2331 | 2322 | msgstr "" | 2322 | msgstr "" |
2332 | 2323 | 2323 | ||
2334 | 2324 | #: bzrlib/builtins.py:4427 | 2324 | #: bzrlib/builtins.py:4457 |
2335 | 2325 | msgid "" | 2325 | msgid "" |
2336 | 2326 | "The working tree contains a list of revisions that have been merged but\n" | 2326 | "The working tree contains a list of revisions that have been merged but\n" |
2337 | 2327 | "not yet committed. These revisions will be included as additional parents\n" | 2327 | "not yet committed. These revisions will be included as additional parents\n" |
2338 | @@ -2333,7 +2333,7 @@ | |||
2339 | 2333 | "reverting any files." | 2333 | "reverting any files." |
2340 | 2334 | msgstr "" | 2334 | msgstr "" |
2341 | 2335 | 2335 | ||
2343 | 2336 | #: bzrlib/builtins.py:4436 | 2336 | #: bzrlib/builtins.py:4466 |
2344 | 2337 | msgid "" | 2337 | msgid "" |
2345 | 2338 | "Using \"bzr revert --forget-merges\", it is possible to apply all of the\n" | 2338 | "Using \"bzr revert --forget-merges\", it is possible to apply all of the\n" |
2346 | 2339 | "changes from a branch in a single revision. To do this, perform the merge\n" | 2339 | "changes from a branch in a single revision. To do this, perform the merge\n" |
2347 | @@ -2348,35 +2348,35 @@ | |||
2348 | 2348 | msgstr "" | 2348 | msgstr "" |
2349 | 2349 | 2349 | ||
2350 | 2350 | # help of 'no-backup' option of 'revert' command | 2350 | # help of 'no-backup' option of 'revert' command |
2352 | 2351 | #: bzrlib/builtins.py:4450 | 2351 | #: bzrlib/builtins.py:4480 |
2353 | 2352 | msgid "Do not save backups of reverted files." | 2352 | msgid "Do not save backups of reverted files." |
2354 | 2353 | msgstr "" | 2353 | msgstr "" |
2355 | 2354 | 2354 | ||
2356 | 2355 | # help of 'forget-merges' option of 'revert' command | 2355 | # help of 'forget-merges' option of 'revert' command |
2358 | 2356 | #: bzrlib/builtins.py:4452 | 2356 | #: bzrlib/builtins.py:4482 |
2359 | 2357 | msgid "Remove pending merge marker, without changing any files." | 2357 | msgid "Remove pending merge marker, without changing any files." |
2360 | 2358 | msgstr "" | 2358 | msgstr "" |
2361 | 2359 | 2359 | ||
2363 | 2360 | #: bzrlib/builtins.py:4483 | 2360 | #: bzrlib/builtins.py:4513 |
2364 | 2361 | msgid "" | 2361 | msgid "" |
2365 | 2362 | "Show help on a command or other topic.\n" | 2362 | "Show help on a command or other topic.\n" |
2366 | 2363 | " " | 2363 | " " |
2367 | 2364 | msgstr "" | 2364 | msgstr "" |
2368 | 2365 | 2365 | ||
2369 | 2366 | # help of 'long' option of 'help' command | 2366 | # help of 'long' option of 'help' command |
2371 | 2367 | #: bzrlib/builtins.py:4488 | 2367 | #: bzrlib/builtins.py:4518 |
2372 | 2368 | msgid "Show help on all commands." | 2368 | msgid "Show help on all commands." |
2373 | 2369 | msgstr "" | 2369 | msgstr "" |
2374 | 2370 | 2370 | ||
2376 | 2371 | #: bzrlib/builtins.py:4517 | 2371 | #: bzrlib/builtins.py:4547 |
2377 | 2372 | msgid "Show unmerged/unpulled revisions between two branches." | 2372 | msgid "Show unmerged/unpulled revisions between two branches." |
2378 | 2373 | msgstr "" | 2373 | msgstr "" |
2379 | 2374 | 2374 | ||
2381 | 2375 | #: bzrlib/builtins.py:4519 | 2375 | #: bzrlib/builtins.py:4549 |
2382 | 2376 | msgid "OTHER_BRANCH may be local or remote." | 2376 | msgid "OTHER_BRANCH may be local or remote." |
2383 | 2377 | msgstr "" | 2377 | msgstr "" |
2384 | 2378 | 2378 | ||
2386 | 2379 | #: bzrlib/builtins.py:4521 | 2379 | #: bzrlib/builtins.py:4551 |
2387 | 2380 | msgid "" | 2380 | msgid "" |
2388 | 2381 | "To filter on a range of revisions, you can use the command -r begin..end\n" | 2381 | "To filter on a range of revisions, you can use the command -r begin..end\n" |
2389 | 2382 | "-r revision requests a specific revision, -r ..end or -r begin.. are\n" | 2382 | "-r revision requests a specific revision, -r ..end or -r begin.. are\n" |
2390 | @@ -2387,100 +2387,100 @@ | |||
2391 | 2387 | " 0 - no missing revisions" | 2387 | " 0 - no missing revisions" |
2392 | 2388 | msgstr "" | 2388 | msgstr "" |
2393 | 2389 | 2389 | ||
2395 | 2390 | #: bzrlib/builtins.py:4531 | 2390 | #: bzrlib/builtins.py:4561 |
2396 | 2391 | msgid "" | 2391 | msgid "" |
2397 | 2392 | " Determine the missing revisions between this and the branch at the\n" | 2392 | " Determine the missing revisions between this and the branch at the\n" |
2398 | 2393 | " remembered pull location::" | 2393 | " remembered pull location::" |
2399 | 2394 | msgstr "" | 2394 | msgstr "" |
2400 | 2395 | 2395 | ||
2402 | 2396 | #: bzrlib/builtins.py:4534 | 2396 | #: bzrlib/builtins.py:4564 |
2403 | 2397 | msgid " bzr missing" | 2397 | msgid " bzr missing" |
2404 | 2398 | msgstr "" | 2398 | msgstr "" |
2405 | 2399 | 2399 | ||
2407 | 2400 | #: bzrlib/builtins.py:4536 | 2400 | #: bzrlib/builtins.py:4566 |
2408 | 2401 | msgid " Determine the missing revisions between this and another branch::" | 2401 | msgid " Determine the missing revisions between this and another branch::" |
2409 | 2402 | msgstr "" | 2402 | msgstr "" |
2410 | 2403 | 2403 | ||
2412 | 2404 | #: bzrlib/builtins.py:4538 | 2404 | #: bzrlib/builtins.py:4568 |
2413 | 2405 | msgid " bzr missing http://server/branch" | 2405 | msgid " bzr missing http://server/branch" |
2414 | 2406 | msgstr "" | 2406 | msgstr "" |
2415 | 2407 | 2407 | ||
2417 | 2408 | #: bzrlib/builtins.py:4540 | 2408 | #: bzrlib/builtins.py:4570 |
2418 | 2409 | msgid "" | 2409 | msgid "" |
2419 | 2410 | " Determine the missing revisions up to a specific revision on the other\n" | 2410 | " Determine the missing revisions up to a specific revision on the other\n" |
2420 | 2411 | " branch::" | 2411 | " branch::" |
2421 | 2412 | msgstr "" | 2412 | msgstr "" |
2422 | 2413 | 2413 | ||
2424 | 2414 | #: bzrlib/builtins.py:4543 | 2414 | #: bzrlib/builtins.py:4573 |
2425 | 2415 | msgid " bzr missing -r ..-10" | 2415 | msgid " bzr missing -r ..-10" |
2426 | 2416 | msgstr "" | 2416 | msgstr "" |
2427 | 2417 | 2417 | ||
2429 | 2418 | #: bzrlib/builtins.py:4545 | 2418 | #: bzrlib/builtins.py:4575 |
2430 | 2419 | msgid "" | 2419 | msgid "" |
2431 | 2420 | " Determine the missing revisions up to a specific revision on this\n" | 2420 | " Determine the missing revisions up to a specific revision on this\n" |
2432 | 2421 | " branch::" | 2421 | " branch::" |
2433 | 2422 | msgstr "" | 2422 | msgstr "" |
2434 | 2423 | 2423 | ||
2436 | 2424 | #: bzrlib/builtins.py:4548 | 2424 | #: bzrlib/builtins.py:4578 |
2437 | 2425 | msgid " bzr missing --my-revision ..-10" | 2425 | msgid " bzr missing --my-revision ..-10" |
2438 | 2426 | msgstr "" | 2426 | msgstr "" |
2439 | 2427 | 2427 | ||
2440 | 2428 | # help of 'reverse' option of 'missing' command | 2428 | # help of 'reverse' option of 'missing' command |
2442 | 2429 | #: bzrlib/builtins.py:4555 | 2429 | #: bzrlib/builtins.py:4585 |
2443 | 2430 | msgid "Reverse the order of revisions." | 2430 | msgid "Reverse the order of revisions." |
2444 | 2431 | msgstr "" | 2431 | msgstr "" |
2445 | 2432 | 2432 | ||
2446 | 2433 | # help of 'mine-only' option of 'missing' command | 2433 | # help of 'mine-only' option of 'missing' command |
2448 | 2434 | #: bzrlib/builtins.py:4557 | 2434 | #: bzrlib/builtins.py:4587 |
2449 | 2435 | msgid "Display changes in the local branch only." | 2435 | msgid "Display changes in the local branch only." |
2450 | 2436 | msgstr "" | 2436 | msgstr "" |
2451 | 2437 | 2437 | ||
2452 | 2438 | # help of 'this' option of 'missing' command | 2438 | # help of 'this' option of 'missing' command |
2454 | 2439 | #: bzrlib/builtins.py:4558 | 2439 | #: bzrlib/builtins.py:4588 |
2455 | 2440 | msgid "Same as --mine-only." | 2440 | msgid "Same as --mine-only." |
2456 | 2441 | msgstr "" | 2441 | msgstr "" |
2457 | 2442 | 2442 | ||
2458 | 2443 | # help of 'theirs-only' option of 'missing' command | 2443 | # help of 'theirs-only' option of 'missing' command |
2460 | 2444 | #: bzrlib/builtins.py:4560 | 2444 | #: bzrlib/builtins.py:4590 |
2461 | 2445 | msgid "Display changes in the remote branch only." | 2445 | msgid "Display changes in the remote branch only." |
2462 | 2446 | msgstr "" | 2446 | msgstr "" |
2463 | 2447 | 2447 | ||
2464 | 2448 | # help of 'other' option of 'missing' command | 2448 | # help of 'other' option of 'missing' command |
2466 | 2449 | #: bzrlib/builtins.py:4561 | 2449 | #: bzrlib/builtins.py:4591 |
2467 | 2450 | msgid "Same as --theirs-only." | 2450 | msgid "Same as --theirs-only." |
2468 | 2451 | msgstr "" | 2451 | msgstr "" |
2469 | 2452 | 2452 | ||
2470 | 2453 | # help of 'revision' option of 'missing' command | 2453 | # help of 'revision' option of 'missing' command |
2472 | 2454 | #: bzrlib/builtins.py:4566 | 2454 | #: bzrlib/builtins.py:4596 |
2473 | 2455 | msgid "" | 2455 | msgid "" |
2474 | 2456 | "Filter on other branch revisions (inclusive). See \"help revisionspec\" for " | 2456 | "Filter on other branch revisions (inclusive). See \"help revisionspec\" for " |
2475 | 2457 | "details." | 2457 | "details." |
2476 | 2458 | msgstr "" | 2458 | msgstr "" |
2477 | 2459 | 2459 | ||
2478 | 2460 | # help of 'my-revision' option of 'missing' command | 2460 | # help of 'my-revision' option of 'missing' command |
2480 | 2461 | #: bzrlib/builtins.py:4570 | 2461 | #: bzrlib/builtins.py:4600 |
2481 | 2462 | msgid "" | 2462 | msgid "" |
2482 | 2463 | "Filter on local branch revisions (inclusive). See \"help revisionspec\" for " | 2463 | "Filter on local branch revisions (inclusive). See \"help revisionspec\" for " |
2483 | 2464 | "details." | 2464 | "details." |
2484 | 2465 | msgstr "" | 2465 | msgstr "" |
2485 | 2466 | 2466 | ||
2486 | 2467 | # help of 'include-merges' option of 'missing' command | 2467 | # help of 'include-merges' option of 'missing' command |
2488 | 2468 | #: bzrlib/builtins.py:4573 | 2468 | #: bzrlib/builtins.py:4603 |
2489 | 2469 | msgid "Show all revisions in addition to the mainline ones." | 2469 | msgid "Show all revisions in addition to the mainline ones." |
2490 | 2470 | msgstr "" | 2470 | msgstr "" |
2491 | 2471 | 2471 | ||
2493 | 2472 | #: bzrlib/builtins.py:4689 | 2472 | #: bzrlib/builtins.py:4719 |
2494 | 2473 | msgid "Compress the data within a repository." | 2473 | msgid "Compress the data within a repository." |
2495 | 2474 | msgstr "" | 2474 | msgstr "" |
2496 | 2475 | 2475 | ||
2498 | 2476 | #: bzrlib/builtins.py:4691 | 2476 | #: bzrlib/builtins.py:4721 |
2499 | 2477 | msgid "" | 2477 | msgid "" |
2500 | 2478 | "This operation compresses the data within a bazaar repository. As\n" | 2478 | "This operation compresses the data within a bazaar repository. As\n" |
2501 | 2479 | "bazaar supports automatic packing of repository, this operation is\n" | 2479 | "bazaar supports automatic packing of repository, this operation is\n" |
2502 | 2480 | "normally not required to be done manually." | 2480 | "normally not required to be done manually." |
2503 | 2481 | msgstr "" | 2481 | msgstr "" |
2504 | 2482 | 2482 | ||
2506 | 2483 | #: bzrlib/builtins.py:4695 | 2483 | #: bzrlib/builtins.py:4725 |
2507 | 2484 | msgid "" | 2484 | msgid "" |
2508 | 2485 | "During the pack operation, bazaar takes a backup of existing repository\n" | 2485 | "During the pack operation, bazaar takes a backup of existing repository\n" |
2509 | 2486 | "data, i.e. pack files. This backup is eventually removed by bazaar\n" | 2486 | "data, i.e. pack files. This backup is eventually removed by bazaar\n" |
2510 | @@ -2489,7 +2489,7 @@ | |||
2511 | 2489 | "used." | 2489 | "used." |
2512 | 2490 | msgstr "" | 2490 | msgstr "" |
2513 | 2491 | 2491 | ||
2515 | 2492 | #: bzrlib/builtins.py:4701 | 2492 | #: bzrlib/builtins.py:4731 |
2516 | 2493 | msgid "" | 2493 | msgid "" |
2517 | 2494 | "Warning: If you use --clean-obsolete-packs and your machine crashes\n" | 2494 | "Warning: If you use --clean-obsolete-packs and your machine crashes\n" |
2518 | 2495 | "during or immediately after repacking, you may be left with a state\n" | 2495 | "during or immediately after repacking, you may be left with a state\n" |
2519 | @@ -2498,25 +2498,25 @@ | |||
2520 | 2498 | msgstr "" | 2498 | msgstr "" |
2521 | 2499 | 2499 | ||
2522 | 2500 | # help of 'clean-obsolete-packs' option of 'pack' command | 2500 | # help of 'clean-obsolete-packs' option of 'pack' command |
2524 | 2501 | #: bzrlib/builtins.py:4710 | 2501 | #: bzrlib/builtins.py:4740 |
2525 | 2502 | msgid "Delete obsolete packs to save disk space." | 2502 | msgid "Delete obsolete packs to save disk space." |
2526 | 2503 | msgstr "" | 2503 | msgstr "" |
2527 | 2504 | 2504 | ||
2529 | 2505 | #: bzrlib/builtins.py:4724 | 2505 | #: bzrlib/builtins.py:4754 |
2530 | 2506 | msgid "List the installed plugins." | 2506 | msgid "List the installed plugins." |
2531 | 2507 | msgstr "" | 2507 | msgstr "" |
2532 | 2508 | 2508 | ||
2534 | 2509 | #: bzrlib/builtins.py:4726 | 2509 | #: bzrlib/builtins.py:4756 |
2535 | 2510 | msgid "" | 2510 | msgid "" |
2536 | 2511 | "This command displays the list of installed plugins including\n" | 2511 | "This command displays the list of installed plugins including\n" |
2537 | 2512 | "version of plugin and a short description of each." | 2512 | "version of plugin and a short description of each." |
2538 | 2513 | msgstr "" | 2513 | msgstr "" |
2539 | 2514 | 2514 | ||
2541 | 2515 | #: bzrlib/builtins.py:4729 | 2515 | #: bzrlib/builtins.py:4759 |
2542 | 2516 | msgid "--verbose shows the path where each plugin is located." | 2516 | msgid "--verbose shows the path where each plugin is located." |
2543 | 2517 | msgstr "" | 2517 | msgstr "" |
2544 | 2518 | 2518 | ||
2546 | 2519 | #: bzrlib/builtins.py:4731 | 2519 | #: bzrlib/builtins.py:4761 |
2547 | 2520 | msgid "" | 2520 | msgid "" |
2548 | 2521 | "A plugin is an external component for Bazaar that extends the\n" | 2521 | "A plugin is an external component for Bazaar that extends the\n" |
2549 | 2522 | "revision control system, by adding or replacing code in Bazaar.\n" | 2522 | "revision control system, by adding or replacing code in Bazaar.\n" |
2550 | @@ -2525,7 +2525,7 @@ | |||
2551 | 2525 | "customizing log output." | 2525 | "customizing log output." |
2552 | 2526 | msgstr "" | 2526 | msgstr "" |
2553 | 2527 | 2527 | ||
2555 | 2528 | #: bzrlib/builtins.py:4737 | 2528 | #: bzrlib/builtins.py:4767 |
2556 | 2529 | msgid "" | 2529 | msgid "" |
2557 | 2530 | "See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n" | 2530 | "See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n" |
2558 | 2531 | "for further information on plugins including where to find them and how to\n" | 2531 | "for further information on plugins including where to find them and how to\n" |
2559 | @@ -2533,94 +2533,94 @@ | |||
2560 | 2533 | "plugins using the Python programming language." | 2533 | "plugins using the Python programming language." |
2561 | 2534 | msgstr "" | 2534 | msgstr "" |
2562 | 2535 | 2535 | ||
2564 | 2536 | #: bzrlib/builtins.py:4753 | 2536 | #: bzrlib/builtins.py:4783 |
2565 | 2537 | msgid "Show testament (signing-form) of a revision." | 2537 | msgid "Show testament (signing-form) of a revision." |
2566 | 2538 | msgstr "" | 2538 | msgstr "" |
2567 | 2539 | 2539 | ||
2568 | 2540 | # help of 'long' option of 'testament' command | 2540 | # help of 'long' option of 'testament' command |
2570 | 2541 | #: bzrlib/builtins.py:4756 | 2541 | #: bzrlib/builtins.py:4786 |
2571 | 2542 | msgid "Produce long-format testament." | 2542 | msgid "Produce long-format testament." |
2572 | 2543 | msgstr "" | 2543 | msgstr "" |
2573 | 2544 | 2544 | ||
2574 | 2545 | # help of 'strict' option of 'testament' command | 2545 | # help of 'strict' option of 'testament' command |
2576 | 2546 | #: bzrlib/builtins.py:4758 | 2546 | #: bzrlib/builtins.py:4788 |
2577 | 2547 | msgid "Produce a strict-format testament." | 2547 | msgid "Produce a strict-format testament." |
2578 | 2548 | msgstr "" | 2548 | msgstr "" |
2579 | 2549 | 2549 | ||
2581 | 2550 | #: bzrlib/builtins.py:4784 | 2550 | #: bzrlib/builtins.py:4814 |
2582 | 2551 | msgid "Show the origin of each line in a file." | 2551 | msgid "Show the origin of each line in a file." |
2583 | 2552 | msgstr "" | 2552 | msgstr "" |
2584 | 2553 | 2553 | ||
2586 | 2554 | #: bzrlib/builtins.py:4786 | 2554 | #: bzrlib/builtins.py:4816 |
2587 | 2555 | msgid "" | 2555 | msgid "" |
2588 | 2556 | "This prints out the given file with an annotation on the left side\n" | 2556 | "This prints out the given file with an annotation on the left side\n" |
2589 | 2557 | "indicating which revision, author and date introduced the change." | 2557 | "indicating which revision, author and date introduced the change." |
2590 | 2558 | msgstr "" | 2558 | msgstr "" |
2591 | 2559 | 2559 | ||
2593 | 2560 | #: bzrlib/builtins.py:4789 | 2560 | #: bzrlib/builtins.py:4819 |
2594 | 2561 | msgid "" | 2561 | msgid "" |
2595 | 2562 | "If the origin is the same for a run of consecutive lines, it is\n" | 2562 | "If the origin is the same for a run of consecutive lines, it is\n" |
2596 | 2563 | "shown only at the top, unless the --all option is given." | 2563 | "shown only at the top, unless the --all option is given." |
2597 | 2564 | msgstr "" | 2564 | msgstr "" |
2598 | 2565 | 2565 | ||
2599 | 2566 | # help of 'all' option of 'annotate' command | 2566 | # help of 'all' option of 'annotate' command |
2601 | 2567 | #: bzrlib/builtins.py:4797 | 2567 | #: bzrlib/builtins.py:4827 |
2602 | 2568 | msgid "Show annotations on all lines." | 2568 | msgid "Show annotations on all lines." |
2603 | 2569 | msgstr "" | 2569 | msgstr "" |
2604 | 2570 | 2570 | ||
2605 | 2571 | # help of 'long' option of 'annotate' command | 2571 | # help of 'long' option of 'annotate' command |
2607 | 2572 | #: bzrlib/builtins.py:4798 | 2572 | #: bzrlib/builtins.py:4828 |
2608 | 2573 | msgid "Show commit date in annotations." | 2573 | msgid "Show commit date in annotations." |
2609 | 2574 | msgstr "" | 2574 | msgstr "" |
2610 | 2575 | 2575 | ||
2612 | 2576 | #: bzrlib/builtins.py:4901 | 2576 | #: bzrlib/builtins.py:4931 |
2613 | 2577 | msgid "" | 2577 | msgid "" |
2614 | 2578 | "Convert the current branch into a checkout of the supplied branch.\n" | 2578 | "Convert the current branch into a checkout of the supplied branch.\n" |
2615 | 2579 | "If no branch is supplied, rebind to the last bound location." | 2579 | "If no branch is supplied, rebind to the last bound location." |
2616 | 2580 | msgstr "" | 2580 | msgstr "" |
2617 | 2581 | 2581 | ||
2619 | 2582 | #: bzrlib/builtins.py:4904 | 2582 | #: bzrlib/builtins.py:4934 |
2620 | 2583 | msgid "" | 2583 | msgid "" |
2621 | 2584 | "Once converted into a checkout, commits must succeed on the master branch\n" | 2584 | "Once converted into a checkout, commits must succeed on the master branch\n" |
2622 | 2585 | "before they will be applied to the local branch." | 2585 | "before they will be applied to the local branch." |
2623 | 2586 | msgstr "" | 2586 | msgstr "" |
2624 | 2587 | 2587 | ||
2626 | 2588 | #: bzrlib/builtins.py:4907 | 2588 | #: bzrlib/builtins.py:4937 |
2627 | 2589 | msgid "" | 2589 | msgid "" |
2628 | 2590 | "Bound branches use the nickname of its master branch unless it is set\n" | 2590 | "Bound branches use the nickname of its master branch unless it is set\n" |
2629 | 2591 | "locally, in which case binding will update the local nickname to be\n" | 2591 | "locally, in which case binding will update the local nickname to be\n" |
2630 | 2592 | "that of the master." | 2592 | "that of the master." |
2631 | 2593 | msgstr "" | 2593 | msgstr "" |
2632 | 2594 | 2594 | ||
2634 | 2595 | #: bzrlib/builtins.py:4942 | 2595 | #: bzrlib/builtins.py:4972 |
2635 | 2596 | msgid "Convert the current checkout into a regular branch." | 2596 | msgid "Convert the current checkout into a regular branch." |
2636 | 2597 | msgstr "" | 2597 | msgstr "" |
2637 | 2598 | 2598 | ||
2639 | 2599 | #: bzrlib/builtins.py:4944 | 2599 | #: bzrlib/builtins.py:4974 |
2640 | 2600 | msgid "" | 2600 | msgid "" |
2641 | 2601 | "After unbinding, the local branch is considered independent and subsequent\n" | 2601 | "After unbinding, the local branch is considered independent and subsequent\n" |
2642 | 2602 | "commits will be local only." | 2602 | "commits will be local only." |
2643 | 2603 | msgstr "" | 2603 | msgstr "" |
2644 | 2604 | 2604 | ||
2646 | 2605 | #: bzrlib/builtins.py:4959 | 2605 | #: bzrlib/builtins.py:4989 |
2647 | 2606 | msgid "Remove the last committed revision." | 2606 | msgid "Remove the last committed revision." |
2648 | 2607 | msgstr "" | 2607 | msgstr "" |
2649 | 2608 | 2608 | ||
2651 | 2609 | #: bzrlib/builtins.py:4961 | 2609 | #: bzrlib/builtins.py:4991 |
2652 | 2610 | msgid "" | 2610 | msgid "" |
2653 | 2611 | "--verbose will print out what is being removed.\n" | 2611 | "--verbose will print out what is being removed.\n" |
2654 | 2612 | "--dry-run will go through all the motions, but not actually\n" | 2612 | "--dry-run will go through all the motions, but not actually\n" |
2655 | 2613 | "remove anything." | 2613 | "remove anything." |
2656 | 2614 | msgstr "" | 2614 | msgstr "" |
2657 | 2615 | 2615 | ||
2659 | 2616 | #: bzrlib/builtins.py:4965 | 2616 | #: bzrlib/builtins.py:4995 |
2660 | 2617 | msgid "" | 2617 | msgid "" |
2661 | 2618 | "If --revision is specified, uncommit revisions to leave the branch at the\n" | 2618 | "If --revision is specified, uncommit revisions to leave the branch at the\n" |
2662 | 2619 | "specified revision. For example, \"bzr uncommit -r 15\" will leave the\n" | 2619 | "specified revision. For example, \"bzr uncommit -r 15\" will leave the\n" |
2663 | 2620 | "branch at revision 15." | 2620 | "branch at revision 15." |
2664 | 2621 | msgstr "" | 2621 | msgstr "" |
2665 | 2622 | 2622 | ||
2667 | 2623 | #: bzrlib/builtins.py:4969 | 2623 | #: bzrlib/builtins.py:4999 |
2668 | 2624 | msgid "" | 2624 | msgid "" |
2669 | 2625 | "Uncommit leaves the working tree ready for a new commit. The only change\n" | 2625 | "Uncommit leaves the working tree ready for a new commit. The only change\n" |
2670 | 2626 | "it may make is to restore any pending merges that were present before\n" | 2626 | "it may make is to restore any pending merges that were present before\n" |
2671 | @@ -2628,43 +2628,48 @@ | |||
2672 | 2628 | msgstr "" | 2628 | msgstr "" |
2673 | 2629 | 2629 | ||
2674 | 2630 | # help of 'dry-run' option of 'uncommit' command | 2630 | # help of 'dry-run' option of 'uncommit' command |
2676 | 2631 | #: bzrlib/builtins.py:4980 | 2631 | #: bzrlib/builtins.py:5010 |
2677 | 2632 | msgid "Don't actually make changes." | 2632 | msgid "Don't actually make changes." |
2678 | 2633 | msgstr "" | 2633 | msgstr "" |
2679 | 2634 | 2634 | ||
2680 | 2635 | # help of 'force' option of 'uncommit' command | 2635 | # help of 'force' option of 'uncommit' command |
2682 | 2636 | #: bzrlib/builtins.py:4981 | 2636 | #: bzrlib/builtins.py:5011 |
2683 | 2637 | msgid "Say yes to all questions." | 2637 | msgid "Say yes to all questions." |
2684 | 2638 | msgstr "" | 2638 | msgstr "" |
2685 | 2639 | 2639 | ||
2686 | 2640 | # help of 'keep-tags' option of 'uncommit' command | ||
2687 | 2641 | #: bzrlib/builtins.py:5013 | ||
2688 | 2642 | msgid "Keep tags that point to removed revisions." | ||
2689 | 2643 | msgstr "" | ||
2690 | 2644 | |||
2691 | 2640 | # help of 'local' option of 'uncommit' command | 2645 | # help of 'local' option of 'uncommit' command |
2693 | 2641 | #: bzrlib/builtins.py:4983 | 2646 | #: bzrlib/builtins.py:5015 |
2694 | 2642 | msgid "Only remove the commits from the local branch when in a checkout." | 2647 | msgid "Only remove the commits from the local branch when in a checkout." |
2695 | 2643 | msgstr "" | 2648 | msgstr "" |
2696 | 2644 | 2649 | ||
2698 | 2645 | #: bzrlib/builtins.py:5068 | 2650 | #: bzrlib/builtins.py:5101 |
2699 | 2646 | msgid "Break a dead lock." | 2651 | msgid "Break a dead lock." |
2700 | 2647 | msgstr "" | 2652 | msgstr "" |
2701 | 2648 | 2653 | ||
2703 | 2649 | #: bzrlib/builtins.py:5070 | 2654 | #: bzrlib/builtins.py:5103 |
2704 | 2650 | msgid "" | 2655 | msgid "" |
2705 | 2651 | "This command breaks a lock on a repository, branch, working directory or\n" | 2656 | "This command breaks a lock on a repository, branch, working directory or\n" |
2706 | 2652 | "config file." | 2657 | "config file." |
2707 | 2653 | msgstr "" | 2658 | msgstr "" |
2708 | 2654 | 2659 | ||
2710 | 2655 | #: bzrlib/builtins.py:5073 | 2660 | #: bzrlib/builtins.py:5106 |
2711 | 2656 | msgid "" | 2661 | msgid "" |
2712 | 2657 | "CAUTION: Locks should only be broken when you are sure that the process\n" | 2662 | "CAUTION: Locks should only be broken when you are sure that the process\n" |
2713 | 2658 | "holding the lock has been stopped." | 2663 | "holding the lock has been stopped." |
2714 | 2659 | msgstr "" | 2664 | msgstr "" |
2715 | 2660 | 2665 | ||
2717 | 2661 | #: bzrlib/builtins.py:5076 | 2666 | #: bzrlib/builtins.py:5109 |
2718 | 2662 | msgid "" | 2667 | msgid "" |
2719 | 2663 | "You can get information on what locks are open via the 'bzr info\n" | 2668 | "You can get information on what locks are open via the 'bzr info\n" |
2720 | 2664 | "[location]' command." | 2669 | "[location]' command." |
2721 | 2665 | msgstr "" | 2670 | msgstr "" |
2722 | 2666 | 2671 | ||
2724 | 2667 | #: bzrlib/builtins.py:5079 | 2672 | #: bzrlib/builtins.py:5112 |
2725 | 2668 | msgid "" | 2673 | msgid "" |
2726 | 2669 | ":Examples:\n" | 2674 | ":Examples:\n" |
2727 | 2670 | " bzr break-lock\n" | 2675 | " bzr break-lock\n" |
2728 | @@ -2673,36 +2678,36 @@ | |||
2729 | 2673 | msgstr "" | 2678 | msgstr "" |
2730 | 2674 | 2679 | ||
2731 | 2675 | # help of 'config' option of 'break-lock' command | 2680 | # help of 'config' option of 'break-lock' command |
2733 | 2676 | #: bzrlib/builtins.py:5088 | 2681 | #: bzrlib/builtins.py:5121 |
2734 | 2677 | msgid "LOCATION is the directory where the config lock is." | 2682 | msgid "LOCATION is the directory where the config lock is." |
2735 | 2678 | msgstr "" | 2683 | msgstr "" |
2736 | 2679 | 2684 | ||
2737 | 2680 | # help of 'force' option of 'break-lock' command | 2685 | # help of 'force' option of 'break-lock' command |
2739 | 2681 | #: bzrlib/builtins.py:5090 | 2686 | #: bzrlib/builtins.py:5123 |
2740 | 2682 | msgid "Do not ask for confirmation before breaking the lock." | 2687 | msgid "Do not ask for confirmation before breaking the lock." |
2741 | 2683 | msgstr "" | 2688 | msgstr "" |
2742 | 2684 | 2689 | ||
2744 | 2685 | #: bzrlib/builtins.py:5126 | 2690 | #: bzrlib/builtins.py:5159 |
2745 | 2686 | msgid "Run the bzr server." | 2691 | msgid "Run the bzr server." |
2746 | 2687 | msgstr "" | 2692 | msgstr "" |
2747 | 2688 | 2693 | ||
2748 | 2689 | # help of 'inet' option of 'serve' command | 2694 | # help of 'inet' option of 'serve' command |
2750 | 2690 | #: bzrlib/builtins.py:5132 | 2695 | #: bzrlib/builtins.py:5165 |
2751 | 2691 | msgid "Serve on stdin/out for use from inetd or sshd." | 2696 | msgid "Serve on stdin/out for use from inetd or sshd." |
2752 | 2692 | msgstr "" | 2697 | msgstr "" |
2753 | 2693 | 2698 | ||
2754 | 2694 | # title of 'protocol' option of 'serve' command | 2699 | # title of 'protocol' option of 'serve' command |
2756 | 2695 | #: bzrlib/builtins.py:5133 | 2700 | #: bzrlib/builtins.py:5166 |
2757 | 2696 | msgid "protocol" | 2701 | msgid "protocol" |
2758 | 2697 | msgstr "" | 2702 | msgstr "" |
2759 | 2698 | 2703 | ||
2760 | 2699 | # help of 'protocol' option of 'serve' command | 2704 | # help of 'protocol' option of 'serve' command |
2762 | 2700 | #: bzrlib/builtins.py:5134 | 2705 | #: bzrlib/builtins.py:5167 |
2763 | 2701 | msgid "Protocol to serve." | 2706 | msgid "Protocol to serve." |
2764 | 2702 | msgstr "" | 2707 | msgstr "" |
2765 | 2703 | 2708 | ||
2766 | 2704 | # help of 'port' option of 'serve' command | 2709 | # help of 'port' option of 'serve' command |
2768 | 2705 | #: bzrlib/builtins.py:5138 | 2710 | #: bzrlib/builtins.py:5171 |
2769 | 2706 | msgid "" | 2711 | msgid "" |
2770 | 2707 | "Listen for connections on nominated port of the form [hostname:]portnumber. " | 2712 | "Listen for connections on nominated port of the form [hostname:]portnumber. " |
2771 | 2708 | "Passing 0 as the port number will result in a dynamically allocated port. " | 2713 | "Passing 0 as the port number will result in a dynamically allocated port. " |
2772 | @@ -2710,12 +2715,12 @@ | |||
2773 | 2710 | msgstr "" | 2715 | msgstr "" |
2774 | 2711 | 2716 | ||
2775 | 2712 | # help of 'directory' option of 'serve' command | 2717 | # help of 'directory' option of 'serve' command |
2777 | 2713 | #: bzrlib/builtins.py:5144 | 2718 | #: bzrlib/builtins.py:5177 |
2778 | 2714 | msgid "Serve contents of this directory." | 2719 | msgid "Serve contents of this directory." |
2779 | 2715 | msgstr "" | 2720 | msgstr "" |
2780 | 2716 | 2721 | ||
2781 | 2717 | # help of 'allow-writes' option of 'serve' command | 2722 | # help of 'allow-writes' option of 'serve' command |
2783 | 2718 | #: bzrlib/builtins.py:5146 | 2723 | #: bzrlib/builtins.py:5179 |
2784 | 2719 | msgid "" | 2724 | msgid "" |
2785 | 2720 | "By default the server is a readonly server. Supplying --allow-writes " | 2725 | "By default the server is a readonly server. Supplying --allow-writes " |
2786 | 2721 | "enables write access to the contents of the served directory and below. " | 2726 | "enables write access to the contents of the served directory and below. " |
2787 | @@ -2724,83 +2729,83 @@ | |||
2788 | 2724 | "uncontrolled write access to your file system." | 2729 | "uncontrolled write access to your file system." |
2789 | 2725 | msgstr "" | 2730 | msgstr "" |
2790 | 2726 | 2731 | ||
2792 | 2727 | #: bzrlib/builtins.py:5191 | 2732 | #: bzrlib/builtins.py:5224 |
2793 | 2728 | msgid "Combine a tree into its containing tree." | 2733 | msgid "Combine a tree into its containing tree." |
2794 | 2729 | msgstr "" | 2734 | msgstr "" |
2795 | 2730 | 2735 | ||
2797 | 2731 | #: bzrlib/builtins.py:5193 | 2736 | #: bzrlib/builtins.py:5226 |
2798 | 2732 | msgid "This command requires the target tree to be in a rich-root format." | 2737 | msgid "This command requires the target tree to be in a rich-root format." |
2799 | 2733 | msgstr "" | 2738 | msgstr "" |
2800 | 2734 | 2739 | ||
2802 | 2735 | #: bzrlib/builtins.py:5195 | 2740 | #: bzrlib/builtins.py:5228 |
2803 | 2736 | msgid "" | 2741 | msgid "" |
2804 | 2737 | "The TREE argument should be an independent tree, inside another tree, but\n" | 2742 | "The TREE argument should be an independent tree, inside another tree, but\n" |
2805 | 2738 | "not part of it. (Such trees can be produced by \"bzr split\", but also by\n" | 2743 | "not part of it. (Such trees can be produced by \"bzr split\", but also by\n" |
2806 | 2739 | "running \"bzr branch\" with the target inside a tree.)" | 2744 | "running \"bzr branch\" with the target inside a tree.)" |
2807 | 2740 | msgstr "" | 2745 | msgstr "" |
2808 | 2741 | 2746 | ||
2810 | 2742 | #: bzrlib/builtins.py:5199 | 2747 | #: bzrlib/builtins.py:5232 |
2811 | 2743 | msgid "" | 2748 | msgid "" |
2812 | 2744 | "The result is a combined tree, with the subtree no longer an independent\n" | 2749 | "The result is a combined tree, with the subtree no longer an independent\n" |
2813 | 2745 | "part. This is marked as a merge of the subtree into the containing tree,\n" | 2750 | "part. This is marked as a merge of the subtree into the containing tree,\n" |
2814 | 2746 | "and all history is preserved." | 2751 | "and all history is preserved." |
2815 | 2747 | msgstr "" | 2752 | msgstr "" |
2816 | 2748 | 2753 | ||
2818 | 2749 | #: bzrlib/builtins.py:5237 | 2754 | #: bzrlib/builtins.py:5270 |
2819 | 2750 | msgid "Split a subdirectory of a tree into a separate tree." | 2755 | msgid "Split a subdirectory of a tree into a separate tree." |
2820 | 2751 | msgstr "" | 2756 | msgstr "" |
2821 | 2752 | 2757 | ||
2823 | 2753 | #: bzrlib/builtins.py:5239 | 2758 | #: bzrlib/builtins.py:5272 |
2824 | 2754 | msgid "" | 2759 | msgid "" |
2825 | 2755 | "This command will produce a target tree in a format that supports\n" | 2760 | "This command will produce a target tree in a format that supports\n" |
2826 | 2756 | "rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n" | 2761 | "rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n" |
2827 | 2757 | "converted into earlier formats like 'dirstate-tags'." | 2762 | "converted into earlier formats like 'dirstate-tags'." |
2828 | 2758 | msgstr "" | 2763 | msgstr "" |
2829 | 2759 | 2764 | ||
2831 | 2760 | #: bzrlib/builtins.py:5243 | 2765 | #: bzrlib/builtins.py:5276 |
2832 | 2761 | msgid "" | 2766 | msgid "" |
2833 | 2762 | "The TREE argument should be a subdirectory of a working tree. That\n" | 2767 | "The TREE argument should be a subdirectory of a working tree. That\n" |
2834 | 2763 | "subdirectory will be converted into an independent tree, with its own\n" | 2768 | "subdirectory will be converted into an independent tree, with its own\n" |
2835 | 2764 | "branch. Commits in the top-level tree will not apply to the new subtree." | 2769 | "branch. Commits in the top-level tree will not apply to the new subtree." |
2836 | 2765 | msgstr "" | 2770 | msgstr "" |
2837 | 2766 | 2771 | ||
2839 | 2767 | #: bzrlib/builtins.py:5364 | 2772 | #: bzrlib/builtins.py:5397 |
2840 | 2768 | msgid "Mail or create a merge-directive for submitting changes." | 2773 | msgid "Mail or create a merge-directive for submitting changes." |
2841 | 2769 | msgstr "" | 2774 | msgstr "" |
2842 | 2770 | 2775 | ||
2844 | 2771 | #: bzrlib/builtins.py:5366 | 2776 | #: bzrlib/builtins.py:5399 |
2845 | 2772 | msgid "A merge directive provides many things needed for requesting merges:" | 2777 | msgid "A merge directive provides many things needed for requesting merges:" |
2846 | 2773 | msgstr "" | 2778 | msgstr "" |
2847 | 2774 | 2779 | ||
2849 | 2775 | #: bzrlib/builtins.py:5368 | 2780 | #: bzrlib/builtins.py:5401 |
2850 | 2776 | msgid "* A machine-readable description of the merge to perform" | 2781 | msgid "* A machine-readable description of the merge to perform" |
2851 | 2777 | msgstr "" | 2782 | msgstr "" |
2852 | 2778 | 2783 | ||
2854 | 2779 | #: bzrlib/builtins.py:5370 | 2784 | #: bzrlib/builtins.py:5403 |
2855 | 2780 | msgid "* An optional patch that is a preview of the changes requested" | 2785 | msgid "* An optional patch that is a preview of the changes requested" |
2856 | 2781 | msgstr "" | 2786 | msgstr "" |
2857 | 2782 | 2787 | ||
2859 | 2783 | #: bzrlib/builtins.py:5372 | 2788 | #: bzrlib/builtins.py:5405 |
2860 | 2784 | msgid "" | 2789 | msgid "" |
2861 | 2785 | "* An optional bundle of revision data, so that the changes can be applied\n" | 2790 | "* An optional bundle of revision data, so that the changes can be applied\n" |
2862 | 2786 | " directly from the merge directive, without retrieving data from a\n" | 2791 | " directly from the merge directive, without retrieving data from a\n" |
2863 | 2787 | " branch." | 2792 | " branch." |
2864 | 2788 | msgstr "" | 2793 | msgstr "" |
2865 | 2789 | 2794 | ||
2867 | 2790 | #: bzrlib/builtins.py:5376 | 2795 | #: bzrlib/builtins.py:5409 |
2868 | 2791 | msgid "" | 2796 | msgid "" |
2869 | 2792 | "`bzr send` creates a compact data set that, when applied using bzr\n" | 2797 | "`bzr send` creates a compact data set that, when applied using bzr\n" |
2870 | 2793 | "merge, has the same effect as merging from the source branch. " | 2798 | "merge, has the same effect as merging from the source branch. " |
2871 | 2794 | msgstr "" | 2799 | msgstr "" |
2872 | 2795 | 2800 | ||
2874 | 2796 | #: bzrlib/builtins.py:5379 | 2801 | #: bzrlib/builtins.py:5412 |
2875 | 2797 | msgid "" | 2802 | msgid "" |
2876 | 2798 | "By default the merge directive is self-contained and can be applied to any\n" | 2803 | "By default the merge directive is self-contained and can be applied to any\n" |
2877 | 2799 | "branch containing submit_branch in its ancestory without needing access to\n" | 2804 | "branch containing submit_branch in its ancestory without needing access to\n" |
2878 | 2800 | "the source branch." | 2805 | "the source branch." |
2879 | 2801 | msgstr "" | 2806 | msgstr "" |
2880 | 2802 | 2807 | ||
2882 | 2803 | #: bzrlib/builtins.py:5383 | 2808 | #: bzrlib/builtins.py:5416 |
2883 | 2804 | msgid "" | 2809 | msgid "" |
2884 | 2805 | "If --no-bundle is specified, then Bazaar doesn't send the contents of the\n" | 2810 | "If --no-bundle is specified, then Bazaar doesn't send the contents of the\n" |
2885 | 2806 | "revisions, but only a structured request to merge from the\n" | 2811 | "revisions, but only a structured request to merge from the\n" |
2886 | @@ -2809,7 +2814,7 @@ | |||
2887 | 2809 | "included if known, so that people can check it later." | 2814 | "included if known, so that people can check it later." |
2888 | 2810 | msgstr "" | 2815 | msgstr "" |
2889 | 2811 | 2816 | ||
2891 | 2812 | #: bzrlib/builtins.py:5389 | 2817 | #: bzrlib/builtins.py:5422 |
2892 | 2813 | msgid "" | 2818 | msgid "" |
2893 | 2814 | "The submit branch defaults to the parent of the source branch, but can be\n" | 2819 | "The submit branch defaults to the parent of the source branch, but can be\n" |
2894 | 2815 | "overridden. Both submit branch and public branch will be remembered in\n" | 2820 | "overridden. Both submit branch and public branch will be remembered in\n" |
2895 | @@ -2818,16 +2823,16 @@ | |||
2896 | 2818 | "be changed using --from." | 2823 | "be changed using --from." |
2897 | 2819 | msgstr "" | 2824 | msgstr "" |
2898 | 2820 | 2825 | ||
2900 | 2821 | #: bzrlib/builtins.py:5395 | 2826 | #: bzrlib/builtins.py:5428 |
2901 | 2822 | msgid "" | 2827 | msgid "" |
2902 | 2823 | "Both the submit branch and the public branch follow the usual behavior with\n" | 2828 | "Both the submit branch and the public branch follow the usual behavior with\n" |
2903 | 2824 | "respect to --remember: If there is no default location set, the first send\n" | 2829 | "respect to --remember: If there is no default location set, the first send\n" |
2905 | 2825 | "will set it (use --no-remember to avoid settting it). After that, you can\n" | 2830 | "will set it (use --no-remember to avoid setting it). After that, you can\n" |
2906 | 2826 | "omit the location to use the default. To change the default, use\n" | 2831 | "omit the location to use the default. To change the default, use\n" |
2907 | 2827 | "--remember. The value will only be saved if the location can be accessed." | 2832 | "--remember. The value will only be saved if the location can be accessed." |
2908 | 2828 | msgstr "" | 2833 | msgstr "" |
2909 | 2829 | 2834 | ||
2911 | 2830 | #: bzrlib/builtins.py:5401 | 2835 | #: bzrlib/builtins.py:5434 |
2912 | 2831 | msgid "" | 2836 | msgid "" |
2913 | 2832 | "In order to calculate those changes, bzr must analyse the submit branch.\n" | 2837 | "In order to calculate those changes, bzr must analyse the submit branch.\n" |
2914 | 2833 | "Therefore it is most efficient for the submit branch to be a local mirror.\n" | 2838 | "Therefore it is most efficient for the submit branch to be a local mirror.\n" |
2915 | @@ -2835,20 +2840,20 @@ | |||
2916 | 2835 | "in the merge directive." | 2840 | "in the merge directive." |
2917 | 2836 | msgstr "" | 2841 | msgstr "" |
2918 | 2837 | 2842 | ||
2920 | 2838 | #: bzrlib/builtins.py:5406 | 2843 | #: bzrlib/builtins.py:5439 |
2921 | 2839 | msgid "" | 2844 | msgid "" |
2922 | 2840 | "The default behaviour is to send the merge directive by mail, unless -o is\n" | 2845 | "The default behaviour is to send the merge directive by mail, unless -o is\n" |
2923 | 2841 | "given, in which case it is sent to a file." | 2846 | "given, in which case it is sent to a file." |
2924 | 2842 | msgstr "" | 2847 | msgstr "" |
2925 | 2843 | 2848 | ||
2927 | 2844 | #: bzrlib/builtins.py:5409 | 2849 | #: bzrlib/builtins.py:5442 |
2928 | 2845 | msgid "" | 2850 | msgid "" |
2929 | 2846 | "Mail is sent using your preferred mail program. This should be transparent\n" | 2851 | "Mail is sent using your preferred mail program. This should be transparent\n" |
2930 | 2847 | "on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n" | 2852 | "on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n" |
2931 | 2848 | "If the preferred client can't be found (or used), your editor will be used." | 2853 | "If the preferred client can't be found (or used), your editor will be used." |
2932 | 2849 | msgstr "" | 2854 | msgstr "" |
2933 | 2850 | 2855 | ||
2935 | 2851 | #: bzrlib/builtins.py:5413 | 2856 | #: bzrlib/builtins.py:5446 |
2936 | 2852 | msgid "" | 2857 | msgid "" |
2937 | 2853 | "To use a specific mail program, set the mail_client configuration option.\n" | 2858 | "To use a specific mail program, set the mail_client configuration option.\n" |
2938 | 2854 | "(For Thunderbird 1.5, this works around some bugs.) Supported values for\n" | 2859 | "(For Thunderbird 1.5, this works around some bugs.) Supported values for\n" |
2939 | @@ -2860,7 +2865,7 @@ | |||
2940 | 2860 | "supported clients." | 2865 | "supported clients." |
2941 | 2861 | msgstr "" | 2866 | msgstr "" |
2942 | 2862 | 2867 | ||
2944 | 2863 | #: bzrlib/builtins.py:5420 | 2868 | #: bzrlib/builtins.py:5453 |
2945 | 2864 | msgid "" | 2869 | msgid "" |
2946 | 2865 | "If mail is being sent, a to address is required. This can be supplied\n" | 2870 | "If mail is being sent, a to address is required. This can be supplied\n" |
2947 | 2866 | "either on the commandline, by setting the submit_to configuration\n" | 2871 | "either on the commandline, by setting the submit_to configuration\n" |
2948 | @@ -2868,7 +2873,7 @@ | |||
2949 | 2868 | "in the submit branch." | 2873 | "in the submit branch." |
2950 | 2869 | msgstr "" | 2874 | msgstr "" |
2951 | 2870 | 2875 | ||
2953 | 2871 | #: bzrlib/builtins.py:5425 | 2876 | #: bzrlib/builtins.py:5458 |
2954 | 2872 | msgid "" | 2877 | msgid "" |
2955 | 2873 | "Two formats are currently supported: \"4\" uses revision bundle format 4 " | 2878 | "Two formats are currently supported: \"4\" uses revision bundle format 4 " |
2956 | 2874 | "and\n" | 2879 | "and\n" |
2957 | @@ -2878,13 +2883,13 @@ | |||
2958 | 2878 | "format 1. It is compatible with Bazaar 0.12 - 0.18." | 2883 | "format 1. It is compatible with Bazaar 0.12 - 0.18." |
2959 | 2879 | msgstr "" | 2884 | msgstr "" |
2960 | 2880 | 2885 | ||
2962 | 2881 | #: bzrlib/builtins.py:5431 | 2886 | #: bzrlib/builtins.py:5464 |
2963 | 2882 | msgid "" | 2887 | msgid "" |
2964 | 2883 | "The merge directives created by bzr send may be applied using bzr merge or\n" | 2888 | "The merge directives created by bzr send may be applied using bzr merge or\n" |
2965 | 2884 | "bzr pull by specifying a file containing a merge directive as the location." | 2889 | "bzr pull by specifying a file containing a merge directive as the location." |
2966 | 2885 | msgstr "" | 2890 | msgstr "" |
2967 | 2886 | 2891 | ||
2969 | 2887 | #: bzrlib/builtins.py:5434 | 2892 | #: bzrlib/builtins.py:5467 |
2970 | 2888 | msgid "" | 2893 | msgid "" |
2971 | 2889 | "bzr send makes extensive use of public locations to map local locations " | 2894 | "bzr send makes extensive use of public locations to map local locations " |
2972 | 2890 | "into\n" | 2895 | "into\n" |
2973 | @@ -2893,90 +2898,90 @@ | |||
2974 | 2893 | msgstr "" | 2898 | msgstr "" |
2975 | 2894 | 2899 | ||
2976 | 2895 | # help of 'output' option of 'send' command | 2900 | # help of 'output' option of 'send' command |
2978 | 2896 | #: bzrlib/builtins.py:5458 | 2901 | #: bzrlib/builtins.py:5491 |
2979 | 2897 | msgid "Write merge directive to this file or directory; use - for stdout." | 2902 | msgid "Write merge directive to this file or directory; use - for stdout." |
2980 | 2898 | msgstr "" | 2903 | msgstr "" |
2981 | 2899 | 2904 | ||
2982 | 2900 | # help of 'strict' option of 'send' command | 2905 | # help of 'strict' option of 'send' command |
2984 | 2901 | #: bzrlib/builtins.py:5462 | 2906 | #: bzrlib/builtins.py:5495 |
2985 | 2902 | msgid "" | 2907 | msgid "" |
2986 | 2903 | "Refuse to send if there are uncommitted changes in the working tree, --no-" | 2908 | "Refuse to send if there are uncommitted changes in the working tree, --no-" |
2987 | 2904 | "strict disables the check." | 2909 | "strict disables the check." |
2988 | 2905 | msgstr "" | 2910 | msgstr "" |
2989 | 2906 | 2911 | ||
2990 | 2907 | # help of 'mail-to' option of 'send' command | 2912 | # help of 'mail-to' option of 'send' command |
2992 | 2908 | #: bzrlib/builtins.py:5464 | 2913 | #: bzrlib/builtins.py:5497 |
2993 | 2909 | msgid "Mail the request to this address." | 2914 | msgid "Mail the request to this address." |
2994 | 2910 | msgstr "" | 2915 | msgstr "" |
2995 | 2911 | 2916 | ||
2996 | 2912 | # help of 'body' option of 'send' command | 2917 | # help of 'body' option of 'send' command |
2998 | 2913 | #: bzrlib/builtins.py:5468 | 2918 | #: bzrlib/builtins.py:5501 |
2999 | 2914 | msgid "Body for the email." | 2919 | msgid "Body for the email." |
3000 | 2915 | msgstr "" | 2920 | msgstr "" |
3001 | 2916 | 2921 | ||
3002 | 2917 | # help of 'no-bundle' option of 'send' command | 2922 | # help of 'no-bundle' option of 'send' command |
3004 | 2918 | #: bzrlib/builtins.py:5521 | 2923 | #: bzrlib/builtins.py:5554 |
3005 | 2919 | msgid "Do not include a bundle in the merge directive." | 2924 | msgid "Do not include a bundle in the merge directive." |
3006 | 2920 | msgstr "" | 2925 | msgstr "" |
3007 | 2921 | 2926 | ||
3008 | 2922 | # help of 'no-patch' option of 'send' command | 2927 | # help of 'no-patch' option of 'send' command |
3010 | 2923 | #: bzrlib/builtins.py:5522 | 2928 | #: bzrlib/builtins.py:5555 |
3011 | 2924 | msgid "Do not include a preview patch in the merge directive." | 2929 | msgid "Do not include a preview patch in the merge directive." |
3012 | 2925 | msgstr "" | 2930 | msgstr "" |
3013 | 2926 | 2931 | ||
3014 | 2927 | # help of 'remember' option of 'send' command | 2932 | # help of 'remember' option of 'send' command |
3016 | 2928 | #: bzrlib/builtins.py:5525 | 2933 | #: bzrlib/builtins.py:5558 |
3017 | 2929 | msgid "Remember submit and public branch." | 2934 | msgid "Remember submit and public branch." |
3018 | 2930 | msgstr "" | 2935 | msgstr "" |
3019 | 2931 | 2936 | ||
3020 | 2932 | # help of 'from' option of 'send' command | 2937 | # help of 'from' option of 'send' command |
3022 | 2933 | #: bzrlib/builtins.py:5527 | 2938 | #: bzrlib/builtins.py:5560 |
3023 | 2934 | msgid "" | 2939 | msgid "" |
3024 | 2935 | "Branch to generate the submission from, rather than the one containing the " | 2940 | "Branch to generate the submission from, rather than the one containing the " |
3025 | 2936 | "working directory." | 2941 | "working directory." |
3026 | 2937 | msgstr "" | 2942 | msgstr "" |
3027 | 2938 | 2943 | ||
3028 | 2939 | # title of 'format' option of 'send' command | 2944 | # title of 'format' option of 'send' command |
3030 | 2940 | #: bzrlib/builtins.py:5537 | 2945 | #: bzrlib/builtins.py:5570 |
3031 | 2941 | msgid "format" | 2946 | msgid "format" |
3032 | 2942 | msgstr "" | 2947 | msgstr "" |
3033 | 2943 | 2948 | ||
3034 | 2944 | # help of 'format' option of 'send' command | 2949 | # help of 'format' option of 'send' command |
3036 | 2945 | #: bzrlib/builtins.py:5538 | 2950 | #: bzrlib/builtins.py:5571 |
3037 | 2946 | msgid "Use the specified output format." | 2951 | msgid "Use the specified output format." |
3038 | 2947 | msgstr "" | 2952 | msgstr "" |
3039 | 2948 | 2953 | ||
3041 | 2949 | #: bzrlib/builtins.py:5560 | 2954 | #: bzrlib/builtins.py:5593 |
3042 | 2950 | msgid "Create, remove or modify a tag naming a revision." | 2955 | msgid "Create, remove or modify a tag naming a revision." |
3043 | 2951 | msgstr "" | 2956 | msgstr "" |
3044 | 2952 | 2957 | ||
3046 | 2953 | #: bzrlib/builtins.py:5562 | 2958 | #: bzrlib/builtins.py:5595 |
3047 | 2954 | msgid "" | 2959 | msgid "" |
3048 | 2955 | "Tags give human-meaningful names to revisions. Commands that take a -r\n" | 2960 | "Tags give human-meaningful names to revisions. Commands that take a -r\n" |
3049 | 2956 | "(--revision) option can be given -rtag:X, where X is any previously\n" | 2961 | "(--revision) option can be given -rtag:X, where X is any previously\n" |
3050 | 2957 | "created tag." | 2962 | "created tag." |
3051 | 2958 | msgstr "" | 2963 | msgstr "" |
3052 | 2959 | 2964 | ||
3054 | 2960 | #: bzrlib/builtins.py:5566 | 2965 | #: bzrlib/builtins.py:5599 |
3055 | 2961 | msgid "" | 2966 | msgid "" |
3056 | 2962 | "Tags are stored in the branch. Tags are copied from one branch to another\n" | 2967 | "Tags are stored in the branch. Tags are copied from one branch to another\n" |
3057 | 2963 | "along when you branch, push, pull or merge." | 2968 | "along when you branch, push, pull or merge." |
3058 | 2964 | msgstr "" | 2969 | msgstr "" |
3059 | 2965 | 2970 | ||
3061 | 2966 | #: bzrlib/builtins.py:5569 | 2971 | #: bzrlib/builtins.py:5602 |
3062 | 2967 | msgid "" | 2972 | msgid "" |
3063 | 2968 | "It is an error to give a tag name that already exists unless you pass\n" | 2973 | "It is an error to give a tag name that already exists unless you pass\n" |
3064 | 2969 | "--force, in which case the tag is moved to point to the new revision." | 2974 | "--force, in which case the tag is moved to point to the new revision." |
3065 | 2970 | msgstr "" | 2975 | msgstr "" |
3066 | 2971 | 2976 | ||
3068 | 2972 | #: bzrlib/builtins.py:5572 | 2977 | #: bzrlib/builtins.py:5605 |
3069 | 2973 | msgid "" | 2978 | msgid "" |
3070 | 2974 | "To rename a tag (change the name but keep it on the same revsion), run " | 2979 | "To rename a tag (change the name but keep it on the same revsion), run " |
3071 | 2975 | "``bzr\n" | 2980 | "``bzr\n" |
3072 | 2976 | "tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``." | 2981 | "tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``." |
3073 | 2977 | msgstr "" | 2982 | msgstr "" |
3074 | 2978 | 2983 | ||
3076 | 2979 | #: bzrlib/builtins.py:5575 | 2984 | #: bzrlib/builtins.py:5608 |
3077 | 2980 | msgid "" | 2985 | msgid "" |
3078 | 2981 | "If no tag name is specified it will be determined through the \n" | 2986 | "If no tag name is specified it will be determined through the \n" |
3079 | 2982 | "'automatic_tag_name' hook. This can e.g. be used to automatically tag\n" | 2987 | "'automatic_tag_name' hook. This can e.g. be used to automatically tag\n" |
3080 | @@ -2985,53 +2990,53 @@ | |||
3081 | 2985 | msgstr "" | 2990 | msgstr "" |
3082 | 2986 | 2991 | ||
3083 | 2987 | # help of 'delete' option of 'tag' command | 2992 | # help of 'delete' option of 'tag' command |
3085 | 2988 | #: bzrlib/builtins.py:5585 | 2993 | #: bzrlib/builtins.py:5618 |
3086 | 2989 | msgid "Delete this tag rather than placing it." | 2994 | msgid "Delete this tag rather than placing it." |
3087 | 2990 | msgstr "" | 2995 | msgstr "" |
3088 | 2991 | 2996 | ||
3089 | 2992 | # help of 'directory' option of 'tag' command | 2997 | # help of 'directory' option of 'tag' command |
3091 | 2993 | #: bzrlib/builtins.py:5588 | 2998 | #: bzrlib/builtins.py:5621 |
3092 | 2994 | msgid "Branch in which to place the tag." | 2999 | msgid "Branch in which to place the tag." |
3093 | 2995 | msgstr "" | 3000 | msgstr "" |
3094 | 2996 | 3001 | ||
3095 | 2997 | # help of 'force' option of 'tag' command | 3002 | # help of 'force' option of 'tag' command |
3097 | 2998 | #: bzrlib/builtins.py:5590 | 3003 | #: bzrlib/builtins.py:5623 |
3098 | 2999 | msgid "Replace existing tags." | 3004 | msgid "Replace existing tags." |
3099 | 3000 | msgstr "" | 3005 | msgstr "" |
3100 | 3001 | 3006 | ||
3102 | 3002 | #: bzrlib/builtins.py:5629 | 3007 | #: bzrlib/builtins.py:5672 |
3103 | 3003 | msgid "List tags." | 3008 | msgid "List tags." |
3104 | 3004 | msgstr "" | 3009 | msgstr "" |
3105 | 3005 | 3010 | ||
3107 | 3006 | #: bzrlib/builtins.py:5631 | 3011 | #: bzrlib/builtins.py:5674 |
3108 | 3007 | msgid "" | 3012 | msgid "" |
3109 | 3008 | "This command shows a table of tag names and the revisions they reference." | 3013 | "This command shows a table of tag names and the revisions they reference." |
3110 | 3009 | msgstr "" | 3014 | msgstr "" |
3111 | 3010 | 3015 | ||
3112 | 3011 | # help of 'directory' option of 'tags' command | 3016 | # help of 'directory' option of 'tags' command |
3114 | 3012 | #: bzrlib/builtins.py:5637 | 3017 | #: bzrlib/builtins.py:5680 |
3115 | 3013 | msgid "Branch whose tags should be displayed." | 3018 | msgid "Branch whose tags should be displayed." |
3116 | 3014 | msgstr "" | 3019 | msgstr "" |
3117 | 3015 | 3020 | ||
3118 | 3016 | # help of 'sort' option of 'tags' command | 3021 | # help of 'sort' option of 'tags' command |
3120 | 3017 | #: bzrlib/builtins.py:5639 | 3022 | #: bzrlib/builtins.py:5682 |
3121 | 3018 | msgid "Sort tags by different criteria." | 3023 | msgid "Sort tags by different criteria." |
3122 | 3019 | msgstr "" | 3024 | msgstr "" |
3123 | 3020 | 3025 | ||
3124 | 3021 | # title of 'sort' option of 'tags' command | 3026 | # title of 'sort' option of 'tags' command |
3126 | 3022 | #: bzrlib/builtins.py:5639 | 3027 | #: bzrlib/builtins.py:5682 |
3127 | 3023 | msgid "Sorting" | 3028 | msgid "Sorting" |
3128 | 3024 | msgstr "" | 3029 | msgstr "" |
3129 | 3025 | 3030 | ||
3131 | 3026 | #: bzrlib/builtins.py:5684 | 3031 | #: bzrlib/builtins.py:5727 |
3132 | 3027 | msgid "Reconfigure the type of a bzr directory." | 3032 | msgid "Reconfigure the type of a bzr directory." |
3133 | 3028 | msgstr "" | 3033 | msgstr "" |
3134 | 3029 | 3034 | ||
3136 | 3030 | #: bzrlib/builtins.py:5686 | 3035 | #: bzrlib/builtins.py:5729 |
3137 | 3031 | msgid "A target configuration must be specified." | 3036 | msgid "A target configuration must be specified." |
3138 | 3032 | msgstr "" | 3037 | msgstr "" |
3139 | 3033 | 3038 | ||
3141 | 3034 | #: bzrlib/builtins.py:5688 | 3039 | #: bzrlib/builtins.py:5731 |
3142 | 3035 | msgid "" | 3040 | msgid "" |
3143 | 3036 | "For checkouts, the bind-to location will be auto-detected if not specified.\n" | 3041 | "For checkouts, the bind-to location will be auto-detected if not specified.\n" |
3144 | 3037 | "The order of preference is\n" | 3042 | "The order of preference is\n" |
3145 | @@ -3043,42 +3048,42 @@ | |||
3146 | 3043 | msgstr "" | 3048 | msgstr "" |
3147 | 3044 | 3049 | ||
3148 | 3045 | # title of 'target_type' option of 'reconfigure' command | 3050 | # title of 'target_type' option of 'reconfigure' command |
3150 | 3046 | #: bzrlib/builtins.py:5702 | 3051 | #: bzrlib/builtins.py:5745 |
3151 | 3047 | msgid "Target type" | 3052 | msgid "Target type" |
3152 | 3048 | msgstr "" | 3053 | msgstr "" |
3153 | 3049 | 3054 | ||
3154 | 3050 | # help of 'target_type' option of 'reconfigure' command | 3055 | # help of 'target_type' option of 'reconfigure' command |
3156 | 3051 | #: bzrlib/builtins.py:5703 | 3056 | #: bzrlib/builtins.py:5746 |
3157 | 3052 | msgid "The type to reconfigure the directory to." | 3057 | msgid "The type to reconfigure the directory to." |
3158 | 3053 | msgstr "" | 3058 | msgstr "" |
3159 | 3054 | 3059 | ||
3160 | 3055 | # help of 'bind-to' option of 'reconfigure' command | 3060 | # help of 'bind-to' option of 'reconfigure' command |
3162 | 3056 | #: bzrlib/builtins.py:5718 | 3061 | #: bzrlib/builtins.py:5761 |
3163 | 3057 | msgid "Branch to bind checkout to." | 3062 | msgid "Branch to bind checkout to." |
3164 | 3058 | msgstr "" | 3063 | msgstr "" |
3165 | 3059 | 3064 | ||
3166 | 3060 | # help of 'force' option of 'reconfigure' command | 3065 | # help of 'force' option of 'reconfigure' command |
3168 | 3061 | #: bzrlib/builtins.py:5720 | 3066 | #: bzrlib/builtins.py:5763 |
3169 | 3062 | msgid "Perform reconfiguration even if local changes will be lost." | 3067 | msgid "Perform reconfiguration even if local changes will be lost." |
3170 | 3063 | msgstr "" | 3068 | msgstr "" |
3171 | 3064 | 3069 | ||
3172 | 3065 | # help of 'stacked-on' option of 'reconfigure' command | 3070 | # help of 'stacked-on' option of 'reconfigure' command |
3174 | 3066 | #: bzrlib/builtins.py:5723 | 3071 | #: bzrlib/builtins.py:5766 |
3175 | 3067 | msgid "Reconfigure a branch to be stacked on another branch." | 3072 | msgid "Reconfigure a branch to be stacked on another branch." |
3176 | 3068 | msgstr "" | 3073 | msgstr "" |
3177 | 3069 | 3074 | ||
3178 | 3070 | # help of 'unstacked' option of 'reconfigure' command | 3075 | # help of 'unstacked' option of 'reconfigure' command |
3180 | 3071 | #: bzrlib/builtins.py:5727 | 3076 | #: bzrlib/builtins.py:5770 |
3181 | 3072 | msgid "" | 3077 | msgid "" |
3182 | 3073 | "Reconfigure a branch to be unstacked. This may require copying substantial " | 3078 | "Reconfigure a branch to be unstacked. This may require copying substantial " |
3183 | 3074 | "data into it." | 3079 | "data into it." |
3184 | 3075 | msgstr "" | 3080 | msgstr "" |
3185 | 3076 | 3081 | ||
3187 | 3077 | #: bzrlib/builtins.py:5775 | 3082 | #: bzrlib/builtins.py:5818 |
3188 | 3078 | msgid "Set the branch of a checkout and update." | 3083 | msgid "Set the branch of a checkout and update." |
3189 | 3079 | msgstr "" | 3084 | msgstr "" |
3190 | 3080 | 3085 | ||
3192 | 3081 | #: bzrlib/builtins.py:5777 | 3086 | #: bzrlib/builtins.py:5820 |
3193 | 3082 | msgid "" | 3087 | msgid "" |
3194 | 3083 | "For lightweight checkouts, this changes the branch being referenced.\n" | 3088 | "For lightweight checkouts, this changes the branch being referenced.\n" |
3195 | 3084 | "For heavyweight checkouts, this checks that there are no local commits\n" | 3089 | "For heavyweight checkouts, this checks that there are no local commits\n" |
3196 | @@ -3086,17 +3091,17 @@ | |||
3197 | 3086 | "of the new location and binds to it." | 3091 | "of the new location and binds to it." |
3198 | 3087 | msgstr "" | 3092 | msgstr "" |
3199 | 3088 | 3093 | ||
3201 | 3089 | #: bzrlib/builtins.py:5782 | 3094 | #: bzrlib/builtins.py:5825 |
3202 | 3090 | msgid "" | 3095 | msgid "" |
3203 | 3091 | "In both cases, the working tree is updated and uncommitted changes\n" | 3096 | "In both cases, the working tree is updated and uncommitted changes\n" |
3204 | 3092 | "are merged. The user can commit or revert these as they desire." | 3097 | "are merged. The user can commit or revert these as they desire." |
3205 | 3093 | msgstr "" | 3098 | msgstr "" |
3206 | 3094 | 3099 | ||
3208 | 3095 | #: bzrlib/builtins.py:5785 | 3100 | #: bzrlib/builtins.py:5828 |
3209 | 3096 | msgid "Pending merges need to be committed or reverted before using switch." | 3101 | msgid "Pending merges need to be committed or reverted before using switch." |
3210 | 3097 | msgstr "" | 3102 | msgstr "" |
3211 | 3098 | 3103 | ||
3213 | 3099 | #: bzrlib/builtins.py:5787 | 3104 | #: bzrlib/builtins.py:5830 |
3214 | 3100 | msgid "" | 3105 | msgid "" |
3215 | 3101 | "The path to the branch to switch to can be specified relative to the parent\n" | 3106 | "The path to the branch to switch to can be specified relative to the parent\n" |
3216 | 3102 | "directory of the current branch. For example, if you are currently in a\n" | 3107 | "directory of the current branch. For example, if you are currently in a\n" |
3217 | @@ -3104,7 +3109,7 @@ | |||
3218 | 3104 | "/path/to/newbranch." | 3109 | "/path/to/newbranch." |
3219 | 3105 | msgstr "" | 3110 | msgstr "" |
3220 | 3106 | 3111 | ||
3222 | 3107 | #: bzrlib/builtins.py:5792 | 3112 | #: bzrlib/builtins.py:5835 |
3223 | 3108 | msgid "" | 3113 | msgid "" |
3224 | 3109 | "Bound branches use the nickname of its master branch unless it is set\n" | 3114 | "Bound branches use the nickname of its master branch unless it is set\n" |
3225 | 3110 | "locally, in which case switching will update the local nickname to be\n" | 3115 | "locally, in which case switching will update the local nickname to be\n" |
3226 | @@ -3112,20 +3117,20 @@ | |||
3227 | 3112 | msgstr "" | 3117 | msgstr "" |
3228 | 3113 | 3118 | ||
3229 | 3114 | # help of 'force' option of 'switch' command | 3119 | # help of 'force' option of 'switch' command |
3231 | 3115 | #: bzrlib/builtins.py:5800 | 3120 | #: bzrlib/builtins.py:5843 |
3232 | 3116 | msgid "Switch even if local commits will be lost." | 3121 | msgid "Switch even if local commits will be lost." |
3233 | 3117 | msgstr "" | 3122 | msgstr "" |
3234 | 3118 | 3123 | ||
3235 | 3119 | # help of 'create-branch' option of 'switch' command | 3124 | # help of 'create-branch' option of 'switch' command |
3237 | 3120 | #: bzrlib/builtins.py:5803 | 3125 | #: bzrlib/builtins.py:5846 |
3238 | 3121 | msgid "Create the target branch from this one before switching to it." | 3126 | msgid "Create the target branch from this one before switching to it." |
3239 | 3122 | msgstr "" | 3127 | msgstr "" |
3240 | 3123 | 3128 | ||
3242 | 3124 | #: bzrlib/builtins.py:5872 | 3129 | #: bzrlib/builtins.py:5915 |
3243 | 3125 | msgid "Manage filtered views." | 3130 | msgid "Manage filtered views." |
3244 | 3126 | msgstr "" | 3131 | msgstr "" |
3245 | 3127 | 3132 | ||
3247 | 3128 | #: bzrlib/builtins.py:5874 | 3133 | #: bzrlib/builtins.py:5917 |
3248 | 3129 | msgid "" | 3134 | msgid "" |
3249 | 3130 | "Views provide a mask over the tree so that users can focus on\n" | 3135 | "Views provide a mask over the tree so that users can focus on\n" |
3250 | 3131 | "a subset of a tree when doing their work. After creating a view,\n" | 3136 | "a subset of a tree when doing their work. After creating a view,\n" |
3251 | @@ -3135,7 +3140,7 @@ | |||
3252 | 3135 | "must be within the current view." | 3140 | "must be within the current view." |
3253 | 3136 | msgstr "" | 3141 | msgstr "" |
3254 | 3137 | 3142 | ||
3256 | 3138 | #: bzrlib/builtins.py:5881 | 3143 | #: bzrlib/builtins.py:5924 |
3257 | 3139 | msgid "" | 3144 | msgid "" |
3258 | 3140 | "In most cases, a view has a short life-span: it is created to make\n" | 3145 | "In most cases, a view has a short life-span: it is created to make\n" |
3259 | 3141 | "a selected change and is deleted once that change is committed.\n" | 3146 | "a selected change and is deleted once that change is committed.\n" |
3260 | @@ -3143,7 +3148,7 @@ | |||
3261 | 3143 | "and switch between them." | 3148 | "and switch between them." |
3262 | 3144 | msgstr "" | 3149 | msgstr "" |
3263 | 3145 | 3150 | ||
3265 | 3146 | #: bzrlib/builtins.py:5886 | 3151 | #: bzrlib/builtins.py:5929 |
3266 | 3147 | msgid "" | 3152 | msgid "" |
3267 | 3148 | "To disable the current view without deleting it, you can switch to\n" | 3153 | "To disable the current view without deleting it, you can switch to\n" |
3268 | 3149 | "the pseudo view called ``off``. This can be useful when you need\n" | 3154 | "the pseudo view called ``off``. This can be useful when you need\n" |
3269 | @@ -3151,131 +3156,131 @@ | |||
3270 | 3151 | "want to switch back to your view after that." | 3156 | "want to switch back to your view after that." |
3271 | 3152 | msgstr "" | 3157 | msgstr "" |
3272 | 3153 | 3158 | ||
3274 | 3154 | #: bzrlib/builtins.py:5891 | 3159 | #: bzrlib/builtins.py:5934 |
3275 | 3155 | msgid "" | 3160 | msgid "" |
3276 | 3156 | ":Examples:\n" | 3161 | ":Examples:\n" |
3277 | 3157 | " To define the current view::" | 3162 | " To define the current view::" |
3278 | 3158 | msgstr "" | 3163 | msgstr "" |
3279 | 3159 | 3164 | ||
3281 | 3160 | #: bzrlib/builtins.py:5894 | 3165 | #: bzrlib/builtins.py:5937 |
3282 | 3161 | msgid " bzr view file1 dir1 ..." | 3166 | msgid " bzr view file1 dir1 ..." |
3283 | 3162 | msgstr "" | 3167 | msgstr "" |
3284 | 3163 | 3168 | ||
3286 | 3164 | #: bzrlib/builtins.py:5896 | 3169 | #: bzrlib/builtins.py:5939 |
3287 | 3165 | msgid " To list the current view::" | 3170 | msgid " To list the current view::" |
3288 | 3166 | msgstr "" | 3171 | msgstr "" |
3289 | 3167 | 3172 | ||
3291 | 3168 | #: bzrlib/builtins.py:5898 | 3173 | #: bzrlib/builtins.py:5941 |
3292 | 3169 | msgid " bzr view" | 3174 | msgid " bzr view" |
3293 | 3170 | msgstr "" | 3175 | msgstr "" |
3294 | 3171 | 3176 | ||
3296 | 3172 | #: bzrlib/builtins.py:5900 | 3177 | #: bzrlib/builtins.py:5943 |
3297 | 3173 | msgid " To delete the current view::" | 3178 | msgid " To delete the current view::" |
3298 | 3174 | msgstr "" | 3179 | msgstr "" |
3299 | 3175 | 3180 | ||
3301 | 3176 | #: bzrlib/builtins.py:5902 | 3181 | #: bzrlib/builtins.py:5945 |
3302 | 3177 | msgid " bzr view --delete" | 3182 | msgid " bzr view --delete" |
3303 | 3178 | msgstr "" | 3183 | msgstr "" |
3304 | 3179 | 3184 | ||
3306 | 3180 | #: bzrlib/builtins.py:5904 | 3185 | #: bzrlib/builtins.py:5947 |
3307 | 3181 | msgid " To disable the current view without deleting it::" | 3186 | msgid " To disable the current view without deleting it::" |
3308 | 3182 | msgstr "" | 3187 | msgstr "" |
3309 | 3183 | 3188 | ||
3311 | 3184 | #: bzrlib/builtins.py:5906 | 3189 | #: bzrlib/builtins.py:5949 |
3312 | 3185 | msgid " bzr view --switch off" | 3190 | msgid " bzr view --switch off" |
3313 | 3186 | msgstr "" | 3191 | msgstr "" |
3314 | 3187 | 3192 | ||
3316 | 3188 | #: bzrlib/builtins.py:5908 | 3193 | #: bzrlib/builtins.py:5951 |
3317 | 3189 | msgid " To define a named view and switch to it::" | 3194 | msgid " To define a named view and switch to it::" |
3318 | 3190 | msgstr "" | 3195 | msgstr "" |
3319 | 3191 | 3196 | ||
3321 | 3192 | #: bzrlib/builtins.py:5910 | 3197 | #: bzrlib/builtins.py:5953 |
3322 | 3193 | msgid " bzr view --name view-name file1 dir1 ..." | 3198 | msgid " bzr view --name view-name file1 dir1 ..." |
3323 | 3194 | msgstr "" | 3199 | msgstr "" |
3324 | 3195 | 3200 | ||
3326 | 3196 | #: bzrlib/builtins.py:5912 | 3201 | #: bzrlib/builtins.py:5955 |
3327 | 3197 | msgid " To list a named view::" | 3202 | msgid " To list a named view::" |
3328 | 3198 | msgstr "" | 3203 | msgstr "" |
3329 | 3199 | 3204 | ||
3331 | 3200 | #: bzrlib/builtins.py:5914 | 3205 | #: bzrlib/builtins.py:5957 |
3332 | 3201 | msgid " bzr view --name view-name" | 3206 | msgid " bzr view --name view-name" |
3333 | 3202 | msgstr "" | 3207 | msgstr "" |
3334 | 3203 | 3208 | ||
3336 | 3204 | #: bzrlib/builtins.py:5916 | 3209 | #: bzrlib/builtins.py:5959 |
3337 | 3205 | msgid " To delete a named view::" | 3210 | msgid " To delete a named view::" |
3338 | 3206 | msgstr "" | 3211 | msgstr "" |
3339 | 3207 | 3212 | ||
3341 | 3208 | #: bzrlib/builtins.py:5918 | 3213 | #: bzrlib/builtins.py:5961 |
3342 | 3209 | msgid " bzr view --name view-name --delete" | 3214 | msgid " bzr view --name view-name --delete" |
3343 | 3210 | msgstr "" | 3215 | msgstr "" |
3344 | 3211 | 3216 | ||
3346 | 3212 | #: bzrlib/builtins.py:5920 | 3217 | #: bzrlib/builtins.py:5963 |
3347 | 3213 | msgid " To switch to a named view::" | 3218 | msgid " To switch to a named view::" |
3348 | 3214 | msgstr "" | 3219 | msgstr "" |
3349 | 3215 | 3220 | ||
3351 | 3216 | #: bzrlib/builtins.py:5922 | 3221 | #: bzrlib/builtins.py:5965 |
3352 | 3217 | msgid " bzr view --switch view-name" | 3222 | msgid " bzr view --switch view-name" |
3353 | 3218 | msgstr "" | 3223 | msgstr "" |
3354 | 3219 | 3224 | ||
3356 | 3220 | #: bzrlib/builtins.py:5924 | 3225 | #: bzrlib/builtins.py:5967 |
3357 | 3221 | msgid " To list all views defined::" | 3226 | msgid " To list all views defined::" |
3358 | 3222 | msgstr "" | 3227 | msgstr "" |
3359 | 3223 | 3228 | ||
3361 | 3224 | #: bzrlib/builtins.py:5926 | 3229 | #: bzrlib/builtins.py:5969 |
3362 | 3225 | msgid " bzr view --all" | 3230 | msgid " bzr view --all" |
3363 | 3226 | msgstr "" | 3231 | msgstr "" |
3364 | 3227 | 3232 | ||
3366 | 3228 | #: bzrlib/builtins.py:5928 | 3233 | #: bzrlib/builtins.py:5971 |
3367 | 3229 | msgid " To delete all views::" | 3234 | msgid " To delete all views::" |
3368 | 3230 | msgstr "" | 3235 | msgstr "" |
3369 | 3231 | 3236 | ||
3371 | 3232 | #: bzrlib/builtins.py:5930 | 3237 | #: bzrlib/builtins.py:5973 |
3372 | 3233 | msgid " bzr view --delete --all" | 3238 | msgid " bzr view --delete --all" |
3373 | 3234 | msgstr "" | 3239 | msgstr "" |
3374 | 3235 | 3240 | ||
3375 | 3236 | # help of 'all' option of 'view' command | 3241 | # help of 'all' option of 'view' command |
3377 | 3237 | #: bzrlib/builtins.py:5937 | 3242 | #: bzrlib/builtins.py:5980 |
3378 | 3238 | msgid "Apply list or delete action to all views." | 3243 | msgid "Apply list or delete action to all views." |
3379 | 3239 | msgstr "" | 3244 | msgstr "" |
3380 | 3240 | 3245 | ||
3381 | 3241 | # help of 'delete' option of 'view' command | 3246 | # help of 'delete' option of 'view' command |
3383 | 3242 | #: bzrlib/builtins.py:5940 | 3247 | #: bzrlib/builtins.py:5983 |
3384 | 3243 | msgid "Delete the view." | 3248 | msgid "Delete the view." |
3385 | 3244 | msgstr "" | 3249 | msgstr "" |
3386 | 3245 | 3250 | ||
3387 | 3246 | # help of 'name' option of 'view' command | 3251 | # help of 'name' option of 'view' command |
3389 | 3247 | #: bzrlib/builtins.py:5943 | 3252 | #: bzrlib/builtins.py:5986 |
3390 | 3248 | msgid "Name of the view to define, list or delete." | 3253 | msgid "Name of the view to define, list or delete." |
3391 | 3249 | msgstr "" | 3254 | msgstr "" |
3392 | 3250 | 3255 | ||
3393 | 3251 | # help of 'switch' option of 'view' command | 3256 | # help of 'switch' option of 'view' command |
3395 | 3252 | #: bzrlib/builtins.py:5947 | 3257 | #: bzrlib/builtins.py:5990 |
3396 | 3253 | msgid "Name of the view to switch to." | 3258 | msgid "Name of the view to switch to." |
3397 | 3254 | msgstr "" | 3259 | msgstr "" |
3398 | 3255 | 3260 | ||
3400 | 3256 | #: bzrlib/builtins.py:6047 | 3261 | #: bzrlib/builtins.py:6090 |
3401 | 3257 | msgid "Remove a branch." | 3262 | msgid "Remove a branch." |
3402 | 3258 | msgstr "" | 3263 | msgstr "" |
3403 | 3259 | 3264 | ||
3405 | 3260 | #: bzrlib/builtins.py:6049 | 3265 | #: bzrlib/builtins.py:6092 |
3406 | 3261 | msgid "" | 3266 | msgid "" |
3407 | 3262 | "This will remove the branch from the specified location but \n" | 3267 | "This will remove the branch from the specified location but \n" |
3408 | 3263 | "will keep any working tree or repository in place." | 3268 | "will keep any working tree or repository in place." |
3409 | 3264 | msgstr "" | 3269 | msgstr "" |
3410 | 3265 | 3270 | ||
3412 | 3266 | #: bzrlib/builtins.py:6054 | 3271 | #: bzrlib/builtins.py:6097 |
3413 | 3267 | msgid " Remove the branch at repo/trunk::" | 3272 | msgid " Remove the branch at repo/trunk::" |
3414 | 3268 | msgstr "" | 3273 | msgstr "" |
3415 | 3269 | 3274 | ||
3417 | 3270 | #: bzrlib/builtins.py:6056 | 3275 | #: bzrlib/builtins.py:6099 |
3418 | 3271 | msgid " bzr remove-branch repo/trunk" | 3276 | msgid " bzr remove-branch repo/trunk" |
3419 | 3272 | msgstr "" | 3277 | msgstr "" |
3420 | 3273 | 3278 | ||
3422 | 3274 | #: bzrlib/builtins.py:6072 | 3279 | #: bzrlib/builtins.py:6115 |
3423 | 3275 | msgid "Temporarily set aside some changes from the current tree." | 3280 | msgid "Temporarily set aside some changes from the current tree." |
3424 | 3276 | msgstr "" | 3281 | msgstr "" |
3425 | 3277 | 3282 | ||
3427 | 3278 | #: bzrlib/builtins.py:6074 | 3283 | #: bzrlib/builtins.py:6117 |
3428 | 3279 | msgid "" | 3284 | msgid "" |
3429 | 3280 | "Shelve allows you to temporarily put changes you've made \"on the shelf\",\n" | 3285 | "Shelve allows you to temporarily put changes you've made \"on the shelf\",\n" |
3430 | 3281 | "ie. out of the way, until a later time when you can bring them back from\n" | 3286 | "ie. out of the way, until a later time when you can bring them back from\n" |
3431 | @@ -3284,11 +3289,11 @@ | |||
3432 | 3284 | "will they survive its deletion." | 3289 | "will they survive its deletion." |
3433 | 3285 | msgstr "" | 3290 | msgstr "" |
3434 | 3286 | 3291 | ||
3436 | 3287 | #: bzrlib/builtins.py:6080 | 3292 | #: bzrlib/builtins.py:6123 |
3437 | 3288 | msgid "If shelve --list is specified, previously-shelved changes are listed." | 3293 | msgid "If shelve --list is specified, previously-shelved changes are listed." |
3438 | 3289 | msgstr "" | 3294 | msgstr "" |
3439 | 3290 | 3295 | ||
3441 | 3291 | #: bzrlib/builtins.py:6082 | 3296 | #: bzrlib/builtins.py:6125 |
3442 | 3292 | msgid "" | 3297 | msgid "" |
3443 | 3293 | "Shelve is intended to help separate several sets of changes that have\n" | 3298 | "Shelve is intended to help separate several sets of changes that have\n" |
3444 | 3294 | "been inappropriately mingled. If you just want to get rid of all changes\n" | 3299 | "been inappropriately mingled. If you just want to get rid of all changes\n" |
3445 | @@ -3296,35 +3301,35 @@ | |||
3446 | 3296 | "shelve all text changes at once, use shelve --all." | 3301 | "shelve all text changes at once, use shelve --all." |
3447 | 3297 | msgstr "" | 3302 | msgstr "" |
3448 | 3298 | 3303 | ||
3450 | 3299 | #: bzrlib/builtins.py:6087 | 3304 | #: bzrlib/builtins.py:6130 |
3451 | 3300 | msgid "" | 3305 | msgid "" |
3452 | 3301 | "If filenames are specified, only the changes to those files will be\n" | 3306 | "If filenames are specified, only the changes to those files will be\n" |
3453 | 3302 | "shelved. Other files will be left untouched." | 3307 | "shelved. Other files will be left untouched." |
3454 | 3303 | msgstr "" | 3308 | msgstr "" |
3455 | 3304 | 3309 | ||
3457 | 3305 | #: bzrlib/builtins.py:6090 | 3310 | #: bzrlib/builtins.py:6133 |
3458 | 3306 | msgid "" | 3311 | msgid "" |
3459 | 3307 | "If a revision is specified, changes since that revision will be shelved." | 3312 | "If a revision is specified, changes since that revision will be shelved." |
3460 | 3308 | msgstr "" | 3313 | msgstr "" |
3461 | 3309 | 3314 | ||
3463 | 3310 | #: bzrlib/builtins.py:6092 | 3315 | #: bzrlib/builtins.py:6135 |
3464 | 3311 | msgid "" | 3316 | msgid "" |
3465 | 3312 | "You can put multiple items on the shelf, and by default, 'unshelve' will\n" | 3317 | "You can put multiple items on the shelf, and by default, 'unshelve' will\n" |
3466 | 3313 | "restore the most recently shelved changes." | 3318 | "restore the most recently shelved changes." |
3467 | 3314 | msgstr "" | 3319 | msgstr "" |
3468 | 3315 | 3320 | ||
3470 | 3316 | #: bzrlib/builtins.py:6095 | 3321 | #: bzrlib/builtins.py:6138 |
3471 | 3317 | msgid "" | 3322 | msgid "" |
3472 | 3318 | "For complicated changes, it is possible to edit the changes in a separate\n" | 3323 | "For complicated changes, it is possible to edit the changes in a separate\n" |
3473 | 3319 | "editor program to decide what the file remaining in the working copy\n" | 3324 | "editor program to decide what the file remaining in the working copy\n" |
3474 | 3320 | "should look like. To do this, add the configuration option" | 3325 | "should look like. To do this, add the configuration option" |
3475 | 3321 | msgstr "" | 3326 | msgstr "" |
3476 | 3322 | 3327 | ||
3478 | 3323 | #: bzrlib/builtins.py:6099 | 3328 | #: bzrlib/builtins.py:6142 |
3479 | 3324 | msgid " change_editor = PROGRAM @new_path @old_path" | 3329 | msgid " change_editor = PROGRAM @new_path @old_path" |
3480 | 3325 | msgstr "" | 3330 | msgstr "" |
3481 | 3326 | 3331 | ||
3483 | 3327 | #: bzrlib/builtins.py:6101 | 3332 | #: bzrlib/builtins.py:6144 |
3484 | 3328 | msgid "" | 3333 | msgid "" |
3485 | 3329 | "where @new_path is replaced with the path of the new version of the \n" | 3334 | "where @new_path is replaced with the path of the new version of the \n" |
3486 | 3330 | "file and @old_path is replaced with the path of the old version of \n" | 3335 | "file and @old_path is replaced with the path of the old version of \n" |
3487 | @@ -3334,35 +3339,35 @@ | |||
3488 | 3334 | msgstr "" | 3339 | msgstr "" |
3489 | 3335 | 3340 | ||
3490 | 3336 | # help of 'all' option of 'shelve' command | 3341 | # help of 'all' option of 'shelve' command |
3492 | 3337 | #: bzrlib/builtins.py:6113 | 3342 | #: bzrlib/builtins.py:6156 |
3493 | 3338 | msgid "Shelve all changes." | 3343 | msgid "Shelve all changes." |
3494 | 3339 | msgstr "" | 3344 | msgstr "" |
3495 | 3340 | 3345 | ||
3496 | 3341 | # help of 'writer' option of 'shelve' command | 3346 | # help of 'writer' option of 'shelve' command |
3498 | 3342 | #: bzrlib/builtins.py:6115 | 3347 | #: bzrlib/builtins.py:6158 |
3499 | 3343 | msgid "Method to use for writing diffs." | 3348 | msgid "Method to use for writing diffs." |
3500 | 3344 | msgstr "" | 3349 | msgstr "" |
3501 | 3345 | 3350 | ||
3502 | 3346 | # title of 'writer' option of 'shelve' command | 3351 | # title of 'writer' option of 'shelve' command |
3504 | 3347 | #: bzrlib/builtins.py:6115 | 3352 | #: bzrlib/builtins.py:6158 |
3505 | 3348 | msgid "writer" | 3353 | msgid "writer" |
3506 | 3349 | msgstr "" | 3354 | msgstr "" |
3507 | 3350 | 3355 | ||
3508 | 3351 | # help of 'list' option of 'shelve' command | 3356 | # help of 'list' option of 'shelve' command |
3510 | 3352 | #: bzrlib/builtins.py:6119 | 3357 | #: bzrlib/builtins.py:6162 |
3511 | 3353 | msgid "List shelved changes." | 3358 | msgid "List shelved changes." |
3512 | 3354 | msgstr "" | 3359 | msgstr "" |
3513 | 3355 | 3360 | ||
3514 | 3356 | # help of 'destroy' option of 'shelve' command | 3361 | # help of 'destroy' option of 'shelve' command |
3516 | 3357 | #: bzrlib/builtins.py:6121 | 3362 | #: bzrlib/builtins.py:6164 |
3517 | 3358 | msgid "Destroy removed changes instead of shelving them." | 3363 | msgid "Destroy removed changes instead of shelving them." |
3518 | 3359 | msgstr "" | 3364 | msgstr "" |
3519 | 3360 | 3365 | ||
3521 | 3361 | #: bzrlib/builtins.py:6161 | 3366 | #: bzrlib/builtins.py:6204 |
3522 | 3362 | msgid "Restore shelved changes." | 3367 | msgid "Restore shelved changes." |
3523 | 3363 | msgstr "" | 3368 | msgstr "" |
3524 | 3364 | 3369 | ||
3526 | 3365 | #: bzrlib/builtins.py:6163 | 3370 | #: bzrlib/builtins.py:6206 |
3527 | 3366 | msgid "" | 3371 | msgid "" |
3528 | 3367 | "By default, the most recently shelved changes are restored. However if you\n" | 3372 | "By default, the most recently shelved changes are restored. However if you\n" |
3529 | 3368 | "specify a shelf by id those changes will be restored instead. This works\n" | 3373 | "specify a shelf by id those changes will be restored instead. This works\n" |
3530 | @@ -3370,60 +3375,60 @@ | |||
3531 | 3370 | msgstr "" | 3375 | msgstr "" |
3532 | 3371 | 3376 | ||
3533 | 3372 | # help of 'action' option of 'unshelve' command | 3377 | # help of 'action' option of 'unshelve' command |
3535 | 3373 | #: bzrlib/builtins.py:6172 | 3378 | #: bzrlib/builtins.py:6215 |
3536 | 3374 | msgid "The action to perform." | 3379 | msgid "The action to perform." |
3537 | 3375 | msgstr "" | 3380 | msgstr "" |
3538 | 3376 | 3381 | ||
3540 | 3377 | #: bzrlib/builtins.py:6194 | 3382 | #: bzrlib/builtins.py:6237 |
3541 | 3378 | msgid "Remove unwanted files from working tree." | 3383 | msgid "Remove unwanted files from working tree." |
3542 | 3379 | msgstr "" | 3384 | msgstr "" |
3543 | 3380 | 3385 | ||
3545 | 3381 | #: bzrlib/builtins.py:6196 | 3386 | #: bzrlib/builtins.py:6239 |
3546 | 3382 | msgid "" | 3387 | msgid "" |
3547 | 3383 | "By default, only unknown files, not ignored files, are deleted. Versioned\n" | 3388 | "By default, only unknown files, not ignored files, are deleted. Versioned\n" |
3548 | 3384 | "files are never deleted." | 3389 | "files are never deleted." |
3549 | 3385 | msgstr "" | 3390 | msgstr "" |
3550 | 3386 | 3391 | ||
3552 | 3387 | #: bzrlib/builtins.py:6199 | 3392 | #: bzrlib/builtins.py:6242 |
3553 | 3388 | msgid "" | 3393 | msgid "" |
3554 | 3389 | "Another class is 'detritus', which includes files emitted by bzr during\n" | 3394 | "Another class is 'detritus', which includes files emitted by bzr during\n" |
3555 | 3390 | "normal operations and selftests. (The value of these files decreases with\n" | 3395 | "normal operations and selftests. (The value of these files decreases with\n" |
3556 | 3391 | "time.)" | 3396 | "time.)" |
3557 | 3392 | msgstr "" | 3397 | msgstr "" |
3558 | 3393 | 3398 | ||
3560 | 3394 | #: bzrlib/builtins.py:6203 | 3399 | #: bzrlib/builtins.py:6246 |
3561 | 3395 | msgid "" | 3400 | msgid "" |
3562 | 3396 | "If no options are specified, unknown files are deleted. Otherwise, option\n" | 3401 | "If no options are specified, unknown files are deleted. Otherwise, option\n" |
3563 | 3397 | "flags are respected, and may be combined." | 3402 | "flags are respected, and may be combined." |
3564 | 3398 | msgstr "" | 3403 | msgstr "" |
3565 | 3399 | 3404 | ||
3567 | 3400 | #: bzrlib/builtins.py:6206 | 3405 | #: bzrlib/builtins.py:6249 |
3568 | 3401 | msgid "To check what clean-tree will do, use --dry-run." | 3406 | msgid "To check what clean-tree will do, use --dry-run." |
3569 | 3402 | msgstr "" | 3407 | msgstr "" |
3570 | 3403 | 3408 | ||
3571 | 3404 | # help of 'ignored' option of 'clean-tree' command | 3409 | # help of 'ignored' option of 'clean-tree' command |
3573 | 3405 | #: bzrlib/builtins.py:6209 | 3410 | #: bzrlib/builtins.py:6252 |
3574 | 3406 | msgid "Delete all ignored files." | 3411 | msgid "Delete all ignored files." |
3575 | 3407 | msgstr "" | 3412 | msgstr "" |
3576 | 3408 | 3413 | ||
3577 | 3409 | # help of 'detritus' option of 'clean-tree' command | 3414 | # help of 'detritus' option of 'clean-tree' command |
3579 | 3410 | #: bzrlib/builtins.py:6210 | 3415 | #: bzrlib/builtins.py:6253 |
3580 | 3411 | msgid "" | 3416 | msgid "" |
3581 | 3412 | "Delete conflict files, merge and revert backups, and failed selftest dirs." | 3417 | "Delete conflict files, merge and revert backups, and failed selftest dirs." |
3582 | 3413 | msgstr "" | 3418 | msgstr "" |
3583 | 3414 | 3419 | ||
3584 | 3415 | # help of 'unknown' option of 'clean-tree' command | 3420 | # help of 'unknown' option of 'clean-tree' command |
3586 | 3416 | #: bzrlib/builtins.py:6213 | 3421 | #: bzrlib/builtins.py:6256 |
3587 | 3417 | msgid "Delete files unknown to bzr (default)." | 3422 | msgid "Delete files unknown to bzr (default)." |
3588 | 3418 | msgstr "" | 3423 | msgstr "" |
3589 | 3419 | 3424 | ||
3590 | 3420 | # help of 'dry-run' option of 'clean-tree' command | 3425 | # help of 'dry-run' option of 'clean-tree' command |
3592 | 3421 | #: bzrlib/builtins.py:6214 | 3426 | #: bzrlib/builtins.py:6257 |
3593 | 3422 | msgid "Show files to delete instead of deleting them." | 3427 | msgid "Show files to delete instead of deleting them." |
3594 | 3423 | msgstr "" | 3428 | msgstr "" |
3595 | 3424 | 3429 | ||
3596 | 3425 | # help of 'force' option of 'clean-tree' command | 3430 | # help of 'force' option of 'clean-tree' command |
3598 | 3426 | #: bzrlib/builtins.py:6216 | 3431 | #: bzrlib/builtins.py:6259 |
3599 | 3427 | msgid "Do not prompt before deleting." | 3432 | msgid "Do not prompt before deleting." |
3600 | 3428 | msgstr "" | 3433 | msgstr "" |
3601 | 3429 | 3434 | ||
3602 | @@ -3594,26 +3599,26 @@ | |||
3603 | 3594 | msgid "All commits signed with verifiable keys" | 3599 | msgid "All commits signed with verifiable keys" |
3604 | 3595 | msgstr "" | 3600 | msgstr "" |
3605 | 3596 | 3601 | ||
3607 | 3597 | #: bzrlib/config.py:3118 | 3602 | #: bzrlib/config.py:3277 |
3608 | 3598 | msgid "Display, set or remove a configuration option." | 3603 | msgid "Display, set or remove a configuration option." |
3609 | 3599 | msgstr "" | 3604 | msgstr "" |
3610 | 3600 | 3605 | ||
3612 | 3601 | #: bzrlib/config.py:3120 | 3606 | #: bzrlib/config.py:3279 |
3613 | 3602 | msgid "Display the active value for a given option." | 3607 | msgid "Display the active value for a given option." |
3614 | 3603 | msgstr "" | 3608 | msgstr "" |
3615 | 3604 | 3609 | ||
3617 | 3605 | #: bzrlib/config.py:3122 | 3610 | #: bzrlib/config.py:3281 |
3618 | 3606 | msgid "" | 3611 | msgid "" |
3619 | 3607 | "If --all is specified, NAME is interpreted as a regular expression and all\n" | 3612 | "If --all is specified, NAME is interpreted as a regular expression and all\n" |
3620 | 3608 | "matching options are displayed mentioning their scope. The active value\n" | 3613 | "matching options are displayed mentioning their scope. The active value\n" |
3621 | 3609 | "that bzr will take into account is the first one displayed for each option." | 3614 | "that bzr will take into account is the first one displayed for each option." |
3622 | 3610 | msgstr "" | 3615 | msgstr "" |
3623 | 3611 | 3616 | ||
3625 | 3612 | #: bzrlib/config.py:3126 | 3617 | #: bzrlib/config.py:3285 |
3626 | 3613 | msgid "If no NAME is given, --all .* is implied." | 3618 | msgid "If no NAME is given, --all .* is implied." |
3627 | 3614 | msgstr "" | 3619 | msgstr "" |
3628 | 3615 | 3620 | ||
3630 | 3616 | #: bzrlib/config.py:3128 | 3621 | #: bzrlib/config.py:3287 |
3631 | 3617 | msgid "" | 3622 | msgid "" |
3632 | 3618 | "Setting a value is achieved by using name=value without spaces. The value\n" | 3623 | "Setting a value is achieved by using name=value without spaces. The value\n" |
3633 | 3619 | "is set in the most relevant scope and can be checked by displaying the\n" | 3624 | "is set in the most relevant scope and can be checked by displaying the\n" |
3634 | @@ -3621,17 +3626,17 @@ | |||
3635 | 3621 | msgstr "" | 3626 | msgstr "" |
3636 | 3622 | 3627 | ||
3637 | 3623 | # help of 'scope' option of 'config' command | 3628 | # help of 'scope' option of 'config' command |
3639 | 3624 | #: bzrlib/config.py:3139 | 3629 | #: bzrlib/config.py:3298 |
3640 | 3625 | msgid "Reduce the scope to the specified configuration file" | 3630 | msgid "Reduce the scope to the specified configuration file" |
3641 | 3626 | msgstr "" | 3631 | msgstr "" |
3642 | 3627 | 3632 | ||
3643 | 3628 | # help of 'all' option of 'config' command | 3633 | # help of 'all' option of 'config' command |
3645 | 3629 | #: bzrlib/config.py:3143 | 3634 | #: bzrlib/config.py:3302 |
3646 | 3630 | msgid "Display all the defined values for the matching options." | 3635 | msgid "Display all the defined values for the matching options." |
3647 | 3631 | msgstr "" | 3636 | msgstr "" |
3648 | 3632 | 3637 | ||
3649 | 3633 | # help of 'remove' option of 'config' command | 3638 | # help of 'remove' option of 'config' command |
3651 | 3634 | #: bzrlib/config.py:3145 | 3639 | #: bzrlib/config.py:3304 |
3652 | 3635 | msgid "Remove the option from the configuration file" | 3640 | msgid "Remove the option from the configuration file" |
3653 | 3636 | msgstr "" | 3641 | msgstr "" |
3654 | 3637 | 3642 | ||
3655 | @@ -3690,244 +3695,244 @@ | |||
3656 | 3690 | msgid "action" | 3695 | msgid "action" |
3657 | 3691 | msgstr "" | 3696 | msgstr "" |
3658 | 3692 | 3697 | ||
3660 | 3693 | #: bzrlib/errors.py:208 | 3698 | #: bzrlib/errors.py:215 |
3661 | 3694 | msgid "The tree builder is already building a tree." | 3699 | msgid "The tree builder is already building a tree." |
3662 | 3695 | msgstr "" | 3700 | msgstr "" |
3663 | 3696 | 3701 | ||
3665 | 3697 | #: bzrlib/errors.py:229 | 3702 | #: bzrlib/errors.py:236 |
3666 | 3698 | msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s" | 3703 | msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s" |
3667 | 3699 | msgstr "" | 3704 | msgstr "" |
3668 | 3700 | 3705 | ||
3670 | 3701 | #: bzrlib/errors.py:248 | 3706 | #: bzrlib/errors.py:255 |
3671 | 3702 | msgid "" | 3707 | msgid "" |
3672 | 3703 | "The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports " | 3708 | "The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports " |
3673 | 3704 | "versions \"%(minimum)s\" to \"%(current)s\"." | 3709 | "versions \"%(minimum)s\" to \"%(current)s\"." |
3674 | 3705 | msgstr "" | 3710 | msgstr "" |
3675 | 3706 | 3711 | ||
3677 | 3707 | #: bzrlib/errors.py:260 | 3712 | #: bzrlib/errors.py:267 |
3678 | 3708 | msgid "The transport '%(transport)s' is only accessible within this process." | 3713 | msgid "The transport '%(transport)s' is only accessible within this process." |
3679 | 3709 | msgstr "" | 3714 | msgstr "" |
3680 | 3710 | 3715 | ||
3682 | 3711 | #: bzrlib/errors.py:278 | 3716 | #: bzrlib/errors.py:285 |
3683 | 3712 | msgid "Invalid revision number %(revno)s" | 3717 | msgid "Invalid revision number %(revno)s" |
3684 | 3713 | msgstr "" | 3718 | msgstr "" |
3685 | 3714 | 3719 | ||
3687 | 3715 | #: bzrlib/errors.py:287 | 3720 | #: bzrlib/errors.py:294 |
3688 | 3716 | msgid "Invalid revision-id {%(revision_id)s} in %(branch)s" | 3721 | msgid "Invalid revision-id {%(revision_id)s} in %(branch)s" |
3689 | 3717 | msgstr "" | 3722 | msgstr "" |
3690 | 3718 | 3723 | ||
3692 | 3719 | #: bzrlib/errors.py:298 | 3724 | #: bzrlib/errors.py:305 |
3693 | 3720 | msgid "Reserved revision-id {%(revision_id)s}" | 3725 | msgid "Reserved revision-id {%(revision_id)s}" |
3694 | 3721 | msgstr "" | 3726 | msgstr "" |
3695 | 3722 | 3727 | ||
3697 | 3723 | #: bzrlib/errors.py:312 | 3728 | #: bzrlib/errors.py:319 |
3698 | 3724 | msgid "There is no public branch set for \"%(branch_url)s\"." | 3729 | msgid "There is no public branch set for \"%(branch_url)s\"." |
3699 | 3725 | msgstr "" | 3730 | msgstr "" |
3700 | 3726 | 3731 | ||
3702 | 3727 | #: bzrlib/errors.py:322 | 3732 | #: bzrlib/errors.py:329 |
3703 | 3728 | msgid "" | 3733 | msgid "" |
3704 | 3729 | "No help could be found for '%(topic)s'. Please use 'bzr help topics' to " | 3734 | "No help could be found for '%(topic)s'. Please use 'bzr help topics' to " |
3705 | 3730 | "obtain a list of topics." | 3735 | "obtain a list of topics." |
3706 | 3731 | msgstr "" | 3736 | msgstr "" |
3707 | 3732 | 3737 | ||
3709 | 3733 | #: bzrlib/errors.py:331 | 3738 | #: bzrlib/errors.py:338 |
3710 | 3734 | msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s." | 3739 | msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s." |
3711 | 3735 | msgstr "" | 3740 | msgstr "" |
3712 | 3736 | 3741 | ||
3714 | 3737 | #: bzrlib/errors.py:341 | 3742 | #: bzrlib/errors.py:348 |
3715 | 3738 | msgid "" | 3743 | msgid "" |
3716 | 3739 | "The file id \"%(file_id)s\" is not present in the repository %(repository)r" | 3744 | "The file id \"%(file_id)s\" is not present in the repository %(repository)r" |
3717 | 3740 | msgstr "" | 3745 | msgstr "" |
3718 | 3741 | 3746 | ||
3720 | 3742 | #: bzrlib/errors.py:350 | 3747 | #: bzrlib/errors.py:357 |
3721 | 3743 | msgid "The branch '%(branch)s' is not stacked." | 3748 | msgid "The branch '%(branch)s' is not stacked." |
3722 | 3744 | msgstr "" | 3749 | msgstr "" |
3723 | 3745 | 3750 | ||
3725 | 3746 | #: bzrlib/errors.py:364 | 3751 | #: bzrlib/errors.py:371 |
3726 | 3747 | msgid "No WorkingTree exists for \"%(base)s\"." | 3752 | msgid "No WorkingTree exists for \"%(base)s\"." |
3727 | 3748 | msgstr "" | 3753 | msgstr "" |
3728 | 3749 | 3754 | ||
3730 | 3750 | #: bzrlib/errors.py:373 | 3755 | #: bzrlib/errors.py:380 |
3731 | 3751 | msgid "Not currently building a tree." | 3756 | msgid "Not currently building a tree." |
3732 | 3752 | msgstr "" | 3757 | msgstr "" |
3733 | 3753 | 3758 | ||
3735 | 3754 | #: bzrlib/errors.py:378 | 3759 | #: bzrlib/errors.py:385 |
3736 | 3755 | msgid "%(url)s is not a local path." | 3760 | msgid "%(url)s is not a local path." |
3737 | 3756 | msgstr "" | 3761 | msgstr "" |
3738 | 3757 | 3762 | ||
3740 | 3758 | #: bzrlib/errors.py:406 | 3763 | #: bzrlib/errors.py:413 |
3741 | 3759 | msgid "%(not_locked)r is not write locked but needs to be." | 3764 | msgid "%(not_locked)r is not write locked but needs to be." |
3742 | 3760 | msgstr "" | 3765 | msgstr "" |
3743 | 3761 | 3766 | ||
3745 | 3762 | #: bzrlib/errors.py:414 | 3767 | #: bzrlib/errors.py:421 |
3746 | 3763 | msgid "Error in command line options" | 3768 | msgid "Error in command line options" |
3747 | 3764 | msgstr "" | 3769 | msgstr "" |
3748 | 3765 | 3770 | ||
3750 | 3766 | #: bzrlib/errors.py:419 | 3771 | #: bzrlib/errors.py:426 |
3751 | 3767 | msgid "%(value)s is not an index of type %(_type)s." | 3772 | msgid "%(value)s is not an index of type %(_type)s." |
3752 | 3768 | msgstr "" | 3773 | msgstr "" |
3753 | 3769 | 3774 | ||
3755 | 3770 | #: bzrlib/errors.py:429 | 3775 | #: bzrlib/errors.py:436 |
3756 | 3771 | msgid "Error in data for index %(value)s." | 3776 | msgid "Error in data for index %(value)s." |
3757 | 3772 | msgstr "" | 3777 | msgstr "" |
3758 | 3773 | 3778 | ||
3760 | 3774 | #: bzrlib/errors.py:438 | 3779 | #: bzrlib/errors.py:445 |
3761 | 3775 | msgid "The key '%(key)s' is already in index '%(index)s'." | 3780 | msgid "The key '%(key)s' is already in index '%(index)s'." |
3762 | 3776 | msgstr "" | 3781 | msgstr "" |
3763 | 3777 | 3782 | ||
3765 | 3778 | #: bzrlib/errors.py:448 | 3783 | #: bzrlib/errors.py:455 |
3766 | 3779 | msgid "The key '%(key)s' is not a valid key." | 3784 | msgid "The key '%(key)s' is not a valid key." |
3767 | 3780 | msgstr "" | 3785 | msgstr "" |
3768 | 3781 | 3786 | ||
3770 | 3782 | #: bzrlib/errors.py:457 | 3787 | #: bzrlib/errors.py:464 |
3771 | 3783 | msgid "Could not parse options for index %(value)s." | 3788 | msgid "Could not parse options for index %(value)s." |
3772 | 3784 | msgstr "" | 3789 | msgstr "" |
3773 | 3785 | 3790 | ||
3775 | 3786 | #: bzrlib/errors.py:466 | 3791 | #: bzrlib/errors.py:473 |
3776 | 3787 | msgid "The value '%(value)s' is not a valid value." | 3792 | msgid "The value '%(value)s' is not a valid value." |
3777 | 3788 | msgstr "" | 3793 | msgstr "" |
3778 | 3789 | 3794 | ||
3780 | 3790 | #: bzrlib/errors.py:494 | 3795 | #: bzrlib/errors.py:501 |
3781 | 3791 | msgid "Generic path error: %(path)r%(extra)s)" | 3796 | msgid "Generic path error: %(path)r%(extra)s)" |
3782 | 3792 | msgstr "" | 3797 | msgstr "" |
3783 | 3793 | 3798 | ||
3785 | 3794 | #: bzrlib/errors.py:507 | 3799 | #: bzrlib/errors.py:514 |
3786 | 3795 | msgid "No such file: %(path)r%(extra)s" | 3800 | msgid "No such file: %(path)r%(extra)s" |
3787 | 3796 | msgstr "" | 3801 | msgstr "" |
3788 | 3797 | 3802 | ||
3790 | 3798 | #: bzrlib/errors.py:512 | 3803 | #: bzrlib/errors.py:519 |
3791 | 3799 | msgid "File exists: %(path)r%(extra)s" | 3804 | msgid "File exists: %(path)r%(extra)s" |
3792 | 3800 | msgstr "" | 3805 | msgstr "" |
3793 | 3801 | 3806 | ||
3795 | 3802 | #: bzrlib/errors.py:518 | 3807 | #: bzrlib/errors.py:525 |
3796 | 3803 | msgid "" | 3808 | msgid "" |
3797 | 3804 | "Could not rename %(source)s => %(dest)s because both files exist. (Use --" | 3809 | "Could not rename %(source)s => %(dest)s because both files exist. (Use --" |
3798 | 3805 | "after to tell bzr about a rename that has already happened)%(extra)s" | 3810 | "after to tell bzr about a rename that has already happened)%(extra)s" |
3799 | 3806 | msgstr "" | 3811 | msgstr "" |
3800 | 3807 | 3812 | ||
3802 | 3808 | #: bzrlib/errors.py:534 | 3813 | #: bzrlib/errors.py:541 |
3803 | 3809 | msgid "\"%(path)s\" is not a directory %(extra)s" | 3814 | msgid "\"%(path)s\" is not a directory %(extra)s" |
3804 | 3810 | msgstr "" | 3815 | msgstr "" |
3805 | 3811 | 3816 | ||
3807 | 3812 | #: bzrlib/errors.py:539 | 3817 | #: bzrlib/errors.py:546 |
3808 | 3813 | msgid "\"%(path)s\" is not in the working directory %(extra)s" | 3818 | msgid "\"%(path)s\" is not in the working directory %(extra)s" |
3809 | 3814 | msgstr "" | 3819 | msgstr "" |
3810 | 3815 | 3820 | ||
3812 | 3816 | #: bzrlib/errors.py:544 | 3821 | #: bzrlib/errors.py:551 |
3813 | 3817 | msgid "Directory not empty: \"%(path)s\"%(extra)s" | 3822 | msgid "Directory not empty: \"%(path)s\"%(extra)s" |
3814 | 3818 | msgstr "" | 3823 | msgstr "" |
3815 | 3819 | 3824 | ||
3817 | 3820 | #: bzrlib/errors.py:549 | 3825 | #: bzrlib/errors.py:556 |
3818 | 3821 | msgid "Hard-linking \"%(path)s\" is not supported" | 3826 | msgid "Hard-linking \"%(path)s\" is not supported" |
3819 | 3822 | msgstr "" | 3827 | msgstr "" |
3820 | 3823 | 3828 | ||
3822 | 3824 | #: bzrlib/errors.py:564 | 3829 | #: bzrlib/errors.py:571 |
3823 | 3825 | msgid "Device or resource busy: \"%(path)s\"%(extra)s" | 3830 | msgid "Device or resource busy: \"%(path)s\"%(extra)s" |
3824 | 3826 | msgstr "" | 3831 | msgstr "" |
3825 | 3827 | 3832 | ||
3827 | 3828 | #: bzrlib/errors.py:569 | 3833 | #: bzrlib/errors.py:576 |
3828 | 3829 | msgid "Permission denied: \"%(path)s\"%(extra)s" | 3834 | msgid "Permission denied: \"%(path)s\"%(extra)s" |
3829 | 3830 | msgstr "" | 3835 | msgstr "" |
3830 | 3831 | 3836 | ||
3832 | 3832 | #: bzrlib/errors.py:574 | 3837 | #: bzrlib/errors.py:581 |
3833 | 3833 | msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s" | 3838 | msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s" |
3834 | 3834 | msgstr "" | 3839 | msgstr "" |
3835 | 3835 | 3840 | ||
3837 | 3836 | #: bzrlib/errors.py:579 | 3841 | #: bzrlib/errors.py:586 |
3838 | 3837 | msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r" | 3842 | msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r" |
3839 | 3838 | msgstr "" | 3843 | msgstr "" |
3840 | 3839 | 3844 | ||
3842 | 3840 | #: bzrlib/errors.py:590 | 3845 | #: bzrlib/errors.py:597 |
3843 | 3841 | msgid "URLs differ by more than path: %(from_)r and %(to)r" | 3846 | msgid "URLs differ by more than path: %(from_)r and %(to)r" |
3844 | 3842 | msgstr "" | 3847 | msgstr "" |
3845 | 3843 | 3848 | ||
3847 | 3844 | #: bzrlib/errors.py:612 | 3849 | #: bzrlib/errors.py:619 |
3848 | 3845 | msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib." | 3850 | msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib." |
3849 | 3846 | msgstr "" | 3851 | msgstr "" |
3850 | 3847 | 3852 | ||
3852 | 3848 | #: bzrlib/errors.py:622 | 3853 | #: bzrlib/errors.py:629 |
3853 | 3849 | msgid "Unsupported protocol for url \"%(path)s\"%(extra)s" | 3854 | msgid "Unsupported protocol for url \"%(path)s\"%(extra)s" |
3854 | 3850 | msgstr "" | 3855 | msgstr "" |
3855 | 3851 | 3856 | ||
3857 | 3852 | #: bzrlib/errors.py:630 | 3857 | #: bzrlib/errors.py:637 |
3858 | 3853 | msgid "" | 3858 | msgid "" |
3859 | 3854 | "The branch '%(url)s'(%(format)s) is not a stackable format. You will need to " | 3859 | "The branch '%(url)s'(%(format)s) is not a stackable format. You will need to " |
3860 | 3855 | "upgrade the branch to permit branch stacking." | 3860 | "upgrade the branch to permit branch stacking." |
3861 | 3856 | msgstr "" | 3861 | msgstr "" |
3862 | 3857 | 3862 | ||
3864 | 3858 | #: bzrlib/errors.py:641 | 3863 | #: bzrlib/errors.py:648 |
3865 | 3859 | msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'." | 3864 | msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'." |
3866 | 3860 | msgstr "" | 3865 | msgstr "" |
3867 | 3861 | 3866 | ||
3869 | 3862 | #: bzrlib/errors.py:651 | 3867 | #: bzrlib/errors.py:658 |
3870 | 3863 | msgid "" | 3868 | msgid "" |
3871 | 3864 | "The repository '%(url)s'(%(format)s) is not a stackable format. You will " | 3869 | "The repository '%(url)s'(%(format)s) is not a stackable format. You will " |
3872 | 3865 | "need to upgrade the repository to permit branch stacking." | 3870 | "need to upgrade the repository to permit branch stacking." |
3873 | 3866 | msgstr "" | 3871 | msgstr "" |
3874 | 3867 | 3872 | ||
3876 | 3868 | #: bzrlib/errors.py:662 | 3873 | #: bzrlib/errors.py:669 |
3877 | 3869 | msgid "Error reading from %(path)r." | 3874 | msgid "Error reading from %(path)r." |
3878 | 3870 | msgstr "" | 3875 | msgstr "" |
3879 | 3871 | 3876 | ||
3881 | 3872 | #: bzrlib/errors.py:681 | 3877 | #: bzrlib/errors.py:688 |
3882 | 3873 | msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s" | 3878 | msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s" |
3883 | 3874 | msgstr "" | 3879 | msgstr "" |
3884 | 3875 | 3880 | ||
3886 | 3876 | #: bzrlib/errors.py:697 | 3881 | #: bzrlib/errors.py:704 |
3887 | 3877 | msgid "Path \"%(path)s\" is not unicode normalized" | 3882 | msgid "Path \"%(path)s\" is not unicode normalized" |
3888 | 3878 | msgstr "" | 3883 | msgstr "" |
3889 | 3879 | 3884 | ||
3891 | 3880 | #: bzrlib/errors.py:705 | 3885 | #: bzrlib/errors.py:712 |
3892 | 3881 | msgid "Not a branch: \"%(path)s\"%(detail)s." | 3886 | msgid "Not a branch: \"%(path)s\"%(detail)s." |
3893 | 3882 | msgstr "" | 3887 | msgstr "" |
3894 | 3883 | 3888 | ||
3896 | 3884 | #: bzrlib/errors.py:747 | 3889 | #: bzrlib/errors.py:754 |
3897 | 3885 | msgid "No submit branch available for branch \"%(path)s\"" | 3890 | msgid "No submit branch available for branch \"%(path)s\"" |
3898 | 3886 | msgstr "" | 3891 | msgstr "" |
3899 | 3887 | 3892 | ||
3901 | 3888 | #: bzrlib/errors.py:756 | 3893 | #: bzrlib/errors.py:763 |
3902 | 3889 | msgid "Already a branch: \"%(path)s\"." | 3894 | msgid "Already a branch: \"%(path)s\"." |
3903 | 3890 | msgstr "" | 3895 | msgstr "" |
3904 | 3891 | 3896 | ||
3906 | 3892 | #: bzrlib/errors.py:762 | 3897 | #: bzrlib/errors.py:769 |
3907 | 3893 | msgid "" | 3898 | msgid "" |
3908 | 3894 | "Directory contains a branch, but no working tree (use bzr checkout if you " | 3899 | "Directory contains a branch, but no working tree (use bzr checkout if you " |
3909 | 3895 | "wish to build a working tree): \"%(path)s\"" | 3900 | "wish to build a working tree): \"%(path)s\"" |
3910 | 3896 | msgstr "" | 3901 | msgstr "" |
3911 | 3897 | 3902 | ||
3913 | 3898 | #: bzrlib/errors.py:767 | 3903 | #: bzrlib/errors.py:774 |
3914 | 3899 | msgid "" | 3904 | msgid "" |
3915 | 3900 | "\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\"" | 3905 | "\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\"" |
3916 | 3901 | msgstr "" | 3906 | msgstr "" |
3917 | 3902 | 3907 | ||
3919 | 3903 | #: bzrlib/errors.py:777 | 3908 | #: bzrlib/errors.py:784 |
3920 | 3904 | msgid "" | 3909 | msgid "" |
3921 | 3905 | "Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\"" | 3910 | "Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\"" |
3922 | 3906 | msgstr "" | 3911 | msgstr "" |
3923 | 3907 | 3912 | ||
3925 | 3908 | #: bzrlib/errors.py:787 | 3913 | #: bzrlib/errors.py:794 |
3926 | 3909 | msgid "No repository present: \"%(path)s\"" | 3914 | msgid "No repository present: \"%(path)s\"" |
3927 | 3910 | msgstr "" | 3915 | msgstr "" |
3928 | 3911 | 3916 | ||
3930 | 3912 | #: bzrlib/errors.py:795 | 3917 | #: bzrlib/errors.py:802 |
3931 | 3913 | msgid "File \"%(path)s\" is not in branch %(branch_base)s." | 3918 | msgid "File \"%(path)s\" is not in branch %(branch_base)s." |
3932 | 3914 | msgstr "" | 3919 | msgstr "" |
3933 | 3915 | 3920 | ||
3935 | 3916 | #: bzrlib/errors.py:807 | 3921 | #: bzrlib/errors.py:814 |
3936 | 3917 | msgid "" | 3922 | msgid "" |
3937 | 3918 | "Unsupported branch format: %(format)s\n" | 3923 | "Unsupported branch format: %(format)s\n" |
3938 | 3919 | "Please run 'bzr upgrade'" | 3924 | "Please run 'bzr upgrade'" |
3939 | 3920 | msgstr "" | 3925 | msgstr "" |
3940 | 3921 | 3926 | ||
3942 | 3922 | #: bzrlib/errors.py:813 | 3927 | #: bzrlib/errors.py:820 |
3943 | 3923 | msgid "Unknown %(kind)s format: %(format)r" | 3928 | msgid "Unknown %(kind)s format: %(format)r" |
3944 | 3924 | msgstr "" | 3929 | msgstr "" |
3945 | 3925 | 3930 | ||
3947 | 3926 | #: bzrlib/errors.py:822 | 3931 | #: bzrlib/errors.py:829 |
3948 | 3927 | msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s." | 3932 | msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s." |
3949 | 3928 | msgstr "" | 3933 | msgstr "" |
3950 | 3929 | 3934 | ||
3952 | 3930 | #: bzrlib/errors.py:835 | 3935 | #: bzrlib/errors.py:842 |
3953 | 3931 | msgid "" | 3936 | msgid "" |
3954 | 3932 | "%(target)s\n" | 3937 | "%(target)s\n" |
3955 | 3933 | "is not compatible with\n" | 3938 | "is not compatible with\n" |
3956 | @@ -3935,452 +3940,452 @@ | |||
3957 | 3935 | "%(details)s" | 3940 | "%(details)s" |
3958 | 3936 | msgstr "" | 3941 | msgstr "" |
3959 | 3937 | 3942 | ||
3961 | 3938 | #: bzrlib/errors.py:851 | 3943 | #: bzrlib/errors.py:858 |
3962 | 3939 | msgid "Revision is not compatible with %(repo_format)s" | 3944 | msgid "Revision is not compatible with %(repo_format)s" |
3963 | 3940 | msgstr "" | 3945 | msgstr "" |
3964 | 3941 | 3946 | ||
3966 | 3942 | #: bzrlib/errors.py:861 | 3947 | #: bzrlib/errors.py:868 |
3967 | 3943 | msgid "%(context_info)s%(path)s is already versioned." | 3948 | msgid "%(context_info)s%(path)s is already versioned." |
3968 | 3944 | msgstr "" | 3949 | msgstr "" |
3969 | 3945 | 3950 | ||
3971 | 3946 | #: bzrlib/errors.py:882 | 3951 | #: bzrlib/errors.py:889 |
3972 | 3947 | msgid "%(context_info)s%(path)s is not versioned." | 3952 | msgid "%(context_info)s%(path)s is not versioned." |
3973 | 3948 | msgstr "" | 3953 | msgstr "" |
3974 | 3949 | 3954 | ||
3976 | 3950 | #: bzrlib/errors.py:903 | 3955 | #: bzrlib/errors.py:910 |
3977 | 3951 | msgid "Path(s) are not versioned: %(paths_as_string)s" | 3956 | msgid "Path(s) are not versioned: %(paths_as_string)s" |
3978 | 3952 | msgstr "" | 3957 | msgstr "" |
3979 | 3953 | 3958 | ||
3981 | 3954 | #: bzrlib/errors.py:914 | 3959 | #: bzrlib/errors.py:921 |
3982 | 3955 | msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s" | 3960 | msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s" |
3983 | 3956 | msgstr "" | 3961 | msgstr "" |
3984 | 3957 | 3962 | ||
3986 | 3958 | #: bzrlib/errors.py:933 | 3963 | #: bzrlib/errors.py:940 |
3987 | 3959 | msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\"" | 3964 | msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\"" |
3988 | 3960 | msgstr "" | 3965 | msgstr "" |
3989 | 3961 | 3966 | ||
3991 | 3962 | #: bzrlib/errors.py:941 | 3967 | #: bzrlib/errors.py:948 |
3992 | 3963 | msgid "" | 3968 | msgid "" |
3993 | 3964 | "Filename %(filename)r is not valid in your current filesystem encoding " | 3969 | "Filename %(filename)r is not valid in your current filesystem encoding " |
3994 | 3965 | "%(fs_encoding)s" | 3970 | "%(fs_encoding)s" |
3995 | 3966 | msgstr "" | 3971 | msgstr "" |
3996 | 3967 | 3972 | ||
3998 | 3968 | #: bzrlib/errors.py:952 | 3973 | #: bzrlib/errors.py:959 |
3999 | 3969 | msgid "Cannot operate on \"%(filename)s\" because it is a control file" | 3974 | msgid "Cannot operate on \"%(filename)s\" because it is a control file" |
4000 | 3970 | msgstr "" | 3975 | msgstr "" |
4001 | 3971 | 3976 | ||
4003 | 3972 | #: bzrlib/errors.py:970 | 3977 | #: bzrlib/errors.py:977 |
4004 | 3973 | msgid "The lock for '%(lock_description)s' is in use and cannot be broken." | 3978 | msgid "The lock for '%(lock_description)s' is in use and cannot be broken." |
4005 | 3974 | msgstr "" | 3979 | msgstr "" |
4006 | 3975 | 3980 | ||
4008 | 3976 | #: bzrlib/errors.py:1009 | 3981 | #: bzrlib/errors.py:1016 |
4009 | 3977 | msgid "Cannot lock %(lock)s: %(why)s" | 3982 | msgid "Cannot lock %(lock)s: %(why)s" |
4010 | 3978 | msgstr "" | 3983 | msgstr "" |
4011 | 3979 | 3984 | ||
4013 | 3980 | #: bzrlib/errors.py:1019 | 3985 | #: bzrlib/errors.py:1026 |
4014 | 3981 | msgid "" | 3986 | msgid "" |
4015 | 3982 | "A transaction related operation was attempted after the transaction finished." | 3987 | "A transaction related operation was attempted after the transaction finished." |
4016 | 3983 | msgstr "" | 3988 | msgstr "" |
4017 | 3984 | 3989 | ||
4019 | 3985 | #: bzrlib/errors.py:1046 | 3990 | #: bzrlib/errors.py:1053 |
4020 | 3986 | msgid "Cannot lock: transport is read only: %(transport)s" | 3991 | msgid "Cannot lock: transport is read only: %(transport)s" |
4021 | 3987 | msgstr "" | 3992 | msgstr "" |
4022 | 3988 | 3993 | ||
4024 | 3989 | #: bzrlib/errors.py:1054 | 3994 | #: bzrlib/errors.py:1061 |
4025 | 3990 | msgid "Could not acquire lock \"%(lock)s\": %(msg)s" | 3995 | msgid "Could not acquire lock \"%(lock)s\": %(msg)s" |
4026 | 3991 | msgstr "" | 3996 | msgstr "" |
4027 | 3992 | 3997 | ||
4029 | 3993 | #: bzrlib/errors.py:1065 | 3998 | #: bzrlib/errors.py:1072 |
4030 | 3994 | msgid "Lock was broken while still open: %(lock)s - check storage consistency!" | 3999 | msgid "Lock was broken while still open: %(lock)s - check storage consistency!" |
4031 | 3995 | msgstr "" | 4000 | msgstr "" |
4032 | 3996 | 4001 | ||
4034 | 3997 | #: bzrlib/errors.py:1076 | 4002 | #: bzrlib/errors.py:1083 |
4035 | 3998 | msgid "" | 4003 | msgid "" |
4036 | 3999 | "Lock was released and re-acquired before being broken: %(lock)s: held by " | 4004 | "Lock was released and re-acquired before being broken: %(lock)s: held by " |
4037 | 4000 | "%(holder)r, wanted to break %(target)r" | 4005 | "%(holder)r, wanted to break %(target)r" |
4038 | 4001 | msgstr "" | 4006 | msgstr "" |
4039 | 4002 | 4007 | ||
4041 | 4003 | #: bzrlib/errors.py:1088 | 4008 | #: bzrlib/errors.py:1095 |
4042 | 4004 | msgid "" | 4009 | msgid "" |
4043 | 4005 | "Lock is apparently held, but corrupted: %(corruption_info)s\n" | 4010 | "Lock is apparently held, but corrupted: %(corruption_info)s\n" |
4044 | 4006 | "Use 'bzr break-lock' to clear it" | 4011 | "Use 'bzr break-lock' to clear it" |
4045 | 4007 | msgstr "" | 4012 | msgstr "" |
4046 | 4008 | 4013 | ||
4048 | 4009 | #: bzrlib/errors.py:1101 | 4014 | #: bzrlib/errors.py:1108 |
4049 | 4010 | msgid "Lock not held: %(lock)s" | 4015 | msgid "Lock not held: %(lock)s" |
4050 | 4011 | msgstr "" | 4016 | msgstr "" |
4051 | 4012 | 4017 | ||
4053 | 4013 | #: bzrlib/errors.py:1130 | 4018 | #: bzrlib/errors.py:1137 |
4054 | 4014 | msgid "No changes to commit" | 4019 | msgid "No changes to commit" |
4055 | 4015 | msgstr "" | 4020 | msgstr "" |
4056 | 4016 | 4021 | ||
4058 | 4017 | #: bzrlib/errors.py:1135 | 4022 | #: bzrlib/errors.py:1142 |
4059 | 4018 | msgid "" | 4023 | msgid "" |
4060 | 4019 | "Selected-file commit of merges is not supported yet: files %(files_str)s" | 4024 | "Selected-file commit of merges is not supported yet: files %(files_str)s" |
4061 | 4020 | msgstr "" | 4025 | msgstr "" |
4062 | 4021 | 4026 | ||
4064 | 4022 | #: bzrlib/errors.py:1145 | 4027 | #: bzrlib/errors.py:1152 |
4065 | 4023 | msgid "" | 4028 | msgid "" |
4066 | 4024 | "Excluding paths during commit is not supported by repository at %(repository)" | 4029 | "Excluding paths during commit is not supported by repository at %(repository)" |
4067 | 4025 | "r." | 4030 | "r." |
4068 | 4026 | msgstr "" | 4031 | msgstr "" |
4069 | 4027 | 4032 | ||
4071 | 4028 | #: bzrlib/errors.py:1154 | 4033 | #: bzrlib/errors.py:1161 |
4072 | 4029 | msgid "" | 4034 | msgid "" |
4073 | 4030 | "The specified commit message contains characters unsupported by the current " | 4035 | "The specified commit message contains characters unsupported by the current " |
4074 | 4031 | "encoding." | 4036 | "encoding." |
4075 | 4032 | msgstr "" | 4037 | msgstr "" |
4076 | 4033 | 4038 | ||
4078 | 4034 | #: bzrlib/errors.py:1160 | 4039 | #: bzrlib/errors.py:1167 |
4079 | 4035 | msgid "Upgrade URL cannot work with readonly URLs." | 4040 | msgid "Upgrade URL cannot work with readonly URLs." |
4080 | 4036 | msgstr "" | 4041 | msgstr "" |
4081 | 4037 | 4042 | ||
4083 | 4038 | #: bzrlib/errors.py:1165 | 4043 | #: bzrlib/errors.py:1172 |
4084 | 4039 | msgid "The branch format %(format)s is already at the most recent format." | 4044 | msgid "The branch format %(format)s is already at the most recent format." |
4085 | 4040 | msgstr "" | 4045 | msgstr "" |
4086 | 4041 | 4046 | ||
4088 | 4042 | #: bzrlib/errors.py:1188 | 4047 | #: bzrlib/errors.py:1195 |
4089 | 4043 | msgid "Option --change does not accept revision ranges" | 4048 | msgid "Option --change does not accept revision ranges" |
4090 | 4044 | msgstr "" | 4049 | msgstr "" |
4091 | 4045 | 4050 | ||
4093 | 4046 | #: bzrlib/errors.py:1193 | 4051 | #: bzrlib/errors.py:1200 |
4094 | 4047 | msgid "No namespace registered for string: %(spec)r" | 4052 | msgid "No namespace registered for string: %(spec)r" |
4095 | 4048 | msgstr "" | 4053 | msgstr "" |
4096 | 4049 | 4054 | ||
4098 | 4050 | #: bzrlib/errors.py:1212 | 4055 | #: bzrlib/errors.py:1219 |
4099 | 4051 | msgid "" | 4056 | msgid "" |
4100 | 4052 | "Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s" | 4057 | "Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s" |
4101 | 4053 | "%(extra)s" | 4058 | "%(extra)s" |
4102 | 4054 | msgstr "" | 4059 | msgstr "" |
4103 | 4055 | 4060 | ||
4105 | 4056 | #: bzrlib/errors.py:1226 | 4061 | #: bzrlib/errors.py:1233 |
4106 | 4057 | msgid "%(branch)s is missing %(object_type)s {%(object_id)s}" | 4062 | msgid "%(branch)s is missing %(object_type)s {%(object_id)s}" |
4107 | 4058 | msgstr "" | 4063 | msgstr "" |
4108 | 4059 | 4064 | ||
4110 | 4060 | #: bzrlib/errors.py:1231 | 4065 | #: bzrlib/errors.py:1238 |
4111 | 4061 | msgid "" | 4066 | msgid "" |
4112 | 4062 | "Operation denied because it would change the main history, which is not " | 4067 | "Operation denied because it would change the main history, which is not " |
4113 | 4063 | "permitted by the append_revisions_only setting on branch \"%(location)s\"." | 4068 | "permitted by the append_revisions_only setting on branch \"%(location)s\"." |
4114 | 4064 | msgstr "" | 4069 | msgstr "" |
4115 | 4065 | 4070 | ||
4117 | 4066 | #: bzrlib/errors.py:1242 | 4071 | #: bzrlib/errors.py:1249 |
4118 | 4067 | msgid "" | 4072 | msgid "" |
4119 | 4068 | "These branches have diverged. Use the missing command to see how.\n" | 4073 | "These branches have diverged. Use the missing command to see how.\n" |
4120 | 4069 | "Use the merge command to reconcile them." | 4074 | "Use the merge command to reconcile them." |
4121 | 4070 | msgstr "" | 4075 | msgstr "" |
4122 | 4071 | 4076 | ||
4124 | 4072 | #: bzrlib/errors.py:1262 | 4077 | #: bzrlib/errors.py:1269 |
4125 | 4073 | msgid "" | 4078 | msgid "" |
4126 | 4074 | "Branches have no common ancestor, and no merge base revision was specified." | 4079 | "Branches have no common ancestor, and no merge base revision was specified." |
4127 | 4075 | msgstr "" | 4080 | msgstr "" |
4128 | 4076 | 4081 | ||
4130 | 4077 | #: bzrlib/errors.py:1268 | 4082 | #: bzrlib/errors.py:1275 |
4131 | 4078 | msgid "" | 4083 | msgid "" |
4132 | 4079 | "Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3." | 4084 | "Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3." |
4133 | 4080 | msgstr "" | 4085 | msgstr "" |
4134 | 4081 | 4086 | ||
4136 | 4082 | #: bzrlib/errors.py:1274 | 4087 | #: bzrlib/errors.py:1281 |
4137 | 4083 | msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" | 4088 | msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" |
4138 | 4084 | msgstr "" | 4089 | msgstr "" |
4139 | 4085 | 4090 | ||
4141 | 4086 | #: bzrlib/errors.py:1283 | 4091 | #: bzrlib/errors.py:1290 |
4142 | 4087 | msgid "" | 4092 | msgid "" |
4143 | 4088 | "Revisions are not derived from the same root: %(revision_a)s %(revision_b)s." | 4093 | "Revisions are not derived from the same root: %(revision_a)s %(revision_b)s." |
4144 | 4089 | msgstr "" | 4094 | msgstr "" |
4145 | 4090 | 4095 | ||
4147 | 4091 | #: bzrlib/errors.py:1292 | 4096 | #: bzrlib/errors.py:1299 |
4148 | 4092 | msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" | 4097 | msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" |
4149 | 4093 | msgstr "" | 4098 | msgstr "" |
4150 | 4094 | 4099 | ||
4152 | 4095 | #: bzrlib/errors.py:1312 | 4100 | #: bzrlib/errors.py:1319 |
4153 | 4096 | msgid "Branch %(branch)s has no commits." | 4101 | msgid "Branch %(branch)s has no commits." |
4154 | 4097 | msgstr "" | 4102 | msgstr "" |
4155 | 4098 | 4103 | ||
4157 | 4099 | #: bzrlib/errors.py:1330 | 4104 | #: bzrlib/errors.py:1337 |
4158 | 4100 | msgid "" | 4105 | msgid "" |
4159 | 4101 | "Bound branch %(branch)s is out of date with master branch %(master)s." | 4106 | "Bound branch %(branch)s is out of date with master branch %(master)s." |
4160 | 4102 | "%(extra_help)s" | 4107 | "%(extra_help)s" |
4161 | 4103 | msgstr "" | 4108 | msgstr "" |
4162 | 4104 | 4109 | ||
4164 | 4105 | #: bzrlib/errors.py:1342 | 4110 | #: bzrlib/errors.py:1349 |
4165 | 4106 | msgid "" | 4111 | msgid "" |
4166 | 4107 | "Cannot commit to branch %(branch)s. It is bound to %(master)s, which is " | 4112 | "Cannot commit to branch %(branch)s. It is bound to %(master)s, which is " |
4167 | 4108 | "bound to %(remote)s." | 4113 | "bound to %(remote)s." |
4168 | 4109 | msgstr "" | 4114 | msgstr "" |
4169 | 4110 | 4115 | ||
4171 | 4111 | #: bzrlib/errors.py:1354 | 4116 | #: bzrlib/errors.py:1361 |
4172 | 4112 | msgid "Cannot pull --overwrite to a branch which is bound %(branch)s" | 4117 | msgid "Cannot pull --overwrite to a branch which is bound %(branch)s" |
4173 | 4113 | msgstr "" | 4118 | msgstr "" |
4174 | 4114 | 4119 | ||
4176 | 4115 | #: bzrlib/errors.py:1363 | 4120 | #: bzrlib/errors.py:1370 |
4177 | 4116 | msgid "" | 4121 | msgid "" |
4178 | 4117 | "Unable to connect to target of bound branch %(branch)s => %(target)s: " | 4122 | "Unable to connect to target of bound branch %(branch)s => %(target)s: " |
4179 | 4118 | "%(error)s" | 4123 | "%(error)s" |
4180 | 4119 | msgstr "" | 4124 | msgstr "" |
4181 | 4120 | 4125 | ||
4183 | 4121 | #: bzrlib/errors.py:1375 | 4126 | #: bzrlib/errors.py:1382 |
4184 | 4122 | msgid "Error in processing weave: %(msg)s" | 4127 | msgid "Error in processing weave: %(msg)s" |
4185 | 4123 | msgstr "" | 4128 | msgstr "" |
4186 | 4124 | 4129 | ||
4188 | 4125 | #: bzrlib/errors.py:1384 | 4130 | #: bzrlib/errors.py:1391 |
4189 | 4126 | msgid "Revision {%(revision_id)s} already present in %(weave)s" | 4131 | msgid "Revision {%(revision_id)s} already present in %(weave)s" |
4190 | 4127 | msgstr "" | 4132 | msgstr "" |
4191 | 4128 | 4133 | ||
4193 | 4129 | #: bzrlib/errors.py:1395 | 4134 | #: bzrlib/errors.py:1402 |
4194 | 4130 | msgid "Revision {%(revision_id)s} not present in %(weave)s" | 4135 | msgid "Revision {%(revision_id)s} not present in %(weave)s" |
4195 | 4131 | msgstr "" | 4136 | msgstr "" |
4196 | 4132 | 4137 | ||
4198 | 4133 | #: bzrlib/errors.py:1405 | 4138 | #: bzrlib/errors.py:1412 |
4199 | 4134 | msgid "Weave invariant violated: %(what)s" | 4139 | msgid "Weave invariant violated: %(what)s" |
4200 | 4135 | msgstr "" | 4140 | msgstr "" |
4201 | 4136 | 4141 | ||
4203 | 4137 | #: bzrlib/errors.py:1414 | 4142 | #: bzrlib/errors.py:1421 |
4204 | 4138 | msgid "Parents are mismatched between two revisions. %(msg)s" | 4143 | msgid "Parents are mismatched between two revisions. %(msg)s" |
4205 | 4139 | msgstr "" | 4144 | msgstr "" |
4206 | 4140 | 4145 | ||
4208 | 4141 | #: bzrlib/errors.py:1436 | 4146 | #: bzrlib/errors.py:1443 |
4209 | 4142 | msgid "" | 4147 | msgid "" |
4210 | 4143 | "Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, " | 4148 | "Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, " |
4211 | 4144 | "%(weave_b)s" | 4149 | "%(weave_b)s" |
4212 | 4145 | msgstr "" | 4150 | msgstr "" |
4213 | 4146 | 4151 | ||
4215 | 4147 | #: bzrlib/errors.py:1448 | 4152 | #: bzrlib/errors.py:1455 |
4216 | 4148 | msgid "Versioned file error" | 4153 | msgid "Versioned file error" |
4217 | 4149 | msgstr "" | 4154 | msgstr "" |
4218 | 4150 | 4155 | ||
4220 | 4151 | #: bzrlib/errors.py:1453 | 4156 | #: bzrlib/errors.py:1460 |
4221 | 4152 | msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"." | 4157 | msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"." |
4222 | 4153 | msgstr "" | 4158 | msgstr "" |
4223 | 4154 | 4159 | ||
4225 | 4155 | #: bzrlib/errors.py:1463 | 4160 | #: bzrlib/errors.py:1470 |
4226 | 4156 | msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"." | 4161 | msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"." |
4227 | 4157 | msgstr "" | 4162 | msgstr "" |
4228 | 4158 | 4163 | ||
4230 | 4159 | #: bzrlib/errors.py:1473 | 4164 | #: bzrlib/errors.py:1480 |
4231 | 4160 | msgid "Text did not match its checksum: %(msg)s" | 4165 | msgid "Text did not match its checksum: %(msg)s" |
4232 | 4161 | msgstr "" | 4166 | msgstr "" |
4233 | 4162 | 4167 | ||
4235 | 4163 | #: bzrlib/errors.py:1598 | 4168 | #: bzrlib/errors.py:1605 |
4236 | 4164 | msgid "Export format %(format)r not supported" | 4169 | msgid "Export format %(format)r not supported" |
4237 | 4165 | msgstr "" | 4170 | msgstr "" |
4238 | 4166 | 4171 | ||
4240 | 4167 | #: bzrlib/errors.py:1607 | 4172 | #: bzrlib/errors.py:1614 |
4241 | 4168 | msgid "Transport error: %(msg)s %(orig_error)s" | 4173 | msgid "Transport error: %(msg)s %(orig_error)s" |
4242 | 4169 | msgstr "" | 4174 | msgstr "" |
4243 | 4170 | 4175 | ||
4245 | 4171 | #: bzrlib/errors.py:1633 | 4176 | #: bzrlib/errors.py:1640 |
4246 | 4172 | msgid "Generic bzr smart protocol error: %(details)s" | 4177 | msgid "Generic bzr smart protocol error: %(details)s" |
4247 | 4173 | msgstr "" | 4178 | msgstr "" |
4248 | 4174 | 4179 | ||
4250 | 4175 | #: bzrlib/errors.py:1641 | 4180 | #: bzrlib/errors.py:1648 |
4251 | 4176 | msgid "Received bad protocol version marker: %(marker)r" | 4181 | msgid "Received bad protocol version marker: %(marker)r" |
4252 | 4177 | msgstr "" | 4182 | msgstr "" |
4253 | 4178 | 4183 | ||
4255 | 4179 | #: bzrlib/errors.py:1672 | 4184 | #: bzrlib/errors.py:1679 |
4256 | 4180 | msgid "Transport operation not possible: %(msg)s %(orig_error)s" | 4185 | msgid "Transport operation not possible: %(msg)s %(orig_error)s" |
4257 | 4181 | msgstr "" | 4186 | msgstr "" |
4258 | 4182 | 4187 | ||
4260 | 4183 | #: bzrlib/errors.py:1677 | 4188 | #: bzrlib/errors.py:1684 |
4261 | 4184 | msgid "Connection error: %(msg)s %(orig_error)s" | 4189 | msgid "Connection error: %(msg)s %(orig_error)s" |
4262 | 4185 | msgstr "" | 4190 | msgstr "" |
4263 | 4186 | 4191 | ||
4265 | 4187 | #: bzrlib/errors.py:1682 | 4192 | #: bzrlib/errors.py:1689 |
4266 | 4188 | msgid "%(msg)s %(host)s%(port)s%(orig_error)s" | 4193 | msgid "%(msg)s %(host)s%(port)s%(orig_error)s" |
4267 | 4189 | msgstr "" | 4194 | msgstr "" |
4268 | 4190 | 4195 | ||
4270 | 4191 | #: bzrlib/errors.py:1703 | 4196 | #: bzrlib/errors.py:1710 |
4271 | 4192 | msgid "Connection closed: %(msg)s %(orig_error)s" | 4197 | msgid "Connection closed: %(msg)s %(orig_error)s" |
4272 | 4193 | msgstr "" | 4198 | msgstr "" |
4273 | 4194 | 4199 | ||
4275 | 4195 | #: bzrlib/errors.py:1708 | 4200 | #: bzrlib/errors.py:1715 |
4276 | 4196 | msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s" | 4201 | msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s" |
4277 | 4197 | msgstr "" | 4202 | msgstr "" |
4278 | 4198 | 4203 | ||
4280 | 4199 | #: bzrlib/errors.py:1718 | 4204 | #: bzrlib/errors.py:1725 |
4281 | 4200 | msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s" | 4205 | msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s" |
4282 | 4201 | msgstr "" | 4206 | msgstr "" |
4283 | 4202 | 4207 | ||
4285 | 4203 | #: bzrlib/errors.py:1733 | 4208 | #: bzrlib/errors.py:1740 |
4286 | 4204 | msgid "Invalid http range %(range)r for %(path)s: %(msg)s" | 4209 | msgid "Invalid http range %(range)r for %(path)s: %(msg)s" |
4287 | 4205 | msgstr "" | 4210 | msgstr "" |
4288 | 4206 | 4211 | ||
4290 | 4207 | #: bzrlib/errors.py:1747 | 4212 | #: bzrlib/errors.py:1754 |
4291 | 4208 | msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s" | 4213 | msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s" |
4292 | 4209 | msgstr "" | 4214 | msgstr "" |
4293 | 4210 | 4215 | ||
4295 | 4211 | #: bzrlib/errors.py:1755 | 4216 | #: bzrlib/errors.py:1762 |
4296 | 4212 | msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s" | 4217 | msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s" |
4297 | 4213 | msgstr "" | 4218 | msgstr "" |
4298 | 4214 | 4219 | ||
4300 | 4215 | #: bzrlib/errors.py:1764 | 4220 | #: bzrlib/errors.py:1771 |
4301 | 4216 | msgid "%(source)s is%(permanently)s redirected to %(target)s" | 4221 | msgid "%(source)s is%(permanently)s redirected to %(target)s" |
4302 | 4217 | msgstr "" | 4222 | msgstr "" |
4303 | 4218 | 4223 | ||
4305 | 4219 | #: bzrlib/errors.py:1778 | 4224 | #: bzrlib/errors.py:1785 |
4306 | 4220 | msgid "Too many redirections" | 4225 | msgid "Too many redirections" |
4307 | 4221 | msgstr "" | 4226 | msgstr "" |
4308 | 4222 | 4227 | ||
4310 | 4223 | #: bzrlib/errors.py:1783 | 4228 | #: bzrlib/errors.py:1790 |
4311 | 4224 | msgid "Working tree has conflicts." | 4229 | msgid "Working tree has conflicts." |
4312 | 4225 | msgstr "" | 4230 | msgstr "" |
4313 | 4226 | 4231 | ||
4315 | 4227 | #: bzrlib/errors.py:1787 | 4232 | #: bzrlib/errors.py:1794 |
4316 | 4228 | msgid "Config file %(filename)s is not UTF-8 encoded\n" | 4233 | msgid "Config file %(filename)s is not UTF-8 encoded\n" |
4317 | 4229 | msgstr "" | 4234 | msgstr "" |
4318 | 4230 | 4235 | ||
4320 | 4231 | #: bzrlib/errors.py:1796 | 4236 | #: bzrlib/errors.py:1803 |
4321 | 4232 | msgid "" | 4237 | msgid "" |
4322 | 4233 | "Error(s) parsing config file %(filename)s:\n" | 4238 | "Error(s) parsing config file %(filename)s:\n" |
4323 | 4234 | "%(errors)s" | 4239 | "%(errors)s" |
4324 | 4235 | msgstr "" | 4240 | msgstr "" |
4325 | 4236 | 4241 | ||
4327 | 4237 | #: bzrlib/errors.py:1807 | 4242 | #: bzrlib/errors.py:1814 |
4328 | 4238 | msgid "Bad value \"%(value)s\" for option \"%(name)s\"." | 4243 | msgid "Bad value \"%(value)s\" for option \"%(name)s\"." |
4329 | 4239 | msgstr "" | 4244 | msgstr "" |
4330 | 4240 | 4245 | ||
4332 | 4241 | #: bzrlib/errors.py:1815 | 4246 | #: bzrlib/errors.py:1822 |
4333 | 4242 | msgid "%(username)r does not seem to contain a reasonable email address" | 4247 | msgid "%(username)r does not seem to contain a reasonable email address" |
4334 | 4243 | msgstr "" | 4248 | msgstr "" |
4335 | 4244 | 4249 | ||
4337 | 4245 | #: bzrlib/errors.py:1824 | 4250 | #: bzrlib/errors.py:1831 |
4338 | 4246 | msgid "Failed to GPG sign data with command \"%(command_line)s\"" | 4251 | msgid "Failed to GPG sign data with command \"%(command_line)s\"" |
4339 | 4247 | msgstr "" | 4252 | msgstr "" |
4340 | 4248 | 4253 | ||
4342 | 4249 | #: bzrlib/errors.py:1832 | 4254 | #: bzrlib/errors.py:1839 |
4343 | 4250 | msgid "Failed to verify GPG signature data with error \"%(error)s\"" | 4255 | msgid "Failed to verify GPG signature data with error \"%(error)s\"" |
4344 | 4251 | msgstr "" | 4256 | msgstr "" |
4345 | 4252 | 4257 | ||
4347 | 4253 | #: bzrlib/errors.py:1840 | 4258 | #: bzrlib/errors.py:1847 |
4348 | 4254 | msgid "Unable to import library \"%(library)s\": %(error)s" | 4259 | msgid "Unable to import library \"%(library)s\": %(error)s" |
4349 | 4255 | msgstr "" | 4260 | msgstr "" |
4350 | 4256 | 4261 | ||
4352 | 4257 | #: bzrlib/errors.py:1848 | 4262 | #: bzrlib/errors.py:1855 |
4353 | 4258 | msgid "python-gpgme is not installed, it is needed to verify signatures" | 4263 | msgid "python-gpgme is not installed, it is needed to verify signatures" |
4354 | 4259 | msgstr "" | 4264 | msgstr "" |
4355 | 4260 | 4265 | ||
4357 | 4261 | #: bzrlib/errors.py:1856 | 4266 | #: bzrlib/errors.py:1863 |
4358 | 4262 | msgid "" | 4267 | msgid "" |
4359 | 4263 | "The working tree for %(basedir)s has changed since the last commit, but " | 4268 | "The working tree for %(basedir)s has changed since the last commit, but " |
4360 | 4264 | "weave merge requires that it be unchanged" | 4269 | "weave merge requires that it be unchanged" |
4361 | 4265 | msgstr "" | 4270 | msgstr "" |
4362 | 4266 | 4271 | ||
4364 | 4267 | #: bzrlib/errors.py:1866 | 4272 | #: bzrlib/errors.py:1873 |
4365 | 4268 | msgid "" | 4273 | msgid "" |
4366 | 4269 | "Can't reprocess and show base, because reprocessing obscures the " | 4274 | "Can't reprocess and show base, because reprocessing obscures the " |
4367 | 4270 | "relationship of conflicting lines to the base" | 4275 | "relationship of conflicting lines to the base" |
4368 | 4271 | msgstr "" | 4276 | msgstr "" |
4369 | 4272 | 4277 | ||
4371 | 4273 | #: bzrlib/errors.py:1872 | 4278 | #: bzrlib/errors.py:1879 |
4372 | 4274 | msgid "Cycle in graph %(graph)r" | 4279 | msgid "Cycle in graph %(graph)r" |
4373 | 4275 | msgstr "" | 4280 | msgstr "" |
4374 | 4276 | 4281 | ||
4376 | 4277 | #: bzrlib/errors.py:1900 | 4282 | #: bzrlib/errors.py:1907 |
4377 | 4278 | msgid "File %(filename)s is not conflicted." | 4283 | msgid "File %(filename)s is not conflicted." |
4378 | 4279 | msgstr "" | 4284 | msgstr "" |
4379 | 4280 | 4285 | ||
4381 | 4281 | #: bzrlib/errors.py:1922 | 4286 | #: bzrlib/errors.py:1929 |
4382 | 4282 | msgid "No bundle was found in \"%(filename)s\"." | 4287 | msgid "No bundle was found in \"%(filename)s\"." |
4383 | 4283 | msgstr "" | 4288 | msgstr "" |
4384 | 4284 | 4289 | ||
4386 | 4285 | #: bzrlib/errors.py:1931 | 4290 | #: bzrlib/errors.py:1938 |
4387 | 4286 | msgid "Unable to handle bundle version %(version)s: %(msg)s" | 4291 | msgid "Unable to handle bundle version %(version)s: %(msg)s" |
4388 | 4287 | msgstr "" | 4292 | msgstr "" |
4389 | 4288 | 4293 | ||
4391 | 4289 | #: bzrlib/errors.py:1941 | 4294 | #: bzrlib/errors.py:1948 |
4392 | 4290 | msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s" | 4295 | msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s" |
4393 | 4291 | msgstr "" | 4296 | msgstr "" |
4394 | 4292 | 4297 | ||
4396 | 4293 | #: bzrlib/errors.py:1954 | 4298 | #: bzrlib/errors.py:1961 |
4397 | 4294 | msgid "File id {%(file_id)s} already exists in inventory as %(entry)s" | 4299 | msgid "File id {%(file_id)s} already exists in inventory as %(entry)s" |
4398 | 4295 | msgstr "" | 4300 | msgstr "" |
4399 | 4296 | 4301 | ||
4401 | 4297 | #: bzrlib/errors.py:1964 | 4302 | #: bzrlib/errors.py:1971 |
4402 | 4298 | msgid "Key %(key)s is already present in map" | 4303 | msgid "Key %(key)s is already present in map" |
4403 | 4299 | msgstr "" | 4304 | msgstr "" |
4404 | 4300 | 4305 | ||
4406 | 4301 | #: bzrlib/errors.py:1969 | 4306 | #: bzrlib/errors.py:1976 |
4407 | 4302 | msgid "The prefix %(prefix)s is in the help search path twice." | 4307 | msgid "The prefix %(prefix)s is in the help search path twice." |
4408 | 4303 | msgstr "" | 4308 | msgstr "" |
4409 | 4304 | 4309 | ||
4411 | 4305 | #: bzrlib/errors.py:1977 | 4310 | #: bzrlib/errors.py:1984 |
4412 | 4306 | msgid "Tree transform is malformed %(conflicts)r" | 4311 | msgid "Tree transform is malformed %(conflicts)r" |
4413 | 4307 | msgstr "" | 4312 | msgstr "" |
4414 | 4308 | 4313 | ||
4416 | 4309 | #: bzrlib/errors.py:1979 | 4314 | #: bzrlib/errors.py:1986 |
4417 | 4310 | msgid "" | 4315 | msgid "" |
4418 | 4311 | "No final name for trans_id %(trans_id)r\n" | 4316 | "No final name for trans_id %(trans_id)r\n" |
4419 | 4312 | "file-id: %(file_id)r\n" | 4317 | "file-id: %(file_id)r\n" |
4420 | 4313 | "root trans-id: %(root_trans_id)r\n" | 4318 | "root trans-id: %(root_trans_id)r\n" |
4421 | 4314 | msgstr "" | 4319 | msgstr "" |
4422 | 4315 | 4320 | ||
4424 | 4316 | #: bzrlib/errors.py:2011 | 4321 | #: bzrlib/errors.py:2018 |
4425 | 4317 | msgid "Attempt to reuse a transform that has already been applied." | 4322 | msgid "Attempt to reuse a transform that has already been applied." |
4426 | 4318 | msgstr "" | 4323 | msgstr "" |
4427 | 4319 | 4324 | ||
4429 | 4320 | #: bzrlib/errors.py:2016 | 4325 | #: bzrlib/errors.py:2023 |
4430 | 4321 | msgid "Moving the root directory is not supported at this time" | 4326 | msgid "Moving the root directory is not supported at this time" |
4431 | 4322 | msgstr "" | 4327 | msgstr "" |
4432 | 4323 | 4328 | ||
4434 | 4324 | #: bzrlib/errors.py:2021 | 4329 | #: bzrlib/errors.py:2028 |
4435 | 4325 | msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s" | 4330 | msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s" |
4436 | 4326 | msgstr "" | 4331 | msgstr "" |
4437 | 4327 | 4332 | ||
4439 | 4328 | #: bzrlib/errors.py:2032 | 4333 | #: bzrlib/errors.py:2039 |
4440 | 4329 | msgid "" | 4334 | msgid "" |
4441 | 4330 | "Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" | 4335 | "Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" |
4442 | 4331 | msgstr "" | 4336 | msgstr "" |
4443 | 4332 | 4337 | ||
4445 | 4333 | #: bzrlib/errors.py:2068 | 4338 | #: bzrlib/errors.py:2075 |
4446 | 4334 | msgid "" | 4339 | msgid "" |
4447 | 4335 | "Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" | 4340 | "Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" |
4448 | 4336 | msgstr "" | 4341 | msgstr "" |
4449 | 4337 | 4342 | ||
4451 | 4338 | #: bzrlib/errors.py:2077 | 4343 | #: bzrlib/errors.py:2084 |
4452 | 4339 | msgid "" | 4344 | msgid "" |
4453 | 4340 | "Can't safely remove modified or unknown files:\n" | 4345 | "Can't safely remove modified or unknown files:\n" |
4454 | 4341 | "%(changes_as_text)sUse --keep to not delete them, or --force to delete them " | 4346 | "%(changes_as_text)sUse --keep to not delete them, or --force to delete them " |
4455 | 4342 | "regardless." | 4347 | "regardless." |
4456 | 4343 | msgstr "" | 4348 | msgstr "" |
4457 | 4344 | 4349 | ||
4459 | 4345 | #: bzrlib/errors.py:2114 | 4350 | #: bzrlib/errors.py:2121 |
4460 | 4346 | msgid "Unable to import paramiko (required for sftp support): %(error)s" | 4351 | msgid "Unable to import paramiko (required for sftp support): %(error)s" |
4461 | 4347 | msgstr "" | 4352 | msgstr "" |
4462 | 4348 | 4353 | ||
4464 | 4349 | #: bzrlib/errors.py:2122 | 4354 | #: bzrlib/errors.py:2129 |
4465 | 4350 | msgid "Nothing to merge." | 4355 | msgid "Nothing to merge." |
4466 | 4351 | msgstr "" | 4356 | msgstr "" |
4467 | 4352 | 4357 | ||
4469 | 4353 | #: bzrlib/errors.py:2127 | 4358 | #: bzrlib/errors.py:2134 |
4470 | 4354 | msgid "Format %(format)s cannot be initialised by this version of bzr." | 4359 | msgid "Format %(format)s cannot be initialised by this version of bzr." |
4471 | 4355 | msgstr "" | 4360 | msgstr "" |
4472 | 4356 | 4361 | ||
4474 | 4357 | #: bzrlib/errors.py:2136 | 4362 | #: bzrlib/errors.py:2143 |
4475 | 4358 | msgid "" | 4363 | msgid "" |
4476 | 4359 | "Cannot convert from format %(from_format)s to format %(format)s. " | 4364 | "Cannot convert from format %(from_format)s to format %(format)s. " |
4477 | 4360 | "%(problem)s" | 4365 | "%(problem)s" |
4478 | 4361 | msgstr "" | 4366 | msgstr "" |
4479 | 4362 | 4367 | ||
4481 | 4363 | #: bzrlib/errors.py:2148 | 4368 | #: bzrlib/errors.py:2155 |
4482 | 4364 | msgid "Could not find an appropriate Differ for file \"%(path)s\"" | 4369 | msgid "Could not find an appropriate Differ for file \"%(path)s\"" |
4483 | 4365 | msgstr "" | 4370 | msgstr "" |
4484 | 4366 | 4371 | ||
4486 | 4367 | #: bzrlib/errors.py:2156 | 4372 | #: bzrlib/errors.py:2163 |
4487 | 4368 | msgid "%(exe_name)s could not be found on this machine" | 4373 | msgid "%(exe_name)s could not be found on this machine" |
4488 | 4369 | msgstr "" | 4374 | msgstr "" |
4489 | 4370 | 4375 | ||
4491 | 4371 | #: bzrlib/errors.py:2164 | 4376 | #: bzrlib/errors.py:2171 |
4492 | 4372 | msgid "Diff is not installed on this machine: %(msg)s" | 4377 | msgid "Diff is not installed on this machine: %(msg)s" |
4493 | 4373 | msgstr "" | 4378 | msgstr "" |
4494 | 4374 | 4379 | ||
4496 | 4375 | #: bzrlib/errors.py:2172 | 4380 | #: bzrlib/errors.py:2179 |
4497 | 4376 | msgid "Diff3 is not installed on this machine." | 4381 | msgid "Diff3 is not installed on this machine." |
4498 | 4377 | msgstr "" | 4382 | msgstr "" |
4499 | 4378 | 4383 | ||
4501 | 4379 | #: bzrlib/errors.py:2178 | 4384 | #: bzrlib/errors.py:2185 |
4502 | 4380 | msgid "The content being inserted is already present." | 4385 | msgid "The content being inserted is already present." |
4503 | 4381 | msgstr "" | 4386 | msgstr "" |
4504 | 4382 | 4387 | ||
4506 | 4383 | #: bzrlib/errors.py:2183 | 4388 | #: bzrlib/errors.py:2190 |
4507 | 4384 | msgid "" | 4389 | msgid "" |
4508 | 4385 | "This tree contains left-over files from a failed operation.\n" | 4390 | "This tree contains left-over files from a failed operation.\n" |
4509 | 4386 | " Please examine %(limbo_dir)s to see if it contains any files you wish " | 4391 | " Please examine %(limbo_dir)s to see if it contains any files you wish " |
4510 | @@ -4388,14 +4393,14 @@ | |||
4511 | 4388 | " keep, and delete it when you are done." | 4393 | " keep, and delete it when you are done." |
4512 | 4389 | msgstr "" | 4394 | msgstr "" |
4513 | 4390 | 4395 | ||
4515 | 4391 | #: bzrlib/errors.py:2194 | 4396 | #: bzrlib/errors.py:2201 |
4516 | 4392 | msgid "" | 4397 | msgid "" |
4517 | 4393 | "This tree contains left-over files from a failed operation.\n" | 4398 | "This tree contains left-over files from a failed operation.\n" |
4518 | 4394 | " Please examine %(pending_deletion)s to see if it contains any files you\n" | 4399 | " Please examine %(pending_deletion)s to see if it contains any files you\n" |
4519 | 4395 | " wish to keep, and delete it when you are done." | 4400 | " wish to keep, and delete it when you are done." |
4520 | 4396 | msgstr "" | 4401 | msgstr "" |
4521 | 4397 | 4402 | ||
4523 | 4398 | #: bzrlib/errors.py:2204 | 4403 | #: bzrlib/errors.py:2211 |
4524 | 4399 | msgid "" | 4404 | msgid "" |
4525 | 4400 | "Unable to delete transform temporary directory %(limbo_dir)s.\n" | 4405 | "Unable to delete transform temporary directory %(limbo_dir)s.\n" |
4526 | 4401 | " Please examine %(limbo_dir)s to see if it contains any files you wish " | 4406 | " Please examine %(limbo_dir)s to see if it contains any files you wish " |
4527 | @@ -4403,487 +4408,497 @@ | |||
4528 | 4403 | " keep, and delete it when you are done." | 4408 | " keep, and delete it when you are done." |
4529 | 4404 | msgstr "" | 4409 | msgstr "" |
4530 | 4405 | 4410 | ||
4532 | 4406 | #: bzrlib/errors.py:2215 | 4411 | #: bzrlib/errors.py:2222 |
4533 | 4407 | msgid "" | 4412 | msgid "" |
4534 | 4408 | "Unable to delete transform temporary directory %(pending_deletion)s. Please " | 4413 | "Unable to delete transform temporary directory %(pending_deletion)s. Please " |
4535 | 4409 | "examine %(pending_deletion)s to see if it contains any files you wish to " | 4414 | "examine %(pending_deletion)s to see if it contains any files you wish to " |
4536 | 4410 | "keep, and delete it when you are done." | 4415 | "keep, and delete it when you are done." |
4537 | 4411 | msgstr "" | 4416 | msgstr "" |
4538 | 4412 | 4417 | ||
4540 | 4413 | #: bzrlib/errors.py:2225 | 4418 | #: bzrlib/errors.py:2232 |
4541 | 4414 | msgid "Working tree is out of date, please run 'bzr update'.%(more)s" | 4419 | msgid "Working tree is out of date, please run 'bzr update'.%(more)s" |
4542 | 4415 | msgstr "" | 4420 | msgstr "" |
4543 | 4416 | 4421 | ||
4545 | 4417 | #: bzrlib/errors.py:2239 | 4422 | #: bzrlib/errors.py:2246 |
4546 | 4418 | msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"." | 4423 | msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"." |
4547 | 4419 | msgstr "" | 4424 | msgstr "" |
4548 | 4420 | 4425 | ||
4550 | 4421 | #: bzrlib/errors.py:2252 | 4426 | #: bzrlib/errors.py:2259 |
4551 | 4422 | msgid "Error in merge modified format" | 4427 | msgid "Error in merge modified format" |
4552 | 4423 | msgstr "" | 4428 | msgstr "" |
4553 | 4424 | 4429 | ||
4555 | 4425 | #: bzrlib/errors.py:2257 | 4430 | #: bzrlib/errors.py:2264 |
4556 | 4426 | msgid "Format error in conflict listings" | 4431 | msgid "Format error in conflict listings" |
4557 | 4427 | msgstr "" | 4432 | msgstr "" |
4558 | 4428 | 4433 | ||
4560 | 4429 | #: bzrlib/errors.py:2261 | 4434 | #: bzrlib/errors.py:2268 |
4561 | 4430 | msgid "" | 4435 | msgid "" |
4562 | 4431 | "Inconsistency in dirstate file %(dirstate_path)s.\n" | 4436 | "Inconsistency in dirstate file %(dirstate_path)s.\n" |
4563 | 4432 | "Error: %(description)s" | 4437 | "Error: %(description)s" |
4564 | 4433 | msgstr "" | 4438 | msgstr "" |
4565 | 4434 | 4439 | ||
4567 | 4435 | #: bzrlib/errors.py:2272 | 4440 | #: bzrlib/errors.py:2279 |
4568 | 4436 | msgid "" | 4441 | msgid "" |
4569 | 4437 | "An error has been detected in the repository %(repo_path)s.\n" | 4442 | "An error has been detected in the repository %(repo_path)s.\n" |
4570 | 4438 | "Please run bzr reconcile on this repository." | 4443 | "Please run bzr reconcile on this repository." |
4571 | 4439 | msgstr "" | 4444 | msgstr "" |
4572 | 4440 | 4445 | ||
4574 | 4441 | #: bzrlib/errors.py:2283 | 4446 | #: bzrlib/errors.py:2290 |
4575 | 4442 | msgid "" | 4447 | msgid "" |
4576 | 4443 | "An inconsistent delta was supplied involving %(path)r, %(file_id)r\n" | 4448 | "An inconsistent delta was supplied involving %(path)r, %(file_id)r\n" |
4577 | 4444 | "reason: %(reason)s" | 4449 | "reason: %(reason)s" |
4578 | 4445 | msgstr "" | 4450 | msgstr "" |
4579 | 4446 | 4451 | ||
4581 | 4447 | #: bzrlib/errors.py:2296 | 4452 | #: bzrlib/errors.py:2303 |
4582 | 4448 | msgid "" | 4453 | msgid "" |
4583 | 4449 | "An inconsistent delta was supplied: %(delta)r\n" | 4454 | "An inconsistent delta was supplied: %(delta)r\n" |
4584 | 4450 | "reason: %(reason)s" | 4455 | "reason: %(reason)s" |
4585 | 4451 | msgstr "" | 4456 | msgstr "" |
4586 | 4452 | 4457 | ||
4588 | 4453 | #: bzrlib/errors.py:2308 | 4458 | #: bzrlib/errors.py:2315 |
4589 | 4454 | msgid "To use this feature you must upgrade your branch at %(path)s." | 4459 | msgid "To use this feature you must upgrade your branch at %(path)s." |
4590 | 4455 | msgstr "" | 4460 | msgstr "" |
4591 | 4456 | 4461 | ||
4593 | 4457 | #: bzrlib/errors.py:2317 | 4462 | #: bzrlib/errors.py:2324 |
4594 | 4458 | msgid "To use this feature you must upgrade your repository at %(path)s." | 4463 | msgid "To use this feature you must upgrade your repository at %(path)s." |
4595 | 4459 | msgstr "" | 4464 | msgstr "" |
4596 | 4460 | 4465 | ||
4598 | 4461 | #: bzrlib/errors.py:2322 | 4466 | #: bzrlib/errors.py:2329 |
4599 | 4462 | msgid "" | 4467 | msgid "" |
4600 | 4463 | "To use this feature you must upgrade your branch at %(path)s to a format " | 4468 | "To use this feature you must upgrade your branch at %(path)s to a format " |
4601 | 4464 | "which supports rich roots." | 4469 | "which supports rich roots." |
4602 | 4465 | msgstr "" | 4470 | msgstr "" |
4603 | 4466 | 4471 | ||
4605 | 4467 | #: bzrlib/errors.py:2328 | 4472 | #: bzrlib/errors.py:2335 |
4606 | 4468 | msgid "Cannot perform local-only commits on unbound branches." | 4473 | msgid "Cannot perform local-only commits on unbound branches." |
4607 | 4469 | msgstr "" | 4474 | msgstr "" |
4608 | 4470 | 4475 | ||
4610 | 4471 | #: bzrlib/errors.py:2333 | 4476 | #: bzrlib/errors.py:2340 |
4611 | 4472 | msgid "The method %(mname)s is not supported on objects of type %(tname)s." | 4477 | msgid "The method %(mname)s is not supported on objects of type %(tname)s." |
4612 | 4473 | msgstr "" | 4478 | msgstr "" |
4613 | 4474 | 4479 | ||
4615 | 4475 | #: bzrlib/errors.py:2354 | 4480 | #: bzrlib/errors.py:2361 |
4616 | 4481 | msgid "Ghost tags not supported by format %(format)r." | ||
4617 | 4482 | msgstr "" | ||
4618 | 4483 | |||
4619 | 4484 | #: bzrlib/errors.py:2369 | ||
4620 | 4476 | msgid "File is binary but should be text." | 4485 | msgid "File is binary but should be text." |
4621 | 4477 | msgstr "" | 4486 | msgstr "" |
4622 | 4478 | 4487 | ||
4624 | 4479 | #: bzrlib/errors.py:2359 | 4488 | #: bzrlib/errors.py:2374 |
4625 | 4480 | msgid "The path %(path)s is not permitted on this platform" | 4489 | msgid "The path %(path)s is not permitted on this platform" |
4626 | 4481 | msgstr "" | 4490 | msgstr "" |
4627 | 4482 | 4491 | ||
4629 | 4483 | #: bzrlib/errors.py:2368 | 4492 | #: bzrlib/errors.py:2383 |
4630 | 4484 | msgid "" | 4493 | msgid "" |
4631 | 4485 | "Testament did not match expected value.\n" | 4494 | "Testament did not match expected value.\n" |
4632 | 4486 | " For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n" | 4495 | " For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n" |
4633 | 4487 | " {%(measured)s}" | 4496 | " {%(measured)s}" |
4634 | 4488 | msgstr "" | 4497 | msgstr "" |
4635 | 4489 | 4498 | ||
4637 | 4490 | #: bzrlib/errors.py:2380 | 4499 | #: bzrlib/errors.py:2395 |
4638 | 4491 | msgid "Not a bzr revision-bundle: %(text)r" | 4500 | msgid "Not a bzr revision-bundle: %(text)r" |
4639 | 4492 | msgstr "" | 4501 | msgstr "" |
4640 | 4493 | 4502 | ||
4642 | 4494 | #: bzrlib/errors.py:2389 | 4503 | #: bzrlib/errors.py:2404 |
4643 | 4495 | msgid "Bad bzr revision-bundle: %(text)r" | 4504 | msgid "Bad bzr revision-bundle: %(text)r" |
4644 | 4496 | msgstr "" | 4505 | msgstr "" |
4645 | 4497 | 4506 | ||
4647 | 4498 | #: bzrlib/errors.py:2398 | 4507 | #: bzrlib/errors.py:2413 |
4648 | 4499 | msgid "Malformed bzr revision-bundle header: %(text)r" | 4508 | msgid "Malformed bzr revision-bundle header: %(text)r" |
4649 | 4500 | msgstr "" | 4509 | msgstr "" |
4650 | 4501 | 4510 | ||
4652 | 4502 | #: bzrlib/errors.py:2403 | 4511 | #: bzrlib/errors.py:2418 |
4653 | 4503 | msgid "Malformed patches in bzr revision-bundle: %(text)r" | 4512 | msgid "Malformed patches in bzr revision-bundle: %(text)r" |
4654 | 4504 | msgstr "" | 4513 | msgstr "" |
4655 | 4505 | 4514 | ||
4657 | 4506 | #: bzrlib/errors.py:2408 | 4515 | #: bzrlib/errors.py:2423 |
4658 | 4507 | msgid "Malformed footer in bzr revision-bundle: %(text)r" | 4516 | msgid "Malformed footer in bzr revision-bundle: %(text)r" |
4659 | 4508 | msgstr "" | 4517 | msgstr "" |
4660 | 4509 | 4518 | ||
4662 | 4510 | #: bzrlib/errors.py:2413 | 4519 | #: bzrlib/errors.py:2428 |
4663 | 4511 | msgid "End of line marker was not \\n in bzr revision-bundle" | 4520 | msgid "End of line marker was not \\n in bzr revision-bundle" |
4664 | 4512 | msgstr "" | 4521 | msgstr "" |
4665 | 4513 | 4522 | ||
4667 | 4514 | #: bzrlib/errors.py:2423 | 4523 | #: bzrlib/errors.py:2438 |
4668 | 4515 | msgid "Bundle format %(bundle_format)s is incompatible with %(other)s" | 4524 | msgid "Bundle format %(bundle_format)s is incompatible with %(other)s" |
4669 | 4516 | msgstr "" | 4525 | msgstr "" |
4670 | 4517 | 4526 | ||
4672 | 4518 | #: bzrlib/errors.py:2433 | 4527 | #: bzrlib/errors.py:2448 |
4673 | 4519 | msgid "Root class for inventory serialization errors" | 4528 | msgid "Root class for inventory serialization errors" |
4674 | 4520 | msgstr "" | 4529 | msgstr "" |
4675 | 4521 | 4530 | ||
4677 | 4522 | #: bzrlib/errors.py:2437 | 4531 | #: bzrlib/errors.py:2452 |
4678 | 4523 | msgid "" | 4532 | msgid "" |
4679 | 4524 | "The inventory was not in the expected format:\n" | 4533 | "The inventory was not in the expected format:\n" |
4680 | 4525 | " %(msg)s" | 4534 | " %(msg)s" |
4681 | 4526 | msgstr "" | 4535 | msgstr "" |
4682 | 4527 | 4536 | ||
4684 | 4528 | #: bzrlib/errors.py:2446 | 4537 | #: bzrlib/errors.py:2461 |
4685 | 4529 | msgid "This operation requires rich root data storage" | 4538 | msgid "This operation requires rich root data storage" |
4686 | 4530 | msgstr "" | 4539 | msgstr "" |
4687 | 4531 | 4540 | ||
4689 | 4532 | #: bzrlib/errors.py:2459 | 4541 | #: bzrlib/errors.py:2474 |
4690 | 4533 | msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s" | 4542 | msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s" |
4691 | 4534 | msgstr "" | 4543 | msgstr "" |
4692 | 4535 | 4544 | ||
4694 | 4536 | #: bzrlib/errors.py:2468 | 4545 | #: bzrlib/errors.py:2483 |
4695 | 4537 | msgid "" | 4546 | msgid "" |
4696 | 4538 | "Don't know how to handle SSH connections. Please set BZR_SSH environment " | 4547 | "Don't know how to handle SSH connections. Please set BZR_SSH environment " |
4697 | 4539 | "variable." | 4548 | "variable." |
4698 | 4540 | msgstr "" | 4549 | msgstr "" |
4699 | 4541 | 4550 | ||
4701 | 4542 | #: bzrlib/errors.py:2475 | 4551 | #: bzrlib/errors.py:2490 |
4702 | 4543 | msgid "" | 4552 | msgid "" |
4703 | 4544 | "Could not determine revno for {%(revision_id)s} because its ancestry shows a " | 4553 | "Could not determine revno for {%(revision_id)s} because its ancestry shows a " |
4704 | 4545 | "ghost at {%(ghost_revision_id)s}" | 4554 | "ghost at {%(ghost_revision_id)s}" |
4705 | 4546 | msgstr "" | 4555 | msgstr "" |
4706 | 4547 | 4556 | ||
4708 | 4548 | #: bzrlib/errors.py:2485 | 4557 | #: bzrlib/errors.py:2500 |
4709 | 4549 | msgid "Ghost revision {%(revision_id)s} cannot be used here." | 4558 | msgid "Ghost revision {%(revision_id)s} cannot be used here." |
4710 | 4550 | msgstr "" | 4559 | msgstr "" |
4711 | 4551 | 4560 | ||
4713 | 4552 | #: bzrlib/errors.py:2536 | 4561 | #: bzrlib/errors.py:2551 |
4714 | 4553 | msgid "" | 4562 | msgid "" |
4715 | 4554 | "A merge directive must provide either a bundle or a public branch location." | 4563 | "A merge directive must provide either a bundle or a public branch location." |
4716 | 4555 | msgstr "" | 4564 | msgstr "" |
4717 | 4556 | 4565 | ||
4719 | 4557 | #: bzrlib/errors.py:2543 | 4566 | #: bzrlib/errors.py:2558 |
4720 | 4558 | msgid "Bad merge directive payload %(start)r" | 4567 | msgid "Bad merge directive payload %(start)r" |
4721 | 4559 | msgstr "" | 4568 | msgstr "" |
4722 | 4560 | 4569 | ||
4724 | 4561 | #: bzrlib/errors.py:2553 | 4570 | #: bzrlib/errors.py:2568 |
4725 | 4562 | msgid "Preview patch does not match requested changes." | 4571 | msgid "Preview patch does not match requested changes." |
4726 | 4563 | msgstr "" | 4572 | msgstr "" |
4727 | 4564 | 4573 | ||
4729 | 4565 | #: bzrlib/errors.py:2559 | 4574 | #: bzrlib/errors.py:2574 |
4730 | 4566 | msgid "Patch_type was %(patch_type)s, but no patch was supplied." | 4575 | msgid "Patch_type was %(patch_type)s, but no patch was supplied." |
4731 | 4567 | msgstr "" | 4576 | msgstr "" |
4732 | 4568 | 4577 | ||
4734 | 4569 | #: bzrlib/errors.py:2569 | 4578 | #: bzrlib/errors.py:2584 |
4735 | 4570 | msgid "" | 4579 | msgid "" |
4736 | 4571 | "Your branch does not have all of the revisions required in order to merge " | 4580 | "Your branch does not have all of the revisions required in order to merge " |
4737 | 4572 | "this merge directive and the target location specified in the merge " | 4581 | "this merge directive and the target location specified in the merge " |
4738 | 4573 | "directive is not a branch: %(location)s." | 4582 | "directive is not a branch: %(location)s." |
4739 | 4574 | msgstr "" | 4583 | msgstr "" |
4740 | 4575 | 4584 | ||
4742 | 4576 | #: bzrlib/errors.py:2581 | 4585 | #: bzrlib/errors.py:2596 |
4743 | 4577 | msgid "Unsupported entry kind %(kind)s" | 4586 | msgid "Unsupported entry kind %(kind)s" |
4744 | 4578 | msgstr "" | 4587 | msgstr "" |
4745 | 4579 | 4588 | ||
4747 | 4580 | #: bzrlib/errors.py:2589 | 4589 | #: bzrlib/errors.py:2604 |
4748 | 4581 | msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s" | 4590 | msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s" |
4749 | 4582 | msgstr "" | 4591 | msgstr "" |
4750 | 4583 | 4592 | ||
4752 | 4584 | #: bzrlib/errors.py:2599 | 4593 | #: bzrlib/errors.py:2614 |
4753 | 4585 | msgid "Subsume target %(other_tree)s needs to be upgraded." | 4594 | msgid "Subsume target %(other_tree)s needs to be upgraded." |
4754 | 4586 | msgstr "" | 4595 | msgstr "" |
4755 | 4587 | 4596 | ||
4757 | 4588 | #: bzrlib/errors.py:2618 | 4597 | #: bzrlib/errors.py:2633 |
4758 | 4589 | msgid "No such tag: %(tag_name)s" | 4598 | msgid "No such tag: %(tag_name)s" |
4759 | 4590 | msgstr "" | 4599 | msgstr "" |
4760 | 4591 | 4600 | ||
4762 | 4592 | #: bzrlib/errors.py:2626 | 4601 | #: bzrlib/errors.py:2641 |
4763 | 4593 | msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade." | 4602 | msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade." |
4764 | 4594 | msgstr "" | 4603 | msgstr "" |
4765 | 4595 | 4604 | ||
4767 | 4596 | #: bzrlib/errors.py:2635 | 4605 | #: bzrlib/errors.py:2650 |
4768 | 4597 | msgid "Tag %(tag_name)s already exists." | 4606 | msgid "Tag %(tag_name)s already exists." |
4769 | 4598 | msgstr "" | 4607 | msgstr "" |
4770 | 4599 | 4608 | ||
4772 | 4600 | #: bzrlib/errors.py:2643 | 4609 | #: bzrlib/errors.py:2658 |
4773 | 4601 | msgid "" | 4610 | msgid "" |
4774 | 4602 | "Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs" | 4611 | "Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs" |
4775 | 4603 | "\" for more information on this feature." | 4612 | "\" for more information on this feature." |
4776 | 4604 | msgstr "" | 4613 | msgstr "" |
4777 | 4605 | 4614 | ||
4779 | 4606 | #: bzrlib/errors.py:2653 | 4615 | #: bzrlib/errors.py:2668 |
4780 | 4607 | msgid "" | 4616 | msgid "" |
4781 | 4608 | "The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s" | 4617 | "The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s" |
4782 | 4609 | msgstr "" | 4618 | msgstr "" |
4783 | 4610 | 4619 | ||
4785 | 4611 | #: bzrlib/errors.py:2663 | 4620 | #: bzrlib/errors.py:2678 |
4786 | 4612 | msgid "" | 4621 | msgid "" |
4787 | 4613 | "Cannot find registered bug tracker called %(abbreviation)s on %(branch)s" | 4622 | "Cannot find registered bug tracker called %(abbreviation)s on %(branch)s" |
4788 | 4614 | msgstr "" | 4623 | msgstr "" |
4789 | 4615 | 4624 | ||
4791 | 4616 | #: bzrlib/errors.py:2673 | 4625 | #: bzrlib/errors.py:2688 |
4792 | 4617 | msgid "Invalid line in bugs property: '%(line)s'" | 4626 | msgid "Invalid line in bugs property: '%(line)s'" |
4793 | 4618 | msgstr "" | 4627 | msgstr "" |
4794 | 4619 | 4628 | ||
4796 | 4620 | #: bzrlib/errors.py:2681 | 4629 | #: bzrlib/errors.py:2696 |
4797 | 4621 | msgid "Invalid bug status: '%(status)s'" | 4630 | msgid "Invalid bug status: '%(status)s'" |
4798 | 4622 | msgstr "" | 4631 | msgstr "" |
4799 | 4623 | 4632 | ||
4801 | 4624 | #: bzrlib/errors.py:2689 | 4633 | #: bzrlib/errors.py:2704 |
4802 | 4625 | msgid "Could not understand response from smart server: %(response_tuple)r" | 4634 | msgid "Could not understand response from smart server: %(response_tuple)r" |
4803 | 4626 | msgstr "" | 4635 | msgstr "" |
4804 | 4627 | 4636 | ||
4806 | 4628 | #: bzrlib/errors.py:2728 | 4637 | #: bzrlib/errors.py:2743 |
4807 | 4629 | msgid "Server sent an unexpected error: %(error_tuple)r" | 4638 | msgid "Server sent an unexpected error: %(error_tuple)r" |
4808 | 4630 | msgstr "" | 4639 | msgstr "" |
4809 | 4631 | 4640 | ||
4811 | 4632 | #: bzrlib/errors.py:2747 | 4641 | #: bzrlib/errors.py:2762 |
4812 | 4633 | msgid "Unrecognised container format: %(container_format)r" | 4642 | msgid "Unrecognised container format: %(container_format)r" |
4813 | 4634 | msgstr "" | 4643 | msgstr "" |
4814 | 4635 | 4644 | ||
4816 | 4636 | #: bzrlib/errors.py:2755 | 4645 | #: bzrlib/errors.py:2770 |
4817 | 4637 | msgid "Unexpected end of container stream" | 4646 | msgid "Unexpected end of container stream" |
4818 | 4638 | msgstr "" | 4647 | msgstr "" |
4819 | 4639 | 4648 | ||
4821 | 4640 | #: bzrlib/errors.py:2760 | 4649 | #: bzrlib/errors.py:2775 |
4822 | 4641 | msgid "Unknown record type: %(record_type)r" | 4650 | msgid "Unknown record type: %(record_type)r" |
4823 | 4642 | msgstr "" | 4651 | msgstr "" |
4824 | 4643 | 4652 | ||
4826 | 4644 | #: bzrlib/errors.py:2768 | 4653 | #: bzrlib/errors.py:2783 |
4827 | 4645 | msgid "Invalid record: %(reason)s" | 4654 | msgid "Invalid record: %(reason)s" |
4828 | 4646 | msgstr "" | 4655 | msgstr "" |
4829 | 4647 | 4656 | ||
4831 | 4648 | #: bzrlib/errors.py:2776 | 4657 | #: bzrlib/errors.py:2791 |
4832 | 4649 | msgid "Container has data after end marker: %(excess)r" | 4658 | msgid "Container has data after end marker: %(excess)r" |
4833 | 4650 | msgstr "" | 4659 | msgstr "" |
4834 | 4651 | 4660 | ||
4836 | 4652 | #: bzrlib/errors.py:2784 | 4661 | #: bzrlib/errors.py:2799 |
4837 | 4653 | msgid "Container has multiple records with the same name: %(name)s" | 4662 | msgid "Container has multiple records with the same name: %(name)s" |
4838 | 4654 | msgstr "" | 4663 | msgstr "" |
4839 | 4655 | 4664 | ||
4841 | 4656 | #: bzrlib/errors.py:2797 | 4665 | #: bzrlib/errors.py:2812 |
4842 | 4657 | msgid "Corrupt or incompatible data stream: %(reason)s" | 4666 | msgid "Corrupt or incompatible data stream: %(reason)s" |
4843 | 4658 | msgstr "" | 4667 | msgstr "" |
4844 | 4659 | 4668 | ||
4846 | 4660 | #: bzrlib/errors.py:2805 | 4669 | #: bzrlib/errors.py:2820 |
4847 | 4661 | msgid "SMTP error: %(error)s" | 4670 | msgid "SMTP error: %(error)s" |
4848 | 4662 | msgstr "" | 4671 | msgstr "" |
4849 | 4663 | 4672 | ||
4851 | 4664 | #: bzrlib/errors.py:2813 | 4673 | #: bzrlib/errors.py:2828 |
4852 | 4665 | msgid "No message supplied." | 4674 | msgid "No message supplied." |
4853 | 4666 | msgstr "" | 4675 | msgstr "" |
4854 | 4667 | 4676 | ||
4856 | 4668 | #: bzrlib/errors.py:2818 | 4677 | #: bzrlib/errors.py:2833 |
4857 | 4669 | msgid "No mail-to address (--mail-to) or output (-o) specified." | 4678 | msgid "No mail-to address (--mail-to) or output (-o) specified." |
4858 | 4670 | msgstr "" | 4679 | msgstr "" |
4859 | 4671 | 4680 | ||
4861 | 4672 | #: bzrlib/errors.py:2823 | 4681 | #: bzrlib/errors.py:2838 |
4862 | 4673 | msgid "Unknown mail client: %(mail_client)s" | 4682 | msgid "Unknown mail client: %(mail_client)s" |
4863 | 4674 | msgstr "" | 4683 | msgstr "" |
4864 | 4675 | 4684 | ||
4866 | 4676 | #: bzrlib/errors.py:2831 | 4685 | #: bzrlib/errors.py:2846 |
4867 | 4677 | msgid "" | 4686 | msgid "" |
4868 | 4678 | "Unable to find mail client with the following names: " | 4687 | "Unable to find mail client with the following names: " |
4869 | 4679 | "%(mail_command_list_string)s" | 4688 | "%(mail_command_list_string)s" |
4870 | 4680 | msgstr "" | 4689 | msgstr "" |
4871 | 4681 | 4690 | ||
4873 | 4682 | #: bzrlib/errors.py:2841 | 4691 | #: bzrlib/errors.py:2856 |
4874 | 4683 | msgid "SMTP connection to %(host)s refused" | 4692 | msgid "SMTP connection to %(host)s refused" |
4875 | 4684 | msgstr "" | 4693 | msgstr "" |
4876 | 4685 | 4694 | ||
4878 | 4686 | #: bzrlib/errors.py:2850 | 4695 | #: bzrlib/errors.py:2865 |
4879 | 4687 | msgid "Please specify smtp_server. No server at default %(host)s." | 4696 | msgid "Please specify smtp_server. No server at default %(host)s." |
4880 | 4688 | msgstr "" | 4697 | msgstr "" |
4881 | 4689 | 4698 | ||
4883 | 4690 | #: bzrlib/errors.py:2864 | 4699 | #: bzrlib/errors.py:2879 |
4884 | 4691 | msgid "" | 4700 | msgid "" |
4885 | 4692 | "'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-" | 4701 | "'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-" |
4886 | 4693 | "reconfigure." | 4702 | "reconfigure." |
4887 | 4694 | msgstr "" | 4703 | msgstr "" |
4888 | 4695 | 4704 | ||
4890 | 4696 | #: bzrlib/errors.py:2876 | 4705 | #: bzrlib/errors.py:2891 |
4891 | 4697 | msgid "'%(display_url)s' is already a branch." | 4706 | msgid "'%(display_url)s' is already a branch." |
4892 | 4698 | msgstr "" | 4707 | msgstr "" |
4893 | 4699 | 4708 | ||
4895 | 4700 | #: bzrlib/errors.py:2881 | 4709 | #: bzrlib/errors.py:2896 |
4896 | 4701 | msgid "'%(display_url)s' is already a tree." | 4710 | msgid "'%(display_url)s' is already a tree." |
4897 | 4702 | msgstr "" | 4711 | msgstr "" |
4898 | 4703 | 4712 | ||
4900 | 4704 | #: bzrlib/errors.py:2886 | 4713 | #: bzrlib/errors.py:2901 |
4901 | 4705 | msgid "'%(display_url)s' is already a checkout." | 4714 | msgid "'%(display_url)s' is already a checkout." |
4902 | 4706 | msgstr "" | 4715 | msgstr "" |
4903 | 4707 | 4716 | ||
4905 | 4708 | #: bzrlib/errors.py:2891 | 4717 | #: bzrlib/errors.py:2906 |
4906 | 4709 | msgid "'%(display_url)s' is already a lightweight checkout." | 4718 | msgid "'%(display_url)s' is already a lightweight checkout." |
4907 | 4710 | msgstr "" | 4719 | msgstr "" |
4908 | 4711 | 4720 | ||
4910 | 4712 | #: bzrlib/errors.py:2896 | 4721 | #: bzrlib/errors.py:2911 |
4911 | 4713 | msgid "'%(display_url)s' is already using a shared repository." | 4722 | msgid "'%(display_url)s' is already using a shared repository." |
4912 | 4714 | msgstr "" | 4723 | msgstr "" |
4913 | 4715 | 4724 | ||
4915 | 4716 | #: bzrlib/errors.py:2901 | 4725 | #: bzrlib/errors.py:2916 |
4916 | 4717 | msgid "'%(display_url)s' is already standalone." | 4726 | msgid "'%(display_url)s' is already standalone." |
4917 | 4718 | msgstr "" | 4727 | msgstr "" |
4918 | 4719 | 4728 | ||
4920 | 4720 | #: bzrlib/errors.py:2906 | 4729 | #: bzrlib/errors.py:2921 |
4921 | 4721 | msgid "Shared repository '%(display_url)s' already creates working trees." | 4730 | msgid "Shared repository '%(display_url)s' already creates working trees." |
4922 | 4722 | msgstr "" | 4731 | msgstr "" |
4923 | 4723 | 4732 | ||
4925 | 4724 | #: bzrlib/errors.py:2912 | 4733 | #: bzrlib/errors.py:2927 |
4926 | 4725 | msgid "" | 4734 | msgid "" |
4927 | 4726 | "Shared repository '%(display_url)s' already doesn't create working trees." | 4735 | "Shared repository '%(display_url)s' already doesn't create working trees." |
4928 | 4727 | msgstr "" | 4736 | msgstr "" |
4929 | 4728 | 4737 | ||
4931 | 4729 | #: bzrlib/errors.py:2918 | 4738 | #: bzrlib/errors.py:2933 |
4932 | 4730 | msgid "Requested reconfiguration of '%(display_url)s' is not supported." | 4739 | msgid "Requested reconfiguration of '%(display_url)s' is not supported." |
4933 | 4731 | msgstr "" | 4740 | msgstr "" |
4934 | 4732 | 4741 | ||
4936 | 4733 | #: bzrlib/errors.py:2923 | 4742 | #: bzrlib/errors.py:2938 |
4937 | 4734 | msgid "No location could be found to bind to at %(display_url)s." | 4743 | msgid "No location could be found to bind to at %(display_url)s." |
4938 | 4735 | msgstr "" | 4744 | msgstr "" |
4939 | 4736 | 4745 | ||
4941 | 4737 | #: bzrlib/errors.py:2928 | 4746 | #: bzrlib/errors.py:2943 |
4942 | 4738 | msgid "" | 4747 | msgid "" |
4943 | 4739 | "Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)." | 4748 | "Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)." |
4944 | 4740 | "%(more)s" | 4749 | "%(more)s" |
4945 | 4741 | msgstr "" | 4750 | msgstr "" |
4946 | 4742 | 4751 | ||
4948 | 4743 | #: bzrlib/errors.py:2947 | 4752 | #: bzrlib/errors.py:2962 |
4949 | 4744 | msgid "" | 4753 | msgid "" |
4950 | 4745 | "Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)." | 4754 | "Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)." |
4951 | 4746 | "%(more)s" | 4755 | "%(more)s" |
4952 | 4747 | msgstr "" | 4756 | msgstr "" |
4953 | 4748 | 4757 | ||
4955 | 4749 | #: bzrlib/errors.py:2953 | 4758 | #: bzrlib/errors.py:2968 |
4956 | 4750 | msgid "Variable {%(name)s} is not available." | 4759 | msgid "Variable {%(name)s} is not available." |
4957 | 4751 | msgstr "" | 4760 | msgstr "" |
4958 | 4752 | 4761 | ||
4960 | 4753 | #: bzrlib/errors.py:2961 | 4762 | #: bzrlib/errors.py:2976 |
4961 | 4754 | msgid "No template specified." | 4763 | msgid "No template specified." |
4962 | 4755 | msgstr "" | 4764 | msgstr "" |
4963 | 4756 | 4765 | ||
4965 | 4757 | #: bzrlib/errors.py:2966 | 4766 | #: bzrlib/errors.py:2981 |
4966 | 4758 | msgid "Unable to create symlink %(path_str)son this platform" | 4767 | msgid "Unable to create symlink %(path_str)son this platform" |
4967 | 4759 | msgstr "" | 4768 | msgstr "" |
4968 | 4760 | 4769 | ||
4970 | 4761 | #: bzrlib/errors.py:2981 | 4770 | #: bzrlib/errors.py:2996 |
4971 | 4762 | msgid "" | 4771 | msgid "" |
4972 | 4763 | "Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original" | 4772 | "Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original" |
4973 | 4764 | "\", \"local\"." | 4773 | "\", \"local\"." |
4974 | 4765 | msgstr "" | 4774 | msgstr "" |
4975 | 4766 | 4775 | ||
4977 | 4767 | #: bzrlib/errors.py:3015 | 4776 | #: bzrlib/errors.py:3030 |
4978 | 4768 | msgid "" | 4777 | msgid "" |
4979 | 4769 | "Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s" | 4778 | "Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s" |
4980 | 4770 | msgstr "" | 4779 | msgstr "" |
4981 | 4771 | 4780 | ||
4983 | 4772 | #: bzrlib/errors.py:3027 | 4781 | #: bzrlib/errors.py:3042 |
4984 | 4773 | msgid "The \"%(config_id)s\" configuration does not exist." | 4782 | msgid "The \"%(config_id)s\" configuration does not exist." |
4985 | 4774 | msgstr "" | 4783 | msgstr "" |
4986 | 4775 | 4784 | ||
4988 | 4776 | #: bzrlib/errors.py:3035 | 4785 | #: bzrlib/errors.py:3050 |
4989 | 4777 | msgid "The \"%(option_name)s\" configuration option does not exist." | 4786 | msgid "The \"%(option_name)s\" configuration option does not exist." |
4990 | 4778 | msgstr "" | 4787 | msgstr "" |
4991 | 4779 | 4788 | ||
4993 | 4780 | #: bzrlib/errors.py:3043 | 4789 | #: bzrlib/errors.py:3058 |
4994 | 4781 | msgid "The alias \"%(alias_name)s\" does not exist." | 4790 | msgid "The alias \"%(alias_name)s\" does not exist." |
4995 | 4782 | msgstr "" | 4791 | msgstr "" |
4996 | 4783 | 4792 | ||
4998 | 4784 | #: bzrlib/errors.py:3057 | 4793 | #: bzrlib/errors.py:3072 |
4999 | 4785 | msgid "\"%(alias_name)s\" is not a valid location alias." | 4794 | msgid "\"%(alias_name)s\" is not a valid location alias." |
5000 | 4786 | msgstr "" | 4795 | msgstr "" |
The diff has been truncated for viewing.
Should this also be guarded against initializing i18n twice?