« back to all changes in this revision
Viewing changes to po/ar.po
- browse files at revision 6574.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6574.1.1
- Committer: John Arbash Meinel
- Date: 2013-05-23 10:04:17 UTC
- mfrom: (6437.63.11 2.5)
- mto: This revision was merged to the branch mainline in revision 6575.
- Revision ID: john@arbash-meinel.com-20130523100417-i38zikta14q2xdyz
Merge lp:bzr/2.5 tip and move up the changelog items.
- files added:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- files modified:
- .bzrignore
added
removed
po/ar.po
1
# Arabic translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-02-21 11:04+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Arabic <ar@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
18
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19
"X-Launchpad-Export-Date: 2012-02-22 06:50+0000\n"
20
"X-Generator: Launchpad (build 14838)\n"
21
22
#: bzrlib/add.py:95
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr ""
25
26
#: bzrlib/branch.py:872
27
msgid "Unstacking"
28
msgstr ""
29
30
#: bzrlib/branch.py:3205
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr ""
34
35
#: bzrlib/branch.py:3207
36
#, python-format
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] ""
40
msgstr[1] ""
41
42
#: bzrlib/branch.py:3210
43
msgid "No new revisions or tags to push."
44
msgstr ""
45
46
#: bzrlib/branch.py:3212
47
msgid "No new revisions to push."
48
msgstr ""
49
50
#: bzrlib/branch.py:3232
51
msgid "checked branch {0} format {1}"
52
msgstr ""
53
54
#: bzrlib/branch.py:3235
55
#, python-format
56
msgid "found error:%s"
57
msgstr ""
58
59
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
60
#, python-format
61
msgid "Ignoring files outside view. View is %s"
62
msgstr ""
63
64
#: bzrlib/builtins.py:218
65
#, python-format
66
msgid "bzr %s --revision takes exactly one revision identifier"
67
msgstr ""
68
69
#: bzrlib/builtins.py:303
70
msgid "Display status summary."
71
msgstr ""
72
73
#: bzrlib/builtins.py:305
74
msgid ""
75
"This reports on versioned and unknown files, reporting them\n"
76
"grouped by state. Possible states are:"
77
msgstr ""
78
79
#: bzrlib/builtins.py:308
80
msgid ""
81
"added\n"
82
" Versioned in the working copy but not in the previous revision."
83
msgstr ""
84
85
#: bzrlib/builtins.py:311
86
msgid ""
87
"removed\n"
88
" Versioned in the previous revision but removed or deleted\n"
89
" in the working copy."
90
msgstr ""
91
92
#: bzrlib/builtins.py:315
93
msgid ""
94
"renamed\n"
95
" Path of this file changed from the previous revision;\n"
96
" the text may also have changed. This includes files whose\n"
97
" parent directory was renamed."
98
msgstr ""
99
100
#: bzrlib/builtins.py:320
101
msgid ""
102
"modified\n"
103
" Text has changed since the previous revision."
104
msgstr ""
105
106
#: bzrlib/builtins.py:323
107
msgid ""
108
"kind changed\n"
109
" File kind has been changed (e.g. from file to directory)."
110
msgstr ""
111
112
#: bzrlib/builtins.py:326
113
msgid ""
114
"unknown\n"
115
" Not versioned and not matching an ignore pattern."
116
msgstr ""
117
118
#: bzrlib/builtins.py:329
119
msgid ""
120
"Additionally for directories, symlinks and files with a changed\n"
121
"executable bit, Bazaar indicates their type using a trailing\n"
122
"character: '/', '@' or '*' respectively. These decorations can be\n"
123
"disabled using the '--no-classify' option."
124
msgstr ""
125
126
#: bzrlib/builtins.py:334
127
msgid ""
128
"To see ignored files use 'bzr ignored'. For details on the\n"
129
"changes to file texts, use 'bzr diff'."
130
msgstr ""
131
132
#: bzrlib/builtins.py:337
133
msgid ""
134
"Note that --short or -S gives status flags for each item, similar\n"
135
"to Subversion's status command. To get output similar to svn -q,\n"
136
"use bzr status -SV."
137
msgstr ""
138
139
#: bzrlib/builtins.py:341
140
msgid ""
141
"If no arguments are specified, the status of the entire working\n"
142
"directory is shown. Otherwise, only the status of the specified\n"
143
"files or directories is reported. If a directory is given, status\n"
144
"is reported for everything inside that directory."
145
msgstr ""
146
147
#: bzrlib/builtins.py:346
148
msgid ""
149
"Before merges are committed, the pending merge tip revisions are\n"
150
"shown. To see all pending merge revisions, use the -v option.\n"
151
"To skip the display of pending merge information altogether, use\n"
152
"the no-pending option or specify a file/directory."
153
msgstr ""
154
155
#: bzrlib/builtins.py:351
156
msgid ""
157
"To compare the working directory to a specific revision, pass a\n"
158
"single revision to the revision argument."
159
msgstr ""
160
161
#: bzrlib/builtins.py:354
162
msgid ""
163
"To see which files have changed in a specific revision, or between\n"
164
"two revisions, pass a revision range to the revision argument.\n"
165
"This will produce the same results as calling 'bzr diff --summarize'."
166
msgstr ""
167
168
#: bzrlib/builtins.py:363
169
msgid "Use short status indicators."
170
msgstr ""
171
172
#: bzrlib/builtins.py:365
173
msgid "Only show versioned files."
174
msgstr ""
175
176
#: bzrlib/builtins.py:367
177
msgid "Don't show pending merges."
178
msgstr ""
179
180
#: bzrlib/builtins.py:370
181
msgid "Do not mark object type using indicator."
182
msgstr ""
183
184
#: bzrlib/builtins.py:385
185
msgid "bzr status --revision takes exactly one or two revision specifiers"
186
msgstr ""
187
188
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
189
msgid "You can only supply one of revision_id or --revision"
190
msgstr ""
191
192
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
193
msgid "You must supply either --revision or a revision_id"
194
msgstr ""
195
196
#: bzrlib/builtins.py:439
197
#, python-format
198
msgid "Repository %r does not support access to raw revision texts"
199
msgstr ""
200
201
#: bzrlib/builtins.py:450
202
msgid "The repository {0} contains no revision {1}."
203
msgstr ""
204
205
#: bzrlib/builtins.py:457
206
msgid "You cannot specify a NULL revision."
207
msgstr ""
208
209
#: bzrlib/builtins.py:549
210
msgid "Remove the working tree from a given branch/checkout."
211
msgstr ""
212
213
#: bzrlib/builtins.py:551
214
msgid ""
215
"Since a lightweight checkout is little more than a working tree\n"
216
"this will refuse to run against one."
217
msgstr ""
218
219
#: bzrlib/builtins.py:554
220
msgid "To re-create the working tree, use \"bzr checkout\"."
221
msgstr ""
222
223
#: bzrlib/builtins.py:560
224
msgid ""
225
"Remove the working tree even if it has uncommitted or shelved changes."
226
msgstr ""
227
228
#: bzrlib/builtins.py:574
229
msgid "No working tree to remove"
230
msgstr ""
231
232
#: bzrlib/builtins.py:576
233
msgid "You cannot remove the working tree of a remote path"
234
msgstr ""
235
236
#: bzrlib/builtins.py:585
237
msgid "You cannot remove the working tree from a lightweight checkout"
238
msgstr ""
239
240
#: bzrlib/builtins.py:625
241
msgid ""
242
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
243
"instead. Use \"--force\" if you are sure you want to reset the working tree."
244
msgstr ""
245
246
#: bzrlib/builtins.py:636
247
msgid ""
248
", the header appears corrupt, try passing -r -1 to set the state to the last "
249
"commit"
250
msgstr ""
251
252
#: bzrlib/builtins.py:640
253
msgid "failed to reset the tree state{0}"
254
msgstr ""
255
256
#: bzrlib/builtins.py:644
257
msgid "Show current revision number."
258
msgstr ""
259
260
#: bzrlib/builtins.py:646
261
msgid "This is equal to the number of revisions on this branch."
262
msgstr ""
263
264
#: bzrlib/builtins.py:659
265
msgid "--tree and --revision can not be used together"
266
msgstr ""
267
268
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
269
msgid "Tags can only be placed on a single revision, not on a range"
270
msgstr ""
271
272
#: bzrlib/builtins.py:700
273
msgid "Show revno of working tree."
274
msgstr ""
275
276
#: bzrlib/builtins.py:748
277
msgid "Add specified files or directories."
278
msgstr ""
279
280
#: bzrlib/builtins.py:750
281
msgid ""
282
"In non-recursive mode, all the named items are added, regardless\n"
283
"of whether they were previously ignored. A warning is given if\n"
284
"any of the named files are already versioned."
285
msgstr ""
286
287
#: bzrlib/builtins.py:754
288
msgid ""
289
"In recursive mode (the default), files are treated the same way\n"
290
"but the behaviour for directories is different. Directories that\n"
291
"are already versioned do not give a warning. All directories,\n"
292
"whether already versioned or not, are searched for files or\n"
293
"subdirectories that are neither versioned or ignored, and these\n"
294
"are added. This search proceeds recursively into versioned\n"
295
"directories. If no names are given '.' is assumed."
296
msgstr ""
297
298
#: bzrlib/builtins.py:762
299
msgid ""
300
"A warning will be printed when nested trees are encountered,\n"
301
"unless they are explicitly ignored."
302
msgstr ""
303
304
#: bzrlib/builtins.py:765
305
msgid ""
306
"Therefore simply saying 'bzr add' will version all files that\n"
307
"are currently unknown."
308
msgstr ""
309
310
#: bzrlib/builtins.py:768
311
msgid ""
312
"Adding a file whose parent directory is not versioned will\n"
313
"implicitly add the parent, and so on up to the root. This means\n"
314
"you should never need to explicitly add a directory, they'll just\n"
315
"get added when you add a file in the directory."
316
msgstr ""
317
318
#: bzrlib/builtins.py:773
319
msgid ""
320
"--dry-run will show which files would be added, but not actually\n"
321
"add them."
322
msgstr ""
323
324
#: bzrlib/builtins.py:776
325
msgid ""
326
"--file-ids-from will try to use the file ids from the supplied path.\n"
327
"It looks up ids trying to find a matching parent directory with the\n"
328
"same filename, and then by pure path. This option is rarely needed\n"
329
"but can be useful when adding the same logical file into two\n"
330
"branches that will be merged later (without showing the two different\n"
331
"adds as a conflict). It is also useful when merging another project\n"
332
"into a subdirectory of this one."
333
msgstr ""
334
335
#: bzrlib/builtins.py:784
336
msgid ""
337
"Any files matching patterns in the ignore list will not be added\n"
338
"unless they are explicitly mentioned."
339
msgstr ""
340
341
#: bzrlib/builtins.py:787
342
msgid ""
343
"In recursive mode, files larger than the configuration option \n"
344
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
345
"to file size."
346
msgstr ""
347
348
#: bzrlib/builtins.py:794
349
msgid "Don't recursively add the contents of directories."
350
msgstr ""
351
352
#: bzrlib/builtins.py:800
353
msgid "Lookup file ids from this tree."
354
msgstr ""
355
356
#: bzrlib/builtins.py:836
357
msgid "ignored {0} matching \"{1}\"\n"
358
msgstr ""
359
360
#: bzrlib/builtins.py:841
361
msgid "Create a new versioned directory."
362
msgstr ""
363
364
#: bzrlib/builtins.py:843
365
msgid "This is equivalent to creating the directory and then adding it."
366
msgstr ""
367
368
#: bzrlib/builtins.py:850
369
msgid "No error if existing, make parent directories as needed."
370
msgstr ""
371
372
#: bzrlib/builtins.py:884
373
#, python-format
374
msgid "added %s\n"
375
msgstr ""
376
377
#: bzrlib/builtins.py:926
378
#, python-format
379
msgid "invalid kind %r specified"
380
msgstr ""
381
382
#: bzrlib/builtins.py:963
383
msgid "Move or rename a file."
384
msgstr ""
385
386
#: bzrlib/builtins.py:965
387
msgid " bzr mv SOURCE... DESTINATION"
388
msgstr ""
389
390
#: bzrlib/builtins.py:967
391
msgid ""
392
"If the last argument is a versioned directory, all the other names\n"
393
"are moved into it. Otherwise, there must be exactly two arguments\n"
394
"and the file is changed to a new name."
395
msgstr ""
396
397
#: bzrlib/builtins.py:971
398
msgid ""
399
"If OLDNAME does not exist on the filesystem but is versioned and\n"
400
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
401
"assumes that the file has been manually moved and only updates\n"
402
"its internal inventory to reflect that change.\n"
403
"The same is valid when moving many SOURCE files to a DESTINATION."
404
msgstr ""
405
406
#: bzrlib/builtins.py:977
407
msgid "Files cannot be moved between branches."
408
msgstr ""
409
410
#: bzrlib/builtins.py:984
411
msgid ""
412
"Move only the bzr identifier of the file, because the file has already been "
413
"moved."
414
msgstr ""
415
416
#: bzrlib/builtins.py:986
417
msgid "Automatically guess renames."
418
msgstr ""
419
420
#: bzrlib/builtins.py:987
421
msgid "Avoid making changes when guessing renames."
422
msgstr ""
423
424
#: bzrlib/builtins.py:996
425
msgid "--dry-run requires --auto."
426
msgstr ""
427
428
#: bzrlib/builtins.py:1000
429
msgid "missing file argument"
430
msgstr ""
431
432
#: bzrlib/builtins.py:1004
433
msgid "can not move root of branch"
434
msgstr ""
435
436
#: bzrlib/builtins.py:1010
437
msgid "Only one path may be specified to --auto."
438
msgstr ""
439
440
#: bzrlib/builtins.py:1013
441
msgid "--after cannot be specified with --auto."
442
msgstr ""
443
444
#: bzrlib/builtins.py:1050
445
msgid "to mv multiple files the destination must be a versioned directory"
446
msgstr ""
447
448
#: bzrlib/builtins.py:1102
449
msgid "Turn this branch into a mirror of another branch."
450
msgstr ""
451
452
#: bzrlib/builtins.py:1104
453
msgid ""
454
"By default, this command only works on branches that have not diverged.\n"
455
"Branches are considered diverged if the destination branch's most recent \n"
456
"commit is one that has not been merged (directly or indirectly) into the \n"
457
"parent."
458
msgstr ""
459
460
#: bzrlib/builtins.py:1109
461
msgid ""
462
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
463
"from one into the other. Once one branch has merged, the other should\n"
464
"be able to pull it again."
465
msgstr ""
466
467
#: bzrlib/builtins.py:1113
468
msgid ""
469
"If you want to replace your local changes and just want your branch to\n"
470
"match the remote one, use pull --overwrite. This will work even if the two\n"
471
"branches have diverged."
472
msgstr ""
473
474
#: bzrlib/builtins.py:1117
475
msgid ""
476
"If there is no default location set, the first pull will set it (use\n"
477
"--no-remember to avoid setting it). After that, you can omit the\n"
478
"location to use the default. To change the default, use --remember. The\n"
479
"value will only be saved if the remote location can be accessed."
480
msgstr ""
481
482
#: bzrlib/builtins.py:1122
483
msgid ""
484
"The --verbose option will display the revisions pulled using the log_format\n"
485
"configuration option. You can use a different format by overriding it with\n"
486
"-Olog_format=<other_format>."
487
msgstr ""
488
489
#: bzrlib/builtins.py:1126
490
msgid ""
491
"Note: The location can be specified either in the form of a branch,\n"
492
"or in the form of a path to a file containing a merge directive generated\n"
493
"with bzr send."
494
msgstr ""
495
496
#: bzrlib/builtins.py:1134
497
msgid "Show logs of pulled revisions."
498
msgstr ""
499
500
#: bzrlib/builtins.py:1136
501
msgid ""
502
"Branch to pull into, rather than the one containing the working directory."
503
msgstr ""
504
505
#: bzrlib/builtins.py:1139
506
msgid ""
507
"Perform a local pull in a bound branch. Local pulls are not applied to the "
508
"master branch."
509
msgstr ""
510
511
#: bzrlib/builtins.py:1168
512
msgid "Need working tree for --show-base."
513
msgstr ""
514
515
#: bzrlib/builtins.py:1184
516
msgid "No pull location known or specified."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1190
520
#, python-format
521
msgid "Using saved parent location: %s\n"
522
msgstr ""
523
524
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
525
msgid "Cannot use -r with merge directives or bundles"
526
msgstr ""
527
528
#: bzrlib/builtins.py:1238
529
msgid "Update a mirror of this branch."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1240
533
msgid ""
534
"The target branch will not have its working tree populated because this\n"
535
"is both expensive, and is not supported on remote file systems."
536
msgstr ""
537
538
#: bzrlib/builtins.py:1243
539
msgid ""
540
"Some smart servers or protocols *may* put the working tree in place in\n"
541
"the future."
542
msgstr ""
543
544
#: bzrlib/builtins.py:1246
545
msgid ""
546
"This command only works on branches that have not diverged. Branches are\n"
547
"considered diverged if the destination branch's most recent commit is one\n"
548
"that has not been merged (directly or indirectly) by the source branch."
549
msgstr ""
550
551
#: bzrlib/builtins.py:1250
552
msgid ""
553
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
554
"the other branch completely, discarding its unmerged changes."
555
msgstr ""
556
557
#: bzrlib/builtins.py:1253
558
msgid ""
559
"If you want to ensure you have the different changes in the other branch,\n"
560
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
561
"After that you will be able to do a push without '--overwrite'."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1257
565
msgid ""
566
"If there is no default push location set, the first push will set it (use\n"
567
"--no-remember to avoid setting it). After that, you can omit the\n"
568
"location to use the default. To change the default, use --remember. The\n"
569
"value will only be saved if the remote location can be accessed."
570
msgstr ""
571
572
#: bzrlib/builtins.py:1262
573
msgid ""
574
"The --verbose option will display the revisions pushed using the log_format\n"
575
"configuration option. You can use a different format by overriding it with\n"
576
"-Olog_format=<other_format>."
577
msgstr ""
578
579
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
580
msgid ""
581
"Branch to push from, rather than the one containing the working directory."
582
msgstr ""
583
584
#: bzrlib/builtins.py:1276
585
msgid ""
586
"By default push will fail if the target directory exists, but does not "
587
"already have a control directory. This flag will allow push to proceed."
588
msgstr ""
589
590
#: bzrlib/builtins.py:1281
591
msgid ""
592
"Create a stacked branch that references the public location of the parent "
593
"branch."
594
msgstr ""
595
596
#: bzrlib/builtins.py:1284
597
msgid ""
598
"Create a stacked branch that refers to another branch for the commit "
599
"history. Only the work not present in the referenced branch is included in "
600
"the branch created."
601
msgstr ""
602
603
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
604
msgid ""
605
"Refuse to push if there are uncommitted changes in the working tree, --no-"
606
"strict disables the check."
607
msgstr ""
608
609
#: bzrlib/builtins.py:1292
610
msgid "Don't populate the working tree, even for protocols that support it."
611
msgstr ""
612
613
#: bzrlib/builtins.py:1336
614
msgid "Could not determine branch to refer to."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1345
618
#, python-format
619
msgid ""
620
"No push location known or specified. To push to the parent branch (at %s), "
621
"use 'bzr push :parent'."
622
msgstr ""
623
624
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
625
msgid "No push location known or specified."
626
msgstr ""
627
628
#: bzrlib/builtins.py:1355
629
#, python-format
630
msgid "Using saved push location: %s"
631
msgstr ""
632
633
#: bzrlib/builtins.py:1365
634
msgid "Create a new branch that is a copy of an existing branch."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1367
638
msgid ""
639
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
640
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
641
"./bar.\n"
642
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
643
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
644
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
645
"create ./foo-bar."
646
msgstr ""
647
648
#: bzrlib/builtins.py:1374
649
msgid ""
650
"To retrieve the branch as of a particular revision, supply the --revision\n"
651
"parameter, as in \"branch foo/bar -r 5\"."
652
msgstr ""
653
654
#: bzrlib/builtins.py:1377
655
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
656
msgstr ""
657
658
#: bzrlib/builtins.py:1387
659
msgid "Create a branch without a working-tree."
660
msgstr ""
661
662
#: bzrlib/builtins.py:1389
663
msgid "Switch the checkout in the current directory to the new branch."
664
msgstr ""
665
666
#: bzrlib/builtins.py:1392
667
msgid ""
668
"Create a stacked branch referring to the source branch. The new branch will "
669
"depend on the availability of the source branch for all operations."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1396
673
msgid "Do not use a shared repository, even if available."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1398
677
msgid ""
678
"By default branch will fail if the target directory exists, but does not "
679
"already have a control directory. This flag will allow branch to proceed."
680
msgstr ""
681
682
#: bzrlib/builtins.py:1403
683
msgid "Bind new branch to from location."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1450
687
#, python-format
688
msgid "Target directory \"%s\" already exists."
689
msgstr ""
690
691
#: bzrlib/builtins.py:1462
692
#, python-format
693
msgid "Parent of \"%s\" does not exist."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1481
697
msgid "The branch {0} has no revision {1}."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
701
#, python-format
702
msgid "Created new stacked branch referring to %s."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1500
706
#, python-format
707
msgid "Branched %d revision."
708
msgid_plural "Branched %d revisions."
709
msgstr[0] ""
710
msgstr[1] ""
711
712
#: bzrlib/builtins.py:1505
713
#, python-format
714
msgid "New branch bound to %s"
715
msgstr ""
716
717
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
718
#, python-format
719
msgid "Switched to branch: %s"
720
msgstr ""
721
722
#: bzrlib/builtins.py:1515
723
msgid "List the branches available at the current location."
724
msgstr ""
725
726
#: bzrlib/builtins.py:1517
727
msgid ""
728
"This command will print the names of all the branches at the current\n"
729
"location."
730
msgstr ""
731
732
#: bzrlib/builtins.py:1524
733
msgid ""
734
"Recursively scan for branches rather than just looking in the specified "
735
"location."
736
msgstr ""
737
738
#: bzrlib/builtins.py:1554
739
msgid "(default)"
740
msgstr ""
741
742
#: bzrlib/builtins.py:1566
743
msgid "Create a new checkout of an existing branch."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1568
747
msgid ""
748
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
749
"for\n"
750
"the branch found in '.'. This is useful if you have removed the working "
751
"tree\n"
752
"or if it was never created - i.e. if you pushed the branch to its current\n"
753
"location using SFTP."
754
msgstr ""
755
756
#: bzrlib/builtins.py:1573
757
msgid ""
758
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
759
"will\n"
760
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
761
"./bar.\n"
762
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
763
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
764
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
765
"create ./foo-bar."
766
msgstr ""
767
768
#: bzrlib/builtins.py:1580
769
msgid ""
770
"To retrieve the branch as of a particular revision, supply the --revision\n"
771
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
772
"immediately\n"
773
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
774
"old\n"
775
"code.)"
776
msgstr ""
777
778
#: bzrlib/builtins.py:1590
779
msgid ""
780
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
781
"the branch for every operation. Normal checkouts can perform common "
782
"operations like diff and status without such access, and also support local "
783
"commits."
784
msgstr ""
785
786
#: bzrlib/builtins.py:1597
787
msgid "Get file contents from this tree."
788
msgstr ""
789
790
#: bzrlib/builtins.py:1599
791
msgid "Hard-link working tree files where possible."
792
msgstr ""
793
794
#: bzrlib/builtins.py:1640
795
msgid ""
796
"Show list of renamed files.\n"
797
" "
798
msgstr ""
799
800
#: bzrlib/builtins.py:1670
801
msgid "Update a working tree to a new revision."
802
msgstr ""
803
804
#: bzrlib/builtins.py:1672
805
msgid ""
806
"This will perform a merge of the destination revision (the tip of the\n"
807
"branch, or the specified revision) into the working tree, and then make\n"
808
"that revision the basis revision for the working tree. "
809
msgstr ""
810
811
#: bzrlib/builtins.py:1676
812
msgid ""
813
"You can use this to visit an older revision, or to update a working tree\n"
814
"that is out of date from its branch."
815
msgstr ""
816
817
#: bzrlib/builtins.py:1679
818
msgid ""
819
"If there are any uncommitted changes in the tree, they will be carried\n"
820
"across and remain as uncommitted changes after the update. To discard\n"
821
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
822
"with the changes brought in by the change in basis revision."
823
msgstr ""
824
825
#: bzrlib/builtins.py:1684
826
msgid ""
827
"If the tree's branch is bound to a master branch, bzr will also update\n"
828
"the branch from the master."
829
msgstr ""
830
831
#: bzrlib/builtins.py:1687
832
msgid ""
833
"You cannot update just a single file or directory, because each Bazaar\n"
834
"working tree has just a single basis revision. If you want to restore a\n"
835
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
836
"update'. If you want to restore a file to its state in a previous\n"
837
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
838
"out the old content of that file to a new location."
839
msgstr ""
840
841
#: bzrlib/builtins.py:1694
842
msgid ""
843
"The 'dir' argument, if given, must be the location of the root of a\n"
844
"working tree to update. By default, the working tree that contains the \n"
845
"current working directory is used."
846
msgstr ""
847
848
#: bzrlib/builtins.py:1710
849
msgid "bzr update --revision takes exactly one revision"
850
msgstr ""
851
852
#: bzrlib/builtins.py:1718
853
msgid "bzr update can only update a whole tree, not a file or subdirectory"
854
msgstr ""
855
856
#: bzrlib/builtins.py:1749
857
msgid "Tree is up to date at revision {0} of branch {1}"
858
msgstr ""
859
860
#: bzrlib/builtins.py:1765
861
#, python-format
862
msgid ""
863
"branch has no revision %s\n"
864
"bzr update --revision only works for a revision in the branch history"
865
msgstr ""
866
867
#: bzrlib/builtins.py:1771
868
msgid "Updated to revision {0} of branch {1}"
869
msgstr ""
870
871
#: bzrlib/builtins.py:1775
872
msgid ""
873
"Your local commits will now show as pending merges with 'bzr status', and "
874
"can be committed with 'bzr commit'."
875
msgstr ""
876
877
#: bzrlib/builtins.py:1784
878
msgid "Show information about a working tree, branch or repository."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1786
882
msgid ""
883
"This command will show all known locations and formats associated to the\n"
884
"tree, branch or repository."
885
msgstr ""
886
887
#: bzrlib/builtins.py:1789
888
msgid ""
889
"In verbose mode, statistical information is included with each report.\n"
890
"To see extended statistic information, use a verbosity level of 2 or\n"
891
"higher by specifying the verbose option multiple times, e.g. -vv."
892
msgstr ""
893
894
#: bzrlib/builtins.py:1793
895
msgid "Branches and working trees will also report any missing revisions."
896
msgstr ""
897
898
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
899
#: bzrlib/builtins.py:6442
900
msgid ":Examples:"
901
msgstr ""
902
903
#: bzrlib/builtins.py:1797
904
msgid " Display information on the format and related locations:"
905
msgstr ""
906
907
#: bzrlib/builtins.py:1799
908
msgid " bzr info"
909
msgstr ""
910
911
#: bzrlib/builtins.py:1801
912
msgid ""
913
" Display the above together with extended format information and\n"
914
" basic statistics (like the number of files in the working tree and\n"
915
" number of revisions in the branch and repository):"
916
msgstr ""
917
918
#: bzrlib/builtins.py:1805
919
msgid " bzr info -v"
920
msgstr ""
921
922
#: bzrlib/builtins.py:1807
923
msgid " Display the above together with number of committers to the branch:"
924
msgstr ""
925
926
#: bzrlib/builtins.py:1809
927
msgid " bzr info -vv"
928
msgstr ""
929
930
#: bzrlib/builtins.py:1828
931
msgid "Remove files or directories."
932
msgstr ""
933
934
#: bzrlib/builtins.py:1830
935
msgid ""
936
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
937
"delete them if they can easily be recovered using revert otherwise they\n"
938
"will be backed up (adding an extention of the form .~#~). If no options or\n"
939
"parameters are given Bazaar will scan for files that are being tracked by\n"
940
"Bazaar but missing in your tree and stop tracking them for you."
941
msgstr ""
942
943
#: bzrlib/builtins.py:1838
944
msgid "Only remove files that have never been committed."
945
msgstr ""
946
947
#: bzrlib/builtins.py:1840
948
msgid "The file deletion mode to be used."
949
msgstr ""
950
951
#: bzrlib/builtins.py:1841
952
msgid "Deletion Strategy"
953
msgstr ""
954
955
#: bzrlib/builtins.py:1842
956
msgid "Backup changed files (default)."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1843
960
msgid "Delete from bzr but leave the working copy."
961
msgstr ""
962
963
#: bzrlib/builtins.py:1844
964
msgid "Don't backup changed files."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1845
968
msgid ""
969
"Delete all the specified files, even if they can not be recovered and even "
970
"if they are non-empty directories. (deprecated, use no-backup)"
971
msgstr ""
972
973
#: bzrlib/builtins.py:1854
974
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
975
msgstr ""
976
977
#: bzrlib/builtins.py:1871
978
msgid "No matching files."
979
msgstr ""
980
981
#: bzrlib/builtins.py:1932
982
msgid "Reconcile bzr metadata in a branch."
983
msgstr ""
984
985
#: bzrlib/builtins.py:1934
986
msgid ""
987
"This can correct data mismatches that may have been caused by\n"
988
"previous ghost operations or bzr upgrades. You should only\n"
989
"need to run this command if 'bzr check' or a bzr developer\n"
990
"advises you to run it."
991
msgstr ""
992
993
#: bzrlib/builtins.py:1939
994
msgid ""
995
"If a second branch is provided, cross-branch reconciliation is\n"
996
"also attempted, which will check that data like the tree root\n"
997
"id which was not present in very early bzr versions is represented\n"
998
"correctly in both branches."
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1944
1002
msgid ""
1003
"At the same time it is run it may recompress data resulting in\n"
1004
"a potential saving in disk space or performance gain."
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1947
1008
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1009
msgstr ""
1010
1011
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1012
msgid ""
1013
"Format for the bzr 2.0 series.\n"
1014
"Uses group-compress storage.\n"
1015
"Provides rich roots which are a one-way transition.\n"
1016
msgstr ""
1017
1018
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1019
msgid ""
1020
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1021
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1025
msgid "The 2a format with experimental support for colocated branches.\n"
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:2015
1029
msgid "Make a directory into a versioned branch."
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:2017
1033
msgid ""
1034
"Use this to create an empty branch, or before importing an\n"
1035
"existing project."
1036
msgstr ""
1037
1038
#: bzrlib/builtins.py:2020
1039
msgid ""
1040
"If there is a repository in a parent directory of the location, then\n"
1041
"the history of the branch will be stored in the repository. Otherwise\n"
1042
"init creates a standalone branch which carries its own history\n"
1043
"in the .bzr directory."
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:2025
1047
msgid ""
1048
"If there is already a branch at the location but it has no working tree,\n"
1049
"the tree can be populated with 'bzr checkout'."
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:2028
1053
msgid "Recipe for importing a tree of files::"
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:2030
1057
msgid ""
1058
" cd ~/project\n"
1059
" bzr init\n"
1060
" bzr add .\n"
1061
" bzr status\n"
1062
" bzr commit -m \"imported project\""
1063
msgstr ""
1064
1065
#: bzrlib/builtins.py:2041
1066
msgid ""
1067
"Create the path leading up to the branch if it does not already exist."
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:2044
1071
msgid "Specify a format for this branch. See \"help formats\"."
1072
msgstr ""
1073
1074
#: bzrlib/builtins.py:2052
1075
msgid ""
1076
"Never change revnos or the existing log. Append revisions to it only."
1077
msgstr ""
1078
1079
#: bzrlib/builtins.py:2055
1080
msgid "Create a branch without a working tree."
1081
msgstr ""
1082
1083
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1084
#, python-format
1085
msgid ""
1086
"Parent directory of %s does not exist.\n"
1087
"You may supply --create-prefix to create all leading parent directories."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2109
1091
msgid ""
1092
"This branch format cannot be set to append-revisions-only. Try --default."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:2120
1096
msgid "Created a {0} (format: {1})\n"
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:2129
1100
#, python-format
1101
msgid "Using shared repository: %s\n"
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2133
1105
msgid "Create a shared repository for branches to share storage space."
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2135
1109
msgid ""
1110
"New branches created under the repository directory will store their\n"
1111
"revisions in the repository, not in the branch directory. For branches\n"
1112
"with shared history, this reduces the amount of storage needed and \n"
1113
"speeds up the creation of new branches."
1114
msgstr ""
1115
1116
#: bzrlib/builtins.py:2140
1117
msgid ""
1118
"If the --no-trees option is given then the branches in the repository\n"
1119
"will not have working trees by default. They will still exist as \n"
1120
"directories on disk, but they will not have separate copies of the \n"
1121
"files at a certain revision. This can be useful for repositories that\n"
1122
"store branches which are interacted with through checkouts or remote\n"
1123
"branches, such as on a server."
1124
msgstr ""
1125
1126
#: bzrlib/builtins.py:2147
1127
msgid ""
1128
":Examples:\n"
1129
" Create a shared repository holding just branches::"
1130
msgstr ""
1131
1132
#: bzrlib/builtins.py:2150
1133
msgid ""
1134
" bzr init-repo --no-trees repo\n"
1135
" bzr init repo/trunk"
1136
msgstr ""
1137
1138
#: bzrlib/builtins.py:2153
1139
msgid " Make a lightweight checkout elsewhere::"
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2155
1143
msgid ""
1144
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1145
" cd trunk-checkout\n"
1146
" (add files here)"
1147
msgstr ""
1148
1149
#: bzrlib/builtins.py:2163
1150
msgid ""
1151
"Specify a format for this repository. See \"bzr help formats\" for details."
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2167
1155
msgid "Repository format"
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2169
1159
msgid "Branches in the repository will default to not having a working tree."
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2195
1163
msgid "Show differences in the working tree, between revisions or branches."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2197
1167
msgid ""
1168
"If no arguments are given, all changes for the current tree are listed.\n"
1169
"If files are given, only the changes in those files are listed.\n"
1170
"Remote and multiple branches can be compared by using the --old and\n"
1171
"--new options. If not provided, the default for both is derived from\n"
1172
"the first argument, if any, or the current tree if no arguments are\n"
1173
"given."
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2204
1177
msgid ""
1178
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1179
"produces patches suitable for \"patch -p1\"."
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:2207
1183
msgid ""
1184
"Note that when using the -r argument with a range of revisions, the\n"
1185
"differences are computed between the two specified revisions. That\n"
1186
"is, the command does not show the changes introduced by the first \n"
1187
"revision in the range. This differs from the interpretation of \n"
1188
"revision ranges used by \"bzr log\" which includes the first revision\n"
1189
"in the range."
1190
msgstr ""
1191
1192
#: bzrlib/builtins.py:2214
1193
msgid ""
1194
":Exit values:\n"
1195
" 1 - changed\n"
1196
" 2 - unrepresentable changes\n"
1197
" 3 - error\n"
1198
" 0 - no change"
1199
msgstr ""
1200
1201
#: bzrlib/builtins.py:2220
1202
msgid ""
1203
":Examples:\n"
1204
" Shows the difference in the working tree versus the last commit::"
1205
msgstr ""
1206
1207
#: bzrlib/builtins.py:2223
1208
msgid " bzr diff"
1209
msgstr ""
1210
1211
#: bzrlib/builtins.py:2225
1212
msgid " Difference between the working tree and revision 1::"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2227
1216
msgid " bzr diff -r1"
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2229
1220
msgid " Difference between revision 3 and revision 1::"
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2231
1224
msgid " bzr diff -r1..3"
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2233
1228
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2235
1232
msgid " bzr diff -r1..3 xxx"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2237
1236
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2239
1240
msgid " bzr diff -c2"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2241
1244
msgid ""
1245
" To see the changes introduced by revision X::\n"
1246
" \n"
1247
" bzr diff -cX"
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2245
1251
msgid ""
1252
" Note that in the case of a merge, the -c option shows the changes\n"
1253
" compared to the left hand parent. To see the changes against\n"
1254
" another parent, use::"
1255
msgstr ""
1256
1257
#: bzrlib/builtins.py:2249
1258
msgid " bzr diff -r<chosen_parent>..X"
1259
msgstr ""
1260
1261
#: bzrlib/builtins.py:2251
1262
msgid ""
1263
" The changes between the current revision and the previous revision\n"
1264
" (equivalent to -c-1 and -r-2..-1)"
1265
msgstr ""
1266
1267
#: bzrlib/builtins.py:2254
1268
msgid " bzr diff -r-2.."
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2256
1272
msgid " Show just the differences for file NEWS::"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2258
1276
msgid " bzr diff NEWS"
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2260
1280
msgid " Show the differences in working tree xxx for file NEWS::"
1281
msgstr ""
1282
1283
#: bzrlib/builtins.py:2262
1284
msgid " bzr diff xxx/NEWS"
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2264
1288
msgid " Show the differences from branch xxx to this working tree:"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2266
1292
msgid " bzr diff --old xxx"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2268
1296
msgid " Show the differences between two branches for file NEWS::"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2270
1300
msgid " bzr diff --old xxx --new yyy NEWS"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2272
1304
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2274
1308
msgid ""
1309
" bzr diff --prefix old/:new/\n"
1310
" \n"
1311
" Show the differences using a custom diff program with options::\n"
1312
" \n"
1313
" bzr diff --using /usr/bin/diff --diff-options -wu"
1314
msgstr ""
1315
1316
#: bzrlib/builtins.py:2284
1317
msgid "Pass these options to the external diff program."
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2287
1321
msgid ""
1322
"Set prefixes added to old and new filenames, as two values separated by a "
1323
"colon. (eg \"old/:new/\")."
1324
msgstr ""
1325
1326
#: bzrlib/builtins.py:2290
1327
msgid "Branch/tree to compare from."
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2294
1331
msgid "Branch/tree to compare to."
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2300
1335
msgid "Use this command to compare files."
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2305
1339
msgid "Diff format to use."
1340
msgstr ""
1341
1342
#: bzrlib/builtins.py:2307
1343
msgid "Diff format"
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2329
1347
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2333
1351
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1355
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1356
msgid "{0} and {1} are mutually exclusive"
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2358
1360
msgid ""
1361
"List files deleted in the working tree.\n"
1362
" "
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2436
1366
msgid "Show the tree root directory."
1367
msgstr ""
1368
1369
#: bzrlib/builtins.py:2438
1370
msgid ""
1371
"The root is the nearest enclosing directory with a .bzr control\n"
1372
"directory."
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2453
1376
msgid "The limit argument must be an integer."
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2461
1380
msgid "The levels argument must be an integer."
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2466
1384
msgid "Show historical log for a branch or subset of a branch."
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2468
1388
msgid ""
1389
"log is bzr's default tool for exploring the history of a branch.\n"
1390
"The branch to use is taken from the first parameter. If no parameters\n"
1391
"are given, the branch containing the working directory is logged.\n"
1392
"Here are some simple examples::"
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2473
1396
msgid ""
1397
" bzr log log the current branch\n"
1398
" bzr log foo.py log a file in its branch\n"
1399
" bzr log http://server/branch log a branch on a server"
1400
msgstr ""
1401
1402
#: bzrlib/builtins.py:2477
1403
msgid ""
1404
"The filtering, ordering and information shown for each revision can\n"
1405
"be controlled as explained below. By default, all revisions are\n"
1406
"shown sorted (topologically) so that newer revisions appear before\n"
1407
"older ones and descendants always appear before ancestors. If displayed,\n"
1408
"merged revisions are shown indented under the revision in which they\n"
1409
"were merged."
1410
msgstr ""
1411
1412
#: bzrlib/builtins.py:2484
1413
msgid ":Output control:"
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2486
1417
msgid ""
1418
" The log format controls how information about each revision is\n"
1419
" displayed. The standard log formats are called ``long``, ``short``\n"
1420
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1421
" for more details on log formats."
1422
msgstr ""
1423
1424
#: bzrlib/builtins.py:2491
1425
msgid ""
1426
" The following options can be used to control what information is\n"
1427
" displayed::"
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2494
1431
msgid ""
1432
" -l N display a maximum of N revisions\n"
1433
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1434
" -v display a status summary (delta) for each revision\n"
1435
" -p display a diff (patch) for each revision\n"
1436
" --show-ids display revision-ids (and file-ids), not just revnos"
1437
msgstr ""
1438
1439
#: bzrlib/builtins.py:2500
1440
msgid ""
1441
" Note that the default number of levels to display is a function of the\n"
1442
" log format. If the -n option is not used, the standard log formats show\n"
1443
" just the top level (mainline)."
1444
msgstr ""
1445
1446
#: bzrlib/builtins.py:2504
1447
msgid ""
1448
" Status summaries are shown using status flags like A, M, etc. To see\n"
1449
" the changes explained using words like ``added`` and ``modified``\n"
1450
" instead, use the -vv option."
1451
msgstr ""
1452
1453
#: bzrlib/builtins.py:2508
1454
msgid ":Ordering control:"
1455
msgstr ""
1456
1457
#: bzrlib/builtins.py:2510
1458
msgid ""
1459
" To display revisions from oldest to newest, use the --forward option.\n"
1460
" In most cases, using this option will have little impact on the total\n"
1461
" time taken to produce a log, though --forward does not incrementally\n"
1462
" display revisions like --reverse does when it can."
1463
msgstr ""
1464
1465
#: bzrlib/builtins.py:2515
1466
msgid ":Revision filtering:"
1467
msgstr ""
1468
1469
#: bzrlib/builtins.py:2517
1470
msgid ""
1471
" The -r option can be used to specify what revision or range of revisions\n"
1472
" to filter against. The various forms are shown below::"
1473
msgstr ""
1474
1475
#: bzrlib/builtins.py:2520
1476
msgid ""
1477
" -rX display revision X\n"
1478
" -rX.. display revision X and later\n"
1479
" -r..Y display up to and including revision Y\n"
1480
" -rX..Y display from X to Y inclusive"
1481
msgstr ""
1482
1483
#: bzrlib/builtins.py:2525
1484
msgid ""
1485
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1486
" Some common examples are given below::"
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2528
1490
msgid ""
1491
" -r-1 show just the tip\n"
1492
" -r-10.. show the last 10 mainline revisions\n"
1493
" -rsubmit:.. show what's new on this branch\n"
1494
" -rancestor:path.. show changes since the common ancestor of this\n"
1495
" branch and the one at location path\n"
1496
" -rdate:yesterday.. show changes since yesterday"
1497
msgstr ""
1498
1499
#: bzrlib/builtins.py:2535
1500
msgid ""
1501
" When logging a range of revisions using -rX..Y, log starts at\n"
1502
" revision Y and searches back in history through the primary\n"
1503
" (\"left-hand\") parents until it finds X. When logging just the\n"
1504
" top level (using -n1), an error is reported if X is not found\n"
1505
" along the way. If multi-level logging is used (-n0), X may be\n"
1506
" a nested merge revision and the log will be truncated accordingly."
1507
msgstr ""
1508
1509
#: bzrlib/builtins.py:2542
1510
msgid ":Path filtering:"
1511
msgstr ""
1512
1513
#: bzrlib/builtins.py:2544
1514
msgid ""
1515
" If parameters are given and the first one is not a branch, the log\n"
1516
" will be filtered to show only those revisions that changed the\n"
1517
" nominated files or directories."
1518
msgstr ""
1519
1520
#: bzrlib/builtins.py:2548
1521
msgid ""
1522
" Filenames are interpreted within their historical context. To log a\n"
1523
" deleted file, specify a revision range so that the file existed at\n"
1524
" the end or start of the range."
1525
msgstr ""
1526
1527
#: bzrlib/builtins.py:2552
1528
msgid ""
1529
" Historical context is also important when interpreting pathnames of\n"
1530
" renamed files/directories. Consider the following example:"
1531
msgstr ""
1532
1533
#: bzrlib/builtins.py:2555
1534
msgid ""
1535
" * revision 1: add tutorial.txt\n"
1536
" * revision 2: modify tutorial.txt\n"
1537
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2559
1541
msgid " In this case:"
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2561
1545
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2563
1549
msgid ""
1550
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1551
msgstr ""
1552
1553
#: bzrlib/builtins.py:2565
1554
msgid ""
1555
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1556
" the original file in revision 2."
1557
msgstr ""
1558
1559
#: bzrlib/builtins.py:2568
1560
msgid ""
1561
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1562
" was no file called guide.txt in revision 2."
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2571
1566
msgid ""
1567
" Renames are always followed by log. By design, there is no need to\n"
1568
" explicitly ask for this (and no way to stop logging a file back\n"
1569
" until it was last renamed)."
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2575
1573
msgid ":Other filtering:"
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2577
1577
msgid ""
1578
" The --match option can be used for finding revisions that match a\n"
1579
" regular expression in a commit message, committer, author or bug.\n"
1580
" Specifying the option several times will match any of the supplied\n"
1581
" expressions. --match-author, --match-bugs, --match-committer and\n"
1582
" --match-message can be used to only match a specific field."
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2583
1586
msgid ":Tips & tricks:"
1587
msgstr ""
1588
1589
#: bzrlib/builtins.py:2585
1590
msgid ""
1591
" GUI tools and IDEs are often better at exploring history than command\n"
1592
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1593
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1594
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1595
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1596
msgstr ""
1597
1598
#: bzrlib/builtins.py:2591
1599
msgid ""
1600
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1601
msgstr ""
1602
1603
#: bzrlib/builtins.py:2593
1604
msgid ""
1605
" [ALIASES]\n"
1606
" tip = log -r-1\n"
1607
" top = log -l10 --line\n"
1608
" show = log -v -p"
1609
msgstr ""
1610
1611
#: bzrlib/builtins.py:2598
1612
msgid ""
1613
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1614
" will show the last 10 mainline revisions. To see the details of a\n"
1615
" particular revision X, ``bzr show -rX``."
1616
msgstr ""
1617
1618
#: bzrlib/builtins.py:2602
1619
msgid ""
1620
" If you are interested in looking deeper into a particular merge X,\n"
1621
" use ``bzr log -n0 -rX``."
1622
msgstr ""
1623
1624
#: bzrlib/builtins.py:2605
1625
msgid ""
1626
" ``bzr log -v`` on a branch with lots of history is currently\n"
1627
" very slow. A fix for this issue is currently under development.\n"
1628
" With or without that fix, it is recommended that a revision range\n"
1629
" be given when using the -v option."
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2610
1633
msgid ""
1634
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1635
" used to find revisions matching user names, commit messages, etc.\n"
1636
" Among other features, this plugin can find all revisions containing\n"
1637
" a list of words but not others."
1638
msgstr ""
1639
1640
#: bzrlib/builtins.py:2615
1641
msgid ""
1642
" When exploring non-mainline history on large projects with deep\n"
1643
" history, the performance of log can be greatly improved by installing\n"
1644
" the historycache plugin. This plugin buffers historical information\n"
1645
" trading disk space for faster speed."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2624
1649
msgid "Show from oldest to newest."
1650
msgstr ""
1651
1652
#: bzrlib/builtins.py:2627
1653
msgid "Show files changed in each revision."
1654
msgstr ""
1655
1656
#: bzrlib/builtins.py:2633
1657
msgid "Show just the specified revision. See also \"help revisionspec\"."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2637
1661
msgid "What names to list as authors - first, all or committer."
1662
msgstr ""
1663
1664
#: bzrlib/builtins.py:2638
1665
msgid "Authors"
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2643
1669
msgid "Number of levels to display - 0 for all, 1 for flat."
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2653
1673
msgid "Limit the output to the first N revisions."
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2658
1677
msgid "Show changes made in each revision as a patch."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2660
1681
msgid "Show merged revisions like --levels 0 does."
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2664
1685
msgid "Do not report commits with more than one parent."
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2666
1689
msgid ""
1690
"Display only the revisions that are not part of both ancestries (require -"
1691
"rX..Y)."
1692
msgstr ""
1693
1694
#: bzrlib/builtins.py:2670
1695
msgid "Show digital signature validity."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2673
1699
msgid "Show revisions whose properties match this expression."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2677
1703
msgid "Show revisions whose message matches this expression."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2681
1707
msgid "Show revisions whose committer matches this expression."
1708
msgstr ""
1709
1710
#: bzrlib/builtins.py:2685
1711
msgid "Show revisions whose authors match this expression."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2689
1715
msgid "Show revisions whose bugs match this expression."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2743
1719
msgid "--exclude-common-ancestry requires -r with two revisions"
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2771
1723
#, python-format
1724
msgid "Path unknown at end or start of revision range: %s"
1725
msgstr ""
1726
1727
#: bzrlib/builtins.py:2888
1728
#, python-format
1729
msgid "bzr %s doesn't accept two revisions in different branches."
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2904
1733
#, python-format
1734
msgid "bzr %s --revision takes one or two values."
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2949
1738
msgid ""
1739
"List files in a tree.\n"
1740
" "
1741
msgstr ""
1742
1743
#: bzrlib/builtins.py:2958
1744
msgid "Recurse into subdirectories."
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2960
1748
msgid "Print paths relative to the root of the branch."
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2962
1752
msgid "Print unknown files."
1753
msgstr ""
1754
1755
#: bzrlib/builtins.py:2963
1756
msgid "Print versioned files."
1757
msgstr ""
1758
1759
#: bzrlib/builtins.py:2966
1760
msgid "Print ignored files."
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:2968
1764
msgid "List entries of a particular kind: file, directory, symlink."
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:2981
1768
msgid "invalid kind specified"
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2984
1772
msgid "Cannot set both --verbose and --null"
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2993
1776
msgid "cannot specify both --from-root and PATH"
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:3080
1780
msgid "Ignore specified files or patterns."
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:3082
1784
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:3084
1788
msgid ""
1789
"If a .bzrignore file does not exist, the ignore command\n"
1790
"will create one and add the specified files or patterns to the newly\n"
1791
"created file. The ignore command will also automatically add the \n"
1792
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1793
"the use of the ignore command will require an explicit add command."
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:3090
1797
msgid ""
1798
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1799
"After adding, editing or deleting that file either indirectly by\n"
1800
"using this command or directly by using an editor, be sure to commit\n"
1801
"it."
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:3095
1805
msgid ""
1806
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1807
"the global ignore file can be found in the application data directory as\n"
1808
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1809
"Global ignores are not touched by this command. The global ignore file\n"
1810
"can be edited directly using an editor."
1811
msgstr ""
1812
1813
#: bzrlib/builtins.py:3101
1814
msgid ""
1815
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1816
"precedence over regular ignores. Such exceptions are used to specify\n"
1817
"files that should be versioned which would otherwise be ignored."
1818
msgstr ""
1819
1820
#: bzrlib/builtins.py:3105
1821
msgid ""
1822
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1823
"precedence over the '!' exception patterns."
1824
msgstr ""
1825
1826
#: bzrlib/builtins.py:3108
1827
msgid ""
1828
":Notes: \n"
1829
" \n"
1830
"* Ignore patterns containing shell wildcards must be quoted from\n"
1831
" the shell on Unix."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:3113
1835
msgid ""
1836
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1837
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:3116
1841
msgid ""
1842
":Examples:\n"
1843
" Ignore the top level Makefile::"
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:3119
1847
msgid " bzr ignore ./Makefile"
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:3121
1851
msgid " Ignore .class files in all directories...::"
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3123
1855
msgid " bzr ignore \"*.class\""
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:3125
1859
msgid " ...but do not ignore \"special.class\"::"
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:3127
1863
msgid " bzr ignore \"!special.class\""
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:3129
1867
msgid " Ignore files whose name begins with the \"#\" character::"
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3131
1871
msgid " bzr ignore \"RE:^#\""
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1875
msgid " Ignore .o files under the lib directory::"
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3135
1879
msgid " bzr ignore \"lib/**/*.o\""
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3139
1883
msgid " bzr ignore \"RE:lib/.*\\.o\""
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3141
1887
msgid " Ignore everything but the \"debian\" toplevel directory::"
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3143
1891
msgid ""
1892
" bzr ignore \"RE:(?!debian/).*\"\n"
1893
" \n"
1894
" Ignore everything except the \"local\" toplevel directory,\n"
1895
" but always ignore autosave files ending in ~, even under local/::\n"
1896
" \n"
1897
" bzr ignore \"*\"\n"
1898
" bzr ignore \"!./local\"\n"
1899
" bzr ignore \"!!*~\""
1900
msgstr ""
1901
1902
#: bzrlib/builtins.py:3157
1903
msgid "Display the default ignore rules that bzr uses."
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3169
1907
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3180
1911
#, python-format
1912
msgid "Invalid ignore pattern found. %s"
1913
msgid_plural "Invalid ignore patterns found. %s"
1914
msgstr[0] ""
1915
msgstr[1] ""
1916
1917
#: bzrlib/builtins.py:3189
1918
msgid "NAME_PATTERN should not be an absolute path"
1919
msgstr ""
1920
1921
#: bzrlib/builtins.py:3202
1922
#, python-format
1923
msgid ""
1924
"Warning: the following files are version controlled and match your ignore "
1925
"pattern:\n"
1926
"%s\n"
1927
"These files will continue to be version controlled unless you 'bzr remove' "
1928
"them.\n"
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3209
1932
msgid "List ignored files and the patterns that matched them."
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3211
1936
msgid ""
1937
"List all the ignored files and the ignore pattern that caused the file to\n"
1938
"be ignored."
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3214
1942
msgid "Alternatively, to list just the files::"
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:3216
1946
msgid " bzr ls --ignored"
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3250
1950
#, python-format
1951
msgid "not a valid revision-number: %r"
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3257
1955
msgid ""
1956
"Export current or past revision to a destination directory or archive."
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3259
1960
msgid "If no revision is specified this exports the last committed revision."
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3261
1964
msgid ""
1965
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1966
"given, try to find the format with the extension. If no extension\n"
1967
"is found exports to a directory (equivalent to --format=dir)."
1968
msgstr ""
1969
1970
#: bzrlib/builtins.py:3265
1971
msgid ""
1972
"If root is supplied, it will be used as the root directory inside\n"
1973
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1974
"to the exported filename. The root option has no effect for 'dir' format."
1975
msgstr ""
1976
1977
#: bzrlib/builtins.py:3269
1978
msgid ""
1979
"If branch is omitted then the branch containing the current working\n"
1980
"directory will be used."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3272
1984
msgid ""
1985
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3274
1989
msgid ""
1990
" ================= =========================\n"
1991
" Supported formats Autodetected by extension\n"
1992
" ================= =========================\n"
1993
" dir (none)\n"
1994
" tar .tar\n"
1995
" tbz2 .tar.bz2, .tbz2\n"
1996
" tgz .tar.gz, .tgz\n"
1997
" zip .zip\n"
1998
" ================= ========================="
1999
msgstr ""
2000
2001
#: bzrlib/builtins.py:3288
2002
msgid "Type of file to export to."
2003
msgstr ""
2004
2005
#: bzrlib/builtins.py:3291
2006
msgid "Apply content filters to export the convenient form."
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:3295
2010
msgid "Name of the root directory inside the exported file."
2011
msgstr ""
2012
2013
#: bzrlib/builtins.py:3297
2014
msgid ""
2015
"Set modification time of files to that of the last revision in which it was "
2016
"changed."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3300
2020
msgid ""
2021
"Export the working tree contents rather than that of the last revision."
2022
msgstr ""
2023
2024
#: bzrlib/builtins.py:3319
2025
msgid "--uncommitted requires a working tree"
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3328
2029
#, python-format
2030
msgid "Unsupported export format: %s"
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3332
2034
msgid ""
2035
"Write the contents of a file as of a given revision to standard output."
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3334
2039
msgid "If no revision is nominated, the last revision is used."
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3336
2043
msgid ""
2044
"Note: Take care to redirect standard output when using this command on a\n"
2045
"binary file."
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3342
2049
msgid "The path name in the old tree."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3343
2053
msgid "Apply content filters to display the convenience form."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3354
2057
msgid "bzr cat --revision takes exactly one revision specifier"
2058
msgstr ""
2059
2060
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2061
msgid "{0!r} is not present in revision {1}"
2062
msgstr ""
2063
2064
#: bzrlib/builtins.py:3414
2065
msgid "Commit changes into a new revision."
2066
msgstr ""
2067
2068
#: bzrlib/builtins.py:3416
2069
msgid ""
2070
"An explanatory message needs to be given for each commit. This is\n"
2071
"often done by using the --message option (getting the message from the\n"
2072
"command line) or by using the --file option (getting the message from\n"
2073
"a file). If neither of these options is given, an editor is opened for\n"
2074
"the user to enter the message. To see the changed files in the\n"
2075
"boilerplate text loaded into the editor, use the --show-diff option."
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3423
2079
msgid ""
2080
"By default, the entire tree is committed and the person doing the\n"
2081
"commit is assumed to be the author. These defaults can be overridden\n"
2082
"as explained below."
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3427
2086
msgid ":Selective commits:"
2087
msgstr ""
2088
2089
#: bzrlib/builtins.py:3429
2090
msgid ""
2091
" If selected files are specified, only changes to those files are\n"
2092
" committed. If a directory is specified then the directory and\n"
2093
" everything within it is committed."
2094
msgstr ""
2095
2096
#: bzrlib/builtins.py:3433
2097
msgid ""
2098
" When excludes are given, they take precedence over selected files.\n"
2099
" For example, to commit only changes within foo, but not changes\n"
2100
" within foo/bar::"
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3437
2104
msgid " bzr commit foo -x foo/bar"
2105
msgstr ""
2106
2107
#: bzrlib/builtins.py:3439
2108
msgid " A selective commit after a merge is not yet supported."
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3441
2112
msgid ":Custom authors:"
2113
msgstr ""
2114
2115
#: bzrlib/builtins.py:3443
2116
msgid ""
2117
" If the author of the change is not the same person as the committer,\n"
2118
" you can specify the author's name using the --author option. The\n"
2119
" name should be in the same format as a committer-id, e.g.\n"
2120
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2121
" the change you can specify the option multiple times, once for each\n"
2122
" author."
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3450
2126
msgid ":Checks:"
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3452
2130
msgid ""
2131
" A common mistake is to forget to add a new file or directory before\n"
2132
" running the commit command. The --strict option checks for unknown\n"
2133
" files and aborts the commit if any are found. More advanced pre-commit\n"
2134
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2135
" for details."
2136
msgstr ""
2137
2138
#: bzrlib/builtins.py:3458
2139
msgid ":Things to note:"
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3460
2143
msgid ""
2144
" If you accidentially commit the wrong changes or make a spelling\n"
2145
" mistake in the commit message say, you can use the uncommit command\n"
2146
" to undo it. See ``bzr help uncommit`` for details."
2147
msgstr ""
2148
2149
#: bzrlib/builtins.py:3464
2150
msgid ""
2151
" Hooks can also be configured to run after a commit. This allows you\n"
2152
" to trigger updates to external systems like bug trackers. The --fixes\n"
2153
" option can be used to record the association between a revision and\n"
2154
" one or more bugs. See ``bzr help bugs`` for details."
2155
msgstr ""
2156
2157
#: bzrlib/builtins.py:3474
2158
msgid "Do not consider changes made to a given path."
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:3477
2162
msgid "Description of the new revision."
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3480
2166
msgid "Commit even if nothing has changed."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3484
2170
msgid "Take commit message from this file."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3486
2174
msgid "Refuse to commit if there are unknown files in the working tree."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3489
2178
msgid ""
2179
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2180
"08:00:00 +0100'."
2181
msgstr ""
2182
2183
#: bzrlib/builtins.py:3492
2184
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2185
msgstr ""
2186
2187
#: bzrlib/builtins.py:3495
2188
msgid "Set the author's name, if it's different from the committer."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3498
2192
msgid ""
2193
"Perform a local commit in a bound branch. Local commits are not pushed to "
2194
"the master branch until a normal commit is performed."
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3504
2198
msgid ""
2199
"When no message is supplied, show the diff along with the status summary in "
2200
"the message editor."
2201
msgstr ""
2202
2203
#: bzrlib/builtins.py:3507
2204
msgid ""
2205
"When committing to a foreign version control system do not push data that "
2206
"can not be natively represented."
2207
msgstr ""
2208
2209
#: bzrlib/builtins.py:3525
2210
#, python-format
2211
msgid ""
2212
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2213
"default bug tracker using the `bugtracker` option.\n"
2214
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3534
2218
#, python-format
2219
msgid ""
2220
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2221
"for more information on this feature.\n"
2222
"Commit refused."
2223
msgstr ""
2224
2225
#: bzrlib/builtins.py:3543
2226
#, python-format
2227
msgid "Unrecognized bug %s. Commit refused."
2228
msgstr ""
2229
2230
#: bzrlib/builtins.py:3546
2231
#, python-format
2232
msgid ""
2233
"%s\n"
2234
"Commit refused."
2235
msgstr ""
2236
2237
#: bzrlib/builtins.py:3570
2238
msgid "Could not parse --commit-time: "
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3610
2242
msgid "please specify either --message or --file"
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3639
2246
msgid "please specify a commit message with either --message or --file"
2247
msgstr ""
2248
2249
#: bzrlib/builtins.py:3642
2250
msgid ""
2251
"Empty commit message specified. Please specify a commit message with either -"
2252
"-message or --file or leave a blank message with --message \"\"."
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3662
2256
msgid ""
2257
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2258
"-unchanged to force an empty commit."
2259
msgstr ""
2260
2261
#: bzrlib/builtins.py:3666
2262
msgid ""
2263
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2264
"resolve FILE\" to resolve."
2265
msgstr ""
2266
2267
#: bzrlib/builtins.py:3670
2268
msgid "Commit refused because there are unknown files in the working tree."
2269
msgstr ""
2270
2271
#: bzrlib/builtins.py:3673
2272
msgid ""
2273
"\n"
2274
"To commit to master branch, run update and then commit.\n"
2275
"You can also pass --local to commit to continue working disconnected."
2276
msgstr ""
2277
2278
#: bzrlib/builtins.py:3681
2279
msgid ""
2280
"Validate working tree structure, branch consistency and repository history."
2281
msgstr ""
2282
2283
#: bzrlib/builtins.py:3683
2284
msgid ""
2285
"This command checks various invariants about branch and repository storage\n"
2286
"to detect data corruption or bzr bugs."
2287
msgstr ""
2288
2289
#: bzrlib/builtins.py:3686
2290
msgid ""
2291
"The working tree and branch checks will only give output if a problem is\n"
2292
"detected. The output fields of the repository check are:"
2293
msgstr ""
2294
2295
#: bzrlib/builtins.py:3689
2296
msgid ""
2297
"revisions\n"
2298
" This is just the number of revisions checked. It doesn't\n"
2299
" indicate a problem."
2300
msgstr ""
2301
2302
#: bzrlib/builtins.py:3693
2303
msgid ""
2304
"versionedfiles\n"
2305
" This is just the number of versionedfiles checked. It\n"
2306
" doesn't indicate a problem."
2307
msgstr ""
2308
2309
#: bzrlib/builtins.py:3697
2310
msgid ""
2311
"unreferenced ancestors\n"
2312
" Texts that are ancestors of other texts, but\n"
2313
" are not properly referenced by the revision ancestry. This is a\n"
2314
" subtle problem that Bazaar can work around."
2315
msgstr ""
2316
2317
#: bzrlib/builtins.py:3702
2318
msgid ""
2319
"unique file texts\n"
2320
" This is the total number of unique file contents\n"
2321
" seen in the checked revisions. It does not indicate a problem."
2322
msgstr ""
2323
2324
#: bzrlib/builtins.py:3706
2325
msgid ""
2326
"repeated file texts\n"
2327
" This is the total number of repeated texts seen\n"
2328
" in the checked revisions. Texts can be repeated when their file\n"
2329
" entries are modified, but the file contents are not. It does not\n"
2330
" indicate a problem."
2331
msgstr ""
2332
2333
#: bzrlib/builtins.py:3712
2334
msgid ""
2335
"If no restrictions are specified, all Bazaar data that is found at the "
2336
"given\n"
2337
"location will be checked."
2338
msgstr ""
2339
2340
#: bzrlib/builtins.py:3717
2341
msgid " Check the tree and branch at 'foo'::"
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3719
2345
msgid " bzr check --tree --branch foo"
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3721
2349
msgid " Check only the repository at 'bar'::"
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3723
2353
msgid " bzr check --repo bar"
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3725
2357
msgid " Check everything at 'baz'::"
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3727
2361
msgid " bzr check baz"
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3733
2365
msgid "Check the branch related to the current directory."
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3735
2369
msgid "Check the repository related to the current directory."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3737
2373
msgid "Check the working tree related to the current directory."
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3751
2377
msgid "Upgrade a repository, branch or working tree to a newer format."
2378
msgstr ""
2379
2380
#: bzrlib/builtins.py:3753
2381
msgid ""
2382
"When the default format has changed after a major new release of\n"
2383
"Bazaar, you may be informed during certain operations that you\n"
2384
"should upgrade. Upgrading to a newer format may improve performance\n"
2385
"or make new features available. It may however limit interoperability\n"
2386
"with older repositories or with older versions of Bazaar."
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3759
2390
msgid ""
2391
"If you wish to upgrade to a particular format rather than the\n"
2392
"current default, that can be specified using the --format option.\n"
2393
"As a consequence, you can use the upgrade command this way to\n"
2394
"\"downgrade\" to an earlier format, though some conversions are\n"
2395
"a one way process (e.g. changing from the 1.x default to the\n"
2396
"2.x default) so downgrading is not always possible."
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3766
2400
msgid ""
2401
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2402
"process (where # is a number). By default, this is left there on\n"
2403
"completion. If the conversion fails, delete the new .bzr directory\n"
2404
"and rename this one back in its place. Use the --clean option to ask\n"
2405
"for the backup.bzr directory to be removed on successful conversion.\n"
2406
"Alternatively, you can delete it by hand if everything looks good\n"
2407
"afterwards."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3774
2411
msgid ""
2412
"If the location given is a shared repository, dependent branches\n"
2413
"are also converted provided the repository converts successfully.\n"
2414
"If the conversion of a branch fails, remaining branches are still\n"
2415
"tried."
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:3779
2419
msgid ""
2420
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2421
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3787
2425
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2426
msgstr ""
2427
2428
#: bzrlib/builtins.py:3791
2429
msgid "Branch format"
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3793
2433
msgid "Remove the backup.bzr directory if successful."
2434
msgstr ""
2435
2436
#: bzrlib/builtins.py:3795
2437
msgid "Show what would be done, but don't actually do anything."
2438
msgstr ""
2439
2440
#: bzrlib/builtins.py:3810
2441
msgid "Show or set bzr user id."
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3812
2445
msgid ""
2446
":Examples:\n"
2447
" Show the email of the current user::"
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3815
2451
msgid " bzr whoami --email"
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3817
2455
msgid " Set the current user::"
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3819
2459
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3823
2463
msgid "Display email address only."
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3825
2467
msgid "Set identity for the current branch instead of globally."
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3851
2471
msgid "--email can only be used to display existing identity"
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3873
2475
msgid "Print or set the branch nickname."
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3875
2479
msgid ""
2480
"If unset, the tree root directory name is used as the nickname.\n"
2481
"To print the current nickname, execute with no argument."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3878
2485
msgid ""
2486
"Bound branches use the nickname of its master branch unless it is set\n"
2487
"locally."
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3898
2491
msgid "Set/unset and display aliases."
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3900
2495
msgid ""
2496
":Examples:\n"
2497
" Show the current aliases::"
2498
msgstr ""
2499
2500
#: bzrlib/builtins.py:3903
2501
msgid " bzr alias"
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3905
2505
msgid " Show the alias specified for 'll'::"
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3907
2509
msgid " bzr alias ll"
2510
msgstr ""
2511
2512
#: bzrlib/builtins.py:3909
2513
msgid " Set an alias for 'll'::"
2514
msgstr ""
2515
2516
#: bzrlib/builtins.py:3911
2517
msgid " bzr alias ll=\"log --line -r-10..-1\""
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3913
2521
msgid " To remove an alias for 'll'::"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3915
2525
msgid " bzr alias --remove ll"
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3920
2529
msgid "Remove the alias."
2530
msgstr ""
2531
2532
#: bzrlib/builtins.py:3938
2533
msgid "bzr alias --remove expects an alias to remove."
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:4119
2537
msgid ""
2538
"subunit not available. subunit needs to be installed to use --subunit."
2539
msgstr ""
2540
2541
#: bzrlib/builtins.py:4136
2542
msgid ""
2543
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:4183
2547
msgid "Show version of bzr."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:4187
2551
msgid "Print just the version number."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:4206
2555
msgid "It sure does!\n"
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:4230
2559
#, python-format
2560
msgid "merge base is revision %s\n"
2561
msgstr ""
2562
2563
#: bzrlib/builtins.py:4234
2564
msgid "Perform a three-way merge."
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:4236
2568
msgid ""
2569
"The source of the merge can be specified either in the form of a branch,\n"
2570
"or in the form of a path to a file containing a merge directive generated\n"
2571
"with bzr send. If neither is specified, the default is the upstream branch\n"
2572
"or the branch most recently merged using --remember. The source of the\n"
2573
"merge may also be specified in the form of a path to a file in another\n"
2574
"branch: in this case, only the modifications to that file are merged into\n"
2575
"the current working tree."
2576
msgstr ""
2577
2578
#: bzrlib/builtins.py:4244
2579
msgid ""
2580
"When merging from a branch, by default bzr will try to merge in all new\n"
2581
"work from the other branch, automatically determining an appropriate base\n"
2582
"revision. If this fails, you may need to give an explicit base."
2583
msgstr ""
2584
2585
#: bzrlib/builtins.py:4248
2586
msgid ""
2587
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2588
"try to merge in all new work up to and including revision OTHER."
2589
msgstr ""
2590
2591
#: bzrlib/builtins.py:4251
2592
msgid ""
2593
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2594
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2595
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2596
"not already contain revision BASE, such a merge is commonly referred to as\n"
2597
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2598
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2599
"changes from the other branch is not stored in the commit."
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:4259
2603
msgid "Revision numbers are always relative to the source branch."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2607
msgid ""
2608
"Merge will do its best to combine the changes in two branches, but there\n"
2609
"are some kinds of problems only a human can fix. When it encounters those,\n"
2610
"it will mark a conflict. A conflict means that you need to fix something,\n"
2611
"before you can commit."
2612
msgstr ""
2613
2614
#: bzrlib/builtins.py:4266
2615
msgid ""
2616
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:4268
2620
msgid ""
2621
"If there is no default branch set, the first merge will set it (use\n"
2622
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2623
"to use the default. To change the default, use --remember. The value will\n"
2624
"only be saved if the remote location can be accessed."
2625
msgstr ""
2626
2627
#: bzrlib/builtins.py:4273
2628
msgid ""
2629
"The results of the merge are placed into the destination working\n"
2630
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2631
"committed to record the result of the merge."
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4277
2635
msgid ""
2636
"merge refuses to run if there are any uncommitted changes, unless\n"
2637
"--force is given. If --force is given, then the changes from the source \n"
2638
"will be merged with the current working tree, including any uncommitted\n"
2639
"changes in the tree. The --force option can also be used to create a\n"
2640
"merge revision which has more than two parents."
2641
msgstr ""
2642
2643
#: bzrlib/builtins.py:4283
2644
msgid ""
2645
"If one would like to merge changes from the working tree of the other\n"
2646
"branch without merging any committed revisions, the --uncommitted option\n"
2647
"can be given."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:4287
2651
msgid ""
2652
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2653
"you to apply each diff hunk and file change, similar to \"shelve\"."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:4290
2657
msgid ""
2658
":Examples:\n"
2659
" To merge all new revisions from bzr.dev::"
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4293
2663
msgid " bzr merge ../bzr.dev"
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:4295
2667
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4297
2671
msgid " bzr merge -r 82 ../bzr.dev"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4299
2675
msgid " To merge the changes introduced by 82, without previous changes::"
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4301
2679
msgid " bzr merge -r 81..82 ../bzr.dev"
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4303
2683
msgid " To apply a merge directive contained in /tmp/merge::"
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4305
2687
msgid " bzr merge /tmp/merge"
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:4307
2691
msgid ""
2692
" To create a merge revision with three parents from two branches\n"
2693
" feature1a and feature1b:"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4310
2697
msgid ""
2698
" bzr merge ../feature1a\n"
2699
" bzr merge ../feature1b --force\n"
2700
" bzr commit -m 'revision with three parents'"
2701
msgstr ""
2702
2703
#: bzrlib/builtins.py:4322
2704
msgid "Merge even if the destination tree has uncommitted changes."
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:4328
2708
msgid ""
2709
"Apply uncommitted changes from a working copy, instead of branch changes."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4330
2713
msgid ""
2714
"If the destination is already completely merged into the source, pull from "
2715
"the source rather than merging. When this happens, you do not need to "
2716
"commit the result."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4335
2720
msgid ""
2721
"Branch to merge into, rather than the one containing the working directory."
2722
msgstr ""
2723
2724
#: bzrlib/builtins.py:4337
2725
msgid "Instead of merging, show a diff of the merge."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4339
2729
msgid "Select changes interactively."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4361
2733
msgid ""
2734
"Merging into empty branches not currently supported, "
2735
"https://bugs.launchpad.net/bzr/+bug/308562"
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4388
2739
msgid "Cannot use --uncommitted with bundles or merge directives."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4399
2743
msgid "Cannot use --uncommitted and --revision at the same time."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4419
2747
msgid "merger: "
2748
msgstr ""
2749
2750
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2751
msgid "Nothing to do."
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:4425
2755
msgid "Cannot pull individual files"
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4433
2759
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4491
2763
#, python-format
2764
msgid "Show-base is not supported for this merge type. %s"
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4500
2768
#, python-format
2769
msgid "Conflict reduction is not supported for merge type %s."
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:4504
2773
msgid "Cannot do conflict reduction and show base."
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4615
2777
msgid "No location specified or remembered"
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:4617
2781
msgid "{0} remembered {1} location {2}"
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4623
2785
msgid "Redo a merge."
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4625
2789
msgid ""
2790
"Use this if you want to try a different merge technique while resolving\n"
2791
"conflicts. Some merge techniques are better than others, and remerge\n"
2792
"lets you try different ones on different files."
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:4629
2796
msgid ""
2797
"The options for remerge have the same meaning and defaults as the ones for\n"
2798
"merge. The difference is that remerge can (only) be run when there is a\n"
2799
"pending merge, and it lets you specify particular files."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4633
2803
msgid ""
2804
":Examples:\n"
2805
" Re-do the merge of all conflicted files, and show the base text in\n"
2806
" conflict regions, in addition to the usual THIS and OTHER texts::"
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4637
2810
msgid " bzr remerge --show-base"
2811
msgstr ""
2812
2813
#: bzrlib/builtins.py:4639
2814
msgid ""
2815
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2816
" additional processing to reduce the size of conflict regions::"
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4642
2820
msgid " bzr remerge --merge-type weave --reprocess foobar"
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4649
2824
msgid "Show base revision text in conflicts."
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4661
2828
msgid ""
2829
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2830
"merges."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4717
2834
msgid "Revert files to a previous revision."
2835
msgstr ""
2836
2837
#: bzrlib/builtins.py:4719
2838
msgid ""
2839
"Giving a list of files will revert only those files. Otherwise, all files\n"
2840
"will be reverted. If the revision is not specified with '--revision', the\n"
2841
"last committed revision is used."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4723
2845
msgid ""
2846
"To remove only some changes, without reverting to a prior version, use\n"
2847
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2848
"will remove the changes introduced by the second last commit (-2), without\n"
2849
"affecting the changes introduced by the last commit (-1). To remove\n"
2850
"certain changes on a hunk-by-hunk basis, see the shelve command."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4729
2854
msgid ""
2855
"By default, any files that have been manually changed will be backed up\n"
2856
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2857
"'.~#~' appended to their name, where # is a number."
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:4733
2861
msgid ""
2862
"When you provide files, you can use their current pathname or the pathname\n"
2863
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2864
"name. If you name a directory, all the contents of that directory will be\n"
2865
"reverted."
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4738
2869
msgid ""
2870
"If you have newly added files since the target revision, they will be\n"
2871
"removed. If the files to be removed have been changed, backups will be\n"
2872
"created as above. Directories containing unknown files will not be\n"
2873
"deleted."
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4743
2877
msgid ""
2878
"The working tree contains a list of revisions that have been merged but\n"
2879
"not yet committed. These revisions will be included as additional parents\n"
2880
"of the next commit. Normally, using revert clears that list as well as\n"
2881
"reverting the files. If any files are specified, revert leaves the list\n"
2882
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2883
".`` in the tree root to revert all files but keep the recorded merges,\n"
2884
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2885
"reverting any files."
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4752
2889
msgid ""
2890
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2891
"changes from a branch in a single revision. To do this, perform the merge\n"
2892
"as desired. Then doing revert with the \"--forget-merges\" option will "
2893
"keep\n"
2894
"the content of the tree as it was, but it will clear the list of pending\n"
2895
"merges. The next commit will then contain all of the changes that are\n"
2896
"present in the other branch, but without any other parent revisions.\n"
2897
"Because this technique forgets where these changes originated, it may\n"
2898
"cause additional conflicts on later merges involving the same source and\n"
2899
"target branches."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4766
2903
msgid "Do not save backups of reverted files."
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4768
2907
msgid "Remove pending merge marker, without changing any files."
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:4799
2911
msgid ""
2912
"Show help on a command or other topic.\n"
2913
" "
2914
msgstr ""
2915
2916
#: bzrlib/builtins.py:4804
2917
msgid "Show help on all commands."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4833
2921
msgid "Show unmerged/unpulled revisions between two branches."
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4835
2925
msgid "OTHER_BRANCH may be local or remote."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4837
2929
msgid ""
2930
"To filter on a range of revisions, you can use the command -r begin..end\n"
2931
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2932
"also valid.\n"
2933
" \n"
2934
":Exit values:\n"
2935
" 1 - some missing revisions\n"
2936
" 0 - no missing revisions"
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4847
2940
msgid ""
2941
" Determine the missing revisions between this and the branch at the\n"
2942
" remembered pull location::"
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4850
2946
msgid " bzr missing"
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4852
2950
msgid " Determine the missing revisions between this and another branch::"
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4854
2954
msgid " bzr missing http://server/branch"
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4856
2958
msgid ""
2959
" Determine the missing revisions up to a specific revision on the other\n"
2960
" branch::"
2961
msgstr ""
2962
2963
#: bzrlib/builtins.py:4859
2964
msgid " bzr missing -r ..-10"
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4861
2968
msgid ""
2969
" Determine the missing revisions up to a specific revision on this\n"
2970
" branch::"
2971
msgstr ""
2972
2973
#: bzrlib/builtins.py:4864
2974
msgid " bzr missing --my-revision ..-10"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4871
2978
msgid "Reverse the order of revisions."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4873
2982
msgid "Display changes in the local branch only."
2983
msgstr ""
2984
2985
#: bzrlib/builtins.py:4874
2986
msgid "Same as --mine-only."
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4876
2990
msgid "Display changes in the remote branch only."
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4877
2994
msgid "Same as --theirs-only."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4882
2998
msgid ""
2999
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3000
"details."
3001
msgstr ""
3002
3003
#: bzrlib/builtins.py:4886
3004
msgid ""
3005
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3006
"details."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4889
3010
msgid "Show all revisions in addition to the mainline ones."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4943
3014
msgid "No peer location known or specified."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4947
3018
msgid "Using saved parent location: {0}\n"
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4980
3022
#, python-format
3023
msgid "You have %d extra revision:\n"
3024
msgid_plural "You have %d extra revisions:\n"
3025
msgstr[0] ""
3026
msgstr[1] ""
3027
3028
#: bzrlib/builtins.py:4996
3029
#, python-format
3030
msgid "You are missing %d revision:\n"
3031
msgid_plural "You are missing %d revisions:\n"
3032
msgstr[0] ""
3033
msgstr[1] ""
3034
3035
#: bzrlib/builtins.py:5008
3036
msgid "This branch has no new revisions.\n"
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:5011
3040
msgid "Other branch has no new revisions.\n"
3041
msgstr ""
3042
3043
#: bzrlib/builtins.py:5016
3044
msgid "Branches are up to date.\n"
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:5027
3048
msgid "Compress the data within a repository."
3049
msgstr ""
3050
3051
#: bzrlib/builtins.py:5029
3052
msgid ""
3053
"This operation compresses the data within a bazaar repository. As\n"
3054
"bazaar supports automatic packing of repository, this operation is\n"
3055
"normally not required to be done manually."
3056
msgstr ""
3057
3058
#: bzrlib/builtins.py:5033
3059
msgid ""
3060
"During the pack operation, bazaar takes a backup of existing repository\n"
3061
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3062
"automatically when it is safe to do so. To save disk space by removing\n"
3063
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3064
"used."
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:5039
3068
msgid ""
3069
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3070
"during or immediately after repacking, you may be left with a state\n"
3071
"where the deletion has been written to disk but the new packs have not\n"
3072
"been. In this case the repository may be unusable."
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:5048
3076
msgid "Delete obsolete packs to save disk space."
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:5062
3080
msgid "List the installed plugins."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:5064
3084
msgid ""
3085
"This command displays the list of installed plugins including\n"
3086
"version of plugin and a short description of each."
3087
msgstr ""
3088
3089
#: bzrlib/builtins.py:5067
3090
msgid "--verbose shows the path where each plugin is located."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:5069
3094
msgid ""
3095
"A plugin is an external component for Bazaar that extends the\n"
3096
"revision control system, by adding or replacing code in Bazaar.\n"
3097
"Plugins can do a variety of things, including overriding commands,\n"
3098
"adding new commands, providing additional network transports and\n"
3099
"customizing log output."
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:5075
3103
msgid ""
3104
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3105
"for further information on plugins including where to find them and how to\n"
3106
"install them. Instructions are also provided there on how to write new\n"
3107
"plugins using the Python programming language."
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:5091
3111
msgid "Show testament (signing-form) of a revision."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:5094
3115
msgid "Produce long-format testament."
3116
msgstr ""
3117
3118
#: bzrlib/builtins.py:5096
3119
msgid "Produce a strict-format testament."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5122
3123
msgid "Show the origin of each line in a file."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5124
3127
msgid ""
3128
"This prints out the given file with an annotation on the left side\n"
3129
"indicating which revision, author and date introduced the change."
3130
msgstr ""
3131
3132
#: bzrlib/builtins.py:5127
3133
msgid ""
3134
"If the origin is the same for a run of consecutive lines, it is\n"
3135
"shown only at the top, unless the --all option is given."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:5135
3139
msgid "Show annotations on all lines."
3140
msgstr ""
3141
3142
#: bzrlib/builtins.py:5136
3143
msgid "Show commit date in annotations."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5223
3147
msgid "Cannot sign a range of non-revision-history revisions"
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:5235
3151
msgid "Please supply either one revision, or a range."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5239
3155
msgid ""
3156
"Convert the current branch into a checkout of the supplied branch.\n"
3157
"If no branch is supplied, rebind to the last bound location."
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:5242
3161
msgid ""
3162
"Once converted into a checkout, commits must succeed on the master branch\n"
3163
"before they will be applied to the local branch."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:5245
3167
msgid ""
3168
"Bound branches use the nickname of its master branch unless it is set\n"
3169
"locally, in which case binding will update the local nickname to be\n"
3170
"that of the master."
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:5260
3174
msgid "No location supplied. This format does not remember old locations."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:5265
3178
msgid "Branch is already bound"
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:5267
3182
msgid "No location supplied and no previous location known"
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:5273
3186
msgid "These branches have diverged. Try merging, and then bind again."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5280
3190
msgid "Convert the current checkout into a regular branch."
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5282
3194
msgid ""
3195
"After unbinding, the local branch is considered independent and subsequent\n"
3196
"commits will be local only."
3197
msgstr ""
3198
3199
#: bzrlib/builtins.py:5293
3200
msgid "Local branch is not bound"
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5297
3204
msgid "Remove the last committed revision."
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5299
3208
msgid ""
3209
"--verbose will print out what is being removed.\n"
3210
"--dry-run will go through all the motions, but not actually\n"
3211
"remove anything."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5303
3215
msgid ""
3216
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3217
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3218
"branch at revision 15."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5307
3222
msgid ""
3223
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3224
"it may make is to restore any pending merges that were present before\n"
3225
"the commit."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:5318
3229
msgid "Don't actually make changes."
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:5319
3233
msgid "Say yes to all questions."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5321
3237
msgid "Keep tags that point to removed revisions."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5323
3241
msgid "Only remove the commits from the local branch when in a checkout."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5372
3245
msgid "No revisions to uncommit.\n"
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5387
3249
msgid "Dry-run, pretending to remove the above revisions.\n"
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5390
3253
msgid "The above revision(s) will be removed.\n"
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:5394
3257
msgid "Uncommit these revisions"
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5397
3261
msgid "Canceled\n"
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5404
3265
#, python-format
3266
msgid ""
3267
"You can restore the old tip by running:\n"
3268
" bzr pull . -r revid:%s\n"
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:5409
3272
msgid "Break a dead lock."
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5411
3276
msgid ""
3277
"This command breaks a lock on a repository, branch, working directory or\n"
3278
"config file."
3279
msgstr ""
3280
3281
#: bzrlib/builtins.py:5414
3282
msgid ""
3283
"CAUTION: Locks should only be broken when you are sure that the process\n"
3284
"holding the lock has been stopped."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5417
3288
msgid ""
3289
"You can get information on what locks are open via the 'bzr info\n"
3290
"[location]' command."
3291
msgstr ""
3292
3293
#: bzrlib/builtins.py:5420
3294
msgid ""
3295
":Examples:\n"
3296
" bzr break-lock\n"
3297
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3298
" bzr break-lock --conf ~/.bazaar"
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5429
3302
msgid "LOCATION is the directory where the config lock is."
3303
msgstr ""
3304
3305
#: bzrlib/builtins.py:5431
3306
msgid "Do not ask for confirmation before breaking the lock."
3307
msgstr ""
3308
3309
#: bzrlib/builtins.py:5466
3310
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5467
3314
msgid "Run the bzr server."
3315
msgstr ""
3316
3317
#: bzrlib/builtins.py:5473
3318
msgid "Serve on stdin/out for use from inetd or sshd."
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5474
3322
msgid "protocol"
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5475
3326
msgid "Protocol to serve."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5479
3330
msgid ""
3331
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3332
"Passing 0 as the port number will result in a dynamically allocated port. "
3333
"The default port depends on the protocol."
3334
msgstr ""
3335
3336
#: bzrlib/builtins.py:5485
3337
msgid "Serve contents of this directory."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5487
3341
msgid ""
3342
"By default the server is a readonly server. Supplying --allow-writes "
3343
"enables write access to the contents of the served directory and below. "
3344
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3345
"of external authentication is arranged supplying this option leads to global "
3346
"uncontrolled write access to your file system."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5496
3350
msgid "Override the default idle client timeout (5min)."
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5546
3354
msgid "Combine a tree into its containing tree."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5548
3358
msgid "This command requires the target tree to be in a rich-root format."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5550
3362
msgid ""
3363
"The TREE argument should be an independent tree, inside another tree, but\n"
3364
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3365
"running \"bzr branch\" with the target inside a tree.)"
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5554
3369
msgid ""
3370
"The result is a combined tree, with the subtree no longer an independent\n"
3371
"part. This is marked as a merge of the subtree into the containing tree,\n"
3372
"and all history is preserved."
3373
msgstr ""
3374
3375
#: bzrlib/builtins.py:5572
3376
#, python-format
3377
msgid ""
3378
"Can't join trees because %s doesn't support rich root data.\n"
3379
"You can use bzr upgrade on the repository."
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3383
msgid "Cannot join {0}. {1}"
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5592
3387
msgid "Split a subdirectory of a tree into a separate tree."
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5594
3391
msgid ""
3392
"This command will produce a target tree in a format that supports\n"
3393
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3394
"converted into earlier formats like 'dirstate-tags'."
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:5598
3398
msgid ""
3399
"The TREE argument should be a subdirectory of a working tree. That\n"
3400
"subdirectory will be converted into an independent tree, with its own\n"
3401
"branch. Commits in the top-level tree will not apply to the new subtree."
3402
msgstr ""
3403
3404
#: bzrlib/builtins.py:5678
3405
msgid "No submit branch specified or known"
3406
msgstr ""
3407
3408
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3409
msgid "No public branch specified or known"
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5691
3413
msgid "bzr merge-directive takes at most two one revision identifiers"
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5700
3417
msgid "No revisions to bundle."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5719
3421
msgid "Mail or create a merge-directive for submitting changes."
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5721
3425
msgid "A merge directive provides many things needed for requesting merges:"
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5723
3429
msgid "* A machine-readable description of the merge to perform"
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5725
3433
msgid "* An optional patch that is a preview of the changes requested"
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5727
3437
msgid ""
3438
"* An optional bundle of revision data, so that the changes can be applied\n"
3439
" directly from the merge directive, without retrieving data from a\n"
3440
" branch."
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:5731
3444
msgid ""
3445
"`bzr send` creates a compact data set that, when applied using bzr\n"
3446
"merge, has the same effect as merging from the source branch. "
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5734
3450
msgid ""
3451
"By default the merge directive is self-contained and can be applied to any\n"
3452
"branch containing submit_branch in its ancestory without needing access to\n"
3453
"the source branch."
3454
msgstr ""
3455
3456
#: bzrlib/builtins.py:5738
3457
msgid ""
3458
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3459
"revisions, but only a structured request to merge from the\n"
3460
"public_location. In that case the public_branch is needed and it must be\n"
3461
"up-to-date and accessible to the recipient. The public_branch is always\n"
3462
"included if known, so that people can check it later."
3463
msgstr ""
3464
3465
#: bzrlib/builtins.py:5744
3466
msgid ""
3467
"The submit branch defaults to the parent of the source branch, but can be\n"
3468
"overridden. Both submit branch and public branch will be remembered in\n"
3469
"branch.conf the first time they are used for a particular branch. The\n"
3470
"source branch defaults to that containing the working directory, but can\n"
3471
"be changed using --from."
3472
msgstr ""
3473
3474
#: bzrlib/builtins.py:5750
3475
msgid ""
3476
"Both the submit branch and the public branch follow the usual behavior with\n"
3477
"respect to --remember: If there is no default location set, the first send\n"
3478
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3479
"omit the location to use the default. To change the default, use\n"
3480
"--remember. The value will only be saved if the location can be accessed."
3481
msgstr ""
3482
3483
#: bzrlib/builtins.py:5756
3484
msgid ""
3485
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3486
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3487
"If a public location is known for the submit_branch, that location is used\n"
3488
"in the merge directive."
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:5761
3492
msgid ""
3493
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3494
"given, in which case it is sent to a file."
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5764
3498
msgid ""
3499
"Mail is sent using your preferred mail program. This should be transparent\n"
3500
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3501
"If the preferred client can't be found (or used), your editor will be used."
3502
msgstr ""
3503
3504
#: bzrlib/builtins.py:5768
3505
msgid ""
3506
"To use a specific mail program, set the mail_client configuration option.\n"
3507
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3508
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3509
"(MacOS X's\n"
3510
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3511
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3512
"add\n"
3513
"supported clients."
3514
msgstr ""
3515
3516
#: bzrlib/builtins.py:5775
3517
msgid ""
3518
"If mail is being sent, a to address is required. This can be supplied\n"
3519
"either on the commandline, by setting the submit_to configuration\n"
3520
"option in the branch itself or the child_submit_to configuration option\n"
3521
"in the submit branch."
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:5780
3525
msgid ""
3526
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3527
"and\n"
3528
"merge directive format 2. It is significantly faster and smaller than\n"
3529
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3530
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3531
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5786
3535
msgid ""
3536
"The merge directives created by bzr send may be applied using bzr merge or\n"
3537
"bzr pull by specifying a file containing a merge directive as the location."
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:5789
3541
msgid ""
3542
"bzr send makes extensive use of public locations to map local locations "
3543
"into\n"
3544
"URLs that can be used by other people. See `bzr help configuration` to\n"
3545
"set them, and use `bzr info` to display them."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5813
3549
msgid "Write merge directive to this file or directory; use - for stdout."
3550
msgstr ""
3551
3552
#: bzrlib/builtins.py:5817
3553
msgid ""
3554
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3555
"strict disables the check."
3556
msgstr ""
3557
3558
#: bzrlib/builtins.py:5819
3559
msgid "Mail the request to this address."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5823
3563
msgid "Body for the email."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5876
3567
msgid "Do not include a bundle in the merge directive."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5877
3571
msgid "Do not include a preview patch in the merge directive."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5880
3575
msgid "Remember submit and public branch."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5882
3579
msgid ""
3580
"Branch to generate the submission from, rather than the one containing the "
3581
"working directory."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3585
msgid "format"
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5893
3589
msgid "Use the specified output format."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5915
3593
msgid "Create, remove or modify a tag naming a revision."
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5917
3597
msgid ""
3598
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3599
"(--revision) option can be given -rtag:X, where X is any previously\n"
3600
"created tag."
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5921
3604
msgid ""
3605
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3606
"along when you branch, push, pull or merge."
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5924
3610
msgid ""
3611
"It is an error to give a tag name that already exists unless you pass\n"
3612
"--force, in which case the tag is moved to point to the new revision."
3613
msgstr ""
3614
3615
#: bzrlib/builtins.py:5927
3616
msgid ""
3617
"To rename a tag (change the name but keep it on the same revsion), run "
3618
"``bzr\n"
3619
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5930
3623
msgid ""
3624
"If no tag name is specified it will be determined through the \n"
3625
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3626
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3627
"details."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5940
3631
msgid "Delete this tag rather than placing it."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5943
3635
msgid "Branch in which to place the tag."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5945
3639
msgid "Replace existing tags."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5960
3643
msgid "No tag specified to delete."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5962
3647
#, python-format
3648
msgid "Deleted tag %s."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5976
3652
msgid "Please specify a tag name."
3653
msgstr ""
3654
3655
#: bzrlib/builtins.py:5984
3656
#, python-format
3657
msgid "Tag %s already exists for that revision."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5988
3661
#, python-format
3662
msgid "Created tag %s."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5990
3666
#, python-format
3667
msgid "Updated tag %s."
3668
msgstr ""
3669
3670
#: bzrlib/builtins.py:5994
3671
msgid "List tags."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5996
3675
msgid ""
3676
"This command shows a table of tag names and the revisions they reference."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:6002
3680
msgid "Branch whose tags should be displayed."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:6004
3684
msgid "Sort tags by different criteria."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:6004
3688
msgid "Sorting"
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:6073
3692
msgid "Reconfigure the type of a bzr directory."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:6075
3696
msgid "A target configuration must be specified."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:6077
3700
msgid ""
3701
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3702
"The order of preference is\n"
3703
"1. For a lightweight checkout, the current bound location.\n"
3704
"2. For branches that used to be checkouts, the previously-bound location.\n"
3705
"3. The push location.\n"
3706
"4. The parent location.\n"
3707
"If none of these is available, --bind-to must be specified."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:6091
3711
msgid "Tree type"
3712
msgstr ""
3713
3714
#: bzrlib/builtins.py:6092
3715
msgid "The relation between branch and tree."
3716
msgstr ""
3717
3718
#: bzrlib/builtins.py:6094
3719
msgid "Reconfigure to be an unbound branch with no working tree."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:6095
3723
msgid "Reconfigure to be an unbound branch with a working tree."
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:6096
3727
msgid "Reconfigure to be a bound branch with a working tree."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6097
3731
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:6102
3735
msgid "Repository type"
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6103
3739
msgid "Location fo the repository."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6105
3743
msgid ""
3744
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:6107
3748
msgid "Reconfigure to use a shared repository."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6111
3752
msgid "Trees in Repository"
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6112
3756
msgid "Whether new branches in the repository have trees."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6114
3760
msgid ""
3761
"Reconfigure repository to create working trees on branches by default."
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:6116
3765
msgid ""
3766
"Reconfigure repository to not create working trees on branches by default."
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:6119
3770
msgid "Branch to bind checkout to."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:6121
3774
msgid "Perform reconfiguration even if local changes will be lost."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:6124
3778
msgid "Reconfigure a branch to be stacked on another branch."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6128
3782
msgid ""
3783
"Reconfigure a branch to be unstacked. This may require copying substantial "
3784
"data into it."
3785
msgstr ""
3786
3787
#: bzrlib/builtins.py:6138
3788
msgid "Can't use both --stacked-on and --unstacked"
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:6152
3792
msgid "No target configuration specified"
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:6187
3796
msgid "Set the branch of a checkout and update."
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:6189
3800
msgid ""
3801
"For lightweight checkouts, this changes the branch being referenced.\n"
3802
"For heavyweight checkouts, this checks that there are no local commits\n"
3803
"versus the current bound branch, then it makes the local branch a mirror\n"
3804
"of the new location and binds to it."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6194
3808
msgid ""
3809
"In both cases, the working tree is updated and uncommitted changes\n"
3810
"are merged. The user can commit or revert these as they desire."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:6197
3814
msgid "Pending merges need to be committed or reverted before using switch."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:6199
3818
msgid ""
3819
"The path to the branch to switch to can be specified relative to the parent\n"
3820
"directory of the current branch. For example, if you are currently in a\n"
3821
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3822
"/path/to/newbranch."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:6204
3826
msgid ""
3827
"Bound branches use the nickname of its master branch unless it is set\n"
3828
"locally, in which case switching will update the local nickname to be\n"
3829
"that of the master."
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:6212
3833
msgid "Switch even if local commits will be lost."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:6215
3837
msgid "Create the target branch from this one before switching to it."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6229
3841
msgid "You must supply either a revision or a location"
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:6242
3845
msgid "cannot create branch without source branch"
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6262
3849
msgid "Manage filtered views."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6264
3853
msgid ""
3854
"Views provide a mask over the tree so that users can focus on\n"
3855
"a subset of a tree when doing their work. After creating a view,\n"
3856
"commands that support a list of files - status, diff, commit, etc -\n"
3857
"effectively have that list of files implicitly given each time.\n"
3858
"An explicit list of files can still be given but those files\n"
3859
"must be within the current view."
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:6271
3863
msgid ""
3864
"In most cases, a view has a short life-span: it is created to make\n"
3865
"a selected change and is deleted once that change is committed.\n"
3866
"At other times, you may wish to create one or more named views\n"
3867
"and switch between them."
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:6276
3871
msgid ""
3872
"To disable the current view without deleting it, you can switch to\n"
3873
"the pseudo view called ``off``. This can be useful when you need\n"
3874
"to see the whole tree for an operation or two (e.g. merge) but\n"
3875
"want to switch back to your view after that."
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:6281
3879
msgid ""
3880
":Examples:\n"
3881
" To define the current view::"
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:6284
3885
msgid " bzr view file1 dir1 ..."
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:6286
3889
msgid " To list the current view::"
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6288
3893
msgid " bzr view"
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:6290
3897
msgid " To delete the current view::"
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6292
3901
msgid " bzr view --delete"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6294
3905
msgid " To disable the current view without deleting it::"
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6296
3909
msgid " bzr view --switch off"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6298
3913
msgid " To define a named view and switch to it::"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6300
3917
msgid " bzr view --name view-name file1 dir1 ..."
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6302
3921
msgid " To list a named view::"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6304
3925
msgid " bzr view --name view-name"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6306
3929
msgid " To delete a named view::"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6308
3933
msgid " bzr view --name view-name --delete"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6310
3937
msgid " To switch to a named view::"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6312
3941
msgid " bzr view --switch view-name"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6314
3945
msgid " To list all views defined::"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6316
3949
msgid " bzr view --all"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6318
3953
msgid " To delete all views::"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6320
3957
msgid " bzr view --delete --all"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6327
3961
msgid "Apply list or delete action to all views."
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6330
3965
msgid "Delete the view."
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6333
3969
msgid "Name of the view to define, list or delete."
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6337
3973
msgid "Name of the view to switch to."
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6356
3977
msgid "Both --delete and a file list specified"
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6359
3981
msgid "Both --delete and --switch specified"
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6362
3985
msgid "Deleted all views.\n"
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6364
3989
msgid "No current view to delete"
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6367
3993
#, python-format
3994
msgid "Deleted '%s' view.\n"
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6371
3998
msgid "Both --switch and a file list specified"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6374
4002
msgid "Both --switch and --all specified"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6377
4006
msgid "No current view to disable"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6379
4010
#, python-format
4011
msgid "Disabled '%s' view.\n"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4015
msgid "Using '{0}' view: {1}\n"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6386
4019
msgid "Views defined:\n"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6395
4023
msgid "No views defined.\n"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6402
4027
msgid "Cannot change the 'off' pseudo view"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6410
4031
msgid "No current view.\n"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6413
4035
msgid "'{0}' view is: {1}\n"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6433
4039
msgid " <no hooks installed>\n"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6437
4043
msgid "Remove a branch."
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6439
4047
msgid ""
4048
"This will remove the branch from the specified location but \n"
4049
"will keep any working tree or repository in place."
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6444
4053
msgid " Remove the branch at repo/trunk::"
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6446
4057
msgid " bzr remove-branch repo/trunk"
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6461
4061
msgid "Plaintext diff output."
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6462
4065
msgid "Temporarily set aside some changes from the current tree."
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6464
4069
msgid ""
4070
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4071
"ie. out of the way, until a later time when you can bring them back from\n"
4072
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4073
"your working tree, and so they aren't propagated along with your branch nor\n"
4074
"will they survive its deletion."
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6470
4078
msgid "If shelve --list is specified, previously-shelved changes are listed."
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6472
4082
msgid ""
4083
"Shelve is intended to help separate several sets of changes that have\n"
4084
"been inappropriately mingled. If you just want to get rid of all changes\n"
4085
"and you don't need to restore them later, use revert. If you want to\n"
4086
"shelve all text changes at once, use shelve --all."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6477
4090
msgid ""
4091
"If filenames are specified, only the changes to those files will be\n"
4092
"shelved. Other files will be left untouched."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:6480
4096
msgid ""
4097
"If a revision is specified, changes since that revision will be shelved."
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6482
4101
msgid ""
4102
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4103
"restore the most recently shelved changes."
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:6485
4107
msgid ""
4108
"For complicated changes, it is possible to edit the changes in a separate\n"
4109
"editor program to decide what the file remaining in the working copy\n"
4110
"should look like. To do this, add the configuration option"
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:6489
4114
msgid " change_editor = PROGRAM @new_path @old_path"
4115
msgstr ""
4116
4117
#: bzrlib/builtins.py:6491
4118
msgid ""
4119
"where @new_path is replaced with the path of the new version of the \n"
4120
"file and @old_path is replaced with the path of the old version of \n"
4121
"the file. The PROGRAM should save the new file with the desired \n"
4122
"contents of the file in the working tree.\n"
4123
" "
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6503
4127
msgid "Shelve all changes."
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6505
4131
msgid "Method to use for writing diffs."
4132
msgstr ""
4133
4134
#: bzrlib/builtins.py:6505
4135
msgid "writer"
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6509
4139
msgid "List shelved changes."
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6511
4143
msgid "Destroy removed changes instead of shelving them."
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6540
4147
msgid "No shelved changes."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6551
4151
msgid "Restore shelved changes."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6553
4155
msgid ""
4156
"By default, the most recently shelved changes are restored. However if you\n"
4157
"specify a shelf by id those changes will be restored instead. This works\n"
4158
"best when the changes don't depend on each other."
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:6562
4162
msgid "The action to perform."
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4166
msgid "action"
4167
msgstr ""
4168
4169
#: bzrlib/builtins.py:6564
4170
msgid "Apply changes and remove from the shelf."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6565
4174
msgid "Show changes, but do not apply or remove them."
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6566
4178
msgid ""
4179
"Instead of unshelving the changes, show the diff that would result from "
4180
"unshelving."
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:6568
4184
msgid "Delete changes without applying them."
4185
msgstr ""
4186
4187
#: bzrlib/builtins.py:6569
4188
msgid "Apply changes but don't delete them."
4189
msgstr ""
4190
4191
#: bzrlib/builtins.py:6584
4192
msgid "Remove unwanted files from working tree."
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:6586
4196
msgid ""
4197
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4198
"files are never deleted."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6589
4202
msgid ""
4203
"Another class is 'detritus', which includes files emitted by bzr during\n"
4204
"normal operations and selftests. (The value of these files decreases with\n"
4205
"time.)"
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6593
4209
msgid ""
4210
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4211
"flags are respected, and may be combined."
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6596
4215
msgid "To check what clean-tree will do, use --dry-run."
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6599
4219
msgid "Delete all ignored files."
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6600
4223
msgid ""
4224
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4225
msgstr ""
4226
4227
#: bzrlib/builtins.py:6603
4228
msgid "Delete files unknown to bzr (default)."
4229
msgstr ""
4230
4231
#: bzrlib/builtins.py:6604
4232
msgid "Show files to delete instead of deleting them."
4233
msgstr ""
4234
4235
#: bzrlib/builtins.py:6606
4236
msgid "Do not prompt before deleting."
4237
msgstr ""
4238
4239
#: bzrlib/bundle/__init__.py:59
4240
msgid "A directory cannot be a bundle"
4241
msgstr ""
4242
4243
#: bzrlib/bundle/apply_bundle.py:40
4244
msgid "Install revisions"
4245
msgstr ""
4246
4247
#: bzrlib/bundle/commands.py:64
4248
msgid "--verbose requires a merge directive"
4249
msgstr ""
4250
4251
#: bzrlib/bundle/commands.py:67
4252
msgid "Bundle format not supported"
4253
msgstr ""
4254
4255
#: bzrlib/bundle/commands.py:77
4256
msgid "Records\n"
4257
msgstr ""
4258
4259
#: bzrlib/bundle/commands.py:81
4260
msgid "{0}: {1} ({2} multiparent)\n"
4261
msgstr ""
4262
4263
#: bzrlib/bundle/commands.py:83
4264
#, python-format
4265
msgid "unique files: %d\n"
4266
msgstr ""
4267
4268
#: bzrlib/bundle/commands.py:92
4269
msgid "Revisions\n"
4270
msgstr ""
4271
4272
#: bzrlib/bundle/commands.py:93
4273
#, python-format
4274
msgid "nicks: %s\n"
4275
msgstr ""
4276
4277
#: bzrlib/bundle/commands.py:95
4278
#, python-format
4279
msgid ""
4280
"committers: \n"
4281
"%s\n"
4282
msgstr ""
4283
4284
#: bzrlib/bundle/commands.py:103
4285
msgid "Decoded contents\n"
4286
msgstr ""
4287
4288
#: bzrlib/bundle/serializer/v4.py:327
4289
#, python-format
4290
msgid "Bundling %d revision."
4291
msgid_plural "Bundling %d revisions."
4292
msgstr[0] ""
4293
msgstr[1] ""
4294
4295
#: bzrlib/bzrdir.py:490
4296
msgid ""
4297
"making backup of {0}\n"
4298
" to {1}"
4299
msgstr ""
4300
4301
#: bzrlib/bzrdir.py:513
4302
msgid "renamed {0} to {1}"
4303
msgstr ""
4304
4305
#: bzrlib/bzrdir.py:1652
4306
#, python-format
4307
msgid ""
4308
"Source repository format does not support stacking, using format:\n"
4309
" %s"
4310
msgstr ""
4311
4312
#: bzrlib/bzrdir.py:1672
4313
#, python-format
4314
msgid ""
4315
"Source branch format does not support stacking, using format:\n"
4316
" %s"
4317
msgstr ""
4318
4319
#: bzrlib/bzrdir.py:1818
4320
msgid "starting repository conversion"
4321
msgstr ""
4322
4323
#: bzrlib/bzrdir.py:2039
4324
msgid "Using default stacking branch {0} at {1}"
4325
msgstr ""
4326
4327
#: bzrlib/check.py:108
4328
msgid "check"
4329
msgstr ""
4330
4331
#: bzrlib/check.py:110
4332
msgid "checking revisions"
4333
msgstr ""
4334
4335
#: bzrlib/check.py:112
4336
msgid "checking commit contents"
4337
msgstr ""
4338
4339
#: bzrlib/check.py:114
4340
msgid "checking file graphs"
4341
msgstr ""
4342
4343
#: bzrlib/check.py:118
4344
msgid "checking branches and trees"
4345
msgstr ""
4346
4347
#: bzrlib/check.py:205
4348
msgid "checked repository {0} format {1}"
4349
msgstr ""
4350
4351
#: bzrlib/check.py:208
4352
#, python-format
4353
msgid "%6d revisions"
4354
msgstr ""
4355
4356
#: bzrlib/check.py:209
4357
#, python-format
4358
msgid "%6d file-ids"
4359
msgstr ""
4360
4361
#: bzrlib/check.py:211
4362
#, python-format
4363
msgid "%6d unreferenced text versions"
4364
msgstr ""
4365
4366
#: bzrlib/check.py:215
4367
msgid "unreferenced version: {{{0}}} in {1}"
4368
msgstr ""
4369
4370
#: bzrlib/check.py:218
4371
#, python-format
4372
msgid "%6d revisions are missing inventory_sha1"
4373
msgstr ""
4374
4375
#: bzrlib/check.py:221
4376
#, python-format
4377
msgid "%6d revisions are mentioned but not present"
4378
msgstr ""
4379
4380
#: bzrlib/check.py:224
4381
#, python-format
4382
msgid "%6d ghost revisions"
4383
msgstr ""
4384
4385
#: bzrlib/check.py:229
4386
#, python-format
4387
msgid "%6d revisions missing parents in ancestry"
4388
msgstr ""
4389
4390
#: bzrlib/check.py:233
4391
#, python-format
4392
msgid " %s should be in the ancestry for:"
4393
msgstr ""
4394
4395
#: bzrlib/check.py:237
4396
#, python-format
4397
msgid "%6d inconsistent parents"
4398
msgstr ""
4399
4400
#: bzrlib/check.py:241
4401
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4402
msgstr ""
4403
4404
#: bzrlib/check.py:247
4405
#, python-format
4406
msgid "%6d revisions have incorrect parents in the revision index"
4407
msgstr ""
4408
4409
#: bzrlib/check.py:253
4410
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4411
msgstr ""
4412
4413
#: bzrlib/check.py:267
4414
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4415
msgstr ""
4416
4417
#: bzrlib/check.py:296
4418
msgid ""
4419
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4420
"{{{4}}}"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:354
4424
#, python-format
4425
msgid "Checking branch at '%s'."
4426
msgstr ""
4427
4428
#: bzrlib/check.py:374
4429
#, python-format
4430
msgid "Checking working tree at '%s'."
4431
msgstr ""
4432
4433
#: bzrlib/check.py:427 bzrlib/check.py:441
4434
msgid "No branch found at specified location."
4435
msgstr ""
4436
4437
#: bzrlib/check.py:429 bzrlib/check.py:439
4438
msgid "No working tree found at specified location."
4439
msgstr ""
4440
4441
#: bzrlib/check.py:432
4442
#, python-format
4443
msgid "Checking repository at '%s'."
4444
msgstr ""
4445
4446
#: bzrlib/check.py:443
4447
msgid "No repository found at specified location."
4448
msgstr ""
4449
4450
#: bzrlib/clean_tree.py:63
4451
msgid "Nothing to delete."
4452
msgstr ""
4453
4454
#: bzrlib/clean_tree.py:68
4455
msgid "Are you sure you wish to delete these"
4456
msgstr ""
4457
4458
#: bzrlib/clean_tree.py:70
4459
msgid "Canceled"
4460
msgstr ""
4461
4462
#: bzrlib/clean_tree.py:107
4463
#, python-format
4464
msgid "unable to remove %s"
4465
msgstr ""
4466
4467
#: bzrlib/clean_tree.py:111
4468
msgid "deleting paths:"
4469
msgstr ""
4470
4471
#: bzrlib/clean_tree.py:125
4472
msgid "unable to remove \"{0}\": {1}."
4473
msgstr ""
4474
4475
#: bzrlib/clean_tree.py:130
4476
msgid "No files deleted."
4477
msgstr ""
4478
4479
#: bzrlib/cmd_version_info.py:47
4480
msgid "No known version info format {0}. Supported types are: {1}"
4481
msgstr ""
4482
4483
#: bzrlib/cmd_version_info.py:52
4484
msgid "Version info in Custom template-based format."
4485
msgstr ""
4486
4487
#: bzrlib/cmd_version_info.py:52
4488
msgid "Version info in Python format."
4489
msgstr ""
4490
4491
#: bzrlib/cmd_version_info.py:52
4492
msgid "Version info in RIO (simple text) format (default)."
4493
msgstr ""
4494
4495
#: bzrlib/cmd_version_info.py:53
4496
msgid "Show version information about this tree."
4497
msgstr ""
4498
4499
#: bzrlib/cmd_version_info.py:55
4500
msgid ""
4501
"You can use this command to add information about version into\n"
4502
"source code of an application. The output can be in one of the\n"
4503
"supported formats or in a custom format based on a template."
4504
msgstr ""
4505
4506
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4507
#: en/help_topics/configuration.txt:710
4508
msgid "For example::"
4509
msgstr ""
4510
4511
#: bzrlib/cmd_version_info.py:61
4512
msgid ""
4513
" bzr version-info --custom \\\n"
4514
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4515
msgstr ""
4516
4517
#: bzrlib/cmd_version_info.py:64
4518
msgid ""
4519
"will produce a C header file with formatted string containing the\n"
4520
"current revision number. Other supported variables in templates are:"
4521
msgstr ""
4522
4523
#: bzrlib/cmd_version_info.py:67
4524
msgid ""
4525
" * {date} - date of the last revision\n"
4526
" * {build_date} - current date\n"
4527
" * {revno} - revision number\n"
4528
" * {revision_id} - revision id\n"
4529
" * {branch_nick} - branch nickname\n"
4530
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4531
" otherwise 1"
4532
msgstr ""
4533
4534
#: bzrlib/cmd_version_info.py:77
4535
msgid "Select the output format."
4536
msgstr ""
4537
4538
#: bzrlib/cmd_version_info.py:81
4539
msgid "Include all possible information."
4540
msgstr ""
4541
4542
#: bzrlib/cmd_version_info.py:82
4543
msgid "Check if tree is clean."
4544
msgstr ""
4545
4546
#: bzrlib/cmd_version_info.py:84
4547
msgid "Include the revision-history."
4548
msgstr ""
4549
4550
#: bzrlib/cmd_version_info.py:86
4551
msgid "Include the last revision for each file."
4552
msgstr ""
4553
4554
#: bzrlib/cmd_version_info.py:87
4555
msgid "Template for the output."
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:101
4559
msgid "bzr version-info --revision takes exactly one revision specifier"
4560
msgstr ""
4561
4562
#: bzrlib/commands.py:229
4563
#, python-format
4564
msgid "unknown command \"%s\""
4565
msgstr ""
4566
4567
#: bzrlib/commands.py:476
4568
msgid "No help for this command."
4569
msgstr ""
4570
4571
#: bzrlib/commands.py:489
4572
#, python-format
4573
msgid ":Purpose: %s\n"
4574
msgstr ""
4575
4576
#: bzrlib/commands.py:491
4577
#, python-format
4578
msgid ""
4579
":Usage:\n"
4580
"%s\n"
4581
msgstr ""
4582
4583
#: bzrlib/commands.py:493
4584
#, python-format
4585
msgid ":Usage: %s\n"
4586
msgstr ""
4587
4588
#: bzrlib/commands.py:512
4589
#, python-format
4590
msgid ":Options:%s"
4591
msgstr ""
4592
4593
#: bzrlib/commands.py:523
4594
#, python-format
4595
msgid ""
4596
":Description:\n"
4597
" %s\n"
4598
"\n"
4599
msgstr ""
4600
4601
#: bzrlib/commands.py:533
4602
#, python-format
4603
msgid ""
4604
"See bzr help %s for more details and examples.\n"
4605
"\n"
4606
msgstr ""
4607
4608
#: bzrlib/commands.py:538
4609
msgid ":Aliases: "
4610
msgstr ""
4611
4612
#: bzrlib/commands.py:542
4613
#, python-format
4614
msgid ":From: plugin \"%s\"\n"
4615
msgstr ""
4616
4617
#: bzrlib/commands.py:554
4618
msgid ":doc:`{0} <{1}-help>`"
4619
msgstr ""
4620
4621
#: bzrlib/commands.py:558
4622
#, python-format
4623
msgid ":See also: %s"
4624
msgstr ""
4625
4626
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4627
msgid "Only ASCII permitted in option names"
4628
msgstr ""
4629
4630
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4631
msgid "command {0!r} needs one or more {1}"
4632
msgstr ""
4633
4634
#: bzrlib/commands.py:858
4635
msgid "command {0!r} requires argument {1}"
4636
msgstr ""
4637
4638
#: bzrlib/commands.py:865
4639
msgid "extra argument to command {0}: {1}"
4640
msgstr ""
4641
4642
#: bzrlib/commands.py:962
4643
#, python-format
4644
msgid "Profile data written to \"%s\"."
4645
msgstr ""
4646
4647
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4648
msgid "added"
4649
msgstr ""
4650
4651
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4652
msgid "modified"
4653
msgstr ""
4654
4655
#: bzrlib/commit.py:131
4656
#, python-format
4657
msgid "Committing%s"
4658
msgstr ""
4659
4660
#: bzrlib/commit.py:134
4661
#, python-format
4662
msgid "Committed revision %d."
4663
msgstr ""
4664
4665
#: bzrlib/commit.py:143
4666
#, python-format
4667
msgid "deleted %s"
4668
msgstr ""
4669
4670
#: bzrlib/commit.py:146
4671
#, python-format
4672
msgid "missing %s"
4673
msgstr ""
4674
4675
#: bzrlib/commit.py:511
4676
msgid ""
4677
"Conflicting tags in bound branch:\n"
4678
"{0}"
4679
msgstr ""
4680
4681
#: bzrlib/commit.py:742
4682
msgid "renamed"
4683
msgstr ""
4684
4685
#: bzrlib/commit.py:977
4686
msgid "unchanged"
4687
msgstr ""
4688
4689
#: bzrlib/commit.py:999
4690
msgid "{0} [{1}] - Stage"
4691
msgstr ""
4692
4693
#: bzrlib/commit.py:1002
4694
#, python-format
4695
msgid "%s - Stage"
4696
msgstr ""
4697
4698
#: bzrlib/commit_signature_commands.py:36
4699
msgid "Sign all commits by a given committer."
4700
msgstr ""
4701
4702
#: bzrlib/commit_signature_commands.py:38
4703
msgid ""
4704
"If location is not specified the local tree is used.\n"
4705
"If committer is not specified the default committer is used."
4706
msgstr ""
4707
4708
#: bzrlib/commit_signature_commands.py:41
4709
msgid "This does not sign commits that already have signatures."
4710
msgstr ""
4711
4712
#: bzrlib/commit_signature_commands.py:49
4713
msgid ""
4714
"Don't actually sign anything, just print the revisions that would be signed."
4715
msgstr ""
4716
4717
#: bzrlib/commit_signature_commands.py:103
4718
msgid "Verify all commit signatures."
4719
msgstr ""
4720
4721
#: bzrlib/commit_signature_commands.py:105
4722
msgid ""
4723
"Verifies that all commits in the branch are signed by known GnuPG keys."
4724
msgstr ""
4725
4726
#: bzrlib/commit_signature_commands.py:110
4727
msgid ""
4728
"Comma separated list of GPG key patterns which are acceptable for "
4729
"verification."
4730
msgstr ""
4731
4732
#: bzrlib/commit_signature_commands.py:147
4733
msgid "Cannot verify a range of non-revision-history revisions"
4734
msgstr ""
4735
4736
#: bzrlib/commit_signature_commands.py:168
4737
msgid "All commits signed with verifiable keys"
4738
msgstr ""
4739
4740
#: bzrlib/config.py:475
4741
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4742
msgstr ""
4743
4744
#: bzrlib/config.py:2485
4745
msgid "{0} is not an SI unit."
4746
msgstr ""
4747
4748
#: bzrlib/config.py:2949
4749
msgid ""
4750
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4751
"will be saved."
4752
msgstr ""
4753
4754
#: bzrlib/config.py:3093
4755
#, python-format
4756
msgid "Invalid '%s', should be of the form 'name=value'"
4757
msgstr ""
4758
4759
#: bzrlib/config.py:3962
4760
msgid "Display, set or remove a configuration option."
4761
msgstr ""
4762
4763
#: bzrlib/config.py:3964
4764
msgid "Display the active value for a given option."
4765
msgstr ""
4766
4767
#: bzrlib/config.py:3966
4768
msgid ""
4769
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4770
"matching options are displayed mentioning their scope. The active value\n"
4771
"that bzr will take into account is the first one displayed for each option."
4772
msgstr ""
4773
4774
#: bzrlib/config.py:3970
4775
msgid "If no NAME is given, --all .* is implied."
4776
msgstr ""
4777
4778
#: bzrlib/config.py:3972
4779
msgid ""
4780
"Setting a value is achieved by using name=value without spaces. The value\n"
4781
"is set in the most relevant scope and can be checked by displaying the\n"
4782
"option again."
4783
msgstr ""
4784
4785
#: bzrlib/config.py:3984
4786
msgid "Reduce the scope to the specified configuration file."
4787
msgstr ""
4788
4789
#: bzrlib/config.py:3988
4790
msgid "Display all the defined values for the matching options."
4791
msgstr ""
4792
4793
#: bzrlib/config.py:3990
4794
msgid "Remove the option from the configuration file."
4795
msgstr ""
4796
4797
#: bzrlib/conflicts.py:50
4798
msgid "List files with conflicts."
4799
msgstr ""
4800
4801
#: bzrlib/conflicts.py:57
4802
msgid ""
4803
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4804
"is supplied, the pathnames of files with text conflicts are listed,\n"
4805
"instead. (This is useful for editing all files with text conflicts.)"
4806
msgstr ""
4807
4808
#: bzrlib/conflicts.py:61
4809
msgid "Use bzr resolve when you have fixed a problem."
4810
msgstr ""
4811
4812
#: bzrlib/conflicts.py:66
4813
msgid "List paths of files with text conflicts."
4814
msgstr ""
4815
4816
#: bzrlib/conflicts.py:85
4817
msgid "Marks the conflict as resolved."
4818
msgstr ""
4819
4820
#: bzrlib/conflicts.py:88
4821
msgid "Resolve the conflict preserving the version in the working tree."
4822
msgstr ""
4823
4824
#: bzrlib/conflicts.py:91
4825
msgid "Resolve the conflict taking the merged version into account."
4826
msgstr ""
4827
4828
#: bzrlib/conflicts.py:98
4829
msgid "How to resolve the conflict."
4830
msgstr ""
4831
4832
#: bzrlib/conflicts.py:104
4833
msgid "Mark a conflict as resolved."
4834
msgstr ""
4835
4836
#: bzrlib/conflicts.py:111
4837
msgid ""
4838
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4839
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4840
"as\n"
4841
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4842
msgstr ""
4843
4844
#: bzrlib/conflicts.py:119
4845
msgid "Resolve all conflicts in this tree."
4846
msgstr ""
4847
4848
#: bzrlib/conflicts.py:126
4849
msgid "If --all is specified, no FILE may be provided"
4850
msgstr ""
4851
4852
#: bzrlib/conflicts.py:151
4853
#, python-format
4854
msgid "%d conflict auto-resolved."
4855
msgid_plural "%d conflicts auto-resolved."
4856
msgstr[0] ""
4857
msgstr[1] ""
4858
4859
#: bzrlib/conflicts.py:154
4860
msgid "Remaining conflicts:"
4861
msgstr ""
4862
4863
#: bzrlib/conflicts.py:159
4864
msgid "All conflicts resolved."
4865
msgstr ""
4866
4867
#: bzrlib/conflicts.py:168
4868
msgid "{0} conflict resolved, {1} remaining"
4869
msgid_plural "{0} conflicts resolved, {1} remaining"
4870
msgstr[0] ""
4871
msgstr[1] ""
4872
4873
#: bzrlib/controldir.py:710
4874
msgid "{0} is{1} redirected to {2}"
4875
msgstr ""
4876
4877
#: bzrlib/diff.py:399
4878
#, python-format
4879
msgid "*** Ignoring files outside view. View is %s"
4880
msgstr ""
4881
4882
#: bzrlib/errors.py:157
4883
msgid "The tree builder is already building a tree."
4884
msgstr ""
4885
4886
#: bzrlib/errors.py:178
4887
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4888
msgstr ""
4889
4890
#: bzrlib/errors.py:197
4891
msgid ""
4892
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4893
"versions \"%(minimum)s\" to \"%(current)s\"."
4894
msgstr ""
4895
4896
#: bzrlib/errors.py:209
4897
msgid "The transport '%(transport)s' is only accessible within this process."
4898
msgstr ""
4899
4900
#: bzrlib/errors.py:227
4901
msgid "Invalid revision number %(revno)s"
4902
msgstr ""
4903
4904
#: bzrlib/errors.py:236
4905
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4906
msgstr ""
4907
4908
#: bzrlib/errors.py:247
4909
msgid "Reserved revision-id {%(revision_id)s}"
4910
msgstr ""
4911
4912
#: bzrlib/errors.py:261
4913
msgid "There is no public branch set for \"%(branch_url)s\"."
4914
msgstr ""
4915
4916
#: bzrlib/errors.py:271
4917
msgid ""
4918
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4919
"obtain a list of topics."
4920
msgstr ""
4921
4922
#: bzrlib/errors.py:280
4923
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4924
msgstr ""
4925
4926
#: bzrlib/errors.py:290
4927
msgid ""
4928
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4929
msgstr ""
4930
4931
#: bzrlib/errors.py:299
4932
msgid "The branch '%(branch)s' is not stacked."
4933
msgstr ""
4934
4935
#: bzrlib/errors.py:313
4936
msgid "No WorkingTree exists for \"%(base)s\"."
4937
msgstr ""
4938
4939
#: bzrlib/errors.py:322
4940
msgid "Not currently building a tree."
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:327
4944
msgid "%(url)s is not a local path."
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:355
4948
msgid "%(not_locked)r is not write locked but needs to be."
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:363
4952
msgid "Error in command line options"
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:368
4956
msgid "%(value)s is not an index of type %(_type)s."
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:378
4960
msgid "Error in data for index %(value)s."
4961
msgstr ""
4962
4963
#: bzrlib/errors.py:387
4964
msgid "The key '%(key)s' is already in index '%(index)s'."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:397
4968
msgid "The key '%(key)s' is not a valid key."
4969
msgstr ""
4970
4971
#: bzrlib/errors.py:406
4972
msgid "Could not parse options for index %(value)s."
4973
msgstr ""
4974
4975
#: bzrlib/errors.py:415
4976
msgid "The value '%(value)s' is not a valid value."
4977
msgstr ""
4978
4979
#: bzrlib/errors.py:424
4980
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:443
4984
msgid "Generic path error: %(path)r%(extra)s)"
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:456
4988
msgid "No such file: %(path)r%(extra)s"
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:461
4992
msgid "File exists: %(path)r%(extra)s"
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:467
4996
msgid ""
4997
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4998
"after to tell bzr about a rename that has already happened)%(extra)s"
4999
msgstr ""
5000
5001
#: bzrlib/errors.py:483
5002
msgid "\"%(path)s\" is not a directory %(extra)s"
5003
msgstr ""
5004
5005
#: bzrlib/errors.py:488
5006
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5007
msgstr ""
5008
5009
#: bzrlib/errors.py:493
5010
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5011
msgstr ""
5012
5013
#: bzrlib/errors.py:498
5014
msgid "Hard-linking \"%(path)s\" is not supported"
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:513
5018
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:518
5022
msgid "Permission denied: \"%(path)s\"%(extra)s"
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:523
5026
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5027
msgstr ""
5028
5029
#: bzrlib/errors.py:528
5030
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:539
5034
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:561
5038
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5039
msgstr ""
5040
5041
#: bzrlib/errors.py:571
5042
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5043
msgstr ""
5044
5045
#: bzrlib/errors.py:579
5046
msgid ""
5047
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5048
"upgrade the branch to permit branch stacking."
5049
msgstr ""
5050
5051
#: bzrlib/errors.py:590
5052
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5053
msgstr ""
5054
5055
#: bzrlib/errors.py:600
5056
msgid ""
5057
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5058
"need to upgrade the repository to permit branch stacking."
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:611
5062
msgid "Error reading from %(path)r."
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:630
5066
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:646
5070
msgid "Path \"%(path)s\" is not unicode normalized"
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:654
5074
msgid "Not a branch: \"%(path)s\"%(detail)s."
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:696
5078
msgid "No submit branch available for branch \"%(path)s\""
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:705
5082
msgid "A control directory already exists: \"%(path)s\"."
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:710
5086
msgid "Already a branch: \"%(path)s\"."
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:715
5090
msgid "Parent branch already exists: \"%(path)s\"."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:721
5094
msgid ""
5095
"Directory contains a branch, but no working tree (use bzr checkout if you "
5096
"wish to build a working tree): \"%(path)s\""
5097
msgstr ""
5098
5099
#: bzrlib/errors.py:726
5100
msgid ""
5101
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5102
msgstr ""
5103
5104
#: bzrlib/errors.py:736
5105
msgid ""
5106
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:746
5110
msgid "No repository present: \"%(path)s\""
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:753
5114
msgid ""
5115
"Unsupported branch format: %(format)s\n"
5116
"Please run 'bzr upgrade'"
5117
msgstr ""
5118
5119
#: bzrlib/errors.py:759
5120
msgid "Unknown %(kind)s format: %(format)r"
5121
msgstr ""
5122
5123
#: bzrlib/errors.py:768
5124
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:778
5128
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:793
5132
msgid ""
5133
"%(target)s\n"
5134
"is not compatible with\n"
5135
"%(source)s\n"
5136
"%(details)s"
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:809
5140
msgid "Revision is not compatible with %(repo_format)s"
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:819
5144
msgid "%(context_info)s%(path)s is already versioned."
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:840
5148
msgid "%(context_info)s%(path)s is not versioned."
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:861
5152
msgid "Path(s) are not versioned: %(paths_as_string)s"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:872
5156
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:891
5160
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:899
5164
msgid ""
5165
"Filename %(filename)r is not valid in your current filesystem encoding "
5166
"%(fs_encoding)s"
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:910
5170
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:928
5174
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:967
5178
msgid "Cannot lock %(lock)s: %(why)s"
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:977
5182
msgid ""
5183
"A transaction related operation was attempted after the transaction finished."
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:1004
5187
msgid "Cannot lock: transport is read only: %(transport)s"
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:1012
5191
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:1023
5195
msgid ""
5196
"Lock was broken while still open: %(lock)s - check storage consistency!"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:1034
5200
msgid ""
5201
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5202
"%(holder)r, wanted to break %(target)r"
5203
msgstr ""
5204
5205
#: bzrlib/errors.py:1046
5206
msgid ""
5207
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5208
"Use 'bzr break-lock' to clear it"
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:1059
5212
msgid "Lock not held: %(lock)s"
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:1088
5216
msgid "No changes to commit"
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:1093
5220
msgid ""
5221
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5222
msgstr ""
5223
5224
#: bzrlib/errors.py:1103
5225
msgid ""
5226
"Excluding paths during commit is not supported by repository at "
5227
"%(repository)r."
5228
msgstr ""
5229
5230
#: bzrlib/errors.py:1112
5231
msgid ""
5232
"The specified commit message contains characters unsupported by the current "
5233
"encoding."
5234
msgstr ""
5235
5236
#: bzrlib/errors.py:1118
5237
msgid "Upgrade URL cannot work with readonly URLs."
5238
msgstr ""
5239
5240
#: bzrlib/errors.py:1123
5241
msgid "The branch format %(format)s is already at the most recent format."
5242
msgstr ""
5243
5244
#: bzrlib/errors.py:1146
5245
msgid "Option --change does not accept revision ranges"
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:1151
5249
msgid "No namespace registered for string: %(spec)r"
5250
msgstr ""
5251
5252
#: bzrlib/errors.py:1170
5253
msgid ""
5254
"Requested revision: '%(spec)s' does not exist in branch: "
5255
"%(branch_url)s%(extra)s"
5256
msgstr ""
5257
5258
#: bzrlib/errors.py:1184
5259
msgid ""
5260
"Operation denied because it would change the main history, which is not "
5261
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:1195
5265
msgid ""
5266
"These branches have diverged. Use the missing command to see how.\n"
5267
"Use the merge command to reconcile them."
5268
msgstr ""
5269
5270
#: bzrlib/errors.py:1215
5271
msgid ""
5272
"Branches have no common ancestor, and no merge base revision was specified."
5273
msgstr ""
5274
5275
#: bzrlib/errors.py:1221
5276
msgid ""
5277
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:1227
5281
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:1236
5285
msgid ""
5286
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5287
msgstr ""
5288
5289
#: bzrlib/errors.py:1245
5290
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:1254
5294
msgid "Branch %(branch)s has no commits."
5295
msgstr ""
5296
5297
#: bzrlib/errors.py:1272
5298
msgid ""
5299
"Bound branch %(branch)s is out of date with master branch "
5300
"%(master)s.%(extra_help)s"
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:1284
5304
msgid ""
5305
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5306
"bound to %(remote)s."
5307
msgstr ""
5308
5309
#: bzrlib/errors.py:1296
5310
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:1305
5314
msgid ""
5315
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5316
"%(error)s"
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:1317
5320
msgid "Error in processing weave: %(msg)s"
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:1326
5324
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:1337
5328
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5329
msgstr ""
5330
5331
#: bzrlib/errors.py:1347
5332
msgid "Weave invariant violated: %(what)s"
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:1356
5336
msgid "Parents are mismatched between two revisions. %(msg)s"
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:1378
5340
msgid ""
5341
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5342
"%(weave_b)s"
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:1390
5346
msgid "Versioned file error"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1395
5350
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1405
5354
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:1415
5358
msgid "Text did not match its checksum: %(msg)s"
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:1541
5362
msgid "Export format %(format)r not supported"
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:1550
5366
msgid "Transport error: %(msg)s %(orig_error)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1576
5370
msgid "Generic bzr smart protocol error: %(details)s"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1584
5374
msgid "Received bad protocol version marker: %(marker)r"
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:1616
5378
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:1621
5382
msgid "Connection error: %(msg)s %(orig_error)s"
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:1626
5386
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1647
5390
msgid "Connection closed: %(msg)s %(orig_error)s"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1652
5394
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1657
5398
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:1667
5402
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1682
5406
msgid "Certificate error: %(error)s"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1690
5410
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1704
5414
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1712
5418
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1721
5422
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1735
5426
msgid "Too many redirections"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1740
5430
msgid "Working tree has conflicts."
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1744
5434
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1753
5438
msgid ""
5439
"Error(s) parsing config file %(filename)s:\n"
5440
"%(errors)s"
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:1763
5444
msgid ""
5445
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5446
"See ``bzr help %(name)s``"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1773
5450
msgid "%(username)r does not seem to contain a reasonable email address"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1782
5454
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1790
5458
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1798
5462
msgid "Unable to import library \"%(library)s\": %(error)s"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1806
5466
msgid "python-gpgme is not installed, it is needed to verify signatures"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1814
5470
msgid ""
5471
"The working tree for %(basedir)s has changed since the last commit, but "
5472
"weave merge requires that it be unchanged"
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1824
5476
msgid ""
5477
"Can't reprocess and show base, because reprocessing obscures the "
5478
"relationship of conflicting lines to the base"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1830
5482
msgid "Cycle in graph %(graph)r"
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:1858
5486
msgid "File %(filename)s is not conflicted."
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1880
5490
msgid "No bundle was found in \"%(filename)s\"."
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1889
5494
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:1899
5498
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1912
5502
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1922
5506
msgid "Key %(key)s is already present in map"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1927
5510
msgid "The prefix %(prefix)s is in the help search path twice."
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1937
5514
msgid ""
5515
"No final name for trans_id %(trans_id)r\n"
5516
"file-id: %(file_id)r\n"
5517
"root trans-id: %(root_trans_id)r\n"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1969
5521
msgid "Attempt to reuse a transform that has already been applied."
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1974
5525
msgid "Moving the root directory is not supported at this time"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1979
5529
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1990
5533
msgid ""
5534
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:2026
5538
msgid ""
5539
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:2056
5543
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:2064
5547
msgid "Nothing to merge."
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:2069
5551
msgid "Format %(format)s cannot be initialised by this version of bzr."
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:2078
5555
msgid ""
5556
"Cannot convert from format %(from_format)s to format %(format)s. "
5557
"%(problem)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:2090
5561
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:2098
5565
msgid "%(exe_name)s could not be found on this machine"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:2106
5569
msgid "Diff is not installed on this machine: %(msg)s"
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:2114
5573
msgid "Diff3 is not installed on this machine."
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:2120
5577
msgid "The content being inserted is already present."
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:2125
5581
msgid ""
5582
"This tree contains left-over files from a failed operation.\n"
5583
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5584
"to\n"
5585
" keep, and delete it when you are done."
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:2136
5589
msgid ""
5590
"This tree contains left-over files from a failed operation.\n"
5591
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5592
" wish to keep, and delete it when you are done."
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:2146
5596
msgid ""
5597
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5598
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5599
"to\n"
5600
" keep, and delete it when you are done."
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:2157
5604
msgid ""
5605
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5606
"examine %(pending_deletion)s to see if it contains any files you wish to "
5607
"keep, and delete it when you are done."
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:2167
5611
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:2181
5615
msgid ""
5616
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:2194
5620
msgid "Error in merge modified format"
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:2199
5624
msgid "Format error in conflict listings"
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:2203
5628
msgid ""
5629
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5630
"Error: %(description)s"
5631
msgstr ""
5632
5633
#: bzrlib/errors.py:2214
5634
msgid ""
5635
"An error has been detected in the repository %(repo_path)s.\n"
5636
"Please run bzr reconcile on this repository."
5637
msgstr ""
5638
5639
#: bzrlib/errors.py:2225
5640
msgid ""
5641
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5642
"reason: %(reason)s"
5643
msgstr ""
5644
5645
#: bzrlib/errors.py:2238
5646
msgid ""
5647
"An inconsistent delta was supplied: %(delta)r\n"
5648
"reason: %(reason)s"
5649
msgstr ""
5650
5651
#: bzrlib/errors.py:2250
5652
msgid "To use this feature you must upgrade your branch at %(path)s."
5653
msgstr ""
5654
5655
#: bzrlib/errors.py:2259
5656
msgid "To use this feature you must upgrade your repository at %(path)s."
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2264
5660
msgid ""
5661
"To use this feature you must upgrade your branch at %(path)s to a format "
5662
"which supports rich roots."
5663
msgstr ""
5664
5665
#: bzrlib/errors.py:2270
5666
msgid "Cannot perform local-only commits on unbound branches."
5667
msgstr ""
5668
5669
#: bzrlib/errors.py:2275
5670
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:2296
5674
msgid "Ghost tags not supported by format %(format)r."
5675
msgstr ""
5676
5677
#: bzrlib/errors.py:2304
5678
msgid "File is binary but should be text."
5679
msgstr ""
5680
5681
#: bzrlib/errors.py:2309
5682
msgid "The path %(path)s is not permitted on this platform"
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:2318
5686
msgid ""
5687
"Testament did not match expected value.\n"
5688
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5689
" {%(measured)s}"
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:2330
5693
msgid "Not a bzr revision-bundle: %(text)r"
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:2339
5697
msgid "Bad bzr revision-bundle: %(text)r"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:2348
5701
msgid "Malformed bzr revision-bundle header: %(text)r"
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:2353
5705
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2358
5709
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:2363
5713
msgid "End of line marker was not \\n in bzr revision-bundle"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:2373
5717
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2383
5721
msgid "Root class for inventory serialization errors"
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:2387
5725
msgid ""
5726
"The inventory was not in the expected format:\n"
5727
" %(msg)s"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:2396
5731
msgid "This operation requires rich root data storage"
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:2409
5735
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:2418
5739
msgid ""
5740
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5741
"variable."
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:2425
5745
msgid ""
5746
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5747
"ghost at {%(ghost_revision_id)s}"
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:2435
5751
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:2486
5755
msgid ""
5756
"A merge directive must provide either a bundle or a public branch location."
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2493
5760
msgid "Bad merge directive payload %(start)r"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2503
5764
msgid "Preview patch does not match requested changes."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2509
5768
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2519
5772
msgid ""
5773
"Your branch does not have all of the revisions required in order to merge "
5774
"this merge directive and the target location specified in the merge "
5775
"directive is not a branch: %(location)s."
5776
msgstr ""
5777
5778
#: bzrlib/errors.py:2531
5779
msgid "Unsupported entry kind %(kind)s"
5780
msgstr ""
5781
5782
#: bzrlib/errors.py:2539
5783
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:2549
5787
msgid "Subsume target %(other_tree)s needs to be upgraded."
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2568
5791
msgid "No such tag: %(tag_name)s"
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2576
5795
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:2585
5799
msgid "Tag %(tag_name)s already exists."
5800
msgstr ""
5801
5802
#: bzrlib/errors.py:2593
5803
msgid ""
5804
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5805
"bugs\" for more information on this feature."
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:2603
5809
msgid ""
5810
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:2613
5814
msgid ""
5815
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2623
5819
msgid "Invalid line in bugs property: '%(line)s'"
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2631
5823
msgid "Invalid bug status: '%(status)s'"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2639
5827
msgid "Could not understand response from smart server: %(response_tuple)r"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2678
5831
msgid "Server sent an unexpected error: %(error_tuple)r"
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2697
5835
msgid "Unrecognised container format: %(container_format)r"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2705
5839
msgid "Unexpected end of container stream"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2710
5843
msgid "Unknown record type: %(record_type)r"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2718
5847
msgid "Invalid record: %(reason)s"
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2726
5851
msgid "Container has data after end marker: %(excess)r"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2734
5855
msgid "Container has multiple records with the same name: %(name)s"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2747
5859
msgid "Corrupt or incompatible data stream: %(reason)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2755
5863
msgid "SMTP error: %(error)s"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2763
5867
msgid "No message supplied."
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2768
5871
msgid "No mail-to address (--mail-to) or output (-o) specified."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2773
5875
msgid "Unknown mail client: %(mail_client)s"
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2781
5879
msgid ""
5880
"Unable to find mail client with the following names: "
5881
"%(mail_command_list_string)s"
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:2791
5885
msgid "SMTP connection to %(host)s refused"
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:2800
5889
msgid "Please specify smtp_server. No server at default %(host)s."
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:2814
5893
msgid ""
5894
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5895
"reconfigure."
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2826
5899
msgid "'%(display_url)s' is already a branch."
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2831
5903
msgid "'%(display_url)s' is already a tree."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2836
5907
msgid "'%(display_url)s' is already a checkout."
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2841
5911
msgid "'%(display_url)s' is already a lightweight checkout."
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2846
5915
msgid "'%(display_url)s' is already using a shared repository."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2851
5919
msgid "'%(display_url)s' is already standalone."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2856
5923
msgid "Shared repository '%(display_url)s' already creates working trees."
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2862
5927
msgid ""
5928
"Shared repository '%(display_url)s' already doesn't create working trees."
5929
msgstr ""
5930
5931
#: bzrlib/errors.py:2868
5932
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5933
msgstr ""
5934
5935
#: bzrlib/errors.py:2873
5936
msgid "No location could be found to bind to at %(display_url)s."
5937
msgstr ""
5938
5939
#: bzrlib/errors.py:2878
5940
msgid ""
5941
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5942
"status).%(more)s"
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2897
5946
msgid ""
5947
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5948
"list).%(more)s"
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2903
5952
msgid "Variable {%(name)s} is not available."
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2911
5956
msgid "No template specified."
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2916
5960
msgid "Unable to create symlink %(path_str)son this platform"
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2931
5964
msgid ""
5965
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5966
"\"original\", \"local\"."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2965
5970
msgid ""
5971
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2977
5975
msgid "The \"%(config_id)s\" configuration does not exist."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2985
5979
msgid "The \"%(option_name)s\" configuration option does not exist."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2993
5983
msgid "The alias \"%(alias_name)s\" does not exist."
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:3007
5987
msgid "\"%(alias_name)s\" is not a valid location alias."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:3015
5991
msgid "No %(alias_name)s location assigned."
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:3023
5995
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:3033
5999
msgid "Unknown rules detected: %(unknowns_str)s."
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:3044
6003
msgid "Tip change rejected: %(msg)s"
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:3052
6007
msgid "Shelf corrupt."
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:3057
6011
msgid "Corruption while decompressing repository file%(orig_error)s"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:3069
6015
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:3077
6019
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:3085
6023
msgid ""
6024
"An attempt to access a url outside the server jail was made: '%(url)s'."
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:3093
6028
msgid "The user aborted the operation."
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:3098
6032
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:3108
6036
msgid "No such view: %(view_name)s."
6037
msgstr ""
6038
6039
#: bzrlib/errors.py:3118
6040
msgid ""
6041
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6042
"to a later format."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:3127
6046
msgid ""
6047
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3194
6051
msgid "%(bzrdir)r does not support co-located branches."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3200
6055
msgid ""
6056
"Unable to determine your name.\n"
6057
"Please, set your name with the 'whoami' command.\n"
6058
"E.g. bzr whoami \"Your Name <name@example.com>\""
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:3209
6062
msgid "Invalid pattern(s) found. %(msg)s"
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:3217
6066
msgid ""
6067
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6068
"unbind` to fix."
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:3228
6072
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:3237
6076
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:3246
6080
msgid ""
6081
"No compatible object available for operations from %(source)r to %(target)r."
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:3256
6085
msgid ""
6086
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6087
"%(arguments)s."
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:3266
6091
msgid ""
6092
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6093
"format %(format)r"
6094
msgstr ""
6095
6096
#: bzrlib/errors.py:3278
6097
msgid ""
6098
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6099
"plugin."
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:3291
6103
msgid "Binary files section encountered."
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:3299
6107
msgid ""
6108
"Malformed patch header. %(desc)s\n"
6109
"%(line)r"
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:3308
6113
msgid ""
6114
"Malformed hunk header. %(desc)s\n"
6115
"%(line)r"
6116
msgstr ""
6117
6118
#: bzrlib/errors.py:3317
6119
msgid ""
6120
"Malformed line. %(desc)s\n"
6121
"%(line)r"
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:3327
6125
msgid ""
6126
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6127
"but patch says it should be \"%(patch_line)s\""
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:3338
6131
msgid "The feature %(feature)s has already been registered."
6132
msgstr ""
6133
6134
#: bzrlib/export_pot.py:252
6135
#, python-format
6136
msgid "Exporting messages from builtin command: %s"
6137
msgstr ""
6138
6139
#: bzrlib/export_pot.py:271
6140
msgid "Exporting messages from plugin command: {0} in {1}"
6141
msgstr ""
6142
6143
#: bzrlib/export_pot.py:292
6144
#, python-format
6145
msgid "Exporting message from error: %s"
6146
msgstr ""
6147
6148
#: bzrlib/fetch.py:98
6149
msgid "Finding revisions"
6150
msgstr ""
6151
6152
#: bzrlib/fetch.py:103
6153
msgid "Fetching revisions"
6154
msgstr ""
6155
6156
#: bzrlib/foreign.py:262
6157
msgid "Push into a different VCS without any custom bzr metadata."
6158
msgstr ""
6159
6160
#: bzrlib/foreign.py:264
6161
msgid ""
6162
"This will afterwards rebase the local branch on the remote\n"
6163
"branch unless the --no-rebase option is used, in which case \n"
6164
"the two branches will be out of sync after the push. "
6165
msgstr ""
6166
6167
#: bzrlib/foreign.py:277
6168
msgid "Do not rebase after push."
6169
msgstr ""
6170
6171
#: bzrlib/foreign.py:311
6172
#, python-format
6173
msgid "Using saved location: %s\n"
6174
msgstr ""
6175
6176
#: bzrlib/foreign.py:321
6177
msgid ""
6178
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6179
"regular push."
6180
msgstr ""
6181
6182
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6183
msgid "{0} commits with valid signatures"
6184
msgstr ""
6185
6186
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6187
msgid "{0} commit with unknown key"
6188
msgid_plural "{0} commits with unknown keys"
6189
msgstr[0] ""
6190
msgstr[1] ""
6191
6192
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6193
msgid "{0} commit not valid"
6194
msgid_plural "{0} commits not valid"
6195
msgstr[0] ""
6196
msgstr[1] ""
6197
6198
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6199
msgid "{0} commit not signed"
6200
msgid_plural "{0} commits not signed"
6201
msgstr[0] ""
6202
msgstr[1] ""
6203
6204
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6205
msgid "{0} commit with key now expired"
6206
msgid_plural "{0} commits with key now expired"
6207
msgstr[0] ""
6208
msgstr[1] ""
6209
6210
#: bzrlib/gpg.py:343
6211
msgid "No GnuPG key results for pattern: {0}"
6212
msgstr ""
6213
6214
#: bzrlib/gpg.py:386
6215
msgid "{0} signed {1} commit"
6216
msgid_plural "{0} signed {1} commits"
6217
msgstr[0] ""
6218
msgstr[1] ""
6219
6220
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6221
msgid "{0} commit by author {1}"
6222
msgid_plural "{0} commits by author {1}"
6223
msgstr[0] ""
6224
msgstr[1] ""
6225
6226
#: bzrlib/gpg.py:433
6227
msgid "Unknown key {0} signed {1} commit"
6228
msgid_plural "Unknown key {0} signed {1} commits"
6229
msgstr[0] ""
6230
msgstr[1] ""
6231
6232
#: bzrlib/gpg.py:452
6233
msgid "{0} commit by author {1} with key {2} now expired"
6234
msgid_plural "{0} commits by author {1} with key {2} now expired"
6235
msgstr[0] ""
6236
msgstr[1] ""
6237
6238
#: bzrlib/groupcompress.py:1739
6239
#, python-format
6240
msgid "Insert claimed random_id=True, but then inserted %r two times"
6241
msgstr ""
6242
6243
#: bzrlib/hooks.py:331
6244
#, python-format
6245
msgid "Introduced in: %s"
6246
msgstr ""
6247
6248
#: bzrlib/hooks.py:334
6249
#, python-format
6250
msgid "Deprecated in: %s"
6251
msgstr ""
6252
6253
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6254
msgid "Walking content"
6255
msgstr ""
6256
6257
#: bzrlib/knit.py:3330
6258
msgid "annotating"
6259
msgstr ""
6260
6261
#: bzrlib/lock.py:548
6262
msgid "{0!r} was {1} locked again"
6263
msgstr ""
6264
6265
#: bzrlib/lockdir.py:321
6266
#, python-format
6267
msgid "error removing pending lock: %s"
6268
msgstr ""
6269
6270
#: bzrlib/lockdir.py:616
6271
msgid "Unable to obtain"
6272
msgstr ""
6273
6274
#: bzrlib/lockdir.py:618
6275
msgid "Lock owner changed for"
6276
msgstr ""
6277
6278
#: bzrlib/lockdir.py:620
6279
msgid "{0} lock {1} {2}."
6280
msgstr ""
6281
6282
#: bzrlib/lockdir.py:627
6283
#, python-format
6284
msgid "Will continue to try until %s, unless you press Ctrl-C."
6285
msgstr ""
6286
6287
#: bzrlib/lockdir.py:629
6288
msgid "See \"bzr help break-lock\" for more."
6289
msgstr ""
6290
6291
#: bzrlib/lockdir.py:739
6292
#, python-format
6293
msgid ""
6294
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6295
msgstr ""
6296
6297
#: bzrlib/log.py:572
6298
msgid "--exclude-common-ancestry requires two different revisions"
6299
msgstr ""
6300
6301
#: bzrlib/log.py:574
6302
#, python-format
6303
msgid "invalid direction %r"
6304
msgstr ""
6305
6306
#: bzrlib/log.py:662
6307
msgid "Start revision not found in history of end revision."
6308
msgstr ""
6309
6310
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6311
msgid "Logging revision 0 is invalid."
6312
msgstr ""
6313
6314
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6315
msgid "Start revision must be older than the end revision."
6316
msgstr ""
6317
6318
#: bzrlib/log.py:1827
6319
#, python-format
6320
msgid "unknown log formatter: %r"
6321
msgstr ""
6322
6323
#: bzrlib/log.py:2123
6324
msgid "fixes bug"
6325
msgid_plural "fixes bugs"
6326
msgstr[0] ""
6327
msgstr[1] ""
6328
6329
#: bzrlib/merge.py:689
6330
msgid "All changes applied successfully."
6331
msgstr ""
6332
6333
#: bzrlib/merge.py:691
6334
#, python-format
6335
msgid "%d conflicts encountered."
6336
msgstr ""
6337
6338
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6339
msgid "Preparing file merge"
6340
msgstr ""
6341
6342
#: bzrlib/multiparent.py:426
6343
msgid "Importing revisions"
6344
msgstr ""
6345
6346
#: bzrlib/option.py:526
6347
msgid "Show help message."
6348
msgstr ""
6349
6350
#: bzrlib/option.py:528
6351
msgid "Only display errors and warnings."
6352
msgstr ""
6353
6354
#: bzrlib/option.py:531
6355
msgid "Show usage message and options."
6356
msgstr ""
6357
6358
#: bzrlib/option.py:533
6359
msgid "Display more information."
6360
msgstr ""
6361
6362
#: bzrlib/option.py:541
6363
msgid ""
6364
"Select changes introduced by the specified revision. See also \"help "
6365
"revisionspec\"."
6366
msgstr ""
6367
6368
#: bzrlib/option.py:543
6369
msgid "Branch to operate on, instead of working directory."
6370
msgstr ""
6371
6372
#: bzrlib/option.py:545
6373
msgid "Detailed log format."
6374
msgstr ""
6375
6376
#: bzrlib/option.py:545
6377
msgid "Format used by GNU ChangeLog files."
6378
msgstr ""
6379
6380
#: bzrlib/option.py:545
6381
msgid "Log format with one line per revision."
6382
msgstr ""
6383
6384
#: bzrlib/option.py:545
6385
msgid "Moderately short log format."
6386
msgstr ""
6387
6388
#: bzrlib/option.py:545
6389
msgid "Use specified log format."
6390
msgstr ""
6391
6392
#: bzrlib/option.py:547
6393
msgid "Log format"
6394
msgstr ""
6395
6396
#: bzrlib/option.py:549
6397
msgid "LCA-newness merge."
6398
msgstr ""
6399
6400
#: bzrlib/option.py:549
6401
msgid "Merge using external diff3."
6402
msgstr ""
6403
6404
#: bzrlib/option.py:549
6405
msgid "Native diff3-style merge."
6406
msgstr ""
6407
6408
#: bzrlib/option.py:549
6409
msgid "Select a particular merge algorithm."
6410
msgstr ""
6411
6412
#: bzrlib/option.py:549
6413
msgid "Weave-based merge."
6414
msgstr ""
6415
6416
#: bzrlib/option.py:551
6417
msgid "Merge algorithm"
6418
msgstr ""
6419
6420
#: bzrlib/option.py:554
6421
msgid "Message string."
6422
msgstr ""
6423
6424
#: bzrlib/option.py:556
6425
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6426
msgstr ""
6427
6428
#: bzrlib/option.py:558
6429
msgid "Ignore differences between branches and overwrite unconditionally."
6430
msgstr ""
6431
6432
#: bzrlib/option.py:560
6433
msgid "Remember the specified location as a default."
6434
msgstr ""
6435
6436
#: bzrlib/option.py:562
6437
msgid "Reprocess to reduce spurious conflicts."
6438
msgstr ""
6439
6440
#: bzrlib/option.py:566
6441
msgid "See \"help revisionspec\" for details."
6442
msgstr ""
6443
6444
#: bzrlib/option.py:568
6445
msgid "Show internal object ids."
6446
msgstr ""
6447
6448
#: bzrlib/option.py:571
6449
msgid "Display timezone as local, original, or utc."
6450
msgstr ""
6451
6452
#: bzrlib/osutils.py:100
6453
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6454
msgstr ""
6455
6456
#: bzrlib/osutils.py:220
6457
msgid "lstat/stat of ({0!r}): {1!r}"
6458
msgstr ""
6459
6460
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6461
#, python-format
6462
msgid "sorry, %r not allowed in path"
6463
msgstr ""
6464
6465
#: bzrlib/osutils.py:1237
6466
#, python-format
6467
msgid "%r is too short to calculate a relative path"
6468
msgstr ""
6469
6470
#: bzrlib/plugin.py:143
6471
#, python-format
6472
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6473
msgstr ""
6474
6475
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6476
msgid "Enable completions for the selected plugin (default: all plugins)"
6477
msgstr ""
6478
6479
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6480
msgid "Generate a shell function for bash command line completion."
6481
msgstr ""
6482
6483
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6484
msgid ""
6485
"This command generates a shell function which can be used by bash to\n"
6486
"automatically complete the currently typed command when the user presses\n"
6487
"the completion key (usually tab)."
6488
msgstr ""
6489
6490
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6491
msgid ""
6492
"Commonly used like this:\n"
6493
" eval \"`bzr bash-completion`\""
6494
msgstr ""
6495
6496
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6497
msgid "Name of the generated function (default: _bzr)"
6498
msgstr ""
6499
6500
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6501
msgid "Generate only the shell function, don't enable it"
6502
msgstr ""
6503
6504
#: bzrlib/plugins/launchpad/__init__.py:81
6505
msgid "Register a branch with launchpad.net."
6506
msgstr ""
6507
6508
#: bzrlib/plugins/launchpad/__init__.py:83
6509
msgid ""
6510
"This command lists a bzr branch in the directory of branches on\n"
6511
"launchpad.net. Registration allows the branch to be associated with\n"
6512
"bugs or specifications."
6513
msgstr ""
6514
6515
#: bzrlib/plugins/launchpad/__init__.py:87
6516
msgid ""
6517
"Before using this command you must register the project to which the\n"
6518
"branch belongs, and create an account for yourself on launchpad.net."
6519
msgstr ""
6520
6521
#: bzrlib/plugins/launchpad/__init__.py:90
6522
msgid ""
6523
"arguments:\n"
6524
" public_url: The publicly visible url for the branch to register.\n"
6525
" This must be an http or https url (which Launchpad can read\n"
6526
" from to access the branch). Local file urls, SFTP urls, and\n"
6527
" bzr+ssh urls will not work.\n"
6528
" If no public_url is provided, bzr will use the configured\n"
6529
" public_url if there is one for the current branch, and\n"
6530
" otherwise error."
6531
msgstr ""
6532
6533
#: bzrlib/plugins/launchpad/__init__.py:99
6534
msgid ""
6535
"example:\n"
6536
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6537
" --project fooproject"
6538
msgstr ""
6539
6540
#: bzrlib/plugins/launchpad/__init__.py:106
6541
msgid "Launchpad project short name to associate with the branch."
6542
msgstr ""
6543
6544
#: bzrlib/plugins/launchpad/__init__.py:113
6545
msgid ""
6546
"Short name for the branch; by default taken from the last component of the "
6547
"url."
6548
msgstr ""
6549
6550
#: bzrlib/plugins/launchpad/__init__.py:117
6551
msgid "One-sentence description of the branch."
6552
msgstr ""
6553
6554
#: bzrlib/plugins/launchpad/__init__.py:120
6555
msgid "Longer description of the purpose or contents of the branch."
6556
msgstr ""
6557
6558
#: bzrlib/plugins/launchpad/__init__.py:123
6559
msgid "Branch author's email address, if not yourself."
6560
msgstr ""
6561
6562
#: bzrlib/plugins/launchpad/__init__.py:126
6563
msgid "The bug this branch fixes."
6564
msgstr ""
6565
6566
#: bzrlib/plugins/launchpad/__init__.py:129
6567
msgid "Prepare the request but don't actually send it."
6568
msgstr ""
6569
6570
#: bzrlib/plugins/launchpad/__init__.py:151
6571
msgid ""
6572
"register-branch requires a public branch url - see bzr help register-branch."
6573
msgstr ""
6574
6575
#: bzrlib/plugins/launchpad/__init__.py:159
6576
msgid "--product is deprecated; please use --project."
6577
msgstr ""
6578
6579
#: bzrlib/plugins/launchpad/__init__.py:191
6580
msgid "Open a Launchpad branch page in your web browser."
6581
msgstr ""
6582
6583
#: bzrlib/plugins/launchpad/__init__.py:196
6584
msgid "Do not actually open the browser. Just say the URL we would use."
6585
msgstr ""
6586
6587
#: bzrlib/plugins/launchpad/__init__.py:231
6588
#, python-format
6589
msgid "Opening %s in web browser"
6590
msgstr ""
6591
6592
#: bzrlib/plugins/launchpad/__init__.py:241
6593
msgid "Show or set the Launchpad user ID."
6594
msgstr ""
6595
6596
#: bzrlib/plugins/launchpad/__init__.py:243
6597
msgid ""
6598
"When communicating with Launchpad, some commands need to know your\n"
6599
"Launchpad user ID. This command can be used to set or show the\n"
6600
"user ID that Bazaar will use for such communication."
6601
msgstr ""
6602
6603
#: bzrlib/plugins/launchpad/__init__.py:247
6604
msgid ""
6605
":Examples:\n"
6606
" Show the Launchpad ID of the current user::"
6607
msgstr ""
6608
6609
#: bzrlib/plugins/launchpad/__init__.py:250
6610
msgid " bzr launchpad-login"
6611
msgstr ""
6612
6613
#: bzrlib/plugins/launchpad/__init__.py:252
6614
msgid " Set the Launchpad ID of the current user to 'bob'::"
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/__init__.py:254
6618
msgid " bzr launchpad-login bob"
6619
msgstr ""
6620
6621
#: bzrlib/plugins/launchpad/__init__.py:261
6622
msgid "Don't check that the user name is valid."
6623
msgstr ""
6624
6625
#: bzrlib/plugins/launchpad/__init__.py:276
6626
#: bzrlib/plugins/launchpad/__init__.py:287
6627
msgid "Launchpad user ID exists and has SSH keys.\n"
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/__init__.py:279
6631
msgid "No Launchpad user ID configured.\n"
6632
msgstr ""
6633
6634
#: bzrlib/plugins/launchpad/__init__.py:290
6635
#, python-format
6636
msgid "Launchpad user ID set to '%s'.\n"
6637
msgstr ""
6638
6639
#: bzrlib/plugins/launchpad/__init__.py:298
6640
msgid "Ask Launchpad to mirror a branch now."
6641
msgstr ""
6642
6643
#: bzrlib/plugins/launchpad/__init__.py:318
6644
msgid "Propose merging a branch on Launchpad."
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/__init__.py:320
6648
msgid ""
6649
"This will open your usual editor to provide the initial comment. When it\n"
6650
"has created the proposal, it will open it in your default web browser."
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:323
6654
msgid ""
6655
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6656
"is not supplied, the remembered submit branch will be used. If no submit\n"
6657
"branch is remembered, the development focus will be used."
6658
msgstr ""
6659
6660
#: bzrlib/plugins/launchpad/__init__.py:327
6661
msgid ""
6662
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6663
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6664
"The parameter the launchpad account name of the desired reviewer. This\n"
6665
"may optionally be followed by '=' and the review type. For example:"
6666
msgstr ""
6667
6668
#: bzrlib/plugins/launchpad/__init__.py:332
6669
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/__init__.py:334
6673
msgid ""
6674
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6675
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6676
msgstr ""
6677
6678
#: bzrlib/plugins/launchpad/__init__.py:339
6679
msgid "Propose the merge on staging."
6680
msgstr ""
6681
6682
#: bzrlib/plugins/launchpad/__init__.py:341
6683
msgid "Commit message."
6684
msgstr ""
6685
6686
#: bzrlib/plugins/launchpad/__init__.py:343
6687
msgid "Mark the proposal as approved immediately."
6688
msgstr ""
6689
6690
#: bzrlib/plugins/launchpad/__init__.py:345
6691
msgid "Requested reviewer and optional type."
6692
msgstr ""
6693
6694
#: bzrlib/plugins/launchpad/__init__.py:382
6695
msgid "Find the proposal to merge this revision."
6696
msgstr ""
6697
6698
#: bzrlib/plugins/launchpad/__init__.py:384
6699
msgid ""
6700
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6701
"This works only if the selected branch was the merge proposal target, and\n"
6702
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6703
"are opened in a web browser."
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/__init__.py:389
6707
msgid ""
6708
"Any revision involved in the merge may be specified-- the revision in\n"
6709
"which the merge was performed, or one of the revisions that was merged."
6710
msgstr ""
6711
6712
#: bzrlib/plugins/launchpad/__init__.py:392
6713
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6714
msgstr ""
6715
6716
#: bzrlib/plugins/launchpad/__init__.py:394
6717
msgid " bzr lp-find-proposal -r annotate:README:1"
6718
msgstr ""
6719
6720
#: bzrlib/plugins/launchpad/__init__.py:409
6721
msgid "No review found."
6722
msgstr ""
6723
6724
#: bzrlib/plugins/launchpad/__init__.py:410
6725
#, python-format
6726
msgid "%d proposals(s) found."
6727
msgstr ""
6728
6729
#: bzrlib/plugins/launchpad/__init__.py:420
6730
msgid "Finding revision-id"
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/__init__.py:427
6734
msgid "Finding merge"
6735
msgstr ""
6736
6737
#: bzrlib/plugins/launchpad/__init__.py:432
6738
msgid "Finding revno"
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/__init__.py:437
6742
msgid "Finding Launchpad branch"
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/__init__.py:440
6746
msgid "Finding proposals"
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/account.py:66
6750
msgid "Setting ssh/sftp usernames for launchpad.net."
6751
msgstr ""
6752
6753
#: bzrlib/plugins/launchpad/lp_api.py:241
6754
#: bzrlib/plugins/launchpad/lp_api.py:246
6755
#, python-format
6756
msgid "%s is not registered on Launchpad"
6757
msgstr ""
6758
6759
#: bzrlib/plugins/launchpad/lp_api.py:256
6760
#, python-format
6761
msgid "%s has no development focus."
6762
msgstr ""
6763
6764
#: bzrlib/plugins/launchpad/lp_api.py:261
6765
#, python-format
6766
msgid "development focus %s has no branch."
6767
msgstr ""
6768
6769
#: bzrlib/plugins/launchpad/lp_api.py:266
6770
#, python-format
6771
msgid "source package %s has no branch."
6772
msgstr ""
6773
6774
#: bzrlib/plugins/launchpad/lp_api.py:270
6775
#, python-format
6776
msgid "%s has no associated product or source package."
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/lp_api.py:282
6780
#, python-format
6781
msgid "%s is already up-to-date."
6782
msgstr ""
6783
6784
#: bzrlib/plugins/launchpad/lp_api.py:289
6785
#, python-format
6786
msgid "Pushing to %s"
6787
msgstr ""
6788
6789
#: bzrlib/plugins/launchpad/lp_directory.py:170
6790
msgid ""
6791
"resolution for {0}\n"
6792
" local: {1}\n"
6793
" remote: {2}"
6794
msgstr ""
6795
6796
#: bzrlib/plugins/launchpad/lp_propose.py:149
6797
#, python-format
6798
msgid "There is already a branch merge proposal: %s"
6799
msgstr ""
6800
6801
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6802
msgid "pb parameter to convert() is deprecated"
6803
msgstr ""
6804
6805
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6806
msgid "starting upgrade from format 4 to 5"
6807
msgstr ""
6808
6809
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6810
msgid "note: upgrade may be faster if all store files are ungzipped first"
6811
msgstr ""
6812
6813
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6814
msgid "converting revision"
6815
msgstr ""
6816
6817
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6818
msgid "upgraded to weaves:"
6819
msgstr ""
6820
6821
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6822
#, python-format
6823
msgid "%6d revisions and inventories"
6824
msgstr ""
6825
6826
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6827
#, python-format
6828
msgid "%6d revisions not present"
6829
msgstr ""
6830
6831
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6832
#, python-format
6833
msgid "%6d texts"
6834
msgstr ""
6835
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6837
msgid "writing weave"
6838
msgstr ""
6839
6840
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6841
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6842
msgid "inventory"
6843
msgstr ""
6844
6845
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6846
msgid "write revision"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6850
msgid "loading revision"
6851
msgstr ""
6852
6853
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6854
#, python-format
6855
msgid "revision {%s} not present in branch; will be converted as a ghost"
6856
msgstr ""
6857
6858
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6859
msgid "starting upgrade from format 5 to 6"
6860
msgstr ""
6861
6862
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6863
#, python-format
6864
msgid "adding prefixes to %s"
6865
msgstr ""
6866
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6868
msgid "starting upgrade from format 6 to metadir"
6869
msgstr ""
6870
6871
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6872
msgid "Removing ancestry.weave"
6873
msgstr ""
6874
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6876
msgid "Finding branch files"
6877
msgstr ""
6878
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6880
msgid "Upgrading repository"
6881
msgstr ""
6882
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6884
msgid "Upgrading branch"
6885
msgstr ""
6886
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6888
msgid "No working tree."
6889
msgstr ""
6890
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6892
msgid "Upgrading working tree"
6893
msgstr ""
6894
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6896
#, python-format
6897
msgid "Make %s lock"
6898
msgstr ""
6899
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6901
#, python-format
6902
msgid "Moving %s"
6903
msgstr ""
6904
6905
#: bzrlib/push.py:56
6906
msgid "Created new branch."
6907
msgstr ""
6908
6909
#: bzrlib/push.py:97
6910
#, python-format
6911
msgid ""
6912
"Target directory %s already contains a .bzr directory, but it is not valid."
6913
msgstr ""
6914
6915
#: bzrlib/push.py:101
6916
#, python-format
6917
msgid ""
6918
"Target directory %s already exists, but does not have a .bzr directory. "
6919
"Supply --use-existing-dir to push there anyway."
6920
msgstr ""
6921
6922
#: bzrlib/push.py:122
6923
#, python-format
6924
msgid "Too many redirections trying to make %s."
6925
msgstr ""
6926
6927
#: bzrlib/push.py:147
6928
msgid ""
6929
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6930
"information."
6931
msgstr ""
6932
6933
#: bzrlib/push.py:151
6934
#, python-format
6935
msgid ""
6936
"It is not possible to losslessly push to %s. You may want to use dpush "
6937
"instead."
6938
msgstr ""
6939
6940
#: bzrlib/push.py:157
6941
#, python-format
6942
msgid ""
6943
"At %s you have a valid .bzr control directory, but not a branch or "
6944
"repository. This is an unsupported configuration. Please move the target "
6945
"directory out of the way and try again."
6946
msgstr ""
6947
6948
#: bzrlib/reconcile.py:97
6949
#, python-format
6950
msgid "Reconciling branch %s"
6951
msgstr ""
6952
6953
#: bzrlib/reconcile.py:103
6954
#, python-format
6955
msgid "Reconciling repository %s"
6956
msgstr ""
6957
6958
#: bzrlib/reconcile.py:105
6959
msgid "Reconciling repository"
6960
msgstr ""
6961
6962
#: bzrlib/reconcile.py:111
6963
#, python-format
6964
msgid "%s cannot canonicalize CHKs."
6965
msgstr ""
6966
6967
#: bzrlib/reconcile.py:119
6968
msgid "Reconcile aborted: revision index has inconsistent parents."
6969
msgstr ""
6970
6971
#: bzrlib/reconcile.py:121
6972
msgid "Run \"bzr check\" for more details."
6973
msgstr ""
6974
6975
#: bzrlib/reconcile.py:123
6976
msgid "Reconciliation complete."
6977
msgstr ""
6978
6979
#: bzrlib/reconcile.py:166
6980
msgid "Fixing last revision info {0} => {1}"
6981
msgstr ""
6982
6983
#: bzrlib/reconcile.py:173
6984
msgid "revision_history ok."
6985
msgstr ""
6986
6987
#: bzrlib/reconcile.py:234
6988
msgid "Reading inventory data"
6989
msgstr ""
6990
6991
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6992
msgid "Inventory ok."
6993
msgstr ""
6994
6995
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6996
msgid "Backing up inventory"
6997
msgstr ""
6998
6999
#: bzrlib/reconcile.py:258
7000
msgid "Backup inventory created."
7001
msgstr ""
7002
7003
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7004
msgid "Writing weave"
7005
msgstr ""
7006
7007
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7008
msgid "Inventory regenerated."
7009
msgstr ""
7010
7011
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7012
msgid "Reading indexes"
7013
msgstr ""
7014
7015
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7016
msgid "Checking unused inventories"
7017
msgstr ""
7018
7019
#: bzrlib/reconcile.py:388
7020
msgid "Backup Inventory created"
7021
msgstr ""
7022
7023
#: bzrlib/reconcile.py:446
7024
msgid "Fixing text parents"
7025
msgstr ""
7026
7027
#: bzrlib/reconfigure.py:54
7028
msgid "{0} is now stacked on {1}\n"
7029
msgstr ""
7030
7031
#: bzrlib/reconfigure.py:69
7032
#, python-format
7033
msgid "%s is now not stacked\n"
7034
msgstr ""
7035
7036
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7037
#, python-format
7038
msgid "bzr: ERROR (ignored): %s"
7039
msgstr ""
7040
7041
#: bzrlib/remote.py:2541
7042
msgid "Copying repository content as tarball..."
7043
msgstr ""
7044
7045
#: bzrlib/rename_map.py:69
7046
msgid "Calculating hashes"
7047
msgstr ""
7048
7049
#: bzrlib/rename_map.py:107
7050
msgid "Determining hash hits"
7051
msgstr ""
7052
7053
#: bzrlib/rename_map.py:242
7054
msgid "{0} => {1}"
7055
msgstr ""
7056
7057
#: bzrlib/repository.py:1787
7058
msgid "Moving repository to repository.backup"
7059
msgstr ""
7060
7061
#: bzrlib/repository.py:1794
7062
msgid "Creating new repository"
7063
msgstr ""
7064
7065
#: bzrlib/repository.py:1799
7066
msgid "Copying content"
7067
msgstr ""
7068
7069
#: bzrlib/repository.py:1803
7070
msgid "Deleting old repository content"
7071
msgstr ""
7072
7073
#: bzrlib/repository.py:1805
7074
msgid "repository converted"
7075
msgstr ""
7076
7077
#: bzrlib/revisionspec.py:903
7078
msgid "Using {0} {1}"
7079
msgstr ""
7080
7081
#: bzrlib/send.py:58
7082
#, python-format
7083
msgid "Mail client \"%s\" does not support specifying body"
7084
msgstr ""
7085
7086
#: bzrlib/send.py:62
7087
msgid "--remember requires a branch to be specified."
7088
msgstr ""
7089
7090
#: bzrlib/send.py:77
7091
msgid "No submit branch known or specified"
7092
msgstr ""
7093
7094
#: bzrlib/send.py:80
7095
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7096
msgstr ""
7097
7098
#: bzrlib/send.py:98
7099
#, python-format
7100
msgid "No such send format '%s'."
7101
msgstr ""
7102
7103
#: bzrlib/send.py:114
7104
msgid "bzr send takes at most two one revision identifiers"
7105
msgstr ""
7106
7107
#: bzrlib/send.py:127
7108
msgid "No revisions to submit."
7109
msgstr ""
7110
7111
#: bzrlib/send.py:139
7112
msgid ""
7113
"- not supported for merge directives that use more than one output file."
7114
msgstr ""
7115
7116
#: bzrlib/send.py:185
7117
msgid "Format 0.9 does not permit bundle with no patch"
7118
msgstr ""
7119
7120
#: bzrlib/shelf_ui.py:46
7121
#, python-format
7122
msgid "Shelve adding file \"%(path)s\"?"
7123
msgstr ""
7124
7125
#: bzrlib/shelf_ui.py:47
7126
msgid "Shelve binary changes?"
7127
msgstr ""
7128
7129
#: bzrlib/shelf_ui.py:48
7130
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7131
msgstr ""
7132
7133
#: bzrlib/shelf_ui.py:50
7134
#, python-format
7135
msgid "Shelve removing file \"%(path)s\"?"
7136
msgstr ""
7137
7138
#: bzrlib/shelf_ui.py:51
7139
#, python-format
7140
msgid "Shelve %d change(s)?"
7141
msgstr ""
7142
7143
#: bzrlib/shelf_ui.py:52
7144
msgid "Shelve?"
7145
msgstr ""
7146
7147
#: bzrlib/shelf_ui.py:53
7148
#, python-format
7149
msgid ""
7150
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7151
msgstr ""
7152
7153
#: bzrlib/shelf_ui.py:55
7154
#, python-format
7155
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7156
msgstr ""
7157
7158
#: bzrlib/shelf_ui.py:70
7159
#, python-format
7160
msgid "Changes shelved with id \"%d\"."
7161
msgstr ""
7162
7163
#: bzrlib/shelf_ui.py:74
7164
msgid "Selected changes destroyed."
7165
msgstr ""
7166
7167
#: bzrlib/shelf_ui.py:78
7168
msgid "Selected changes:"
7169
msgstr ""
7170
7171
#: bzrlib/shelf_ui.py:98
7172
#, python-format
7173
msgid "Delete file \"%(path)s\"?"
7174
msgstr ""
7175
7176
#: bzrlib/shelf_ui.py:99
7177
msgid "Apply binary changes?"
7178
msgstr ""
7179
7180
#: bzrlib/shelf_ui.py:100
7181
#, python-format
7182
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7183
msgstr ""
7184
7185
#: bzrlib/shelf_ui.py:102
7186
#, python-format
7187
msgid "Add file \"%(path)s\"?"
7188
msgstr ""
7189
7190
#: bzrlib/shelf_ui.py:103
7191
#, python-format
7192
msgid "Apply %d change(s)?"
7193
msgstr ""
7194
7195
#: bzrlib/shelf_ui.py:104
7196
msgid "Apply change?"
7197
msgstr ""
7198
7199
#: bzrlib/shelf_ui.py:105
7200
#, python-format
7201
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7202
msgstr ""
7203
7204
#: bzrlib/shelf_ui.py:107
7205
#, python-format
7206
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7207
msgstr ""
7208
7209
#: bzrlib/shelf_ui.py:402
7210
msgid "No changes are shelved."
7211
msgstr ""
7212
7213
#: bzrlib/shelf_ui.py:460
7214
#, python-format
7215
msgid "Using changes with id \"%d\"."
7216
msgstr ""
7217
7218
#: bzrlib/shelf_ui.py:464
7219
#, python-format
7220
msgid "Message: %s"
7221
msgstr ""
7222
7223
#: bzrlib/shelf_ui.py:476
7224
#, python-format
7225
msgid "Deleted changes with id \"%d\"."
7226
msgstr ""
7227
7228
#: bzrlib/smart/medium.py:714
7229
msgid "HPSS calls: {0} ({1} vfs) {2}"
7230
msgstr ""
7231
7232
#: bzrlib/smart/server.py:169
7233
msgid "Requested to stop gracefully"
7234
msgstr ""
7235
7236
#: bzrlib/smart/server.py:179
7237
#, python-format
7238
msgid "Waiting for %d client(s) to finish"
7239
msgstr ""
7240
7241
#: bzrlib/smart/server.py:185
7242
#, python-format
7243
msgid "Still waiting for %d client(s) to finish"
7244
msgstr ""
7245
7246
#: bzrlib/smart/server.py:219
7247
#, python-format
7248
msgid "listening socket error: %s"
7249
msgstr ""
7250
7251
#: bzrlib/smart/server.py:452
7252
#, python-format
7253
msgid "listening on port: %s"
7254
msgstr ""
7255
7256
#: bzrlib/switch.py:73
7257
msgid "Pending merges must be committed or reverted before using switch."
7258
msgstr ""
7259
7260
#: bzrlib/switch.py:100
7261
msgid ""
7262
"Cannot switch as local commits found in the checkout. Commit these to the "
7263
"bound branch or use --force to throw them away."
7264
msgstr ""
7265
7266
#: bzrlib/switch.py:105
7267
#, python-format
7268
msgid ""
7269
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7270
"anyway, use --force."
7271
msgstr ""
7272
7273
#: bzrlib/switch.py:125
7274
msgid "Cannot switch a branch, only a checkout."
7275
msgstr ""
7276
7277
#: bzrlib/switch.py:163
7278
#, python-format
7279
msgid "Tree is up to date at revision %d."
7280
msgstr ""
7281
7282
#: bzrlib/switch.py:169
7283
#, python-format
7284
msgid "Updated to revision %d."
7285
msgstr ""
7286
7287
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7288
msgid "Apply phase"
7289
msgstr ""
7290
7291
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7292
msgid "removing file"
7293
msgstr ""
7294
7295
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7296
msgid "adding file"
7297
msgstr ""
7298
7299
#: bzrlib/transform.py:2591
7300
msgid "Building tree"
7301
msgstr ""
7302
7303
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7304
msgid "Adding file contents"
7305
msgstr ""
7306
7307
#: bzrlib/transform.py:3028
7308
msgid "Resolution pass"
7309
msgstr ""
7310
7311
#: bzrlib/transport/ftp/_gssapi.py:88
7312
#, python-format
7313
msgid "Authenticated as %s"
7314
msgstr ""
7315
7316
#: bzrlib/tree.py:634
7317
msgid "*** {0} content-filter: {1} => {2!r}"
7318
msgstr ""
7319
7320
#: bzrlib/upgrade.py:77
7321
#, python-format
7322
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7323
msgstr ""
7324
7325
#: bzrlib/upgrade.py:100
7326
#, python-format
7327
msgid "cannot upgrade from bzrdir format %s"
7328
msgstr ""
7329
7330
#: bzrlib/upgrade.py:103
7331
#, python-format
7332
msgid "starting upgrade of %s"
7333
msgstr ""
7334
7335
#: bzrlib/upgrade.py:110
7336
msgid "finished"
7337
msgstr ""
7338
7339
#: bzrlib/upgrade.py:120
7340
msgid "Deleting backup.bzr"
7341
msgstr ""
7342
7343
#: bzrlib/upgrade.py:151
7344
msgid ""
7345
"\n"
7346
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7347
msgstr ""
7348
7349
#: bzrlib/upgrade.py:208
7350
#, python-format
7351
msgid "Found %d dependent branches - upgrading ..."
7352
msgstr ""
7353
7354
#: bzrlib/upgrade.py:276
7355
msgid "Upgrading bzrdirs"
7356
msgstr ""
7357
7358
#: bzrlib/upgrade.py:282
7359
#, python-format
7360
msgid "Upgrading %s"
7361
msgstr ""
7362
7363
#: bzrlib/upgrade.py:283
7364
msgid "Upgrading {0} {1} ..."
7365
msgstr ""
7366
7367
#: bzrlib/upgrade.py:301
7368
msgid "Removing backup ..."
7369
msgstr ""
7370
7371
#: bzrlib/upgrade.py:305
7372
msgid "failed to clean-up {0}: {1}"
7373
msgstr ""
7374
7375
#: bzrlib/vf_repository.py:1090
7376
msgid "inventories"
7377
msgstr ""
7378
7379
#: bzrlib/vf_repository.py:1116
7380
msgid "texts"
7381
msgstr ""
7382
7383
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7384
msgid "Calculating text parents"
7385
msgstr ""
7386
7387
#: bzrlib/vf_repository.py:1706
7388
msgid "Fetch texts"
7389
msgstr ""
7390
7391
#: bzrlib/vf_repository.py:2535
7392
msgid "loading text store"
7393
msgstr ""
7394
7395
#: bzrlib/vf_repository.py:2541
7396
msgid "checking text graph"
7397
msgstr ""
7398
7399
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7400
#: bzrlib/vf_repository.py:3124
7401
msgid "Transferring revisions"
7402
msgstr ""
7403
7404
#: bzrlib/win32utils.py:146
7405
msgid "Failed to GetProcessMemoryInfo()"
7406
msgstr ""
7407
7408
#: bzrlib/win32utils.py:167
7409
msgid "Cannot debug memory on win32 without ctypes or win32process"
7410
msgstr ""
7411
7412
#: bzrlib/win32utils.py:172
7413
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7414
msgstr ""
7415
7416
#: bzrlib/win32utils.py:180
7417
#, python-format
7418
msgid "WorkingSize %8d KiB"
7419
msgstr ""
7420
7421
#: bzrlib/win32utils.py:181
7422
#, python-format
7423
msgid "PeakWorking %8d KiB"
7424
msgstr ""
7425
7426
#: bzrlib/win32utils.py:182
7427
#, python-format
7428
msgid "PagefileUsage %8d KiB"
7429
msgstr ""
7430
7431
#: bzrlib/win32utils.py:183
7432
#, python-format
7433
msgid "PeakPagefileUsage %8d KiB"
7434
msgstr ""
7435
7436
#: bzrlib/win32utils.py:185
7437
#, python-format
7438
msgid "PrivateUsage %8d KiB"
7439
msgstr ""
7440
7441
#: bzrlib/win32utils.py:186
7442
#, python-format
7443
msgid "PageFaultCount %8d"
7444
msgstr ""
7445
7446
#: bzrlib/workingtree.py:1478
7447
msgid "Rerun update after fixing the conflicts."
7448
msgstr ""
7449
7450
#: dummy/help_topics/authentication/summary.txt:1
7451
msgid "Information on configuring authentication"
7452
msgstr ""
7453
7454
#: dummy/help_topics/basic/detail.txt:1
7455
msgid ""
7456
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7457
"http://bazaar.canonical.com/"
7458
msgstr ""
7459
7460
#: dummy/help_topics/basic/detail.txt:4
7461
msgid ""
7462
"Basic commands:\n"
7463
" bzr init makes this directory a versioned branch\n"
7464
" bzr branch make a copy of another branch"
7465
msgstr ""
7466
7467
#: dummy/help_topics/basic/detail.txt:8
7468
msgid ""
7469
" bzr add make files or directories versioned\n"
7470
" bzr ignore ignore a file or pattern\n"
7471
" bzr mv move or rename a versioned file"
7472
msgstr ""
7473
7474
#: dummy/help_topics/basic/detail.txt:12
7475
msgid ""
7476
" bzr status summarize changes in working copy\n"
7477
" bzr diff show detailed diffs"
7478
msgstr ""
7479
7480
#: dummy/help_topics/basic/detail.txt:15
7481
msgid ""
7482
" bzr merge pull in changes from another branch\n"
7483
" bzr commit save some or all changes\n"
7484
" bzr send send changes via email"
7485
msgstr ""
7486
7487
#: dummy/help_topics/basic/detail.txt:19
7488
msgid ""
7489
" bzr log show history of changes\n"
7490
" bzr check validate storage"
7491
msgstr ""
7492
7493
#: dummy/help_topics/basic/detail.txt:22
7494
msgid ""
7495
" bzr help init more help on e.g. init command\n"
7496
" bzr help commands list all commands\n"
7497
" bzr help topics list all help topics\n"
7498
msgstr ""
7499
7500
#: dummy/help_topics/basic/summary.txt:1
7501
msgid "Basic commands"
7502
msgstr ""
7503
7504
#: dummy/help_topics/branches/detail.txt:1
7505
msgid "Branches"
7506
msgstr ""
7507
7508
#: dummy/help_topics/branches/detail.txt:3
7509
msgid ""
7510
"A branch consists of the state of a project, including all of its\n"
7511
"history. All branches have a repository associated (which is where the\n"
7512
"branch history is stored), but multiple branches may share the same\n"
7513
"repository (a shared repository). Branches can be copied and merged."
7514
msgstr ""
7515
7516
#: dummy/help_topics/branches/detail.txt:8
7517
msgid ""
7518
"In addition, one branch may be bound to another one. Binding to another\n"
7519
"branch indicates that commits which happen in this branch must also \n"
7520
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7521
"commits when the two branches are out of date. In order for a commit \n"
7522
"to succeed, it may be necessary to update the current branch using \n"
7523
"``bzr update``."
7524
msgstr ""
7525
7526
#: dummy/help_topics/branches/detail.txt:15
7527
#: dummy/help_topics/checkouts/detail.txt:66
7528
#: dummy/help_topics/repositories/detail.txt:36
7529
msgid "Related commands::"
7530
msgstr ""
7531
7532
#: dummy/help_topics/branches/detail.txt:17
7533
msgid ""
7534
" init Change a directory into a versioned branch.\n"
7535
" branch Create a new branch that is a copy of an existing branch.\n"
7536
" merge Perform a three-way merge.\n"
7537
" bind Bind a branch to another one.\n"
7538
msgstr ""
7539
7540
#: dummy/help_topics/branches/summary.txt:1
7541
msgid "Information on what a branch is"
7542
msgstr ""
7543
7544
#: dummy/help_topics/bugs/summary.txt:1
7545
msgid "Bug tracker settings"
7546
msgstr ""
7547
7548
#: dummy/help_topics/checkouts/detail.txt:1
7549
msgid "Checkouts"
7550
msgstr ""
7551
7552
#: dummy/help_topics/checkouts/detail.txt:3
7553
msgid ""
7554
"Checkouts are source trees that are connected to a branch, so that when\n"
7555
"you commit in the source tree, the commit goes into that branch. They\n"
7556
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7557
"Bazaar's decentralized features until you want them. Using checkouts\n"
7558
"with shared repositories is very similar to working with SVN or CVS, but\n"
7559
"doesn't have the same restrictions. And using checkouts still allows\n"
7560
"others working on the project to use whatever workflow they like."
7561
msgstr ""
7562
7563
#: dummy/help_topics/checkouts/detail.txt:11
7564
msgid ""
7565
"A checkout is created with the bzr checkout command (see \"help "
7566
"checkout\").\n"
7567
"You pass it a reference to another branch, and it will create a local copy\n"
7568
"for you that still contains a reference to the branch you created the\n"
7569
"checkout from (the master branch). Then if you make any commits they will "
7570
"be\n"
7571
"made on the other branch first. This creates an instant mirror of your work, "
7572
"or\n"
7573
"facilitates lockstep development, where each developer is working together,\n"
7574
"continuously integrating the changes of others."
7575
msgstr ""
7576
7577
#: dummy/help_topics/checkouts/detail.txt:19
7578
msgid ""
7579
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7580
"you have the full history locally. As you have a first class branch you "
7581
"can\n"
7582
"also commit locally if you want, for instance due to the temporary loss af "
7583
"a\n"
7584
"network connection. Use the --local option to commit to do this. All the "
7585
"local\n"
7586
"commits will then be made on the master branch the next time you do a non-"
7587
"local\n"
7588
"commit."
7589
msgstr ""
7590
7591
#: dummy/help_topics/checkouts/detail.txt:26
7592
msgid ""
7593
"If you are using a checkout from a shared branch you will periodically want "
7594
"to\n"
7595
"pull in all the changes made by others. This is done using the \"update\"\n"
7596
"command. The changes need to be applied before any non-local commit, but\n"
7597
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7598
"command when needed."
7599
msgstr ""
7600
7601
#: dummy/help_topics/checkouts/detail.txt:32
7602
msgid ""
7603
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7604
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7605
"SVN checkout in that it is not a first class branch, it mainly consists of "
7606
"the\n"
7607
"working tree. This means that any history operations must query the master\n"
7608
"branch, which could be slow if a network connection is involved. Also, as "
7609
"you\n"
7610
"don't have a local branch, then you cannot commit locally."
7611
msgstr ""
7612
7613
#: dummy/help_topics/checkouts/detail.txt:39
7614
msgid ""
7615
"Lightweight checkouts work best when you have fast reliable access to the\n"
7616
"master branch. This means that if the master branch is on the same disk or "
7617
"LAN\n"
7618
"a lightweight checkout will be faster than a heavyweight one for any "
7619
"commands\n"
7620
"that modify the revision history (as only one copy of the branch needs to\n"
7621
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7622
"that uses the history but does not change it, but if the master branch is "
7623
"on\n"
7624
"the same disk then there won't be a noticeable difference."
7625
msgstr ""
7626
7627
#: dummy/help_topics/checkouts/detail.txt:47
7628
msgid ""
7629
"Another possible use for a checkout is to use it with a treeless repository\n"
7630
"containing your branches, where you maintain only one working tree by\n"
7631
"switching the master branch that the checkout points to when you want to\n"
7632
"work on a different branch."
7633
msgstr ""
7634
7635
#: dummy/help_topics/checkouts/detail.txt:52
7636
msgid ""
7637
"Obviously to commit on a checkout you need to be able to write to the "
7638
"master\n"
7639
"branch. This means that the master branch must be accessible over a "
7640
"writeable\n"
7641
"protocol , such as sftp://, and that you have write permissions at the "
7642
"other\n"
7643
"end. Checkouts also work on the local file system, so that all that matters "
7644
"is\n"
7645
"file permissions."
7646
msgstr ""
7647
7648
#: dummy/help_topics/checkouts/detail.txt:58
7649
msgid ""
7650
"You can change the master of a checkout by using the \"switch\" command "
7651
"(see\n"
7652
"\"help switch\"). This will change the location that the commits are sent "
7653
"to.\n"
7654
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7655
"checkout. If you would like to convert your heavy checkout into a normal\n"
7656
"branch so that every commit is local, you can use the \"unbind\" command. To "
7657
"see\n"
7658
"whether or not a branch is bound or not you can use the \"info\" command. If "
7659
"the\n"
7660
"branch is bound it will tell you the location of the bound branch."
7661
msgstr ""
7662
7663
#: dummy/help_topics/checkouts/detail.txt:68
7664
msgid ""
7665
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7666
" checkout\n"
7667
" update Pull any changes in the master branch in to your checkout\n"
7668
" commit Make a commit that is sent to the master branch. If you have\n"
7669
" a heavy checkout then the --local option will commit to the\n"
7670
" checkout without sending the commit to the master\n"
7671
" switch Change the master branch that the commits in the checkout "
7672
"will\n"
7673
" be sent to\n"
7674
" bind Turn a standalone branch into a heavy checkout so that any\n"
7675
" commits will be sent to the master branch\n"
7676
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7677
" commits are only made locally\n"
7678
" info Displays whether a branch is bound or unbound. If the branch "
7679
"is\n"
7680
" bound, then it will also display the location of the bound "
7681
"branch\n"
7682
msgstr ""
7683
7684
#: dummy/help_topics/checkouts/summary.txt:1
7685
msgid "Information on what a checkout is"
7686
msgstr ""
7687
7688
#: dummy/help_topics/commands/summary.txt:1
7689
msgid "Basic help for all commands"
7690
msgstr ""
7691
7692
#: dummy/help_topics/configuration/summary.txt:1
7693
msgid "Details on the configuration settings available"
7694
msgstr ""
7695
7696
#: dummy/help_topics/conflict-types/summary.txt:1
7697
msgid "Types of conflicts and what to do about them"
7698
msgstr ""
7699
7700
#: dummy/help_topics/content-filters/summary.txt:1
7701
msgid "Conversion of content into/from working trees"
7702
msgstr ""
7703
7704
#: dummy/help_topics/criss-cross/detail.txt:1
7705
msgid "Criss-Cross"
7706
msgstr ""
7707
7708
#: dummy/help_topics/criss-cross/detail.txt:3
7709
msgid ""
7710
"A criss-cross in the branch history can cause the default merge technique\n"
7711
"to emit more conflicts than would normally be expected."
7712
msgstr ""
7713
7714
#: dummy/help_topics/criss-cross/detail.txt:6
7715
msgid ""
7716
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7717
"give\n"
7718
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7719
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7720
msgstr ""
7721
7722
#: dummy/help_topics/criss-cross/detail.txt:10
7723
msgid ""
7724
"Criss-crosses occur in a branch's history if two branches merge the same "
7725
"thing\n"
7726
"and then merge one another, or if two branches merge one another at the "
7727
"same\n"
7728
"time. They can be avoided by having each branch only merge from or into a\n"
7729
"designated central branch (a \"star topology\")."
7730
msgstr ""
7731
7732
#: dummy/help_topics/criss-cross/detail.txt:15
7733
msgid ""
7734
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7735
"default\n"
7736
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7737
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7738
"differences between THIS and OTHER are due to one side adding lines, or\n"
7739
"from another side removing lines."
7740
msgstr ""
7741
7742
#: dummy/help_topics/criss-cross/detail.txt:21
7743
msgid ""
7744
"Criss-crosses mean there is no good choice for a base. Selecting the "
7745
"recent\n"
7746
"merge points could cause one side's changes to be silently discarded.\n"
7747
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7748
"are emitted."
7749
msgstr ""
7750
7751
#: dummy/help_topics/criss-cross/detail.txt:26
7752
msgid ""
7753
"The ``weave`` merge type is not affected by this problem because it uses\n"
7754
"line-origin detection instead of a basis revision to determine the cause of\n"
7755
"differences.\n"
7756
msgstr ""
7757
7758
#: dummy/help_topics/criss-cross/summary.txt:1
7759
msgid "Information on criss-cross merging"
7760
msgstr ""
7761
7762
#: dummy/help_topics/current-formats/summary.txt:1
7763
msgid "Current storage formats"
7764
msgstr ""
7765
7766
#: dummy/help_topics/debug-flags/summary.txt:1
7767
msgid "Options to show or record debug information"
7768
msgstr ""
7769
7770
#: dummy/help_topics/diverged-branches/summary.txt:1
7771
msgid "How to fix diverged branches"
7772
msgstr ""
7773
7774
#: dummy/help_topics/env-variables/detail.txt:1
7775
msgid "Environment Variables"
7776
msgstr ""
7777
7778
#: dummy/help_topics/env-variables/detail.txt:3
7779
msgid ""
7780
"=================== "
7781
"===========================================================\n"
7782
"BZRPATH Path where bzr is to look for shell plugin external\n"
7783
" commands.\n"
7784
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7785
"EMAIL E-Mail address of the user.\n"
7786
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7787
"EDITOR Editor for editing commit messages.\n"
7788
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7789
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7790
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7791
"BZR_PLUGIN_PATH.\n"
7792
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7793
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7794
"and\n"
7795
" HOME.\n"
7796
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7797
"URLs).\n"
7798
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7799
"sshcorp,\n"
7800
" plink or lsh.\n"
7801
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7802
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7803
"BZR_COLUMNS Override implicit terminal width.\n"
7804
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7805
"(selftest)\n"
7806
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7807
"'text'.\n"
7808
"BZR_PDB Control whether to launch a debugger on error.\n"
7809
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7810
" breakin debugger.\n"
7811
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7812
"(instead\n"
7813
" of char-based).\n"
7814
"=================== "
7815
"===========================================================\n"
7816
msgstr ""
7817
7818
#: dummy/help_topics/env-variables/summary.txt:1
7819
msgid "Environment variable names and values"
7820
msgstr ""
7821
7822
#: dummy/help_topics/eol/summary.txt:1
7823
msgid "Information on end-of-line handling"
7824
msgstr ""
7825
7826
#: dummy/help_topics/files/detail.txt:1
7827
msgid "Files"
7828
msgstr ""
7829
7830
#: dummy/help_topics/files/detail.txt:3
7831
msgid ""
7832
":On Unix: ~/.bazaar/bazaar.conf\n"
7833
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7834
"bazaar\\\\2.0\\\\bazaar.conf"
7835
msgstr ""
7836
7837
#: dummy/help_topics/files/detail.txt:6
7838
msgid ""
7839
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7840
"used to define general configuration that will be applied everywhere.\n"
7841
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7842
"commonly used options."
7843
msgstr ""
7844
7845
#: dummy/help_topics/files/detail.txt:11
7846
msgid "A typical config file might look something like::"
7847
msgstr ""
7848
7849
#: dummy/help_topics/files/detail.txt:13
7850
msgid ""
7851
" [DEFAULT]\n"
7852
" email=John Doe <jdoe@isp.com>"
7853
msgstr ""
7854
7855
#: dummy/help_topics/files/detail.txt:16
7856
msgid ""
7857
" [ALIASES]\n"
7858
" commit = commit --strict\n"
7859
" log10 = log --short -r -10..-1\n"
7860
msgstr ""
7861
7862
#: dummy/help_topics/files/summary.txt:1
7863
msgid "Information on configuration and log files"
7864
msgstr ""
7865
7866
#: dummy/help_topics/formats/detail.txt:1
7867
msgid "Storage Formats"
7868
msgstr ""
7869
7870
#: dummy/help_topics/formats/detail.txt:3
7871
msgid ""
7872
"To ensure that older clients do not access data incorrectly,\n"
7873
"Bazaar's policy is to introduce a new storage format whenever\n"
7874
"new features requiring new metadata are added. New storage\n"
7875
"formats may also be introduced to improve performance and\n"
7876
"scalability."
7877
msgstr ""
7878
7879
#: dummy/help_topics/formats/detail.txt:9
7880
msgid ""
7881
"The newest format, 2a, is highly recommended. If your\n"
7882
"project is not using 2a, then you should suggest to the\n"
7883
"project owner to upgrade."
7884
msgstr ""
7885
7886
#: dummy/help_topics/formats/detail.txt:13
7887
msgid ""
7888
"\n"
7889
".. note::"
7890
msgstr ""
7891
7892
#: dummy/help_topics/formats/detail.txt:16
7893
msgid ""
7894
" Some of the older formats have two variants:\n"
7895
" a plain one and a rich-root one. The latter include an additional\n"
7896
" field about the root of the tree. There is no performance cost\n"
7897
" for using a rich-root format but you cannot easily merge changes\n"
7898
" from a rich-root format into a plain format. As a consequence,\n"
7899
" moving a project to a rich-root format takes some co-ordination\n"
7900
" in that all contributors need to upgrade their repositories\n"
7901
" around the same time. 2a and all future formats will be\n"
7902
" implicitly rich-root."
7903
msgstr ""
7904
7905
#: dummy/help_topics/formats/detail.txt:26
7906
msgid ""
7907
"See :doc:`current-formats-help` for the complete list of\n"
7908
"currently supported formats. See :doc:`other-formats-help` for\n"
7909
"descriptions of any available experimental and deprecated formats.\n"
7910
msgstr ""
7911
7912
#: dummy/help_topics/formats/summary.txt:1
7913
msgid "Information on choosing a storage format"
7914
msgstr ""
7915
7916
#: dummy/help_topics/global-options/detail.txt:1
7917
msgid "Global Options"
7918
msgstr ""
7919
7920
#: dummy/help_topics/global-options/detail.txt:3
7921
msgid ""
7922
"These options may be used with any command, and may appear in front of any\n"
7923
"command. (e.g. ``bzr --profile help``)."
7924
msgstr ""
7925
7926
#: dummy/help_topics/global-options/detail.txt:6
7927
msgid ""
7928
"--version Print the version number. Must be supplied before the "
7929
"command.\n"
7930
"--no-aliases Do not process command aliases when running this command.\n"
7931
"--builtin Use the built-in version of a command, not the plugin "
7932
"version.\n"
7933
" This does not suppress other plugin effects.\n"
7934
"--no-plugins Do not process any plugins.\n"
7935
"--no-l10n Do not translate messages.\n"
7936
"--concurrency Number of processes that can be run concurrently (selftest)."
7937
msgstr ""
7938
7939
#: dummy/help_topics/global-options/detail.txt:14
7940
msgid ""
7941
"--profile Profile execution using the hotshot profiler.\n"
7942
"--lsprof Profile execution using the lsprof profiler.\n"
7943
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7944
" results to a specified file. If the filename ends with "
7945
"\".txt\",\n"
7946
" text format will be used. If the filename either starts "
7947
"with\n"
7948
" \"callgrind.out\" or end with \".callgrind\", the output will "
7949
"be\n"
7950
" formatted for use with KCacheGrind. Otherwise, the output\n"
7951
" will be a pickle.\n"
7952
"--coverage Generate line coverage report in the specified directory."
7953
msgstr ""
7954
7955
#: dummy/help_topics/global-options/detail.txt:24
7956
msgid ""
7957
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7958
"for\n"
7959
" the duration of the command. This can be used multiple times "
7960
"if\n"
7961
" several options need to be overridden."
7962
msgstr ""
7963
7964
#: dummy/help_topics/global-options/detail.txt:28
7965
msgid ""
7966
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7967
"information on profiling."
7968
msgstr ""
7969
7970
#: dummy/help_topics/global-options/detail.txt:31
7971
msgid ""
7972
"A number of debug flags are also available to assist troubleshooting and\n"
7973
"development. See :doc:`debug-flags-help`.\n"
7974
msgstr ""
7975
7976
#: dummy/help_topics/global-options/summary.txt:1
7977
msgid "Options that control how Bazaar runs"
7978
msgstr ""
7979
7980
#: dummy/help_topics/hidden-commands/summary.txt:1
7981
msgid "All hidden commands"
7982
msgstr ""
7983
7984
#: dummy/help_topics/hooks/summary.txt:1
7985
msgid "Points at which custom processing can be added"
7986
msgstr ""
7987
7988
#: dummy/help_topics/launchpad/detail.txt:1
7989
msgid "Integration with Launchpad.net"
7990
msgstr ""
7991
7992
#: dummy/help_topics/launchpad/detail.txt:3
7993
msgid ""
7994
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7995
"specification tracking."
7996
msgstr ""
7997
7998
#: dummy/help_topics/launchpad/detail.txt:6
7999
msgid ""
8000
"The bzr client (through the plugin called 'launchpad') has special\n"
8001
"features to communicate with Launchpad:"
8002
msgstr ""
8003
8004
#: dummy/help_topics/launchpad/detail.txt:9
8005
msgid ""
8006
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8007
"This\n"
8008
" is then used by the 'lp:' transport to download your branches using\n"
8009
" bzr+ssh://."
8010
msgstr ""
8011
8012
#: dummy/help_topics/launchpad/detail.txt:13
8013
msgid ""
8014
" * The 'lp:' transport uses Launchpad as a directory service: for "
8015
"example\n"
8016
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8017
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8018
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8019
msgstr ""
8020
8021
#: dummy/help_topics/launchpad/detail.txt:18
8022
msgid ""
8023
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8024
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8025
"lp:12345'\n"
8026
" will record a revision property that marks that revision as fixing\n"
8027
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8028
" automatically be linked to the bug report."
8029
msgstr ""
8030
8031
#: dummy/help_topics/launchpad/detail.txt:24
8032
msgid ""
8033
" * The register-branch command tells Launchpad about the url of a\n"
8034
" public branch. Launchpad will then mirror the branch, display\n"
8035
" its contents and allow it to be attached to bugs and other\n"
8036
" objects."
8037
msgstr ""
8038
8039
#: dummy/help_topics/launchpad/detail.txt:29
8040
msgid "For more information see http://help.launchpad.net/\n"
8041
msgstr ""
8042
8043
#: dummy/help_topics/launchpad/summary.txt:1
8044
msgid "Using Bazaar with Launchpad.net"
8045
msgstr ""
8046
8047
#: dummy/help_topics/location-alias/summary.txt:1
8048
msgid "Aliases for remembered locations"
8049
msgstr ""
8050
8051
#: dummy/help_topics/log-formats/summary.txt:1
8052
msgid "Details on the logging formats available"
8053
msgstr ""
8054
8055
#: dummy/help_topics/other-formats/summary.txt:1
8056
msgid "Experimental and deprecated storage formats"
8057
msgstr ""
8058
8059
#: dummy/help_topics/patterns/summary.txt:1
8060
msgid "Information on the pattern syntax"
8061
msgstr ""
8062
8063
#: dummy/help_topics/repositories/detail.txt:1
8064
msgid "Repositories"
8065
msgstr ""
8066
8067
#: dummy/help_topics/repositories/detail.txt:3
8068
msgid ""
8069
"Repositories in Bazaar are where committed information is stored. There is\n"
8070
"a repository associated with every branch."
8071
msgstr ""
8072
8073
#: dummy/help_topics/repositories/detail.txt:6
8074
msgid ""
8075
"Repositories are a form of database. Bzr will usually maintain this for\n"
8076
"good performance automatically, but in some situations (e.g. when doing\n"
8077
"very many commits in a short time period) you may want to ask bzr to\n"
8078
"optimise the database indices. This can be done by the 'bzr pack' command."
8079
msgstr ""
8080
8081
#: dummy/help_topics/repositories/detail.txt:11
8082
msgid ""
8083
"By default just running 'bzr init' will create a repository within the new\n"
8084
"branch but it is possible to create a shared repository which allows "
8085
"multiple\n"
8086
"branches to share their information in the same location. When a new branch "
8087
"is\n"
8088
"created it will first look to see if there is a containing shared repository "
8089
"it\n"
8090
"can use."
8091
msgstr ""
8092
8093
#: dummy/help_topics/repositories/detail.txt:17
8094
msgid ""
8095
"When two branches of the same project share a repository, there is\n"
8096
"generally a large space saving. For some operations (e.g. branching\n"
8097
"within the repository) this translates in to a large time saving."
8098
msgstr ""
8099
8100
#: dummy/help_topics/repositories/detail.txt:21
8101
msgid ""
8102
"To create a shared repository use the init-repository command (or the alias\n"
8103
"init-repo). This command takes the location of the repository to create. "
8104
"This\n"
8105
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8106
"which contains a shared repository. Any new branches that are created in "
8107
"this\n"
8108
"directory will then use it for storage."
8109
msgstr ""
8110
8111
#: dummy/help_topics/repositories/detail.txt:27
8112
msgid ""
8113
"It is a good idea to create a repository whenever you might create more\n"
8114
"than one branch of a project. This is true for both working areas where you\n"
8115
"are doing the development, and any server areas that you use for hosting\n"
8116
"projects. In the latter case, it is common to want branches without working\n"
8117
"trees. Since the files in the branch will not be edited directly there is "
8118
"no\n"
8119
"need to use up disk space for a working tree. To create a repository in "
8120
"which\n"
8121
"the branches will not have working trees pass the '--no-trees' option to\n"
8122
"'init-repository'."
8123
msgstr ""
8124
8125
#: dummy/help_topics/repositories/detail.txt:38
8126
msgid ""
8127
" init-repository Create a shared repository. Use --no-trees to create "
8128
"one\n"
8129
" in which new branches won't get a working tree.\n"
8130
msgstr ""
8131
8132
#: dummy/help_topics/repositories/summary.txt:1
8133
msgid "Basic information on shared repositories."
8134
msgstr ""
8135
8136
#: dummy/help_topics/revisionspec/summary.txt:1
8137
msgid "Explain how to use --revision"
8138
msgstr ""
8139
8140
#: dummy/help_topics/rules/summary.txt:1
8141
msgid "Information on defining rule-based preferences"
8142
msgstr ""
8143
8144
#: dummy/help_topics/standalone-trees/detail.txt:1
8145
msgid "Standalone Trees"
8146
msgstr ""
8147
8148
#: dummy/help_topics/standalone-trees/detail.txt:3
8149
msgid ""
8150
"A standalone tree is a working tree with an associated repository. It\n"
8151
"is an independently usable branch, with no dependencies on any other.\n"
8152
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8153
"an existing project under version control."
8154
msgstr ""
8155
8156
#: dummy/help_topics/standalone-trees/detail.txt:8
8157
msgid "Related Commands::"
8158
msgstr ""
8159
8160
#: dummy/help_topics/standalone-trees/detail.txt:10
8161
msgid " init Make a directory into a versioned branch.\n"
8162
msgstr ""
8163
8164
#: dummy/help_topics/standalone-trees/summary.txt:1
8165
msgid "Information on what a standalone tree is"
8166
msgstr ""
8167
8168
#: dummy/help_topics/standard-options/detail.txt:1
8169
msgid "Standard Options"
8170
msgstr ""
8171
8172
#: dummy/help_topics/standard-options/detail.txt:3
8173
msgid "Standard options are legal for all commands."
8174
msgstr ""
8175
8176
#: dummy/help_topics/standard-options/detail.txt:5
8177
msgid ""
8178
"--help, -h Show help message.\n"
8179
"--verbose, -v Display more information.\n"
8180
"--quiet, -q Only display errors and warnings."
8181
msgstr ""
8182
8183
#: dummy/help_topics/standard-options/detail.txt:9
8184
msgid "Unlike global options, standard options can be used in aliases.\n"
8185
msgstr ""
8186
8187
#: dummy/help_topics/standard-options/summary.txt:1
8188
msgid "Options that can be used with any command"
8189
msgstr ""
8190
8191
#: dummy/help_topics/status-flags/detail.txt:1
8192
msgid "Status Flags"
8193
msgstr ""
8194
8195
#: dummy/help_topics/status-flags/detail.txt:3
8196
msgid ""
8197
"Status flags are used to summarise changes to the working tree in a concise\n"
8198
"manner. They are in the form::"
8199
msgstr ""
8200
8201
#: dummy/help_topics/status-flags/detail.txt:6
8202
msgid " xxx <filename>"
8203
msgstr ""
8204
8205
#: dummy/help_topics/status-flags/detail.txt:8
8206
msgid "where the columns' meanings are as follows."
8207
msgstr ""
8208
8209
#: dummy/help_topics/status-flags/detail.txt:10
8210
msgid "Column 1 - versioning/renames::"
8211
msgstr ""
8212
8213
#: dummy/help_topics/status-flags/detail.txt:12
8214
msgid ""
8215
" + File versioned\n"
8216
" - File unversioned\n"
8217
" R File renamed\n"
8218
" ? File unknown\n"
8219
" X File nonexistent (and unknown to bzr)\n"
8220
" C File has conflicts\n"
8221
" P Entry for a pending merge (not a file)"
8222
msgstr ""
8223
8224
#: dummy/help_topics/status-flags/detail.txt:20
8225
msgid "Column 2 - contents::"
8226
msgstr ""
8227
8228
#: dummy/help_topics/status-flags/detail.txt:22
8229
msgid ""
8230
" N File created\n"
8231
" D File deleted\n"
8232
" K File kind changed\n"
8233
" M File modified"
8234
msgstr ""
8235
8236
#: dummy/help_topics/status-flags/detail.txt:27
8237
msgid "Column 3 - execute::"
8238
msgstr ""
8239
8240
#: dummy/help_topics/status-flags/detail.txt:29
8241
msgid " * The execute bit was changed\n"
8242
msgstr ""
8243
8244
#: dummy/help_topics/status-flags/summary.txt:1
8245
msgid "Help on status flags"
8246
msgstr ""
8247
8248
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8249
msgid "Branches Out of Sync"
8250
msgstr ""
8251
8252
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8253
msgid ""
8254
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8255
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8256
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8257
"have the same last revision as the new reference branch for the lightweight\n"
8258
"checkout, data could be lost, so Bazaar refuses."
8259
msgstr ""
8260
8261
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8262
msgid "How you deal with this depends on *why* the branches are out of sync."
8263
msgstr ""
8264
8265
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8266
msgid ""
8267
"If you have a checkout and have done local commits, you can get back in "
8268
"sync\n"
8269
"by running \"bzr update\" (and possibly \"bzr commit\")."
8270
msgstr ""
8271
8272
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8273
msgid ""
8274
"If you have a branch and the remote branch is out-of-date, you can push\n"
8275
"the local changes using \"bzr push\". If the local branch is out of date, "
8276
"you\n"
8277
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8278
"commit\n"
8279
"and then push your changes. If you decide that some of the changes aren't\n"
8280
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8281
msgstr ""
8282
8283
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8284
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8285
msgstr ""
8286
8287
#: dummy/help_topics/topics/summary.txt:1
8288
msgid "Topics list"
8289
msgstr ""
8290
8291
#: dummy/help_topics/url-special-chars/summary.txt:1
8292
msgid "Special character handling in URLs"
8293
msgstr ""
8294
8295
#: dummy/help_topics/urlspec/summary.txt:1
8296
msgid "Supported transport protocols"
8297
msgstr ""
8298
8299
#: dummy/help_topics/working-trees/detail.txt:1
8300
msgid "Working Trees"
8301
msgstr ""
8302
8303
#: dummy/help_topics/working-trees/detail.txt:3
8304
msgid ""
8305
"A working tree is the contents of a branch placed on disk so that you can\n"
8306
"see the files and edit them. The working tree is where you make changes to "
8307
"a\n"
8308
"branch, and when you commit the current state of the working tree is the\n"
8309
"snapshot that is recorded in the commit."
8310
msgstr ""
8311
8312
#: dummy/help_topics/working-trees/detail.txt:8
8313
msgid ""
8314
"When you push a branch to a remote system, a working tree will not be\n"
8315
"created. If one is already present the files will not be updated. The\n"
8316
"branch information will be updated and the working tree will be marked\n"
8317
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8318
"may be uncommitted changes or the update may cause content conflicts that "
8319
"are\n"
8320
"difficult to deal with remotely."
8321
msgstr ""
8322
8323
#: dummy/help_topics/working-trees/detail.txt:15
8324
msgid ""
8325
"If you have a branch with no working tree you can use the 'checkout' "
8326
"command\n"
8327
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8328
"will\n"
8329
"create the working tree. If the branch is updated remotely, you can update "
8330
"the\n"
8331
"working tree by running 'bzr update' in that directory."
8332
msgstr ""
8333
8334
#: dummy/help_topics/working-trees/detail.txt:20
8335
msgid ""
8336
"If you have a branch with a working tree that you do not want the 'remove-"
8337
"tree'\n"
8338
"command will remove the tree if it is safe. This can be done to avoid the\n"
8339
"warning about the remote working tree not being updated when pushing to the\n"
8340
"branch. It can also be useful when working with a '--no-trees' repository\n"
8341
"(see 'bzr help repositories')."
8342
msgstr ""
8343
8344
#: dummy/help_topics/working-trees/detail.txt:26
8345
msgid ""
8346
"If you want to have a working tree on a remote machine that you push to you\n"
8347
"can either run 'bzr update' in the remote branch after each push, or use "
8348
"some\n"
8349
"other method to update the tree during the push. There is an 'rspush' "
8350
"plugin\n"
8351
"that will update the working tree using rsync as well as doing a push. "
8352
"There\n"
8353
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8354
"SSH\n"
8355
"after each push."
8356
msgstr ""
8357
8358
#: dummy/help_topics/working-trees/detail.txt:33
8359
msgid "Useful commands::"
8360
msgstr ""
8361
8362
#: dummy/help_topics/working-trees/detail.txt:35
8363
msgid ""
8364
" checkout Create a working tree when a branch does not have one.\n"
8365
" remove-tree Removes the working tree from a branch when it is safe to do "
8366
"so.\n"
8367
" update When a working tree is out of sync with its associated "
8368
"branch\n"
8369
" this will update the tree to match the branch.\n"
8370
msgstr ""
8371
8372
#: dummy/help_topics/working-trees/summary.txt:1
8373
msgid "Information on working trees"
8374
msgstr ""
8375
8376
#: en/help_topics/authentication.txt:1
8377
msgid ""
8378
"Authentication Settings\n"
8379
"======================="
8380
msgstr ""
8381
8382
#: en/help_topics/authentication.txt:4
8383
msgid ""
8384
"\n"
8385
"Intent\n"
8386
"------"
8387
msgstr ""
8388
8389
#: en/help_topics/authentication.txt:8
8390
msgid ""
8391
"Many different authentication policies can be described in the\n"
8392
"``authentication.conf`` file but a particular user should need only a few\n"
8393
"definitions to cover his needs without having to specify a user and a "
8394
"password\n"
8395
"for every branch he uses."
8396
msgstr ""
8397
8398
#: en/help_topics/authentication.txt:13
8399
msgid ""
8400
"The definitions found in this file are used to find the credentials to use "
8401
"for\n"
8402
"a given url. The same credentials can generally be used for as many branches "
8403
"as\n"
8404
"possible by grouping their declaration around the remote servers that need\n"
8405
"them. It's even possible to declare credentials that will be used by "
8406
"different\n"
8407
"servers."
8408
msgstr ""
8409
8410
#: en/help_topics/authentication.txt:19
8411
msgid ""
8412
"The intent is to make this file as small as possible to minimize maintenance."
8413
msgstr ""
8414
8415
#: en/help_topics/authentication.txt:21
8416
msgid ""
8417
"Once the relevant credentials are declared in this file you may use branch "
8418
"urls\n"
8419
"without embedding passwords (security hazard) or even users (enabling "
8420
"sharing\n"
8421
"of your urls with others)."
8422
msgstr ""
8423
8424
#: en/help_topics/authentication.txt:25
8425
msgid "Instead of using::"
8426
msgstr ""
8427
8428
#: en/help_topics/authentication.txt:27
8429
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8430
msgstr ""
8431
8432
#: en/help_topics/authentication.txt:29
8433
msgid "you simply use::"
8434
msgstr ""
8435
8436
#: en/help_topics/authentication.txt:31
8437
msgid " bzr branch ftp://host.com/path/to/my/branch"
8438
msgstr ""
8439
8440
#: en/help_topics/authentication.txt:33
8441
msgid ""
8442
"provided you have created the following ``authentication.conf`` file::"
8443
msgstr ""
8444
8445
#: en/help_topics/authentication.txt:35
8446
msgid ""
8447
" [myprojects]\n"
8448
" scheme=ftp\n"
8449
" host=host.com\n"
8450
" user=joe\n"
8451
" password=secret\n"
8452
" "
8453
msgstr ""
8454
8455
#: en/help_topics/authentication.txt:42
8456
msgid ""
8457
"Authentication definitions\n"
8458
"--------------------------"
8459
msgstr ""
8460
8461
#: en/help_topics/authentication.txt:45
8462
msgid ""
8463
"There are two kinds of authentication used by the various schemes supported "
8464
"by\n"
8465
"bzr:"
8466
msgstr ""
8467
8468
#: en/help_topics/authentication.txt:48
8469
msgid "1. user and password"
8470
msgstr ""
8471
8472
#: en/help_topics/authentication.txt:50
8473
msgid ""
8474
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8475
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8476
"ssh agents are a better, more secure solution. So we have chosen to not "
8477
"provide\n"
8478
"our own less secure method."
8479
msgstr ""
8480
8481
#: en/help_topics/authentication.txt:55
8482
msgid "2. user, realm and password"
8483
msgstr ""
8484
8485
#: en/help_topics/authentication.txt:57
8486
msgid ""
8487
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8488
"against a host. But, by using ``.htaccess`` files, for example, it is "
8489
"possible\n"
8490
"to define several (``user, realm, password``) for a given ``host``. So what "
8491
"is\n"
8492
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8493
"is\n"
8494
"not taken into account in the definitions, but will displayed if bzr "
8495
"prompts\n"
8496
"you for a password."
8497
msgstr ""
8498
8499
#: en/help_topics/authentication.txt:64
8500
msgid ""
8501
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8502
"specifying the appropriate port."
8503
msgstr ""
8504
8505
#: en/help_topics/authentication.txt:67
8506
msgid ""
8507
"To take all schemes into account, the password will be deduced from a set "
8508
"of\n"
8509
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8510
"``user``,\n"
8511
"``password``)."
8512
msgstr ""
8513
8514
#: en/help_topics/authentication.txt:71
8515
msgid ""
8516
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8517
"used\n"
8518
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8519
"``ssh``\n"
8520
" should be used instead since this is the real scheme regarding\n"
8521
" authentication,"
8522
msgstr ""
8523
8524
#: en/help_topics/authentication.txt:76
8525
msgid " * ``host``: can be empty (to act as a default for any host),"
8526
msgstr ""
8527
8528
#: en/help_topics/authentication.txt:78
8529
msgid ""
8530
" * ``port`` can be empty (useful when an host provides several servers for "
8531
"the\n"
8532
" same scheme), only numerical values are allowed, this should be used "
8533
"only\n"
8534
" when the server uses a port different than the scheme standard port,"
8535
msgstr ""
8536
8537
#: en/help_topics/authentication.txt:82
8538
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8539
msgstr ""
8540
8541
#: en/help_topics/authentication.txt:84
8542
msgid ""
8543
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8544
" ``getpass.get_user()``),"
8545
msgstr ""
8546
8547
#: en/help_topics/authentication.txt:87
8548
msgid ""
8549
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8550
" password."
8551
msgstr ""
8552
8553
#: en/help_topics/authentication.txt:90
8554
msgid ""
8555
"Multiple definitions can be provided and, for a given URL, bzr will select "
8556
"a\n"
8557
"(``user`` [, ``password``]) based on the following rules :"
8558
msgstr ""
8559
8560
#: en/help_topics/authentication.txt:93
8561
msgid " 1. the first match wins,"
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:95
8565
msgid " 2. empty fields match everything,"
8566
msgstr ""
8567
8568
#: en/help_topics/authentication.txt:97
8569
msgid ""
8570
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8571
msgstr ""
8572
8573
#: en/help_topics/authentication.txt:99
8574
msgid ""
8575
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8576
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8577
"``projectbzr.sf.net``\n"
8578
" will not match ``bzr.sf.net``)."
8579
msgstr ""
8580
8581
#: en/help_topics/authentication.txt:103
8582
msgid ""
8583
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8584
msgstr ""
8585
8586
#: en/help_topics/authentication.txt:105
8587
msgid ""
8588
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8589
"above,\n"
8590
" empty paths will match any provided path)."
8591
msgstr ""
8592
8593
#: en/help_topics/authentication.txt:110
8594
msgid ""
8595
"File format\n"
8596
"-----------"
8597
msgstr ""
8598
8599
#: en/help_topics/authentication.txt:113
8600
msgid ""
8601
"The general rules for :doc:`configuration files <configuration-help>`\n"
8602
"apply except for the variable policies."
8603
msgstr ""
8604
8605
#: en/help_topics/authentication.txt:116
8606
msgid "Each section describes an authentication definition."
8607
msgstr ""
8608
8609
#: en/help_topics/authentication.txt:118
8610
msgid ""
8611
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8612
"reserved\n"
8613
"and should appear as the *last* section."
8614
msgstr ""
8615
8616
#: en/help_topics/authentication.txt:121
8617
msgid "Each section should define:"
8618
msgstr ""
8619
8620
#: en/help_topics/authentication.txt:123
8621
msgid "* ``user``: the login to be used,"
8622
msgstr ""
8623
8624
#: en/help_topics/authentication.txt:125
8625
msgid "Each section could define:"
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:127
8629
msgid "* ``host``: the remote server,"
8630
msgstr ""
8631
8632
#: en/help_topics/authentication.txt:129
8633
msgid "* ``port``: the port the server is listening,"
8634
msgstr ""
8635
8636
#: en/help_topics/authentication.txt:131
8637
msgid "* ``path``: the branch location,"
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:133
8641
msgid "* ``password``: the password."
8642
msgstr ""
8643
8644
#: en/help_topics/authentication.txt:135
8645
msgid ""
8646
"\n"
8647
"Examples\n"
8648
"--------"
8649
msgstr ""
8650
8651
#: en/help_topics/authentication.txt:139
8652
msgid ""
8653
"\n"
8654
"Personal projects hosted outside\n"
8655
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8656
msgstr ""
8657
8658
#: en/help_topics/authentication.txt:143
8659
msgid ""
8660
"All connections are done with the same ``user`` (the remote one for which "
8661
"the\n"
8662
"default bzr one is not appropriate) and the password is always prompted "
8663
"with\n"
8664
"some exceptions::"
8665
msgstr ""
8666
8667
#: en/help_topics/authentication.txt:147
8668
msgid ""
8669
" # Pet projects on hobby.net\n"
8670
" [hobby]\n"
8671
" host=r.hobby.net\n"
8672
" user=jim\n"
8673
" password=obvious1234\n"
8674
" \n"
8675
" # Home server\n"
8676
" [home]\n"
8677
" scheme=https\n"
8678
" host=home.net\n"
8679
" user=joe\n"
8680
" password=1essobV10us\n"
8681
" \n"
8682
" [DEFAULT]\n"
8683
" # Our local user is barbaz, on all remote sites we're known as "
8684
"foobar\n"
8685
" user=foobar"
8686
msgstr ""
8687
8688
#: en/help_topics/authentication.txt:164
8689
msgid ""
8690
"\n"
8691
"Source hosting provider\n"
8692
"~~~~~~~~~~~~~~~~~~~~~~~"
8693
msgstr ""
8694
8695
#: en/help_topics/authentication.txt:168
8696
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8697
msgstr ""
8698
8699
#: en/help_topics/authentication.txt:170
8700
msgid ""
8701
" [shpnet domain]\n"
8702
" # we use sftp, but ssh is the scheme used for authentication\n"
8703
" scheme=ssh\n"
8704
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8705
" host=.shp.net\n"
8706
" user=joe\n"
8707
" # bzr don't support supplying a password for sftp,\n"
8708
" # consider using an ssh agent if you don't want to supply\n"
8709
" # a password interactively. (pageant, ssh-agent, etc)"
8710
msgstr ""
8711
8712
#: en/help_topics/authentication.txt:180
8713
msgid ""
8714
"HTTPS, SFTP servers and their proxy\n"
8715
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:183
8719
msgid ""
8720
"At company.com, the server hosting release and integration branches is "
8721
"behind a\n"
8722
"proxy, and the two branches use different authentication policies::"
8723
msgstr ""
8724
8725
#: en/help_topics/authentication.txt:186
8726
msgid ""
8727
" [reference code]\n"
8728
" scheme=https\n"
8729
" host=dev.company.com\n"
8730
" path=/dev\n"
8731
" user=user1\n"
8732
" password=pass1"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:193
8736
msgid ""
8737
" # development branches on dev server\n"
8738
" [dev]\n"
8739
" scheme=ssh # bzr+ssh and sftp are available here\n"
8740
" host=dev.company.com\n"
8741
" path=/dev/integration\n"
8742
" user=user2\n"
8743
" \n"
8744
" # proxy\n"
8745
" [proxy]\n"
8746
" scheme=http\n"
8747
" host=proxy.company.com\n"
8748
" port=3128\n"
8749
" user=proxyuser1\n"
8750
" password=proxypass1"
8751
msgstr ""
8752
8753
#: en/help_topics/authentication.txt:208
8754
msgid ""
8755
"\n"
8756
"Planned enhancements\n"
8757
"--------------------"
8758
msgstr ""
8759
8760
#: en/help_topics/authentication.txt:212
8761
msgid ""
8762
"The following are not yet implemented but planned as parts of a work in\n"
8763
"progress:"
8764
msgstr ""
8765
8766
#: en/help_topics/authentication.txt:215
8767
msgid "* add a ``password_encoding`` field allowing:"
8768
msgstr ""
8769
8770
#: en/help_topics/authentication.txt:217
8771
msgid ""
8772
" - storing the passwords in various obfuscating encodings (base64 for one),"
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:219
8776
msgid " - delegate password storage to plugins (.netrc for example)."
8777
msgstr ""
8778
8779
#: en/help_topics/authentication.txt:221
8780
msgid ""
8781
"* update the credentials when the user is prompted for user or password,"
8782
msgstr ""
8783
8784
#: en/help_topics/authentication.txt:223
8785
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8786
msgstr ""
8787
8788
#: en/help_topics/authentication.txt:225
8789
msgid ""
8790
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8791
"but\n"
8792
"ignored in the actual implementation.\n"
8793
msgstr ""
8794
8795
#: en/help_topics/bugs.txt:1
8796
msgid "Bug Tracker Settings"
8797
msgstr ""
8798
8799
#: en/help_topics/bugs.txt:3
8800
msgid ""
8801
"When making a commit, metadata about bugs fixed by that change can be\n"
8802
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8803
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8804
"(The only ``status`` value currently supported is ``fixed.``)"
8805
msgstr ""
8806
8807
#: en/help_topics/bugs.txt:8
8808
msgid ""
8809
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8810
"identifier\n"
8811
"rather than a full URL. This looks like::"
8812
msgstr ""
8813
8814
#: en/help_topics/bugs.txt:11
8815
msgid " bzr commit --fixes <tracker>:<id>"
8816
msgstr ""
8817
8818
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8819
msgid "or::"
8820
msgstr ""
8821
8822
#: en/help_topics/bugs.txt:15
8823
msgid " bzr commit --fixes <id>"
8824
msgstr ""
8825
8826
#: en/help_topics/bugs.txt:17
8827
msgid ""
8828
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8829
"the\n"
8830
"identifier for that bug within the bugtracker, usually the bug number.\n"
8831
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8832
"or global configuration is used."
8833
msgstr ""
8834
8835
#: en/help_topics/bugs.txt:22
8836
msgid ""
8837
"Bazaar knows about a few bug trackers that have many users. If\n"
8838
"you use one of these bug trackers then there is no setup required to\n"
8839
"use this feature, you just need to know the tracker identifier to use.\n"
8840
"These are the bugtrackers that are built in:"
8841
msgstr ""
8842
8843
#: en/help_topics/bugs.txt:27
8844
msgid ""
8845
" ============================ ============ ============\n"
8846
" URL Abbreviation Example\n"
8847
" ============================ ============ ============\n"
8848
" https://bugs.launchpad.net/ lp lp:12345\n"
8849
" http://bugs.debian.org/ deb deb:12345\n"
8850
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8851
" ============================ ============ ============"
8852
msgstr ""
8853
8854
#: en/help_topics/bugs.txt:35
8855
msgid ""
8856
"For the bug trackers not listed above configuration is required.\n"
8857
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8858
"is built in, along with a template mechanism for other bugtrackers with\n"
8859
"simple URL schemes. If your bug tracker can't be described by one\n"
8860
"of the schemes described below then you can write a plugin to support\n"
8861
"it."
8862
msgstr ""
8863
8864
#: en/help_topics/bugs.txt:42
8865
msgid ""
8866
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8867
"variable which contains the base URL of the bug tracker. These options\n"
8868
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8869
"configuration section in ``locations.conf``. You can set up these values\n"
8870
"for each of the projects you work on."
8871
msgstr ""
8872
8873
#: en/help_topics/bugs.txt:48
8874
msgid ""
8875
"Note: As you provide a short name for each tracker, you can specify one or\n"
8876
"more bugs in one or more trackers at commit time if you wish."
8877
msgstr ""
8878
8879
#: en/help_topics/bugs.txt:51
8880
msgid ""
8881
"Launchpad\n"
8882
"---------"
8883
msgstr ""
8884
8885
#: en/help_topics/bugs.txt:54
8886
msgid ""
8887
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8888
msgstr ""
8889
8890
#: en/help_topics/bugs.txt:56
8891
msgid ""
8892
"bugzilla_<tracker>_url\n"
8893
"----------------------"
8894
msgstr ""
8895
8896
#: en/help_topics/bugs.txt:59
8897
msgid ""
8898
"If present, the location of the Bugzilla bug tracker referred to by\n"
8899
"<tracker>. This option can then be used together with ``bzr commit\n"
8900
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8901
"example::"
8902
msgstr ""
8903
8904
#: en/help_topics/bugs.txt:64
8905
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8906
msgstr ""
8907
8908
#: en/help_topics/bugs.txt:66
8909
msgid ""
8910
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8911
"fixed."
8912
msgstr ""
8913
8914
#: en/help_topics/bugs.txt:69
8915
msgid ""
8916
"trac_<tracker>_url\n"
8917
"------------------"
8918
msgstr ""
8919
8920
#: en/help_topics/bugs.txt:72
8921
msgid ""
8922
"If present, the location of the Trac instance referred to by\n"
8923
"<tracker>. This option can then be used together with ``bzr commit\n"
8924
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8925
"example::"
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:77
8929
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8930
msgstr ""
8931
8932
#: en/help_topics/bugs.txt:79
8933
msgid ""
8934
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8935
"as\n"
8936
"fixed."
8937
msgstr ""
8938
8939
#: en/help_topics/bugs.txt:82
8940
msgid ""
8941
"bugtracker_<tracker>_url\n"
8942
"------------------------"
8943
msgstr ""
8944
8945
#: en/help_topics/bugs.txt:85
8946
msgid ""
8947
"If present, the location of a generic bug tracker instance referred to by\n"
8948
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8949
"which will be replaced by a specific bug ID. This option can then be used\n"
8950
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8951
"fixed by that commit. For example::"
8952
msgstr ""
8953
8954
#: en/help_topics/bugs.txt:91
8955
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8956
msgstr ""
8957
8958
#: en/help_topics/bugs.txt:93
8959
msgid ""
8960
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8961
"Roundup bug tracker as fixed, or::"
8962
msgstr ""
8963
8964
#: en/help_topics/bugs.txt:96
8965
msgid ""
8966
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8967
msgstr ""
8968
8969
#: en/help_topics/bugs.txt:98
8970
msgid ""
8971
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8972
"RT bug tracker as fixed, or::"
8973
msgstr ""
8974
8975
#: en/help_topics/bugs.txt:101
8976
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8977
msgstr ""
8978
8979
#: en/help_topics/bugs.txt:103
8980
msgid ""
8981
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8982
"1234\n"
8983
"in Hudson's JIRA bug tracker as fixed.\n"
8984
msgstr ""
8985
8986
#: en/help_topics/commands.txt:1
8987
msgid ""
8988
"add Add specified files or directories.\n"
8989
"alias Set/unset and display aliases.\n"
8990
"annotate Show the origin of each line in a file.\n"
8991
"bash-completion Generate a shell function for bash command line "
8992
"completion.\n"
8993
" [bash_completion]\n"
8994
"bind Convert the current branch into a checkout of the "
8995
"supplied\n"
8996
" branch.\n"
8997
"branch Create a new branch that is a copy of an existing branch.\n"
8998
"branches List the branches available at the current location.\n"
8999
"break-lock Break a dead lock.\n"
9000
"cat Write the contents of a file as of a given revision to\n"
9001
" standard output.\n"
9002
"check Validate working tree structure, branch consistency and\n"
9003
" repository history.\n"
9004
"checkout Create a new checkout of an existing branch.\n"
9005
"clean-tree Remove unwanted files from working tree.\n"
9006
"commit Commit changes into a new revision.\n"
9007
"config Display, set or remove a configuration option.\n"
9008
"conflicts List files with conflicts.\n"
9009
"deleted List files deleted in the working tree.\n"
9010
"diff Show differences in the working tree, between revisions "
9011
"or\n"
9012
" branches.\n"
9013
"dpush Push into a different VCS without any custom bzr "
9014
"metadata.\n"
9015
"export Export current or past revision to a destination directory "
9016
"or\n"
9017
" archive.\n"
9018
"help Show help on a command or other topic.\n"
9019
"ignore Ignore specified files or patterns.\n"
9020
"ignored List ignored files and the patterns that matched them.\n"
9021
"info Show information about a working tree, branch or "
9022
"repository.\n"
9023
"init Make a directory into a versioned branch.\n"
9024
"init-repository Create a shared repository for branches to share storage\n"
9025
" space.\n"
9026
"join Combine a tree into its containing tree.\n"
9027
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9028
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9029
"launchpad-open Open a Launchpad branch page in your web browser. "
9030
"[launchpad]\n"
9031
"log Show historical log for a branch or subset of a branch.\n"
9032
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9033
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9034
"ls List files in a tree.\n"
9035
"merge Perform a three-way merge.\n"
9036
"missing Show unmerged/unpulled revisions between two branches.\n"
9037
"mkdir Create a new versioned directory.\n"
9038
"mv Move or rename a file.\n"
9039
"nick Print or set the branch nickname.\n"
9040
"pack Compress the data within a repository.\n"
9041
"plugins List the installed plugins.\n"
9042
"pull Turn this branch into a mirror of another branch.\n"
9043
"push Update a mirror of this branch.\n"
9044
"reconcile Reconcile bzr metadata in a branch.\n"
9045
"reconfigure Reconfigure the type of a bzr directory.\n"
9046
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9047
"remerge Redo a merge.\n"
9048
"remove Remove files or directories.\n"
9049
"remove-branch Remove a branch.\n"
9050
"remove-tree Remove the working tree from a given branch/checkout.\n"
9051
"renames Show list of renamed files.\n"
9052
"resolve Mark a conflict as resolved.\n"
9053
"revert Revert files to a previous revision.\n"
9054
"revno Show current revision number.\n"
9055
"root Show the tree root directory.\n"
9056
"send Mail or create a merge-directive for submitting changes.\n"
9057
"serve Run the bzr server.\n"
9058
"shelve Temporarily set aside some changes from the current tree.\n"
9059
"sign-my-commits Sign all commits by a given committer.\n"
9060
"split Split a subdirectory of a tree into a separate tree.\n"
9061
"status Display status summary.\n"
9062
"switch Set the branch of a checkout and update.\n"
9063
"tag Create, remove or modify a tag naming a revision.\n"
9064
"tags List tags.\n"
9065
"testament Show testament (signing-form) of a revision.\n"
9066
"unbind Convert the current checkout into a regular branch.\n"
9067
"uncommit Remove the last committed revision.\n"
9068
"unshelve Restore shelved changes.\n"
9069
"update Update a working tree to a new revision.\n"
9070
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9071
" format.\n"
9072
"verify-signatures Verify all commit signatures.\n"
9073
"version Show version of bzr.\n"
9074
"version-info Show version information about this tree.\n"
9075
"view Manage filtered views.\n"
9076
"whoami Show or set bzr user id.\n"
9077
msgstr ""
9078
9079
#: en/help_topics/configuration.txt:1
9080
msgid ""
9081
"Configuration Settings\n"
9082
"======================="
9083
msgstr ""
9084
9085
#: en/help_topics/configuration.txt:4
9086
msgid ""
9087
"Environment settings\n"
9088
"---------------------"
9089
msgstr ""
9090
9091
#: en/help_topics/configuration.txt:7
9092
msgid ""
9093
"While most configuration is handled by configuration files, some options\n"
9094
"which may be semi-permanent can also be controlled through the environment."
9095
msgstr ""
9096
9097
#: en/help_topics/configuration.txt:10
9098
msgid ""
9099
"BZR_EMAIL\n"
9100
"~~~~~~~~~"
9101
msgstr ""
9102
9103
#: en/help_topics/configuration.txt:13
9104
msgid "Override the email id used by Bazaar. Typical format::"
9105
msgstr ""
9106
9107
#: en/help_topics/configuration.txt:15
9108
msgid " \"John Doe <jdoe@example.com>\""
9109
msgstr ""
9110
9111
#: en/help_topics/configuration.txt:17
9112
msgid "See also the ``email`` configuration option."
9113
msgstr ""
9114
9115
#: en/help_topics/configuration.txt:19
9116
msgid ""
9117
"BZR_PROGRESS_BAR\n"
9118
"~~~~~~~~~~~~~~~~"
9119
msgstr ""
9120
9121
#: en/help_topics/configuration.txt:22
9122
msgid ""
9123
"Override the progress display. Possible values are \"none\" or \"text\". "
9124
"If\n"
9125
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9126
"draws\n"
9127
"the ordinary command line progress bar."
9128
msgstr ""
9129
9130
#: en/help_topics/configuration.txt:26
9131
msgid ""
9132
"BZR_SIGQUIT_PDB\n"
9133
"~~~~~~~~~~~~~~~"
9134
msgstr ""
9135
9136
#: en/help_topics/configuration.txt:29
9137
msgid ""
9138
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9139
msgstr ""
9140
9141
#: en/help_topics/configuration.txt:31
9142
msgid ""
9143
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9144
"* 1 = Invoke breakin debugger (default)"
9145
msgstr ""
9146
9147
#: en/help_topics/configuration.txt:34
9148
msgid ""
9149
"BZR_HOME\n"
9150
"~~~~~~~~"
9151
msgstr ""
9152
9153
#: en/help_topics/configuration.txt:37
9154
msgid "Override the home directory used by Bazaar."
9155
msgstr ""
9156
9157
#: en/help_topics/configuration.txt:39
9158
msgid ""
9159
"BZR_SSH\n"
9160
"~~~~~~~"
9161
msgstr ""
9162
9163
#: en/help_topics/configuration.txt:42
9164
msgid "Select a different SSH implementation."
9165
msgstr ""
9166
9167
#: en/help_topics/configuration.txt:44
9168
msgid ""
9169
"BZR_PDB\n"
9170
"~~~~~~~"
9171
msgstr ""
9172
9173
#: en/help_topics/configuration.txt:47
9174
msgid "Control whether to launch a debugger on error."
9175
msgstr ""
9176
9177
#: en/help_topics/configuration.txt:49
9178
msgid ""
9179
"* 0 = Standard behavior\n"
9180
"* 1 = Launch debugger"
9181
msgstr ""
9182
9183
#: en/help_topics/configuration.txt:52
9184
msgid ""
9185
"BZR_REMOTE_PATH\n"
9186
"~~~~~~~~~~~~~~~"
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:55
9190
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9191
msgstr ""
9192
9193
#: en/help_topics/configuration.txt:57
9194
msgid "See also the ``bzr_remote_path`` configuration option."
9195
msgstr ""
9196
9197
#: en/help_topics/configuration.txt:59
9198
msgid ""
9199
"BZR_EDITOR\n"
9200
"~~~~~~~~~~"
9201
msgstr ""
9202
9203
#: en/help_topics/configuration.txt:62
9204
msgid "Path to the editor Bazaar should use for commit messages, etc."
9205
msgstr ""
9206
9207
#: en/help_topics/configuration.txt:64
9208
msgid ""
9209
"BZR_LOG\n"
9210
"~~~~~~~"
9211
msgstr ""
9212
9213
#: en/help_topics/configuration.txt:67
9214
msgid ""
9215
"Location of the Bazaar log file. You can check the current location by\n"
9216
"running ``bzr version``."
9217
msgstr ""
9218
9219
#: en/help_topics/configuration.txt:70
9220
msgid ""
9221
"The log file contains debug information that is useful for diagnosing or\n"
9222
"reporting problems with Bazaar."
9223
msgstr ""
9224
9225
#: en/help_topics/configuration.txt:73
9226
msgid ""
9227
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9228
"will disable logging."
9229
msgstr ""
9230
9231
#: en/help_topics/configuration.txt:76
9232
msgid ""
9233
"\n"
9234
"BZR_PLUGIN_PATH\n"
9235
"~~~~~~~~~~~~~~~"
9236
msgstr ""
9237
9238
#: en/help_topics/configuration.txt:80
9239
msgid ""
9240
"The path to the plugins directory that Bazaar should use.\n"
9241
"If not set, Bazaar will search for plugins in:"
9242
msgstr ""
9243
9244
#: en/help_topics/configuration.txt:83
9245
msgid ""
9246
"* the user specific plugin directory (containing the ``user`` plugins),"
9247
msgstr ""
9248
9249
#: en/help_topics/configuration.txt:85
9250
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9251
msgstr ""
9252
9253
#: en/help_topics/configuration.txt:87
9254
msgid ""
9255
"* the site specific plugin directory if applicable (containing\n"
9256
" the ``site`` plugins)."
9257
msgstr ""
9258
9259
#: en/help_topics/configuration.txt:90
9260
msgid ""
9261
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9262
"the way the plugin are searched. "
9263
msgstr ""
9264
9265
#: en/help_topics/configuration.txt:93
9266
msgid ""
9267
"As for the ``PATH`` variables, if multiple directories are\n"
9268
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9269
"platform specific appropriate character (':' on Unix,\n"
9270
"';' on windows)"
9271
msgstr ""
9272
9273
#: en/help_topics/configuration.txt:98
9274
msgid ""
9275
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9276
"in ``user``. However it will continue to search in ``core`` and\n"
9277
"``site`` unless they are explicitly removed."
9278
msgstr ""
9279
9280
#: en/help_topics/configuration.txt:102
9281
msgid ""
9282
"If you need to change the order or remove one of these\n"
9283
"directories, you should use special values:"
9284
msgstr ""
9285
9286
#: en/help_topics/configuration.txt:105
9287
msgid ""
9288
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9289
" path from the default values,"
9290
msgstr ""
9291
9292
#: en/help_topics/configuration.txt:108
9293
msgid ""
9294
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9295
" before the remaining default values (and also remove it from\n"
9296
" the default values)."
9297
msgstr ""
9298
9299
#: en/help_topics/configuration.txt:112
9300
msgid ""
9301
"Note that the special values 'user', 'core' and 'site' should be\n"
9302
"used literally, they will be substituted by the corresponding,\n"
9303
"platform specific, values."
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:116
9307
msgid ""
9308
"The examples below use ':' as the separator, windows users\n"
9309
"should use ';'."
9310
msgstr ""
9311
9312
#: en/help_topics/configuration.txt:119
9313
msgid "Overriding the default user plugin directory::"
9314
msgstr ""
9315
9316
#: en/help_topics/configuration.txt:121
9317
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9318
msgstr ""
9319
9320
#: en/help_topics/configuration.txt:123
9321
msgid "Disabling the site directory while retaining the user directory::"
9322
msgstr ""
9323
9324
#: en/help_topics/configuration.txt:125
9325
msgid " BZR_PLUGIN_PATH='-site:+user'"
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:127
9329
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9330
msgstr ""
9331
9332
#: en/help_topics/configuration.txt:129
9333
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:131
9337
msgid "Overriding the default site plugin directory::"
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:133
9341
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9342
msgstr ""
9343
9344
#: en/help_topics/configuration.txt:135
9345
msgid ""
9346
"BZR_DISABLE_PLUGINS\n"
9347
"~~~~~~~~~~~~~~~~~~~"
9348
msgstr ""
9349
9350
#: en/help_topics/configuration.txt:138
9351
msgid ""
9352
"Under special circumstances (mostly when trying to diagnose a\n"
9353
"bug), it's better to disable a plugin (or several) rather than\n"
9354
"uninstalling them completely. Such plugins can be specified in\n"
9355
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9356
msgstr ""
9357
9358
#: en/help_topics/configuration.txt:143
9359
msgid ""
9360
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9361
"will raise an import error if they are explicitly imported (by\n"
9362
"another plugin that depends on them for example)."
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:147
9366
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:149
9370
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:151
9374
msgid ""
9375
"BZR_PLUGINS_AT\n"
9376
"~~~~~~~~~~~~~~"
9377
msgstr ""
9378
9379
#: en/help_topics/configuration.txt:154
9380
msgid ""
9381
"When adding a new feature or working on a bug in a plugin,\n"
9382
"developers often need to use a specific version of a given\n"
9383
"plugin. Since python requires that the directory containing the\n"
9384
"code is named like the plugin itself this make it impossible to\n"
9385
"use arbitrary directory names (using a two-level directory scheme\n"
9386
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9387
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9388
msgstr ""
9389
9390
#: en/help_topics/configuration.txt:162
9391
msgid ""
9392
"Plugins specified in this environment variable takes precedence\n"
9393
"over the ones in ``BZR_PLUGIN_PATH``."
9394
msgstr ""
9395
9396
#: en/help_topics/configuration.txt:165
9397
msgid ""
9398
"The variable specified a list of ``plugin_name@plugin path``,\n"
9399
"``plugin_name`` being the name of the plugin as it appears in\n"
9400
"python module paths, ``plugin_path`` being the path to the\n"
9401
"directory containing the plugin code itself\n"
9402
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9403
"separator, use ';' on windows."
9404
msgstr ""
9405
9406
#: en/help_topics/configuration.txt:172
9407
msgid ""
9408
"Example:\n"
9409
"~~~~~~~~"
9410
msgstr ""
9411
9412
#: en/help_topics/configuration.txt:175
9413
msgid ""
9414
"Using a specific version of ``myplugin``:\n"
9415
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9416
msgstr ""
9417
9418
#: en/help_topics/configuration.txt:178
9419
msgid ""
9420
"BZRPATH\n"
9421
"~~~~~~~"
9422
msgstr ""
9423
9424
#: en/help_topics/configuration.txt:181
9425
msgid "The path where Bazaar should look for shell plugin external commands."
9426
msgstr ""
9427
9428
#: en/help_topics/configuration.txt:183
9429
msgid ""
9430
"\n"
9431
"http_proxy, https_proxy\n"
9432
"~~~~~~~~~~~~~~~~~~~~~~~"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:187
9436
msgid "Specifies the network proxy for outgoing connections, for example::"
9437
msgstr ""
9438
9439
#: en/help_topics/configuration.txt:189
9440
msgid ""
9441
" http_proxy=http://proxy.example.com:3128/ \n"
9442
" https_proxy=http://proxy.example.com:3128/"
9443
msgstr ""
9444
9445
#: en/help_topics/configuration.txt:192
9446
msgid ""
9447
"\n"
9448
"Configuration files\n"
9449
"-------------------"
9450
msgstr ""
9451
9452
#: en/help_topics/configuration.txt:196
9453
msgid ""
9454
"Location\n"
9455
"~~~~~~~~"
9456
msgstr ""
9457
9458
#: en/help_topics/configuration.txt:199
9459
msgid ""
9460
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9461
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9462
"on\n"
9463
"Windows. (You can check the location for your system by using\n"
9464
"``bzr version``.)"
9465
msgstr ""
9466
9467
#: en/help_topics/configuration.txt:204
9468
msgid "There are three primary configuration files in this location:"
9469
msgstr ""
9470
9471
#: en/help_topics/configuration.txt:206
9472
msgid "* ``bazaar.conf`` describes default configuration options,"
9473
msgstr ""
9474
9475
#: en/help_topics/configuration.txt:208
9476
msgid ""
9477
"* ``locations.conf`` describes configuration information for\n"
9478
" specific branch locations,"
9479
msgstr ""
9480
9481
#: en/help_topics/configuration.txt:211
9482
msgid ""
9483
"* ``authentication.conf`` describes credential information for\n"
9484
" remote servers."
9485
msgstr ""
9486
9487
#: en/help_topics/configuration.txt:214
9488
msgid ""
9489
"Each branch can also contain a configuration file that sets values specific\n"
9490
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9491
"the\n"
9492
"branch. This file is visible to all users of a branch, if you wish to "
9493
"override\n"
9494
"one of the values for a branch with a setting that is specific to you then "
9495
"you\n"
9496
"can do so in ``locations.conf``."
9497
msgstr ""
9498
9499
#: en/help_topics/configuration.txt:220
9500
msgid ""
9501
"General format\n"
9502
"~~~~~~~~~~~~~~"
9503
msgstr ""
9504
9505
#: en/help_topics/configuration.txt:223
9506
msgid ""
9507
"An ini file has three types of contructs: section headers, section\n"
9508
"options and comments."
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:226
9512
msgid ""
9513
"Comments\n"
9514
"^^^^^^^^"
9515
msgstr ""
9516
9517
#: en/help_topics/configuration.txt:229
9518
msgid ""
9519
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9520
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9521
"Bazaar when parsing ini files."
9522
msgstr ""
9523
9524
#: en/help_topics/configuration.txt:233
9525
msgid ""
9526
"Section headers\n"
9527
"^^^^^^^^^^^^^^^"
9528
msgstr ""
9529
9530
#: en/help_topics/configuration.txt:236
9531
msgid ""
9532
"A section header is a word enclosed in brackets that starts at the begining\n"
9533
"of a line. A typical section header looks like this::"
9534
msgstr ""
9535
9536
#: en/help_topics/configuration.txt:239
9537
msgid " [DEFAULT]"
9538
msgstr ""
9539
9540
#: en/help_topics/configuration.txt:241
9541
msgid ""
9542
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9543
"[ALIASES]. Section headers are case sensitive. The default section provides "
9544
"for\n"
9545
"setting options which can be overridden with the branch config file."
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:245
9549
msgid ""
9550
"For ``locations.conf``, the options from the section with the\n"
9551
"longest matching section header are used to the exclusion of other\n"
9552
"potentially valid section headers. A section header uses the path for\n"
9553
"the branch as the section header. Some examples include::"
9554
msgstr ""
9555
9556
#: en/help_topics/configuration.txt:250
9557
msgid ""
9558
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9559
" [/home/jdoe/branches/]"
9560
msgstr ""
9561
9562
#: en/help_topics/configuration.txt:253
9563
msgid ""
9564
"\n"
9565
"Section options\n"
9566
"^^^^^^^^^^^^^^^"
9567
msgstr ""
9568
9569
#: en/help_topics/configuration.txt:257
9570
msgid ""
9571
"A section option resides within a section. A section option contains an\n"
9572
"option name, an equals sign and a value. For example::"
9573
msgstr ""
9574
9575
#: en/help_topics/configuration.txt:260
9576
msgid ""
9577
" email = John Doe <jdoe@isp.com>\n"
9578
" gpg_signing_key = Amy Pond <amy@example.com>"
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:263
9582
msgid ""
9583
"A option can reference other options by enclosing them in curly brackets::"
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:265
9587
msgid ""
9588
" my_branch_name = feature_x\n"
9589
" my_server = bzr+ssh://example.com\n"
9590
" push_location = {my_server}/project/{my_branch_name}"
9591
msgstr ""
9592
9593
#: en/help_topics/configuration.txt:269
9594
msgid ""
9595
"Option policies\n"
9596
"^^^^^^^^^^^^^^^"
9597
msgstr ""
9598
9599
#: en/help_topics/configuration.txt:272
9600
msgid ""
9601
"Options defined in a section affect the named directory or URL plus\n"
9602
"any locations they contain. Policies can be used to change how an\n"
9603
"option value is interpreted for contained locations. Currently\n"
9604
"there are three policies available:"
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:277
9608
msgid ""
9609
" none:\n"
9610
" the value is interpreted the same for contained locations. This is\n"
9611
" the default behaviour.\n"
9612
" norecurse:\n"
9613
" the value is only used for the exact location specified by the\n"
9614
" section name.\n"
9615
" appendpath:\n"
9616
" for contained locations, any additional path components are\n"
9617
" appended to the value."
9618
msgstr ""
9619
9620
#: en/help_topics/configuration.txt:287
9621
msgid ""
9622
"Policies are specified by keys with names of the form "
9623
"\"<option_name>:policy\".\n"
9624
"For example, to define the push location for a tree of branches, the\n"
9625
"following could be used::"
9626
msgstr ""
9627
9628
#: en/help_topics/configuration.txt:291
9629
msgid ""
9630
" [/top/location]\n"
9631
" push_location = sftp://example.com/location\n"
9632
" push_location:policy = appendpath"
9633
msgstr ""
9634
9635
#: en/help_topics/configuration.txt:295
9636
msgid ""
9637
"With this configuration, the push location for ``/top/location/branch1``\n"
9638
"would be ``sftp://example.com/location/branch1``."
9639
msgstr ""
9640
9641
#: en/help_topics/configuration.txt:298
9642
msgid ""
9643
"Section local options\n"
9644
"^^^^^^^^^^^^^^^^^^^^^"
9645
msgstr ""
9646
9647
#: en/help_topics/configuration.txt:301
9648
msgid ""
9649
"Some options are defined automatically inside a given section and can be\n"
9650
"refered to in this section only. "
9651
msgstr ""
9652
9653
#: en/help_topics/configuration.txt:304
9654
msgid "For example, the ``appendpath`` policy can be used like this::"
9655
msgstr ""
9656
9657
#: en/help_topics/configuration.txt:306
9658
msgid ""
9659
" [/home/vila/src/bzr/bugs]\n"
9660
" mypush = lp:~vila/bzr\n"
9661
" mypush:policy=appendpath"
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:310
9665
msgid "Using ``relpath`` to achieve the same result is done like this::"
9666
msgstr ""
9667
9668
#: en/help_topics/configuration.txt:312
9669
msgid ""
9670
" [/home/vila/src/bzr/bugs]\n"
9671
" mypush = lp:~vila/bzr/{relpath}"
9672
msgstr ""
9673
9674
#: en/help_topics/configuration.txt:315
9675
msgid ""
9676
"In both cases, when used in a directory like\n"
9677
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9678
msgstr ""
9679
9680
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9681
msgid ""
9682
" $ bzr config mypush\n"
9683
" lp:~vila/bzr/832013-expand-in-stack"
9684
msgstr ""
9685
9686
#: en/help_topics/configuration.txt:321
9687
msgid "Another such option is ``basename`` which can be used like this::"
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:323
9691
msgid ""
9692
" [/home/vila/src/bzr]\n"
9693
" mypush = lp:~vila/bzr/{basename}"
9694
msgstr ""
9695
9696
#: en/help_topics/configuration.txt:326
9697
msgid ""
9698
"When used in a directory like\n"
9699
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9700
msgstr ""
9701
9702
#: en/help_topics/configuration.txt:332
9703
msgid ""
9704
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9705
"itself is defined as the relative path between the section name and the\n"
9706
"location it matches."
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:336
9710
msgid ""
9711
"When an option is local to a Section, it cannot be referred to from option\n"
9712
"values in any other section from the same ``Store`` nor from any other\n"
9713
"``Store``."
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:340
9717
msgid ""
9718
"\n"
9719
"The main configuration file, bazaar.conf\n"
9720
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:344
9724
msgid ""
9725
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9726
"The default section contains the default\n"
9727
"configuration options for all branches. The default section can be\n"
9728
"overriden by providing a branch-specific section in ``locations.conf``."
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:349
9732
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:351
9736
msgid ""
9737
" [DEFAULT]\n"
9738
" email = John Doe <jdoe@isp.com>\n"
9739
" editor = /usr/bin/vim\n"
9740
" create_signatures = when-required"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:356
9744
msgid ""
9745
"\n"
9746
"The branch location configuration file, locations.conf\n"
9747
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9748
msgstr ""
9749
9750
#: en/help_topics/configuration.txt:360
9751
msgid ""
9752
"``locations.conf`` allows one to specify overriding settings for\n"
9753
"a specific branch. The format is almost identical to the default section in\n"
9754
"bazaar.conf with one significant change: The section header, instead of "
9755
"saying\n"
9756
"default, will be the path to a branch that you wish to override a value\n"
9757
"for. The '?' and '*' wildcards are supported::"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:366
9761
msgid ""
9762
" [/home/jdoe/branches/nethack]\n"
9763
" email = Nethack Admin <nethack@nethack.com>"
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:369
9767
msgid ""
9768
" [http://hypothetical.site.com/branches/devel-branch]\n"
9769
" create_signatures = always"
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:372
9773
msgid ""
9774
"The authentication configuration file, authentication.conf\n"
9775
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9776
msgstr ""
9777
9778
#: en/help_topics/configuration.txt:375
9779
msgid ""
9780
"``authentication.conf`` allows one to specify credentials for\n"
9781
"remote servers. This can be used for all the supported transports and any "
9782
"part\n"
9783
"of bzr that requires authentication (smtp for example)."
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:379
9787
msgid ""
9788
"The syntax of the file obeys the same rules as the others except for the\n"
9789
"option policies which don't apply."
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:382
9793
msgid ""
9794
"For more information on the possible uses of the authentication "
9795
"configuration\n"
9796
"file see :doc:`authentication-help`."
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:385
9800
msgid ""
9801
"\n"
9802
"Common options\n"
9803
"--------------"
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:389
9807
msgid ""
9808
"debug_flags\n"
9809
"~~~~~~~~~~~"
9810
msgstr ""
9811
9812
#: en/help_topics/configuration.txt:392
9813
msgid ""
9814
"A comma-separated list of debugging options to turn on. The same values\n"
9815
"can be used as with the -D command-line option (see `help global-options`).\n"
9816
"For example::"
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:396
9820
msgid " debug_flags = hpss"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:400
9824
msgid " debug_flags = hpss,evil"
9825
msgstr ""
9826
9827
#: en/help_topics/configuration.txt:402
9828
msgid ""
9829
"email\n"
9830
"~~~~~"
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:405
9834
msgid ""
9835
"The email address to use when committing a branch. Typically takes the form\n"
9836
"of::"
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:408
9840
msgid " email = Full Name <account@hostname.tld>"
9841
msgstr ""
9842
9843
#: en/help_topics/configuration.txt:410
9844
msgid ""
9845
"editor\n"
9846
"~~~~~~"
9847
msgstr ""
9848
9849
#: en/help_topics/configuration.txt:413
9850
msgid ""
9851
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9852
"a commit message. This setting is trumped by the environment variable\n"
9853
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9854
"variables."
9855
msgstr ""
9856
9857
#: en/help_topics/configuration.txt:418
9858
msgid ""
9859
"log_format\n"
9860
"~~~~~~~~~~"
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:421
9864
msgid ""
9865
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9866
"and ``line``. Additional formats may be provided by plugins. The default\n"
9867
"value is ``long``."
9868
msgstr ""
9869
9870
#: en/help_topics/configuration.txt:425
9871
msgid ""
9872
"check_signatures\n"
9873
"~~~~~~~~~~~~~~~~"
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:428
9877
msgid ""
9878
"Reserved for future use. These options will allow a policy for branches to\n"
9879
"require signatures."
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:431
9883
msgid ""
9884
"require\n"
9885
" The gnupg signature for revisions must be present and must be valid."
9886
msgstr ""
9887
9888
#: en/help_topics/configuration.txt:434
9889
msgid ""
9890
"ignore\n"
9891
" Do not check gnupg signatures of revisions."
9892
msgstr ""
9893
9894
#: en/help_topics/configuration.txt:437
9895
msgid ""
9896
"check-available\n"
9897
" (default) If gnupg signatures for revisions are present, check them.\n"
9898
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9899
" no signature is present."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:442
9903
msgid ""
9904
"create_signatures\n"
9905
"~~~~~~~~~~~~~~~~~"
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:445
9909
msgid ""
9910
"Defines the behaviour of signing revisions on commits. By default bzr will "
9911
"not\n"
9912
"sign new commits."
9913
msgstr ""
9914
9915
#: en/help_topics/configuration.txt:448
9916
msgid ""
9917
"always\n"
9918
" Sign every new revision that is committed. If the signing fails then "
9919
"the\n"
9920
" commit will not be made."
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:452
9924
msgid ""
9925
"when-required\n"
9926
" Reserved for future use."
9927
msgstr ""
9928
9929
#: en/help_topics/configuration.txt:455
9930
msgid ""
9931
"never\n"
9932
" Reserved for future use."
9933
msgstr ""
9934
9935
#: en/help_topics/configuration.txt:458
9936
msgid ""
9937
"In future it is planned that ``when-required`` will sign newly\n"
9938
"committed revisions only when the branch requires them. ``never`` will "
9939
"refuse\n"
9940
"to sign newly committed revisions, even if the branch requires signatures."
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:462
9944
msgid ""
9945
"dirstate.fdatasync\n"
9946
"~~~~~~~~~~~~~~~~~~"
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:465
9950
msgid ""
9951
"If true (default), working tree metadata changes are flushed through the\n"
9952
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9953
"should not be lost if the machine crashes. See also repository.fdatasync."
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:469
9957
msgid ""
9958
"gpg_signing_key\n"
9959
"~~~~~~~~~~~~~~~"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:472
9963
msgid ""
9964
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9965
"address, key fingerprint or full key ID. When unset or when set to\n"
9966
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:476
9970
msgid ""
9971
"recurse\n"
9972
"~~~~~~~"
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:479
9976
msgid ""
9977
"Only useful in ``locations.conf``. Defines whether or not the\n"
9978
"configuration for this section applies to subdirectories:"
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:482
9982
msgid ""
9983
"true\n"
9984
" (default) This section applies to subdirectories as well."
9985
msgstr ""
9986
9987
#: en/help_topics/configuration.txt:485
9988
msgid ""
9989
"false\n"
9990
" This section only applies to the branch at this directory and not\n"
9991
" branches below it."
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:489
9995
msgid ""
9996
"gpg_signing_command\n"
9997
"~~~~~~~~~~~~~~~~~~~"
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:492
10001
msgid ""
10002
"(Default: \"gpg\"). Which program should be used to sign and check "
10003
"revisions.\n"
10004
"For example::"
10005
msgstr ""
10006
10007
#: en/help_topics/configuration.txt:495
10008
msgid " gpg_signing_command = /usr/bin/gnpg"
10009
msgstr ""
10010
10011
#: en/help_topics/configuration.txt:497
10012
msgid ""
10013
"The specified command must accept the options \"--clearsign\" and \"-u "
10014
"<email>\"."
10015
msgstr ""
10016
10017
#: en/help_topics/configuration.txt:499
10018
msgid ""
10019
"bzr_remote_path\n"
10020
"~~~~~~~~~~~~~~~"
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:502
10024
msgid ""
10025
"(Default: \"bzr\"). The path to the command that should be used to run the "
10026
"smart\n"
10027
"server for bzr. This value may only be specified in locations.conf, because:"
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:505
10031
msgid ""
10032
"- it's needed before branch.conf is accessible\n"
10033
"- allowing remote branch.conf files to specify commands would be a security\n"
10034
" risk"
10035
msgstr ""
10036
10037
#: en/help_topics/configuration.txt:509
10038
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10039
msgstr ""
10040
10041
#: en/help_topics/configuration.txt:511
10042
msgid ""
10043
"smtp_server\n"
10044
"~~~~~~~~~~~"
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:514
10048
msgid ""
10049
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10050
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10051
msgstr ""
10052
10053
#: en/help_topics/configuration.txt:517
10054
msgid ""
10055
"smtp_username, smtp_password\n"
10056
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10057
msgstr ""
10058
10059
#: en/help_topics/configuration.txt:520
10060
msgid ""
10061
"User and password to authenticate to the SMTP server. If smtp_username\n"
10062
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10063
"These settings are only needed if the SMTP server requires authentication\n"
10064
"to send mail."
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:525
10068
msgid ""
10069
"locks.steal_dead\n"
10070
"~~~~~~~~~~~~~~~~"
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:528
10074
msgid ""
10075
"If set to true, bzr will automatically break locks held by processes from\n"
10076
"the same machine and user that are no longer alive. Otherwise, it will\n"
10077
"print a message and you can break the lock manually, if you are satisfied\n"
10078
"the object is no longer in use."
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:533
10082
msgid ""
10083
"mail_client\n"
10084
"~~~~~~~~~~~"
10085
msgstr ""
10086
10087
#: en/help_topics/configuration.txt:536
10088
msgid ""
10089
"A mail client to use for sending merge requests.\n"
10090
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10091
"it\n"
10092
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10093
"``editor``."
10094
msgstr ""
10095
10096
#: en/help_topics/configuration.txt:541
10097
msgid "Supported values for specific clients:"
10098
msgstr ""
10099
10100
#: en/help_topics/configuration.txt:543
10101
msgid ""
10102
":claws: Use Claws. This skips a dialog for attaching files.\n"
10103
":evolution: Use Evolution.\n"
10104
":kmail: Use KMail.\n"
10105
":mutt: Use Mutt.\n"
10106
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10107
"1.5,\n"
10108
" this works around some bugs that xdg-email doesn't handle."
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:550
10112
msgid "Supported generic values are:"
10113
msgstr ""
10114
10115
#: en/help_topics/configuration.txt:552
10116
msgid ""
10117
":default: See above.\n"
10118
":editor: Use your editor to compose the merge request. This also uses\n"
10119
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10120
" smtp_username and smtp_password.\n"
10121
":mapi: Use your preferred e-mail client on Windows.\n"
10122
":xdg-email: Use xdg-email to run your preferred mail program"
10123
msgstr ""
10124
10125
#: en/help_topics/configuration.txt:559
10126
msgid ""
10127
"repository.fdatasync\n"
10128
"~~~~~~~~~~~~~~~~~~~~"
10129
msgstr ""
10130
10131
#: en/help_topics/configuration.txt:562
10132
msgid ""
10133
"If true (default), repository changes are flushed through the OS buffers\n"
10134
"to physical disk. This is somewhat slower, but means data should not be\n"
10135
"lost if the machine crashes. See also dirstate.fdatasync."
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:566
10139
msgid ""
10140
"submit_branch\n"
10141
"~~~~~~~~~~~~~"
10142
msgstr ""
10143
10144
#: en/help_topics/configuration.txt:569
10145
msgid ""
10146
"The branch you intend to submit your current work to. This is "
10147
"automatically\n"
10148
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10149
"This\n"
10150
"should usually be set on a per-branch or per-location basis."
10151
msgstr ""
10152
10153
#: en/help_topics/configuration.txt:573
10154
msgid ""
10155
"public_branch\n"
10156
"~~~~~~~~~~~~~"
10157
msgstr ""
10158
10159
#: en/help_topics/configuration.txt:576
10160
msgid ""
10161
"A publically-accessible version of this branch (implying that this version "
10162
"is\n"
10163
"not publically-accessible). Used (and set) by ``bzr send``."
10164
msgstr ""
10165
10166
#: en/help_topics/configuration.txt:579
10167
msgid ""
10168
"suppress_warnings\n"
10169
"~~~~~~~~~~~~~~~~~"
10170
msgstr ""
10171
10172
#: en/help_topics/configuration.txt:582
10173
msgid ""
10174
"A list of strings, each string represent a warning that can be emitted by\n"
10175
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:585
10179
msgid "Valid values:"
10180
msgstr ""
10181
10182
#: en/help_topics/configuration.txt:587
10183
msgid ""
10184
"* ``format_deprecation``:\n"
10185
" whether the format deprecation warning is shown on repositories that "
10186
"are\n"
10187
" using deprecated formats."
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:591
10191
msgid ""
10192
"default_format\n"
10193
"~~~~~~~~~~~~~~"
10194
msgstr ""
10195
10196
#: en/help_topics/configuration.txt:594
10197
msgid ""
10198
"A format name for the default format used when creating branches. See "
10199
"``bzr\n"
10200
"help formats`` for possible values."
10201
msgstr ""
10202
10203
#: en/help_topics/configuration.txt:597
10204
msgid ""
10205
"\n"
10206
"Unicode options\n"
10207
"---------------"
10208
msgstr ""
10209
10210
#: en/help_topics/configuration.txt:601
10211
msgid ""
10212
"output_encoding\n"
10213
"~~~~~~~~~~~~~~~"
10214
msgstr ""
10215
10216
#: en/help_topics/configuration.txt:604
10217
msgid ""
10218
"A Python unicode encoding name for text output from bzr, such as log\n"
10219
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10220
"is the terminal encoding prefered by the operating system."
10221
msgstr ""
10222
10223
#: en/help_topics/configuration.txt:608
10224
msgid ""
10225
"\n"
10226
"Branch type specific options\n"
10227
"----------------------------"
10228
msgstr ""
10229
10230
#: en/help_topics/configuration.txt:612
10231
msgid ""
10232
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10233
"later format. They\n"
10234
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10235
"manually set in ``locations.conf`` or ``bazaar.conf``."
10236
msgstr ""
10237
10238
#: en/help_topics/configuration.txt:617
10239
msgid ""
10240
"append_revisions_only\n"
10241
"~~~~~~~~~~~~~~~~~~~~~"
10242
msgstr ""
10243
10244
#: en/help_topics/configuration.txt:620
10245
msgid ""
10246
"If set to \"True\" then revisions can only be appended to the log, not\n"
10247
"removed. A branch with this setting enabled can only pull from another\n"
10248
"branch if the other branch's log is a longer version of its own. This is\n"
10249
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10250
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10251
"compatibility with previous bzr versions (older than 2.2)."
10252
msgstr ""
10253
10254
#: en/help_topics/configuration.txt:627
10255
msgid ""
10256
"parent_location\n"
10257
"~~~~~~~~~~~~~~~"
10258
msgstr ""
10259
10260
#: en/help_topics/configuration.txt:630
10261
msgid ""
10262
"If present, the location of the default branch for pull or merge. This "
10263
"option\n"
10264
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10265
"--remember``."
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:634
10269
msgid ""
10270
"push_location\n"
10271
"~~~~~~~~~~~~~"
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:637
10275
msgid ""
10276
"If present, the location of the default branch for push. This option\n"
10277
"is normally set by the first ``push`` or ``push --remember``."
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:640
10281
msgid ""
10282
"push_strict\n"
10283
"~~~~~~~~~~~"
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:643
10287
msgid ""
10288
"If present, defines the ``--strict`` option default value for checking\n"
10289
"uncommitted changes before pushing."
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:646
10293
msgid ""
10294
"dpush_strict\n"
10295
"~~~~~~~~~~~~"
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:649
10299
msgid ""
10300
"If present, defines the ``--strict`` option default value for checking\n"
10301
"uncommitted changes before pushing into a different VCS without any\n"
10302
"custom bzr metadata."
10303
msgstr ""
10304
10305
#: en/help_topics/configuration.txt:653
10306
msgid ""
10307
"bound_location\n"
10308
"~~~~~~~~~~~~~~"
10309
msgstr ""
10310
10311
#: en/help_topics/configuration.txt:656
10312
msgid ""
10313
"The location that commits should go to when acting as a checkout.\n"
10314
"This option is normally set by ``bind``."
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:659
10318
msgid ""
10319
"bound\n"
10320
"~~~~~"
10321
msgstr ""
10322
10323
#: en/help_topics/configuration.txt:662
10324
msgid ""
10325
"If set to \"True\", the branch should act as a checkout, and push each "
10326
"commit to\n"
10327
"the bound_location. This option is normally set by ``bind``/``unbind``."
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:665
10331
msgid ""
10332
"send_strict\n"
10333
"~~~~~~~~~~~"
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:668
10337
msgid ""
10338
"If present, defines the ``--strict`` option default value for checking\n"
10339
"uncommitted changes before sending a merge directive."
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:671
10343
msgid ""
10344
"add.maximum_file_size\n"
10345
"~~~~~~~~~~~~~~~~~~~~~"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:674
10349
msgid ""
10350
"Defines the maximum file size the command line \"add\" operation will allow\n"
10351
"in recursive mode, with files larger than this value being skipped. You may "
10352
"\n"
10353
"specify this value as an integer (in which case it is interpreted as bytes), "
10354
"\n"
10355
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10356
"0 \n"
10357
"will disable skipping."
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:680
10361
msgid ""
10362
"External Merge Tools\n"
10363
"--------------------"
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:683
10367
msgid ""
10368
"bzr.mergetool.<name>\n"
10369
"~~~~~~~~~~~~~~~~~~~~"
10370
msgstr ""
10371
10372
#: en/help_topics/configuration.txt:686
10373
msgid ""
10374
"Defines an external merge tool called <name> with the given command-line.\n"
10375
"Arguments containing spaces should be quoted using single or double quotes. "
10376
"The\n"
10377
"executable may omit its path if it can be found on the PATH."
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:690
10381
msgid ""
10382
"The following markers can be used in the command-line to substitute "
10383
"filenames\n"
10384
"involved in the merge conflict::"
10385
msgstr ""
10386
10387
#: en/help_topics/configuration.txt:693
10388
msgid ""
10389
" {base} file.BASE\n"
10390
" {this} file.THIS\n"
10391
" {other} file.OTHER\n"
10392
" {result} output file\n"
10393
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10394
"merge\n"
10395
" succeeds."
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:702
10399
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10400
msgstr ""
10401
10402
#: en/help_topics/configuration.txt:704
10403
msgid ""
10404
"bzr.default_mergetool\n"
10405
"~~~~~~~~~~~~~~~~~~~~~"
10406
msgstr ""
10407
10408
#: en/help_topics/configuration.txt:707
10409
msgid ""
10410
"Specifies which external merge tool (as defined above) should be selected "
10411
"by\n"
10412
"default in tools such as ``bzr qconflicts``."
10413
msgstr ""
10414
10415
#: en/help_topics/configuration.txt:712
10416
msgid " bzr.default_mergetool = kdiff3\n"
10417
msgstr ""
10418
10419
#: en/help_topics/conflict-types.txt:1
10420
msgid ""
10421
"Conflict Types\n"
10422
"=============="
10423
msgstr ""
10424
10425
#: en/help_topics/conflict-types.txt:4
10426
msgid ""
10427
"Some operations, like merge, revert and pull, modify the contents of your\n"
10428
"working tree. These modifications are programmatically generated, and so "
10429
"they\n"
10430
"may conflict with the current state of your working tree. "
10431
msgstr ""
10432
10433
#: en/help_topics/conflict-types.txt:8
10434
msgid ""
10435
"When conflicts are present in your working tree (as shown by ``bzr\n"
10436
"conflicts``), you should resolve them and then inform bzr that the "
10437
"conflicts\n"
10438
"have been resolved."
10439
msgstr ""
10440
10441
#: en/help_topics/conflict-types.txt:12
10442
msgid ""
10443
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10444
"should resolve them is not the one responsible for their occurrence, as is "
10445
"the\n"
10446
"case when merging other people's work or because some conflicts are "
10447
"presented\n"
10448
"in a way that is not easy to understand."
10449
msgstr ""
10450
10451
#: en/help_topics/conflict-types.txt:17
10452
msgid ""
10453
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10454
"conflict if and only if there's an actual conceptual conflict in the source\n"
10455
"tree. Because Bazaar doesn't understand the real meaning of the files "
10456
"being\n"
10457
"versioned, it can, when faced with ambiguities, fall short in either "
10458
"direction\n"
10459
"trying to resolve the conflict itself. Many kinds of changes can be "
10460
"combined\n"
10461
"programmatically, but sometimes only a human can determine the right thing "
10462
"to\n"
10463
"do."
10464
msgstr ""
10465
10466
#: en/help_topics/conflict-types.txt:25
10467
msgid ""
10468
"When Bazaar generates a conflict, it adds information into the working tree "
10469
"to\n"
10470
"present the conflicting versions, and it's up to you to find the correct\n"
10471
"resolution."
10472
msgstr ""
10473
10474
#: en/help_topics/conflict-types.txt:29
10475
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10476
msgstr ""
10477
10478
#: en/help_topics/conflict-types.txt:31
10479
msgid ""
10480
"1. Modify the working tree content so that the conflicted item is now in "
10481
"the\n"
10482
" state you want to keep, then"
10483
msgstr ""
10484
10485
#: en/help_topics/conflict-types.txt:34
10486
msgid ""
10487
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10488
" remaining generated information (``bzr resolve <item>``)."
10489
msgstr ""
10490
10491
#: en/help_topics/conflict-types.txt:37
10492
msgid ""
10493
"For most conflict types, there are some obvious ways to modify the working\n"
10494
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10495
"itself already made a choice, when possible."
10496
msgstr ""
10497
10498
#: en/help_topics/conflict-types.txt:41
10499
msgid ""
10500
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10501
"different ways to resolve the conflict."
10502
msgstr ""
10503
10504
#: en/help_topics/conflict-types.txt:44
10505
msgid ""
10506
"Each type of conflict is explained below, and the action which must be done "
10507
"to\n"
10508
"resolve the conflict is outlined."
10509
msgstr ""
10510
10511
#: en/help_topics/conflict-types.txt:47
10512
msgid ""
10513
"Various actions are available depending on the kind of conflict, for some "
10514
"of\n"
10515
"these actions, Bazaar can provide some help. In the end you should at least\n"
10516
"inform Bazaar that you're done with the conflict with::"
10517
msgstr ""
10518
10519
#: en/help_topics/conflict-types.txt:51
10520
msgid " ``bzr resolve FILE --action=done'"
10521
msgstr ""
10522
10523
#: en/help_topics/conflict-types.txt:53
10524
msgid ""
10525
"Note that this is the default action when a single file is involved so you "
10526
"can\n"
10527
"simply use::"
10528
msgstr ""
10529
10530
#: en/help_topics/conflict-types.txt:56
10531
msgid " ``bzr resolve FILE``"
10532
msgstr ""
10533
10534
#: en/help_topics/conflict-types.txt:58
10535
msgid "See ``bzr help resolve`` for more details."
10536
msgstr ""
10537
10538
#: en/help_topics/conflict-types.txt:60
10539
msgid ""
10540
"Text conflicts\n"
10541
"--------------"
10542
msgstr ""
10543
10544
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10545
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10546
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10547
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10548
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10549
msgid "Typical message::"
10550
msgstr ""
10551
10552
#: en/help_topics/conflict-types.txt:65
10553
msgid " Text conflict in FILE"
10554
msgstr ""
10555
10556
#: en/help_topics/conflict-types.txt:67
10557
msgid ""
10558
"These are produced when a text merge cannot completely reconcile two sets "
10559
"of\n"
10560
"text changes. Bazaar will emit files for each version with the extensions\n"
10561
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10562
"tree,\n"
10563
"i.e. the tree that you are merging changes into. OTHER is the version that "
10564
"you\n"
10565
"are merging into the target. BASE is an older version that is used as a "
10566
"basis\n"
10567
"for comparison."
10568
msgstr ""
10569
10570
#: en/help_topics/conflict-types.txt:74
10571
msgid ""
10572
"In the main copy of the file, Bazaar will include all the changes that it\n"
10573
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10574
"\"herringbone\" markers like ``<<<<<<<``."
10575
msgstr ""
10576
10577
#: en/help_topics/conflict-types.txt:78
10578
msgid ""
10579
"Say the initial text is \"The project leader released it.\", and THIS "
10580
"modifies it\n"
10581
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10582
"leader\n"
10583
"released Bazaar.\" A conflict would look like this::"
10584
msgstr ""
10585
10586
#: en/help_topics/conflict-types.txt:82
10587
msgid ""
10588
" <<<<<<< TREE\n"
10589
" Martin Pool released it.\n"
10590
" =======\n"
10591
" The project leader released Bazaar.\n"
10592
" >>>>>>> MERGE-SOURCE"
10593
msgstr ""
10594
10595
#: en/help_topics/conflict-types.txt:88
10596
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10597
msgstr ""
10598
10599
#: en/help_topics/conflict-types.txt:90
10600
msgid ""
10601
"You can handle text conflicts either by editing the main copy of the file,\n"
10602
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10603
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10604
"set of changes over the other (but see below when you encounter these\n"
10605
"cases). More often, the two sets of changes must be intelligently combined."
10606
msgstr ""
10607
10608
#: en/help_topics/conflict-types.txt:96
10609
msgid ""
10610
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10611
"you are done editing, the file should look like it never had a conflict, and "
10612
"be\n"
10613
"ready to commit."
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:100
10617
msgid ""
10618
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10619
"Bazaar will auto-detect which conflicts you have resolved."
10620
msgstr ""
10621
10622
#: en/help_topics/conflict-types.txt:103
10623
msgid ""
10624
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10625
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10626
"working tree."
10627
msgstr ""
10628
10629
#: en/help_topics/conflict-types.txt:107
10630
msgid ""
10631
"\n"
10632
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10633
"resolve`` with one of the following actions:"
10634
msgstr ""
10635
10636
#: en/help_topics/conflict-types.txt:111
10637
msgid ""
10638
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10639
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10640
msgstr ""
10641
10642
#: en/help_topics/conflict-types.txt:114
10643
msgid ""
10644
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10645
"modifications will be taken into account."
10646
msgstr ""
10647
10648
#: en/help_topics/conflict-types.txt:117
10649
msgid ""
10650
"Content conflicts\n"
10651
"-----------------"
10652
msgstr ""
10653
10654
#: en/help_topics/conflict-types.txt:122
10655
msgid " Contents conflict in FILE"
10656
msgstr ""
10657
10658
#: en/help_topics/conflict-types.txt:124
10659
msgid ""
10660
"This conflict happens when there are conflicting changes in the working "
10661
"tree\n"
10662
"and the merge source, but the conflicted items are not text files. They "
10663
"may\n"
10664
"be binary files, or symlinks, or directories. It can even happen with "
10665
"files\n"
10666
"that are deleted on one side, and modified on the other."
10667
msgstr ""
10668
10669
#: en/help_topics/conflict-types.txt:129
10670
msgid ""
10671
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10672
"be\n"
10673
"regular files, symlinks or directories). But it will not include a \"main "
10674
"copy\"\n"
10675
"of the file with herringbone conflict markers. It will appear that the "
10676
"\"main\n"
10677
"copy\" has been renamed to THIS or OTHER."
10678
msgstr ""
10679
10680
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10681
msgid ""
10682
"To resolve that kind of conflict, you should rebuild FILE from either "
10683
"version\n"
10684
"or a combination of both."
10685
msgstr ""
10686
10687
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10688
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10689
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10690
#: en/help_topics/conflict-types.txt:361
10691
msgid "``bzr resolve`` recognizes the following actions:"
10692
msgstr ""
10693
10694
#: en/help_topics/conflict-types.txt:139
10695
msgid ""
10696
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10697
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10698
"* ``--action=done`` will just mark the conflict as resolved."
10699
msgstr ""
10700
10701
#: en/help_topics/conflict-types.txt:143
10702
msgid ""
10703
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10704
"and\n"
10705
"``.OTHER`` files if they are still present in the working tree."
10706
msgstr ""
10707
10708
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10709
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10710
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10711
#: en/help_topics/conflict-types.txt:369
10712
msgid ""
10713
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10714
msgstr ""
10715
10716
#: en/help_topics/conflict-types.txt:148
10717
msgid ""
10718
"Tag conflicts\n"
10719
"-------------"
10720
msgstr ""
10721
10722
#: en/help_topics/conflict-types.txt:153
10723
msgid ""
10724
" Conflicting tags:\n"
10725
" version-0.1"
10726
msgstr ""
10727
10728
#: en/help_topics/conflict-types.txt:156
10729
msgid ""
10730
"When pulling from or pushing to another branch, Bazaar informs you about "
10731
"tags\n"
10732
"that conflict between the two branches; that is the same tag points to two\n"
10733
"different revisions. You need not resolve these conflicts, but subsequent\n"
10734
"uses of pull or push will result in the same message."
10735
msgstr ""
10736
10737
#: en/help_topics/conflict-types.txt:161
10738
msgid ""
10739
"To resolve the conflict, you must apply the correct tags to either the "
10740
"target\n"
10741
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10742
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10743
"target branch's tags match the source branch, then in the target branch do\n"
10744
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10745
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10746
"source\n"
10747
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10748
"favor of the target branch, you need to similarly use ``tag --force`` in "
10749
"the\n"
10750
"source branch. (Note that pulling or pushing using --overwrite will "
10751
"overwrite\n"
10752
"all tags as well.)"
10753
msgstr ""
10754
10755
#: en/help_topics/conflict-types.txt:172
10756
msgid ""
10757
"Duplicate paths\n"
10758
"---------------"
10759
msgstr ""
10760
10761
#: en/help_topics/conflict-types.txt:177
10762
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10763
msgstr ""
10764
10765
#: en/help_topics/conflict-types.txt:179
10766
msgid ""
10767
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10768
"already been used. The existing file will be renamed to \"FILE.moved\". "
10769
msgstr ""
10770
10771
#: en/help_topics/conflict-types.txt:187
10772
msgid ""
10773
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10774
"FILE``,\n"
10775
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10776
"* ``--action=done`` will just mark the conflict as resolved."
10777
msgstr ""
10778
10779
#: en/help_topics/conflict-types.txt:191
10780
msgid ""
10781
"Note that you must get rid of FILE.moved before using ``--action=done``."
10782
msgstr ""
10783
10784
#: en/help_topics/conflict-types.txt:195
10785
msgid ""
10786
"Unversioned parent\n"
10787
"------------------"
10788
msgstr ""
10789
10790
#: en/help_topics/conflict-types.txt:200
10791
msgid ""
10792
" Conflict because FILE is not versioned, but has versioned children."
10793
msgstr ""
10794
10795
#: en/help_topics/conflict-types.txt:202
10796
msgid ""
10797
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10798
"not\n"
10799
"versioned. This happens when the directory has been deleted in the target,\n"
10800
"but has a new child in the source, or vice versa. In this situation, "
10801
"Bazaar\n"
10802
"will version the parent directory as well. Resolving this issue depends\n"
10803
"very much on the particular scenario. You may wish to rename or delete "
10804
"either\n"
10805
"the file or the directory. When you are satisfied, you can run \"bzr "
10806
"resolve\n"
10807
"FILE\" to mark the conflict as resolved."
10808
msgstr ""
10809
10810
#: en/help_topics/conflict-types.txt:210
10811
msgid ""
10812
"Missing parent\n"
10813
"--------------"
10814
msgstr ""
10815
10816
#: en/help_topics/conflict-types.txt:215
10817
msgid " Conflict adding files to FILE. Created directory."
10818
msgstr ""
10819
10820
#: en/help_topics/conflict-types.txt:217
10821
msgid ""
10822
"This happens when a directory has been deleted in the target, but has new\n"
10823
"children in the source. This is similar to the \"unversioned parent\" "
10824
"conflict,\n"
10825
"except that the parent directory does not *exist*, instead of just being\n"
10826
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10827
"Resolving this issue depends very much on the particular scenario."
10828
msgstr ""
10829
10830
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10831
msgid ""
10832
"To resolve that kind of conflict, you should either remove or rename the\n"
10833
"children or the directory or a combination of both."
10834
msgstr ""
10835
10836
#: en/help_topics/conflict-types.txt:228
10837
msgid ""
10838
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10839
" children,\n"
10840
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10841
"children\n"
10842
" and restoring the directory,\n"
10843
"* ``--action=done`` will just mark the conflict as resolved."
10844
msgstr ""
10845
10846
#: en/help_topics/conflict-types.txt:236
10847
msgid ""
10848
"Deleting parent\n"
10849
"---------------"
10850
msgstr ""
10851
10852
#: en/help_topics/conflict-types.txt:241
10853
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10854
msgstr ""
10855
10856
#: en/help_topics/conflict-types.txt:243
10857
msgid ""
10858
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10859
"source, but has new children in the target (either because a directory\n"
10860
"deletion is merged or because the merge introduce new children). Bazaar\n"
10861
"will retain the directory. Resolving this issue depends very much on the\n"
10862
"particular scenario."
10863
msgstr ""
10864
10865
#: en/help_topics/conflict-types.txt:254
10866
msgid ""
10867
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10868
"directory,"
10869
msgstr ""
10870
10871
#: en/help_topics/conflict-types.txt:256
10872
msgid ""
10873
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10874
" children,"
10875
msgstr ""
10876
10877
#: en/help_topics/conflict-types.txt:259
10878
msgid "* ``--action=done`` will just mark the conflict as resolved."
10879
msgstr ""
10880
10881
#: en/help_topics/conflict-types.txt:261
10882
msgid ""
10883
"Note that when merging a directory deletion, if unversioned files are\n"
10884
"present, they become potential orphans has they don't have a directory\n"
10885
"parent anymore."
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:265
10889
msgid ""
10890
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10891
"setting the ``bzr.transform.orphan_policy`` configuration option."
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:268
10895
msgid "There are two possible values for this option:"
10896
msgstr ""
10897
10898
#: en/help_topics/conflict-types.txt:270
10899
msgid ""
10900
"* ``conflict`` (the default): will leave the orphans in place and\n"
10901
" generate a conflicts,"
10902
msgstr ""
10903
10904
#: en/help_topics/conflict-types.txt:273
10905
msgid ""
10906
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10907
"root\n"
10908
" of the working tree with names like ``<file>.~#~``."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:278
10912
msgid ""
10913
"Path conflict\n"
10914
"-------------"
10915
msgstr ""
10916
10917
#: en/help_topics/conflict-types.txt:283
10918
msgid " Path conflict: PATH1 / PATH2"
10919
msgstr ""
10920
10921
#: en/help_topics/conflict-types.txt:285
10922
msgid ""
10923
"This happens when the source and target have each modified the name or "
10924
"parent\n"
10925
"directory of a file. Bazaar will use the path elements from the source."
10926
msgstr ""
10927
10928
#: en/help_topics/conflict-types.txt:288
10929
msgid ""
10930
"To resolve that kind of conflict, you just have to decide what name should "
10931
"be\n"
10932
"retained for the file involved."
10933
msgstr ""
10934
10935
#: en/help_topics/conflict-types.txt:293
10936
msgid ""
10937
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10938
" issuing ``bzr mv PATH2 PATH1``,\n"
10939
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10940
"``PATH2``,\n"
10941
"* ``--action=done`` will just mark the conflict as resolved."
10942
msgstr ""
10943
10944
#: en/help_topics/conflict-types.txt:300
10945
msgid ""
10946
"Parent loop\n"
10947
"-----------"
10948
msgstr ""
10949
10950
#: en/help_topics/conflict-types.txt:305
10951
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10952
msgstr ""
10953
10954
#: en/help_topics/conflict-types.txt:307
10955
msgid ""
10956
"This happens when the source and the target have each moved directories, so\n"
10957
"that, if the change could be applied, a directory would be contained by "
10958
"itself.\n"
10959
"For example::"
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:311
10963
msgid ""
10964
" $ bzr init\n"
10965
" $ bzr mkdir white\n"
10966
" $ bzr mkdir black\n"
10967
" $ bzr commit -m \"BASE\"\n"
10968
" $ bzr branch . ../other\n"
10969
" $ bzr mv white black\n"
10970
" $ bzr commit -m \"THIS\"\n"
10971
" $ bzr mv ../other/black ../other/white\n"
10972
" $ bzr commit ../other -m \"OTHER\"\n"
10973
" $ bzr merge ../other"
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:322
10977
msgid ""
10978
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10979
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10980
"name should be retained for the directories involved."
10981
msgstr ""
10982
10983
#: en/help_topics/conflict-types.txt:328
10984
msgid ""
10985
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10986
"\n"
10987
" in ``black``,\n"
10988
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10989
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10990
"* ``--action=done`` will just mark the conflict as resolved."
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:336
10994
msgid ""
10995
"Non-directory parent\n"
10996
"--------------------"
10997
msgstr ""
10998
10999
#: en/help_topics/conflict-types.txt:341
11000
msgid ""
11001
" Conflict: foo.new is not a directory, but has files in it.\n"
11002
" Created directory."
11003
msgstr ""
11004
11005
#: en/help_topics/conflict-types.txt:344
11006
msgid ""
11007
"This happens when one side has added files to a directory, and the other "
11008
"side\n"
11009
"has changed the directory into a file or symlink. For example::"
11010
msgstr ""
11011
11012
#: en/help_topics/conflict-types.txt:347
11013
msgid ""
11014
" $ bzr init\n"
11015
" $ bzr mkdir foo\n"
11016
" $ bzr commit -m \"BASE\"\n"
11017
" $ bzr branch . ../other\n"
11018
" $ rmdir foo\n"
11019
" $ touch foo\n"
11020
" $ bzr commit -m \"THIS\"\n"
11021
" $ bzr mkdir ../other/foo/bar\n"
11022
" $ bzr commit ../other -m \"OTHER\"\n"
11023
" $ bzr merge ../other"
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:358
11027
msgid ""
11028
"To resolve that kind of conflict, you have to decide what name should be\n"
11029
"retained for the file, directory or symlink involved."
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:363
11033
msgid ""
11034
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11035
" ``bzr add foo``,\n"
11036
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11037
" ``bzr mv foo.new foo``,\n"
11038
"* ``--action=done`` will just mark the conflict as resolved."
11039
msgstr ""
11040
11041
#: en/help_topics/conflict-types.txt:371
11042
msgid ""
11043
"MalformedTransform\n"
11044
"------------------"
11045
msgstr ""
11046
11047
#: en/help_topics/conflict-types.txt:374
11048
msgid ""
11049
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11050
"exception. This means that Bazaar encountered a filesystem conflict that it "
11051
"was\n"
11052
"unable to resolve. This usually indicates a bug. Please let us know if "
11053
"you\n"
11054
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11055
msgstr ""
11056
11057
#: en/help_topics/content-filters.txt:1
11058
msgid ""
11059
"Content Filters\n"
11060
"==============="
11061
msgstr ""
11062
11063
#: en/help_topics/content-filters.txt:4
11064
msgid ""
11065
"Content formats\n"
11066
"---------------"
11067
msgstr ""
11068
11069
#: en/help_topics/content-filters.txt:7
11070
msgid ""
11071
"Bazaar's content filtering allows you to store files in a different\n"
11072
"format from the copy in your working tree. This lets you, or your\n"
11073
"co-developers, use Windows development tools that expect CRLF files\n"
11074
"on projects that use other line-ending conventions. Among other things,\n"
11075
"content filters also let Unix developers more easily work on projects\n"
11076
"using Windows line-ending conventions, keyword expansion/compression,\n"
11077
"and trailing spaces on lines in text files to be implicitly stripped\n"
11078
"when committed."
11079
msgstr ""
11080
11081
#: en/help_topics/content-filters.txt:16
11082
msgid "To generalize, there are two content formats supported by Bazaar:"
11083
msgstr ""
11084
11085
#: en/help_topics/content-filters.txt:18
11086
msgid ""
11087
"* a canonical format - how files are stored internally\n"
11088
"* a convenience format - how files are created in a working tree."
11089
msgstr ""
11090
11091
#: en/help_topics/content-filters.txt:21
11092
msgid ""
11093
"\n"
11094
"Format conversion\n"
11095
"-----------------"
11096
msgstr ""
11097
11098
#: en/help_topics/content-filters.txt:25
11099
msgid ""
11100
"The conversion between these formats is done by content filters.\n"
11101
"A content filter has two parts:"
11102
msgstr ""
11103
11104
#: en/help_topics/content-filters.txt:28
11105
msgid ""
11106
"* a read converter - converts from convenience to canonical format\n"
11107
"* a write converter - converts from canonical to convenience format."
11108
msgstr ""
11109
11110
#: en/help_topics/content-filters.txt:31
11111
msgid ""
11112
"Many of these converters will provide *round-trip* conversion,\n"
11113
"i.e. applying the read converter followed by the write converter\n"
11114
"gives back the original content. However, others may provide an\n"
11115
"asymmetric conversion. For example, a read converter might strip\n"
11116
"trailing whitespace off lines in source code while the matching\n"
11117
"write converter might pass content through unchanged."
11118
msgstr ""
11119
11120
#: en/help_topics/content-filters.txt:38
11121
msgid ""
11122
"\n"
11123
"Enabling content filters\n"
11124
"------------------------"
11125
msgstr ""
11126
11127
#: en/help_topics/content-filters.txt:42
11128
msgid ""
11129
"Content filters are typically provided by plugins, so the first step\n"
11130
"in using them is to install the relevant plugins and read their\n"
11131
"documentation. Some plugins may be very specific about which files\n"
11132
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11133
"In other cases, the plugin may leave it in the user's hands to\n"
11134
"define which files are to be filtered. This is typically done\n"
11135
"using rule-based preferences. See ``bzr help rules`` for general\n"
11136
"information about defining these."
11137
msgstr ""
11138
11139
#: en/help_topics/content-filters.txt:51
11140
msgid ""
11141
"\n"
11142
"Impact on commands\n"
11143
"------------------"
11144
msgstr ""
11145
11146
#: en/help_topics/content-filters.txt:55
11147
msgid ""
11148
"Read converters are only applied to commands that read content from\n"
11149
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11150
"will apply read converters to files in the working tree, then compare\n"
11151
"the results to the content last committed."
11152
msgstr ""
11153
11154
#: en/help_topics/content-filters.txt:60
11155
msgid ""
11156
"Write converters are only applied by commands that **create files in a\n"
11157
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11158
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11159
"respectively."
11160
msgstr ""
11161
11162
#: en/help_topics/content-filters.txt:65
11163
msgid ""
11164
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11165
"comitting files. If this makes sense for a given plugin providing\n"
11166
"a content filter, the plugin can usually achieve this effect by using a\n"
11167
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11168
"for more information on hooks."
11169
msgstr ""
11170
11171
#: en/help_topics/content-filters.txt:71
11172
msgid ""
11173
"\n"
11174
"Refreshing your working tree\n"
11175
"----------------------------"
11176
msgstr ""
11177
11178
#: en/help_topics/content-filters.txt:75
11179
msgid ""
11180
"For performance reasons, Bazaar caches the timestamps of files in\n"
11181
"a working tree, and assumes files are unchanged if their timestamps\n"
11182
"match the cached values. As a consequence, there are times when\n"
11183
"you may need to explicitly ask for content filtering to be reapplied\n"
11184
"in one or both directions, e.g. after installing or reconfiguring\n"
11185
"plugins providing it."
11186
msgstr ""
11187
11188
#: en/help_topics/content-filters.txt:82
11189
msgid "Here are some general guidelines for doing this:"
11190
msgstr ""
11191
11192
#: en/help_topics/content-filters.txt:84
11193
msgid ""
11194
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11195
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11196
" relevant read converters and compare the end result with the\n"
11197
" canonical format."
11198
msgstr ""
11199
11200
#: en/help_topics/content-filters.txt:89
11201
msgid ""
11202
" * To reapply write converters, ensure there are no local changes,\n"
11203
" delete the relevant files and run ``bzr revert`` on those files."
11204
msgstr ""
11205
11206
#: en/help_topics/content-filters.txt:92
11207
msgid ""
11208
"Note: In the future, it is likely that additional options will be added\n"
11209
"to commands to make this refreshing process faster and safer.\n"
11210
msgstr ""
11211
11212
#: en/help_topics/current-formats.txt:1
11213
msgid "Current Storage Formats"
11214
msgstr ""
11215
11216
#: en/help_topics/current-formats.txt:3
11217
msgid ""
11218
":2a:\n"
11219
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11220
" compress storage. Provides rich roots which are a one-way\n"
11221
" transition."
11222
msgstr ""
11223
11224
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11225
msgid ""
11226
"\n"
11227
"See :doc:`formats-help` for more about storage formats."
11228
msgstr ""
11229
11230
#: en/help_topics/debug-flags.txt:1
11231
msgid ""
11232
"Debug Flags\n"
11233
"==========="
11234
msgstr ""
11235
11236
#: en/help_topics/debug-flags.txt:4
11237
msgid ""
11238
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11239
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11240
msgstr ""
11241
11242
#: en/help_topics/debug-flags.txt:7
11243
msgid ""
11244
"-Dauth Trace authentication sections used.\n"
11245
"-Dbytes Print out how many bytes were transferred\n"
11246
"-Ddirstate Trace dirstate activity (verbose!)\n"
11247
"-Derror Instead of normal error handling, always print a "
11248
"traceback\n"
11249
" on error.\n"
11250
"-Devil Capture call sites that do expensive or badly-scaling\n"
11251
" operations.\n"
11252
"-Dfetch Trace history copying between repositories.\n"
11253
"-Dfilters Emit information for debugging content filtering.\n"
11254
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11255
"fetch.\n"
11256
"-Dgraph Trace graph traversal.\n"
11257
"-Dhashcache Log every time a working file is read to determine its "
11258
"hash.\n"
11259
"-Dhooks Trace hook execution.\n"
11260
"-Dhpss Trace smart protocol requests and responses.\n"
11261
"-Dhpssdetail More hpss details.\n"
11262
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11263
"-Dhttp Trace http connections, requests and responses.\n"
11264
"-Dindex Trace major index operations.\n"
11265
"-Dknit Trace knit operations.\n"
11266
"-Dlock Trace when lockdir locks are taken or released.\n"
11267
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11268
" retrying the request.\n"
11269
"-Dprogress Trace progress bar operations.\n"
11270
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11271
"-Dmerge Emit information for debugging merges.\n"
11272
"-Dno_apport Don't use apport to report crashes.\n"
11273
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11274
"-Dpack Emit information about pack operations.\n"
11275
"-Drelock Emit a message every time a branch or repository object "
11276
"is\n"
11277
" unlocked then relocked the same way.\n"
11278
"-Dsftp Trace SFTP internals.\n"
11279
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11280
"expected\n"
11281
"-Dstream Trace fetch streams.\n"
11282
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11283
"portable\n"
11284
" manner.\n"
11285
"-Dunlock Some errors during unlock are treated as warnings.\n"
11286
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11287
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11288
"appropriate\n"
11289
" for the format, even for non-local fetches.\n"
11290
msgstr ""
11291
11292
#: en/help_topics/diverged-branches.txt:1
11293
msgid ""
11294
"Diverged Branches\n"
11295
"================="
11296
msgstr ""
11297
11298
#: en/help_topics/diverged-branches.txt:4
11299
msgid ""
11300
"When Bazaar tries to push one branch onto another, it requires that the\n"
11301
"destination branch must be ready to receive the source branch. If this "
11302
"isn't\n"
11303
"the case, then we say that the branches have ``diverged``. Branches are\n"
11304
"considered diverged if the destination branch's most recent commit is one "
11305
"that\n"
11306
"has not been merged (directly or indirectly) by the source branch. To "
11307
"recover\n"
11308
"from diverged branches, one must merge the missing revisions into the "
11309
"source\n"
11310
"branch."
11311
msgstr ""
11312
11313
#: en/help_topics/diverged-branches.txt:12
11314
msgid ""
11315
"This situation commonly arises when using a centralized workflow with local\n"
11316
"commits. If someone else has committed new work to the mainline since your\n"
11317
"last pull and you have local commits that have not yet been pushed to the\n"
11318
"mainline, then your local branch and the mainline have diverged."
11319
msgstr ""
11320
11321
#: en/help_topics/diverged-branches.txt:17
11322
msgid ""
11323
"Discovering What Has Diverged\n"
11324
"-----------------------------"
11325
msgstr ""
11326
11327
#: en/help_topics/diverged-branches.txt:20
11328
msgid ""
11329
"The ``bzr missing`` command is used to find out what revisions are in "
11330
"another\n"
11331
"branch that are not present in the current branch, and vice-versa. It shows "
11332
"a\n"
11333
"summary of which extra revisions exist in each branch. If you want to see "
11334
"the\n"
11335
"precise effects of those revisions, you can use ``bzr diff --"
11336
"old=other_branch``\n"
11337
"to show the differences between other_branch and your current branch."
11338
msgstr ""
11339
11340
#: en/help_topics/diverged-branches.txt:26
11341
msgid ""
11342
"A Solution\n"
11343
"----------"
11344
msgstr ""
11345
11346
#: en/help_topics/diverged-branches.txt:29
11347
msgid ""
11348
"The solution is to merge the revisions from the mainline into your local\n"
11349
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11350
"mainline. This merge may result in conflicts if the other developer's "
11351
"changes\n"
11352
"overlap with your changes. These conflicts should be resolved before\n"
11353
"continuing. After any conflicts have been resolved, or even if there were "
11354
"no\n"
11355
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11356
"to your local branch. This requirement gives you an opportunity to test "
11357
"the\n"
11358
"resulting working tree for correctness, since the merged revisions could "
11359
"have\n"
11360
"made arbitrary changes. After testing, you should commit the merge using\n"
11361
"``bzr commit``. This clears up the diverged branches situation. Your "
11362
"local\n"
11363
"branch can now be pushed to the mainline.\n"
11364
msgstr ""
11365
11366
#: en/help_topics/eol.txt:1
11367
msgid ""
11368
"End of Line Conversion\n"
11369
"======================"
11370
msgstr ""
11371
11372
#: en/help_topics/eol.txt:4
11373
msgid ""
11374
"EOL conversion is provided as a content filter where Bazaar internally\n"
11375
"stores a canonical format but outputs a convenience format. See\n"
11376
"``bzr help content-filters`` for general information about using these."
11377
msgstr ""
11378
11379
#: en/help_topics/eol.txt:8
11380
msgid ""
11381
"Note: Content filtering is only supported in recently added formats,\n"
11382
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11383
"in a recent format. (Just setting the format on the repository\n"
11384
"is not enough.) If content filtering does not appear to be working, use\n"
11385
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11386
"or later."
11387
msgstr ""
11388
11389
#: en/help_topics/eol.txt:15
11390
msgid ""
11391
"EOL conversion needs to be enabled for selected file patterns using\n"
11392
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11393
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11394
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11395
"supported in a future verison of Bazaar."
11396
msgstr ""
11397
11398
#: en/help_topics/eol.txt:21
11399
msgid ""
11400
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11401
"(If a value is not set, ``exact`` is the default.)"
11402
msgstr ""
11403
11404
#: en/help_topics/eol.txt:24
11405
msgid ""
11406
" ========== ===================================== ======================\n"
11407
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11408
" ========== ===================================== ======================\n"
11409
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11410
" ---------- ------------------------------------- ----------------------\n"
11411
" ``lf`` ``lf`` ``lf``\n"
11412
" ---------- ------------------------------------- ----------------------\n"
11413
" ``crlf`` ``crlf`` ``lf``\n"
11414
" ---------- ------------------------------------- ----------------------\n"
11415
" ``exact`` No conversion Exactly as in file\n"
11416
" ========== ===================================== ======================"
11417
msgstr ""
11418
11419
#: en/help_topics/eol.txt:36
11420
msgid ""
11421
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11422
"byte is detected in the file."
11423
msgstr ""
11424
11425
#: en/help_topics/eol.txt:39
11426
msgid ""
11427
"For users working on a cross-platform project, here is a suggested rule\n"
11428
"to use as a starting point::"
11429
msgstr ""
11430
11431
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11432
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11433
msgid ""
11434
" [name *]\n"
11435
" eol = native"
11436
msgstr ""
11437
11438
#: en/help_topics/eol.txt:45
11439
msgid ""
11440
"If you have binary files that do not contain a null byte though, be\n"
11441
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11442
"by giving more explicit patterns earlier in the rules file. For example::"
11443
msgstr ""
11444
11445
#: en/help_topics/eol.txt:49
11446
msgid ""
11447
" [name *.png]\n"
11448
" eol = exact"
11449
msgstr ""
11450
11451
#: en/help_topics/eol.txt:55
11452
msgid ""
11453
"If your working tree is on a network drive shared by users on different\n"
11454
"operating systems, you typically want to force certain conventions for\n"
11455
"certain files. In that way, if a file is created with the wrong line\n"
11456
"endings or line endings get mixed during editing, it gets committed\n"
11457
"correctly and gets checked out correctly. For example::"
11458
msgstr ""
11459
11460
#: en/help_topics/eol.txt:61
11461
msgid ""
11462
" [name *.bat]\n"
11463
" eol = crlf"
11464
msgstr ""
11465
11466
#: en/help_topics/eol.txt:64
11467
msgid ""
11468
" [name *.sh]\n"
11469
" eol = lf"
11470
msgstr ""
11471
11472
#: en/help_topics/eol.txt:70
11473
msgid ""
11474
"If you take the care to create files with their required endings, you can\n"
11475
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11476
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11477
"introducing mixed line endings will be corrected during commit for files\n"
11478
"with those settings."
11479
msgstr ""
11480
11481
#: en/help_topics/eol.txt:76
11482
msgid ""
11483
"If you have sample test data that deliberately has text files with mixed\n"
11484
"newline conventions, you can ask for those to be left alone like this::"
11485
msgstr ""
11486
11487
#: en/help_topics/eol.txt:79
11488
msgid ""
11489
" [name test_data/]\n"
11490
" eol = exact"
11491
msgstr ""
11492
11493
#: en/help_topics/eol.txt:85
11494
msgid ""
11495
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11496
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11497
"of content analysis to detect binary files for commands like ``diff``.\n"
11498
"In the future, a ``binary = true`` rule may be added but it is not\n"
11499
"supported yet.)"
11500
msgstr ""
11501
11502
#: en/help_topics/eol.txt:91
11503
msgid ""
11504
"If you have an existing repository with text files already stored using\n"
11505
"Windows newline conventions (``crlf``), then you may want to keep using "
11506
"that\n"
11507
"convention in the repository. Forcing certain files to this convention\n"
11508
"may also help users who do not have rules configured. To do this, set\n"
11509
"``eol`` to one of the values below."
11510
msgstr ""
11511
11512
#: en/help_topics/eol.txt:97
11513
msgid ""
11514
" ============================ ======================== "
11515
"======================\n"
11516
" Value Checkout end-of-lines as Commit end-of-lines "
11517
"as\n"
11518
" ============================ ======================== "
11519
"======================\n"
11520
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11521
" ``lf`` otherwise\n"
11522
" ---------------------------- ------------------------ ----------------------"
11523
"\n"
11524
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11525
" ---------------------------- ------------------------ ----------------------"
11526
"\n"
11527
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11528
" ============================ ======================== ======================"
11529
msgstr ""
11530
11531
#: en/help_topics/eol.txt:108
11532
msgid ""
11533
"For users working on an existing project that uses Windows newline\n"
11534
"conventions in their Bazaar repository, this rule is suggested as a\n"
11535
"starting point::"
11536
msgstr ""
11537
11538
#: en/help_topics/eol.txt:112
11539
msgid ""
11540
" [name *]\n"
11541
" eol = native-with-crlf-in-repo"
11542
msgstr ""
11543
11544
#: en/help_topics/eol.txt:115
11545
msgid ""
11546
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11547
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11548
"``crlf`` and ``exact``."
11549
msgstr ""
11550
11551
#: en/help_topics/eol.txt:119
11552
msgid ""
11553
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11554
"never reject files because a given line ending or mixed line endings\n"
11555
"are found. A precommit hook should be used if you wish to validate\n"
11556
"(and not just convert) content before committing.\n"
11557
msgstr ""
11558
11559
#: en/help_topics/hidden-commands.txt:1
11560
msgid ""
11561
"added List files added in working tree.\n"
11562
"ancestry List all revisions merged into this branch.\n"
11563
"assert-fail Test reporting of assertion failures\n"
11564
"bundle-info Output interesting stats about a bundle\n"
11565
"bundle-revisions Create a merge-directive for submitting changes.\n"
11566
"cat-revision Write out metadata for a revision.\n"
11567
"dump-btree Dump the contents of a btree index file to stdout.\n"
11568
"export-pot Export command helps and error messages in po format.\n"
11569
"file-id Print file_id of a particular file or directory.\n"
11570
"file-path Print path of file_ids to a file or directory.\n"
11571
"find-merge-base Find and print a base revision for merging two "
11572
"branches.\n"
11573
"hooks Show hooks.\n"
11574
"inventory Show inventory of the current working copy or a "
11575
"revision.\n"
11576
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11577
"lookup-revision Lookup the revision-id from a revision-number\n"
11578
"merge-directive Generate a merge directive for auto-merge tools.\n"
11579
"modified List files modified in working tree.\n"
11580
"re-sign Create a digital signature for an existing revision.\n"
11581
"reference list, view and set branch locations for nested trees.\n"
11582
"relpath Show path of a file relative to root\n"
11583
"repair-workingtree Reset the working tree state file.\n"
11584
"revision-history Display the list of revision ids on a branch.\n"
11585
"revision-info Show revision number and revision id for a given "
11586
"revision\n"
11587
" identifier.\n"
11588
"rocks Statement of optimism.\n"
11589
"selftest Run internal test suite.\n"
11590
"shell-complete Show appropriate completions for context.\n"
11591
"test-script Run a shell-like test from a file.\n"
11592
"touching-revisions Return revision-ids which affected a particular file.\n"
11593
"unknowns List unknown files.\n"
11594
"wait-until-signalled Test helper for\n"
11595
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11596
msgstr ""
11597
11598
#: en/help_topics/hooks.txt:1
11599
msgid ""
11600
"\n"
11601
"Hooks\n"
11602
"====="
11603
msgstr ""
11604
11605
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11606
msgid ""
11607
"Introduction\n"
11608
"------------"
11609
msgstr ""
11610
11611
#: en/help_topics/hooks.txt:8
11612
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11613
msgstr ""
11614
11615
#: en/help_topics/hooks.txt:10
11616
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11617
msgstr ""
11618
11619
#: en/help_topics/hooks.txt:12
11620
msgid ""
11621
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11622
msgstr ""
11623
11624
#: en/help_topics/hooks.txt:14
11625
msgid ""
11626
"The class that contains each hook is given before the hooks it supplies. "
11627
"For\n"
11628
"instance, BranchHooks as the class is the hooks class for\n"
11629
"`bzrlib.branch.Branch.hooks`."
11630
msgstr ""
11631
11632
#: en/help_topics/hooks.txt:18
11633
msgid ""
11634
"Each description also indicates whether the hook runs on the client (the\n"
11635
"machine where bzr was invoked) or the server (the machine addressed by\n"
11636
"the branch URL). These may be, but are not necessarily, the same machine."
11637
msgstr ""
11638
11639
#: en/help_topics/hooks.txt:22
11640
msgid ""
11641
"Plugins (including hooks) are run on the server if all of these is true:"
11642
msgstr ""
11643
11644
#: en/help_topics/hooks.txt:24
11645
msgid ""
11646
" * The connection is via a smart server (accessed with a URL starting with\n"
11647
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11648
"\"http://\"\n"
11649
" URL when a smart server is available via HTTP)."
11650
msgstr ""
11651
11652
#: en/help_topics/hooks.txt:28
11653
msgid ""
11654
" * The hook is either server specific or part of general infrastructure "
11655
"rather\n"
11656
" than client specific code (such as commit)."
11657
msgstr ""
11658
11659
#: en/help_topics/hooks.txt:31
11660
msgid ""
11661
"\n"
11662
"BranchHooks\n"
11663
"-----------"
11664
msgstr ""
11665
11666
#: en/help_topics/hooks.txt:35
11667
msgid ""
11668
"automatic_tag_name\n"
11669
"~~~~~~~~~~~~~~~~~~"
11670
msgstr ""
11671
11672
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11673
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11674
msgid "Introduced in: 2.2"
11675
msgstr ""
11676
11677
#: en/help_topics/hooks.txt:40
11678
msgid ""
11679
"Called to determine an automatic tag name for a revision.\n"
11680
"automatic_tag_name is called with (branch, revision_id) and should\n"
11681
"return a tag name or None if no tag name could be determined. The\n"
11682
"first non-None tag name returned will be used."
11683
msgstr ""
11684
11685
#: en/help_topics/hooks.txt:45
11686
msgid ""
11687
"open\n"
11688
"~~~~"
11689
msgstr ""
11690
11691
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11692
#: en/help_topics/hooks.txt:304
11693
msgid "Introduced in: 1.8"
11694
msgstr ""
11695
11696
#: en/help_topics/hooks.txt:50
11697
msgid ""
11698
"Called with the Branch object that has been opened after a branch is\n"
11699
"opened."
11700
msgstr ""
11701
11702
#: en/help_topics/hooks.txt:53
11703
msgid ""
11704
"post_branch_init\n"
11705
"~~~~~~~~~~~~~~~~"
11706
msgstr ""
11707
11708
#: en/help_topics/hooks.txt:58
11709
msgid ""
11710
"Called after new branch initialization completes. post_branch_init is\n"
11711
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11712
"branch and checkout (both heavyweight and lightweight) will all\n"
11713
"trigger this hook."
11714
msgstr ""
11715
11716
#: en/help_topics/hooks.txt:63
11717
msgid ""
11718
"post_change_branch_tip\n"
11719
"~~~~~~~~~~~~~~~~~~~~~~"
11720
msgstr ""
11721
11722
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11723
msgid "Introduced in: 1.4"
11724
msgstr ""
11725
11726
#: en/help_topics/hooks.txt:68
11727
msgid ""
11728
"Called in bzr client and server after a change to the tip of a branch\n"
11729
"is made. post_change_branch_tip is called with a\n"
11730
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11731
"uncommit will all trigger this hook."
11732
msgstr ""
11733
11734
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11735
msgid ""
11736
"post_commit\n"
11737
"~~~~~~~~~~~"
11738
msgstr ""
11739
11740
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11741
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11742
#: en/help_topics/hooks.txt:145
11743
msgid "Introduced in: 0.15"
11744
msgstr ""
11745
11746
#: en/help_topics/hooks.txt:78
11747
msgid ""
11748
"Called in the bzr client after a commit has completed. post_commit is\n"
11749
"called with (local, master, old_revno, old_revid, new_revno,\n"
11750
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11751
"branch."
11752
msgstr ""
11753
11754
#: en/help_topics/hooks.txt:83
11755
msgid ""
11756
"post_pull\n"
11757
"~~~~~~~~~"
11758
msgstr ""
11759
11760
#: en/help_topics/hooks.txt:88
11761
msgid ""
11762
"Called after a pull operation completes. post_pull is called with a\n"
11763
"bzrlib.branch.PullResult object and only runs in the bzr client."
11764
msgstr ""
11765
11766
#: en/help_topics/hooks.txt:91
11767
msgid ""
11768
"post_push\n"
11769
"~~~~~~~~~"
11770
msgstr ""
11771
11772
#: en/help_topics/hooks.txt:96
11773
msgid ""
11774
"Called after a push operation completes. post_push is called with a\n"
11775
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11776
msgstr ""
11777
11778
#: en/help_topics/hooks.txt:99
11779
msgid ""
11780
"post_switch\n"
11781
"~~~~~~~~~~~"
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:104
11785
msgid ""
11786
"Called after a checkout switches branch. post_switch is called with a\n"
11787
"bzrlib.branch.SwitchHookParams."
11788
msgstr ""
11789
11790
#: en/help_topics/hooks.txt:107
11791
msgid ""
11792
"post_uncommit\n"
11793
"~~~~~~~~~~~~~"
11794
msgstr ""
11795
11796
#: en/help_topics/hooks.txt:112
11797
msgid ""
11798
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11799
"called with (local, master, old_revno, old_revid, new_revno,\n"
11800
"new_revid) where local is the local branch or None, master is the\n"
11801
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11802
"of None."
11803
msgstr ""
11804
11805
#: en/help_topics/hooks.txt:118
11806
msgid ""
11807
"pre_change_branch_tip\n"
11808
"~~~~~~~~~~~~~~~~~~~~~"
11809
msgstr ""
11810
11811
#: en/help_topics/hooks.txt:121
11812
msgid "Introduced in: 1.6"
11813
msgstr ""
11814
11815
#: en/help_topics/hooks.txt:123
11816
msgid ""
11817
"Called in bzr client and server before a change to the tip of a branch\n"
11818
"is made. pre_change_branch_tip is called with a\n"
11819
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11820
"uncommit will all trigger this hook."
11821
msgstr ""
11822
11823
#: en/help_topics/hooks.txt:128
11824
msgid ""
11825
"pre_commit\n"
11826
"~~~~~~~~~~"
11827
msgstr ""
11828
11829
#: en/help_topics/hooks.txt:131
11830
msgid "Introduced in: 0.91"
11831
msgstr ""
11832
11833
#: en/help_topics/hooks.txt:133
11834
msgid ""
11835
"Called after a commit is calculated but before it is completed.\n"
11836
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11837
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11838
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11839
"TreeDelta object describing changes from the basis revision. hooks\n"
11840
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11841
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11842
"tree."
11843
msgstr ""
11844
11845
#: en/help_topics/hooks.txt:142
11846
msgid ""
11847
"set_rh\n"
11848
"~~~~~~"
11849
msgstr ""
11850
11851
#: en/help_topics/hooks.txt:147
11852
msgid ""
11853
"Invoked whenever the revision history has been set via\n"
11854
"set_revision_history. The api signature is (branch, revision_history),\n"
11855
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11856
"for bzr to trigger, a better hook to use is\n"
11857
"Branch.post_change_branch_tip."
11858
msgstr ""
11859
11860
#: en/help_topics/hooks.txt:153
11861
msgid ""
11862
"transform_fallback_location\n"
11863
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:156
11867
msgid "Introduced in: 1.9"
11868
msgstr ""
11869
11870
#: en/help_topics/hooks.txt:158
11871
msgid ""
11872
"Called when a stacked branch is activating its fallback locations.\n"
11873
"transform_fallback_location is called with (branch, url), and should\n"
11874
"return a new url. Returning the same url allows it to be used as-is,\n"
11875
"returning a different one can be used to cause the branch to stack on\n"
11876
"a closer copy of that fallback_location. Note that the branch cannot\n"
11877
"have history accessing methods called on it during this hook because\n"
11878
"the fallback locations have not been activated. When there are\n"
11879
"multiple hooks installed for transform_fallback_location, all are\n"
11880
"called with the url returned from the previous hook.The order is\n"
11881
"however undefined."
11882
msgstr ""
11883
11884
#: en/help_topics/hooks.txt:169
11885
msgid ""
11886
"CommandHooks\n"
11887
"------------"
11888
msgstr ""
11889
11890
#: en/help_topics/hooks.txt:172
11891
msgid ""
11892
"extend_command\n"
11893
"~~~~~~~~~~~~~~"
11894
msgstr ""
11895
11896
#: en/help_topics/hooks.txt:175
11897
msgid "Introduced in: 1.13"
11898
msgstr ""
11899
11900
#: en/help_topics/hooks.txt:177
11901
msgid ""
11902
"Called after creating a command object to allow modifications such as\n"
11903
"adding or removing options, docs etc. Called with the new\n"
11904
"bzrlib.commands.Command object."
11905
msgstr ""
11906
11907
#: en/help_topics/hooks.txt:181
11908
msgid ""
11909
"get_command\n"
11910
"~~~~~~~~~~~"
11911
msgstr ""
11912
11913
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11914
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11915
msgid "Introduced in: 1.17"
11916
msgstr ""
11917
11918
#: en/help_topics/hooks.txt:186
11919
msgid ""
11920
"Called when creating a single command. Called with (cmd_or_None,\n"
11921
"command_name). get_command should either return the cmd_or_None\n"
11922
"parameter, or a replacement Command object that should be used for the\n"
11923
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11924
"Many users will prefer to use bzrlib.commands.register_command or\n"
11925
"plugin_cmds.register_lazy."
11926
msgstr ""
11927
11928
#: en/help_topics/hooks.txt:193
11929
msgid ""
11930
"get_missing_command\n"
11931
"~~~~~~~~~~~~~~~~~~~"
11932
msgstr ""
11933
11934
#: en/help_topics/hooks.txt:198
11935
msgid ""
11936
"Called when creating a single command if no command could be found.\n"
11937
"Called with (command_name). get_missing_command should either return\n"
11938
"None, or a Command object to be used for the command."
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:202
11942
msgid ""
11943
"list_commands\n"
11944
"~~~~~~~~~~~~~"
11945
msgstr ""
11946
11947
#: en/help_topics/hooks.txt:207
11948
msgid ""
11949
"Called when enumerating commands. Called with a set of cmd_name\n"
11950
"strings for all the commands found so far. This set is safe to mutate\n"
11951
"- e.g. to remove a command. list_commands should return the updated\n"
11952
"set of command names."
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:212
11956
msgid ""
11957
"_ConfigHooks\n"
11958
"------------"
11959
msgstr ""
11960
11961
#: en/help_topics/hooks.txt:215
11962
msgid ""
11963
"get\n"
11964
"~~~"
11965
msgstr ""
11966
11967
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11968
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11969
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11970
#: en/help_topics/hooks.txt:443
11971
msgid "Introduced in: 2.4"
11972
msgstr ""
11973
11974
#: en/help_topics/hooks.txt:220
11975
msgid ""
11976
"Invoked when a config option is read. The signature is (stack, name,\n"
11977
"value)."
11978
msgstr ""
11979
11980
#: en/help_topics/hooks.txt:223
11981
msgid ""
11982
"load\n"
11983
"~~~~"
11984
msgstr ""
11985
11986
#: en/help_topics/hooks.txt:228
11987
msgid "Invoked when a config store is loaded. The signature is (store)."
11988
msgstr ""
11989
11990
#: en/help_topics/hooks.txt:230
11991
msgid ""
11992
"remove\n"
11993
"~~~~~~"
11994
msgstr ""
11995
11996
#: en/help_topics/hooks.txt:235
11997
msgid ""
11998
"Invoked when a config option is removed. The signature is (stack,\n"
11999
"name)."
12000
msgstr ""
12001
12002
#: en/help_topics/hooks.txt:238
12003
msgid ""
12004
"save\n"
12005
"~~~~"
12006
msgstr ""
12007
12008
#: en/help_topics/hooks.txt:243
12009
msgid "Invoked when a config store is saved. The signature is (store)."
12010
msgstr ""
12011
12012
#: en/help_topics/hooks.txt:245
12013
msgid ""
12014
"set\n"
12015
"~~~"
12016
msgstr ""
12017
12018
#: en/help_topics/hooks.txt:250
12019
msgid ""
12020
"Invoked when a config option is set. The signature is (stack, name,\n"
12021
"value)."
12022
msgstr ""
12023
12024
#: en/help_topics/hooks.txt:253
12025
msgid ""
12026
"ControlDirHooks\n"
12027
"---------------"
12028
msgstr ""
12029
12030
#: en/help_topics/hooks.txt:256
12031
msgid ""
12032
"post_repo_init\n"
12033
"~~~~~~~~~~~~~~"
12034
msgstr ""
12035
12036
#: en/help_topics/hooks.txt:261
12037
msgid ""
12038
"Invoked after a repository has been initialized. post_repo_init is\n"
12039
"called with a bzrlib.controldir.RepoInitHookParams."
12040
msgstr ""
12041
12042
#: en/help_topics/hooks.txt:264
12043
msgid ""
12044
"pre_open\n"
12045
"~~~~~~~~"
12046
msgstr ""
12047
12048
#: en/help_topics/hooks.txt:267
12049
msgid "Introduced in: 1.14"
12050
msgstr ""
12051
12052
#: en/help_topics/hooks.txt:269
12053
msgid ""
12054
"Invoked before attempting to open a ControlDir with the transport that\n"
12055
"the open will use."
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:272
12059
msgid ""
12060
"InfoHooks\n"
12061
"---------"
12062
msgstr ""
12063
12064
#: en/help_topics/hooks.txt:275
12065
msgid ""
12066
"repository\n"
12067
"~~~~~~~~~~"
12068
msgstr ""
12069
12070
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12071
#: en/help_topics/hooks.txt:521
12072
msgid "Introduced in: 1.15"
12073
msgstr ""
12074
12075
#: en/help_topics/hooks.txt:280
12076
msgid ""
12077
"Invoked when displaying the statistics for a repository. repository is\n"
12078
"called with a statistics dictionary as returned by the repository and\n"
12079
"a file-like object to write to."
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:284
12083
msgid ""
12084
"LockHooks\n"
12085
"---------"
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:287
12089
msgid ""
12090
"lock_acquired\n"
12091
"~~~~~~~~~~~~~"
12092
msgstr ""
12093
12094
#: en/help_topics/hooks.txt:292
12095
msgid ""
12096
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:294
12100
msgid ""
12101
"lock_broken\n"
12102
"~~~~~~~~~~~"
12103
msgstr ""
12104
12105
#: en/help_topics/hooks.txt:299
12106
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12107
msgstr ""
12108
12109
#: en/help_topics/hooks.txt:301
12110
msgid ""
12111
"lock_released\n"
12112
"~~~~~~~~~~~~~"
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:306
12116
msgid ""
12117
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12118
msgstr ""
12119
12120
#: en/help_topics/hooks.txt:308
12121
msgid ""
12122
"MergeHooks\n"
12123
"----------"
12124
msgstr ""
12125
12126
#: en/help_topics/hooks.txt:311
12127
msgid ""
12128
"merge_file_content\n"
12129
"~~~~~~~~~~~~~~~~~~"
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:314
12133
msgid "Introduced in: 2.1"
12134
msgstr ""
12135
12136
#: en/help_topics/hooks.txt:316
12137
msgid ""
12138
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12139
"object when starting a merge. Should return either None or a subclass\n"
12140
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12141
"called per file that needs to be merged (including when one side has\n"
12142
"deleted the file and the other has changed it). See the\n"
12143
"AbstractPerFileMerger API docs for details on how it is used by merge."
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:323
12147
msgid ""
12148
"post_merge\n"
12149
"~~~~~~~~~~"
12150
msgstr ""
12151
12152
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12153
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12154
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12155
msgid "Introduced in: 2.5"
12156
msgstr ""
12157
12158
#: en/help_topics/hooks.txt:328
12159
msgid ""
12160
"Called after a merge. Receives a Merger object as the single argument.\n"
12161
"The return value is ignored."
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:331
12165
msgid ""
12166
"pre_merge\n"
12167
"~~~~~~~~~"
12168
msgstr ""
12169
12170
#: en/help_topics/hooks.txt:336
12171
msgid ""
12172
"Called before a merge. Receives a Merger object as the single\n"
12173
"argument."
12174
msgstr ""
12175
12176
#: en/help_topics/hooks.txt:339
12177
msgid ""
12178
"MergeDirectiveHooks\n"
12179
"-------------------"
12180
msgstr ""
12181
12182
#: en/help_topics/hooks.txt:342
12183
msgid ""
12184
"merge_request_body\n"
12185
"~~~~~~~~~~~~~~~~~~"
12186
msgstr ""
12187
12188
#: en/help_topics/hooks.txt:345
12189
msgid "Introduced in: 1.15.0"
12190
msgstr ""
12191
12192
#: en/help_topics/hooks.txt:347
12193
msgid ""
12194
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12195
"request. Callbacks must return a body. If more than one callback is\n"
12196
"registered, the output of one callback is provided to the next."
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:351
12200
msgid ""
12201
"MessageEditorHooks\n"
12202
"------------------"
12203
msgstr ""
12204
12205
#: en/help_topics/hooks.txt:354
12206
msgid ""
12207
"commit_message_template\n"
12208
"~~~~~~~~~~~~~~~~~~~~~~~"
12209
msgstr ""
12210
12211
#: en/help_topics/hooks.txt:357
12212
msgid "Introduced in: 1.10"
12213
msgstr ""
12214
12215
#: en/help_topics/hooks.txt:359
12216
msgid ""
12217
"Called when a commit message is being generated.\n"
12218
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12219
"and the message that is known so far. commit_message_template must\n"
12220
"return a new message to use (which could be the same as it was given).\n"
12221
"When there are multiple hooks registered for commit_message_template,\n"
12222
"they are chained with the result from the first passed into the\n"
12223
"second, and so on."
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:367
12227
msgid ""
12228
"set_commit_message\n"
12229
"~~~~~~~~~~~~~~~~~~"
12230
msgstr ""
12231
12232
#: en/help_topics/hooks.txt:372
12233
msgid ""
12234
"Set a fixed commit message. set_commit_message is called with the\n"
12235
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12236
"properties by editing commit.builder._revprops) and the message so\n"
12237
"far. set_commit_message must return the message to use or None if it\n"
12238
"should use the message editor as normal."
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:378
12242
msgid ""
12243
"MutableTreeHooks\n"
12244
"----------------"
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:381
12248
msgid ""
12249
"post_build_tree\n"
12250
"~~~~~~~~~~~~~~~"
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:386
12254
msgid ""
12255
"Called after a completely new tree is built. The hook is called with\n"
12256
"the tree as its only argument."
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:392
12260
msgid "Introduced in: 2.0"
12261
msgstr ""
12262
12263
#: en/help_topics/hooks.txt:394
12264
msgid ""
12265
"Called after a commit is performed on a tree. The hook is called with\n"
12266
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12267
"commit was performed on is available via the mutable_tree attribute of\n"
12268
"that object."
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:399
12272
msgid ""
12273
"post_transform\n"
12274
"~~~~~~~~~~~~~~"
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:404
12278
msgid ""
12279
"Called after a tree transform has been performed on a tree. The hook\n"
12280
"is called with the tree that is being transformed and the transform."
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:407
12284
msgid ""
12285
"pre_transform\n"
12286
"~~~~~~~~~~~~~"
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:412
12290
msgid ""
12291
"Called before a tree transform on this tree. The hook is called with\n"
12292
"the tree that is being transformed and the transform."
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:415
12296
msgid ""
12297
"start_commit\n"
12298
"~~~~~~~~~~~~"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:420
12302
msgid ""
12303
"Called before a commit is performed on a tree. The start commit hook\n"
12304
"is able to change the tree before the commit takes place. start_commit\n"
12305
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12306
"being performed on."
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:425
12310
msgid ""
12311
"SmartClientHooks\n"
12312
"----------------"
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:428
12316
msgid ""
12317
"call\n"
12318
"~~~~"
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:431
12322
msgid "Introduced in: unknown"
12323
msgstr ""
12324
12325
#: en/help_topics/hooks.txt:433
12326
msgid ""
12327
"Called when the smart client is submitting a request to the smart\n"
12328
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12329
"Streaming request bodies, and responses, are not accessible."
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:437
12333
msgid ""
12334
"SmartServerHooks\n"
12335
"----------------"
12336
msgstr ""
12337
12338
#: en/help_topics/hooks.txt:440
12339
msgid ""
12340
"server_exception\n"
12341
"~~~~~~~~~~~~~~~~"
12342
msgstr ""
12343
12344
#: en/help_topics/hooks.txt:445
12345
msgid ""
12346
"Called by the bzr server when an exception occurs. server_exception is\n"
12347
"called with the sys.exc_info() tuple return true for the hook if the\n"
12348
"exception has been handled, in which case the server will exit\n"
12349
"normally."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:450
12353
msgid ""
12354
"server_started\n"
12355
"~~~~~~~~~~~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12359
msgid "Introduced in: 0.16"
12360
msgstr ""
12361
12362
#: en/help_topics/hooks.txt:455
12363
msgid ""
12364
"Called by the bzr server when it starts serving a directory.\n"
12365
"server_started is called with (backing urls, public url), where\n"
12366
"backing_url is a list of URLs giving the server-specific directory\n"
12367
"locations, and public_url is the public URL for the directory being\n"
12368
"served."
12369
msgstr ""
12370
12371
#: en/help_topics/hooks.txt:461
12372
msgid ""
12373
"server_started_ex\n"
12374
"~~~~~~~~~~~~~~~~~"
12375
msgstr ""
12376
12377
#: en/help_topics/hooks.txt:466
12378
msgid ""
12379
"Called by the bzr server when it starts serving a directory.\n"
12380
"server_started is called with (backing_urls, server_obj)."
12381
msgstr ""
12382
12383
#: en/help_topics/hooks.txt:469
12384
msgid ""
12385
"server_stopped\n"
12386
"~~~~~~~~~~~~~~"
12387
msgstr ""
12388
12389
#: en/help_topics/hooks.txt:474
12390
msgid ""
12391
"Called by the bzr server when it stops serving a directory.\n"
12392
"server_stopped is called with the same parameters as the\n"
12393
"server_started hook: (backing_urls, public_url)."
12394
msgstr ""
12395
12396
#: en/help_topics/hooks.txt:478
12397
msgid ""
12398
"StatusHooks\n"
12399
"-----------"
12400
msgstr ""
12401
12402
#: en/help_topics/hooks.txt:481
12403
msgid ""
12404
"post_status\n"
12405
"~~~~~~~~~~~"
12406
msgstr ""
12407
12408
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12409
msgid "Introduced in: 2.3"
12410
msgstr ""
12411
12412
#: en/help_topics/hooks.txt:486
12413
msgid ""
12414
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12415
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12416
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12417
"correspond to the command line options specified by the user for the\n"
12418
"status command. to_file is the output stream for writing."
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:492
12422
msgid ""
12423
"pre_status\n"
12424
"~~~~~~~~~~"
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:497
12428
msgid ""
12429
"Called with argument StatusHookParams before Bazaar displays the\n"
12430
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12431
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12432
"correspond to the command line options specified by the user for the\n"
12433
"status command. to_file is the output stream for writing."
12434
msgstr ""
12435
12436
#: en/help_topics/hooks.txt:503
12437
msgid ""
12438
"TransportHooks\n"
12439
"--------------"
12440
msgstr ""
12441
12442
#: en/help_topics/hooks.txt:506
12443
msgid ""
12444
"post_connect\n"
12445
"~~~~~~~~~~~~"
12446
msgstr ""
12447
12448
#: en/help_topics/hooks.txt:511
12449
msgid ""
12450
"Called after a new connection is established or a reconnect occurs.\n"
12451
"The sole argument passed is either the connected transport or smart\n"
12452
"medium instance."
12453
msgstr ""
12454
12455
#: en/help_topics/hooks.txt:515
12456
msgid ""
12457
"RioVersionInfoBuilderHooks\n"
12458
"--------------------------"
12459
msgstr ""
12460
12461
#: en/help_topics/hooks.txt:518
12462
msgid ""
12463
"revision\n"
12464
"~~~~~~~~"
12465
msgstr ""
12466
12467
#: en/help_topics/hooks.txt:523
12468
msgid ""
12469
"Invoked when adding information about a revision to the RIO stanza\n"
12470
"that is printed. revision is called with a revision object and a RIO\n"
12471
"stanza.\n"
12472
msgstr ""
12473
12474
#: en/help_topics/location-alias.txt:1
12475
msgid ""
12476
"Location aliases\n"
12477
"================"
12478
msgstr ""
12479
12480
#: en/help_topics/location-alias.txt:4
12481
msgid ""
12482
"Bazaar defines several aliases for locations associated with a branch. "
12483
"These\n"
12484
"can be used with most commands that expect a location, such as `bzr push`."
12485
msgstr ""
12486
12487
#: en/help_topics/location-alias.txt:7
12488
msgid "The aliases are::"
12489
msgstr ""
12490
12491
#: en/help_topics/location-alias.txt:9
12492
msgid ""
12493
" :bound The branch this branch is bound to, for bound branches.\n"
12494
" :parent The parent of this branch.\n"
12495
" :public The public location of this branch.\n"
12496
" :push The saved location used for `bzr push` with no arguments.\n"
12497
" :submit The submit branch for this branch.\n"
12498
" :this This branch."
12499
msgstr ""
12500
12501
#: en/help_topics/location-alias.txt:16
12502
msgid "For example, to push to the parent location::"
12503
msgstr ""
12504
12505
#: en/help_topics/location-alias.txt:18
12506
msgid " bzr push :parent\n"
12507
msgstr ""
12508
12509
#: en/help_topics/log-formats.txt:1
12510
msgid ""
12511
"Log Formats\n"
12512
"==========="
12513
msgstr ""
12514
12515
#: en/help_topics/log-formats.txt:4
12516
msgid ""
12517
"A log format controls how information about each revision is displayed.\n"
12518
"The standard log formats are compared below::"
12519
msgstr ""
12520
12521
#: en/help_topics/log-formats.txt:7
12522
msgid ""
12523
" Feature long short line\n"
12524
" ---------------------- ------------- ------------ -------------------\n"
12525
" design goal detailed view concise view 1 revision per line\n"
12526
" committer name+email name only name only\n"
12527
" author name+email - -\n"
12528
" date-time format full date only date only\n"
12529
" commit message full full top line\n"
12530
" tags yes yes yes\n"
12531
" merges indicator - yes -\n"
12532
" status/delta optional optional -\n"
12533
" diff/patch optional optional -\n"
12534
" revision-id optional optional -\n"
12535
" branch nick yes - -\n"
12536
" foreign vcs properties yes yes -\n"
12537
" preferred levels all 1 1\n"
12538
" digital signature optional - -"
12539
msgstr ""
12540
12541
#: en/help_topics/log-formats.txt:24
12542
msgid ""
12543
"The default format is ``long``. To change this, define the ``log_format``\n"
12544
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12545
msgstr ""
12546
12547
#: en/help_topics/log-formats.txt:27
12548
msgid ""
12549
" [DEFAULT]\n"
12550
" log_format = short"
12551
msgstr ""
12552
12553
#: en/help_topics/log-formats.txt:30
12554
msgid ""
12555
"Alternatively, to change the log format used for a given query, use the\n"
12556
"--long, --short or --line options."
12557
msgstr ""
12558
12559
#: en/help_topics/log-formats.txt:33
12560
msgid ""
12561
"If one of the standard log formats does not meet your needs, additional\n"
12562
"formats can be provided by plugins.\n"
12563
msgstr ""
12564
12565
#: en/help_topics/other-formats.txt:1
12566
msgid "Other Storage Formats"
12567
msgstr ""
12568
12569
#: en/help_topics/other-formats.txt:3
12570
msgid "Experimental formats are shown below."
12571
msgstr ""
12572
12573
#: en/help_topics/other-formats.txt:5
12574
msgid ""
12575
":development-colo:\n"
12576
" (native) The 2a format with experimental support for colocated\n"
12577
" branches."
12578
msgstr ""
12579
12580
#: en/help_topics/other-formats.txt:9
12581
msgid ""
12582
"\n"
12583
"Deprecated formats are shown below."
12584
msgstr ""
12585
12586
#: en/help_topics/other-formats.txt:12
12587
msgid ""
12588
":pack-0.92:\n"
12589
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12590
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12591
" by bzr < 0.92."
12592
msgstr ""
12593
12594
#: en/help_topics/patterns.txt:1
12595
msgid ""
12596
"Patterns\n"
12597
"========"
12598
msgstr ""
12599
12600
#: en/help_topics/patterns.txt:4
12601
msgid ""
12602
"Bazaar uses patterns to match files at various times. For example,\n"
12603
"the ``add`` command skips over files that match ignore patterns\n"
12604
"and preferences can be associated with files using rule patterns.\n"
12605
"The pattern syntax is described below."
12606
msgstr ""
12607
12608
#: en/help_topics/patterns.txt:9
12609
msgid ""
12610
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12611
"slash or is a regular expression, it is compared to the whole path\n"
12612
"from the branch root. Otherwise, it is compared to only the last\n"
12613
"component of the path. To match a file only in the root directory,\n"
12614
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12615
msgstr ""
12616
12617
#: en/help_topics/patterns.txt:15
12618
msgid "Patterns may include globbing wildcards such as::"
12619
msgstr ""
12620
12621
#: en/help_topics/patterns.txt:17
12622
msgid ""
12623
" ? - Matches any single character except '/'\n"
12624
" * - Matches 0 or more characters except '/'\n"
12625
" /**/ - Matches 0 or more directories in a path\n"
12626
" [a-z] - Matches a single character from within a group of characters"
12627
msgstr ""
12628
12629
#: en/help_topics/patterns.txt:22
12630
msgid ""
12631
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12632
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12633
"expression. Regular expression patterns may not include named or\n"
12634
"numbered groups."
12635
msgstr ""
12636
12637
#: en/help_topics/patterns.txt:27
12638
msgid ""
12639
"Case insensitive ignore patterns can be specified with regular expressions\n"
12640
"by using the ``i`` (for ignore case) flag in the pattern."
12641
msgstr ""
12642
12643
#: en/help_topics/patterns.txt:30
12644
msgid ""
12645
"For example, a case insensitive match for ``foo`` may be specified as::"
12646
msgstr ""
12647
12648
#: en/help_topics/patterns.txt:32
12649
msgid " RE:(?i)foo"
12650
msgstr ""
12651
12652
#: en/help_topics/patterns.txt:34
12653
msgid ""
12654
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12655
"matched by that pattern will not be ignored."
12656
msgstr ""
12657
12658
#: en/help_topics/patterns.txt:37
12659
msgid ""
12660
".. _Python regular expressions: http://docs.python.org/library/re.html"
12661
msgstr ""
12662
12663
#: en/help_topics/revisionspec.txt:1
12664
msgid "Revision Identifiers"
12665
msgstr ""
12666
12667
#: en/help_topics/revisionspec.txt:3
12668
msgid ""
12669
"A revision identifier refers to a specific state of a branch's history. It\n"
12670
"can be expressed in several ways. It can begin with a keyword to\n"
12671
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12672
"'before:yesterday' and 'submit:'."
12673
msgstr ""
12674
12675
#: en/help_topics/revisionspec.txt:8
12676
msgid ""
12677
"Alternately, it can be given without a keyword, in which case it will be\n"
12678
"checked as a revision number, a tag, a revision id, a date specification, or "
12679
"a\n"
12680
"branch specification, in that order. For example, 'date:today' could be\n"
12681
"written as simply 'today', though if you have a tag called 'today' that "
12682
"will\n"
12683
"be found first."
12684
msgstr ""
12685
12686
#: en/help_topics/revisionspec.txt:14
12687
msgid ""
12688
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12689
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12690
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12691
"or\n"
12692
"spaces around the '..')."
12693
msgstr ""
12694
12695
#: en/help_topics/revisionspec.txt:19
12696
msgid ""
12697
"Ranges are interpreted differently by different commands. To the \"log\" "
12698
"command,\n"
12699
"a range is a sequence of log messages, but to the \"diff\" command, the "
12700
"range\n"
12701
"denotes a change between revisions (and not a sequence of changes). In\n"
12702
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12703
"consider it\n"
12704
"to be open-ended, that is, they include one end but not the other. For "
12705
"example:\n"
12706
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12707
"3649,\n"
12708
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12709
"and\n"
12710
"3649, but not 3647."
12711
msgstr ""
12712
12713
#: en/help_topics/revisionspec.txt:28
12714
msgid "The keywords used as revision selection methods are the following:"
12715
msgstr ""
12716
12717
#: en/help_topics/revisionspec.txt:30
12718
msgid ""
12719
":revid:\n"
12720
"\tSelects a revision using the revision id.\n"
12721
":submit:\n"
12722
"\tSelects a common ancestor with the submit branch.\n"
12723
":ancestor:\n"
12724
"\tSelects a common ancestor with a second branch.\n"
12725
":date:\n"
12726
"\tSelects a revision on the basis of a datestamp.\n"
12727
":branch:\n"
12728
"\tSelects the last revision of a specified branch.\n"
12729
":tag:\n"
12730
"\tSelects a revision identified by a tag name.\n"
12731
":revno:\n"
12732
"\tSelects a revision using a number.\n"
12733
":before:\n"
12734
"\tSelects the parent of the revision specified.\n"
12735
":annotate:\n"
12736
"\tSelect the revision that last modified the specified line.\n"
12737
":mainline:\n"
12738
"\tSelect mainline revision that merged the specified revision.\n"
12739
":last:\n"
12740
"\tSelects the nth revision from the end."
12741
msgstr ""
12742
12743
#: en/help_topics/revisionspec.txt:53
12744
msgid "In addition, plugins can provide other keywords."
12745
msgstr ""
12746
12747
#: en/help_topics/revisionspec.txt:55
12748
msgid "A detailed description of each keyword is given below."
12749
msgstr ""
12750
12751
#: en/help_topics/revisionspec.txt:57
12752
msgid ":revid:"
12753
msgstr ""
12754
12755
#: en/help_topics/revisionspec.txt:59
12756
msgid ""
12757
" Supply a specific revision id, that can be used to specify any\n"
12758
" revision id in the ancestry of the branch.\n"
12759
" Including merges, and pending merges.\n"
12760
" Examples::"
12761
msgstr ""
12762
12763
#: en/help_topics/revisionspec.txt:64
12764
msgid ""
12765
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12766
msgstr ""
12767
12768
#: en/help_topics/revisionspec.txt:66
12769
msgid ":submit:"
12770
msgstr ""
12771
12772
#: en/help_topics/revisionspec.txt:68
12773
msgid ""
12774
" Diffing against this shows all the changes that were made in this "
12775
"branch,\n"
12776
" and is a good predictor of what merge will do. The submit branch is\n"
12777
" used by the bundle and merge directive commands. If no submit branch\n"
12778
" is specified, the parent branch is used instead."
12779
msgstr ""
12780
12781
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12782
msgid ""
12783
" The common ancestor is the last revision that existed in both\n"
12784
" branches. Usually this is the branch point, but it could also be\n"
12785
" a revision that was merged."
12786
msgstr ""
12787
12788
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12789
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12790
#: en/help_topics/revisionspec.txt:153
12791
msgid " Examples::"
12792
msgstr ""
12793
12794
#: en/help_topics/revisionspec.txt:79
12795
msgid " $ bzr diff -r submit:"
12796
msgstr ""
12797
12798
#: en/help_topics/revisionspec.txt:81
12799
msgid ":ancestor:"
12800
msgstr ""
12801
12802
#: en/help_topics/revisionspec.txt:83
12803
msgid " Supply the path to a branch to select the common ancestor."
12804
msgstr ""
12805
12806
#: en/help_topics/revisionspec.txt:89
12807
msgid ""
12808
" This is frequently used with 'diff' to return all of the changes\n"
12809
" that your branch introduces, while excluding the changes that you\n"
12810
" have not merged from the remote branch."
12811
msgstr ""
12812
12813
#: en/help_topics/revisionspec.txt:95
12814
msgid ""
12815
" ancestor:/path/to/branch\n"
12816
" $ bzr diff -r ancestor:../../mainline/branch"
12817
msgstr ""
12818
12819
#: en/help_topics/revisionspec.txt:98
12820
msgid ":date:"
12821
msgstr ""
12822
12823
#: en/help_topics/revisionspec.txt:100
12824
msgid ""
12825
" Supply a datestamp to select the first revision that matches the date.\n"
12826
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12827
" Matches the first entry after a given date (either at midnight or\n"
12828
" at a specified time)."
12829
msgstr ""
12830
12831
#: en/help_topics/revisionspec.txt:105
12832
msgid " One way to display all the changes since yesterday would be::"
12833
msgstr ""
12834
12835
#: en/help_topics/revisionspec.txt:107
12836
msgid " bzr log -r date:yesterday.."
12837
msgstr ""
12838
12839
#: en/help_topics/revisionspec.txt:111
12840
msgid ""
12841
" date:yesterday -> select the first revision since "
12842
"yesterday\n"
12843
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12844
" August 14th, 2006 at 5:10pm."
12845
msgstr ""
12846
12847
#: en/help_topics/revisionspec.txt:115
12848
msgid ":branch:"
12849
msgstr ""
12850
12851
#: en/help_topics/revisionspec.txt:117
12852
msgid " Supply the path to a branch to select its last revision."
12853
msgstr ""
12854
12855
#: en/help_topics/revisionspec.txt:121
12856
msgid " branch:/path/to/branch"
12857
msgstr ""
12858
12859
#: en/help_topics/revisionspec.txt:123
12860
msgid ":tag:"
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:125
12864
msgid " Tags are stored in the branch and created by the 'tag' command."
12865
msgstr ""
12866
12867
#: en/help_topics/revisionspec.txt:127
12868
msgid ":revno:"
12869
msgstr ""
12870
12871
#: en/help_topics/revisionspec.txt:129
12872
msgid ""
12873
" Use an integer to specify a revision in the history of the branch.\n"
12874
" Optionally a branch can be specified. A negative number will count\n"
12875
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12876
" one). If the negative number is larger than the branch's history, the\n"
12877
" first revision is returned.\n"
12878
" Examples::"
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:136
12882
msgid ""
12883
" revno:1 -> return the first revision of this branch\n"
12884
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12885
" the branch '/path/to/branch'\n"
12886
" revno:-1 -> The last revision in a branch.\n"
12887
" -2:http://other/branch -> The second to last revision in the\n"
12888
" remote branch.\n"
12889
" -1000000 -> Most likely the first revision, unless\n"
12890
" your history is very long."
12891
msgstr ""
12892
12893
#: en/help_topics/revisionspec.txt:145
12894
msgid ":before:"
12895
msgstr ""
12896
12897
#: en/help_topics/revisionspec.txt:147
12898
msgid ""
12899
" Supply any revision spec to return the parent of that revision. This "
12900
"is\n"
12901
" mostly useful when inspecting revisions that are not in the revision "
12902
"history\n"
12903
" of a branch."
12904
msgstr ""
12905
12906
#: en/help_topics/revisionspec.txt:151
12907
msgid ""
12908
" It is an error to request the parent of the null revision (before:0)."
12909
msgstr ""
12910
12911
#: en/help_topics/revisionspec.txt:155
12912
msgid ""
12913
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12914
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12915
" aaaa@bbbb-1234567890\n"
12916
" bzr diff -r before:1913..1913\n"
12917
" -> Find the changes between revision 1913 and its parent "
12918
"(1912).\n"
12919
" (What changes did revision 1913 introduce).\n"
12920
" This is equivalent to: bzr diff -c 1913"
12921
msgstr ""
12922
12923
#: en/help_topics/revisionspec.txt:163
12924
msgid ":annotate:"
12925
msgstr ""
12926
12927
#: en/help_topics/revisionspec.txt:165
12928
msgid ""
12929
" Select the revision that last modified the specified line. Line is\n"
12930
" specified as path:number. Path is a relative path to the file. "
12931
"Numbers\n"
12932
" start at 1, and are relative to the current version, not the last-\n"
12933
" committed version of the file."
12934
msgstr ""
12935
12936
#: en/help_topics/revisionspec.txt:170
12937
msgid ":mainline:"
12938
msgstr ""
12939
12940
#: en/help_topics/revisionspec.txt:172
12941
msgid ""
12942
" Select the revision that merged the specified revision into mainline."
12943
msgstr ""
12944
12945
#: en/help_topics/revisionspec.txt:174
12946
msgid ":last:"
12947
msgstr ""
12948
12949
#: en/help_topics/revisionspec.txt:176
12950
msgid ""
12951
" Supply a positive number to get the nth revision from the end.\n"
12952
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12953
" Examples::"
12954
msgstr ""
12955
12956
#: en/help_topics/revisionspec.txt:180
12957
msgid ""
12958
" last:1 -> return the last revision\n"
12959
" last:3 -> return the revision 2 before the end.\n"
12960
msgstr ""
12961
12962
#: en/help_topics/rules.txt:1
12963
msgid ""
12964
"Rules\n"
12965
"====="
12966
msgstr ""
12967
12968
#: en/help_topics/rules.txt:7
12969
msgid ""
12970
"Rules are defined in ini file format where the sections are file glob\n"
12971
"patterns and the contents of each section are the preferences for files\n"
12972
"matching that pattern(s). For example::"
12973
msgstr ""
12974
12975
#: en/help_topics/rules.txt:11
12976
msgid ""
12977
" [name *.bat]\n"
12978
" eol = native"
12979
msgstr ""
12980
12981
#: en/help_topics/rules.txt:14
12982
msgid ""
12983
" [name *.html *.xml]\n"
12984
" keywords = xml_escape"
12985
msgstr ""
12986
12987
#: en/help_topics/rules.txt:17
12988
msgid ""
12989
"Preferences like these are useful for commands and plugins wishing to\n"
12990
"provide custom behaviour for selected files. For more information on \n"
12991
"end of line conversion see :doc:`eol-help`.\n"
12992
"Keyword support is provided by the `keywords plugin\n"
12993
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12994
msgstr ""
12995
12996
#: en/help_topics/rules.txt:23
12997
msgid ""
12998
"Files\n"
12999
"-----"
13000
msgstr ""
13001
13002
#: en/help_topics/rules.txt:26
13003
msgid ""
13004
"Default rules for all branches are defined in the optional file\n"
13005
"``BZR_HOME/rules``. "
13006
msgstr ""
13007
13008
#: en/help_topics/rules.txt:29
13009
msgid ""
13010
"Rule Patterns\n"
13011
"-------------"
13012
msgstr ""
13013
13014
#: en/help_topics/rules.txt:32
13015
msgid ""
13016
"Patterns are ordered and searching stops as soon as one matches.\n"
13017
"As a consequence, more explicit patterns should be placed towards\n"
13018
"the top of the file. Rule patterns use exactly the same conventions\n"
13019
"as ignore patterns. See :doc:`patterns-help` for details."
13020
msgstr ""
13021
13022
#: en/help_topics/rules.txt:37
13023
msgid ".. note::"
13024
msgstr ""
13025
13026
#: en/help_topics/rules.txt:39
13027
msgid ""
13028
" Patterns containing square brackets or spaces should be\n"
13029
" surrounded in quotes to ensure they are correctly parsed.\n"
13030
msgstr ""
13031
13032
#: en/help_topics/topics.txt:1
13033
msgid ""
13034
"authentication Information on configuring authentication\n"
13035
"basic Basic commands\n"
13036
"branches Information on what a branch is\n"
13037
"bugs Bug tracker settings\n"
13038
"checkouts Information on what a checkout is\n"
13039
"commands Basic help for all commands\n"
13040
"configuration Details on the configuration settings available\n"
13041
"conflict-types Types of conflicts and what to do about them\n"
13042
"content-filters Conversion of content into/from working trees\n"
13043
"criss-cross Information on criss-cross merging\n"
13044
"current-formats Current storage formats\n"
13045
"debug-flags Options to show or record debug information\n"
13046
"diverged-branches How to fix diverged branches\n"
13047
"env-variables Environment variable names and values\n"
13048
"eol Information on end-of-line handling\n"
13049
"files Information on configuration and log files\n"
13050
"formats Information on choosing a storage format\n"
13051
"global-options Options that control how Bazaar runs\n"
13052
"hidden-commands All hidden commands\n"
13053
"hooks Points at which custom processing can be added\n"
13054
"launchpad Using Bazaar with Launchpad.net\n"
13055
"location-alias Aliases for remembered locations\n"
13056
"log-formats Details on the logging formats available\n"
13057
"other-formats Experimental and deprecated storage formats\n"
13058
"patterns Information on the pattern syntax\n"
13059
"repositories Basic information on shared repositories.\n"
13060
"revisionspec Explain how to use --revision\n"
13061
"rules Information on defining rule-based preferences\n"
13062
"standalone-trees Information on what a standalone tree is\n"
13063
"standard-options Options that can be used with any command\n"
13064
"status-flags Help on status flags\n"
13065
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13066
"topics Topics list\n"
13067
"url-special-chars Special character handling in URLs\n"
13068
"urlspec Supported transport protocols\n"
13069
"working-trees Information on working trees\n"
13070
msgstr ""
13071
13072
#: en/help_topics/url-special-chars.txt:1
13073
msgid ""
13074
"Special character handling in URLs\n"
13075
"=================================="
13076
msgstr ""
13077
13078
#: en/help_topics/url-special-chars.txt:4
13079
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13080
msgstr ""
13081
13082
#: en/help_topics/url-special-chars.txt:6
13083
msgid " * Fully qualified URLs"
13084
msgstr ""
13085
13086
#: en/help_topics/url-special-chars.txt:8
13087
msgid " * File system paths, relative or absolute"
13088
msgstr ""
13089
13090
#: en/help_topics/url-special-chars.txt:10
13091
msgid ""
13092
"Internally bzr treats all locations as URLs. For any file system paths\n"
13093
"that are specified it will automatically determine the appropriate URL\n"
13094
"representation, and escape special characters where necessary."
13095
msgstr ""
13096
13097
#: en/help_topics/url-special-chars.txt:14
13098
msgid ""
13099
"There are a few characters which have special meaning in URLs and need "
13100
"careful\n"
13101
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13102
"value in URLs. Any non-ASCII characters in a file path will automatically "
13103
"be\n"
13104
"urlencoded when the path is converted to a URL."
13105
msgstr ""
13106
13107
#: en/help_topics/url-special-chars.txt:19
13108
msgid ""
13109
"URLs represent non-ASCII characters in an encoding defined by the server, "
13110
"but\n"
13111
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13112
"be\n"
13113
"generous in what it accepts as a URL and to print them in a way that\n"
13114
"will be readable."
13115
msgstr ""
13116
13117
#: en/help_topics/url-special-chars.txt:24
13118
msgid ""
13119
"For example, if you have a directory named '/tmp/%2False' these are all "
13120
"valid\n"
13121
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13122
"slash)::"
13123
msgstr ""
13124
13125
#: en/help_topics/url-special-chars.txt:27
13126
msgid ""
13127
" cd /tmp\n"
13128
" bzr log /tmp/%2False\n"
13129
" bzr log %2False\n"
13130
" bzr log file:///tmp/%252False\n"
13131
" bzr log file://localhost/tmp/%252False\n"
13132
" bzr log file:%252False"
13133
msgstr ""
13134
13135
#: en/help_topics/url-special-chars.txt:34
13136
msgid "These are valid but do not refer to the same file::"
13137
msgstr ""
13138
13139
#: en/help_topics/url-special-chars.txt:36
13140
msgid ""
13141
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13142
" bzr log %252False (refers to a file called /tmp/%252False)"
13143
msgstr ""
13144
13145
#: en/help_topics/url-special-chars.txt:39
13146
msgid ""
13147
"Comma also has special meaning in URLs, because it denotes `segment "
13148
"parameters`_"
13149
msgstr ""
13150
13151
#: en/help_topics/url-special-chars.txt:41
13152
msgid ""
13153
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13154
msgstr ""
13155
13156
#: en/help_topics/url-special-chars.txt:43
13157
msgid ""
13158
"Comma is also special in any file system paths that are specified. To use a "
13159
"literal\n"
13160
"comma in a file system path, specify a URL and URL encode the comma::"
13161
msgstr ""
13162
13163
#: en/help_topics/url-special-chars.txt:46
13164
msgid ""
13165
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13166
"\"branch\" set to \"bla\"\n"
13167
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13168
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13169
"\"branch\" set to \"bla\"\n"
13170
msgstr ""
13171
13172
#: en/help_topics/urlspec.txt:1
13173
msgid "URL Identifiers"
13174
msgstr ""
13175
13176
#: en/help_topics/urlspec.txt:3
13177
msgid "Supported URL prefixes::"
13178
msgstr ""
13179
13180
#: en/help_topics/urlspec.txt:5
13181
msgid ""
13182
" aftp:// Access using active FTP.\n"
13183
" bzr:// Fast access using the Bazaar smart server.\n"
13184
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13185
" file:// Access using the standard filesystem (default)\n"
13186
" ftp:// Access using passive FTP.\n"
13187
" http:// Read-only access of branches exported on the web.\n"
13188
" https:// Read-only access of branches exported on the web using "
13189
"SSL.\n"
13190
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13191
msgstr ""
13192
13193
#: en/help_topics/urlspec.txt:14
13194
msgid "Supported modifiers::"
13195
msgstr ""
13196
13197
#: en/help_topics/urlspec.txt:16
13198
msgid " gio+ Access using any GIO supported protocols."
13199
msgstr ""
13200
13201
#: en/help_topics/urlspec.txt:18
13202
msgid "Bazaar supports all of the standard parts within the URL::"
13203
msgstr ""
13204
13205
#: en/help_topics/urlspec.txt:20
13206
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13207
msgstr ""
13208
13209
#: en/help_topics/urlspec.txt:22
13210
msgid "allowing URLs such as::"
13211
msgstr ""
13212
13213
#: en/help_topics/urlspec.txt:24
13214
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13215
msgstr ""
13216
13217
#: en/help_topics/urlspec.txt:26
13218
msgid ""
13219
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13220
"with '~' as meaning that the rest of the path should be interpreted\n"
13221
"relative to the remote user's home directory. For example if the user\n"
13222
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13223
"shell.example.com, then::"
13224
msgstr ""
13225
13226
#: en/help_topics/urlspec.txt:32
13227
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13228
msgstr ""
13229
13230
#: en/help_topics/urlspec.txt:34
13231
msgid "would refer to ``/home/remote/myproject/trunk``."
13232
msgstr ""
13233
13234
#: en/help_topics/urlspec.txt:36
13235
msgid ""
13236
"Many commands that accept URLs also accept location aliases too.\n"
13237
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13238
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1