« back to all changes in this revision
Viewing changes to data/tr/LC_MESSAGES/bzr.po
- browse files at revision 264
- compare with another revision
- download diff
- download tarball
- view history from revision 264
- Committer: Package Import Robot
- Author(s): Ubuntu automatic language-pack builder
- Date: 2015-10-09 10:36:01 UTC
- mfrom: (0.6.11 wily-proposed)
- Revision ID: package-import@ubuntu.com-20151009103601-82z8d0p5zjd8vkse
Tags: 1:15.10+20151008
Automatic update to latest translation data.
- files added:
- data/tr
- data/tr/LC_MESSAGES
- files modified:
- debian/changelog
added
removed
data/tr/LC_MESSAGES/bzr.po
1
# Turkish 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: 2013-07-27 12:45+0200\n"
11
"PO-Revision-Date: 2012-08-21 20:19+0000\n"
12
"Last-Translator: ubuntuki <Unknown>\n"
13
"Language-Team: Turkish <tr@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=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2015-10-08 10:48+0000\n"
19
"X-Generator: Launchpad (build 17802)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3012
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3014
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d etiket güncellendi."
39
40
#: bzrlib/branch.py:3017
41
msgid "No new revisions or tags to push."
42
msgstr ""
43
44
#: bzrlib/branch.py:3019
45
msgid "No new revisions to push."
46
msgstr ""
47
48
#: bzrlib/branch.py:3039
49
msgid "checked branch {0} format {1}"
50
msgstr ""
51
52
#: bzrlib/branch.py:3042
53
#, python-format
54
msgid "found error:%s"
55
msgstr "hata bulundu:%s"
56
57
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
58
#, python-format
59
msgid "Ignoring files outside view. View is %s"
60
msgstr ""
61
62
#: bzrlib/builtins.py:260
63
#, python-format
64
msgid "bzr %s --revision takes exactly one revision identifier"
65
msgstr ""
66
67
#: bzrlib/builtins.py:315
68
msgid "Display status summary."
69
msgstr "Görüntüleme durumu özeti."
70
71
#: bzrlib/builtins.py:317
72
msgid ""
73
"This reports on versioned and unknown files, reporting them\n"
74
"grouped by state. Possible states are:"
75
msgstr ""
76
77
#: bzrlib/builtins.py:320
78
msgid ""
79
"added\n"
80
" Versioned in the working copy but not in the previous revision."
81
msgstr ""
82
83
#: bzrlib/builtins.py:323
84
msgid ""
85
"removed\n"
86
" Versioned in the previous revision but removed or deleted\n"
87
" in the working copy."
88
msgstr ""
89
90
#: bzrlib/builtins.py:327
91
msgid ""
92
"renamed\n"
93
" Path of this file changed from the previous revision;\n"
94
" the text may also have changed. This includes files whose\n"
95
" parent directory was renamed."
96
msgstr ""
97
98
#: bzrlib/builtins.py:332
99
msgid ""
100
"modified\n"
101
" Text has changed since the previous revision."
102
msgstr ""
103
104
#: bzrlib/builtins.py:335
105
msgid ""
106
"kind changed\n"
107
" File kind has been changed (e.g. from file to directory)."
108
msgstr ""
109
110
#: bzrlib/builtins.py:338
111
msgid ""
112
"unknown\n"
113
" Not versioned and not matching an ignore pattern."
114
msgstr ""
115
116
#: bzrlib/builtins.py:341
117
msgid ""
118
"Additionally for directories, symlinks and files with a changed\n"
119
"executable bit, Bazaar indicates their type using a trailing\n"
120
"character: '/', '@' or '*' respectively. These decorations can be\n"
121
"disabled using the '--no-classify' option."
122
msgstr ""
123
124
#: bzrlib/builtins.py:346
125
msgid ""
126
"To see ignored files use 'bzr ignored'. For details on the\n"
127
"changes to file texts, use 'bzr diff'."
128
msgstr ""
129
130
#: bzrlib/builtins.py:349
131
msgid ""
132
"Note that --short or -S gives status flags for each item, similar\n"
133
"to Subversion's status command. To get output similar to svn -q,\n"
134
"use bzr status -SV."
135
msgstr ""
136
137
#: bzrlib/builtins.py:353
138
msgid ""
139
"If no arguments are specified, the status of the entire working\n"
140
"directory is shown. Otherwise, only the status of the specified\n"
141
"files or directories is reported. If a directory is given, status\n"
142
"is reported for everything inside that directory."
143
msgstr ""
144
145
#: bzrlib/builtins.py:358
146
msgid ""
147
"Before merges are committed, the pending merge tip revisions are\n"
148
"shown. To see all pending merge revisions, use the -v option.\n"
149
"To skip the display of pending merge information altogether, use\n"
150
"the no-pending option or specify a file/directory."
151
msgstr ""
152
153
#: bzrlib/builtins.py:363
154
msgid ""
155
"To compare the working directory to a specific revision, pass a\n"
156
"single revision to the revision argument."
157
msgstr ""
158
159
#: bzrlib/builtins.py:366
160
msgid ""
161
"To see which files have changed in a specific revision, or between\n"
162
"two revisions, pass a revision range to the revision argument.\n"
163
"This will produce the same results as calling 'bzr diff --summarize'."
164
msgstr ""
165
166
#: bzrlib/builtins.py:375
167
msgid "Use short status indicators."
168
msgstr "Kısa durum göstergeleri kullan."
169
170
#: bzrlib/builtins.py:377
171
msgid "Only show versioned files."
172
msgstr "Yalnızca sürümlendirilmiş dosyaları göster."
173
174
#: bzrlib/builtins.py:379
175
msgid "Don't show pending merges."
176
msgstr ""
177
178
#: bzrlib/builtins.py:382
179
msgid "Do not mark object type using indicator."
180
msgstr "Nesne türünü gösterge kullanarak işaretleme."
181
182
#: bzrlib/builtins.py:397
183
msgid "bzr status --revision takes exactly one or two revision specifiers"
184
msgstr ""
185
186
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229
187
msgid "You can only supply one of revision_id or --revision"
188
msgstr ""
189
190
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231
191
msgid "You must supply either --revision or a revision_id"
192
msgstr ""
193
194
#: bzrlib/builtins.py:451
195
#, python-format
196
msgid "Repository %r does not support access to raw revision texts"
197
msgstr ""
198
199
#: bzrlib/builtins.py:462
200
msgid "The repository {0} contains no revision {1}."
201
msgstr ""
202
203
#: bzrlib/builtins.py:469
204
msgid "You cannot specify a NULL revision."
205
msgstr ""
206
207
#: bzrlib/builtins.py:561
208
msgid "Remove the working tree from a given branch/checkout."
209
msgstr ""
210
211
#: bzrlib/builtins.py:563
212
msgid ""
213
"Since a lightweight checkout is little more than a working tree\n"
214
"this will refuse to run against one."
215
msgstr ""
216
217
#: bzrlib/builtins.py:566
218
msgid "To re-create the working tree, use \"bzr checkout\"."
219
msgstr ""
220
221
#: bzrlib/builtins.py:572
222
msgid ""
223
"Remove the working tree even if it has uncommitted or shelved changes."
224
msgstr ""
225
226
#: bzrlib/builtins.py:586
227
msgid "No working tree to remove"
228
msgstr ""
229
230
#: bzrlib/builtins.py:588
231
msgid "You cannot remove the working tree of a remote path"
232
msgstr ""
233
234
#: bzrlib/builtins.py:597
235
msgid "You cannot remove the working tree from a lightweight checkout"
236
msgstr ""
237
238
#: bzrlib/builtins.py:637
239
msgid ""
240
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
241
"instead. Use \"--force\" if you are sure you want to reset the working tree."
242
msgstr ""
243
244
#: bzrlib/builtins.py:648
245
msgid ""
246
", the header appears corrupt, try passing -r -1 to set the state to the last "
247
"commit"
248
msgstr ""
249
250
#: bzrlib/builtins.py:652
251
msgid "failed to reset the tree state{0}"
252
msgstr ""
253
254
#: bzrlib/builtins.py:656
255
msgid "Show current revision number."
256
msgstr "Geçerli düzeltme numarasını göster."
257
258
#: bzrlib/builtins.py:658
259
msgid "This is equal to the number of revisions on this branch."
260
msgstr ""
261
262
#: bzrlib/builtins.py:671
263
msgid "--tree and --revision can not be used together"
264
msgstr ""
265
266
#: bzrlib/builtins.py:688
267
msgid "Revision numbers only make sense for single revisions, not ranges"
268
msgstr ""
269
270
#: bzrlib/builtins.py:712
271
msgid "Show revno of working tree."
272
msgstr ""
273
274
#: bzrlib/builtins.py:760
275
msgid "Add specified files or directories."
276
msgstr ""
277
278
#: bzrlib/builtins.py:762
279
msgid ""
280
"In non-recursive mode, all the named items are added, regardless\n"
281
"of whether they were previously ignored. A warning is given if\n"
282
"any of the named files are already versioned."
283
msgstr ""
284
285
#: bzrlib/builtins.py:766
286
msgid ""
287
"In recursive mode (the default), files are treated the same way\n"
288
"but the behaviour for directories is different. Directories that\n"
289
"are already versioned do not give a warning. All directories,\n"
290
"whether already versioned or not, are searched for files or\n"
291
"subdirectories that are neither versioned or ignored, and these\n"
292
"are added. This search proceeds recursively into versioned\n"
293
"directories. If no names are given '.' is assumed."
294
msgstr ""
295
296
#: bzrlib/builtins.py:774
297
msgid ""
298
"A warning will be printed when nested trees are encountered,\n"
299
"unless they are explicitly ignored."
300
msgstr ""
301
302
#: bzrlib/builtins.py:777
303
msgid ""
304
"Therefore simply saying 'bzr add' will version all files that\n"
305
"are currently unknown."
306
msgstr ""
307
308
#: bzrlib/builtins.py:780
309
msgid ""
310
"Adding a file whose parent directory is not versioned will\n"
311
"implicitly add the parent, and so on up to the root. This means\n"
312
"you should never need to explicitly add a directory, they'll just\n"
313
"get added when you add a file in the directory."
314
msgstr ""
315
316
#: bzrlib/builtins.py:785
317
msgid ""
318
"--dry-run will show which files would be added, but not actually\n"
319
"add them."
320
msgstr ""
321
322
#: bzrlib/builtins.py:788
323
msgid ""
324
"--file-ids-from will try to use the file ids from the supplied path.\n"
325
"It looks up ids trying to find a matching parent directory with the\n"
326
"same filename, and then by pure path. This option is rarely needed\n"
327
"but can be useful when adding the same logical file into two\n"
328
"branches that will be merged later (without showing the two different\n"
329
"adds as a conflict). It is also useful when merging another project\n"
330
"into a subdirectory of this one."
331
msgstr ""
332
333
#: bzrlib/builtins.py:796
334
msgid ""
335
"Any files matching patterns in the ignore list will not be added\n"
336
"unless they are explicitly mentioned."
337
msgstr ""
338
339
#: bzrlib/builtins.py:799
340
msgid ""
341
"In recursive mode, files larger than the configuration option \n"
342
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
343
"to file size."
344
msgstr ""
345
346
#: bzrlib/builtins.py:806
347
msgid "Don't recursively add the contents of directories."
348
msgstr ""
349
350
#: bzrlib/builtins.py:813
351
msgid "Lookup file ids from this tree."
352
msgstr ""
353
354
#: bzrlib/builtins.py:849
355
msgid "ignored {0} matching \"{1}\"\n"
356
msgstr ""
357
358
#: bzrlib/builtins.py:854
359
msgid "Create a new versioned directory."
360
msgstr ""
361
362
#: bzrlib/builtins.py:856
363
msgid "This is equivalent to creating the directory and then adding it."
364
msgstr ""
365
366
#: bzrlib/builtins.py:863
367
msgid "No error if existing, make parent directories as needed."
368
msgstr ""
369
370
#: bzrlib/builtins.py:897
371
#, python-format
372
msgid "added %s\n"
373
msgstr "%s eklendi\n"
374
375
#: bzrlib/builtins.py:939
376
#, python-format
377
msgid "invalid kind %r specified"
378
msgstr ""
379
380
#: bzrlib/builtins.py:976
381
msgid "Move or rename a file."
382
msgstr ""
383
384
#: bzrlib/builtins.py:978
385
msgid " bzr mv SOURCE... DESTINATION"
386
msgstr ""
387
388
#: bzrlib/builtins.py:980
389
msgid ""
390
"If the last argument is a versioned directory, all the other names\n"
391
"are moved into it. Otherwise, there must be exactly two arguments\n"
392
"and the file is changed to a new name."
393
msgstr ""
394
395
#: bzrlib/builtins.py:984
396
msgid ""
397
"If OLDNAME does not exist on the filesystem but is versioned and\n"
398
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
399
"assumes that the file has been manually moved and only updates\n"
400
"its internal inventory to reflect that change.\n"
401
"The same is valid when moving many SOURCE files to a DESTINATION."
402
msgstr ""
403
404
#: bzrlib/builtins.py:990
405
msgid "Files cannot be moved between branches."
406
msgstr ""
407
408
#: bzrlib/builtins.py:997
409
msgid ""
410
"Move only the bzr identifier of the file, because the file has already been "
411
"moved."
412
msgstr ""
413
414
#: bzrlib/builtins.py:999
415
msgid "Automatically guess renames."
416
msgstr ""
417
418
#: bzrlib/builtins.py:1000
419
msgid "Avoid making changes when guessing renames."
420
msgstr ""
421
422
#: bzrlib/builtins.py:1009
423
msgid "--dry-run requires --auto."
424
msgstr ""
425
426
#: bzrlib/builtins.py:1013
427
msgid "missing file argument"
428
msgstr ""
429
430
#: bzrlib/builtins.py:1017
431
msgid "can not move root of branch"
432
msgstr ""
433
434
#: bzrlib/builtins.py:1023
435
msgid "Only one path may be specified to --auto."
436
msgstr ""
437
438
#: bzrlib/builtins.py:1026
439
msgid "--after cannot be specified with --auto."
440
msgstr ""
441
442
#: bzrlib/builtins.py:1062
443
msgid "to mv multiple files the destination must be a versioned directory"
444
msgstr ""
445
446
#: bzrlib/builtins.py:1114
447
msgid "Turn this branch into a mirror of another branch."
448
msgstr ""
449
450
#: bzrlib/builtins.py:1116
451
msgid ""
452
"By default, this command only works on branches that have not diverged.\n"
453
"Branches are considered diverged if the destination branch's most recent \n"
454
"commit is one that has not been merged (directly or indirectly) into the \n"
455
"parent."
456
msgstr ""
457
458
#: bzrlib/builtins.py:1121
459
msgid ""
460
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
461
"from one into the other. Once one branch has merged, the other should\n"
462
"be able to pull it again."
463
msgstr ""
464
465
#: bzrlib/builtins.py:1125
466
msgid ""
467
"If you want to replace your local changes and just want your branch to\n"
468
"match the remote one, use pull --overwrite. This will work even if the two\n"
469
"branches have diverged."
470
msgstr ""
471
472
#: bzrlib/builtins.py:1129
473
msgid ""
474
"If there is no default location set, the first pull will set it (use\n"
475
"--no-remember to avoid setting it). After that, you can omit the\n"
476
"location to use the default. To change the default, use --remember. The\n"
477
"value will only be saved if the remote location can be accessed."
478
msgstr ""
479
480
#: bzrlib/builtins.py:1134
481
msgid ""
482
"The --verbose option will display the revisions pulled using the log_format\n"
483
"configuration option. You can use a different format by overriding it with\n"
484
"-Olog_format=<other_format>."
485
msgstr ""
486
487
#: bzrlib/builtins.py:1138
488
msgid ""
489
"Note: The location can be specified either in the form of a branch,\n"
490
"or in the form of a path to a file containing a merge directive generated\n"
491
"with bzr send."
492
msgstr ""
493
494
#: bzrlib/builtins.py:1146
495
msgid "Show logs of pulled revisions."
496
msgstr ""
497
498
#: bzrlib/builtins.py:1148
499
msgid ""
500
"Branch to pull into, rather than the one containing the working directory."
501
msgstr ""
502
503
#: bzrlib/builtins.py:1151
504
msgid ""
505
"Perform a local pull in a bound branch. Local pulls are not applied to the "
506
"master branch."
507
msgstr ""
508
509
#: bzrlib/builtins.py:1188
510
msgid "No working tree, ignoring --show-base"
511
msgstr ""
512
513
#: bzrlib/builtins.py:1204
514
msgid "No pull location known or specified."
515
msgstr ""
516
517
#: bzrlib/builtins.py:1210
518
#, python-format
519
msgid "Using saved parent location: %s\n"
520
msgstr ""
521
522
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
523
msgid "Cannot use -r with merge directives or bundles"
524
msgstr ""
525
526
#: bzrlib/builtins.py:1260
527
msgid "Update a mirror of this branch."
528
msgstr ""
529
530
#: bzrlib/builtins.py:1262
531
msgid ""
532
"The target branch will not have its working tree populated because this\n"
533
"is both expensive, and is not supported on remote file systems."
534
msgstr ""
535
536
#: bzrlib/builtins.py:1265
537
msgid ""
538
"Some smart servers or protocols *may* put the working tree in place in\n"
539
"the future."
540
msgstr ""
541
542
#: bzrlib/builtins.py:1268
543
msgid ""
544
"This command only works on branches that have not diverged. Branches are\n"
545
"considered diverged if the destination branch's most recent commit is one\n"
546
"that has not been merged (directly or indirectly) by the source branch."
547
msgstr ""
548
549
#: bzrlib/builtins.py:1272
550
msgid ""
551
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
552
"the other branch completely, discarding its unmerged changes."
553
msgstr ""
554
555
#: bzrlib/builtins.py:1275
556
msgid ""
557
"If you want to ensure you have the different changes in the other branch,\n"
558
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
559
"After that you will be able to do a push without '--overwrite'."
560
msgstr ""
561
562
#: bzrlib/builtins.py:1279
563
msgid ""
564
"If there is no default push location set, the first push will set it (use\n"
565
"--no-remember to avoid setting it). After that, you can omit the\n"
566
"location to use the default. To change the default, use --remember. The\n"
567
"value will only be saved if the remote location can be accessed."
568
msgstr ""
569
570
#: bzrlib/builtins.py:1284
571
msgid ""
572
"The --verbose option will display the revisions pushed using the log_format\n"
573
"configuration option. You can use a different format by overriding it with\n"
574
"-Olog_format=<other_format>."
575
msgstr ""
576
577
#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
578
msgid ""
579
"Branch to push from, rather than the one containing the working directory."
580
msgstr ""
581
582
#: bzrlib/builtins.py:1298
583
msgid ""
584
"By default push will fail if the target directory exists, but does not "
585
"already have a control directory. This flag will allow push to proceed."
586
msgstr ""
587
588
#: bzrlib/builtins.py:1303
589
msgid ""
590
"Create a stacked branch that references the public location of the parent "
591
"branch."
592
msgstr ""
593
594
#: bzrlib/builtins.py:1306
595
msgid ""
596
"Create a stacked branch that refers to another branch for the commit "
597
"history. Only the work not present in the referenced branch is included in "
598
"the branch created."
599
msgstr ""
600
601
#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
602
msgid ""
603
"Refuse to push if there are uncommitted changes in the working tree, --no-"
604
"strict disables the check."
605
msgstr ""
606
607
#: bzrlib/builtins.py:1314
608
msgid "Don't populate the working tree, even for protocols that support it."
609
msgstr ""
610
611
#: bzrlib/builtins.py:1317
612
msgid "Overwrite tags only."
613
msgstr ""
614
615
#: bzrlib/builtins.py:1368
616
msgid "Could not determine branch to refer to."
617
msgstr ""
618
619
#: bzrlib/builtins.py:1377
620
#, python-format
621
msgid ""
622
"No push location known or specified. To push to the parent branch (at %s), "
623
"use 'bzr push :parent'."
624
msgstr ""
625
626
#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
627
msgid "No push location known or specified."
628
msgstr ""
629
630
#: bzrlib/builtins.py:1387
631
#, python-format
632
msgid "Using saved push location: %s"
633
msgstr ""
634
635
#: bzrlib/builtins.py:1397
636
msgid "Create a new branch that is a copy of an existing branch."
637
msgstr ""
638
639
#: bzrlib/builtins.py:1399
640
msgid ""
641
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
642
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
643
"./bar.\n"
644
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
645
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
646
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
647
"create ./foo-bar."
648
msgstr ""
649
650
#: bzrlib/builtins.py:1406
651
msgid ""
652
"To retrieve the branch as of a particular revision, supply the --revision\n"
653
"parameter, as in \"branch foo/bar -r 5\"."
654
msgstr ""
655
656
#: bzrlib/builtins.py:1409
657
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
658
msgstr ""
659
660
#: bzrlib/builtins.py:1419
661
msgid "Create a branch without a working-tree."
662
msgstr ""
663
664
#: bzrlib/builtins.py:1421
665
msgid "Switch the checkout in the current directory to the new branch."
666
msgstr ""
667
668
#: bzrlib/builtins.py:1424
669
msgid ""
670
"Create a stacked branch referring to the source branch. The new branch will "
671
"depend on the availability of the source branch for all operations."
672
msgstr ""
673
674
#: bzrlib/builtins.py:1428
675
msgid "Do not use a shared repository, even if available."
676
msgstr ""
677
678
#: bzrlib/builtins.py:1430
679
msgid ""
680
"By default branch will fail if the target directory exists, but does not "
681
"already have a control directory. This flag will allow branch to proceed."
682
msgstr ""
683
684
#: bzrlib/builtins.py:1435
685
msgid "Bind new branch to from location."
686
msgstr ""
687
688
#: bzrlib/builtins.py:1482
689
#, python-format
690
msgid "Target directory \"%s\" already exists."
691
msgstr ""
692
693
#: bzrlib/builtins.py:1494
694
#, python-format
695
msgid "Parent of \"%s\" does not exist."
696
msgstr ""
697
698
#: bzrlib/builtins.py:1513
699
msgid "The branch {0} has no revision {1}."
700
msgstr ""
701
702
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
703
#, python-format
704
msgid "Created new stacked branch referring to %s."
705
msgstr ""
706
707
#: bzrlib/builtins.py:1532
708
#, python-format
709
msgid "Branched %d revision."
710
msgid_plural "Branched %d revisions."
711
msgstr[0] ""
712
msgstr[1] ""
713
714
#: bzrlib/builtins.py:1537
715
#, python-format
716
msgid "New branch bound to %s"
717
msgstr ""
718
719
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
720
#, python-format
721
msgid "Switched to branch: %s"
722
msgstr ""
723
724
#: bzrlib/builtins.py:1547
725
msgid "List the branches available at the current location."
726
msgstr ""
727
728
#: bzrlib/builtins.py:1549
729
msgid ""
730
"This command will print the names of all the branches at the current\n"
731
"location."
732
msgstr ""
733
734
#: bzrlib/builtins.py:1556
735
msgid ""
736
"Recursively scan for branches rather than just looking in the specified "
737
"location."
738
msgstr ""
739
740
#: bzrlib/builtins.py:1585
741
msgid "(default)"
742
msgstr ""
743
744
#: bzrlib/builtins.py:1597
745
msgid "Create a new checkout of an existing branch."
746
msgstr ""
747
748
#: bzrlib/builtins.py:1599
749
msgid ""
750
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
751
"for\n"
752
"the branch found in '.'. This is useful if you have removed the working "
753
"tree\n"
754
"or if it was never created - i.e. if you pushed the branch to its current\n"
755
"location using SFTP."
756
msgstr ""
757
758
#: bzrlib/builtins.py:1604
759
msgid ""
760
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
761
"will\n"
762
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
763
"./bar.\n"
764
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
765
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
766
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
767
"create ./foo-bar."
768
msgstr ""
769
770
#: bzrlib/builtins.py:1611
771
msgid ""
772
"To retrieve the branch as of a particular revision, supply the --revision\n"
773
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
774
"immediately\n"
775
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
776
"old\n"
777
"code.)"
778
msgstr ""
779
780
#: bzrlib/builtins.py:1621
781
msgid ""
782
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
783
"the branch for every operation. Normal checkouts can perform common "
784
"operations like diff and status without such access, and also support local "
785
"commits."
786
msgstr ""
787
788
#: bzrlib/builtins.py:1628
789
msgid "Get file contents from this tree."
790
msgstr ""
791
792
#: bzrlib/builtins.py:1630
793
msgid "Hard-link working tree files where possible."
794
msgstr ""
795
796
#: bzrlib/builtins.py:1671
797
msgid ""
798
"Show list of renamed files.\n"
799
" "
800
msgstr ""
801
802
#: bzrlib/builtins.py:1699
803
msgid "Update a working tree to a new revision."
804
msgstr ""
805
806
#: bzrlib/builtins.py:1701
807
msgid ""
808
"This will perform a merge of the destination revision (the tip of the\n"
809
"branch, or the specified revision) into the working tree, and then make\n"
810
"that revision the basis revision for the working tree. "
811
msgstr ""
812
813
#: bzrlib/builtins.py:1705
814
msgid ""
815
"You can use this to visit an older revision, or to update a working tree\n"
816
"that is out of date from its branch."
817
msgstr ""
818
819
#: bzrlib/builtins.py:1708
820
msgid ""
821
"If there are any uncommitted changes in the tree, they will be carried\n"
822
"across and remain as uncommitted changes after the update. To discard\n"
823
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
824
"with the changes brought in by the change in basis revision."
825
msgstr ""
826
827
#: bzrlib/builtins.py:1713
828
msgid ""
829
"If the tree's branch is bound to a master branch, bzr will also update\n"
830
"the branch from the master."
831
msgstr ""
832
833
#: bzrlib/builtins.py:1716
834
msgid ""
835
"You cannot update just a single file or directory, because each Bazaar\n"
836
"working tree has just a single basis revision. If you want to restore a\n"
837
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
838
"update'. If you want to restore a file to its state in a previous\n"
839
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
840
"out the old content of that file to a new location."
841
msgstr ""
842
843
#: bzrlib/builtins.py:1723
844
msgid ""
845
"The 'dir' argument, if given, must be the location of the root of a\n"
846
"working tree to update. By default, the working tree that contains the \n"
847
"current working directory is used."
848
msgstr ""
849
850
#: bzrlib/builtins.py:1739
851
msgid "bzr update --revision takes exactly one revision"
852
msgstr ""
853
854
#: bzrlib/builtins.py:1747
855
msgid "bzr update can only update a whole tree, not a file or subdirectory"
856
msgstr ""
857
858
#: bzrlib/builtins.py:1778
859
msgid "Tree is up to date at revision {0} of branch {1}"
860
msgstr ""
861
862
#: bzrlib/builtins.py:1794
863
#, python-format
864
msgid ""
865
"branch has no revision %s\n"
866
"bzr update --revision only works for a revision in the branch history"
867
msgstr ""
868
869
#: bzrlib/builtins.py:1800
870
msgid "Updated to revision {0} of branch {1}"
871
msgstr ""
872
873
#: bzrlib/builtins.py:1804
874
msgid ""
875
"Your local commits will now show as pending merges with 'bzr status', and "
876
"can be committed with 'bzr commit'."
877
msgstr ""
878
879
#: bzrlib/builtins.py:1813
880
msgid "Show information about a working tree, branch or repository."
881
msgstr ""
882
883
#: bzrlib/builtins.py:1815
884
msgid ""
885
"This command will show all known locations and formats associated to the\n"
886
"tree, branch or repository."
887
msgstr ""
888
889
#: bzrlib/builtins.py:1818
890
msgid ""
891
"In verbose mode, statistical information is included with each report.\n"
892
"To see extended statistic information, use a verbosity level of 2 or\n"
893
"higher by specifying the verbose option multiple times, e.g. -vv."
894
msgstr ""
895
896
#: bzrlib/builtins.py:1822
897
msgid "Branches and working trees will also report any missing revisions."
898
msgstr ""
899
900
#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
901
#: bzrlib/builtins.py:6469
902
msgid ":Examples:"
903
msgstr ""
904
905
#: bzrlib/builtins.py:1826
906
msgid " Display information on the format and related locations:"
907
msgstr ""
908
909
#: bzrlib/builtins.py:1828
910
msgid " bzr info"
911
msgstr ""
912
913
#: bzrlib/builtins.py:1830
914
msgid ""
915
" Display the above together with extended format information and\n"
916
" basic statistics (like the number of files in the working tree and\n"
917
" number of revisions in the branch and repository):"
918
msgstr ""
919
920
#: bzrlib/builtins.py:1834
921
msgid " bzr info -v"
922
msgstr ""
923
924
#: bzrlib/builtins.py:1836
925
msgid " Display the above together with number of committers to the branch:"
926
msgstr ""
927
928
#: bzrlib/builtins.py:1838
929
msgid " bzr info -vv"
930
msgstr ""
931
932
#: bzrlib/builtins.py:1857
933
msgid "Remove files or directories."
934
msgstr "Dosyaları ya da dizinleri kaldır"
935
936
#: bzrlib/builtins.py:1859
937
msgid ""
938
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
939
"delete them if they can easily be recovered using revert otherwise they\n"
940
"will be backed up (adding an extension of the form .~#~). If no options or\n"
941
"parameters are given Bazaar will scan for files that are being tracked by\n"
942
"Bazaar but missing in your tree and stop tracking them for you."
943
msgstr ""
944
945
#: bzrlib/builtins.py:1867
946
msgid "Only remove files that have never been committed."
947
msgstr ""
948
949
#: bzrlib/builtins.py:1869
950
msgid "The file deletion mode to be used."
951
msgstr ""
952
953
#: bzrlib/builtins.py:1870
954
msgid "Deletion Strategy"
955
msgstr "Silme Stratejisi"
956
957
#: bzrlib/builtins.py:1871
958
msgid "Backup changed files (default)."
959
msgstr ""
960
961
#: bzrlib/builtins.py:1872
962
msgid "Delete from bzr but leave the working copy."
963
msgstr ""
964
965
#: bzrlib/builtins.py:1873
966
msgid "Don't backup changed files."
967
msgstr ""
968
969
#: bzrlib/builtins.py:1894
970
msgid "No matching files."
971
msgstr "Eşleşen dosya yok."
972
973
#: bzrlib/builtins.py:1955
974
msgid "Reconcile bzr metadata in a branch."
975
msgstr ""
976
977
#: bzrlib/builtins.py:1957
978
msgid ""
979
"This can correct data mismatches that may have been caused by\n"
980
"previous ghost operations or bzr upgrades. You should only\n"
981
"need to run this command if 'bzr check' or a bzr developer\n"
982
"advises you to run it."
983
msgstr ""
984
985
#: bzrlib/builtins.py:1962
986
msgid ""
987
"If a second branch is provided, cross-branch reconciliation is\n"
988
"also attempted, which will check that data like the tree root\n"
989
"id which was not present in very early bzr versions is represented\n"
990
"correctly in both branches."
991
msgstr ""
992
993
#: bzrlib/builtins.py:1967
994
msgid ""
995
"At the same time it is run it may recompress data resulting in\n"
996
"a potential saving in disk space or performance gain."
997
msgstr ""
998
999
#: bzrlib/builtins.py:1970
1000
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1001
msgstr ""
1002
1003
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1004
msgid ""
1005
"Format for the bzr 2.0 series.\n"
1006
"Uses group-compress storage.\n"
1007
"Provides rich roots which are a one-way transition.\n"
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1011
msgid ""
1012
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1013
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1014
msgstr ""
1015
1016
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1017
msgid "The 2a format with experimental support for colocated branches.\n"
1018
msgstr ""
1019
1020
#: bzrlib/builtins.py:2038
1021
msgid "Make a directory into a versioned branch."
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:2040
1025
msgid ""
1026
"Use this to create an empty branch, or before importing an\n"
1027
"existing project."
1028
msgstr ""
1029
1030
#: bzrlib/builtins.py:2043
1031
msgid ""
1032
"If there is a repository in a parent directory of the location, then\n"
1033
"the history of the branch will be stored in the repository. Otherwise\n"
1034
"init creates a standalone branch which carries its own history\n"
1035
"in the .bzr directory."
1036
msgstr ""
1037
1038
#: bzrlib/builtins.py:2048
1039
msgid ""
1040
"If there is already a branch at the location but it has no working tree,\n"
1041
"the tree can be populated with 'bzr checkout'."
1042
msgstr ""
1043
1044
#: bzrlib/builtins.py:2051
1045
msgid "Recipe for importing a tree of files::"
1046
msgstr ""
1047
1048
#: bzrlib/builtins.py:2053
1049
msgid ""
1050
" cd ~/project\n"
1051
" bzr init\n"
1052
" bzr add .\n"
1053
" bzr status\n"
1054
" bzr commit -m \"imported project\""
1055
msgstr ""
1056
1057
#: bzrlib/builtins.py:2064
1058
msgid ""
1059
"Create the path leading up to the branch if it does not already exist."
1060
msgstr ""
1061
1062
#: bzrlib/builtins.py:2067
1063
msgid "Specify a format for this branch. See \"help formats\"."
1064
msgstr ""
1065
1066
#: bzrlib/builtins.py:2075
1067
msgid ""
1068
"Never change revnos or the existing log. Append revisions to it only."
1069
msgstr ""
1070
1071
#: bzrlib/builtins.py:2078
1072
msgid "Create a branch without a working tree."
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1076
#, python-format
1077
msgid ""
1078
"Parent directory of %s does not exist.\n"
1079
"You may supply --create-prefix to create all leading parent directories."
1080
msgstr ""
1081
1082
#: bzrlib/builtins.py:2132
1083
msgid ""
1084
"This branch format cannot be set to append-revisions-only. Try --default."
1085
msgstr ""
1086
1087
#: bzrlib/builtins.py:2143
1088
msgid "Created a {0} (format: {1})\n"
1089
msgstr ""
1090
1091
#: bzrlib/builtins.py:2152
1092
#, python-format
1093
msgid "Using shared repository: %s\n"
1094
msgstr ""
1095
1096
#: bzrlib/builtins.py:2156
1097
msgid "Create a shared repository for branches to share storage space."
1098
msgstr ""
1099
1100
#: bzrlib/builtins.py:2158
1101
msgid ""
1102
"New branches created under the repository directory will store their\n"
1103
"revisions in the repository, not in the branch directory. For branches\n"
1104
"with shared history, this reduces the amount of storage needed and \n"
1105
"speeds up the creation of new branches."
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2163
1109
msgid ""
1110
"If the --no-trees option is given then the branches in the repository\n"
1111
"will not have working trees by default. They will still exist as \n"
1112
"directories on disk, but they will not have separate copies of the \n"
1113
"files at a certain revision. This can be useful for repositories that\n"
1114
"store branches which are interacted with through checkouts or remote\n"
1115
"branches, such as on a server."
1116
msgstr ""
1117
1118
#: bzrlib/builtins.py:2170
1119
msgid ""
1120
":Examples:\n"
1121
" Create a shared repository holding just branches::"
1122
msgstr ""
1123
1124
#: bzrlib/builtins.py:2173
1125
msgid ""
1126
" bzr init-repo --no-trees repo\n"
1127
" bzr init repo/trunk"
1128
msgstr ""
1129
1130
#: bzrlib/builtins.py:2176
1131
msgid " Make a lightweight checkout elsewhere::"
1132
msgstr ""
1133
1134
#: bzrlib/builtins.py:2178
1135
msgid ""
1136
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1137
" cd trunk-checkout\n"
1138
" (add files here)"
1139
msgstr ""
1140
1141
#: bzrlib/builtins.py:2186
1142
msgid ""
1143
"Specify a format for this repository. See \"bzr help formats\" for details."
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2190
1147
msgid "Repository format"
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2192
1151
msgid "Branches in the repository will default to not having a working tree."
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2218
1155
msgid "Show differences in the working tree, between revisions or branches."
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2220
1159
msgid ""
1160
"If no arguments are given, all changes for the current tree are listed.\n"
1161
"If files are given, only the changes in those files are listed.\n"
1162
"Remote and multiple branches can be compared by using the --old and\n"
1163
"--new options. If not provided, the default for both is derived from\n"
1164
"the first argument, if any, or the current tree if no arguments are\n"
1165
"given."
1166
msgstr ""
1167
1168
#: bzrlib/builtins.py:2227
1169
msgid ""
1170
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1171
"produces patches suitable for \"patch -p1\"."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2230
1175
msgid ""
1176
"Note that when using the -r argument with a range of revisions, the\n"
1177
"differences are computed between the two specified revisions. That\n"
1178
"is, the command does not show the changes introduced by the first \n"
1179
"revision in the range. This differs from the interpretation of \n"
1180
"revision ranges used by \"bzr log\" which includes the first revision\n"
1181
"in the range."
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2237
1185
msgid ""
1186
":Exit values:\n"
1187
" 1 - changed\n"
1188
" 2 - unrepresentable changes\n"
1189
" 3 - error\n"
1190
" 0 - no change"
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2243
1194
msgid ""
1195
":Examples:\n"
1196
" Shows the difference in the working tree versus the last commit::"
1197
msgstr ""
1198
1199
#: bzrlib/builtins.py:2246
1200
msgid " bzr diff"
1201
msgstr ""
1202
1203
#: bzrlib/builtins.py:2248
1204
msgid " Difference between the working tree and revision 1::"
1205
msgstr ""
1206
1207
#: bzrlib/builtins.py:2250
1208
msgid " bzr diff -r1"
1209
msgstr ""
1210
1211
#: bzrlib/builtins.py:2252
1212
msgid " Difference between revision 3 and revision 1::"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2254
1216
msgid " bzr diff -r1..3"
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2256
1220
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2258
1224
msgid " bzr diff -r1..3 xxx"
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2260
1228
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2262
1232
msgid " bzr diff -c2"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2264
1236
msgid ""
1237
" To see the changes introduced by revision X::\n"
1238
" \n"
1239
" bzr diff -cX"
1240
msgstr ""
1241
1242
#: bzrlib/builtins.py:2268
1243
msgid ""
1244
" Note that in the case of a merge, the -c option shows the changes\n"
1245
" compared to the left hand parent. To see the changes against\n"
1246
" another parent, use::"
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2272
1250
msgid " bzr diff -r<chosen_parent>..X"
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2274
1254
msgid ""
1255
" The changes between the current revision and the previous revision\n"
1256
" (equivalent to -c-1 and -r-2..-1)"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2277
1260
msgid " bzr diff -r-2.."
1261
msgstr ""
1262
1263
#: bzrlib/builtins.py:2279
1264
msgid " Show just the differences for file NEWS::"
1265
msgstr ""
1266
1267
#: bzrlib/builtins.py:2281
1268
msgid " bzr diff NEWS"
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2283
1272
msgid " Show the differences in working tree xxx for file NEWS::"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2285
1276
msgid " bzr diff xxx/NEWS"
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2287
1280
msgid " Show the differences from branch xxx to this working tree:"
1281
msgstr ""
1282
1283
#: bzrlib/builtins.py:2289
1284
msgid " bzr diff --old xxx"
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2291
1288
msgid " Show the differences between two branches for file NEWS::"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2293
1292
msgid " bzr diff --old xxx --new yyy NEWS"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2295
1296
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2297
1300
msgid ""
1301
" bzr diff --prefix old/:new/\n"
1302
" \n"
1303
" Show the differences using a custom diff program with options::\n"
1304
" \n"
1305
" bzr diff --using /usr/bin/diff --diff-options -wu"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2307
1309
msgid "Pass these options to the external diff program."
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2310
1313
msgid ""
1314
"Set prefixes added to old and new filenames, as two values separated by a "
1315
"colon. (eg \"old/:new/\")."
1316
msgstr ""
1317
1318
#: bzrlib/builtins.py:2313
1319
msgid "Branch/tree to compare from."
1320
msgstr ""
1321
1322
#: bzrlib/builtins.py:2317
1323
msgid "Branch/tree to compare to."
1324
msgstr ""
1325
1326
#: bzrlib/builtins.py:2323
1327
msgid "Use this command to compare files."
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2328
1331
msgid "Diff format to use."
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2330
1335
msgid "Diff format"
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2332
1339
msgid "How many lines of context to show."
1340
msgstr ""
1341
1342
#: bzrlib/builtins.py:2357
1343
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2361
1347
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1351
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1352
msgid "{0} and {1} are mutually exclusive"
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2386
1356
msgid ""
1357
"List files deleted in the working tree.\n"
1358
" "
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2463
1362
msgid "Show the tree root directory."
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2465
1366
msgid ""
1367
"The root is the nearest enclosing directory with a .bzr control\n"
1368
"directory."
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2480
1372
msgid "The limit argument must be an integer."
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2488
1376
msgid "The levels argument must be an integer."
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2493
1380
msgid "Show historical log for a branch or subset of a branch."
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2495
1384
msgid ""
1385
"log is bzr's default tool for exploring the history of a branch.\n"
1386
"The branch to use is taken from the first parameter. If no parameters\n"
1387
"are given, the branch containing the working directory is logged.\n"
1388
"Here are some simple examples::"
1389
msgstr ""
1390
1391
#: bzrlib/builtins.py:2500
1392
msgid ""
1393
" bzr log log the current branch\n"
1394
" bzr log foo.py log a file in its branch\n"
1395
" bzr log http://server/branch log a branch on a server"
1396
msgstr ""
1397
1398
#: bzrlib/builtins.py:2504
1399
msgid ""
1400
"The filtering, ordering and information shown for each revision can\n"
1401
"be controlled as explained below. By default, all revisions are\n"
1402
"shown sorted (topologically) so that newer revisions appear before\n"
1403
"older ones and descendants always appear before ancestors. If displayed,\n"
1404
"merged revisions are shown indented under the revision in which they\n"
1405
"were merged."
1406
msgstr ""
1407
1408
#: bzrlib/builtins.py:2511
1409
msgid ":Output control:"
1410
msgstr ""
1411
1412
#: bzrlib/builtins.py:2513
1413
msgid ""
1414
" The log format controls how information about each revision is\n"
1415
" displayed. The standard log formats are called ``long``, ``short``\n"
1416
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1417
" for more details on log formats."
1418
msgstr ""
1419
1420
#: bzrlib/builtins.py:2518
1421
msgid ""
1422
" The following options can be used to control what information is\n"
1423
" displayed::"
1424
msgstr ""
1425
1426
#: bzrlib/builtins.py:2521
1427
msgid ""
1428
" -l N display a maximum of N revisions\n"
1429
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1430
" -v display a status summary (delta) for each revision\n"
1431
" -p display a diff (patch) for each revision\n"
1432
" --show-ids display revision-ids (and file-ids), not just revnos"
1433
msgstr ""
1434
1435
#: bzrlib/builtins.py:2527
1436
msgid ""
1437
" Note that the default number of levels to display is a function of the\n"
1438
" log format. If the -n option is not used, the standard log formats show\n"
1439
" just the top level (mainline)."
1440
msgstr ""
1441
1442
#: bzrlib/builtins.py:2531
1443
msgid ""
1444
" Status summaries are shown using status flags like A, M, etc. To see\n"
1445
" the changes explained using words like ``added`` and ``modified``\n"
1446
" instead, use the -vv option."
1447
msgstr ""
1448
1449
#: bzrlib/builtins.py:2535
1450
msgid ":Ordering control:"
1451
msgstr ""
1452
1453
#: bzrlib/builtins.py:2537
1454
msgid ""
1455
" To display revisions from oldest to newest, use the --forward option.\n"
1456
" In most cases, using this option will have little impact on the total\n"
1457
" time taken to produce a log, though --forward does not incrementally\n"
1458
" display revisions like --reverse does when it can."
1459
msgstr ""
1460
1461
#: bzrlib/builtins.py:2542
1462
msgid ":Revision filtering:"
1463
msgstr ""
1464
1465
#: bzrlib/builtins.py:2544
1466
msgid ""
1467
" The -r option can be used to specify what revision or range of revisions\n"
1468
" to filter against. The various forms are shown below::"
1469
msgstr ""
1470
1471
#: bzrlib/builtins.py:2547
1472
msgid ""
1473
" -rX display revision X\n"
1474
" -rX.. display revision X and later\n"
1475
" -r..Y display up to and including revision Y\n"
1476
" -rX..Y display from X to Y inclusive"
1477
msgstr ""
1478
1479
#: bzrlib/builtins.py:2552
1480
msgid ""
1481
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1482
" Some common examples are given below::"
1483
msgstr ""
1484
1485
#: bzrlib/builtins.py:2555
1486
msgid ""
1487
" -r-1 show just the tip\n"
1488
" -r-10.. show the last 10 mainline revisions\n"
1489
" -rsubmit:.. show what's new on this branch\n"
1490
" -rancestor:path.. show changes since the common ancestor of this\n"
1491
" branch and the one at location path\n"
1492
" -rdate:yesterday.. show changes since yesterday"
1493
msgstr ""
1494
1495
#: bzrlib/builtins.py:2562
1496
msgid ""
1497
" When logging a range of revisions using -rX..Y, log starts at\n"
1498
" revision Y and searches back in history through the primary\n"
1499
" (\"left-hand\") parents until it finds X. When logging just the\n"
1500
" top level (using -n1), an error is reported if X is not found\n"
1501
" along the way. If multi-level logging is used (-n0), X may be\n"
1502
" a nested merge revision and the log will be truncated accordingly."
1503
msgstr ""
1504
1505
#: bzrlib/builtins.py:2569
1506
msgid ":Path filtering:"
1507
msgstr ""
1508
1509
#: bzrlib/builtins.py:2571
1510
msgid ""
1511
" If parameters are given and the first one is not a branch, the log\n"
1512
" will be filtered to show only those revisions that changed the\n"
1513
" nominated files or directories."
1514
msgstr ""
1515
1516
#: bzrlib/builtins.py:2575
1517
msgid ""
1518
" Filenames are interpreted within their historical context. To log a\n"
1519
" deleted file, specify a revision range so that the file existed at\n"
1520
" the end or start of the range."
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2579
1524
msgid ""
1525
" Historical context is also important when interpreting pathnames of\n"
1526
" renamed files/directories. Consider the following example:"
1527
msgstr ""
1528
1529
#: bzrlib/builtins.py:2582
1530
msgid ""
1531
" * revision 1: add tutorial.txt\n"
1532
" * revision 2: modify tutorial.txt\n"
1533
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1534
msgstr ""
1535
1536
#: bzrlib/builtins.py:2586
1537
msgid " In this case:"
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2588
1541
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2590
1545
msgid ""
1546
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1547
msgstr ""
1548
1549
#: bzrlib/builtins.py:2592
1550
msgid ""
1551
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1552
" the original file in revision 2."
1553
msgstr ""
1554
1555
#: bzrlib/builtins.py:2595
1556
msgid ""
1557
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1558
" was no file called guide.txt in revision 2."
1559
msgstr ""
1560
1561
#: bzrlib/builtins.py:2598
1562
msgid ""
1563
" Renames are always followed by log. By design, there is no need to\n"
1564
" explicitly ask for this (and no way to stop logging a file back\n"
1565
" until it was last renamed)."
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2602
1569
msgid ":Other filtering:"
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2604
1573
msgid ""
1574
" The --match option can be used for finding revisions that match a\n"
1575
" regular expression in a commit message, committer, author or bug.\n"
1576
" Specifying the option several times will match any of the supplied\n"
1577
" expressions. --match-author, --match-bugs, --match-committer and\n"
1578
" --match-message can be used to only match a specific field."
1579
msgstr ""
1580
1581
#: bzrlib/builtins.py:2610
1582
msgid ":Tips & tricks:"
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2612
1586
msgid ""
1587
" GUI tools and IDEs are often better at exploring history than command\n"
1588
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1589
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1590
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1591
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1592
msgstr ""
1593
1594
#: bzrlib/builtins.py:2618
1595
msgid ""
1596
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1597
msgstr ""
1598
1599
#: bzrlib/builtins.py:2620
1600
msgid ""
1601
" [ALIASES]\n"
1602
" tip = log -r-1\n"
1603
" top = log -l10 --line\n"
1604
" show = log -v -p"
1605
msgstr ""
1606
1607
#: bzrlib/builtins.py:2625
1608
msgid ""
1609
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1610
" will show the last 10 mainline revisions. To see the details of a\n"
1611
" particular revision X, ``bzr show -rX``."
1612
msgstr ""
1613
1614
#: bzrlib/builtins.py:2629
1615
msgid ""
1616
" If you are interested in looking deeper into a particular merge X,\n"
1617
" use ``bzr log -n0 -rX``."
1618
msgstr ""
1619
1620
#: bzrlib/builtins.py:2632
1621
msgid ""
1622
" ``bzr log -v`` on a branch with lots of history is currently\n"
1623
" very slow. A fix for this issue is currently under development.\n"
1624
" With or without that fix, it is recommended that a revision range\n"
1625
" be given when using the -v option."
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:2637
1629
msgid ""
1630
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1631
" used to find revisions matching user names, commit messages, etc.\n"
1632
" Among other features, this plugin can find all revisions containing\n"
1633
" a list of words but not others."
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2642
1637
msgid ""
1638
" When exploring non-mainline history on large projects with deep\n"
1639
" history, the performance of log can be greatly improved by installing\n"
1640
" the historycache plugin. This plugin buffers historical information\n"
1641
" trading disk space for faster speed."
1642
msgstr ""
1643
1644
#: bzrlib/builtins.py:2651
1645
msgid "Show from oldest to newest."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2654
1649
msgid "Show files changed in each revision."
1650
msgstr ""
1651
1652
#: bzrlib/builtins.py:2660
1653
msgid "Show just the specified revision. See also \"help revisionspec\"."
1654
msgstr ""
1655
1656
#: bzrlib/builtins.py:2664
1657
msgid "What names to list as authors - first, all or committer."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2665
1661
msgid "Authors"
1662
msgstr ""
1663
1664
#: bzrlib/builtins.py:2670
1665
msgid "Number of levels to display - 0 for all, 1 for flat."
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2680
1669
msgid "Limit the output to the first N revisions."
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2685
1673
msgid "Show changes made in each revision as a patch."
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2687
1677
msgid "Show merged revisions like --levels 0 does."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2691
1681
msgid "Do not report commits with more than one parent."
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2693
1685
msgid ""
1686
"Display only the revisions that are not part of both ancestries (require -"
1687
"rX..Y)."
1688
msgstr ""
1689
1690
#: bzrlib/builtins.py:2697
1691
msgid "Show digital signature validity."
1692
msgstr ""
1693
1694
#: bzrlib/builtins.py:2700
1695
msgid "Show revisions whose properties match this expression."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2704
1699
msgid "Show revisions whose message matches this expression."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2708
1703
msgid "Show revisions whose committer matches this expression."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2712
1707
msgid "Show revisions whose authors match this expression."
1708
msgstr ""
1709
1710
#: bzrlib/builtins.py:2716
1711
msgid "Show revisions whose bugs match this expression."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2770
1715
msgid "--exclude-common-ancestry requires -r with two revisions"
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2798
1719
#, python-format
1720
msgid "Path unknown at end or start of revision range: %s"
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2915
1724
#, python-format
1725
msgid "bzr %s doesn't accept two revisions in different branches."
1726
msgstr ""
1727
1728
#: bzrlib/builtins.py:2931
1729
#, python-format
1730
msgid "bzr %s --revision takes one or two values."
1731
msgstr ""
1732
1733
#: bzrlib/builtins.py:2976
1734
msgid ""
1735
"List files in a tree.\n"
1736
" "
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2985
1740
msgid "Recurse into subdirectories."
1741
msgstr ""
1742
1743
#: bzrlib/builtins.py:2987
1744
msgid "Print paths relative to the root of the branch."
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2989
1748
msgid "Print unknown files."
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2990
1752
msgid "Print versioned files."
1753
msgstr ""
1754
1755
#: bzrlib/builtins.py:2993
1756
msgid "Print ignored files."
1757
msgstr ""
1758
1759
#: bzrlib/builtins.py:2995
1760
msgid "List entries of a particular kind: file, directory, symlink."
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:3008
1764
msgid "invalid kind specified"
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:3011
1768
msgid "Cannot set both --verbose and --null"
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:3020
1772
msgid "cannot specify both --from-root and PATH"
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:3107
1776
msgid "Ignore specified files or patterns."
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:3109
1780
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:3111
1784
msgid ""
1785
"If a .bzrignore file does not exist, the ignore command\n"
1786
"will create one and add the specified files or patterns to the newly\n"
1787
"created file. The ignore command will also automatically add the \n"
1788
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1789
"the use of the ignore command will require an explicit add command."
1790
msgstr ""
1791
1792
#: bzrlib/builtins.py:3117
1793
msgid ""
1794
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1795
"After adding, editing or deleting that file either indirectly by\n"
1796
"using this command or directly by using an editor, be sure to commit\n"
1797
"it."
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:3122
1801
msgid ""
1802
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1803
"the global ignore file can be found in the application data directory as\n"
1804
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1805
"Global ignores are not touched by this command. The global ignore file\n"
1806
"can be edited directly using an editor."
1807
msgstr ""
1808
1809
#: bzrlib/builtins.py:3128
1810
msgid ""
1811
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1812
"precedence over regular ignores. Such exceptions are used to specify\n"
1813
"files that should be versioned which would otherwise be ignored."
1814
msgstr ""
1815
1816
#: bzrlib/builtins.py:3132
1817
msgid ""
1818
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1819
"precedence over the '!' exception patterns."
1820
msgstr ""
1821
1822
#: bzrlib/builtins.py:3135
1823
msgid ""
1824
":Notes: \n"
1825
" \n"
1826
"* Ignore patterns containing shell wildcards must be quoted from\n"
1827
" the shell on Unix."
1828
msgstr ""
1829
1830
#: bzrlib/builtins.py:3140
1831
msgid ""
1832
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1833
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1834
msgstr ""
1835
1836
#: bzrlib/builtins.py:3143
1837
msgid ""
1838
":Examples:\n"
1839
" Ignore the top level Makefile::"
1840
msgstr ""
1841
1842
#: bzrlib/builtins.py:3146
1843
msgid " bzr ignore ./Makefile"
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:3148
1847
msgid " Ignore .class files in all directories...::"
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:3150
1851
msgid " bzr ignore \"*.class\""
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3152
1855
msgid " ...but do not ignore \"special.class\"::"
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:3154
1859
msgid " bzr ignore \"!special.class\""
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:3156
1863
msgid " Ignore files whose name begins with the \"#\" character::"
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:3158
1867
msgid " bzr ignore \"RE:^#\""
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
1871
msgid " Ignore .o files under the lib directory::"
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:3162
1875
msgid " bzr ignore \"lib/**/*.o\""
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3166
1879
msgid " bzr ignore \"RE:lib/.*\\.o\""
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3168
1883
msgid " Ignore everything but the \"debian\" toplevel directory::"
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3170
1887
msgid ""
1888
" bzr ignore \"RE:(?!debian/).*\"\n"
1889
" \n"
1890
" Ignore everything except the \"local\" toplevel directory,\n"
1891
" but always ignore autosave files ending in ~, even under local/::\n"
1892
" \n"
1893
" bzr ignore \"*\"\n"
1894
" bzr ignore \"!./local\"\n"
1895
" bzr ignore \"!!*~\""
1896
msgstr ""
1897
1898
#: bzrlib/builtins.py:3184
1899
msgid "Display the default ignore rules that bzr uses."
1900
msgstr ""
1901
1902
#: bzrlib/builtins.py:3196
1903
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3207
1907
#, python-format
1908
msgid "Invalid ignore pattern found. %s"
1909
msgid_plural "Invalid ignore patterns found. %s"
1910
msgstr[0] ""
1911
msgstr[1] ""
1912
1913
#: bzrlib/builtins.py:3216
1914
msgid "NAME_PATTERN should not be an absolute path"
1915
msgstr ""
1916
1917
#: bzrlib/builtins.py:3229
1918
#, python-format
1919
msgid ""
1920
"Warning: the following files are version controlled and match your ignore "
1921
"pattern:\n"
1922
"%s\n"
1923
"These files will continue to be version controlled unless you 'bzr remove' "
1924
"them.\n"
1925
msgstr ""
1926
1927
#: bzrlib/builtins.py:3236
1928
msgid "List ignored files and the patterns that matched them."
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3238
1932
msgid ""
1933
"List all the ignored files and the ignore pattern that caused the file to\n"
1934
"be ignored."
1935
msgstr ""
1936
1937
#: bzrlib/builtins.py:3241
1938
msgid "Alternatively, to list just the files::"
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3243
1942
msgid " bzr ls --ignored"
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:3277
1946
#, python-format
1947
msgid "not a valid revision-number: %r"
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:3284
1951
msgid ""
1952
"Export current or past revision to a destination directory or archive."
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3286
1956
msgid "If no revision is specified this exports the last committed revision."
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3288
1960
msgid ""
1961
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1962
"given, try to find the format with the extension. If no extension\n"
1963
"is found exports to a directory (equivalent to --format=dir)."
1964
msgstr ""
1965
1966
#: bzrlib/builtins.py:3292
1967
msgid ""
1968
"If root is supplied, it will be used as the root directory inside\n"
1969
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1970
"to the exported filename. The root option has no effect for 'dir' format."
1971
msgstr ""
1972
1973
#: bzrlib/builtins.py:3296
1974
msgid ""
1975
"If branch is omitted then the branch containing the current working\n"
1976
"directory will be used."
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:3299
1980
msgid ""
1981
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3301
1985
msgid ""
1986
" ================= =========================\n"
1987
" Supported formats Autodetected by extension\n"
1988
" ================= =========================\n"
1989
" dir (none)\n"
1990
" tar .tar\n"
1991
" tbz2 .tar.bz2, .tbz2\n"
1992
" tgz .tar.gz, .tgz\n"
1993
" zip .zip\n"
1994
" ================= ========================="
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3315
1998
msgid "Type of file to export to."
1999
msgstr ""
2000
2001
#: bzrlib/builtins.py:3318
2002
msgid "Apply content filters to export the convenient form."
2003
msgstr ""
2004
2005
#: bzrlib/builtins.py:3322
2006
msgid "Name of the root directory inside the exported file."
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:3324
2010
msgid ""
2011
"Set modification time of files to that of the last revision in which it was "
2012
"changed."
2013
msgstr ""
2014
2015
#: bzrlib/builtins.py:3327
2016
msgid ""
2017
"Export the working tree contents rather than that of the last revision."
2018
msgstr ""
2019
2020
#: bzrlib/builtins.py:3346
2021
msgid "--uncommitted requires a working tree"
2022
msgstr ""
2023
2024
#: bzrlib/builtins.py:3355
2025
#, python-format
2026
msgid "Unsupported export format: %s"
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3359
2030
msgid ""
2031
"Write the contents of a file as of a given revision to standard output."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3361
2035
msgid "If no revision is nominated, the last revision is used."
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3363
2039
msgid ""
2040
"Note: Take care to redirect standard output when using this command on a\n"
2041
"binary file."
2042
msgstr ""
2043
2044
#: bzrlib/builtins.py:3369
2045
msgid "The path name in the old tree."
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3370
2049
msgid "Apply content filters to display the convenience form."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3381
2053
msgid "bzr cat --revision takes exactly one revision specifier"
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2057
msgid "{0!r} is not present in revision {1}"
2058
msgstr ""
2059
2060
#: bzrlib/builtins.py:3441
2061
msgid "Commit changes into a new revision."
2062
msgstr ""
2063
2064
#: bzrlib/builtins.py:3443
2065
msgid ""
2066
"An explanatory message needs to be given for each commit. This is\n"
2067
"often done by using the --message option (getting the message from the\n"
2068
"command line) or by using the --file option (getting the message from\n"
2069
"a file). If neither of these options is given, an editor is opened for\n"
2070
"the user to enter the message. To see the changed files in the\n"
2071
"boilerplate text loaded into the editor, use the --show-diff option."
2072
msgstr ""
2073
2074
#: bzrlib/builtins.py:3450
2075
msgid ""
2076
"By default, the entire tree is committed and the person doing the\n"
2077
"commit is assumed to be the author. These defaults can be overridden\n"
2078
"as explained below."
2079
msgstr ""
2080
2081
#: bzrlib/builtins.py:3454
2082
msgid ":Selective commits:"
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3456
2086
msgid ""
2087
" If selected files are specified, only changes to those files are\n"
2088
" committed. If a directory is specified then the directory and\n"
2089
" everything within it is committed."
2090
msgstr ""
2091
2092
#: bzrlib/builtins.py:3460
2093
msgid ""
2094
" When excludes are given, they take precedence over selected files.\n"
2095
" For example, to commit only changes within foo, but not changes\n"
2096
" within foo/bar::"
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3464
2100
msgid " bzr commit foo -x foo/bar"
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3466
2104
msgid " A selective commit after a merge is not yet supported."
2105
msgstr ""
2106
2107
#: bzrlib/builtins.py:3468
2108
msgid ":Custom authors:"
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3470
2112
msgid ""
2113
" If the author of the change is not the same person as the committer,\n"
2114
" you can specify the author's name using the --author option. The\n"
2115
" name should be in the same format as a committer-id, e.g.\n"
2116
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2117
" the change you can specify the option multiple times, once for each\n"
2118
" author."
2119
msgstr ""
2120
2121
#: bzrlib/builtins.py:3477
2122
msgid ":Checks:"
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3479
2126
msgid ""
2127
" A common mistake is to forget to add a new file or directory before\n"
2128
" running the commit command. The --strict option checks for unknown\n"
2129
" files and aborts the commit if any are found. More advanced pre-commit\n"
2130
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2131
" for details."
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3485
2135
msgid ":Things to note:"
2136
msgstr ""
2137
2138
#: bzrlib/builtins.py:3487
2139
msgid ""
2140
" If you accidentially commit the wrong changes or make a spelling\n"
2141
" mistake in the commit message say, you can use the uncommit command\n"
2142
" to undo it. See ``bzr help uncommit`` for details."
2143
msgstr ""
2144
2145
#: bzrlib/builtins.py:3491
2146
msgid ""
2147
" Hooks can also be configured to run after a commit. This allows you\n"
2148
" to trigger updates to external systems like bug trackers. The --fixes\n"
2149
" option can be used to record the association between a revision and\n"
2150
" one or more bugs. See ``bzr help bugs`` for details."
2151
msgstr ""
2152
2153
#: bzrlib/builtins.py:3501
2154
msgid "Do not consider changes made to a given path."
2155
msgstr ""
2156
2157
#: bzrlib/builtins.py:3504
2158
msgid "Description of the new revision."
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:3507
2162
msgid "Commit even if nothing has changed."
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3511
2166
msgid "Take commit message from this file."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3513
2170
msgid "Refuse to commit if there are unknown files in the working tree."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3516
2174
msgid ""
2175
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2176
"08:00:00 +0100'."
2177
msgstr ""
2178
2179
#: bzrlib/builtins.py:3519
2180
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2181
msgstr ""
2182
2183
#: bzrlib/builtins.py:3522
2184
msgid "Set the author's name, if it's different from the committer."
2185
msgstr ""
2186
2187
#: bzrlib/builtins.py:3525
2188
msgid ""
2189
"Perform a local commit in a bound branch. Local commits are not pushed to "
2190
"the master branch until a normal commit is performed."
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3531
2194
msgid ""
2195
"When no message is supplied, show the diff along with the status summary in "
2196
"the message editor."
2197
msgstr ""
2198
2199
#: bzrlib/builtins.py:3534
2200
msgid ""
2201
"When committing to a foreign version control system do not push data that "
2202
"can not be natively represented."
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3552
2206
#, python-format
2207
msgid ""
2208
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2209
"default bug tracker using the `bugtracker` option.\n"
2210
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3561
2214
#, python-format
2215
msgid ""
2216
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2217
"for more information on this feature.\n"
2218
"Commit refused."
2219
msgstr ""
2220
2221
#: bzrlib/builtins.py:3570
2222
#, python-format
2223
msgid "Unrecognized bug %s. Commit refused."
2224
msgstr ""
2225
2226
#: bzrlib/builtins.py:3573
2227
#, python-format
2228
msgid ""
2229
"%s\n"
2230
"Commit refused."
2231
msgstr ""
2232
2233
#: bzrlib/builtins.py:3597
2234
msgid "Could not parse --commit-time: "
2235
msgstr ""
2236
2237
#: bzrlib/builtins.py:3637
2238
msgid "please specify either --message or --file"
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3666
2242
msgid "please specify a commit message with either --message or --file"
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3669
2246
msgid ""
2247
"Empty commit message specified. Please specify a commit message with either -"
2248
"-message or --file or leave a blank message with --message \"\"."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3689
2252
msgid ""
2253
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2254
"-unchanged to force an empty commit."
2255
msgstr ""
2256
2257
#: bzrlib/builtins.py:3693
2258
msgid ""
2259
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2260
"resolve FILE\" to resolve."
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3697
2264
msgid "Commit refused because there are unknown files in the working tree."
2265
msgstr ""
2266
2267
#: bzrlib/builtins.py:3700
2268
msgid ""
2269
"\n"
2270
"To commit to master branch, run update and then commit.\n"
2271
"You can also pass --local to commit to continue working disconnected."
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3708
2275
msgid ""
2276
"Validate working tree structure, branch consistency and repository history."
2277
msgstr ""
2278
2279
#: bzrlib/builtins.py:3710
2280
msgid ""
2281
"This command checks various invariants about branch and repository storage\n"
2282
"to detect data corruption or bzr bugs."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3713
2286
msgid ""
2287
"The working tree and branch checks will only give output if a problem is\n"
2288
"detected. The output fields of the repository check are:"
2289
msgstr ""
2290
2291
#: bzrlib/builtins.py:3716
2292
msgid ""
2293
"revisions\n"
2294
" This is just the number of revisions checked. It doesn't\n"
2295
" indicate a problem."
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3720
2299
msgid ""
2300
"versionedfiles\n"
2301
" This is just the number of versionedfiles checked. It\n"
2302
" doesn't indicate a problem."
2303
msgstr ""
2304
2305
#: bzrlib/builtins.py:3724
2306
msgid ""
2307
"unreferenced ancestors\n"
2308
" Texts that are ancestors of other texts, but\n"
2309
" are not properly referenced by the revision ancestry. This is a\n"
2310
" subtle problem that Bazaar can work around."
2311
msgstr ""
2312
2313
#: bzrlib/builtins.py:3729
2314
msgid ""
2315
"unique file texts\n"
2316
" This is the total number of unique file contents\n"
2317
" seen in the checked revisions. It does not indicate a problem."
2318
msgstr ""
2319
2320
#: bzrlib/builtins.py:3733
2321
msgid ""
2322
"repeated file texts\n"
2323
" This is the total number of repeated texts seen\n"
2324
" in the checked revisions. Texts can be repeated when their file\n"
2325
" entries are modified, but the file contents are not. It does not\n"
2326
" indicate a problem."
2327
msgstr ""
2328
2329
#: bzrlib/builtins.py:3739
2330
msgid ""
2331
"If no restrictions are specified, all Bazaar data that is found at the "
2332
"given\n"
2333
"location will be checked."
2334
msgstr ""
2335
2336
#: bzrlib/builtins.py:3744
2337
msgid " Check the tree and branch at 'foo'::"
2338
msgstr ""
2339
2340
#: bzrlib/builtins.py:3746
2341
msgid " bzr check --tree --branch foo"
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3748
2345
msgid " Check only the repository at 'bar'::"
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3750
2349
msgid " bzr check --repo bar"
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3752
2353
msgid " Check everything at 'baz'::"
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3754
2357
msgid " bzr check baz"
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3760
2361
msgid "Check the branch related to the current directory."
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3762
2365
msgid "Check the repository related to the current directory."
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3764
2369
msgid "Check the working tree related to the current directory."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3778
2373
msgid "Upgrade a repository, branch or working tree to a newer format."
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3780
2377
msgid ""
2378
"When the default format has changed after a major new release of\n"
2379
"Bazaar, you may be informed during certain operations that you\n"
2380
"should upgrade. Upgrading to a newer format may improve performance\n"
2381
"or make new features available. It may however limit interoperability\n"
2382
"with older repositories or with older versions of Bazaar."
2383
msgstr ""
2384
2385
#: bzrlib/builtins.py:3786
2386
msgid ""
2387
"If you wish to upgrade to a particular format rather than the\n"
2388
"current default, that can be specified using the --format option.\n"
2389
"As a consequence, you can use the upgrade command this way to\n"
2390
"\"downgrade\" to an earlier format, though some conversions are\n"
2391
"a one way process (e.g. changing from the 1.x default to the\n"
2392
"2.x default) so downgrading is not always possible."
2393
msgstr ""
2394
2395
#: bzrlib/builtins.py:3793
2396
msgid ""
2397
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2398
"process (where # is a number). By default, this is left there on\n"
2399
"completion. If the conversion fails, delete the new .bzr directory\n"
2400
"and rename this one back in its place. Use the --clean option to ask\n"
2401
"for the backup.bzr directory to be removed on successful conversion.\n"
2402
"Alternatively, you can delete it by hand if everything looks good\n"
2403
"afterwards."
2404
msgstr ""
2405
2406
#: bzrlib/builtins.py:3801
2407
msgid ""
2408
"If the location given is a shared repository, dependent branches\n"
2409
"are also converted provided the repository converts successfully.\n"
2410
"If the conversion of a branch fails, remaining branches are still\n"
2411
"tried."
2412
msgstr ""
2413
2414
#: bzrlib/builtins.py:3806
2415
msgid ""
2416
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2417
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2418
msgstr ""
2419
2420
#: bzrlib/builtins.py:3814
2421
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3818
2425
msgid "Branch format"
2426
msgstr ""
2427
2428
#: bzrlib/builtins.py:3820
2429
msgid "Remove the backup.bzr directory if successful."
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3822
2433
msgid "Show what would be done, but don't actually do anything."
2434
msgstr ""
2435
2436
#: bzrlib/builtins.py:3837
2437
msgid "Show or set bzr user id."
2438
msgstr ""
2439
2440
#: bzrlib/builtins.py:3839
2441
msgid ""
2442
":Examples:\n"
2443
" Show the email of the current user::"
2444
msgstr ""
2445
2446
#: bzrlib/builtins.py:3842
2447
msgid " bzr whoami --email"
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3844
2451
msgid " Set the current user::"
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3846
2455
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3850
2459
msgid "Display email address only."
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3852
2463
msgid "Set identity for the current branch instead of globally."
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3878
2467
msgid "--email can only be used to display existing identity"
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3902
2471
msgid "Print or set the branch nickname."
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3904
2475
msgid ""
2476
"If unset, the colocated branch name is used for colocated branches, and\n"
2477
"the branch directory name is used for other branches. To print the\n"
2478
"current nickname, execute with no argument."
2479
msgstr ""
2480
2481
#: bzrlib/builtins.py:3908
2482
msgid ""
2483
"Bound branches use the nickname of its master branch unless it is set\n"
2484
"locally."
2485
msgstr ""
2486
2487
#: bzrlib/builtins.py:3928
2488
msgid "Set/unset and display aliases."
2489
msgstr ""
2490
2491
#: bzrlib/builtins.py:3930
2492
msgid ""
2493
":Examples:\n"
2494
" Show the current aliases::"
2495
msgstr ""
2496
2497
#: bzrlib/builtins.py:3933
2498
msgid " bzr alias"
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3935
2502
msgid " Show the alias specified for 'll'::"
2503
msgstr ""
2504
2505
#: bzrlib/builtins.py:3937
2506
msgid " bzr alias ll"
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3939
2510
msgid " Set an alias for 'll'::"
2511
msgstr ""
2512
2513
#: bzrlib/builtins.py:3941
2514
msgid " bzr alias ll=\"log --line -r-10..-1\""
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3943
2518
msgid " To remove an alias for 'll'::"
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3945
2522
msgid " bzr alias --remove ll"
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3950
2526
msgid "Remove the alias."
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3968
2530
msgid "bzr alias --remove expects an alias to remove."
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:4149
2534
msgid ""
2535
"subunit not available. subunit needs to be installed to use --subunit."
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:4166
2539
msgid ""
2540
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2541
msgstr ""
2542
2543
#: bzrlib/builtins.py:4213
2544
msgid "Show version of bzr."
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:4217
2548
msgid "Print just the version number."
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:4236
2552
msgid "It sure does!\n"
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:4260
2556
#, python-format
2557
msgid "merge base is revision %s\n"
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:4264
2561
msgid "Perform a three-way merge."
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:4266
2565
msgid ""
2566
"The source of the merge can be specified either in the form of a branch,\n"
2567
"or in the form of a path to a file containing a merge directive generated\n"
2568
"with bzr send. If neither is specified, the default is the upstream branch\n"
2569
"or the branch most recently merged using --remember. The source of the\n"
2570
"merge may also be specified in the form of a path to a file in another\n"
2571
"branch: in this case, only the modifications to that file are merged into\n"
2572
"the current working tree."
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:4274
2576
msgid ""
2577
"When merging from a branch, by default bzr will try to merge in all new\n"
2578
"work from the other branch, automatically determining an appropriate base\n"
2579
"revision. If this fails, you may need to give an explicit base."
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:4278
2583
msgid ""
2584
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2585
"try to merge in all new work up to and including revision OTHER."
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:4281
2589
msgid ""
2590
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2591
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2592
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2593
"not already contain revision BASE, such a merge is commonly referred to as\n"
2594
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2595
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2596
"changes from the other branch is not stored in the commit."
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:4289
2600
msgid "Revision numbers are always relative to the source branch."
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2604
msgid ""
2605
"Merge will do its best to combine the changes in two branches, but there\n"
2606
"are some kinds of problems only a human can fix. When it encounters those,\n"
2607
"it will mark a conflict. A conflict means that you need to fix something,\n"
2608
"before you can commit."
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:4296
2612
msgid ""
2613
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:4298
2617
msgid ""
2618
"If there is no default branch set, the first merge will set it (use\n"
2619
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2620
"to use the default. To change the default, use --remember. The value will\n"
2621
"only be saved if the remote location can be accessed."
2622
msgstr ""
2623
2624
#: bzrlib/builtins.py:4303
2625
msgid ""
2626
"The results of the merge are placed into the destination working\n"
2627
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2628
"committed to record the result of the merge."
2629
msgstr ""
2630
2631
#: bzrlib/builtins.py:4307
2632
msgid ""
2633
"merge refuses to run if there are any uncommitted changes, unless\n"
2634
"--force is given. If --force is given, then the changes from the source \n"
2635
"will be merged with the current working tree, including any uncommitted\n"
2636
"changes in the tree. The --force option can also be used to create a\n"
2637
"merge revision which has more than two parents."
2638
msgstr ""
2639
2640
#: bzrlib/builtins.py:4313
2641
msgid ""
2642
"If one would like to merge changes from the working tree of the other\n"
2643
"branch without merging any committed revisions, the --uncommitted option\n"
2644
"can be given."
2645
msgstr ""
2646
2647
#: bzrlib/builtins.py:4317
2648
msgid ""
2649
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2650
"you to apply each diff hunk and file change, similar to \"shelve\"."
2651
msgstr ""
2652
2653
#: bzrlib/builtins.py:4320
2654
msgid ""
2655
":Examples:\n"
2656
" To merge all new revisions from bzr.dev::"
2657
msgstr ""
2658
2659
#: bzrlib/builtins.py:4323
2660
msgid " bzr merge ../bzr.dev"
2661
msgstr ""
2662
2663
#: bzrlib/builtins.py:4325
2664
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:4327
2668
msgid " bzr merge -r 82 ../bzr.dev"
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:4329
2672
msgid " To merge the changes introduced by 82, without previous changes::"
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:4331
2676
msgid " bzr merge -r 81..82 ../bzr.dev"
2677
msgstr ""
2678
2679
#: bzrlib/builtins.py:4333
2680
msgid " To apply a merge directive contained in /tmp/merge::"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4335
2684
msgid " bzr merge /tmp/merge"
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:4337
2688
msgid ""
2689
" To create a merge revision with three parents from two branches\n"
2690
" feature1a and feature1b:"
2691
msgstr ""
2692
2693
#: bzrlib/builtins.py:4340
2694
msgid ""
2695
" bzr merge ../feature1a\n"
2696
" bzr merge ../feature1b --force\n"
2697
" bzr commit -m 'revision with three parents'"
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4352
2701
msgid "Merge even if the destination tree has uncommitted changes."
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4358
2705
msgid ""
2706
"Apply uncommitted changes from a working copy, instead of branch changes."
2707
msgstr ""
2708
2709
#: bzrlib/builtins.py:4360
2710
msgid ""
2711
"If the destination is already completely merged into the source, pull from "
2712
"the source rather than merging. When this happens, you do not need to "
2713
"commit the result."
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4365
2717
msgid ""
2718
"Branch to merge into, rather than the one containing the working directory."
2719
msgstr ""
2720
2721
#: bzrlib/builtins.py:4367
2722
msgid "Instead of merging, show a diff of the merge."
2723
msgstr ""
2724
2725
#: bzrlib/builtins.py:4369
2726
msgid "Select changes interactively."
2727
msgstr ""
2728
2729
#: bzrlib/builtins.py:4391
2730
msgid ""
2731
"Merging into empty branches not currently supported, "
2732
"https://bugs.launchpad.net/bzr/+bug/308562"
2733
msgstr ""
2734
2735
#: bzrlib/builtins.py:4418
2736
msgid "Cannot use --uncommitted with bundles or merge directives."
2737
msgstr ""
2738
2739
#: bzrlib/builtins.py:4429
2740
msgid "Cannot use --uncommitted and --revision at the same time."
2741
msgstr ""
2742
2743
#: bzrlib/builtins.py:4449
2744
msgid "merger: "
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2748
msgid "Nothing to do."
2749
msgstr ""
2750
2751
#: bzrlib/builtins.py:4455
2752
msgid "Cannot pull individual files"
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4463
2756
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2757
msgstr ""
2758
2759
#: bzrlib/builtins.py:4521
2760
#, python-format
2761
msgid "Show-base is not supported for this merge type. %s"
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4530
2765
#, python-format
2766
msgid "Conflict reduction is not supported for merge type %s."
2767
msgstr ""
2768
2769
#: bzrlib/builtins.py:4534
2770
msgid "Cannot do conflict reduction and show base."
2771
msgstr ""
2772
2773
#: bzrlib/builtins.py:4645
2774
msgid "No location specified or remembered"
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4647
2778
msgid "{0} remembered {1} location {2}"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4653
2782
msgid "Redo a merge."
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4655
2786
msgid ""
2787
"Use this if you want to try a different merge technique while resolving\n"
2788
"conflicts. Some merge techniques are better than others, and remerge\n"
2789
"lets you try different ones on different files."
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4659
2793
msgid ""
2794
"The options for remerge have the same meaning and defaults as the ones for\n"
2795
"merge. The difference is that remerge can (only) be run when there is a\n"
2796
"pending merge, and it lets you specify particular files."
2797
msgstr ""
2798
2799
#: bzrlib/builtins.py:4663
2800
msgid ""
2801
":Examples:\n"
2802
" Re-do the merge of all conflicted files, and show the base text in\n"
2803
" conflict regions, in addition to the usual THIS and OTHER texts::"
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4667
2807
msgid " bzr remerge --show-base"
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4669
2811
msgid ""
2812
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2813
" additional processing to reduce the size of conflict regions::"
2814
msgstr ""
2815
2816
#: bzrlib/builtins.py:4672
2817
msgid " bzr remerge --merge-type weave --reprocess foobar"
2818
msgstr ""
2819
2820
#: bzrlib/builtins.py:4679
2821
msgid "Show base revision text in conflicts."
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4691
2825
msgid ""
2826
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2827
"merges."
2828
msgstr ""
2829
2830
#: bzrlib/builtins.py:4749
2831
msgid ""
2832
"Set files in the working tree back to the contents of a previous revision."
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4751
2836
msgid ""
2837
"Giving a list of files will revert only those files. Otherwise, all files\n"
2838
"will be reverted. If the revision is not specified with '--revision', the\n"
2839
"working tree basis revision is used. A revert operation affects only the\n"
2840
"working tree, not any revision history like the branch and repository or\n"
2841
"the working tree basis revision."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4757
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.\n"
2851
"To update the branch to a specific revision or the latest revision and\n"
2852
"update the working tree accordingly while preserving local changes, see the\n"
2853
"update command."
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:4766
2857
msgid ""
2858
"Uncommitted changes to files that are reverted will be discarded.\n"
2859
"Howver, by default, any files that have been manually changed will be\n"
2860
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2861
"files have '.~#~' appended to their name, where # is a number."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4771
2865
msgid ""
2866
"When you provide files, you can use their current pathname or the pathname\n"
2867
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2868
"name. If you name a directory, all the contents of that directory will be\n"
2869
"reverted."
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:4776
2873
msgid ""
2874
"If you have newly added files since the target revision, they will be\n"
2875
"removed. If the files to be removed have been changed, backups will be\n"
2876
"created as above. Directories containing unknown files will not be\n"
2877
"deleted."
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4781
2881
msgid ""
2882
"The working tree contains a list of revisions that have been merged but\n"
2883
"not yet committed. These revisions will be included as additional parents\n"
2884
"of the next commit. Normally, using revert clears that list as well as\n"
2885
"reverting the files. If any files are specified, revert leaves the list\n"
2886
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2887
".`` in the tree root to revert all files but keep the recorded merges,\n"
2888
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2889
"reverting any files."
2890
msgstr ""
2891
2892
#: bzrlib/builtins.py:4790
2893
msgid ""
2894
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2895
"changes from a branch in a single revision. To do this, perform the merge\n"
2896
"as desired. Then doing revert with the \"--forget-merges\" option will "
2897
"keep\n"
2898
"the content of the tree as it was, but it will clear the list of pending\n"
2899
"merges. The next commit will then contain all of the changes that are\n"
2900
"present in the other branch, but without any other parent revisions.\n"
2901
"Because this technique forgets where these changes originated, it may\n"
2902
"cause additional conflicts on later merges involving the same source and\n"
2903
"target branches."
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4804
2907
msgid "Do not save backups of reverted files."
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:4806
2911
msgid "Remove pending merge marker, without changing any files."
2912
msgstr ""
2913
2914
#: bzrlib/builtins.py:4837
2915
msgid ""
2916
"Show help on a command or other topic.\n"
2917
" "
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4842
2921
msgid "Show help on all commands."
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4871
2925
msgid "Show unmerged/unpulled revisions between two branches."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4873
2929
msgid "OTHER_BRANCH may be local or remote."
2930
msgstr ""
2931
2932
#: bzrlib/builtins.py:4875
2933
msgid ""
2934
"To filter on a range of revisions, you can use the command -r begin..end\n"
2935
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2936
"also valid.\n"
2937
" \n"
2938
":Exit values:\n"
2939
" 1 - some missing revisions\n"
2940
" 0 - no missing revisions"
2941
msgstr ""
2942
2943
#: bzrlib/builtins.py:4885
2944
msgid ""
2945
" Determine the missing revisions between this and the branch at the\n"
2946
" remembered pull location::"
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4888
2950
msgid " bzr missing"
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4890
2954
msgid " Determine the missing revisions between this and another branch::"
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4892
2958
msgid " bzr missing http://server/branch"
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4894
2962
msgid ""
2963
" Determine the missing revisions up to a specific revision on the other\n"
2964
" branch::"
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4897
2968
msgid " bzr missing -r ..-10"
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:4899
2972
msgid ""
2973
" Determine the missing revisions up to a specific revision on this\n"
2974
" branch::"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4902
2978
msgid " bzr missing --my-revision ..-10"
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4909
2982
msgid "Reverse the order of revisions."
2983
msgstr ""
2984
2985
#: bzrlib/builtins.py:4911
2986
msgid "Display changes in the local branch only."
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4912
2990
msgid "Same as --mine-only."
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4914
2994
msgid "Display changes in the remote branch only."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4915
2998
msgid "Same as --theirs-only."
2999
msgstr ""
3000
3001
#: bzrlib/builtins.py:4920
3002
msgid ""
3003
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3004
"details."
3005
msgstr ""
3006
3007
#: bzrlib/builtins.py:4924
3008
msgid ""
3009
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3010
"details."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4927
3014
msgid "Show all revisions in addition to the mainline ones."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4981
3018
msgid "No peer location known or specified."
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4985
3022
msgid "Using saved parent location: {0}\n"
3023
msgstr ""
3024
3025
#: bzrlib/builtins.py:5018
3026
#, python-format
3027
msgid "You have %d extra revision:\n"
3028
msgid_plural "You have %d extra revisions:\n"
3029
msgstr[0] ""
3030
msgstr[1] ""
3031
3032
#: bzrlib/builtins.py:5038
3033
#, python-format
3034
msgid "You are missing %d revision:\n"
3035
msgid_plural "You are missing %d revisions:\n"
3036
msgstr[0] ""
3037
msgstr[1] ""
3038
3039
#: bzrlib/builtins.py:5053
3040
msgid "This branch has no new revisions.\n"
3041
msgstr ""
3042
3043
#: bzrlib/builtins.py:5056
3044
msgid "Other branch has no new revisions.\n"
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:5061
3048
msgid "Branches are up to date.\n"
3049
msgstr ""
3050
3051
#: bzrlib/builtins.py:5072
3052
msgid "Compress the data within a repository."
3053
msgstr ""
3054
3055
#: bzrlib/builtins.py:5074
3056
msgid ""
3057
"This operation compresses the data within a bazaar repository. As\n"
3058
"bazaar supports automatic packing of repository, this operation is\n"
3059
"normally not required to be done manually."
3060
msgstr ""
3061
3062
#: bzrlib/builtins.py:5078
3063
msgid ""
3064
"During the pack operation, bazaar takes a backup of existing repository\n"
3065
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3066
"automatically when it is safe to do so. To save disk space by removing\n"
3067
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3068
"used."
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:5084
3072
msgid ""
3073
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3074
"during or immediately after repacking, you may be left with a state\n"
3075
"where the deletion has been written to disk but the new packs have not\n"
3076
"been. In this case the repository may be unusable."
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:5093
3080
msgid "Delete obsolete packs to save disk space."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:5107
3084
msgid "List the installed plugins."
3085
msgstr ""
3086
3087
#: bzrlib/builtins.py:5109
3088
msgid ""
3089
"This command displays the list of installed plugins including\n"
3090
"version of plugin and a short description of each."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:5112
3094
msgid "--verbose shows the path where each plugin is located."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:5114
3098
msgid ""
3099
"A plugin is an external component for Bazaar that extends the\n"
3100
"revision control system, by adding or replacing code in Bazaar.\n"
3101
"Plugins can do a variety of things, including overriding commands,\n"
3102
"adding new commands, providing additional network transports and\n"
3103
"customizing log output."
3104
msgstr ""
3105
3106
#: bzrlib/builtins.py:5120
3107
msgid ""
3108
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3109
"for further information on plugins including where to find them and how to\n"
3110
"install them. Instructions are also provided there on how to write new\n"
3111
"plugins using the Python programming language."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:5136
3115
msgid "Show testament (signing-form) of a revision."
3116
msgstr ""
3117
3118
#: bzrlib/builtins.py:5139
3119
msgid "Produce long-format testament."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5141
3123
msgid "Produce a strict-format testament."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5168
3127
msgid "Show the origin of each line in a file."
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:5170
3131
msgid ""
3132
"This prints out the given file with an annotation on the left side\n"
3133
"indicating which revision, author and date introduced the change."
3134
msgstr ""
3135
3136
#: bzrlib/builtins.py:5173
3137
msgid ""
3138
"If the origin is the same for a run of consecutive lines, it is\n"
3139
"shown only at the top, unless the --all option is given."
3140
msgstr ""
3141
3142
#: bzrlib/builtins.py:5181
3143
msgid "Show annotations on all lines."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5182
3147
msgid "Show commit date in annotations."
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:5269
3151
msgid "Cannot sign a range of non-revision-history revisions"
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5281
3155
msgid "Please supply either one revision, or a range."
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:5285
3159
msgid ""
3160
"Convert the current branch into a checkout of the supplied branch.\n"
3161
"If no branch is supplied, rebind to the last bound location."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:5288
3165
msgid ""
3166
"Once converted into a checkout, commits must succeed on the master branch\n"
3167
"before they will be applied to the local branch."
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:5291
3171
msgid ""
3172
"Bound branches use the nickname of its master branch unless it is set\n"
3173
"locally, in which case binding will update the local nickname to be\n"
3174
"that of the master."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:5306
3178
msgid "No location supplied. This format does not remember old locations."
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:5312
3182
msgid "Branch is already bound"
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:5315
3186
msgid "No location supplied and no previous location known"
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5321
3190
msgid "These branches have diverged. Try merging, and then bind again."
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5328
3194
msgid "Convert the current checkout into a regular branch."
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5330
3198
msgid ""
3199
"After unbinding, the local branch is considered independent and subsequent\n"
3200
"commits will be local only."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5341
3204
msgid "Local branch is not bound"
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5345
3208
msgid "Remove the last committed revision."
3209
msgstr ""
3210
3211
#: bzrlib/builtins.py:5347
3212
msgid ""
3213
"--verbose will print out what is being removed.\n"
3214
"--dry-run will go through all the motions, but not actually\n"
3215
"remove anything."
3216
msgstr ""
3217
3218
#: bzrlib/builtins.py:5351
3219
msgid ""
3220
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3221
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3222
"branch at revision 15."
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:5355
3226
msgid ""
3227
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3228
"it may make is to restore any pending merges that were present before\n"
3229
"the commit."
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:5366
3233
msgid "Don't actually make changes."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5367
3237
msgid "Say yes to all questions."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5369
3241
msgid "Keep tags that point to removed revisions."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5371
3245
msgid "Only remove the commits from the local branch when in a checkout."
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5420
3249
msgid "No revisions to uncommit.\n"
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5435
3253
msgid "Dry-run, pretending to remove the above revisions.\n"
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:5438
3257
msgid "The above revision(s) will be removed.\n"
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5442
3261
msgid "Uncommit these revisions"
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5445
3265
msgid "Canceled\n"
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5452
3269
#, python-format
3270
msgid ""
3271
"You can restore the old tip by running:\n"
3272
" bzr pull . -r revid:%s\n"
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5457
3276
msgid "Break a dead lock."
3277
msgstr ""
3278
3279
#: bzrlib/builtins.py:5459
3280
msgid ""
3281
"This command breaks a lock on a repository, branch, working directory or\n"
3282
"config file."
3283
msgstr ""
3284
3285
#: bzrlib/builtins.py:5462
3286
msgid ""
3287
"CAUTION: Locks should only be broken when you are sure that the process\n"
3288
"holding the lock has been stopped."
3289
msgstr ""
3290
3291
#: bzrlib/builtins.py:5465
3292
msgid ""
3293
"You can get information on what locks are open via the 'bzr info\n"
3294
"[location]' command."
3295
msgstr ""
3296
3297
#: bzrlib/builtins.py:5468
3298
msgid ""
3299
":Examples:\n"
3300
" bzr break-lock\n"
3301
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3302
" bzr break-lock --conf ~/.bazaar"
3303
msgstr ""
3304
3305
#: bzrlib/builtins.py:5477
3306
msgid "LOCATION is the directory where the config lock is."
3307
msgstr ""
3308
3309
#: bzrlib/builtins.py:5479
3310
msgid "Do not ask for confirmation before breaking the lock."
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5514
3314
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3315
msgstr ""
3316
3317
#: bzrlib/builtins.py:5515
3318
msgid "Run the bzr server."
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5521
3322
msgid "Serve on stdin/out for use from inetd or sshd."
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5522
3326
msgid "protocol"
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5523
3330
msgid "Protocol to serve."
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5527
3334
msgid "Listen for connections on nominated address."
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5529
3338
msgid ""
3339
"Listen for connections on nominated port. Passing 0 as the port number will "
3340
"result in a dynamically allocated port. The default port depends on the "
3341
"protocol."
3342
msgstr ""
3343
3344
#: bzrlib/builtins.py:5534
3345
msgid "Serve contents of this directory."
3346
msgstr ""
3347
3348
#: bzrlib/builtins.py:5536
3349
msgid ""
3350
"By default the server is a readonly server. Supplying --allow-writes "
3351
"enables write access to the contents of the served directory and below. "
3352
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3353
"of external authentication is arranged supplying this option leads to global "
3354
"uncontrolled write access to your file system."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5545
3358
msgid "Override the default idle client timeout (5min)."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5563
3362
msgid "Combine a tree into its containing tree."
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5565
3366
msgid "This command requires the target tree to be in a rich-root format."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5567
3370
msgid ""
3371
"The TREE argument should be an independent tree, inside another tree, but\n"
3372
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3373
"running \"bzr branch\" with the target inside a tree.)"
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5571
3377
msgid ""
3378
"The result is a combined tree, with the subtree no longer an independent\n"
3379
"part. This is marked as a merge of the subtree into the containing tree,\n"
3380
"and all history is preserved."
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:5589
3384
#, python-format
3385
msgid ""
3386
"Can't join trees because %s doesn't support rich root data.\n"
3387
"You can use bzr upgrade on the repository."
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3391
msgid "Cannot join {0}. {1}"
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5609
3395
msgid "Split a subdirectory of a tree into a separate tree."
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5611
3399
msgid ""
3400
"This command will produce a target tree in a format that supports\n"
3401
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3402
"converted into earlier formats like 'dirstate-tags'."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5615
3406
msgid ""
3407
"The TREE argument should be a subdirectory of a working tree. That\n"
3408
"subdirectory will be converted into an independent tree, with its own\n"
3409
"branch. Commits in the top-level tree will not apply to the new subtree."
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5695
3413
msgid "No submit branch specified or known"
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3417
msgid "No public branch specified or known"
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5709
3421
msgid "bzr merge-directive takes at most two one revision identifiers"
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5718
3425
msgid "No revisions to bundle."
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5737
3429
msgid "Mail or create a merge-directive for submitting changes."
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5739
3433
msgid "A merge directive provides many things needed for requesting merges:"
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5741
3437
msgid "* A machine-readable description of the merge to perform"
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5743
3441
msgid "* An optional patch that is a preview of the changes requested"
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5745
3445
msgid ""
3446
"* An optional bundle of revision data, so that the changes can be applied\n"
3447
" directly from the merge directive, without retrieving data from a\n"
3448
" branch."
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:5749
3452
msgid ""
3453
"`bzr send` creates a compact data set that, when applied using bzr\n"
3454
"merge, has the same effect as merging from the source branch. "
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5752
3458
msgid ""
3459
"By default the merge directive is self-contained and can be applied to any\n"
3460
"branch containing submit_branch in its ancestory without needing access to\n"
3461
"the source branch."
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5756
3465
msgid ""
3466
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3467
"revisions, but only a structured request to merge from the\n"
3468
"public_location. In that case the public_branch is needed and it must be\n"
3469
"up-to-date and accessible to the recipient. The public_branch is always\n"
3470
"included if known, so that people can check it later."
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5762
3474
msgid ""
3475
"The submit branch defaults to the parent of the source branch, but can be\n"
3476
"overridden. Both submit branch and public branch will be remembered in\n"
3477
"branch.conf the first time they are used for a particular branch. The\n"
3478
"source branch defaults to that containing the working directory, but can\n"
3479
"be changed using --from."
3480
msgstr ""
3481
3482
#: bzrlib/builtins.py:5768
3483
msgid ""
3484
"Both the submit branch and the public branch follow the usual behavior with\n"
3485
"respect to --remember: If there is no default location set, the first send\n"
3486
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3487
"omit the location to use the default. To change the default, use\n"
3488
"--remember. The value will only be saved if the location can be accessed."
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:5774
3492
msgid ""
3493
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3494
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3495
"If a public location is known for the submit_branch, that location is used\n"
3496
"in the merge directive."
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:5779
3500
msgid ""
3501
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3502
"given, in which case it is sent to a file."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5782
3506
msgid ""
3507
"Mail is sent using your preferred mail program. This should be transparent\n"
3508
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3509
"If the preferred client can't be found (or used), your editor will be used."
3510
msgstr ""
3511
3512
#: bzrlib/builtins.py:5786
3513
msgid ""
3514
"To use a specific mail program, set the mail_client configuration option.\n"
3515
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3516
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3517
"(MacOS X's\n"
3518
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3519
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3520
"add\n"
3521
"supported clients."
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:5793
3525
msgid ""
3526
"If mail is being sent, a to address is required. This can be supplied\n"
3527
"either on the commandline, by setting the submit_to configuration\n"
3528
"option in the branch itself or the child_submit_to configuration option\n"
3529
"in the submit branch."
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5798
3533
msgid ""
3534
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3535
"and\n"
3536
"merge directive format 2. It is significantly faster and smaller than\n"
3537
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3538
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3539
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:5804
3543
msgid ""
3544
"The merge directives created by bzr send may be applied using bzr merge or\n"
3545
"bzr pull by specifying a file containing a merge directive as the location."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5807
3549
msgid ""
3550
"bzr send makes extensive use of public locations to map local locations "
3551
"into\n"
3552
"URLs that can be used by other people. See `bzr help configuration` to\n"
3553
"set them, and use `bzr info` to display them."
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:5831
3557
msgid "Write merge directive to this file or directory; use - for stdout."
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5835
3561
msgid ""
3562
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3563
"strict disables the check."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5837
3567
msgid "Mail the request to this address."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5841
3571
msgid "Body for the email."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5894
3575
msgid "Do not include a bundle in the merge directive."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5895
3579
msgid "Do not include a preview patch in the merge directive."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5898
3583
msgid "Remember submit and public branch."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5900
3587
msgid ""
3588
"Branch to generate the submission from, rather than the one containing the "
3589
"working directory."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3593
msgid "format"
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5911
3597
msgid "Use the specified output format."
3598
msgstr ""
3599
3600
#: bzrlib/builtins.py:5933
3601
msgid "Create, remove or modify a tag naming a revision."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5935
3605
msgid ""
3606
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3607
"(--revision) option can be given -rtag:X, where X is any previously\n"
3608
"created tag."
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5939
3612
msgid ""
3613
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3614
"along when you branch, push, pull or merge."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5942
3618
msgid ""
3619
"It is an error to give a tag name that already exists unless you pass\n"
3620
"--force, in which case the tag is moved to point to the new revision."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5945
3624
msgid ""
3625
"To rename a tag (change the name but keep it on the same revsion), run "
3626
"``bzr\n"
3627
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5948
3631
msgid ""
3632
"If no tag name is specified it will be determined through the \n"
3633
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3634
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3635
"details."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5958
3639
msgid "Delete this tag rather than placing it."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5961
3643
msgid "Branch in which to place the tag."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5963
3647
msgid "Replace existing tags."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5978
3651
msgid "No tag specified to delete."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5980
3655
#, python-format
3656
msgid "Deleted tag %s."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5985
3660
msgid "Tags can only be placed on a single revision, not on a range"
3661
msgstr ""
3662
3663
#: bzrlib/builtins.py:5994
3664
msgid "Please specify a tag name."
3665
msgstr ""
3666
3667
#: bzrlib/builtins.py:6002
3668
#, python-format
3669
msgid "Tag %s already exists for that revision."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:6006
3673
#, python-format
3674
msgid "Created tag %s."
3675
msgstr ""
3676
3677
#: bzrlib/builtins.py:6008
3678
#, python-format
3679
msgid "Updated tag %s."
3680
msgstr ""
3681
3682
#: bzrlib/builtins.py:6012
3683
msgid "List tags."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:6014
3687
msgid ""
3688
"This command shows a table of tag names and the revisions they reference."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:6020
3692
msgid "Branch whose tags should be displayed."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:6022
3696
msgid "Sort tags by different criteria."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:6022
3700
msgid "Sorting"
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:6091
3704
msgid "Reconfigure the type of a bzr directory."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:6093
3708
msgid "A target configuration must be specified."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:6095
3712
msgid ""
3713
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3714
"The order of preference is\n"
3715
"1. For a lightweight checkout, the current bound location.\n"
3716
"2. For branches that used to be checkouts, the previously-bound location.\n"
3717
"3. The push location.\n"
3718
"4. The parent location.\n"
3719
"If none of these is available, --bind-to must be specified."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:6109
3723
msgid "Tree type"
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:6110
3727
msgid "The relation between branch and tree."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6112
3731
msgid "Reconfigure to be an unbound branch with no working tree."
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:6113
3735
msgid "Reconfigure to be an unbound branch with a working tree."
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6114
3739
msgid "Reconfigure to be a bound branch with a working tree."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6115
3743
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6120
3747
msgid "Repository type"
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:6121
3751
msgid "Location fo the repository."
3752
msgstr ""
3753
3754
#: bzrlib/builtins.py:6123
3755
msgid ""
3756
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6125
3760
msgid "Reconfigure to use a shared repository."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6129
3764
msgid "Trees in Repository"
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:6130
3768
msgid "Whether new branches in the repository have trees."
3769
msgstr ""
3770
3771
#: bzrlib/builtins.py:6132
3772
msgid ""
3773
"Reconfigure repository to create working trees on branches by default."
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:6134
3777
msgid ""
3778
"Reconfigure repository to not create working trees on branches by default."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6137
3782
msgid "Branch to bind checkout to."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6139
3786
msgid "Perform reconfiguration even if local changes will be lost."
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:6142
3790
msgid "Reconfigure a branch to be stacked on another branch."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:6146
3794
msgid ""
3795
"Reconfigure a branch to be unstacked. This may require copying substantial "
3796
"data into it."
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:6156
3800
msgid "Can't use both --stacked-on and --unstacked"
3801
msgstr ""
3802
3803
#: bzrlib/builtins.py:6170
3804
msgid "No target configuration specified"
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6205
3808
msgid "Set the branch of a checkout and update."
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:6207
3812
msgid ""
3813
"For lightweight checkouts, this changes the branch being referenced.\n"
3814
"For heavyweight checkouts, this checks that there are no local commits\n"
3815
"versus the current bound branch, then it makes the local branch a mirror\n"
3816
"of the new location and binds to it."
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:6212
3820
msgid ""
3821
"In both cases, the working tree is updated and uncommitted changes\n"
3822
"are merged. The user can commit or revert these as they desire."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:6215
3826
msgid "Pending merges need to be committed or reverted before using switch."
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:6217
3830
msgid ""
3831
"The path to the branch to switch to can be specified relative to the parent\n"
3832
"directory of the current branch. For example, if you are currently in a\n"
3833
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3834
"/path/to/newbranch."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:6222
3838
msgid ""
3839
"Bound branches use the nickname of its master branch unless it is set\n"
3840
"locally, in which case switching will update the local nickname to be\n"
3841
"that of the master."
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:6230
3845
msgid "Switch even if local commits will be lost."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6233
3849
msgid "Create the target branch from this one before switching to it."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6236
3853
msgid "Store and restore uncommitted changes in the branch."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6250
3857
msgid "You must supply either a revision or a location"
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6263
3861
msgid "cannot create branch without source branch"
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6289
3865
msgid "Manage filtered views."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6291
3869
msgid ""
3870
"Views provide a mask over the tree so that users can focus on\n"
3871
"a subset of a tree when doing their work. After creating a view,\n"
3872
"commands that support a list of files - status, diff, commit, etc -\n"
3873
"effectively have that list of files implicitly given each time.\n"
3874
"An explicit list of files can still be given but those files\n"
3875
"must be within the current view."
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:6298
3879
msgid ""
3880
"In most cases, a view has a short life-span: it is created to make\n"
3881
"a selected change and is deleted once that change is committed.\n"
3882
"At other times, you may wish to create one or more named views\n"
3883
"and switch between them."
3884
msgstr ""
3885
3886
#: bzrlib/builtins.py:6303
3887
msgid ""
3888
"To disable the current view without deleting it, you can switch to\n"
3889
"the pseudo view called ``off``. This can be useful when you need\n"
3890
"to see the whole tree for an operation or two (e.g. merge) but\n"
3891
"want to switch back to your view after that."
3892
msgstr ""
3893
3894
#: bzrlib/builtins.py:6308
3895
msgid ""
3896
":Examples:\n"
3897
" To define the current view::"
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6311
3901
msgid " bzr view file1 dir1 ..."
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6313
3905
msgid " To list the current view::"
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6315
3909
msgid " bzr view"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6317
3913
msgid " To delete the current view::"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6319
3917
msgid " bzr view --delete"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6321
3921
msgid " To disable the current view without deleting it::"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6323
3925
msgid " bzr view --switch off"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6325
3929
msgid " To define a named view and switch to it::"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6327
3933
msgid " bzr view --name view-name file1 dir1 ..."
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6329
3937
msgid " To list a named view::"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6331
3941
msgid " bzr view --name view-name"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6333
3945
msgid " To delete a named view::"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6335
3949
msgid " bzr view --name view-name --delete"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6337
3953
msgid " To switch to a named view::"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6339
3957
msgid " bzr view --switch view-name"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6341
3961
msgid " To list all views defined::"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6343
3965
msgid " bzr view --all"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6345
3969
msgid " To delete all views::"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6347
3973
msgid " bzr view --delete --all"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6354
3977
msgid "Apply list or delete action to all views."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6357
3981
msgid "Delete the view."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6360
3985
msgid "Name of the view to define, list or delete."
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6364
3989
msgid "Name of the view to switch to."
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6383
3993
msgid "Both --delete and a file list specified"
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6386
3997
msgid "Both --delete and --switch specified"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6389
4001
msgid "Deleted all views.\n"
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6391
4005
msgid "No current view to delete"
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:6394
4009
#, python-format
4010
msgid "Deleted '%s' view.\n"
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6398
4014
msgid "Both --switch and a file list specified"
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6401
4018
msgid "Both --switch and --all specified"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:6404
4022
msgid "No current view to disable"
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:6406
4026
#, python-format
4027
msgid "Disabled '%s' view.\n"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
4031
msgid "Using '{0}' view: {1}\n"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6413
4035
msgid "Views defined:\n"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6422
4039
msgid "No views defined.\n"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6429
4043
msgid "Cannot change the 'off' pseudo view"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6437
4047
msgid "No current view.\n"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6440
4051
msgid "'{0}' view is: {1}\n"
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6460
4055
msgid " <no hooks installed>\n"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6464
4059
msgid "Remove a branch."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6466
4063
msgid ""
4064
"This will remove the branch from the specified location but \n"
4065
"will keep any working tree or repository in place."
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6471
4069
msgid " Remove the branch at repo/trunk::"
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6473
4073
msgid " bzr remove-branch repo/trunk"
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6480
4077
msgid "Remove branch even if it is the active branch."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6494
4081
msgid "Branch is active. Use --force to remove it."
4082
msgstr ""
4083
4084
#: bzrlib/builtins.py:6498
4085
msgid "Plaintext diff output."
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6499
4089
msgid "Temporarily set aside some changes from the current tree."
4090
msgstr ""
4091
4092
#: bzrlib/builtins.py:6501
4093
msgid ""
4094
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4095
"ie. out of the way, until a later time when you can bring them back from\n"
4096
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4097
"your working tree, and so they aren't propagated along with your branch nor\n"
4098
"will they survive its deletion."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6507
4102
msgid "If shelve --list is specified, previously-shelved changes are listed."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6509
4106
msgid ""
4107
"Shelve is intended to help separate several sets of changes that have\n"
4108
"been inappropriately mingled. If you just want to get rid of all changes\n"
4109
"and you don't need to restore them later, use revert. If you want to\n"
4110
"shelve all text changes at once, use shelve --all."
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:6514
4114
msgid ""
4115
"If filenames are specified, only the changes to those files will be\n"
4116
"shelved. Other files will be left untouched."
4117
msgstr ""
4118
4119
#: bzrlib/builtins.py:6517
4120
msgid ""
4121
"If a revision is specified, changes since that revision will be shelved."
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:6519
4125
msgid ""
4126
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4127
"restore the most recently shelved changes."
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6522
4131
msgid ""
4132
"For complicated changes, it is possible to edit the changes in a separate\n"
4133
"editor program to decide what the file remaining in the working copy\n"
4134
"should look like. To do this, add the configuration option"
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6526
4138
msgid " change_editor = PROGRAM @new_path @old_path"
4139
msgstr ""
4140
4141
#: bzrlib/builtins.py:6528
4142
msgid ""
4143
"where @new_path is replaced with the path of the new version of the \n"
4144
"file and @old_path is replaced with the path of the old version of \n"
4145
"the file. The PROGRAM should save the new file with the desired \n"
4146
"contents of the file in the working tree.\n"
4147
" "
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6540
4151
msgid "Shelve all changes."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6542
4155
msgid "Method to use for writing diffs."
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6542
4159
msgid "writer"
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6546
4163
msgid "List shelved changes."
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6548
4167
msgid "Destroy removed changes instead of shelving them."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6577
4171
msgid "No shelved changes."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6588
4175
msgid "Restore shelved changes."
4176
msgstr ""
4177
4178
#: bzrlib/builtins.py:6590
4179
msgid ""
4180
"By default, the most recently shelved changes are restored. However if you\n"
4181
"specify a shelf by id those changes will be restored instead. This works\n"
4182
"best when the changes don't depend on each other."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6599
4186
msgid "The action to perform."
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
4190
msgid "action"
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6601
4194
msgid "Apply changes and remove from the shelf."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6602
4198
msgid "Show changes, but do not apply or remove them."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6603
4202
msgid ""
4203
"Instead of unshelving the changes, show the diff that would result from "
4204
"unshelving."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6605
4208
msgid "Delete changes without applying them."
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:6606
4212
msgid "Apply changes but don't delete them."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6621
4216
msgid "Remove unwanted files from working tree."
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:6623
4220
msgid ""
4221
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4222
"files are never deleted."
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:6626
4226
msgid ""
4227
"Another class is 'detritus', which includes files emitted by bzr during\n"
4228
"normal operations and selftests. (The value of these files decreases with\n"
4229
"time.)"
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6630
4233
msgid ""
4234
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4235
"flags are respected, and may be combined."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6633
4239
msgid "To check what clean-tree will do, use --dry-run."
4240
msgstr ""
4241
4242
#: bzrlib/builtins.py:6636
4243
msgid "Delete all ignored files."
4244
msgstr ""
4245
4246
#: bzrlib/builtins.py:6637
4247
msgid ""
4248
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4249
msgstr ""
4250
4251
#: bzrlib/builtins.py:6640
4252
msgid "Delete files unknown to bzr (default)."
4253
msgstr ""
4254
4255
#: bzrlib/builtins.py:6641
4256
msgid "Show files to delete instead of deleting them."
4257
msgstr ""
4258
4259
#: bzrlib/builtins.py:6643
4260
msgid "Do not prompt before deleting."
4261
msgstr ""
4262
4263
#: bzrlib/bundle/__init__.py:59
4264
msgid "A directory cannot be a bundle"
4265
msgstr ""
4266
4267
#: bzrlib/bundle/apply_bundle.py:40
4268
msgid "Install revisions"
4269
msgstr ""
4270
4271
#: bzrlib/bundle/commands.py:64
4272
msgid "--verbose requires a merge directive"
4273
msgstr ""
4274
4275
#: bzrlib/bundle/commands.py:67
4276
msgid "Bundle format not supported"
4277
msgstr ""
4278
4279
#: bzrlib/bundle/commands.py:77
4280
msgid "Records\n"
4281
msgstr ""
4282
4283
#: bzrlib/bundle/commands.py:81
4284
msgid "{0}: {1} ({2} multiparent)\n"
4285
msgstr ""
4286
4287
#: bzrlib/bundle/commands.py:83
4288
#, python-format
4289
msgid "unique files: %d\n"
4290
msgstr ""
4291
4292
#: bzrlib/bundle/commands.py:92
4293
msgid "Revisions\n"
4294
msgstr ""
4295
4296
#: bzrlib/bundle/commands.py:93
4297
#, python-format
4298
msgid "nicks: %s\n"
4299
msgstr ""
4300
4301
#: bzrlib/bundle/commands.py:95
4302
#, python-format
4303
msgid ""
4304
"committers: \n"
4305
"%s\n"
4306
msgstr ""
4307
4308
#: bzrlib/bundle/commands.py:103
4309
msgid "Decoded contents\n"
4310
msgstr ""
4311
4312
#: bzrlib/bundle/serializer/v4.py:327
4313
#, python-format
4314
msgid "Bundling %d revision."
4315
msgid_plural "Bundling %d revisions."
4316
msgstr[0] ""
4317
msgstr[1] ""
4318
4319
#: bzrlib/bzrdir.py:487
4320
msgid ""
4321
"making backup of {0}\n"
4322
" to {1}"
4323
msgstr ""
4324
4325
#: bzrlib/bzrdir.py:510
4326
msgid "renamed {0} to {1}"
4327
msgstr ""
4328
4329
#: bzrlib/bzrdir.py:1639
4330
#, python-format
4331
msgid ""
4332
"Source repository format does not support stacking, using format:\n"
4333
" %s"
4334
msgstr ""
4335
4336
#: bzrlib/bzrdir.py:1659
4337
#, python-format
4338
msgid ""
4339
"Source branch format does not support stacking, using format:\n"
4340
" %s"
4341
msgstr ""
4342
4343
#: bzrlib/bzrdir.py:1805
4344
msgid "starting repository conversion"
4345
msgstr ""
4346
4347
#: bzrlib/bzrdir.py:2026
4348
msgid "Using default stacking branch {0} at {1}"
4349
msgstr ""
4350
4351
#: bzrlib/check.py:108
4352
msgid "check"
4353
msgstr ""
4354
4355
#: bzrlib/check.py:110
4356
msgid "checking revisions"
4357
msgstr ""
4358
4359
#: bzrlib/check.py:112
4360
msgid "checking commit contents"
4361
msgstr ""
4362
4363
#: bzrlib/check.py:114
4364
msgid "checking file graphs"
4365
msgstr ""
4366
4367
#: bzrlib/check.py:118
4368
msgid "checking branches and trees"
4369
msgstr ""
4370
4371
#: bzrlib/check.py:205
4372
msgid "checked repository {0} format {1}"
4373
msgstr ""
4374
4375
#: bzrlib/check.py:208
4376
#, python-format
4377
msgid "%6d revisions"
4378
msgstr ""
4379
4380
#: bzrlib/check.py:209
4381
#, python-format
4382
msgid "%6d file-ids"
4383
msgstr ""
4384
4385
#: bzrlib/check.py:211
4386
#, python-format
4387
msgid "%6d unreferenced text versions"
4388
msgstr ""
4389
4390
#: bzrlib/check.py:215
4391
msgid "unreferenced version: {{{0}}} in {1}"
4392
msgstr ""
4393
4394
#: bzrlib/check.py:218
4395
#, python-format
4396
msgid "%6d revisions are missing inventory_sha1"
4397
msgstr ""
4398
4399
#: bzrlib/check.py:221
4400
#, python-format
4401
msgid "%6d revisions are mentioned but not present"
4402
msgstr ""
4403
4404
#: bzrlib/check.py:224
4405
#, python-format
4406
msgid "%6d ghost revisions"
4407
msgstr ""
4408
4409
#: bzrlib/check.py:229
4410
#, python-format
4411
msgid "%6d revisions missing parents in ancestry"
4412
msgstr ""
4413
4414
#: bzrlib/check.py:233
4415
#, python-format
4416
msgid " %s should be in the ancestry for:"
4417
msgstr ""
4418
4419
#: bzrlib/check.py:237
4420
#, python-format
4421
msgid "%6d inconsistent parents"
4422
msgstr ""
4423
4424
#: bzrlib/check.py:241
4425
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4426
msgstr ""
4427
4428
#: bzrlib/check.py:247
4429
#, python-format
4430
msgid "%6d revisions have incorrect parents in the revision index"
4431
msgstr ""
4432
4433
#: bzrlib/check.py:253
4434
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4435
msgstr ""
4436
4437
#: bzrlib/check.py:267
4438
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4439
msgstr ""
4440
4441
#: bzrlib/check.py:296
4442
msgid ""
4443
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4444
"{{{4}}}"
4445
msgstr ""
4446
4447
#: bzrlib/check.py:354
4448
#, python-format
4449
msgid "Checking branch at '%s'."
4450
msgstr ""
4451
4452
#: bzrlib/check.py:374
4453
#, python-format
4454
msgid "Checking working tree at '%s'."
4455
msgstr ""
4456
4457
#: bzrlib/check.py:427 bzrlib/check.py:441
4458
msgid "No branch found at specified location."
4459
msgstr ""
4460
4461
#: bzrlib/check.py:429 bzrlib/check.py:439
4462
msgid "No working tree found at specified location."
4463
msgstr ""
4464
4465
#: bzrlib/check.py:432
4466
#, python-format
4467
msgid "Checking repository at '%s'."
4468
msgstr ""
4469
4470
#: bzrlib/check.py:443
4471
msgid "No repository found at specified location."
4472
msgstr ""
4473
4474
#: bzrlib/clean_tree.py:63
4475
msgid "Nothing to delete."
4476
msgstr ""
4477
4478
#: bzrlib/clean_tree.py:68
4479
msgid "Are you sure you wish to delete these"
4480
msgstr ""
4481
4482
#: bzrlib/clean_tree.py:70
4483
msgid "Canceled"
4484
msgstr ""
4485
4486
#: bzrlib/clean_tree.py:107
4487
#, python-format
4488
msgid "unable to remove %s"
4489
msgstr ""
4490
4491
#: bzrlib/clean_tree.py:111
4492
msgid "deleting paths:"
4493
msgstr ""
4494
4495
#: bzrlib/clean_tree.py:125
4496
msgid "unable to remove \"{0}\": {1}."
4497
msgstr ""
4498
4499
#: bzrlib/clean_tree.py:130
4500
msgid "No files deleted."
4501
msgstr ""
4502
4503
#: bzrlib/cmd_version_info.py:47
4504
msgid "No known version info format {0}. Supported types are: {1}"
4505
msgstr ""
4506
4507
#: bzrlib/cmd_version_info.py:52
4508
msgid "Version info in Custom template-based format."
4509
msgstr ""
4510
4511
#: bzrlib/cmd_version_info.py:52
4512
msgid "Version info in Python format."
4513
msgstr ""
4514
4515
#: bzrlib/cmd_version_info.py:52
4516
msgid "Version info in RIO (simple text) format (default)."
4517
msgstr ""
4518
4519
#: bzrlib/cmd_version_info.py:53
4520
msgid "Show version information about this tree."
4521
msgstr ""
4522
4523
#: bzrlib/cmd_version_info.py:55
4524
msgid ""
4525
"You can use this command to add information about version into\n"
4526
"source code of an application. The output can be in one of the\n"
4527
"supported formats or in a custom format based on a template."
4528
msgstr ""
4529
4530
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4531
#: en/help_topics/configuration.txt:738
4532
msgid "For example::"
4533
msgstr ""
4534
4535
#: bzrlib/cmd_version_info.py:61
4536
msgid ""
4537
" bzr version-info --custom \\\n"
4538
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4539
msgstr ""
4540
4541
#: bzrlib/cmd_version_info.py:64
4542
msgid ""
4543
"will produce a C header file with formatted string containing the\n"
4544
"current revision number. Other supported variables in templates are:"
4545
msgstr ""
4546
4547
#: bzrlib/cmd_version_info.py:67
4548
msgid ""
4549
" * {date} - date of the last revision\n"
4550
" * {build_date} - current date\n"
4551
" * {revno} - revision number\n"
4552
" * {revision_id} - revision id\n"
4553
" * {branch_nick} - branch nickname\n"
4554
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4555
" otherwise 1"
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:77
4559
msgid "Select the output format."
4560
msgstr ""
4561
4562
#: bzrlib/cmd_version_info.py:81
4563
msgid "Include all possible information."
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:82
4567
msgid "Check if tree is clean."
4568
msgstr ""
4569
4570
#: bzrlib/cmd_version_info.py:84
4571
msgid "Include the revision-history."
4572
msgstr ""
4573
4574
#: bzrlib/cmd_version_info.py:86
4575
msgid "Include the last revision for each file."
4576
msgstr ""
4577
4578
#: bzrlib/cmd_version_info.py:87
4579
msgid "Template for the output."
4580
msgstr ""
4581
4582
#: bzrlib/cmd_version_info.py:101
4583
msgid "bzr version-info --revision takes exactly one revision specifier"
4584
msgstr ""
4585
4586
#: bzrlib/commands.py:229
4587
#, python-format
4588
msgid "unknown command \"%s\""
4589
msgstr ""
4590
4591
#: bzrlib/commands.py:476
4592
msgid "No help for this command."
4593
msgstr ""
4594
4595
#: bzrlib/commands.py:489
4596
#, python-format
4597
msgid ":Purpose: %s\n"
4598
msgstr ""
4599
4600
#: bzrlib/commands.py:491
4601
#, python-format
4602
msgid ""
4603
":Usage:\n"
4604
"%s\n"
4605
msgstr ""
4606
4607
#: bzrlib/commands.py:493
4608
#, python-format
4609
msgid ":Usage: %s\n"
4610
msgstr ""
4611
4612
#: bzrlib/commands.py:512
4613
#, python-format
4614
msgid ":Options:%s"
4615
msgstr ""
4616
4617
#: bzrlib/commands.py:523
4618
#, python-format
4619
msgid ""
4620
":Description:\n"
4621
" %s\n"
4622
"\n"
4623
msgstr ""
4624
4625
#: bzrlib/commands.py:533
4626
#, python-format
4627
msgid ""
4628
"See bzr help %s for more details and examples.\n"
4629
"\n"
4630
msgstr ""
4631
4632
#: bzrlib/commands.py:538
4633
msgid ":Aliases: "
4634
msgstr ""
4635
4636
#: bzrlib/commands.py:542
4637
#, python-format
4638
msgid ":From: plugin \"%s\"\n"
4639
msgstr ""
4640
4641
#: bzrlib/commands.py:554
4642
msgid ":doc:`{0} <{1}-help>`"
4643
msgstr ""
4644
4645
#: bzrlib/commands.py:558
4646
#, python-format
4647
msgid ":See also: %s"
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4651
msgid "Only ASCII permitted in option names"
4652
msgstr ""
4653
4654
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4655
msgid "command {0!r} needs one or more {1}"
4656
msgstr ""
4657
4658
#: bzrlib/commands.py:868
4659
msgid "command {0!r} requires argument {1}"
4660
msgstr ""
4661
4662
#: bzrlib/commands.py:875
4663
msgid "extra argument to command {0}: {1}"
4664
msgstr ""
4665
4666
#: bzrlib/commands.py:952
4667
#, python-format
4668
msgid "Profile data written to \"%s\"."
4669
msgstr ""
4670
4671
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4672
msgid "added"
4673
msgstr ""
4674
4675
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4676
msgid "modified"
4677
msgstr ""
4678
4679
#: bzrlib/commit.py:131
4680
#, python-format
4681
msgid "Committing%s"
4682
msgstr ""
4683
4684
#: bzrlib/commit.py:134
4685
#, python-format
4686
msgid "Committed revision %d."
4687
msgstr ""
4688
4689
#: bzrlib/commit.py:143
4690
#, python-format
4691
msgid "deleted %s"
4692
msgstr ""
4693
4694
#: bzrlib/commit.py:146
4695
#, python-format
4696
msgid "missing %s"
4697
msgstr ""
4698
4699
#: bzrlib/commit.py:511
4700
msgid ""
4701
"Conflicting tags in bound branch:\n"
4702
"{0}"
4703
msgstr ""
4704
4705
#: bzrlib/commit.py:742
4706
msgid "renamed"
4707
msgstr ""
4708
4709
#: bzrlib/commit.py:976
4710
msgid "unchanged"
4711
msgstr ""
4712
4713
#: bzrlib/commit.py:998
4714
msgid "{0} [{1}] - Stage"
4715
msgstr ""
4716
4717
#: bzrlib/commit.py:1001
4718
#, python-format
4719
msgid "%s - Stage"
4720
msgstr ""
4721
4722
#: bzrlib/commit_signature_commands.py:34
4723
msgid "Sign all commits by a given committer."
4724
msgstr ""
4725
4726
#: bzrlib/commit_signature_commands.py:36
4727
msgid ""
4728
"If location is not specified the local tree is used.\n"
4729
"If committer is not specified the default committer is used."
4730
msgstr ""
4731
4732
#: bzrlib/commit_signature_commands.py:39
4733
msgid "This does not sign commits that already have signatures."
4734
msgstr ""
4735
4736
#: bzrlib/commit_signature_commands.py:47
4737
msgid ""
4738
"Don't actually sign anything, just print the revisions that would be signed."
4739
msgstr ""
4740
4741
#: bzrlib/commit_signature_commands.py:98
4742
#, python-format
4743
msgid "Signed %d revision.\n"
4744
msgid_plural "Signed %d revisions.\n"
4745
msgstr[0] ""
4746
msgstr[1] ""
4747
4748
#: bzrlib/commit_signature_commands.py:103
4749
msgid "Verify all commit signatures."
4750
msgstr ""
4751
4752
#: bzrlib/commit_signature_commands.py:105
4753
msgid ""
4754
"Verifies that all commits in the branch are signed by known GnuPG keys."
4755
msgstr ""
4756
4757
#: bzrlib/commit_signature_commands.py:110
4758
msgid ""
4759
"Comma separated list of GPG key patterns which are acceptable for "
4760
"verification."
4761
msgstr ""
4762
4763
#: bzrlib/commit_signature_commands.py:148
4764
msgid "Cannot verify a range of non-revision-history revisions"
4765
msgstr ""
4766
4767
#: bzrlib/commit_signature_commands.py:166
4768
msgid "All commits signed with verifiable keys"
4769
msgstr ""
4770
4771
#: bzrlib/config.py:438
4772
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4773
msgstr ""
4774
4775
#: bzrlib/config.py:2468
4776
msgid "{0} is not an SI unit."
4777
msgstr ""
4778
4779
#: bzrlib/config.py:2989
4780
msgid ""
4781
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4782
"will be saved."
4783
msgstr ""
4784
4785
#: bzrlib/config.py:3134
4786
#, python-format
4787
msgid "Invalid '%s', should be of the form 'name=value'"
4788
msgstr ""
4789
4790
#: bzrlib/config.py:4089
4791
msgid "Display, set or remove a configuration option."
4792
msgstr ""
4793
4794
#: bzrlib/config.py:4091
4795
msgid "Display the active value for option NAME."
4796
msgstr ""
4797
4798
#: bzrlib/config.py:4093
4799
msgid ""
4800
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4801
"matching options are displayed mentioning their scope and without resolving\n"
4802
"option references in the value). The active value that bzr will take into\n"
4803
"account is the first one displayed for each option."
4804
msgstr ""
4805
4806
#: bzrlib/config.py:4098
4807
msgid ""
4808
"If NAME is not given, --all .* is implied (all options are displayed for "
4809
"the\n"
4810
"current scope)."
4811
msgstr ""
4812
4813
#: bzrlib/config.py:4101
4814
msgid ""
4815
"Setting a value is achieved by using NAME=value without spaces. The value\n"
4816
"is set in the most relevant scope and can be checked by displaying the\n"
4817
"option again."
4818
msgstr ""
4819
4820
#: bzrlib/config.py:4105
4821
msgid "Removing a value is achieved by using --remove NAME."
4822
msgstr ""
4823
4824
#: bzrlib/config.py:4115
4825
msgid "Reduce the scope to the specified configuration file."
4826
msgstr ""
4827
4828
#: bzrlib/config.py:4119
4829
msgid "Display all the defined values for the matching options."
4830
msgstr ""
4831
4832
#: bzrlib/config.py:4121
4833
msgid "Remove the option from the configuration file."
4834
msgstr ""
4835
4836
#: bzrlib/conflicts.py:50
4837
msgid "List files with conflicts."
4838
msgstr ""
4839
4840
#: bzrlib/conflicts.py:57
4841
msgid ""
4842
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4843
"is supplied, the pathnames of files with text conflicts are listed,\n"
4844
"instead. (This is useful for editing all files with text conflicts.)"
4845
msgstr ""
4846
4847
#: bzrlib/conflicts.py:61
4848
msgid "Use bzr resolve when you have fixed a problem."
4849
msgstr ""
4850
4851
#: bzrlib/conflicts.py:66
4852
msgid "List paths of files with text conflicts."
4853
msgstr ""
4854
4855
#: bzrlib/conflicts.py:85
4856
msgid "Marks the conflict as resolved."
4857
msgstr ""
4858
4859
#: bzrlib/conflicts.py:88
4860
msgid "Resolve the conflict preserving the version in the working tree."
4861
msgstr ""
4862
4863
#: bzrlib/conflicts.py:91
4864
msgid "Resolve the conflict taking the merged version into account."
4865
msgstr ""
4866
4867
#: bzrlib/conflicts.py:98
4868
msgid "How to resolve the conflict."
4869
msgstr ""
4870
4871
#: bzrlib/conflicts.py:104
4872
msgid "Mark a conflict as resolved."
4873
msgstr ""
4874
4875
#: bzrlib/conflicts.py:111
4876
msgid ""
4877
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4878
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4879
"as\n"
4880
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4881
msgstr ""
4882
4883
#: bzrlib/conflicts.py:119
4884
msgid "Resolve all conflicts in this tree."
4885
msgstr ""
4886
4887
#: bzrlib/conflicts.py:126
4888
msgid "If --all is specified, no FILE may be provided"
4889
msgstr ""
4890
4891
#: bzrlib/conflicts.py:151
4892
#, python-format
4893
msgid "%d conflict auto-resolved."
4894
msgid_plural "%d conflicts auto-resolved."
4895
msgstr[0] ""
4896
msgstr[1] ""
4897
4898
#: bzrlib/conflicts.py:154
4899
msgid "Remaining conflicts:"
4900
msgstr ""
4901
4902
#: bzrlib/conflicts.py:159
4903
msgid "All conflicts resolved."
4904
msgstr ""
4905
4906
#: bzrlib/conflicts.py:168
4907
msgid "{0} conflict resolved, {1} remaining"
4908
msgid_plural "{0} conflicts resolved, {1} remaining"
4909
msgstr[0] ""
4910
msgstr[1] ""
4911
4912
#: bzrlib/controldir.py:712
4913
msgid "{0} is{1} redirected to {2}"
4914
msgstr ""
4915
4916
#: bzrlib/diff.py:400
4917
#, python-format
4918
msgid "*** Ignoring files outside view. View is %s"
4919
msgstr ""
4920
4921
#: bzrlib/errors.py:157
4922
msgid "The tree builder is already building a tree."
4923
msgstr ""
4924
4925
#: bzrlib/errors.py:178
4926
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4927
msgstr ""
4928
4929
#: bzrlib/errors.py:197
4930
msgid ""
4931
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4932
"versions \"%(minimum)s\" to \"%(current)s\"."
4933
msgstr ""
4934
4935
#: bzrlib/errors.py:209
4936
msgid "The transport '%(transport)s' is only accessible within this process."
4937
msgstr ""
4938
4939
#: bzrlib/errors.py:227
4940
msgid "Invalid revision number %(revno)s"
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:236
4944
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:247
4948
msgid "Reserved revision-id {%(revision_id)s}"
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:261
4952
msgid "There is no public branch set for \"%(branch_url)s\"."
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:271
4956
msgid ""
4957
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4958
"obtain a list of topics."
4959
msgstr ""
4960
4961
#: bzrlib/errors.py:280
4962
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4963
msgstr ""
4964
4965
#: bzrlib/errors.py:290
4966
msgid ""
4967
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4968
msgstr ""
4969
4970
#: bzrlib/errors.py:299
4971
msgid "The branch '%(branch)s' is not stacked."
4972
msgstr ""
4973
4974
#: bzrlib/errors.py:313
4975
msgid "No WorkingTree exists for \"%(base)s\"."
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:322
4979
msgid "Not currently building a tree."
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:327
4983
msgid "%(url)s is not a local path."
4984
msgstr ""
4985
4986
#: bzrlib/errors.py:355
4987
msgid "%(not_locked)r is not write locked but needs to be."
4988
msgstr ""
4989
4990
#: bzrlib/errors.py:363
4991
msgid "Error in command line options"
4992
msgstr ""
4993
4994
#: bzrlib/errors.py:368
4995
msgid "%(value)s is not an index of type %(_type)s."
4996
msgstr ""
4997
4998
#: bzrlib/errors.py:378
4999
msgid "Error in data for index %(value)s."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:387
5003
msgid "The key '%(key)s' is already in index '%(index)s'."
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:397
5007
msgid "The key '%(key)s' is not a valid key."
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:406
5011
msgid "Could not parse options for index %(value)s."
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:415
5015
msgid "The value '%(value)s' is not a valid value."
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:424
5019
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:443
5023
msgid "Generic path error: %(path)r%(extra)s)"
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:456
5027
msgid "No such file: %(path)r%(extra)s"
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:461
5031
msgid "File exists: %(path)r%(extra)s"
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:467
5035
msgid ""
5036
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5037
"after to tell bzr about a rename that has already happened)%(extra)s"
5038
msgstr ""
5039
5040
#: bzrlib/errors.py:483
5041
msgid "\"%(path)s\" is not a directory %(extra)s"
5042
msgstr ""
5043
5044
#: bzrlib/errors.py:488
5045
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5046
msgstr ""
5047
5048
#: bzrlib/errors.py:493
5049
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:498
5053
msgid "Hard-linking \"%(path)s\" is not supported"
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:513
5057
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:518
5061
msgid "Permission denied: \"%(path)s\"%(extra)s"
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:523
5065
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:528
5069
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:539
5073
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5074
msgstr ""
5075
5076
#: bzrlib/errors.py:561
5077
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5078
msgstr ""
5079
5080
#: bzrlib/errors.py:571
5081
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5082
msgstr ""
5083
5084
#: bzrlib/errors.py:579
5085
msgid ""
5086
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5087
"upgrade the branch to permit branch stacking."
5088
msgstr ""
5089
5090
#: bzrlib/errors.py:590
5091
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5092
msgstr ""
5093
5094
#: bzrlib/errors.py:600
5095
msgid ""
5096
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5097
"need to upgrade the repository to permit branch stacking."
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:611
5101
msgid "Error reading from %(path)r."
5102
msgstr ""
5103
5104
#: bzrlib/errors.py:630
5105
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:646
5109
msgid "Path \"%(path)s\" is not unicode normalized"
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:654
5113
msgid "Not a branch: \"%(path)s\"%(detail)s."
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:696
5117
msgid "No submit branch available for branch \"%(path)s\""
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:705
5121
msgid "A control directory already exists: \"%(path)s\"."
5122
msgstr ""
5123
5124
#: bzrlib/errors.py:710
5125
msgid "Already a branch: \"%(path)s\"."
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:715
5129
msgid "Invalid branch name: %(name)s"
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:724
5133
msgid "Parent branch already exists: \"%(path)s\"."
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:730
5137
msgid ""
5138
"Directory contains a branch, but no working tree (use bzr checkout if you "
5139
"wish to build a working tree): \"%(path)s\""
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:735
5143
msgid ""
5144
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:745
5148
msgid ""
5149
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:755
5153
msgid "No repository present: \"%(path)s\""
5154
msgstr ""
5155
5156
#: bzrlib/errors.py:762
5157
msgid ""
5158
"Unsupported branch format: %(format)s\n"
5159
"Please run 'bzr upgrade'"
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:768
5163
msgid "Unknown %(kind)s format: %(format)r"
5164
msgstr ""
5165
5166
#: bzrlib/errors.py:777
5167
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5168
msgstr ""
5169
5170
#: bzrlib/errors.py:787
5171
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:802
5175
msgid ""
5176
"%(target)s\n"
5177
"is not compatible with\n"
5178
"%(source)s\n"
5179
"%(details)s"
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:818
5183
msgid "Revision is not compatible with %(repo_format)s"
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:828
5187
msgid "%(context_info)s%(path)s is already versioned."
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:849
5191
msgid "%(context_info)s%(path)s is not versioned."
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:870
5195
msgid "Path(s) are not versioned: %(paths_as_string)s"
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:881
5199
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:900
5203
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5204
msgstr ""
5205
5206
#: bzrlib/errors.py:908
5207
msgid ""
5208
"Filename %(filename)r is not valid in your current filesystem encoding "
5209
"%(fs_encoding)s"
5210
msgstr ""
5211
5212
#: bzrlib/errors.py:919
5213
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5214
msgstr ""
5215
5216
#: bzrlib/errors.py:937
5217
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5218
msgstr ""
5219
5220
#: bzrlib/errors.py:976
5221
msgid "Cannot lock %(lock)s: %(why)s"
5222
msgstr ""
5223
5224
#: bzrlib/errors.py:986
5225
msgid ""
5226
"A transaction related operation was attempted after the transaction finished."
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:1013
5230
msgid "Cannot lock: transport is read only: %(transport)s"
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:1021
5234
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:1032
5238
msgid ""
5239
"Lock was broken while still open: %(lock)s - check storage consistency!"
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:1043
5243
msgid ""
5244
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5245
"%(holder)r, wanted to break %(target)r"
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:1055
5249
msgid ""
5250
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5251
"Use 'bzr break-lock' to clear it"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1068
5255
msgid "Lock not held: %(lock)s"
5256
msgstr ""
5257
5258
#: bzrlib/errors.py:1097
5259
msgid "No changes to commit"
5260
msgstr ""
5261
5262
#: bzrlib/errors.py:1102
5263
msgid ""
5264
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:1112
5268
msgid ""
5269
"Excluding paths during commit is not supported by repository at "
5270
"%(repository)r."
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:1121
5274
msgid ""
5275
"The specified commit message contains characters unsupported by the current "
5276
"encoding."
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1127
5280
msgid "Upgrade URL cannot work with readonly URLs."
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:1132
5284
msgid "The branch format %(format)s is already at the most recent format."
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:1155
5288
msgid "Option --change does not accept revision ranges"
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:1160
5292
msgid "No namespace registered for string: %(spec)r"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:1179
5296
msgid ""
5297
"Requested revision: '%(spec)s' does not exist in branch: "
5298
"%(branch_url)s%(extra)s"
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:1193
5302
msgid ""
5303
"Operation denied because it would change the main history, which is not "
5304
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1204
5308
msgid ""
5309
"These branches have diverged. Use the missing command to see how.\n"
5310
"Use the merge command to reconcile them."
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:1224
5314
msgid ""
5315
"Branches have no common ancestor, and no merge base revision was specified."
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:1230
5319
msgid ""
5320
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:1236
5324
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:1245
5328
msgid ""
5329
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1254
5333
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1263
5337
msgid "Branch %(branch)s has no commits."
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1281
5341
msgid ""
5342
"Bound branch %(branch)s is out of date with master branch "
5343
"%(master)s.%(extra_help)s"
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1293
5347
msgid ""
5348
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5349
"bound to %(remote)s."
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:1305
5353
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5354
msgstr ""
5355
5356
#: bzrlib/errors.py:1314
5357
msgid ""
5358
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5359
"%(error)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1326
5363
msgid "Error in processing weave: %(msg)s"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1335
5367
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1346
5371
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1356
5375
msgid "Weave invariant violated: %(what)s"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1365
5379
msgid "Parents are mismatched between two revisions. %(msg)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1387
5383
msgid ""
5384
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5385
"%(weave_b)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1399
5389
msgid "Versioned file error"
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:1404
5393
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:1414
5397
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1424
5401
msgid "Text did not match its checksum: %(msg)s"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:1550
5405
msgid "Export format %(format)r not supported"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:1559
5409
msgid "Transport error: %(msg)s %(orig_error)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1585
5413
msgid "Generic bzr smart protocol error: %(details)s"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1593
5417
msgid "Received bad protocol version marker: %(marker)r"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:1625
5421
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:1630
5425
msgid "Connection error: %(msg)s %(orig_error)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1635
5429
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1656
5433
msgid "Connection closed: %(msg)s %(orig_error)s"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1661
5437
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1666
5441
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1676
5445
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1691
5449
msgid "Certificate error: %(error)s"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1699
5453
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:1713
5457
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:1721
5461
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:1730
5465
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:1744
5469
msgid "Too many redirections"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:1749
5473
msgid "Working tree has conflicts."
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:1753
5477
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:1762
5481
msgid ""
5482
"Error(s) parsing config file %(filename)s:\n"
5483
"%(errors)s"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:1772
5487
msgid ""
5488
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5489
"See ``bzr help %(name)s``"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1782
5493
msgid "%(username)r does not seem to contain a reasonable email address"
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:1791
5497
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5498
msgstr ""
5499
5500
#: bzrlib/errors.py:1799
5501
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1807
5505
msgid "Unable to import library \"%(library)s\": %(error)s"
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:1815
5509
msgid "python-gpgme is not installed, it is needed to verify signatures"
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:1823
5513
msgid ""
5514
"The working tree for %(basedir)s has changed since the last commit, but "
5515
"weave merge requires that it be unchanged"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:1833
5519
msgid ""
5520
"Can't reprocess and show base, because reprocessing obscures the "
5521
"relationship of conflicting lines to the base"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1839
5525
msgid "Cycle in graph %(graph)r"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1867
5529
msgid "File %(filename)s is not conflicted."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1889
5533
msgid "No bundle was found in \"%(filename)s\"."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1898
5537
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1908
5541
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1921
5545
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1931
5549
msgid "Key %(key)s is already present in map"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1936
5553
msgid "The prefix %(prefix)s is in the help search path twice."
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1946
5557
msgid ""
5558
"No final name for trans_id %(trans_id)r\n"
5559
"file-id: %(file_id)r\n"
5560
"root trans-id: %(root_trans_id)r\n"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1978
5564
msgid "Attempt to reuse a transform that has already been applied."
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:1983
5568
msgid "Moving the root directory is not supported at this time"
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:1988
5572
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5573
msgstr ""
5574
5575
#: bzrlib/errors.py:1999
5576
msgid ""
5577
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:2035
5581
msgid ""
5582
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:2065
5586
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:2073
5590
msgid "Nothing to merge."
5591
msgstr ""
5592
5593
#: bzrlib/errors.py:2078
5594
msgid "Format %(format)s cannot be initialised by this version of bzr."
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:2087
5598
msgid ""
5599
"Cannot convert from format %(from_format)s to format %(format)s. "
5600
"%(problem)s"
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:2099
5604
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5605
msgstr ""
5606
5607
#: bzrlib/errors.py:2107
5608
msgid "%(exe_name)s could not be found on this machine"
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:2115
5612
msgid "Diff is not installed on this machine: %(msg)s"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2123
5616
msgid "Diff3 is not installed on this machine."
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:2129
5620
msgid "The content being inserted is already present."
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:2134
5624
msgid ""
5625
"This tree contains left-over files from a failed operation.\n"
5626
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5627
"to\n"
5628
" keep, and delete it when you are done."
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:2145
5632
msgid ""
5633
"This tree contains left-over files from a failed operation.\n"
5634
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5635
" wish to keep, and delete it when you are done."
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:2155
5639
msgid ""
5640
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5641
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5642
"to\n"
5643
" keep, and delete it when you are done."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:2166
5647
msgid ""
5648
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5649
"examine %(pending_deletion)s to see if it contains any files you wish to "
5650
"keep, and delete it when you are done."
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:2176
5654
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5655
msgstr ""
5656
5657
#: bzrlib/errors.py:2190
5658
msgid ""
5659
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:2203
5663
msgid "Error in merge modified format"
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:2208
5667
msgid "Format error in conflict listings"
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:2212
5671
msgid ""
5672
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5673
"Error: %(description)s"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:2223
5677
msgid ""
5678
"An error has been detected in the repository %(repo_path)s.\n"
5679
"Please run bzr reconcile on this repository."
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2234
5683
msgid ""
5684
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5685
"reason: %(reason)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2247
5689
msgid ""
5690
"An inconsistent delta was supplied: %(delta)r\n"
5691
"reason: %(reason)s"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2259
5695
msgid "To use this feature you must upgrade your branch at %(path)s."
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2268
5699
msgid "To use this feature you must upgrade your repository at %(path)s."
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:2273
5703
msgid ""
5704
"To use this feature you must upgrade your branch at %(path)s to a format "
5705
"which supports rich roots."
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2279
5709
msgid "Cannot perform local-only commits on unbound branches."
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:2284
5713
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:2305
5717
msgid "Ghost tags not supported by format %(format)r."
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2313
5721
msgid "File is binary but should be text."
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:2318
5725
msgid "The path %(path)s is not permitted on this platform"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:2327
5729
msgid ""
5730
"Testament did not match expected value.\n"
5731
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5732
" {%(measured)s}"
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2339
5736
msgid "Not a bzr revision-bundle: %(text)r"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:2348
5740
msgid "Bad bzr revision-bundle: %(text)r"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:2357
5744
msgid "Malformed bzr revision-bundle header: %(text)r"
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2362
5748
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:2367
5752
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2372
5756
msgid "End of line marker was not \\n in bzr revision-bundle"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2382
5760
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2392
5764
msgid "Root class for inventory serialization errors"
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2396
5768
msgid ""
5769
"The inventory was not in the expected format:\n"
5770
" %(msg)s"
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2405
5774
msgid "This operation requires rich root data storage"
5775
msgstr ""
5776
5777
#: bzrlib/errors.py:2418
5778
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2427
5782
msgid ""
5783
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5784
"variable."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2434
5788
msgid ""
5789
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5790
"ghost at {%(ghost_revision_id)s}"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2444
5794
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5795
msgstr ""
5796
5797
#: bzrlib/errors.py:2495
5798
msgid ""
5799
"A merge directive must provide either a bundle or a public branch location."
5800
msgstr ""
5801
5802
#: bzrlib/errors.py:2502
5803
msgid "Bad merge directive payload %(start)r"
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:2512
5807
msgid "Preview patch does not match requested changes."
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2518
5811
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2528
5815
msgid ""
5816
"Your branch does not have all of the revisions required in order to merge "
5817
"this merge directive and the target location specified in the merge "
5818
"directive is not a branch: %(location)s."
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2540
5822
msgid "Unsupported entry kind %(kind)s"
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2548
5826
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2558
5830
msgid "Subsume target %(other_tree)s needs to be upgraded."
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2577
5834
msgid "No such tag: %(tag_name)s"
5835
msgstr ""
5836
5837
#: bzrlib/errors.py:2585
5838
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2594
5842
msgid "Tag %(tag_name)s already exists."
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:2602
5846
msgid ""
5847
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5848
"bugs\" for more information on this feature."
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2612
5852
msgid ""
5853
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2622
5857
msgid ""
5858
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2632
5862
msgid "Invalid line in bugs property: '%(line)s'"
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:2640
5866
msgid "Invalid bug status: '%(status)s'"
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2648
5870
msgid "Could not understand response from smart server: %(response_tuple)r"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2687
5874
msgid "Server sent an unexpected error: %(error_tuple)r"
5875
msgstr ""
5876
5877
#: bzrlib/errors.py:2706
5878
msgid "Unrecognised container format: %(container_format)r"
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2714
5882
msgid "Unexpected end of container stream"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2719
5886
msgid "Unknown record type: %(record_type)r"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2727
5890
msgid "Invalid record: %(reason)s"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2735
5894
msgid "Container has data after end marker: %(excess)r"
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2743
5898
msgid "Container has multiple records with the same name: %(name)s"
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2756
5902
msgid "Corrupt or incompatible data stream: %(reason)s"
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2764
5906
msgid "SMTP error: %(error)s"
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:2772
5910
msgid "No message supplied."
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2777
5914
msgid "No mail-to address (--mail-to) or output (-o) specified."
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2782
5918
msgid ""
5919
"Unable to find mail client with the following names: "
5920
"%(mail_command_list_string)s"
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2792
5924
msgid "SMTP connection to %(host)s refused"
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:2801
5928
msgid "Please specify smtp_server. No server at default %(host)s."
5929
msgstr ""
5930
5931
#: bzrlib/errors.py:2815
5932
msgid ""
5933
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5934
"reconfigure."
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2827
5938
msgid "'%(display_url)s' is already a branch."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2832
5942
msgid "'%(display_url)s' is already a tree."
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2837
5946
msgid "'%(display_url)s' is already a checkout."
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2842
5950
msgid "'%(display_url)s' is already a lightweight checkout."
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2847
5954
msgid "'%(display_url)s' is already using a shared repository."
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:2852
5958
msgid "'%(display_url)s' is already standalone."
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2857
5962
msgid "Shared repository '%(display_url)s' already creates working trees."
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2863
5966
msgid ""
5967
"Shared repository '%(display_url)s' already doesn't create working trees."
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2869
5971
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2874
5975
msgid "No location could be found to bind to at %(display_url)s."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2879
5979
msgid ""
5980
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5981
"status).%(more)s"
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2898
5985
msgid ""
5986
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
5987
msgstr ""
5988
5989
#: bzrlib/errors.py:2913
5990
msgid ""
5991
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5992
"list).%(more)s"
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:2919
5996
msgid "Variable {%(name)s} is not available."
5997
msgstr ""
5998
5999
#: bzrlib/errors.py:2927
6000
msgid "No template specified."
6001
msgstr ""
6002
6003
#: bzrlib/errors.py:2932
6004
msgid "Unable to create symlink %(path_str)son this platform"
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:2947
6008
msgid ""
6009
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6010
"\"original\", \"local\"."
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:2981
6014
msgid ""
6015
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2993
6019
msgid "The \"%(config_id)s\" configuration does not exist."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:3001
6023
msgid "The \"%(option_name)s\" configuration option does not exist."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:3009
6027
msgid "The alias \"%(alias_name)s\" does not exist."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:3023
6031
msgid "\"%(alias_name)s\" is not a valid location alias."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:3031
6035
msgid "No %(alias_name)s location assigned."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:3039
6039
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:3049
6043
msgid "Unknown rules detected: %(unknowns_str)s."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3060
6047
msgid "Tip change rejected: %(msg)s"
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3068
6051
msgid "Shelf corrupt."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3073
6055
msgid "Corruption while decompressing repository file%(orig_error)s"
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3085
6059
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3093
6063
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3101
6067
msgid ""
6068
"An attempt to access a url outside the server jail was made: '%(url)s'."
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:3109
6072
msgid "The user aborted the operation."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:3114
6076
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:3124
6080
msgid "No such view: %(view_name)s."
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:3134
6084
msgid ""
6085
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6086
"to a later format."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:3143
6090
msgid ""
6091
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:3210
6095
msgid "%(bzrdir)r does not support co-located branches."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3216
6099
msgid ""
6100
"Unable to determine your name.\n"
6101
"Please, set your name with the 'whoami' command.\n"
6102
"E.g. bzr whoami \"Your Name <name@example.com>\""
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3225
6106
msgid "Invalid pattern(s) found. %(msg)s"
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:3233
6110
msgid ""
6111
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6112
"unbind` to fix."
6113
msgstr ""
6114
6115
#: bzrlib/errors.py:3244
6116
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6117
msgstr ""
6118
6119
#: bzrlib/errors.py:3253
6120
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6121
msgstr ""
6122
6123
#: bzrlib/errors.py:3262
6124
msgid ""
6125
"No compatible object available for operations from %(source)r to %(target)r."
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:3272
6129
msgid ""
6130
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6131
"%(arguments)s."
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:3282
6135
msgid ""
6136
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6137
"format %(format)r"
6138
msgstr ""
6139
6140
#: bzrlib/errors.py:3294
6141
msgid ""
6142
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6143
"plugin."
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:3307
6147
msgid "Binary files section encountered."
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:3315
6151
msgid ""
6152
"Malformed patch header. %(desc)s\n"
6153
"%(line)r"
6154
msgstr ""
6155
6156
#: bzrlib/errors.py:3324
6157
msgid ""
6158
"Malformed hunk header. %(desc)s\n"
6159
"%(line)r"
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:3333
6163
msgid ""
6164
"Malformed line. %(desc)s\n"
6165
"%(line)r"
6166
msgstr ""
6167
6168
#: bzrlib/errors.py:3343
6169
msgid ""
6170
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6171
"but patch says it should be \"%(patch_line)s\""
6172
msgstr ""
6173
6174
#: bzrlib/errors.py:3354
6175
msgid "The feature %(feature)s has already been registered."
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:3362
6179
msgid ""
6180
"Cannot store uncommitted changes because this branch already stores "
6181
"uncommitted changes."
6182
msgstr ""
6183
6184
#: bzrlib/export_pot.py:252
6185
#, python-format
6186
msgid "Exporting messages from builtin command: %s"
6187
msgstr ""
6188
6189
#: bzrlib/export_pot.py:271
6190
msgid "Exporting messages from plugin command: {0} in {1}"
6191
msgstr ""
6192
6193
#: bzrlib/export_pot.py:292
6194
#, python-format
6195
msgid "Exporting message from error: %s"
6196
msgstr ""
6197
6198
#: bzrlib/fetch.py:98
6199
msgid "Finding revisions"
6200
msgstr ""
6201
6202
#: bzrlib/fetch.py:103
6203
msgid "Fetching revisions"
6204
msgstr ""
6205
6206
#: bzrlib/foreign.py:262
6207
msgid "Push into a different VCS without any custom bzr metadata."
6208
msgstr ""
6209
6210
#: bzrlib/foreign.py:264
6211
msgid ""
6212
"This will afterwards rebase the local branch on the remote\n"
6213
"branch unless the --no-rebase option is used, in which case \n"
6214
"the two branches will be out of sync after the push. "
6215
msgstr ""
6216
6217
#: bzrlib/foreign.py:277
6218
msgid "Do not rebase after push."
6219
msgstr ""
6220
6221
#: bzrlib/foreign.py:311
6222
#, python-format
6223
msgid "Using saved location: %s\n"
6224
msgstr ""
6225
6226
#: bzrlib/foreign.py:321
6227
msgid ""
6228
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6229
"regular push."
6230
msgstr ""
6231
6232
#: bzrlib/gpg.py:366
6233
msgid "No GnuPG key results for pattern: {0}"
6234
msgstr ""
6235
6236
#: bzrlib/gpg.py:439
6237
msgid "{0} commits with valid signatures"
6238
msgstr ""
6239
6240
#: bzrlib/gpg.py:445
6241
msgid "{0} commit with unknown key"
6242
msgid_plural "{0} commits with unknown keys"
6243
msgstr[0] ""
6244
msgstr[1] ""
6245
6246
#: bzrlib/gpg.py:453
6247
msgid "{0} commit not valid"
6248
msgid_plural "{0} commits not valid"
6249
msgstr[0] ""
6250
msgstr[1] ""
6251
6252
#: bzrlib/gpg.py:461
6253
msgid "{0} commit not signed"
6254
msgid_plural "{0} commits not signed"
6255
msgstr[0] ""
6256
msgstr[1] ""
6257
6258
#: bzrlib/gpg.py:469
6259
msgid "{0} commit with key now expired"
6260
msgid_plural "{0} commits with key now expired"
6261
msgstr[0] ""
6262
msgstr[1] ""
6263
6264
#: bzrlib/gpg.py:489
6265
msgid "{0} commit by author {1} with key {2} now expired"
6266
msgid_plural "{0} commits by author {1} with key {2} now expired"
6267
msgstr[0] ""
6268
msgstr[1] ""
6269
6270
#: bzrlib/gpg.py:505
6271
msgid "{0} signed {1} commit"
6272
msgid_plural "{0} signed {1} commits"
6273
msgstr[0] ""
6274
msgstr[1] ""
6275
6276
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6277
msgid "{0} commit by author {1}"
6278
msgid_plural "{0} commits by author {1}"
6279
msgstr[0] ""
6280
msgstr[1] ""
6281
6282
#: bzrlib/gpg.py:554
6283
msgid "Unknown key {0} signed {1} commit"
6284
msgid_plural "Unknown key {0} signed {1} commits"
6285
msgstr[0] ""
6286
msgstr[1] ""
6287
6288
#: bzrlib/groupcompress.py:1739
6289
#, python-format
6290
msgid "Insert claimed random_id=True, but then inserted %r two times"
6291
msgstr ""
6292
6293
#: bzrlib/hooks.py:313
6294
#, python-format
6295
msgid "Introduced in: %s"
6296
msgstr ""
6297
6298
#: bzrlib/hooks.py:316
6299
#, python-format
6300
msgid "Deprecated in: %s"
6301
msgstr ""
6302
6303
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6304
msgid "Walking content"
6305
msgstr ""
6306
6307
#: bzrlib/knit.py:3330
6308
msgid "annotating"
6309
msgstr ""
6310
6311
#: bzrlib/lock.py:549
6312
msgid "{0!r} was {1} locked again"
6313
msgstr ""
6314
6315
#: bzrlib/lockdir.py:321
6316
#, python-format
6317
msgid "error removing pending lock: %s"
6318
msgstr ""
6319
6320
#: bzrlib/lockdir.py:616
6321
msgid "Unable to obtain"
6322
msgstr ""
6323
6324
#: bzrlib/lockdir.py:618
6325
msgid "Lock owner changed for"
6326
msgstr ""
6327
6328
#: bzrlib/lockdir.py:620
6329
msgid "{0} lock {1} {2}."
6330
msgstr ""
6331
6332
#: bzrlib/lockdir.py:627
6333
#, python-format
6334
msgid "Will continue to try until %s, unless you press Ctrl-C."
6335
msgstr ""
6336
6337
#: bzrlib/lockdir.py:629
6338
msgid "See \"bzr help break-lock\" for more."
6339
msgstr ""
6340
6341
#: bzrlib/lockdir.py:739
6342
#, python-format
6343
msgid ""
6344
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6345
msgstr ""
6346
6347
#: bzrlib/log.py:563
6348
msgid "--exclude-common-ancestry requires two different revisions"
6349
msgstr ""
6350
6351
#: bzrlib/log.py:565
6352
#, python-format
6353
msgid "invalid direction %r"
6354
msgstr ""
6355
6356
#: bzrlib/log.py:653
6357
msgid "Start revision not found in history of end revision."
6358
msgstr ""
6359
6360
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6361
msgid "Logging revision 0 is invalid."
6362
msgstr ""
6363
6364
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6365
msgid "Start revision must be older than the end revision."
6366
msgstr ""
6367
6368
#: bzrlib/log.py:1818
6369
#, python-format
6370
msgid "unknown log formatter: %r"
6371
msgstr ""
6372
6373
#: bzrlib/log.py:2114
6374
msgid "fixes bug"
6375
msgid_plural "fixes bugs"
6376
msgstr[0] ""
6377
msgstr[1] ""
6378
6379
#: bzrlib/merge.py:689
6380
msgid "All changes applied successfully."
6381
msgstr ""
6382
6383
#: bzrlib/merge.py:691
6384
#, python-format
6385
msgid "%d conflicts encountered."
6386
msgstr ""
6387
6388
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6389
msgid "Preparing file merge"
6390
msgstr ""
6391
6392
#: bzrlib/multiparent.py:426
6393
msgid "Importing revisions"
6394
msgstr ""
6395
6396
#: bzrlib/option.py:526
6397
msgid "Show help message."
6398
msgstr ""
6399
6400
#: bzrlib/option.py:528
6401
msgid "Only display errors and warnings."
6402
msgstr ""
6403
6404
#: bzrlib/option.py:531
6405
msgid "Show usage message and options."
6406
msgstr ""
6407
6408
#: bzrlib/option.py:533
6409
msgid "Display more information."
6410
msgstr ""
6411
6412
#: bzrlib/option.py:541
6413
msgid ""
6414
"Select changes introduced by the specified revision. See also \"help "
6415
"revisionspec\"."
6416
msgstr ""
6417
6418
#: bzrlib/option.py:543
6419
msgid "Branch to operate on, instead of working directory."
6420
msgstr ""
6421
6422
#: bzrlib/option.py:545
6423
msgid "Detailed log format."
6424
msgstr ""
6425
6426
#: bzrlib/option.py:545
6427
msgid "Format used by GNU ChangeLog files."
6428
msgstr ""
6429
6430
#: bzrlib/option.py:545
6431
msgid "Log format with one line per revision."
6432
msgstr ""
6433
6434
#: bzrlib/option.py:545
6435
msgid "Moderately short log format."
6436
msgstr ""
6437
6438
#: bzrlib/option.py:545
6439
msgid "Use specified log format."
6440
msgstr ""
6441
6442
#: bzrlib/option.py:547
6443
msgid "Log format"
6444
msgstr ""
6445
6446
#: bzrlib/option.py:549
6447
msgid "LCA-newness merge."
6448
msgstr ""
6449
6450
#: bzrlib/option.py:549
6451
msgid "Merge using external diff3."
6452
msgstr ""
6453
6454
#: bzrlib/option.py:549
6455
msgid "Native diff3-style merge."
6456
msgstr ""
6457
6458
#: bzrlib/option.py:549
6459
msgid "Select a particular merge algorithm."
6460
msgstr ""
6461
6462
#: bzrlib/option.py:549
6463
msgid "Weave-based merge."
6464
msgstr ""
6465
6466
#: bzrlib/option.py:551
6467
msgid "Merge algorithm"
6468
msgstr ""
6469
6470
#: bzrlib/option.py:554
6471
msgid "Message string."
6472
msgstr ""
6473
6474
#: bzrlib/option.py:556
6475
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6476
msgstr ""
6477
6478
#: bzrlib/option.py:558
6479
msgid "Ignore differences between branches and overwrite unconditionally."
6480
msgstr ""
6481
6482
#: bzrlib/option.py:560
6483
msgid "Remember the specified location as a default."
6484
msgstr ""
6485
6486
#: bzrlib/option.py:562
6487
msgid "Reprocess to reduce spurious conflicts."
6488
msgstr ""
6489
6490
#: bzrlib/option.py:566
6491
msgid "See \"help revisionspec\" for details."
6492
msgstr ""
6493
6494
#: bzrlib/option.py:568
6495
msgid "Show internal object ids."
6496
msgstr ""
6497
6498
#: bzrlib/option.py:571
6499
msgid "Display timezone as local, original, or utc."
6500
msgstr ""
6501
6502
#: bzrlib/osutils.py:100
6503
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6504
msgstr ""
6505
6506
#: bzrlib/osutils.py:220
6507
msgid "lstat/stat of ({0!r}): {1!r}"
6508
msgstr ""
6509
6510
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6511
#, python-format
6512
msgid "sorry, %r not allowed in path"
6513
msgstr ""
6514
6515
#: bzrlib/osutils.py:1259
6516
#, python-format
6517
msgid "%r is too short to calculate a relative path"
6518
msgstr ""
6519
6520
#: bzrlib/plugin.py:143
6521
#, python-format
6522
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6523
msgstr ""
6524
6525
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6526
msgid "Enable completions for the selected plugin (default: all plugins)"
6527
msgstr ""
6528
6529
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6530
msgid "Generate a shell function for bash command line completion."
6531
msgstr ""
6532
6533
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6534
msgid ""
6535
"This command generates a shell function which can be used by bash to\n"
6536
"automatically complete the currently typed command when the user presses\n"
6537
"the completion key (usually tab)."
6538
msgstr ""
6539
6540
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6541
msgid ""
6542
"Commonly used like this:\n"
6543
" eval \"`bzr bash-completion`\""
6544
msgstr ""
6545
6546
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6547
msgid "Name of the generated function (default: _bzr)"
6548
msgstr ""
6549
6550
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6551
msgid "Generate only the shell function, don't enable it"
6552
msgstr ""
6553
6554
#: bzrlib/plugins/grep/cmds.py:77
6555
msgid "Print lines matching PATTERN for specified files and revisions."
6556
msgstr ""
6557
6558
#: bzrlib/plugins/grep/cmds.py:79
6559
msgid ""
6560
"This command searches the specified files and revisions for a given\n"
6561
"pattern. The pattern is specified as a Python regular expressions[1]."
6562
msgstr ""
6563
6564
#: bzrlib/plugins/grep/cmds.py:82
6565
msgid ""
6566
"If the file name is not specified, the revisions starting with the\n"
6567
"current directory are searched recursively. If the revision number is\n"
6568
"not specified, the working copy is searched. To search the last committed\n"
6569
"revision, use the '-r -1' or '-r last:1' option."
6570
msgstr ""
6571
6572
#: bzrlib/plugins/grep/cmds.py:87
6573
msgid ""
6574
"Unversioned files are not searched unless explicitly specified on the\n"
6575
"command line. Unversioned directores are not searched."
6576
msgstr ""
6577
6578
#: bzrlib/plugins/grep/cmds.py:90
6579
msgid ""
6580
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6581
"format. If a revision is explicitly searched, the output is shown as\n"
6582
"'filepath~N:string', where N is the revision number."
6583
msgstr ""
6584
6585
#: bzrlib/plugins/grep/cmds.py:94
6586
msgid ""
6587
"--include and --exclude options can be used to search only (or exclude\n"
6588
"from search) files with base name matches the specified Unix style GLOB\n"
6589
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6590
"to quote wildcard or backslash character literally. Note that the glob\n"
6591
"pattern is not a regular expression."
6592
msgstr ""
6593
6594
#: bzrlib/plugins/grep/cmds.py:100
6595
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6596
msgstr ""
6597
6598
#: bzrlib/plugins/grep/cmds.py:109
6599
msgid "Show match in color. WHEN is never, always or auto."
6600
msgstr ""
6601
6602
#: bzrlib/plugins/grep/cmds.py:111
6603
msgid "Grep for pattern in changeset for each revision."
6604
msgstr ""
6605
6606
#: bzrlib/plugins/grep/cmds.py:113
6607
msgid "Skip files whose base name matches GLOB."
6608
msgstr ""
6609
6610
#: bzrlib/plugins/grep/cmds.py:115
6611
msgid "Search only files whose base name matches GLOB."
6612
msgstr ""
6613
6614
#: bzrlib/plugins/grep/cmds.py:117
6615
msgid "Print only the name of each input file in which PATTERN is found."
6616
msgstr ""
6617
6618
#: bzrlib/plugins/grep/cmds.py:120
6619
msgid "Print only the name of each input file in which PATTERN is not found."
6620
msgstr ""
6621
6622
#: bzrlib/plugins/grep/cmds.py:123
6623
msgid "Interpret PATTERN is a single fixed string (not regex)."
6624
msgstr ""
6625
6626
#: bzrlib/plugins/grep/cmds.py:125
6627
msgid ""
6628
"Search for pattern starting from the root of the branch. (implies --"
6629
"recursive)"
6630
msgstr ""
6631
6632
#: bzrlib/plugins/grep/cmds.py:128
6633
msgid "ignore case distinctions while matching."
6634
msgstr ""
6635
6636
#: bzrlib/plugins/grep/cmds.py:130
6637
msgid ""
6638
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6639
msgstr ""
6640
6641
#: bzrlib/plugins/grep/cmds.py:135
6642
msgid "show 1-based line number."
6643
msgstr ""
6644
6645
#: bzrlib/plugins/grep/cmds.py:137
6646
msgid "Don't recurse into subdirectories. (default is --recursive)"
6647
msgstr ""
6648
6649
#: bzrlib/plugins/grep/cmds.py:139
6650
msgid ""
6651
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6652
"newline."
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/account.py:66
6656
msgid "Setting ssh/sftp usernames for launchpad.net."
6657
msgstr ""
6658
6659
#: bzrlib/plugins/launchpad/cmds.py:43
6660
msgid "Register a branch with launchpad.net."
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/cmds.py:45
6664
msgid ""
6665
"This command lists a bzr branch in the directory of branches on\n"
6666
"launchpad.net. Registration allows the branch to be associated with\n"
6667
"bugs or specifications."
6668
msgstr ""
6669
6670
#: bzrlib/plugins/launchpad/cmds.py:49
6671
msgid ""
6672
"Before using this command you must register the project to which the\n"
6673
"branch belongs, and create an account for yourself on launchpad.net."
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/cmds.py:52
6677
msgid ""
6678
"arguments:\n"
6679
" public_url: The publicly visible url for the branch to register.\n"
6680
" This must be an http or https url (which Launchpad can read\n"
6681
" from to access the branch). Local file urls, SFTP urls, and\n"
6682
" bzr+ssh urls will not work.\n"
6683
" If no public_url is provided, bzr will use the configured\n"
6684
" public_url if there is one for the current branch, and\n"
6685
" otherwise error."
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/cmds.py:61
6689
msgid ""
6690
"example:\n"
6691
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6692
" --project fooproject"
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/cmds.py:68
6696
msgid "Launchpad project short name to associate with the branch."
6697
msgstr ""
6698
6699
#: bzrlib/plugins/launchpad/cmds.py:75
6700
msgid ""
6701
"Short name for the branch; by default taken from the last component of the "
6702
"url."
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/cmds.py:79
6706
msgid "One-sentence description of the branch."
6707
msgstr ""
6708
6709
#: bzrlib/plugins/launchpad/cmds.py:82
6710
msgid "Longer description of the purpose or contents of the branch."
6711
msgstr ""
6712
6713
#: bzrlib/plugins/launchpad/cmds.py:85
6714
msgid "Branch author's email address, if not yourself."
6715
msgstr ""
6716
6717
#: bzrlib/plugins/launchpad/cmds.py:88
6718
msgid "The bug this branch fixes."
6719
msgstr ""
6720
6721
#: bzrlib/plugins/launchpad/cmds.py:91
6722
msgid "Prepare the request but don't actually send it."
6723
msgstr ""
6724
6725
#: bzrlib/plugins/launchpad/cmds.py:113
6726
msgid ""
6727
"register-branch requires a public branch url - see bzr help register-branch."
6728
msgstr ""
6729
6730
#: bzrlib/plugins/launchpad/cmds.py:121
6731
msgid "--product is deprecated; please use --project."
6732
msgstr ""
6733
6734
#: bzrlib/plugins/launchpad/cmds.py:151
6735
msgid "Open a Launchpad branch page in your web browser."
6736
msgstr ""
6737
6738
#: bzrlib/plugins/launchpad/cmds.py:156
6739
msgid "Do not actually open the browser. Just say the URL we would use."
6740
msgstr ""
6741
6742
#: bzrlib/plugins/launchpad/cmds.py:191
6743
#, python-format
6744
msgid "Opening %s in web browser"
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/cmds.py:199
6748
msgid "Show or set the Launchpad user ID."
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/cmds.py:201
6752
msgid ""
6753
"When communicating with Launchpad, some commands need to know your\n"
6754
"Launchpad user ID. This command can be used to set or show the\n"
6755
"user ID that Bazaar will use for such communication."
6756
msgstr ""
6757
6758
#: bzrlib/plugins/launchpad/cmds.py:205
6759
msgid ""
6760
":Examples:\n"
6761
" Show the Launchpad ID of the current user::"
6762
msgstr ""
6763
6764
#: bzrlib/plugins/launchpad/cmds.py:208
6765
msgid " bzr launchpad-login"
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/cmds.py:210
6769
msgid " Set the Launchpad ID of the current user to 'bob'::"
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/cmds.py:212
6773
msgid " bzr launchpad-login bob"
6774
msgstr ""
6775
6776
#: bzrlib/plugins/launchpad/cmds.py:219
6777
msgid "Don't check that the user name is valid."
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
6781
msgid "Launchpad user ID exists and has SSH keys.\n"
6782
msgstr ""
6783
6784
#: bzrlib/plugins/launchpad/cmds.py:237
6785
msgid "No Launchpad user ID configured.\n"
6786
msgstr ""
6787
6788
#: bzrlib/plugins/launchpad/cmds.py:248
6789
#, python-format
6790
msgid "Launchpad user ID set to '%s'.\n"
6791
msgstr ""
6792
6793
#: bzrlib/plugins/launchpad/cmds.py:254
6794
msgid "Ask Launchpad to mirror a branch now."
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/cmds.py:271
6798
msgid "Propose merging a branch on Launchpad."
6799
msgstr ""
6800
6801
#: bzrlib/plugins/launchpad/cmds.py:273
6802
msgid ""
6803
"This will open your usual editor to provide the initial comment. When it\n"
6804
"has created the proposal, it will open it in your default web browser."
6805
msgstr ""
6806
6807
#: bzrlib/plugins/launchpad/cmds.py:276
6808
msgid ""
6809
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6810
"is not supplied, the remembered submit branch will be used. If no submit\n"
6811
"branch is remembered, the development focus will be used."
6812
msgstr ""
6813
6814
#: bzrlib/plugins/launchpad/cmds.py:280
6815
msgid ""
6816
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6817
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6818
"The parameter the launchpad account name of the desired reviewer. This\n"
6819
"may optionally be followed by '=' and the review type. For example:"
6820
msgstr ""
6821
6822
#: bzrlib/plugins/launchpad/cmds.py:285
6823
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6824
msgstr ""
6825
6826
#: bzrlib/plugins/launchpad/cmds.py:287
6827
msgid ""
6828
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6829
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/cmds.py:292
6833
msgid "Propose the merge on staging."
6834
msgstr ""
6835
6836
#: bzrlib/plugins/launchpad/cmds.py:294
6837
msgid "Commit message."
6838
msgstr ""
6839
6840
#: bzrlib/plugins/launchpad/cmds.py:296
6841
msgid ""
6842
"Mark the proposal as approved immediately, setting the approved revision to "
6843
"tip."
6844
msgstr ""
6845
6846
#: bzrlib/plugins/launchpad/cmds.py:298
6847
msgid "The bug this proposal fixes."
6848
msgstr ""
6849
6850
#: bzrlib/plugins/launchpad/cmds.py:300
6851
msgid "Requested reviewer and optional type."
6852
msgstr ""
6853
6854
#: bzrlib/plugins/launchpad/cmds.py:335
6855
msgid "Find the proposal to merge this revision."
6856
msgstr ""
6857
6858
#: bzrlib/plugins/launchpad/cmds.py:337
6859
msgid ""
6860
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6861
"This works only if the if the merged_revno was recorded for the merge\n"
6862
"proposal. The proposal(s) are opened in a web browser."
6863
msgstr ""
6864
6865
#: bzrlib/plugins/launchpad/cmds.py:341
6866
msgid ""
6867
"Only the revision specified is searched for. To find the mainline\n"
6868
"revision that merged it into mainline, use the \"mainline\" revision spec."
6869
msgstr ""
6870
6871
#: bzrlib/plugins/launchpad/cmds.py:344
6872
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6873
msgstr ""
6874
6875
#: bzrlib/plugins/launchpad/cmds.py:346
6876
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
6877
msgstr ""
6878
6879
#: bzrlib/plugins/launchpad/cmds.py:365
6880
msgid "No review found."
6881
msgstr ""
6882
6883
#: bzrlib/plugins/launchpad/cmds.py:366
6884
#, python-format
6885
msgid "%d proposals(s) found."
6886
msgstr ""
6887
6888
#: bzrlib/plugins/launchpad/cmds.py:378
6889
msgid "Finding proposals"
6890
msgstr ""
6891
6892
#: bzrlib/plugins/launchpad/lp_api.py:228
6893
#: bzrlib/plugins/launchpad/lp_api.py:233
6894
#, python-format
6895
msgid "%s is not registered on Launchpad"
6896
msgstr ""
6897
6898
#: bzrlib/plugins/launchpad/lp_api.py:243
6899
#, python-format
6900
msgid "%s has no development focus."
6901
msgstr ""
6902
6903
#: bzrlib/plugins/launchpad/lp_api.py:248
6904
#, python-format
6905
msgid "development focus %s has no branch."
6906
msgstr ""
6907
6908
#: bzrlib/plugins/launchpad/lp_api.py:253
6909
#, python-format
6910
msgid "source package %s has no branch."
6911
msgstr ""
6912
6913
#: bzrlib/plugins/launchpad/lp_api.py:257
6914
#, python-format
6915
msgid "%s has no associated product or source package."
6916
msgstr ""
6917
6918
#: bzrlib/plugins/launchpad/lp_api.py:269
6919
#, python-format
6920
msgid "%s is already up-to-date."
6921
msgstr ""
6922
6923
#: bzrlib/plugins/launchpad/lp_api.py:276
6924
#, python-format
6925
msgid "Pushing to %s"
6926
msgstr ""
6927
6928
#: bzrlib/plugins/launchpad/lp_directory.py:170
6929
msgid ""
6930
"resolution for {0}\n"
6931
" local: {1}\n"
6932
" remote: {2}"
6933
msgstr ""
6934
6935
#: bzrlib/plugins/launchpad/lp_propose.py:159
6936
#, python-format
6937
msgid "There is already a branch merge proposal: %s"
6938
msgstr ""
6939
6940
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6941
msgid "pb parameter to convert() is deprecated"
6942
msgstr ""
6943
6944
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6945
msgid "starting upgrade from format 4 to 5"
6946
msgstr ""
6947
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6949
msgid "note: upgrade may be faster if all store files are ungzipped first"
6950
msgstr ""
6951
6952
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6953
msgid "converting revision"
6954
msgstr ""
6955
6956
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6957
msgid "upgraded to weaves:"
6958
msgstr ""
6959
6960
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6961
#, python-format
6962
msgid "%6d revisions and inventories"
6963
msgstr ""
6964
6965
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6966
#, python-format
6967
msgid "%6d revisions not present"
6968
msgstr ""
6969
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6971
#, python-format
6972
msgid "%6d texts"
6973
msgstr ""
6974
6975
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6976
msgid "writing weave"
6977
msgstr ""
6978
6979
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6980
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6981
msgid "inventory"
6982
msgstr ""
6983
6984
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6985
msgid "write revision"
6986
msgstr ""
6987
6988
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6989
msgid "loading revision"
6990
msgstr ""
6991
6992
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6993
#, python-format
6994
msgid "revision {%s} not present in branch; will be converted as a ghost"
6995
msgstr ""
6996
6997
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6998
msgid "starting upgrade from format 5 to 6"
6999
msgstr ""
7000
7001
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7002
#, python-format
7003
msgid "adding prefixes to %s"
7004
msgstr ""
7005
7006
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7007
msgid "starting upgrade from format 6 to metadir"
7008
msgstr ""
7009
7010
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7011
msgid "Removing ancestry.weave"
7012
msgstr ""
7013
7014
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7015
msgid "Finding branch files"
7016
msgstr ""
7017
7018
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7019
msgid "Upgrading repository"
7020
msgstr ""
7021
7022
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7023
msgid "Upgrading branch"
7024
msgstr ""
7025
7026
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7027
msgid "No working tree."
7028
msgstr ""
7029
7030
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7031
msgid "Upgrading working tree"
7032
msgstr ""
7033
7034
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7035
#, python-format
7036
msgid "Make %s lock"
7037
msgstr ""
7038
7039
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7040
#, python-format
7041
msgid "Moving %s"
7042
msgstr ""
7043
7044
#: bzrlib/push.py:56
7045
msgid "Created new branch."
7046
msgstr ""
7047
7048
#: bzrlib/push.py:97
7049
#, python-format
7050
msgid ""
7051
"Target directory %s already contains a .bzr directory, but it is not valid."
7052
msgstr ""
7053
7054
#: bzrlib/push.py:101
7055
#, python-format
7056
msgid ""
7057
"Target directory %s already exists, but does not have a .bzr directory. "
7058
"Supply --use-existing-dir to push there anyway."
7059
msgstr ""
7060
7061
#: bzrlib/push.py:122
7062
#, python-format
7063
msgid "Too many redirections trying to make %s."
7064
msgstr ""
7065
7066
#: bzrlib/push.py:148
7067
msgid ""
7068
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7069
"information."
7070
msgstr ""
7071
7072
#: bzrlib/push.py:152
7073
#, python-format
7074
msgid ""
7075
"It is not possible to losslessly push to %s. You may want to use dpush "
7076
"instead."
7077
msgstr ""
7078
7079
#: bzrlib/push.py:158
7080
#, python-format
7081
msgid ""
7082
"At %s you have a valid .bzr control directory, but not a branch or "
7083
"repository. This is an unsupported configuration. Please move the target "
7084
"directory out of the way and try again."
7085
msgstr ""
7086
7087
#: bzrlib/reconcile.py:97
7088
#, python-format
7089
msgid "Reconciling branch %s"
7090
msgstr ""
7091
7092
#: bzrlib/reconcile.py:103
7093
#, python-format
7094
msgid "Reconciling repository %s"
7095
msgstr ""
7096
7097
#: bzrlib/reconcile.py:105
7098
msgid "Reconciling repository"
7099
msgstr ""
7100
7101
#: bzrlib/reconcile.py:111
7102
#, python-format
7103
msgid "%s cannot canonicalize CHKs."
7104
msgstr ""
7105
7106
#: bzrlib/reconcile.py:119
7107
msgid "Reconcile aborted: revision index has inconsistent parents."
7108
msgstr ""
7109
7110
#: bzrlib/reconcile.py:121
7111
msgid "Run \"bzr check\" for more details."
7112
msgstr ""
7113
7114
#: bzrlib/reconcile.py:123
7115
msgid "Reconciliation complete."
7116
msgstr ""
7117
7118
#: bzrlib/reconcile.py:166
7119
msgid "Fixing last revision info {0} => {1}"
7120
msgstr ""
7121
7122
#: bzrlib/reconcile.py:173
7123
msgid "revision_history ok."
7124
msgstr ""
7125
7126
#: bzrlib/reconcile.py:234
7127
msgid "Reading inventory data"
7128
msgstr ""
7129
7130
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7131
msgid "Inventory ok."
7132
msgstr ""
7133
7134
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7135
msgid "Backing up inventory"
7136
msgstr ""
7137
7138
#: bzrlib/reconcile.py:258
7139
msgid "Backup inventory created."
7140
msgstr ""
7141
7142
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7143
msgid "Writing weave"
7144
msgstr ""
7145
7146
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7147
msgid "Inventory regenerated."
7148
msgstr ""
7149
7150
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7151
msgid "Reading indexes"
7152
msgstr ""
7153
7154
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7155
msgid "Checking unused inventories"
7156
msgstr ""
7157
7158
#: bzrlib/reconcile.py:388
7159
msgid "Backup Inventory created"
7160
msgstr ""
7161
7162
#: bzrlib/reconcile.py:446
7163
msgid "Fixing text parents"
7164
msgstr ""
7165
7166
#: bzrlib/reconfigure.py:54
7167
msgid "{0} is now stacked on {1}\n"
7168
msgstr ""
7169
7170
#: bzrlib/reconfigure.py:69
7171
#, python-format
7172
msgid "%s is now not stacked\n"
7173
msgstr ""
7174
7175
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7176
#, python-format
7177
msgid "bzr: ERROR (ignored): %s"
7178
msgstr ""
7179
7180
#: bzrlib/remote.py:2534
7181
msgid "Copying repository content as tarball..."
7182
msgstr ""
7183
7184
#: bzrlib/rename_map.py:69
7185
msgid "Calculating hashes"
7186
msgstr ""
7187
7188
#: bzrlib/rename_map.py:107
7189
msgid "Determining hash hits"
7190
msgstr ""
7191
7192
#: bzrlib/rename_map.py:242
7193
msgid "{0} => {1}"
7194
msgstr ""
7195
7196
#: bzrlib/repository.py:1738
7197
msgid "Moving repository to repository.backup"
7198
msgstr ""
7199
7200
#: bzrlib/repository.py:1745
7201
msgid "Creating new repository"
7202
msgstr ""
7203
7204
#: bzrlib/repository.py:1750
7205
msgid "Copying content"
7206
msgstr ""
7207
7208
#: bzrlib/repository.py:1754
7209
msgid "Deleting old repository content"
7210
msgstr ""
7211
7212
#: bzrlib/repository.py:1756
7213
msgid "repository converted"
7214
msgstr ""
7215
7216
#: bzrlib/revisionspec.py:903
7217
msgid "Using {0} {1}"
7218
msgstr ""
7219
7220
#: bzrlib/send.py:59
7221
#, python-format
7222
msgid "Mail client \"%s\" does not support specifying body"
7223
msgstr ""
7224
7225
#: bzrlib/send.py:63
7226
msgid "--remember requires a branch to be specified."
7227
msgstr ""
7228
7229
#: bzrlib/send.py:78
7230
msgid "No submit branch known or specified"
7231
msgstr ""
7232
7233
#: bzrlib/send.py:81
7234
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7235
msgstr ""
7236
7237
#: bzrlib/send.py:99
7238
#, python-format
7239
msgid "No such send format '%s'."
7240
msgstr ""
7241
7242
#: bzrlib/send.py:115
7243
msgid "bzr send takes at most two one revision identifiers"
7244
msgstr ""
7245
7246
#: bzrlib/send.py:128
7247
msgid "No revisions to submit."
7248
msgstr ""
7249
7250
#: bzrlib/send.py:140
7251
msgid ""
7252
"- not supported for merge directives that use more than one output file."
7253
msgstr ""
7254
7255
#: bzrlib/send.py:186
7256
msgid "Format 0.9 does not permit bundle with no patch"
7257
msgstr ""
7258
7259
#: bzrlib/shelf_ui.py:46
7260
#, python-format
7261
msgid "Shelve adding file \"%(path)s\"?"
7262
msgstr ""
7263
7264
#: bzrlib/shelf_ui.py:47
7265
msgid "Shelve binary changes?"
7266
msgstr ""
7267
7268
#: bzrlib/shelf_ui.py:48
7269
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7270
msgstr ""
7271
7272
#: bzrlib/shelf_ui.py:50
7273
#, python-format
7274
msgid "Shelve removing file \"%(path)s\"?"
7275
msgstr ""
7276
7277
#: bzrlib/shelf_ui.py:51
7278
#, python-format
7279
msgid "Shelve %d change(s)?"
7280
msgstr ""
7281
7282
#: bzrlib/shelf_ui.py:52
7283
msgid "Shelve?"
7284
msgstr ""
7285
7286
#: bzrlib/shelf_ui.py:53
7287
#, python-format
7288
msgid ""
7289
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7290
msgstr ""
7291
7292
#: bzrlib/shelf_ui.py:55
7293
#, python-format
7294
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7295
msgstr ""
7296
7297
#: bzrlib/shelf_ui.py:70
7298
#, python-format
7299
msgid "Changes shelved with id \"%d\"."
7300
msgstr ""
7301
7302
#: bzrlib/shelf_ui.py:74
7303
msgid "Selected changes destroyed."
7304
msgstr ""
7305
7306
#: bzrlib/shelf_ui.py:78
7307
msgid "Selected changes:"
7308
msgstr ""
7309
7310
#: bzrlib/shelf_ui.py:98
7311
#, python-format
7312
msgid "Delete file \"%(path)s\"?"
7313
msgstr ""
7314
7315
#: bzrlib/shelf_ui.py:99
7316
msgid "Apply binary changes?"
7317
msgstr ""
7318
7319
#: bzrlib/shelf_ui.py:100
7320
#, python-format
7321
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7322
msgstr ""
7323
7324
#: bzrlib/shelf_ui.py:102
7325
#, python-format
7326
msgid "Add file \"%(path)s\"?"
7327
msgstr ""
7328
7329
#: bzrlib/shelf_ui.py:103
7330
#, python-format
7331
msgid "Apply %d change(s)?"
7332
msgstr ""
7333
7334
#: bzrlib/shelf_ui.py:104
7335
msgid "Apply change?"
7336
msgstr ""
7337
7338
#: bzrlib/shelf_ui.py:105
7339
#, python-format
7340
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7341
msgstr ""
7342
7343
#: bzrlib/shelf_ui.py:107
7344
#, python-format
7345
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7346
msgstr ""
7347
7348
#: bzrlib/shelf_ui.py:402
7349
msgid "No changes are shelved."
7350
msgstr ""
7351
7352
#: bzrlib/shelf_ui.py:460
7353
#, python-format
7354
msgid "Using changes with id \"%d\"."
7355
msgstr ""
7356
7357
#: bzrlib/shelf_ui.py:464
7358
#, python-format
7359
msgid "Message: %s"
7360
msgstr ""
7361
7362
#: bzrlib/shelf_ui.py:476
7363
#, python-format
7364
msgid "Deleted changes with id \"%d\"."
7365
msgstr ""
7366
7367
#: bzrlib/smart/medium.py:714
7368
msgid "HPSS calls: {0} ({1} vfs) {2}"
7369
msgstr ""
7370
7371
#: bzrlib/smart/ping.py:32
7372
msgid "Pings a Bazaar smart server."
7373
msgstr ""
7374
7375
#: bzrlib/smart/ping.py:34
7376
msgid ""
7377
"This command sends a 'hello' request to the given location using the bzr\n"
7378
"smart protocol, and reports the response."
7379
msgstr ""
7380
7381
#: bzrlib/smart/server.py:169
7382
msgid "Requested to stop gracefully"
7383
msgstr ""
7384
7385
#: bzrlib/smart/server.py:179
7386
#, python-format
7387
msgid "Waiting for %d client(s) to finish"
7388
msgstr ""
7389
7390
#: bzrlib/smart/server.py:185
7391
#, python-format
7392
msgid "Still waiting for %d client(s) to finish"
7393
msgstr ""
7394
7395
#: bzrlib/smart/server.py:219
7396
#, python-format
7397
msgid "listening socket error: %s"
7398
msgstr ""
7399
7400
#: bzrlib/smart/server.py:452
7401
#, python-format
7402
msgid "listening on port: %s"
7403
msgstr ""
7404
7405
#: bzrlib/switch.py:84
7406
msgid "Pending merges must be committed or reverted before using switch."
7407
msgstr ""
7408
7409
#: bzrlib/switch.py:111
7410
msgid ""
7411
"Cannot switch as local commits found in the checkout. Commit these to the "
7412
"bound branch or use --force to throw them away."
7413
msgstr ""
7414
7415
#: bzrlib/switch.py:116
7416
#, python-format
7417
msgid ""
7418
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7419
"anyway, use --force."
7420
msgstr ""
7421
7422
#: bzrlib/switch.py:140
7423
msgid "Cannot switch a branch, only a checkout."
7424
msgstr ""
7425
7426
#: bzrlib/switch.py:183
7427
#, python-format
7428
msgid "Tree is up to date at revision %d."
7429
msgstr ""
7430
7431
#: bzrlib/switch.py:190
7432
#, python-format
7433
msgid "Updated to revision %d."
7434
msgstr ""
7435
7436
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7437
msgid "Apply phase"
7438
msgstr ""
7439
7440
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7441
msgid "removing file"
7442
msgstr ""
7443
7444
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7445
msgid "adding file"
7446
msgstr ""
7447
7448
#: bzrlib/transform.py:2598
7449
msgid "Building tree"
7450
msgstr ""
7451
7452
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7453
msgid "Adding file contents"
7454
msgstr ""
7455
7456
#: bzrlib/transform.py:3017
7457
msgid "Resolution pass"
7458
msgstr ""
7459
7460
#: bzrlib/transport/ftp/_gssapi.py:88
7461
#, python-format
7462
msgid "Authenticated as %s"
7463
msgstr ""
7464
7465
#: bzrlib/tree.py:647
7466
msgid "*** {0} content-filter: {1} => {2!r}"
7467
msgstr ""
7468
7469
#: bzrlib/upgrade.py:77
7470
#, python-format
7471
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7472
msgstr ""
7473
7474
#: bzrlib/upgrade.py:100
7475
#, python-format
7476
msgid "cannot upgrade from bzrdir format %s"
7477
msgstr ""
7478
7479
#: bzrlib/upgrade.py:103
7480
#, python-format
7481
msgid "starting upgrade of %s"
7482
msgstr ""
7483
7484
#: bzrlib/upgrade.py:110
7485
msgid "finished"
7486
msgstr ""
7487
7488
#: bzrlib/upgrade.py:120
7489
msgid "Deleting backup.bzr"
7490
msgstr ""
7491
7492
#: bzrlib/upgrade.py:151
7493
msgid ""
7494
"\n"
7495
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7496
msgstr ""
7497
7498
#: bzrlib/upgrade.py:208
7499
#, python-format
7500
msgid "Found %d dependent branches - upgrading ..."
7501
msgstr ""
7502
7503
#: bzrlib/upgrade.py:276
7504
msgid "Upgrading bzrdirs"
7505
msgstr ""
7506
7507
#: bzrlib/upgrade.py:282
7508
#, python-format
7509
msgid "Upgrading %s"
7510
msgstr ""
7511
7512
#: bzrlib/upgrade.py:283
7513
msgid "Upgrading {0} {1} ..."
7514
msgstr ""
7515
7516
#: bzrlib/upgrade.py:301
7517
msgid "Removing backup ..."
7518
msgstr ""
7519
7520
#: bzrlib/upgrade.py:305
7521
msgid "failed to clean-up {0}: {1}"
7522
msgstr ""
7523
7524
#: bzrlib/vf_repository.py:1091
7525
msgid "inventories"
7526
msgstr ""
7527
7528
#: bzrlib/vf_repository.py:1117
7529
msgid "texts"
7530
msgstr ""
7531
7532
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7533
msgid "Calculating text parents"
7534
msgstr ""
7535
7536
#: bzrlib/vf_repository.py:1707
7537
msgid "Fetch texts"
7538
msgstr ""
7539
7540
#: bzrlib/vf_repository.py:2536
7541
msgid "loading text store"
7542
msgstr ""
7543
7544
#: bzrlib/vf_repository.py:2542
7545
msgid "checking text graph"
7546
msgstr ""
7547
7548
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7549
#: bzrlib/vf_repository.py:3127
7550
msgid "Transferring revisions"
7551
msgstr ""
7552
7553
#: bzrlib/win32utils.py:146
7554
msgid "Failed to GetProcessMemoryInfo()"
7555
msgstr ""
7556
7557
#: bzrlib/win32utils.py:167
7558
msgid "Cannot debug memory on win32 without ctypes or win32process"
7559
msgstr ""
7560
7561
#: bzrlib/win32utils.py:172
7562
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7563
msgstr ""
7564
7565
#: bzrlib/win32utils.py:180
7566
#, python-format
7567
msgid "WorkingSize %8d KiB"
7568
msgstr ""
7569
7570
#: bzrlib/win32utils.py:181
7571
#, python-format
7572
msgid "PeakWorking %8d KiB"
7573
msgstr ""
7574
7575
#: bzrlib/win32utils.py:182
7576
#, python-format
7577
msgid "PagefileUsage %8d KiB"
7578
msgstr ""
7579
7580
#: bzrlib/win32utils.py:183
7581
#, python-format
7582
msgid "PeakPagefileUsage %8d KiB"
7583
msgstr ""
7584
7585
#: bzrlib/win32utils.py:185
7586
#, python-format
7587
msgid "PrivateUsage %8d KiB"
7588
msgstr ""
7589
7590
#: bzrlib/win32utils.py:186
7591
#, python-format
7592
msgid "PageFaultCount %8d"
7593
msgstr ""
7594
7595
#: bzrlib/workingtree.py:1516
7596
msgid "Rerun update after fixing the conflicts."
7597
msgstr ""
7598
7599
#: dummy/help_topics/authentication/summary.txt:1
7600
msgid "Information on configuring authentication"
7601
msgstr ""
7602
7603
#: dummy/help_topics/basic/detail.txt:1
7604
msgid ""
7605
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7606
"http://bazaar.canonical.com/"
7607
msgstr ""
7608
7609
#: dummy/help_topics/basic/detail.txt:4
7610
msgid ""
7611
"Basic commands:\n"
7612
" bzr init makes this directory a versioned branch\n"
7613
" bzr branch make a copy of another branch"
7614
msgstr ""
7615
7616
#: dummy/help_topics/basic/detail.txt:8
7617
msgid ""
7618
" bzr add make files or directories versioned\n"
7619
" bzr ignore ignore a file or pattern\n"
7620
" bzr mv move or rename a versioned file"
7621
msgstr ""
7622
7623
#: dummy/help_topics/basic/detail.txt:12
7624
msgid ""
7625
" bzr status summarize changes in working copy\n"
7626
" bzr diff show detailed diffs"
7627
msgstr ""
7628
7629
#: dummy/help_topics/basic/detail.txt:15
7630
msgid ""
7631
" bzr merge pull in changes from another branch\n"
7632
" bzr commit save some or all changes\n"
7633
" bzr send send changes via email"
7634
msgstr ""
7635
7636
#: dummy/help_topics/basic/detail.txt:19
7637
msgid ""
7638
" bzr log show history of changes\n"
7639
" bzr check validate storage"
7640
msgstr ""
7641
7642
#: dummy/help_topics/basic/detail.txt:22
7643
msgid ""
7644
" bzr help init more help on e.g. init command\n"
7645
" bzr help commands list all commands\n"
7646
" bzr help topics list all help topics\n"
7647
msgstr ""
7648
7649
#: dummy/help_topics/basic/summary.txt:1
7650
msgid "Basic commands"
7651
msgstr ""
7652
7653
#: dummy/help_topics/branches/detail.txt:1
7654
msgid "Branches"
7655
msgstr ""
7656
7657
#: dummy/help_topics/branches/detail.txt:3
7658
msgid ""
7659
"A branch consists of the state of a project, including all of its\n"
7660
"history. All branches have a repository associated (which is where the\n"
7661
"branch history is stored), but multiple branches may share the same\n"
7662
"repository (a shared repository). Branches can be copied and merged."
7663
msgstr ""
7664
7665
#: dummy/help_topics/branches/detail.txt:8
7666
msgid ""
7667
"In addition, one branch may be bound to another one. Binding to another\n"
7668
"branch indicates that commits which happen in this branch must also \n"
7669
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7670
"commits when the two branches are out of date. In order for a commit \n"
7671
"to succeed, it may be necessary to update the current branch using \n"
7672
"``bzr update``."
7673
msgstr ""
7674
7675
#: dummy/help_topics/branches/detail.txt:15
7676
#: dummy/help_topics/checkouts/detail.txt:66
7677
#: dummy/help_topics/repositories/detail.txt:36
7678
msgid "Related commands::"
7679
msgstr ""
7680
7681
#: dummy/help_topics/branches/detail.txt:17
7682
msgid ""
7683
" init Change a directory into a versioned branch.\n"
7684
" branch Create a new branch that is a copy of an existing branch.\n"
7685
" merge Perform a three-way merge.\n"
7686
" bind Bind a branch to another one.\n"
7687
msgstr ""
7688
7689
#: dummy/help_topics/branches/summary.txt:1
7690
msgid "Information on what a branch is"
7691
msgstr ""
7692
7693
#: dummy/help_topics/bugs/summary.txt:1
7694
msgid "Bug tracker settings"
7695
msgstr ""
7696
7697
#: dummy/help_topics/checkouts/detail.txt:1
7698
msgid "Checkouts"
7699
msgstr ""
7700
7701
#: dummy/help_topics/checkouts/detail.txt:3
7702
msgid ""
7703
"Checkouts are source trees that are connected to a branch, so that when\n"
7704
"you commit in the source tree, the commit goes into that branch. They\n"
7705
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7706
"Bazaar's decentralized features until you want them. Using checkouts\n"
7707
"with shared repositories is very similar to working with SVN or CVS, but\n"
7708
"doesn't have the same restrictions. And using checkouts still allows\n"
7709
"others working on the project to use whatever workflow they like."
7710
msgstr ""
7711
7712
#: dummy/help_topics/checkouts/detail.txt:11
7713
msgid ""
7714
"A checkout is created with the bzr checkout command (see \"help "
7715
"checkout\").\n"
7716
"You pass it a reference to another branch, and it will create a local copy\n"
7717
"for you that still contains a reference to the branch you created the\n"
7718
"checkout from (the master branch). Then if you make any commits they will "
7719
"be\n"
7720
"made on the other branch first. This creates an instant mirror of your work, "
7721
"or\n"
7722
"facilitates lockstep development, where each developer is working together,\n"
7723
"continuously integrating the changes of others."
7724
msgstr ""
7725
7726
#: dummy/help_topics/checkouts/detail.txt:19
7727
msgid ""
7728
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7729
"you have the full history locally. As you have a first class branch you "
7730
"can\n"
7731
"also commit locally if you want, for instance due to the temporary loss af "
7732
"a\n"
7733
"network connection. Use the --local option to commit to do this. All the "
7734
"local\n"
7735
"commits will then be made on the master branch the next time you do a non-"
7736
"local\n"
7737
"commit."
7738
msgstr ""
7739
7740
#: dummy/help_topics/checkouts/detail.txt:26
7741
msgid ""
7742
"If you are using a checkout from a shared branch you will periodically want "
7743
"to\n"
7744
"pull in all the changes made by others. This is done using the \"update\"\n"
7745
"command. The changes need to be applied before any non-local commit, but\n"
7746
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7747
"command when needed."
7748
msgstr ""
7749
7750
#: dummy/help_topics/checkouts/detail.txt:32
7751
msgid ""
7752
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7753
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7754
"SVN checkout in that it is not a first class branch, it mainly consists of "
7755
"the\n"
7756
"working tree. This means that any history operations must query the master\n"
7757
"branch, which could be slow if a network connection is involved. Also, as "
7758
"you\n"
7759
"don't have a local branch, then you cannot commit locally."
7760
msgstr ""
7761
7762
#: dummy/help_topics/checkouts/detail.txt:39
7763
msgid ""
7764
"Lightweight checkouts work best when you have fast reliable access to the\n"
7765
"master branch. This means that if the master branch is on the same disk or "
7766
"LAN\n"
7767
"a lightweight checkout will be faster than a heavyweight one for any "
7768
"commands\n"
7769
"that modify the revision history (as only one copy of the branch needs to\n"
7770
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7771
"that uses the history but does not change it, but if the master branch is "
7772
"on\n"
7773
"the same disk then there won't be a noticeable difference."
7774
msgstr ""
7775
7776
#: dummy/help_topics/checkouts/detail.txt:47
7777
msgid ""
7778
"Another possible use for a checkout is to use it with a treeless repository\n"
7779
"containing your branches, where you maintain only one working tree by\n"
7780
"switching the master branch that the checkout points to when you want to\n"
7781
"work on a different branch."
7782
msgstr ""
7783
7784
#: dummy/help_topics/checkouts/detail.txt:52
7785
msgid ""
7786
"Obviously to commit on a checkout you need to be able to write to the "
7787
"master\n"
7788
"branch. This means that the master branch must be accessible over a "
7789
"writeable\n"
7790
"protocol , such as sftp://, and that you have write permissions at the "
7791
"other\n"
7792
"end. Checkouts also work on the local file system, so that all that matters "
7793
"is\n"
7794
"file permissions."
7795
msgstr ""
7796
7797
#: dummy/help_topics/checkouts/detail.txt:58
7798
msgid ""
7799
"You can change the master of a checkout by using the \"switch\" command "
7800
"(see\n"
7801
"\"help switch\"). This will change the location that the commits are sent "
7802
"to.\n"
7803
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7804
"checkout. If you would like to convert your heavy checkout into a normal\n"
7805
"branch so that every commit is local, you can use the \"unbind\" command. To "
7806
"see\n"
7807
"whether or not a branch is bound or not you can use the \"info\" command. If "
7808
"the\n"
7809
"branch is bound it will tell you the location of the bound branch."
7810
msgstr ""
7811
7812
#: dummy/help_topics/checkouts/detail.txt:68
7813
msgid ""
7814
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7815
" checkout\n"
7816
" update Pull any changes in the master branch in to your checkout\n"
7817
" commit Make a commit that is sent to the master branch. If you have\n"
7818
" a heavy checkout then the --local option will commit to the\n"
7819
" checkout without sending the commit to the master\n"
7820
" switch Change the master branch that the commits in the checkout "
7821
"will\n"
7822
" be sent to\n"
7823
" bind Turn a standalone branch into a heavy checkout so that any\n"
7824
" commits will be sent to the master branch\n"
7825
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7826
" commits are only made locally\n"
7827
" info Displays whether a branch is bound or unbound. If the branch "
7828
"is\n"
7829
" bound, then it will also display the location of the bound "
7830
"branch\n"
7831
msgstr ""
7832
7833
#: dummy/help_topics/checkouts/summary.txt:1
7834
msgid "Information on what a checkout is"
7835
msgstr ""
7836
7837
#: dummy/help_topics/commands/summary.txt:1
7838
msgid "Basic help for all commands"
7839
msgstr ""
7840
7841
#: dummy/help_topics/configuration/summary.txt:1
7842
msgid "Details on the configuration settings available"
7843
msgstr ""
7844
7845
#: dummy/help_topics/conflict-types/summary.txt:1
7846
msgid "Types of conflicts and what to do about them"
7847
msgstr ""
7848
7849
#: dummy/help_topics/content-filters/summary.txt:1
7850
msgid "Conversion of content into/from working trees"
7851
msgstr ""
7852
7853
#: dummy/help_topics/criss-cross/detail.txt:1
7854
msgid "Criss-Cross"
7855
msgstr ""
7856
7857
#: dummy/help_topics/criss-cross/detail.txt:3
7858
msgid ""
7859
"A criss-cross in the branch history can cause the default merge technique\n"
7860
"to emit more conflicts than would normally be expected."
7861
msgstr ""
7862
7863
#: dummy/help_topics/criss-cross/detail.txt:6
7864
msgid ""
7865
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7866
"give\n"
7867
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7868
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7869
msgstr ""
7870
7871
#: dummy/help_topics/criss-cross/detail.txt:10
7872
msgid ""
7873
"Criss-crosses occur in a branch's history if two branches merge the same "
7874
"thing\n"
7875
"and then merge one another, or if two branches merge one another at the "
7876
"same\n"
7877
"time. They can be avoided by having each branch only merge from or into a\n"
7878
"designated central branch (a \"star topology\")."
7879
msgstr ""
7880
7881
#: dummy/help_topics/criss-cross/detail.txt:15
7882
msgid ""
7883
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7884
"default\n"
7885
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7886
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7887
"differences between THIS and OTHER are due to one side adding lines, or\n"
7888
"from another side removing lines."
7889
msgstr ""
7890
7891
#: dummy/help_topics/criss-cross/detail.txt:21
7892
msgid ""
7893
"Criss-crosses mean there is no good choice for a base. Selecting the "
7894
"recent\n"
7895
"merge points could cause one side's changes to be silently discarded.\n"
7896
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7897
"are emitted."
7898
msgstr ""
7899
7900
#: dummy/help_topics/criss-cross/detail.txt:26
7901
msgid ""
7902
"The ``weave`` merge type is not affected by this problem because it uses\n"
7903
"line-origin detection instead of a basis revision to determine the cause of\n"
7904
"differences.\n"
7905
msgstr ""
7906
7907
#: dummy/help_topics/criss-cross/summary.txt:1
7908
msgid "Information on criss-cross merging"
7909
msgstr ""
7910
7911
#: dummy/help_topics/current-formats/summary.txt:1
7912
msgid "Current storage formats"
7913
msgstr ""
7914
7915
#: dummy/help_topics/debug-flags/summary.txt:1
7916
msgid "Options to show or record debug information"
7917
msgstr ""
7918
7919
#: dummy/help_topics/diverged-branches/summary.txt:1
7920
msgid "How to fix diverged branches"
7921
msgstr ""
7922
7923
#: dummy/help_topics/env-variables/summary.txt:1
7924
msgid "Environment variable names and values"
7925
msgstr ""
7926
7927
#: dummy/help_topics/eol/summary.txt:1
7928
msgid "Information on end-of-line handling"
7929
msgstr ""
7930
7931
#: dummy/help_topics/files/detail.txt:1
7932
msgid "Files"
7933
msgstr ""
7934
7935
#: dummy/help_topics/files/detail.txt:3
7936
msgid ""
7937
":On Unix: ~/.bazaar/bazaar.conf\n"
7938
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7939
"bazaar\\\\2.0\\\\bazaar.conf"
7940
msgstr ""
7941
7942
#: dummy/help_topics/files/detail.txt:6
7943
msgid ""
7944
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7945
"used to define general configuration that will be applied everywhere.\n"
7946
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7947
"commonly used options."
7948
msgstr ""
7949
7950
#: dummy/help_topics/files/detail.txt:11
7951
msgid "A typical config file might look something like::"
7952
msgstr ""
7953
7954
#: dummy/help_topics/files/detail.txt:13
7955
msgid ""
7956
" [DEFAULT]\n"
7957
" email=John Doe <jdoe@isp.com>"
7958
msgstr ""
7959
7960
#: dummy/help_topics/files/detail.txt:16
7961
msgid ""
7962
" [ALIASES]\n"
7963
" commit = commit --strict\n"
7964
" log10 = log --short -r -10..-1\n"
7965
msgstr ""
7966
7967
#: dummy/help_topics/files/summary.txt:1
7968
msgid "Information on configuration and log files"
7969
msgstr ""
7970
7971
#: dummy/help_topics/formats/detail.txt:1
7972
msgid "Storage Formats"
7973
msgstr ""
7974
7975
#: dummy/help_topics/formats/detail.txt:3
7976
msgid ""
7977
"To ensure that older clients do not access data incorrectly,\n"
7978
"Bazaar's policy is to introduce a new storage format whenever\n"
7979
"new features requiring new metadata are added. New storage\n"
7980
"formats may also be introduced to improve performance and\n"
7981
"scalability."
7982
msgstr ""
7983
7984
#: dummy/help_topics/formats/detail.txt:9
7985
msgid ""
7986
"The newest format, 2a, is highly recommended. If your\n"
7987
"project is not using 2a, then you should suggest to the\n"
7988
"project owner to upgrade."
7989
msgstr ""
7990
7991
#: dummy/help_topics/formats/detail.txt:13
7992
msgid ""
7993
"\n"
7994
".. note::"
7995
msgstr ""
7996
7997
#: dummy/help_topics/formats/detail.txt:16
7998
msgid ""
7999
" Some of the older formats have two variants:\n"
8000
" a plain one and a rich-root one. The latter include an additional\n"
8001
" field about the root of the tree. There is no performance cost\n"
8002
" for using a rich-root format but you cannot easily merge changes\n"
8003
" from a rich-root format into a plain format. As a consequence,\n"
8004
" moving a project to a rich-root format takes some co-ordination\n"
8005
" in that all contributors need to upgrade their repositories\n"
8006
" around the same time. 2a and all future formats will be\n"
8007
" implicitly rich-root."
8008
msgstr ""
8009
8010
#: dummy/help_topics/formats/detail.txt:26
8011
msgid ""
8012
"See :doc:`current-formats-help` for the complete list of\n"
8013
"currently supported formats. See :doc:`other-formats-help` for\n"
8014
"descriptions of any available experimental and deprecated formats.\n"
8015
msgstr ""
8016
8017
#: dummy/help_topics/formats/summary.txt:1
8018
msgid "Information on choosing a storage format"
8019
msgstr ""
8020
8021
#: dummy/help_topics/global-options/detail.txt:1
8022
msgid "Global Options"
8023
msgstr ""
8024
8025
#: dummy/help_topics/global-options/detail.txt:3
8026
msgid ""
8027
"These options may be used with any command, and may appear in front of any\n"
8028
"command. (e.g. ``bzr --profile help``)."
8029
msgstr ""
8030
8031
#: dummy/help_topics/global-options/detail.txt:6
8032
msgid ""
8033
"--version Print the version number. Must be supplied before the "
8034
"command.\n"
8035
"--no-aliases Do not process command aliases when running this command.\n"
8036
"--builtin Use the built-in version of a command, not the plugin "
8037
"version.\n"
8038
" This does not suppress other plugin effects.\n"
8039
"--no-plugins Do not process any plugins.\n"
8040
"--no-l10n Do not translate messages.\n"
8041
"--concurrency Number of processes that can be run concurrently (selftest)."
8042
msgstr ""
8043
8044
#: dummy/help_topics/global-options/detail.txt:14
8045
msgid ""
8046
"--profile Profile execution using the hotshot profiler.\n"
8047
"--lsprof Profile execution using the lsprof profiler.\n"
8048
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8049
" results to a specified file. If the filename ends with "
8050
"\".txt\",\n"
8051
" text format will be used. If the filename either starts "
8052
"with\n"
8053
" \"callgrind.out\" or end with \".callgrind\", the output will "
8054
"be\n"
8055
" formatted for use with KCacheGrind. Otherwise, the output\n"
8056
" will be a pickle.\n"
8057
"--coverage Generate line coverage report in the specified directory."
8058
msgstr ""
8059
8060
#: dummy/help_topics/global-options/detail.txt:24
8061
msgid ""
8062
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8063
"for\n"
8064
" the duration of the command. This can be used multiple times "
8065
"if\n"
8066
" several options need to be overridden."
8067
msgstr ""
8068
8069
#: dummy/help_topics/global-options/detail.txt:28
8070
msgid ""
8071
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8072
"information on profiling."
8073
msgstr ""
8074
8075
#: dummy/help_topics/global-options/detail.txt:31
8076
msgid ""
8077
"A number of debug flags are also available to assist troubleshooting and\n"
8078
"development. See :doc:`debug-flags-help`.\n"
8079
msgstr ""
8080
8081
#: dummy/help_topics/global-options/summary.txt:1
8082
msgid "Options that control how Bazaar runs"
8083
msgstr ""
8084
8085
#: dummy/help_topics/hidden-commands/summary.txt:1
8086
msgid "All hidden commands"
8087
msgstr ""
8088
8089
#: dummy/help_topics/hooks/summary.txt:1
8090
msgid "Points at which custom processing can be added"
8091
msgstr ""
8092
8093
#: dummy/help_topics/launchpad/detail.txt:1
8094
msgid "Integration with Launchpad.net"
8095
msgstr ""
8096
8097
#: dummy/help_topics/launchpad/detail.txt:3
8098
msgid ""
8099
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8100
"specification tracking."
8101
msgstr ""
8102
8103
#: dummy/help_topics/launchpad/detail.txt:6
8104
msgid ""
8105
"The bzr client (through the plugin called 'launchpad') has special\n"
8106
"features to communicate with Launchpad:"
8107
msgstr ""
8108
8109
#: dummy/help_topics/launchpad/detail.txt:9
8110
msgid ""
8111
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8112
"This\n"
8113
" is then used by the 'lp:' transport to download your branches using\n"
8114
" bzr+ssh://."
8115
msgstr ""
8116
8117
#: dummy/help_topics/launchpad/detail.txt:13
8118
msgid ""
8119
" * The 'lp:' transport uses Launchpad as a directory service: for "
8120
"example\n"
8121
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8122
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8123
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8124
msgstr ""
8125
8126
#: dummy/help_topics/launchpad/detail.txt:18
8127
msgid ""
8128
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8129
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8130
"lp:12345'\n"
8131
" will record a revision property that marks that revision as fixing\n"
8132
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8133
" automatically be linked to the bug report."
8134
msgstr ""
8135
8136
#: dummy/help_topics/launchpad/detail.txt:24
8137
msgid ""
8138
" * The register-branch command tells Launchpad about the url of a\n"
8139
" public branch. Launchpad will then mirror the branch, display\n"
8140
" its contents and allow it to be attached to bugs and other\n"
8141
" objects."
8142
msgstr ""
8143
8144
#: dummy/help_topics/launchpad/detail.txt:29
8145
msgid "For more information see http://help.launchpad.net/\n"
8146
msgstr ""
8147
8148
#: dummy/help_topics/launchpad/summary.txt:1
8149
msgid "Using Bazaar with Launchpad.net"
8150
msgstr ""
8151
8152
#: dummy/help_topics/location-alias/summary.txt:1
8153
msgid "Aliases for remembered locations"
8154
msgstr ""
8155
8156
#: dummy/help_topics/log-formats/summary.txt:1
8157
msgid "Details on the logging formats available"
8158
msgstr ""
8159
8160
#: dummy/help_topics/other-formats/summary.txt:1
8161
msgid "Experimental and deprecated storage formats"
8162
msgstr ""
8163
8164
#: dummy/help_topics/patterns/summary.txt:1
8165
msgid "Information on the pattern syntax"
8166
msgstr ""
8167
8168
#: dummy/help_topics/repositories/detail.txt:1
8169
msgid "Repositories"
8170
msgstr ""
8171
8172
#: dummy/help_topics/repositories/detail.txt:3
8173
msgid ""
8174
"Repositories in Bazaar are where committed information is stored. There is\n"
8175
"a repository associated with every branch."
8176
msgstr ""
8177
8178
#: dummy/help_topics/repositories/detail.txt:6
8179
msgid ""
8180
"Repositories are a form of database. Bzr will usually maintain this for\n"
8181
"good performance automatically, but in some situations (e.g. when doing\n"
8182
"very many commits in a short time period) you may want to ask bzr to\n"
8183
"optimise the database indices. This can be done by the 'bzr pack' command."
8184
msgstr ""
8185
8186
#: dummy/help_topics/repositories/detail.txt:11
8187
msgid ""
8188
"By default just running 'bzr init' will create a repository within the new\n"
8189
"branch but it is possible to create a shared repository which allows "
8190
"multiple\n"
8191
"branches to share their information in the same location. When a new branch "
8192
"is\n"
8193
"created it will first look to see if there is a containing shared repository "
8194
"it\n"
8195
"can use."
8196
msgstr ""
8197
8198
#: dummy/help_topics/repositories/detail.txt:17
8199
msgid ""
8200
"When two branches of the same project share a repository, there is\n"
8201
"generally a large space saving. For some operations (e.g. branching\n"
8202
"within the repository) this translates in to a large time saving."
8203
msgstr ""
8204
8205
#: dummy/help_topics/repositories/detail.txt:21
8206
msgid ""
8207
"To create a shared repository use the init-repository command (or the alias\n"
8208
"init-repo). This command takes the location of the repository to create. "
8209
"This\n"
8210
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8211
"which contains a shared repository. Any new branches that are created in "
8212
"this\n"
8213
"directory will then use it for storage."
8214
msgstr ""
8215
8216
#: dummy/help_topics/repositories/detail.txt:27
8217
msgid ""
8218
"It is a good idea to create a repository whenever you might create more\n"
8219
"than one branch of a project. This is true for both working areas where you\n"
8220
"are doing the development, and any server areas that you use for hosting\n"
8221
"projects. In the latter case, it is common to want branches without working\n"
8222
"trees. Since the files in the branch will not be edited directly there is "
8223
"no\n"
8224
"need to use up disk space for a working tree. To create a repository in "
8225
"which\n"
8226
"the branches will not have working trees pass the '--no-trees' option to\n"
8227
"'init-repository'."
8228
msgstr ""
8229
8230
#: dummy/help_topics/repositories/detail.txt:38
8231
msgid ""
8232
" init-repository Create a shared repository. Use --no-trees to create "
8233
"one\n"
8234
" in which new branches won't get a working tree.\n"
8235
msgstr ""
8236
8237
#: dummy/help_topics/repositories/summary.txt:1
8238
msgid "Basic information on shared repositories."
8239
msgstr ""
8240
8241
#: dummy/help_topics/revisionspec/summary.txt:1
8242
msgid "Explain how to use --revision"
8243
msgstr ""
8244
8245
#: dummy/help_topics/rules/summary.txt:1
8246
msgid "Information on defining rule-based preferences"
8247
msgstr ""
8248
8249
#: dummy/help_topics/standalone-trees/detail.txt:1
8250
msgid "Standalone Trees"
8251
msgstr ""
8252
8253
#: dummy/help_topics/standalone-trees/detail.txt:3
8254
msgid ""
8255
"A standalone tree is a working tree with an associated repository. It\n"
8256
"is an independently usable branch, with no dependencies on any other.\n"
8257
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8258
"an existing project under version control."
8259
msgstr ""
8260
8261
#: dummy/help_topics/standalone-trees/detail.txt:8
8262
msgid "Related Commands::"
8263
msgstr ""
8264
8265
#: dummy/help_topics/standalone-trees/detail.txt:10
8266
msgid " init Make a directory into a versioned branch.\n"
8267
msgstr ""
8268
8269
#: dummy/help_topics/standalone-trees/summary.txt:1
8270
msgid "Information on what a standalone tree is"
8271
msgstr ""
8272
8273
#: dummy/help_topics/standard-options/detail.txt:1
8274
msgid "Standard Options"
8275
msgstr ""
8276
8277
#: dummy/help_topics/standard-options/detail.txt:3
8278
msgid "Standard options are legal for all commands."
8279
msgstr ""
8280
8281
#: dummy/help_topics/standard-options/detail.txt:5
8282
msgid ""
8283
"--help, -h Show help message.\n"
8284
"--verbose, -v Display more information.\n"
8285
"--quiet, -q Only display errors and warnings."
8286
msgstr ""
8287
8288
#: dummy/help_topics/standard-options/detail.txt:9
8289
msgid "Unlike global options, standard options can be used in aliases.\n"
8290
msgstr ""
8291
8292
#: dummy/help_topics/standard-options/summary.txt:1
8293
msgid "Options that can be used with any command"
8294
msgstr ""
8295
8296
#: dummy/help_topics/status-flags/detail.txt:1
8297
msgid "Status Flags"
8298
msgstr ""
8299
8300
#: dummy/help_topics/status-flags/detail.txt:3
8301
msgid ""
8302
"Status flags are used to summarise changes to the working tree in a concise\n"
8303
"manner. They are in the form::"
8304
msgstr ""
8305
8306
#: dummy/help_topics/status-flags/detail.txt:6
8307
msgid " xxx <filename>"
8308
msgstr ""
8309
8310
#: dummy/help_topics/status-flags/detail.txt:8
8311
msgid "where the columns' meanings are as follows."
8312
msgstr ""
8313
8314
#: dummy/help_topics/status-flags/detail.txt:10
8315
msgid "Column 1 - versioning/renames::"
8316
msgstr ""
8317
8318
#: dummy/help_topics/status-flags/detail.txt:12
8319
msgid ""
8320
" + File versioned\n"
8321
" - File unversioned\n"
8322
" R File renamed\n"
8323
" ? File unknown\n"
8324
" X File nonexistent (and unknown to bzr)\n"
8325
" C File has conflicts\n"
8326
" P Entry for a pending merge (not a file)"
8327
msgstr ""
8328
8329
#: dummy/help_topics/status-flags/detail.txt:20
8330
msgid "Column 2 - contents::"
8331
msgstr ""
8332
8333
#: dummy/help_topics/status-flags/detail.txt:22
8334
msgid ""
8335
" N File created\n"
8336
" D File deleted\n"
8337
" K File kind changed\n"
8338
" M File modified"
8339
msgstr ""
8340
8341
#: dummy/help_topics/status-flags/detail.txt:27
8342
msgid "Column 3 - execute::"
8343
msgstr ""
8344
8345
#: dummy/help_topics/status-flags/detail.txt:29
8346
msgid " * The execute bit was changed\n"
8347
msgstr ""
8348
8349
#: dummy/help_topics/status-flags/summary.txt:1
8350
msgid "Help on status flags"
8351
msgstr ""
8352
8353
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8354
msgid "Branches Out of Sync"
8355
msgstr ""
8356
8357
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8358
msgid ""
8359
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8360
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8361
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8362
"have the same last revision as the new reference branch for the lightweight\n"
8363
"checkout, data could be lost, so Bazaar refuses."
8364
msgstr ""
8365
8366
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8367
msgid "How you deal with this depends on *why* the branches are out of sync."
8368
msgstr ""
8369
8370
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8371
msgid ""
8372
"If you have a checkout and have done local commits, you can get back in "
8373
"sync\n"
8374
"by running \"bzr update\" (and possibly \"bzr commit\")."
8375
msgstr ""
8376
8377
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8378
msgid ""
8379
"If you have a branch and the remote branch is out-of-date, you can push\n"
8380
"the local changes using \"bzr push\". If the local branch is out of date, "
8381
"you\n"
8382
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8383
"commit\n"
8384
"and then push your changes. If you decide that some of the changes aren't\n"
8385
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8386
msgstr ""
8387
8388
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8389
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8390
msgstr ""
8391
8392
#: dummy/help_topics/topics/summary.txt:1
8393
msgid "Topics list"
8394
msgstr ""
8395
8396
#: dummy/help_topics/url-special-chars/summary.txt:1
8397
msgid "Special character handling in URLs"
8398
msgstr ""
8399
8400
#: dummy/help_topics/urlspec/summary.txt:1
8401
msgid "Supported transport protocols"
8402
msgstr ""
8403
8404
#: dummy/help_topics/working-trees/detail.txt:1
8405
msgid "Working Trees"
8406
msgstr ""
8407
8408
#: dummy/help_topics/working-trees/detail.txt:3
8409
msgid ""
8410
"A working tree is the contents of a branch placed on disk so that you can\n"
8411
"see the files and edit them. The working tree is where you make changes to "
8412
"a\n"
8413
"branch, and when you commit the current state of the working tree is the\n"
8414
"snapshot that is recorded in the commit."
8415
msgstr ""
8416
8417
#: dummy/help_topics/working-trees/detail.txt:8
8418
msgid ""
8419
"When you push a branch to a remote system, a working tree will not be\n"
8420
"created. If one is already present the files will not be updated. The\n"
8421
"branch information will be updated and the working tree will be marked\n"
8422
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8423
"may be uncommitted changes or the update may cause content conflicts that "
8424
"are\n"
8425
"difficult to deal with remotely."
8426
msgstr ""
8427
8428
#: dummy/help_topics/working-trees/detail.txt:15
8429
msgid ""
8430
"If you have a branch with no working tree you can use the 'checkout' "
8431
"command\n"
8432
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8433
"will\n"
8434
"create the working tree. If the branch is updated remotely, you can update "
8435
"the\n"
8436
"working tree by running 'bzr update' in that directory."
8437
msgstr ""
8438
8439
#: dummy/help_topics/working-trees/detail.txt:20
8440
msgid ""
8441
"If you have a branch with a working tree that you do not want the 'remove-"
8442
"tree'\n"
8443
"command will remove the tree if it is safe. This can be done to avoid the\n"
8444
"warning about the remote working tree not being updated when pushing to the\n"
8445
"branch. It can also be useful when working with a '--no-trees' repository\n"
8446
"(see 'bzr help repositories')."
8447
msgstr ""
8448
8449
#: dummy/help_topics/working-trees/detail.txt:26
8450
msgid ""
8451
"If you want to have a working tree on a remote machine that you push to you\n"
8452
"can either run 'bzr update' in the remote branch after each push, or use "
8453
"some\n"
8454
"other method to update the tree during the push. There is an 'rspush' "
8455
"plugin\n"
8456
"that will update the working tree using rsync as well as doing a push. "
8457
"There\n"
8458
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8459
"SSH\n"
8460
"after each push."
8461
msgstr ""
8462
8463
#: dummy/help_topics/working-trees/detail.txt:33
8464
msgid "Useful commands::"
8465
msgstr ""
8466
8467
#: dummy/help_topics/working-trees/detail.txt:35
8468
msgid ""
8469
" checkout Create a working tree when a branch does not have one.\n"
8470
" remove-tree Removes the working tree from a branch when it is safe to do "
8471
"so.\n"
8472
" update When a working tree is out of sync with its associated "
8473
"branch\n"
8474
" this will update the tree to match the branch.\n"
8475
msgstr ""
8476
8477
#: dummy/help_topics/working-trees/summary.txt:1
8478
msgid "Information on working trees"
8479
msgstr ""
8480
8481
#: en/help_topics/authentication.txt:1
8482
msgid ""
8483
"Authentication Settings\n"
8484
"======================="
8485
msgstr ""
8486
8487
#: en/help_topics/authentication.txt:4
8488
msgid ""
8489
"\n"
8490
"Intent\n"
8491
"------"
8492
msgstr ""
8493
8494
#: en/help_topics/authentication.txt:8
8495
msgid ""
8496
"Many different authentication policies can be described in the\n"
8497
"``authentication.conf`` file but a particular user should need only a few\n"
8498
"definitions to cover his needs without having to specify a user and a "
8499
"password\n"
8500
"for every branch he uses."
8501
msgstr ""
8502
8503
#: en/help_topics/authentication.txt:13
8504
msgid ""
8505
"The definitions found in this file are used to find the credentials to use "
8506
"for\n"
8507
"a given url. The same credentials can generally be used for as many branches "
8508
"as\n"
8509
"possible by grouping their declaration around the remote servers that need\n"
8510
"them. It's even possible to declare credentials that will be used by "
8511
"different\n"
8512
"servers."
8513
msgstr ""
8514
8515
#: en/help_topics/authentication.txt:19
8516
msgid ""
8517
"The intent is to make this file as small as possible to minimize maintenance."
8518
msgstr ""
8519
8520
#: en/help_topics/authentication.txt:21
8521
msgid ""
8522
"Once the relevant credentials are declared in this file you may use branch "
8523
"urls\n"
8524
"without embedding passwords (security hazard) or even users (enabling "
8525
"sharing\n"
8526
"of your urls with others)."
8527
msgstr ""
8528
8529
#: en/help_topics/authentication.txt:25
8530
msgid "Instead of using::"
8531
msgstr ""
8532
8533
#: en/help_topics/authentication.txt:27
8534
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8535
msgstr ""
8536
8537
#: en/help_topics/authentication.txt:29
8538
msgid "you simply use::"
8539
msgstr ""
8540
8541
#: en/help_topics/authentication.txt:31
8542
msgid " bzr branch ftp://host.com/path/to/my/branch"
8543
msgstr ""
8544
8545
#: en/help_topics/authentication.txt:33
8546
msgid ""
8547
"provided you have created the following ``authentication.conf`` file::"
8548
msgstr ""
8549
8550
#: en/help_topics/authentication.txt:35
8551
msgid ""
8552
" [myprojects]\n"
8553
" scheme=ftp\n"
8554
" host=host.com\n"
8555
" user=joe\n"
8556
" password=secret\n"
8557
" "
8558
msgstr ""
8559
8560
#: en/help_topics/authentication.txt:42
8561
msgid ""
8562
"Authentication definitions\n"
8563
"--------------------------"
8564
msgstr ""
8565
8566
#: en/help_topics/authentication.txt:45
8567
msgid ""
8568
"There are two kinds of authentication used by the various schemes supported "
8569
"by\n"
8570
"bzr:"
8571
msgstr ""
8572
8573
#: en/help_topics/authentication.txt:48
8574
msgid "1. user and password"
8575
msgstr ""
8576
8577
#: en/help_topics/authentication.txt:50
8578
msgid ""
8579
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8580
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8581
"ssh agents are a better, more secure solution. So we have chosen to not "
8582
"provide\n"
8583
"our own less secure method."
8584
msgstr ""
8585
8586
#: en/help_topics/authentication.txt:55
8587
msgid "2. user, realm and password"
8588
msgstr ""
8589
8590
#: en/help_topics/authentication.txt:57
8591
msgid ""
8592
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8593
"against a host. But, by using ``.htaccess`` files, for example, it is "
8594
"possible\n"
8595
"to define several (``user, realm, password``) for a given ``host``. So what "
8596
"is\n"
8597
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8598
"is\n"
8599
"not taken into account in the definitions, but will displayed if bzr "
8600
"prompts\n"
8601
"you for a password."
8602
msgstr ""
8603
8604
#: en/help_topics/authentication.txt:64
8605
msgid ""
8606
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8607
"specifying the appropriate port."
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:67
8611
msgid ""
8612
"To take all schemes into account, the password will be deduced from a set "
8613
"of\n"
8614
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8615
"``user``,\n"
8616
"``password``)."
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:71
8620
msgid ""
8621
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8622
"used\n"
8623
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8624
"``ssh``\n"
8625
" should be used instead since this is the real scheme regarding\n"
8626
" authentication,"
8627
msgstr ""
8628
8629
#: en/help_topics/authentication.txt:76
8630
msgid " * ``host``: can be empty (to act as a default for any host),"
8631
msgstr ""
8632
8633
#: en/help_topics/authentication.txt:78
8634
msgid ""
8635
" * ``port`` can be empty (useful when an host provides several servers for "
8636
"the\n"
8637
" same scheme), only numerical values are allowed, this should be used "
8638
"only\n"
8639
" when the server uses a port different than the scheme standard port,"
8640
msgstr ""
8641
8642
#: en/help_topics/authentication.txt:82
8643
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:84
8647
msgid ""
8648
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8649
" ``getpass.get_user()``),"
8650
msgstr ""
8651
8652
#: en/help_topics/authentication.txt:87
8653
msgid ""
8654
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8655
" password."
8656
msgstr ""
8657
8658
#: en/help_topics/authentication.txt:90
8659
msgid ""
8660
"Multiple definitions can be provided and, for a given URL, bzr will select "
8661
"a\n"
8662
"(``user`` [, ``password``]) based on the following rules :"
8663
msgstr ""
8664
8665
#: en/help_topics/authentication.txt:93
8666
msgid " 1. the first match wins,"
8667
msgstr ""
8668
8669
#: en/help_topics/authentication.txt:95
8670
msgid " 2. empty fields match everything,"
8671
msgstr ""
8672
8673
#: en/help_topics/authentication.txt:97
8674
msgid ""
8675
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8676
msgstr ""
8677
8678
#: en/help_topics/authentication.txt:99
8679
msgid ""
8680
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8681
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8682
"``projectbzr.sf.net``\n"
8683
" will not match ``bzr.sf.net``)."
8684
msgstr ""
8685
8686
#: en/help_topics/authentication.txt:103
8687
msgid ""
8688
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8689
msgstr ""
8690
8691
#: en/help_topics/authentication.txt:105
8692
msgid ""
8693
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8694
"above,\n"
8695
" empty paths will match any provided path)."
8696
msgstr ""
8697
8698
#: en/help_topics/authentication.txt:110
8699
msgid ""
8700
"File format\n"
8701
"-----------"
8702
msgstr ""
8703
8704
#: en/help_topics/authentication.txt:113
8705
msgid ""
8706
"The general rules for :doc:`configuration files <configuration-help>`\n"
8707
"apply except for the variable policies."
8708
msgstr ""
8709
8710
#: en/help_topics/authentication.txt:116
8711
msgid "Each section describes an authentication definition."
8712
msgstr ""
8713
8714
#: en/help_topics/authentication.txt:118
8715
msgid ""
8716
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8717
"reserved\n"
8718
"and should appear as the *last* section."
8719
msgstr ""
8720
8721
#: en/help_topics/authentication.txt:121
8722
msgid "Each section should define:"
8723
msgstr ""
8724
8725
#: en/help_topics/authentication.txt:123
8726
msgid "* ``user``: the login to be used,"
8727
msgstr ""
8728
8729
#: en/help_topics/authentication.txt:125
8730
msgid "Each section could define:"
8731
msgstr ""
8732
8733
#: en/help_topics/authentication.txt:127
8734
msgid "* ``host``: the remote server,"
8735
msgstr ""
8736
8737
#: en/help_topics/authentication.txt:129
8738
msgid "* ``port``: the port the server is listening,"
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:131
8742
msgid "* ``path``: the branch location,"
8743
msgstr ""
8744
8745
#: en/help_topics/authentication.txt:133
8746
msgid "* ``password``: the password."
8747
msgstr ""
8748
8749
#: en/help_topics/authentication.txt:135
8750
msgid ""
8751
"\n"
8752
"Examples\n"
8753
"--------"
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:139
8757
msgid ""
8758
"\n"
8759
"Personal projects hosted outside\n"
8760
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8761
msgstr ""
8762
8763
#: en/help_topics/authentication.txt:143
8764
msgid ""
8765
"All connections are done with the same ``user`` (the remote one for which "
8766
"the\n"
8767
"default bzr one is not appropriate) and the password is always prompted "
8768
"with\n"
8769
"some exceptions::"
8770
msgstr ""
8771
8772
#: en/help_topics/authentication.txt:147
8773
msgid ""
8774
" # Pet projects on hobby.net\n"
8775
" [hobby]\n"
8776
" host=r.hobby.net\n"
8777
" user=jim\n"
8778
" password=obvious1234\n"
8779
" \n"
8780
" # Home server\n"
8781
" [home]\n"
8782
" scheme=https\n"
8783
" host=home.net\n"
8784
" user=joe\n"
8785
" password=1essobV10us\n"
8786
" \n"
8787
" [DEFAULT]\n"
8788
" # Our local user is barbaz, on all remote sites we're known as "
8789
"foobar\n"
8790
" user=foobar"
8791
msgstr ""
8792
8793
#: en/help_topics/authentication.txt:164
8794
msgid ""
8795
"\n"
8796
"Source hosting provider\n"
8797
"~~~~~~~~~~~~~~~~~~~~~~~"
8798
msgstr ""
8799
8800
#: en/help_topics/authentication.txt:168
8801
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8802
msgstr ""
8803
8804
#: en/help_topics/authentication.txt:170
8805
msgid ""
8806
" [shpnet domain]\n"
8807
" # we use sftp, but ssh is the scheme used for authentication\n"
8808
" scheme=ssh\n"
8809
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8810
" host=.shp.net\n"
8811
" user=joe\n"
8812
" # bzr don't support supplying a password for sftp,\n"
8813
" # consider using an ssh agent if you don't want to supply\n"
8814
" # a password interactively. (pageant, ssh-agent, etc)"
8815
msgstr ""
8816
8817
#: en/help_topics/authentication.txt:180
8818
msgid ""
8819
"HTTPS, SFTP servers and their proxy\n"
8820
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8821
msgstr ""
8822
8823
#: en/help_topics/authentication.txt:183
8824
msgid ""
8825
"At company.com, the server hosting release and integration branches is "
8826
"behind a\n"
8827
"proxy, and the two branches use different authentication policies::"
8828
msgstr ""
8829
8830
#: en/help_topics/authentication.txt:186
8831
msgid ""
8832
" [reference code]\n"
8833
" scheme=https\n"
8834
" host=dev.company.com\n"
8835
" path=/dev\n"
8836
" user=user1\n"
8837
" password=pass1"
8838
msgstr ""
8839
8840
#: en/help_topics/authentication.txt:193
8841
msgid ""
8842
" # development branches on dev server\n"
8843
" [dev]\n"
8844
" scheme=ssh # bzr+ssh and sftp are available here\n"
8845
" host=dev.company.com\n"
8846
" path=/dev/integration\n"
8847
" user=user2\n"
8848
" \n"
8849
" # proxy\n"
8850
" [proxy]\n"
8851
" scheme=http\n"
8852
" host=proxy.company.com\n"
8853
" port=3128\n"
8854
" user=proxyuser1\n"
8855
" password=proxypass1"
8856
msgstr ""
8857
8858
#: en/help_topics/authentication.txt:208
8859
msgid ""
8860
"\n"
8861
"Planned enhancements\n"
8862
"--------------------"
8863
msgstr ""
8864
8865
#: en/help_topics/authentication.txt:212
8866
msgid ""
8867
"The following are not yet implemented but planned as parts of a work in\n"
8868
"progress:"
8869
msgstr ""
8870
8871
#: en/help_topics/authentication.txt:215
8872
msgid "* add a ``password_encoding`` field allowing:"
8873
msgstr ""
8874
8875
#: en/help_topics/authentication.txt:217
8876
msgid ""
8877
" - storing the passwords in various obfuscating encodings (base64 for one),"
8878
msgstr ""
8879
8880
#: en/help_topics/authentication.txt:219
8881
msgid " - delegate password storage to plugins (.netrc for example)."
8882
msgstr ""
8883
8884
#: en/help_topics/authentication.txt:221
8885
msgid ""
8886
"* update the credentials when the user is prompted for user or password,"
8887
msgstr ""
8888
8889
#: en/help_topics/authentication.txt:223
8890
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8891
msgstr ""
8892
8893
#: en/help_topics/authentication.txt:225
8894
msgid ""
8895
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8896
"but\n"
8897
"ignored in the actual implementation.\n"
8898
msgstr ""
8899
8900
#: en/help_topics/bugs.txt:1
8901
msgid "Bug Tracker Settings"
8902
msgstr ""
8903
8904
#: en/help_topics/bugs.txt:3
8905
msgid ""
8906
"When making a commit, metadata about bugs fixed by that change can be\n"
8907
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8908
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8909
"(The only ``status`` value currently supported is ``fixed.``)"
8910
msgstr ""
8911
8912
#: en/help_topics/bugs.txt:8
8913
msgid ""
8914
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8915
"identifier\n"
8916
"rather than a full URL. This looks like::"
8917
msgstr ""
8918
8919
#: en/help_topics/bugs.txt:11
8920
msgid " bzr commit --fixes <tracker>:<id>"
8921
msgstr ""
8922
8923
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8924
msgid "or::"
8925
msgstr ""
8926
8927
#: en/help_topics/bugs.txt:15
8928
msgid " bzr commit --fixes <id>"
8929
msgstr ""
8930
8931
#: en/help_topics/bugs.txt:17
8932
msgid ""
8933
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8934
"the\n"
8935
"identifier for that bug within the bugtracker, usually the bug number.\n"
8936
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8937
"or global configuration is used."
8938
msgstr ""
8939
8940
#: en/help_topics/bugs.txt:22
8941
msgid ""
8942
"Bazaar knows about a few bug trackers that have many users. If\n"
8943
"you use one of these bug trackers then there is no setup required to\n"
8944
"use this feature, you just need to know the tracker identifier to use.\n"
8945
"These are the bugtrackers that are built in:"
8946
msgstr ""
8947
8948
#: en/help_topics/bugs.txt:27
8949
msgid ""
8950
" ============================ ============ ============\n"
8951
" URL Abbreviation Example\n"
8952
" ============================ ============ ============\n"
8953
" https://bugs.launchpad.net/ lp lp:12345\n"
8954
" http://bugs.debian.org/ deb deb:12345\n"
8955
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8956
" ============================ ============ ============"
8957
msgstr ""
8958
8959
#: en/help_topics/bugs.txt:35
8960
msgid ""
8961
"For the bug trackers not listed above configuration is required.\n"
8962
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8963
"is built in, along with a template mechanism for other bugtrackers with\n"
8964
"simple URL schemes. If your bug tracker can't be described by one\n"
8965
"of the schemes described below then you can write a plugin to support\n"
8966
"it."
8967
msgstr ""
8968
8969
#: en/help_topics/bugs.txt:42
8970
msgid ""
8971
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8972
"variable which contains the base URL of the bug tracker. These options\n"
8973
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8974
"configuration section in ``locations.conf``. You can set up these values\n"
8975
"for each of the projects you work on."
8976
msgstr ""
8977
8978
#: en/help_topics/bugs.txt:48
8979
msgid ""
8980
"Note: As you provide a short name for each tracker, you can specify one or\n"
8981
"more bugs in one or more trackers at commit time if you wish."
8982
msgstr ""
8983
8984
#: en/help_topics/bugs.txt:51
8985
msgid ""
8986
"Launchpad\n"
8987
"---------"
8988
msgstr ""
8989
8990
#: en/help_topics/bugs.txt:54
8991
msgid ""
8992
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8993
msgstr ""
8994
8995
#: en/help_topics/bugs.txt:56
8996
msgid ""
8997
"bugzilla_<tracker>_url\n"
8998
"----------------------"
8999
msgstr ""
9000
9001
#: en/help_topics/bugs.txt:59
9002
msgid ""
9003
"If present, the location of the Bugzilla bug tracker referred to by\n"
9004
"<tracker>. This option can then be used together with ``bzr commit\n"
9005
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9006
"example::"
9007
msgstr ""
9008
9009
#: en/help_topics/bugs.txt:64
9010
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9011
msgstr ""
9012
9013
#: en/help_topics/bugs.txt:66
9014
msgid ""
9015
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9016
"fixed."
9017
msgstr ""
9018
9019
#: en/help_topics/bugs.txt:69
9020
msgid ""
9021
"trac_<tracker>_url\n"
9022
"------------------"
9023
msgstr ""
9024
9025
#: en/help_topics/bugs.txt:72
9026
msgid ""
9027
"If present, the location of the Trac instance referred to by\n"
9028
"<tracker>. This option can then be used together with ``bzr commit\n"
9029
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9030
"example::"
9031
msgstr ""
9032
9033
#: en/help_topics/bugs.txt:77
9034
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9035
msgstr ""
9036
9037
#: en/help_topics/bugs.txt:79
9038
msgid ""
9039
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9040
"as\n"
9041
"fixed."
9042
msgstr ""
9043
9044
#: en/help_topics/bugs.txt:82
9045
msgid ""
9046
"bugtracker_<tracker>_url\n"
9047
"------------------------"
9048
msgstr ""
9049
9050
#: en/help_topics/bugs.txt:85
9051
msgid ""
9052
"If present, the location of a generic bug tracker instance referred to by\n"
9053
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9054
"which will be replaced by a specific bug ID. This option can then be used\n"
9055
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9056
"fixed by that commit. For example::"
9057
msgstr ""
9058
9059
#: en/help_topics/bugs.txt:91
9060
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9061
msgstr ""
9062
9063
#: en/help_topics/bugs.txt:93
9064
msgid ""
9065
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9066
"Roundup bug tracker as fixed, or::"
9067
msgstr ""
9068
9069
#: en/help_topics/bugs.txt:96
9070
msgid ""
9071
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9072
msgstr ""
9073
9074
#: en/help_topics/bugs.txt:98
9075
msgid ""
9076
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9077
"RT bug tracker as fixed, or::"
9078
msgstr ""
9079
9080
#: en/help_topics/bugs.txt:101
9081
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9082
msgstr ""
9083
9084
#: en/help_topics/bugs.txt:103
9085
msgid ""
9086
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9087
"1234\n"
9088
"in Hudson's JIRA bug tracker as fixed.\n"
9089
msgstr ""
9090
9091
#: en/help_topics/commands.txt:1
9092
msgid ""
9093
"add Add specified files or directories.\n"
9094
"alias Set/unset and display aliases.\n"
9095
"annotate Show the origin of each line in a file.\n"
9096
"bash-completion Generate a shell function for bash command line "
9097
"completion.\n"
9098
" [bash_completion]\n"
9099
"bind Convert the current branch into a checkout of the "
9100
"supplied\n"
9101
" branch.\n"
9102
"branch Create a new branch that is a copy of an existing branch.\n"
9103
"branches List the branches available at the current location.\n"
9104
"break-lock Break a dead lock.\n"
9105
"cat Write the contents of a file as of a given revision to\n"
9106
" standard output.\n"
9107
"check Validate working tree structure, branch consistency and\n"
9108
" repository history.\n"
9109
"checkout Create a new checkout of an existing branch.\n"
9110
"clean-tree Remove unwanted files from working tree.\n"
9111
"commit Commit changes into a new revision.\n"
9112
"config Display, set or remove a configuration option.\n"
9113
"conflicts List files with conflicts.\n"
9114
"deleted List files deleted in the working tree.\n"
9115
"diff Show differences in the working tree, between revisions "
9116
"or\n"
9117
" branches.\n"
9118
"dpush Push into a different VCS without any custom bzr "
9119
"metadata.\n"
9120
"export Export current or past revision to a destination directory "
9121
"or\n"
9122
" archive.\n"
9123
"grep Print lines matching PATTERN for specified files and\n"
9124
" revisions. [grep]\n"
9125
"help Show help on a command or other topic.\n"
9126
"ignore Ignore specified files or patterns.\n"
9127
"ignored List ignored files and the patterns that matched them.\n"
9128
"info Show information about a working tree, branch or "
9129
"repository.\n"
9130
"init Make a directory into a versioned branch.\n"
9131
"init-repository Create a shared repository for branches to share storage\n"
9132
" space.\n"
9133
"join Combine a tree into its containing tree.\n"
9134
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9135
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9136
"launchpad-open Open a Launchpad branch page in your web browser. "
9137
"[launchpad]\n"
9138
"log Show historical log for a branch or subset of a branch.\n"
9139
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9140
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9141
"ls List files in a tree.\n"
9142
"merge Perform a three-way merge.\n"
9143
"missing Show unmerged/unpulled revisions between two branches.\n"
9144
"mkdir Create a new versioned directory.\n"
9145
"mv Move or rename a file.\n"
9146
"nick Print or set the branch nickname.\n"
9147
"pack Compress the data within a repository.\n"
9148
"ping Pings a Bazaar smart server.\n"
9149
"plugins List the installed plugins.\n"
9150
"pull Turn this branch into a mirror of another branch.\n"
9151
"push Update a mirror of this branch.\n"
9152
"reconcile Reconcile bzr metadata in a branch.\n"
9153
"reconfigure Reconfigure the type of a bzr directory.\n"
9154
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9155
"remerge Redo a merge.\n"
9156
"remove Remove files or directories.\n"
9157
"remove-branch Remove a branch.\n"
9158
"remove-tree Remove the working tree from a given branch/checkout.\n"
9159
"renames Show list of renamed files.\n"
9160
"resolve Mark a conflict as resolved.\n"
9161
"revert Set files in the working tree back to the contents of a\n"
9162
" previous revision.\n"
9163
"revno Show current revision number.\n"
9164
"root Show the tree root directory.\n"
9165
"send Mail or create a merge-directive for submitting changes.\n"
9166
"serve Run the bzr server.\n"
9167
"shelve Temporarily set aside some changes from the current tree.\n"
9168
"sign-my-commits Sign all commits by a given committer.\n"
9169
"split Split a subdirectory of a tree into a separate tree.\n"
9170
"status Display status summary.\n"
9171
"switch Set the branch of a checkout and update.\n"
9172
"tag Create, remove or modify a tag naming a revision.\n"
9173
"tags List tags.\n"
9174
"testament Show testament (signing-form) of a revision.\n"
9175
"unbind Convert the current checkout into a regular branch.\n"
9176
"uncommit Remove the last committed revision.\n"
9177
"unshelve Restore shelved changes.\n"
9178
"update Update a working tree to a new revision.\n"
9179
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9180
" format.\n"
9181
"verify-signatures Verify all commit signatures.\n"
9182
"version Show version of bzr.\n"
9183
"version-info Show version information about this tree.\n"
9184
"view Manage filtered views.\n"
9185
"whoami Show or set bzr user id.\n"
9186
msgstr ""
9187
9188
#: en/help_topics/configuration.txt:1
9189
msgid ""
9190
"Configuration Settings\n"
9191
"======================="
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:4
9195
msgid ""
9196
"Environment settings\n"
9197
"---------------------"
9198
msgstr ""
9199
9200
#: en/help_topics/configuration.txt:7
9201
msgid ""
9202
"While most configuration is handled by configuration files, some options\n"
9203
"which may be semi-permanent can also be controlled through the environment."
9204
msgstr ""
9205
9206
#: en/help_topics/configuration.txt:10
9207
msgid ""
9208
"BZR_EMAIL\n"
9209
"~~~~~~~~~"
9210
msgstr ""
9211
9212
#: en/help_topics/configuration.txt:13
9213
msgid "Override the email id used by Bazaar. Typical format::"
9214
msgstr ""
9215
9216
#: en/help_topics/configuration.txt:15
9217
msgid " \"John Doe <jdoe@example.com>\""
9218
msgstr ""
9219
9220
#: en/help_topics/configuration.txt:17
9221
msgid "See also the ``email`` configuration option."
9222
msgstr ""
9223
9224
#: en/help_topics/configuration.txt:19
9225
msgid ""
9226
"BZR_PROGRESS_BAR\n"
9227
"~~~~~~~~~~~~~~~~"
9228
msgstr ""
9229
9230
#: en/help_topics/configuration.txt:22
9231
msgid ""
9232
"Override the progress display. Possible values are \"none\" or \"text\". "
9233
"If\n"
9234
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9235
"draws\n"
9236
"the ordinary command line progress bar."
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:26
9240
msgid ""
9241
"BZR_SIGQUIT_PDB\n"
9242
"~~~~~~~~~~~~~~~"
9243
msgstr ""
9244
9245
#: en/help_topics/configuration.txt:29
9246
msgid ""
9247
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9248
msgstr ""
9249
9250
#: en/help_topics/configuration.txt:31
9251
msgid ""
9252
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9253
"* 1 = Invoke breakin debugger (default)"
9254
msgstr ""
9255
9256
#: en/help_topics/configuration.txt:34
9257
msgid ""
9258
"BZR_HOME\n"
9259
"~~~~~~~~"
9260
msgstr ""
9261
9262
#: en/help_topics/configuration.txt:37
9263
msgid "Override the home directory used by Bazaar."
9264
msgstr ""
9265
9266
#: en/help_topics/configuration.txt:39
9267
msgid ""
9268
"BZR_SSH\n"
9269
"~~~~~~~"
9270
msgstr ""
9271
9272
#: en/help_topics/configuration.txt:42
9273
msgid "Select a different SSH implementation."
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:44
9277
msgid ""
9278
"BZR_PDB\n"
9279
"~~~~~~~"
9280
msgstr ""
9281
9282
#: en/help_topics/configuration.txt:47
9283
msgid "Control whether to launch a debugger on error."
9284
msgstr ""
9285
9286
#: en/help_topics/configuration.txt:49
9287
msgid ""
9288
"* 0 = Standard behavior\n"
9289
"* 1 = Launch debugger"
9290
msgstr ""
9291
9292
#: en/help_topics/configuration.txt:52
9293
msgid ""
9294
"BZR_REMOTE_PATH\n"
9295
"~~~~~~~~~~~~~~~"
9296
msgstr ""
9297
9298
#: en/help_topics/configuration.txt:55
9299
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9300
msgstr ""
9301
9302
#: en/help_topics/configuration.txt:57
9303
msgid "See also the ``bzr_remote_path`` configuration option."
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:59
9307
msgid ""
9308
"BZR_EDITOR\n"
9309
"~~~~~~~~~~"
9310
msgstr ""
9311
9312
#: en/help_topics/configuration.txt:62
9313
msgid "Path to the editor Bazaar should use for commit messages, etc."
9314
msgstr ""
9315
9316
#: en/help_topics/configuration.txt:64
9317
msgid ""
9318
"BZR_LOG\n"
9319
"~~~~~~~"
9320
msgstr ""
9321
9322
#: en/help_topics/configuration.txt:67
9323
msgid ""
9324
"Location of the Bazaar log file. You can check the current location by\n"
9325
"running ``bzr version``."
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:70
9329
msgid ""
9330
"The log file contains debug information that is useful for diagnosing or\n"
9331
"reporting problems with Bazaar."
9332
msgstr ""
9333
9334
#: en/help_topics/configuration.txt:73
9335
msgid ""
9336
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9337
"will disable logging."
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:76
9341
msgid ""
9342
"\n"
9343
"BZR_PLUGIN_PATH\n"
9344
"~~~~~~~~~~~~~~~"
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:80
9348
msgid ""
9349
"The path to the plugins directory that Bazaar should use.\n"
9350
"If not set, Bazaar will search for plugins in:"
9351
msgstr ""
9352
9353
#: en/help_topics/configuration.txt:83
9354
msgid ""
9355
"* the user specific plugin directory (containing the ``user`` plugins),"
9356
msgstr ""
9357
9358
#: en/help_topics/configuration.txt:85
9359
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9360
msgstr ""
9361
9362
#: en/help_topics/configuration.txt:87
9363
msgid ""
9364
"* the site specific plugin directory if applicable (containing\n"
9365
" the ``site`` plugins)."
9366
msgstr ""
9367
9368
#: en/help_topics/configuration.txt:90
9369
msgid ""
9370
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9371
"the way the plugin are searched. "
9372
msgstr ""
9373
9374
#: en/help_topics/configuration.txt:93
9375
msgid ""
9376
"As for the ``PATH`` variables, if multiple directories are\n"
9377
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9378
"platform specific appropriate character (':' on Unix,\n"
9379
"';' on windows)"
9380
msgstr ""
9381
9382
#: en/help_topics/configuration.txt:98
9383
msgid ""
9384
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9385
"in ``user``. However it will continue to search in ``core`` and\n"
9386
"``site`` unless they are explicitly removed."
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:102
9390
msgid ""
9391
"If you need to change the order or remove one of these\n"
9392
"directories, you should use special values:"
9393
msgstr ""
9394
9395
#: en/help_topics/configuration.txt:105
9396
msgid ""
9397
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9398
" path from the default values,"
9399
msgstr ""
9400
9401
#: en/help_topics/configuration.txt:108
9402
msgid ""
9403
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9404
" before the remaining default values (and also remove it from\n"
9405
" the default values)."
9406
msgstr ""
9407
9408
#: en/help_topics/configuration.txt:112
9409
msgid ""
9410
"Note that the special values 'user', 'core' and 'site' should be\n"
9411
"used literally, they will be substituted by the corresponding,\n"
9412
"platform specific, values."
9413
msgstr ""
9414
9415
#: en/help_topics/configuration.txt:116
9416
msgid ""
9417
"The examples below use ':' as the separator, windows users\n"
9418
"should use ';'."
9419
msgstr ""
9420
9421
#: en/help_topics/configuration.txt:119
9422
msgid "Overriding the default user plugin directory::"
9423
msgstr ""
9424
9425
#: en/help_topics/configuration.txt:121
9426
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9427
msgstr ""
9428
9429
#: en/help_topics/configuration.txt:123
9430
msgid "Disabling the site directory while retaining the user directory::"
9431
msgstr ""
9432
9433
#: en/help_topics/configuration.txt:125
9434
msgid " BZR_PLUGIN_PATH='-site:+user'"
9435
msgstr ""
9436
9437
#: en/help_topics/configuration.txt:127
9438
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:129
9442
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9443
msgstr ""
9444
9445
#: en/help_topics/configuration.txt:131
9446
msgid "Overriding the default site plugin directory::"
9447
msgstr ""
9448
9449
#: en/help_topics/configuration.txt:133
9450
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9451
msgstr ""
9452
9453
#: en/help_topics/configuration.txt:135
9454
msgid ""
9455
"BZR_DISABLE_PLUGINS\n"
9456
"~~~~~~~~~~~~~~~~~~~"
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:138
9460
msgid ""
9461
"Under special circumstances (mostly when trying to diagnose a\n"
9462
"bug), it's better to disable a plugin (or several) rather than\n"
9463
"uninstalling them completely. Such plugins can be specified in\n"
9464
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9465
msgstr ""
9466
9467
#: en/help_topics/configuration.txt:143
9468
msgid ""
9469
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9470
"will raise an import error if they are explicitly imported (by\n"
9471
"another plugin that depends on them for example)."
9472
msgstr ""
9473
9474
#: en/help_topics/configuration.txt:147
9475
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9476
msgstr ""
9477
9478
#: en/help_topics/configuration.txt:149
9479
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9480
msgstr ""
9481
9482
#: en/help_topics/configuration.txt:151
9483
msgid ""
9484
"BZR_PLUGINS_AT\n"
9485
"~~~~~~~~~~~~~~"
9486
msgstr ""
9487
9488
#: en/help_topics/configuration.txt:154
9489
msgid ""
9490
"When adding a new feature or working on a bug in a plugin,\n"
9491
"developers often need to use a specific version of a given\n"
9492
"plugin. Since python requires that the directory containing the\n"
9493
"code is named like the plugin itself this make it impossible to\n"
9494
"use arbitrary directory names (using a two-level directory scheme\n"
9495
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9496
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9497
msgstr ""
9498
9499
#: en/help_topics/configuration.txt:162
9500
msgid ""
9501
"Plugins specified in this environment variable takes precedence\n"
9502
"over the ones in ``BZR_PLUGIN_PATH``."
9503
msgstr ""
9504
9505
#: en/help_topics/configuration.txt:165
9506
msgid ""
9507
"The variable specified a list of ``plugin_name@plugin path``,\n"
9508
"``plugin_name`` being the name of the plugin as it appears in\n"
9509
"python module paths, ``plugin_path`` being the path to the\n"
9510
"directory containing the plugin code itself\n"
9511
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9512
"separator, use ';' on windows."
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:172
9516
msgid ""
9517
"Example:\n"
9518
"~~~~~~~~"
9519
msgstr ""
9520
9521
#: en/help_topics/configuration.txt:175
9522
msgid ""
9523
"Using a specific version of ``myplugin``:\n"
9524
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:178
9528
msgid ""
9529
"BZRPATH\n"
9530
"~~~~~~~"
9531
msgstr ""
9532
9533
#: en/help_topics/configuration.txt:181
9534
msgid "The path where Bazaar should look for shell plugin external commands."
9535
msgstr ""
9536
9537
#: en/help_topics/configuration.txt:183
9538
msgid ""
9539
"\n"
9540
"http_proxy, https_proxy\n"
9541
"~~~~~~~~~~~~~~~~~~~~~~~"
9542
msgstr ""
9543
9544
#: en/help_topics/configuration.txt:187
9545
msgid "Specifies the network proxy for outgoing connections, for example::"
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:189
9549
msgid ""
9550
" http_proxy=http://proxy.example.com:3128/ \n"
9551
" https_proxy=http://proxy.example.com:3128/"
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:192
9555
msgid ""
9556
"\n"
9557
"Configuration files\n"
9558
"-------------------"
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:196
9562
msgid ""
9563
"Location\n"
9564
"~~~~~~~~"
9565
msgstr ""
9566
9567
#: en/help_topics/configuration.txt:199
9568
msgid ""
9569
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9570
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9571
"on\n"
9572
"Windows. (You can check the location for your system by using\n"
9573
"``bzr version``.)"
9574
msgstr ""
9575
9576
#: en/help_topics/configuration.txt:204
9577
msgid "There are three primary configuration files in this location:"
9578
msgstr ""
9579
9580
#: en/help_topics/configuration.txt:206
9581
msgid "* ``bazaar.conf`` describes default configuration options,"
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:208
9585
msgid ""
9586
"* ``locations.conf`` describes configuration information for\n"
9587
" specific branch locations,"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:211
9591
msgid ""
9592
"* ``authentication.conf`` describes credential information for\n"
9593
" remote servers."
9594
msgstr ""
9595
9596
#: en/help_topics/configuration.txt:214
9597
msgid ""
9598
"Each branch can also contain a configuration file that sets values specific\n"
9599
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9600
"the\n"
9601
"branch. This file is visible to all users of a branch, if you wish to "
9602
"override\n"
9603
"one of the values for a branch with a setting that is specific to you then "
9604
"you\n"
9605
"can do so in ``locations.conf``."
9606
msgstr ""
9607
9608
#: en/help_topics/configuration.txt:220
9609
msgid ""
9610
"General format\n"
9611
"~~~~~~~~~~~~~~"
9612
msgstr ""
9613
9614
#: en/help_topics/configuration.txt:223
9615
msgid ""
9616
"An ini file has three types of contructs: section headers, section\n"
9617
"options and comments."
9618
msgstr ""
9619
9620
#: en/help_topics/configuration.txt:226
9621
msgid ""
9622
"Comments\n"
9623
"^^^^^^^^"
9624
msgstr ""
9625
9626
#: en/help_topics/configuration.txt:229
9627
msgid ""
9628
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9629
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9630
"Bazaar when parsing ini files."
9631
msgstr ""
9632
9633
#: en/help_topics/configuration.txt:233
9634
msgid ""
9635
"Section headers\n"
9636
"^^^^^^^^^^^^^^^"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:236
9640
msgid ""
9641
"A section header is a word enclosed in brackets that starts at the begining\n"
9642
"of a line. A typical section header looks like this::"
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:239
9646
msgid " [DEFAULT]"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:241
9650
msgid ""
9651
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9652
"[ALIASES]. Section headers are case sensitive. The default section provides "
9653
"for\n"
9654
"setting options which can be overridden with the branch config file."
9655
msgstr ""
9656
9657
#: en/help_topics/configuration.txt:245
9658
msgid ""
9659
"For ``locations.conf``, the options from the section with the\n"
9660
"longest matching section header are used to the exclusion of other\n"
9661
"potentially valid section headers. A section header uses the path for\n"
9662
"the branch as the section header. Some examples include::"
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:250
9666
msgid ""
9667
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9668
" [/home/jdoe/branches/]"
9669
msgstr ""
9670
9671
#: en/help_topics/configuration.txt:253
9672
msgid ""
9673
"\n"
9674
"Section options\n"
9675
"^^^^^^^^^^^^^^^"
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:257
9679
msgid ""
9680
"A section option resides within a section. A section option contains an\n"
9681
"option name, an equals sign and a value. For example::"
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:260
9685
msgid ""
9686
" email = John Doe <jdoe@isp.com>\n"
9687
" gpg_signing_key = Amy Pond <amy@example.com>"
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:263
9691
msgid ""
9692
"A option can reference other options by enclosing them in curly brackets::"
9693
msgstr ""
9694
9695
#: en/help_topics/configuration.txt:265
9696
msgid ""
9697
" my_branch_name = feature_x\n"
9698
" my_server = bzr+ssh://example.com\n"
9699
" push_location = {my_server}/project/{my_branch_name}"
9700
msgstr ""
9701
9702
#: en/help_topics/configuration.txt:269
9703
msgid ""
9704
"Option policies\n"
9705
"^^^^^^^^^^^^^^^"
9706
msgstr ""
9707
9708
#: en/help_topics/configuration.txt:272
9709
msgid ""
9710
"Options defined in a section affect the named directory or URL plus\n"
9711
"any locations they contain. Policies can be used to change how an\n"
9712
"option value is interpreted for contained locations. Currently\n"
9713
"there are three policies available:"
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:277
9717
msgid ""
9718
" none:\n"
9719
" the value is interpreted the same for contained locations. This is\n"
9720
" the default behaviour.\n"
9721
" norecurse:\n"
9722
" the value is only used for the exact location specified by the\n"
9723
" section name.\n"
9724
" appendpath:\n"
9725
" for contained locations, any additional path components are\n"
9726
" appended to the value."
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:287
9730
msgid ""
9731
"Policies are specified by keys with names of the form "
9732
"\"<option_name>:policy\".\n"
9733
"For example, to define the push location for a tree of branches, the\n"
9734
"following could be used::"
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:291
9738
msgid ""
9739
" [/top/location]\n"
9740
" push_location = sftp://example.com/location\n"
9741
" push_location:policy = appendpath"
9742
msgstr ""
9743
9744
#: en/help_topics/configuration.txt:295
9745
msgid ""
9746
"With this configuration, the push location for ``/top/location/branch1``\n"
9747
"would be ``sftp://example.com/location/branch1``."
9748
msgstr ""
9749
9750
#: en/help_topics/configuration.txt:298
9751
msgid ""
9752
"Section local options\n"
9753
"^^^^^^^^^^^^^^^^^^^^^"
9754
msgstr ""
9755
9756
#: en/help_topics/configuration.txt:301
9757
msgid ""
9758
"Some options are defined automatically inside a given section and can be\n"
9759
"refered to in this section only. "
9760
msgstr ""
9761
9762
#: en/help_topics/configuration.txt:304
9763
msgid "For example, the ``appendpath`` policy can be used like this::"
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:306
9767
msgid ""
9768
" [/home/vila/src/bzr/bugs]\n"
9769
" mypush = lp:~vila/bzr\n"
9770
" mypush:policy=appendpath"
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:310
9774
msgid "Using ``relpath`` to achieve the same result is done like this::"
9775
msgstr ""
9776
9777
#: en/help_topics/configuration.txt:312
9778
msgid ""
9779
" [/home/vila/src/bzr/bugs]\n"
9780
" mypush = lp:~vila/bzr/{relpath}"
9781
msgstr ""
9782
9783
#: en/help_topics/configuration.txt:315
9784
msgid ""
9785
"In both cases, when used in a directory like\n"
9786
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9790
msgid ""
9791
" $ bzr config mypush\n"
9792
" lp:~vila/bzr/832013-expand-in-stack"
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:321
9796
msgid "Another such option is ``basename`` which can be used like this::"
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:323
9800
msgid ""
9801
" [/home/vila/src/bzr]\n"
9802
" mypush = lp:~vila/bzr/{basename}"
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:326
9806
msgid ""
9807
"When used in a directory like\n"
9808
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:332
9812
msgid ""
9813
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9814
"itself is defined as the relative path between the section name and the\n"
9815
"location it matches."
9816
msgstr ""
9817
9818
#: en/help_topics/configuration.txt:336
9819
msgid ""
9820
"Another such option is ``branchname``, which refers to the name of a "
9821
"colocated\n"
9822
"branch. For non-colocated branches, it behaves like basename. It can be "
9823
"used\n"
9824
"like this::"
9825
msgstr ""
9826
9827
#: en/help_topics/configuration.txt:340
9828
msgid ""
9829
" [/home/vila/src/bzr/bugs]\n"
9830
" mypush = lp:~vila/bzr/{branchname}"
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:343
9834
msgid ""
9835
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9836
"get::"
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:345
9840
msgid ""
9841
" bzr config mypush\n"
9842
" lp:~vila/bzr/832013-expand-in-stack"
9843
msgstr ""
9844
9845
#: en/help_topics/configuration.txt:348
9846
msgid ""
9847
"When an option is local to a Section, it cannot be referred to from option\n"
9848
"values in any other section from the same ``Store`` nor from any other\n"
9849
"``Store``."
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:352
9853
msgid ""
9854
"\n"
9855
"The main configuration file, bazaar.conf\n"
9856
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:356
9860
msgid ""
9861
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9862
"The default section contains the default\n"
9863
"configuration options for all branches. The default section can be\n"
9864
"overriden by providing a branch-specific section in ``locations.conf``."
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:361
9868
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:363
9872
msgid ""
9873
" [DEFAULT]\n"
9874
" email = John Doe <jdoe@isp.com>\n"
9875
" editor = /usr/bin/vim\n"
9876
" create_signatures = when-required"
9877
msgstr ""
9878
9879
#: en/help_topics/configuration.txt:368
9880
msgid ""
9881
"\n"
9882
"The branch location configuration file, locations.conf\n"
9883
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:372
9887
msgid ""
9888
"``locations.conf`` allows one to specify overriding settings for\n"
9889
"a specific branch. The format is almost identical to the default section in\n"
9890
"bazaar.conf with one significant change: The section header, instead of "
9891
"saying\n"
9892
"default, will be the path to a branch that you wish to override a value\n"
9893
"for. The '?' and '*' wildcards are supported::"
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:378
9897
msgid ""
9898
" [/home/jdoe/branches/nethack]\n"
9899
" email = Nethack Admin <nethack@nethack.com>"
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:381
9903
msgid ""
9904
" [http://hypothetical.site.com/branches/devel-branch]\n"
9905
" create_signatures = always"
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:384
9909
msgid ""
9910
"The authentication configuration file, authentication.conf\n"
9911
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:387
9915
msgid ""
9916
"``authentication.conf`` allows one to specify credentials for\n"
9917
"remote servers. This can be used for all the supported transports and any "
9918
"part\n"
9919
"of bzr that requires authentication (smtp for example)."
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:391
9923
msgid ""
9924
"The syntax of the file obeys the same rules as the others except for the\n"
9925
"option policies which don't apply."
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:394
9929
msgid ""
9930
"For more information on the possible uses of the authentication "
9931
"configuration\n"
9932
"file see :doc:`authentication-help`."
9933
msgstr ""
9934
9935
#: en/help_topics/configuration.txt:397
9936
msgid ""
9937
"\n"
9938
"Common options\n"
9939
"--------------"
9940
msgstr ""
9941
9942
#: en/help_topics/configuration.txt:401
9943
msgid ""
9944
"debug_flags\n"
9945
"~~~~~~~~~~~"
9946
msgstr ""
9947
9948
#: en/help_topics/configuration.txt:404
9949
msgid ""
9950
"A comma-separated list of debugging options to turn on. The same values\n"
9951
"can be used as with the -D command-line option (see `help global-options`).\n"
9952
"For example::"
9953
msgstr ""
9954
9955
#: en/help_topics/configuration.txt:408
9956
msgid " debug_flags = hpss"
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:412
9960
msgid " debug_flags = hpss,evil"
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:414
9964
msgid ""
9965
"email\n"
9966
"~~~~~"
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:417
9970
msgid ""
9971
"The email address to use when committing a branch. Typically takes the form\n"
9972
"of::"
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:420
9976
msgid " email = Full Name <account@hostname.tld>"
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:422
9980
msgid ""
9981
"editor\n"
9982
"~~~~~~"
9983
msgstr ""
9984
9985
#: en/help_topics/configuration.txt:425
9986
msgid ""
9987
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9988
"a commit message. This setting is trumped by the environment variable\n"
9989
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9990
"variables."
9991
msgstr ""
9992
9993
#: en/help_topics/configuration.txt:430
9994
msgid ""
9995
"log_format\n"
9996
"~~~~~~~~~~"
9997
msgstr ""
9998
9999
#: en/help_topics/configuration.txt:433
10000
msgid ""
10001
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10002
"and ``line``. Additional formats may be provided by plugins. The default\n"
10003
"value is ``long``."
10004
msgstr ""
10005
10006
#: en/help_topics/configuration.txt:437
10007
msgid ""
10008
"check_signatures\n"
10009
"~~~~~~~~~~~~~~~~"
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:440
10013
msgid ""
10014
"Reserved for future use. These options will allow a policy for branches to\n"
10015
"require signatures."
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:443
10019
msgid ""
10020
"require\n"
10021
" The gnupg signature for revisions must be present and must be valid."
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:446
10025
msgid ""
10026
"ignore\n"
10027
" Do not check gnupg signatures of revisions."
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:449
10031
msgid ""
10032
"check-available\n"
10033
" (default) If gnupg signatures for revisions are present, check them.\n"
10034
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10035
" no signature is present."
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:454
10039
msgid ""
10040
"create_signatures\n"
10041
"~~~~~~~~~~~~~~~~~"
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:457
10045
msgid ""
10046
"Defines the behaviour of signing revisions on commits. By default bzr will "
10047
"not\n"
10048
"sign new commits."
10049
msgstr ""
10050
10051
#: en/help_topics/configuration.txt:460
10052
msgid ""
10053
"always\n"
10054
" Sign every new revision that is committed. If the signing fails then "
10055
"the\n"
10056
" commit will not be made."
10057
msgstr ""
10058
10059
#: en/help_topics/configuration.txt:464
10060
msgid ""
10061
"when-required\n"
10062
" Reserved for future use."
10063
msgstr ""
10064
10065
#: en/help_topics/configuration.txt:467
10066
msgid ""
10067
"never\n"
10068
" Reserved for future use."
10069
msgstr ""
10070
10071
#: en/help_topics/configuration.txt:470
10072
msgid ""
10073
"In future it is planned that ``when-required`` will sign newly\n"
10074
"committed revisions only when the branch requires them. ``never`` will "
10075
"refuse\n"
10076
"to sign newly committed revisions, even if the branch requires signatures."
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:474
10080
msgid ""
10081
"dirstate.fdatasync\n"
10082
"~~~~~~~~~~~~~~~~~~"
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:477
10086
msgid ""
10087
"If true (default), working tree metadata changes are flushed through the\n"
10088
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10089
"should not be lost if the machine crashes. See also repository.fdatasync."
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:481
10093
msgid ""
10094
"gpg_signing_key\n"
10095
"~~~~~~~~~~~~~~~"
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:484
10099
msgid ""
10100
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10101
"address, key fingerprint or full key ID. When unset or when set to\n"
10102
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:488
10106
msgid ""
10107
"recurse\n"
10108
"~~~~~~~"
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:491
10112
msgid ""
10113
"Only useful in ``locations.conf``. Defines whether or not the\n"
10114
"configuration for this section applies to subdirectories:"
10115
msgstr ""
10116
10117
#: en/help_topics/configuration.txt:494
10118
msgid ""
10119
"true\n"
10120
" (default) This section applies to subdirectories as well."
10121
msgstr ""
10122
10123
#: en/help_topics/configuration.txt:497
10124
msgid ""
10125
"false\n"
10126
" This section only applies to the branch at this directory and not\n"
10127
" branches below it."
10128
msgstr ""
10129
10130
#: en/help_topics/configuration.txt:501
10131
msgid ""
10132
"gpg_signing_command\n"
10133
"~~~~~~~~~~~~~~~~~~~"
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:504
10137
msgid ""
10138
"(Default: \"gpg\"). Which program should be used to sign and check "
10139
"revisions.\n"
10140
"For example::"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:507
10144
msgid " gpg_signing_command = /usr/bin/gnpg"
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:509
10148
msgid ""
10149
"The specified command must accept the options \"--clearsign\" and \"-u "
10150
"<email>\"."
10151
msgstr ""
10152
10153
#: en/help_topics/configuration.txt:511
10154
msgid ""
10155
"bzr_remote_path\n"
10156
"~~~~~~~~~~~~~~~"
10157
msgstr ""
10158
10159
#: en/help_topics/configuration.txt:514
10160
msgid ""
10161
"(Default: \"bzr\"). The path to the command that should be used to run the "
10162
"smart\n"
10163
"server for bzr. This value may only be specified in locations.conf, because:"
10164
msgstr ""
10165
10166
#: en/help_topics/configuration.txt:517
10167
msgid ""
10168
"- it's needed before branch.conf is accessible\n"
10169
"- allowing remote branch.conf files to specify commands would be a security\n"
10170
" risk"
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:521
10174
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10175
msgstr ""
10176
10177
#: en/help_topics/configuration.txt:523
10178
msgid ""
10179
"smtp_server\n"
10180
"~~~~~~~~~~~"
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:526
10184
msgid ""
10185
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10186
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:529
10190
msgid ""
10191
"smtp_username, smtp_password\n"
10192
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:532
10196
msgid ""
10197
"User and password to authenticate to the SMTP server. If smtp_username\n"
10198
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10199
"These settings are only needed if the SMTP server requires authentication\n"
10200
"to send mail."
10201
msgstr ""
10202
10203
#: en/help_topics/configuration.txt:537
10204
msgid ""
10205
"locks.steal_dead\n"
10206
"~~~~~~~~~~~~~~~~"
10207
msgstr ""
10208
10209
#: en/help_topics/configuration.txt:540
10210
msgid ""
10211
"If set to true, bzr will automatically break locks held by processes from\n"
10212
"the same machine and user that are no longer alive. Otherwise, it will\n"
10213
"print a message and you can break the lock manually, if you are satisfied\n"
10214
"the object is no longer in use."
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:545
10218
msgid ""
10219
"mail_client\n"
10220
"~~~~~~~~~~~"
10221
msgstr ""
10222
10223
#: en/help_topics/configuration.txt:548
10224
msgid ""
10225
"A mail client to use for sending merge requests.\n"
10226
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10227
"it\n"
10228
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10229
"``editor``."
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:553
10233
msgid "Supported values for specific clients:"
10234
msgstr ""
10235
10236
#: en/help_topics/configuration.txt:555
10237
msgid ""
10238
":claws: Use Claws. This skips a dialog for attaching files.\n"
10239
":evolution: Use Evolution.\n"
10240
":kmail: Use KMail.\n"
10241
":mutt: Use Mutt.\n"
10242
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10243
"1.5,\n"
10244
" this works around some bugs that xdg-email doesn't handle."
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:562
10248
msgid "Supported generic values are:"
10249
msgstr ""
10250
10251
#: en/help_topics/configuration.txt:564
10252
msgid ""
10253
":default: See above.\n"
10254
":editor: Use your editor to compose the merge request. This also uses\n"
10255
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10256
" smtp_username and smtp_password.\n"
10257
":mapi: Use your preferred e-mail client on Windows.\n"
10258
":xdg-email: Use xdg-email to run your preferred mail program"
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:571
10262
msgid ""
10263
"repository.fdatasync\n"
10264
"~~~~~~~~~~~~~~~~~~~~"
10265
msgstr ""
10266
10267
#: en/help_topics/configuration.txt:574
10268
msgid ""
10269
"If true (default), repository changes are flushed through the OS buffers\n"
10270
"to physical disk. This is somewhat slower, but means data should not be\n"
10271
"lost if the machine crashes. See also dirstate.fdatasync."
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:578
10275
msgid ""
10276
"submit_branch\n"
10277
"~~~~~~~~~~~~~"
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:581
10281
msgid ""
10282
"The branch you intend to submit your current work to. This is "
10283
"automatically\n"
10284
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10285
"This\n"
10286
"should usually be set on a per-branch or per-location basis."
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:585
10290
msgid ""
10291
"public_branch\n"
10292
"~~~~~~~~~~~~~"
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:588
10296
msgid ""
10297
"A publically-accessible version of this branch (implying that this version "
10298
"is\n"
10299
"not publically-accessible). Used (and set) by ``bzr send``."
10300
msgstr ""
10301
10302
#: en/help_topics/configuration.txt:591
10303
msgid ""
10304
"suppress_warnings\n"
10305
"~~~~~~~~~~~~~~~~~"
10306
msgstr ""
10307
10308
#: en/help_topics/configuration.txt:594
10309
msgid ""
10310
"A list of strings, each string represent a warning that can be emitted by\n"
10311
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10312
msgstr ""
10313
10314
#: en/help_topics/configuration.txt:597
10315
msgid "Valid values:"
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:599
10319
msgid ""
10320
"* ``format_deprecation``:\n"
10321
" whether the format deprecation warning is shown on repositories that "
10322
"are\n"
10323
" using deprecated formats."
10324
msgstr ""
10325
10326
#: en/help_topics/configuration.txt:603
10327
msgid ""
10328
"default_format\n"
10329
"~~~~~~~~~~~~~~"
10330
msgstr ""
10331
10332
#: en/help_topics/configuration.txt:606
10333
msgid ""
10334
"A format name for the default format used when creating branches. See "
10335
"``bzr\n"
10336
"help formats`` for possible values."
10337
msgstr ""
10338
10339
#: en/help_topics/configuration.txt:609
10340
msgid ""
10341
"\n"
10342
"Unicode options\n"
10343
"---------------"
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:613
10347
msgid ""
10348
"output_encoding\n"
10349
"~~~~~~~~~~~~~~~"
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:616
10353
msgid ""
10354
"A Python unicode encoding name for text output from bzr, such as log\n"
10355
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10356
"is the terminal encoding prefered by the operating system."
10357
msgstr ""
10358
10359
#: en/help_topics/configuration.txt:620
10360
msgid ""
10361
"\n"
10362
"Branch type specific options\n"
10363
"----------------------------"
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:624
10367
msgid ""
10368
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10369
"later format. They\n"
10370
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10371
"manually set in ``locations.conf`` or ``bazaar.conf``."
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:629
10375
msgid ""
10376
"append_revisions_only\n"
10377
"~~~~~~~~~~~~~~~~~~~~~"
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:632
10381
msgid ""
10382
"If set to \"True\" then revisions can only be appended to the log, not\n"
10383
"removed. A branch with this setting enabled can only pull from another\n"
10384
"branch if the other branch's log is a longer version of its own. This is\n"
10385
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10386
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10387
"compatibility with previous bzr versions (older than 2.2)."
10388
msgstr ""
10389
10390
#: en/help_topics/configuration.txt:639
10391
msgid ""
10392
"parent_location\n"
10393
"~~~~~~~~~~~~~~~"
10394
msgstr ""
10395
10396
#: en/help_topics/configuration.txt:642
10397
msgid ""
10398
"If present, the location of the default branch for pull or merge. This "
10399
"option\n"
10400
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10401
"--remember``."
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:646
10405
msgid ""
10406
"push_location\n"
10407
"~~~~~~~~~~~~~"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:649
10411
msgid ""
10412
"If present, the location of the default branch for push. This option\n"
10413
"is normally set by the first ``push`` or ``push --remember``."
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:652
10417
msgid ""
10418
"push_strict\n"
10419
"~~~~~~~~~~~"
10420
msgstr ""
10421
10422
#: en/help_topics/configuration.txt:655
10423
msgid ""
10424
"If present, defines the ``--strict`` option default value for checking\n"
10425
"uncommitted changes before pushing."
10426
msgstr ""
10427
10428
#: en/help_topics/configuration.txt:658
10429
msgid ""
10430
"dpush_strict\n"
10431
"~~~~~~~~~~~~"
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:661
10435
msgid ""
10436
"If present, defines the ``--strict`` option default value for checking\n"
10437
"uncommitted changes before pushing into a different VCS without any\n"
10438
"custom bzr metadata."
10439
msgstr ""
10440
10441
#: en/help_topics/configuration.txt:665
10442
msgid ""
10443
"bound_location\n"
10444
"~~~~~~~~~~~~~~"
10445
msgstr ""
10446
10447
#: en/help_topics/configuration.txt:668
10448
msgid ""
10449
"The location that commits should go to when acting as a checkout.\n"
10450
"This option is normally set by ``bind``."
10451
msgstr ""
10452
10453
#: en/help_topics/configuration.txt:671
10454
msgid ""
10455
"bound\n"
10456
"~~~~~"
10457
msgstr ""
10458
10459
#: en/help_topics/configuration.txt:674
10460
msgid ""
10461
"If set to \"True\", the branch should act as a checkout, and push each "
10462
"commit to\n"
10463
"the bound_location. This option is normally set by ``bind``/``unbind``."
10464
msgstr ""
10465
10466
#: en/help_topics/configuration.txt:677
10467
msgid ""
10468
"send_strict\n"
10469
"~~~~~~~~~~~"
10470
msgstr ""
10471
10472
#: en/help_topics/configuration.txt:680
10473
msgid ""
10474
"If present, defines the ``--strict`` option default value for checking\n"
10475
"uncommitted changes before sending a merge directive."
10476
msgstr ""
10477
10478
#: en/help_topics/configuration.txt:683
10479
msgid ""
10480
"add.maximum_file_size\n"
10481
"~~~~~~~~~~~~~~~~~~~~~"
10482
msgstr ""
10483
10484
#: en/help_topics/configuration.txt:686
10485
msgid ""
10486
"Defines the maximum file size the command line \"add\" operation will allow\n"
10487
"in recursive mode, with files larger than this value being skipped. You may "
10488
"\n"
10489
"specify this value as an integer (in which case it is interpreted as bytes), "
10490
"\n"
10491
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10492
"0 \n"
10493
"will disable skipping."
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:692
10497
msgid ""
10498
"External Merge Tools\n"
10499
"--------------------"
10500
msgstr ""
10501
10502
#: en/help_topics/configuration.txt:695
10503
msgid ""
10504
"bzr.mergetool.<name>\n"
10505
"~~~~~~~~~~~~~~~~~~~~"
10506
msgstr ""
10507
10508
#: en/help_topics/configuration.txt:698
10509
msgid ""
10510
"Defines an external merge tool called <name> with the given command-line.\n"
10511
"Arguments containing spaces should be quoted using single or double quotes. "
10512
"The\n"
10513
"executable may omit its path if it can be found on the PATH."
10514
msgstr ""
10515
10516
#: en/help_topics/configuration.txt:702
10517
msgid ""
10518
"The following markers can be used in the command-line to substitute "
10519
"filenames\n"
10520
"involved in the merge conflict::"
10521
msgstr ""
10522
10523
#: en/help_topics/configuration.txt:705
10524
msgid ""
10525
" {base} file.BASE\n"
10526
" {this} file.THIS\n"
10527
" {other} file.OTHER\n"
10528
" {result} output file\n"
10529
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10530
"merge\n"
10531
" succeeds."
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:714
10535
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10536
msgstr ""
10537
10538
#: en/help_topics/configuration.txt:716
10539
msgid ""
10540
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10541
"interpolation markers, trying to display the mergetool line results in the\n"
10542
"following problem::"
10543
msgstr ""
10544
10545
#: en/help_topics/configuration.txt:720
10546
msgid ""
10547
"\n"
10548
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10549
"{result}'\n"
10550
" $ bzr config bzr.mergetool.kdiff3\n"
10551
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10552
"{this} {other} -o {result}\"."
10553
msgstr ""
10554
10555
#: en/help_topics/configuration.txt:725
10556
msgid ""
10557
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10558
msgstr ""
10559
10560
#: en/help_topics/configuration.txt:727
10561
msgid ""
10562
" $ bzr config --all bzr.mergetool.kdiff3\n"
10563
" branch:\n"
10564
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10565
msgstr ""
10566
10567
#: en/help_topics/configuration.txt:731
10568
msgid ""
10569
"\n"
10570
"bzr.default_mergetool\n"
10571
"~~~~~~~~~~~~~~~~~~~~~"
10572
msgstr ""
10573
10574
#: en/help_topics/configuration.txt:735
10575
msgid ""
10576
"Specifies which external merge tool (as defined above) should be selected "
10577
"by\n"
10578
"default in tools such as ``bzr qconflicts``."
10579
msgstr ""
10580
10581
#: en/help_topics/configuration.txt:740
10582
msgid " bzr.default_mergetool = kdiff3\n"
10583
msgstr ""
10584
10585
#: en/help_topics/conflict-types.txt:1
10586
msgid ""
10587
"Conflict Types\n"
10588
"=============="
10589
msgstr ""
10590
10591
#: en/help_topics/conflict-types.txt:4
10592
msgid ""
10593
"Some operations, like merge, revert and pull, modify the contents of your\n"
10594
"working tree. These modifications are programmatically generated, and so "
10595
"they\n"
10596
"may conflict with the current state of your working tree. "
10597
msgstr ""
10598
10599
#: en/help_topics/conflict-types.txt:8
10600
msgid ""
10601
"When conflicts are present in your working tree (as shown by ``bzr\n"
10602
"conflicts``), you should resolve them and then inform bzr that the "
10603
"conflicts\n"
10604
"have been resolved."
10605
msgstr ""
10606
10607
#: en/help_topics/conflict-types.txt:12
10608
msgid ""
10609
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10610
"should resolve them is not the one responsible for their occurrence, as is "
10611
"the\n"
10612
"case when merging other people's work or because some conflicts are "
10613
"presented\n"
10614
"in a way that is not easy to understand."
10615
msgstr ""
10616
10617
#: en/help_topics/conflict-types.txt:17
10618
msgid ""
10619
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10620
"conflict if and only if there's an actual conceptual conflict in the source\n"
10621
"tree. Because Bazaar doesn't understand the real meaning of the files "
10622
"being\n"
10623
"versioned, it can, when faced with ambiguities, fall short in either "
10624
"direction\n"
10625
"trying to resolve the conflict itself. Many kinds of changes can be "
10626
"combined\n"
10627
"programmatically, but sometimes only a human can determine the right thing "
10628
"to\n"
10629
"do."
10630
msgstr ""
10631
10632
#: en/help_topics/conflict-types.txt:25
10633
msgid ""
10634
"When Bazaar generates a conflict, it adds information into the working tree "
10635
"to\n"
10636
"present the conflicting versions, and it's up to you to find the correct\n"
10637
"resolution."
10638
msgstr ""
10639
10640
#: en/help_topics/conflict-types.txt:29
10641
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10642
msgstr ""
10643
10644
#: en/help_topics/conflict-types.txt:31
10645
msgid ""
10646
"1. Modify the working tree content so that the conflicted item is now in "
10647
"the\n"
10648
" state you want to keep, then"
10649
msgstr ""
10650
10651
#: en/help_topics/conflict-types.txt:34
10652
msgid ""
10653
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10654
" remaining generated information (``bzr resolve <item>``)."
10655
msgstr ""
10656
10657
#: en/help_topics/conflict-types.txt:37
10658
msgid ""
10659
"For most conflict types, there are some obvious ways to modify the working\n"
10660
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10661
"itself already made a choice, when possible."
10662
msgstr ""
10663
10664
#: en/help_topics/conflict-types.txt:41
10665
msgid ""
10666
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10667
"different ways to resolve the conflict."
10668
msgstr ""
10669
10670
#: en/help_topics/conflict-types.txt:44
10671
msgid ""
10672
"Each type of conflict is explained below, and the action which must be done "
10673
"to\n"
10674
"resolve the conflict is outlined."
10675
msgstr ""
10676
10677
#: en/help_topics/conflict-types.txt:47
10678
msgid ""
10679
"Various actions are available depending on the kind of conflict, for some "
10680
"of\n"
10681
"these actions, Bazaar can provide some help. In the end you should at least\n"
10682
"inform Bazaar that you're done with the conflict with::"
10683
msgstr ""
10684
10685
#: en/help_topics/conflict-types.txt:51
10686
msgid " ``bzr resolve FILE --action=done'"
10687
msgstr ""
10688
10689
#: en/help_topics/conflict-types.txt:53
10690
msgid ""
10691
"Note that this is the default action when a single file is involved so you "
10692
"can\n"
10693
"simply use::"
10694
msgstr ""
10695
10696
#: en/help_topics/conflict-types.txt:56
10697
msgid " ``bzr resolve FILE``"
10698
msgstr ""
10699
10700
#: en/help_topics/conflict-types.txt:58
10701
msgid "See ``bzr help resolve`` for more details."
10702
msgstr ""
10703
10704
#: en/help_topics/conflict-types.txt:60
10705
msgid ""
10706
"Text conflicts\n"
10707
"--------------"
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10711
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10712
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10713
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10714
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10715
msgid "Typical message::"
10716
msgstr ""
10717
10718
#: en/help_topics/conflict-types.txt:65
10719
msgid " Text conflict in FILE"
10720
msgstr ""
10721
10722
#: en/help_topics/conflict-types.txt:67
10723
msgid ""
10724
"These are produced when a text merge cannot completely reconcile two sets "
10725
"of\n"
10726
"text changes. Bazaar will emit files for each version with the extensions\n"
10727
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10728
"tree,\n"
10729
"i.e. the tree that you are merging changes into. OTHER is the version that "
10730
"you\n"
10731
"are merging into the target. BASE is an older version that is used as a "
10732
"basis\n"
10733
"for comparison."
10734
msgstr ""
10735
10736
#: en/help_topics/conflict-types.txt:74
10737
msgid ""
10738
"In the main copy of the file, Bazaar will include all the changes that it\n"
10739
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10740
"\"herringbone\" markers like ``<<<<<<<``."
10741
msgstr ""
10742
10743
#: en/help_topics/conflict-types.txt:78
10744
msgid ""
10745
"Say the initial text is \"The project leader released it.\", and THIS "
10746
"modifies it\n"
10747
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10748
"leader\n"
10749
"released Bazaar.\" A conflict would look like this::"
10750
msgstr ""
10751
10752
#: en/help_topics/conflict-types.txt:82
10753
msgid ""
10754
" <<<<<<< TREE\n"
10755
" Martin Pool released it.\n"
10756
" =======\n"
10757
" The project leader released Bazaar.\n"
10758
" >>>>>>> MERGE-SOURCE"
10759
msgstr ""
10760
10761
#: en/help_topics/conflict-types.txt:88
10762
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10763
msgstr ""
10764
10765
#: en/help_topics/conflict-types.txt:90
10766
msgid ""
10767
"You can handle text conflicts either by editing the main copy of the file,\n"
10768
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10769
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10770
"set of changes over the other (but see below when you encounter these\n"
10771
"cases). More often, the two sets of changes must be intelligently combined."
10772
msgstr ""
10773
10774
#: en/help_topics/conflict-types.txt:96
10775
msgid ""
10776
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10777
"you are done editing, the file should look like it never had a conflict, and "
10778
"be\n"
10779
"ready to commit."
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:100
10783
msgid ""
10784
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10785
"Bazaar will auto-detect which conflicts you have resolved."
10786
msgstr ""
10787
10788
#: en/help_topics/conflict-types.txt:103
10789
msgid ""
10790
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10791
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10792
"working tree."
10793
msgstr ""
10794
10795
#: en/help_topics/conflict-types.txt:107
10796
msgid ""
10797
"\n"
10798
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10799
"resolve`` with one of the following actions:"
10800
msgstr ""
10801
10802
#: en/help_topics/conflict-types.txt:111
10803
msgid ""
10804
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10805
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10806
msgstr ""
10807
10808
#: en/help_topics/conflict-types.txt:114
10809
msgid ""
10810
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10811
"modifications will be taken into account."
10812
msgstr ""
10813
10814
#: en/help_topics/conflict-types.txt:117
10815
msgid ""
10816
"Content conflicts\n"
10817
"-----------------"
10818
msgstr ""
10819
10820
#: en/help_topics/conflict-types.txt:122
10821
msgid " Contents conflict in FILE"
10822
msgstr ""
10823
10824
#: en/help_topics/conflict-types.txt:124
10825
msgid ""
10826
"This conflict happens when there are conflicting changes in the working "
10827
"tree\n"
10828
"and the merge source, but the conflicted items are not text files. They "
10829
"may\n"
10830
"be binary files, or symlinks, or directories. It can even happen with "
10831
"files\n"
10832
"that are deleted on one side, and modified on the other."
10833
msgstr ""
10834
10835
#: en/help_topics/conflict-types.txt:129
10836
msgid ""
10837
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10838
"be\n"
10839
"regular files, symlinks or directories). But it will not include a \"main "
10840
"copy\"\n"
10841
"of the file with herringbone conflict markers. It will appear that the "
10842
"\"main\n"
10843
"copy\" has been renamed to THIS or OTHER."
10844
msgstr ""
10845
10846
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10847
msgid ""
10848
"To resolve that kind of conflict, you should rebuild FILE from either "
10849
"version\n"
10850
"or a combination of both."
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10854
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10855
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10856
#: en/help_topics/conflict-types.txt:361
10857
msgid "``bzr resolve`` recognizes the following actions:"
10858
msgstr ""
10859
10860
#: en/help_topics/conflict-types.txt:139
10861
msgid ""
10862
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10863
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10864
"* ``--action=done`` will just mark the conflict as resolved."
10865
msgstr ""
10866
10867
#: en/help_topics/conflict-types.txt:143
10868
msgid ""
10869
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10870
"and\n"
10871
"``.OTHER`` files if they are still present in the working tree."
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10875
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10876
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10877
#: en/help_topics/conflict-types.txt:369
10878
msgid ""
10879
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10880
msgstr ""
10881
10882
#: en/help_topics/conflict-types.txt:148
10883
msgid ""
10884
"Tag conflicts\n"
10885
"-------------"
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:153
10889
msgid ""
10890
" Conflicting tags:\n"
10891
" version-0.1"
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:156
10895
msgid ""
10896
"When pulling from or pushing to another branch, Bazaar informs you about "
10897
"tags\n"
10898
"that conflict between the two branches; that is the same tag points to two\n"
10899
"different revisions. You need not resolve these conflicts, but subsequent\n"
10900
"uses of pull or push will result in the same message."
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:161
10904
msgid ""
10905
"To resolve the conflict, you must apply the correct tags to either the "
10906
"target\n"
10907
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10908
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10909
"target branch's tags match the source branch, then in the target branch do\n"
10910
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10911
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10912
"source\n"
10913
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10914
"favor of the target branch, you need to similarly use ``tag --force`` in "
10915
"the\n"
10916
"source branch. (Note that pulling or pushing using --overwrite will "
10917
"overwrite\n"
10918
"all tags as well.)"
10919
msgstr ""
10920
10921
#: en/help_topics/conflict-types.txt:172
10922
msgid ""
10923
"Duplicate paths\n"
10924
"---------------"
10925
msgstr ""
10926
10927
#: en/help_topics/conflict-types.txt:177
10928
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:179
10932
msgid ""
10933
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10934
"already been used. The existing file will be renamed to \"FILE.moved\". "
10935
msgstr ""
10936
10937
#: en/help_topics/conflict-types.txt:187
10938
msgid ""
10939
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10940
"FILE``,\n"
10941
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10942
"* ``--action=done`` will just mark the conflict as resolved."
10943
msgstr ""
10944
10945
#: en/help_topics/conflict-types.txt:191
10946
msgid ""
10947
"Note that you must get rid of FILE.moved before using ``--action=done``."
10948
msgstr ""
10949
10950
#: en/help_topics/conflict-types.txt:195
10951
msgid ""
10952
"Unversioned parent\n"
10953
"------------------"
10954
msgstr ""
10955
10956
#: en/help_topics/conflict-types.txt:200
10957
msgid ""
10958
" Conflict because FILE is not versioned, but has versioned children."
10959
msgstr ""
10960
10961
#: en/help_topics/conflict-types.txt:202
10962
msgid ""
10963
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10964
"not\n"
10965
"versioned. This happens when the directory has been deleted in the target,\n"
10966
"but has a new child in the source, or vice versa. In this situation, "
10967
"Bazaar\n"
10968
"will version the parent directory as well. Resolving this issue depends\n"
10969
"very much on the particular scenario. You may wish to rename or delete "
10970
"either\n"
10971
"the file or the directory. When you are satisfied, you can run \"bzr "
10972
"resolve\n"
10973
"FILE\" to mark the conflict as resolved."
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:210
10977
msgid ""
10978
"Missing parent\n"
10979
"--------------"
10980
msgstr ""
10981
10982
#: en/help_topics/conflict-types.txt:215
10983
msgid " Conflict adding files to FILE. Created directory."
10984
msgstr ""
10985
10986
#: en/help_topics/conflict-types.txt:217
10987
msgid ""
10988
"This happens when a directory has been deleted in the target, but has new\n"
10989
"children in the source. This is similar to the \"unversioned parent\" "
10990
"conflict,\n"
10991
"except that the parent directory does not *exist*, instead of just being\n"
10992
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10993
"Resolving this issue depends very much on the particular scenario."
10994
msgstr ""
10995
10996
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10997
msgid ""
10998
"To resolve that kind of conflict, you should either remove or rename the\n"
10999
"children or the directory or a combination of both."
11000
msgstr ""
11001
11002
#: en/help_topics/conflict-types.txt:228
11003
msgid ""
11004
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11005
" children,\n"
11006
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11007
"children\n"
11008
" and restoring the directory,\n"
11009
"* ``--action=done`` will just mark the conflict as resolved."
11010
msgstr ""
11011
11012
#: en/help_topics/conflict-types.txt:236
11013
msgid ""
11014
"Deleting parent\n"
11015
"---------------"
11016
msgstr ""
11017
11018
#: en/help_topics/conflict-types.txt:241
11019
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11020
msgstr ""
11021
11022
#: en/help_topics/conflict-types.txt:243
11023
msgid ""
11024
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11025
"source, but has new children in the target (either because a directory\n"
11026
"deletion is merged or because the merge introduce new children). Bazaar\n"
11027
"will retain the directory. Resolving this issue depends very much on the\n"
11028
"particular scenario."
11029
msgstr ""
11030
11031
#: en/help_topics/conflict-types.txt:254
11032
msgid ""
11033
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11034
"directory,"
11035
msgstr ""
11036
11037
#: en/help_topics/conflict-types.txt:256
11038
msgid ""
11039
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11040
" children,"
11041
msgstr ""
11042
11043
#: en/help_topics/conflict-types.txt:259
11044
msgid "* ``--action=done`` will just mark the conflict as resolved."
11045
msgstr ""
11046
11047
#: en/help_topics/conflict-types.txt:261
11048
msgid ""
11049
"Note that when merging a directory deletion, if unversioned files are\n"
11050
"present, they become potential orphans has they don't have a directory\n"
11051
"parent anymore."
11052
msgstr ""
11053
11054
#: en/help_topics/conflict-types.txt:265
11055
msgid ""
11056
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11057
"setting the ``bzr.transform.orphan_policy`` configuration option."
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:268
11061
msgid "There are two possible values for this option:"
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:270
11065
msgid ""
11066
"* ``conflict`` (the default): will leave the orphans in place and\n"
11067
" generate a conflicts,"
11068
msgstr ""
11069
11070
#: en/help_topics/conflict-types.txt:273
11071
msgid ""
11072
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11073
"root\n"
11074
" of the working tree with names like ``<file>.~#~``."
11075
msgstr ""
11076
11077
#: en/help_topics/conflict-types.txt:278
11078
msgid ""
11079
"Path conflict\n"
11080
"-------------"
11081
msgstr ""
11082
11083
#: en/help_topics/conflict-types.txt:283
11084
msgid " Path conflict: PATH1 / PATH2"
11085
msgstr ""
11086
11087
#: en/help_topics/conflict-types.txt:285
11088
msgid ""
11089
"This happens when the source and target have each modified the name or "
11090
"parent\n"
11091
"directory of a file. Bazaar will use the path elements from the source."
11092
msgstr ""
11093
11094
#: en/help_topics/conflict-types.txt:288
11095
msgid ""
11096
"To resolve that kind of conflict, you just have to decide what name should "
11097
"be\n"
11098
"retained for the file involved."
11099
msgstr ""
11100
11101
#: en/help_topics/conflict-types.txt:293
11102
msgid ""
11103
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11104
" issuing ``bzr mv PATH2 PATH1``,\n"
11105
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11106
"``PATH2``,\n"
11107
"* ``--action=done`` will just mark the conflict as resolved."
11108
msgstr ""
11109
11110
#: en/help_topics/conflict-types.txt:300
11111
msgid ""
11112
"Parent loop\n"
11113
"-----------"
11114
msgstr ""
11115
11116
#: en/help_topics/conflict-types.txt:305
11117
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11118
msgstr ""
11119
11120
#: en/help_topics/conflict-types.txt:307
11121
msgid ""
11122
"This happens when the source and the target have each moved directories, so\n"
11123
"that, if the change could be applied, a directory would be contained by "
11124
"itself.\n"
11125
"For example::"
11126
msgstr ""
11127
11128
#: en/help_topics/conflict-types.txt:311
11129
msgid ""
11130
" $ bzr init\n"
11131
" $ bzr mkdir white\n"
11132
" $ bzr mkdir black\n"
11133
" $ bzr commit -m \"BASE\"\n"
11134
" $ bzr branch . ../other\n"
11135
" $ bzr mv white black\n"
11136
" $ bzr commit -m \"THIS\"\n"
11137
" $ bzr mv ../other/black ../other/white\n"
11138
" $ bzr commit ../other -m \"OTHER\"\n"
11139
" $ bzr merge ../other"
11140
msgstr ""
11141
11142
#: en/help_topics/conflict-types.txt:322
11143
msgid ""
11144
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11145
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11146
"name should be retained for the directories involved."
11147
msgstr ""
11148
11149
#: en/help_topics/conflict-types.txt:328
11150
msgid ""
11151
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11152
"\n"
11153
" in ``black``,\n"
11154
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11155
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11156
"* ``--action=done`` will just mark the conflict as resolved."
11157
msgstr ""
11158
11159
#: en/help_topics/conflict-types.txt:336
11160
msgid ""
11161
"Non-directory parent\n"
11162
"--------------------"
11163
msgstr ""
11164
11165
#: en/help_topics/conflict-types.txt:341
11166
msgid ""
11167
" Conflict: foo.new is not a directory, but has files in it.\n"
11168
" Created directory."
11169
msgstr ""
11170
11171
#: en/help_topics/conflict-types.txt:344
11172
msgid ""
11173
"This happens when one side has added files to a directory, and the other "
11174
"side\n"
11175
"has changed the directory into a file or symlink. For example::"
11176
msgstr ""
11177
11178
#: en/help_topics/conflict-types.txt:347
11179
msgid ""
11180
" $ bzr init\n"
11181
" $ bzr mkdir foo\n"
11182
" $ bzr commit -m \"BASE\"\n"
11183
" $ bzr branch . ../other\n"
11184
" $ rmdir foo\n"
11185
" $ touch foo\n"
11186
" $ bzr commit -m \"THIS\"\n"
11187
" $ bzr mkdir ../other/foo/bar\n"
11188
" $ bzr commit ../other -m \"OTHER\"\n"
11189
" $ bzr merge ../other"
11190
msgstr ""
11191
11192
#: en/help_topics/conflict-types.txt:358
11193
msgid ""
11194
"To resolve that kind of conflict, you have to decide what name should be\n"
11195
"retained for the file, directory or symlink involved."
11196
msgstr ""
11197
11198
#: en/help_topics/conflict-types.txt:363
11199
msgid ""
11200
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11201
" ``bzr add foo``,\n"
11202
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11203
" ``bzr mv foo.new foo``,\n"
11204
"* ``--action=done`` will just mark the conflict as resolved."
11205
msgstr ""
11206
11207
#: en/help_topics/conflict-types.txt:371
11208
msgid ""
11209
"MalformedTransform\n"
11210
"------------------"
11211
msgstr ""
11212
11213
#: en/help_topics/conflict-types.txt:374
11214
msgid ""
11215
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11216
"exception. This means that Bazaar encountered a filesystem conflict that it "
11217
"was\n"
11218
"unable to resolve. This usually indicates a bug. Please let us know if "
11219
"you\n"
11220
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11221
msgstr ""
11222
11223
#: en/help_topics/content-filters.txt:1
11224
msgid ""
11225
"Content Filters\n"
11226
"==============="
11227
msgstr ""
11228
11229
#: en/help_topics/content-filters.txt:4
11230
msgid ""
11231
"Content formats\n"
11232
"---------------"
11233
msgstr ""
11234
11235
#: en/help_topics/content-filters.txt:7
11236
msgid ""
11237
"Bazaar's content filtering allows you to store files in a different\n"
11238
"format from the copy in your working tree. This lets you, or your\n"
11239
"co-developers, use Windows development tools that expect CRLF files\n"
11240
"on projects that use other line-ending conventions. Among other things,\n"
11241
"content filters also let Unix developers more easily work on projects\n"
11242
"using Windows line-ending conventions, keyword expansion/compression,\n"
11243
"and trailing spaces on lines in text files to be implicitly stripped\n"
11244
"when committed."
11245
msgstr ""
11246
11247
#: en/help_topics/content-filters.txt:16
11248
msgid "To generalize, there are two content formats supported by Bazaar:"
11249
msgstr ""
11250
11251
#: en/help_topics/content-filters.txt:18
11252
msgid ""
11253
"* a canonical format - how files are stored internally\n"
11254
"* a convenience format - how files are created in a working tree."
11255
msgstr ""
11256
11257
#: en/help_topics/content-filters.txt:21
11258
msgid ""
11259
"\n"
11260
"Format conversion\n"
11261
"-----------------"
11262
msgstr ""
11263
11264
#: en/help_topics/content-filters.txt:25
11265
msgid ""
11266
"The conversion between these formats is done by content filters.\n"
11267
"A content filter has two parts:"
11268
msgstr ""
11269
11270
#: en/help_topics/content-filters.txt:28
11271
msgid ""
11272
"* a read converter - converts from convenience to canonical format\n"
11273
"* a write converter - converts from canonical to convenience format."
11274
msgstr ""
11275
11276
#: en/help_topics/content-filters.txt:31
11277
msgid ""
11278
"Many of these converters will provide *round-trip* conversion,\n"
11279
"i.e. applying the read converter followed by the write converter\n"
11280
"gives back the original content. However, others may provide an\n"
11281
"asymmetric conversion. For example, a read converter might strip\n"
11282
"trailing whitespace off lines in source code while the matching\n"
11283
"write converter might pass content through unchanged."
11284
msgstr ""
11285
11286
#: en/help_topics/content-filters.txt:38
11287
msgid ""
11288
"\n"
11289
"Enabling content filters\n"
11290
"------------------------"
11291
msgstr ""
11292
11293
#: en/help_topics/content-filters.txt:42
11294
msgid ""
11295
"Content filters are typically provided by plugins, so the first step\n"
11296
"in using them is to install the relevant plugins and read their\n"
11297
"documentation. Some plugins may be very specific about which files\n"
11298
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11299
"In other cases, the plugin may leave it in the user's hands to\n"
11300
"define which files are to be filtered. This is typically done\n"
11301
"using rule-based preferences. See ``bzr help rules`` for general\n"
11302
"information about defining these."
11303
msgstr ""
11304
11305
#: en/help_topics/content-filters.txt:51
11306
msgid ""
11307
"\n"
11308
"Impact on commands\n"
11309
"------------------"
11310
msgstr ""
11311
11312
#: en/help_topics/content-filters.txt:55
11313
msgid ""
11314
"Read converters are only applied to commands that read content from\n"
11315
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11316
"will apply read converters to files in the working tree, then compare\n"
11317
"the results to the content last committed."
11318
msgstr ""
11319
11320
#: en/help_topics/content-filters.txt:60
11321
msgid ""
11322
"Write converters are only applied by commands that **create files in a\n"
11323
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11324
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11325
"respectively."
11326
msgstr ""
11327
11328
#: en/help_topics/content-filters.txt:65
11329
msgid ""
11330
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11331
"comitting files. If this makes sense for a given plugin providing\n"
11332
"a content filter, the plugin can usually achieve this effect by using a\n"
11333
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11334
"for more information on hooks."
11335
msgstr ""
11336
11337
#: en/help_topics/content-filters.txt:71
11338
msgid ""
11339
"\n"
11340
"Refreshing your working tree\n"
11341
"----------------------------"
11342
msgstr ""
11343
11344
#: en/help_topics/content-filters.txt:75
11345
msgid ""
11346
"For performance reasons, Bazaar caches the timestamps of files in\n"
11347
"a working tree, and assumes files are unchanged if their timestamps\n"
11348
"match the cached values. As a consequence, there are times when\n"
11349
"you may need to explicitly ask for content filtering to be reapplied\n"
11350
"in one or both directions, e.g. after installing or reconfiguring\n"
11351
"plugins providing it."
11352
msgstr ""
11353
11354
#: en/help_topics/content-filters.txt:82
11355
msgid "Here are some general guidelines for doing this:"
11356
msgstr ""
11357
11358
#: en/help_topics/content-filters.txt:84
11359
msgid ""
11360
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11361
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11362
" relevant read converters and compare the end result with the\n"
11363
" canonical format."
11364
msgstr ""
11365
11366
#: en/help_topics/content-filters.txt:89
11367
msgid ""
11368
" * To reapply write converters, ensure there are no local changes,\n"
11369
" delete the relevant files and run ``bzr revert`` on those files."
11370
msgstr ""
11371
11372
#: en/help_topics/content-filters.txt:92
11373
msgid ""
11374
"Note: In the future, it is likely that additional options will be added\n"
11375
"to commands to make this refreshing process faster and safer.\n"
11376
msgstr ""
11377
11378
#: en/help_topics/current-formats.txt:1
11379
msgid "Current Storage Formats"
11380
msgstr ""
11381
11382
#: en/help_topics/current-formats.txt:3
11383
msgid ""
11384
":2a:\n"
11385
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11386
" compress storage. Provides rich roots which are a one-way\n"
11387
" transition."
11388
msgstr ""
11389
11390
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11391
msgid ""
11392
"\n"
11393
"See :doc:`formats-help` for more about storage formats."
11394
msgstr ""
11395
11396
#: en/help_topics/debug-flags.txt:1
11397
msgid ""
11398
"Debug Flags\n"
11399
"==========="
11400
msgstr ""
11401
11402
#: en/help_topics/debug-flags.txt:4
11403
msgid ""
11404
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11405
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11406
msgstr ""
11407
11408
#: en/help_topics/debug-flags.txt:7
11409
msgid ""
11410
"-Dauth Trace authentication sections used.\n"
11411
"-Dbytes Print out how many bytes were transferred\n"
11412
"-Ddirstate Trace dirstate activity (verbose!)\n"
11413
"-Derror Instead of normal error handling, always print a "
11414
"traceback\n"
11415
" on error.\n"
11416
"-Devil Capture call sites that do expensive or badly-scaling\n"
11417
" operations.\n"
11418
"-Dfetch Trace history copying between repositories.\n"
11419
"-Dfilters Emit information for debugging content filtering.\n"
11420
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11421
"fetch.\n"
11422
"-Dgraph Trace graph traversal.\n"
11423
"-Dhashcache Log every time a working file is read to determine its "
11424
"hash.\n"
11425
"-Dhooks Trace hook execution.\n"
11426
"-Dhpss Trace smart protocol requests and responses.\n"
11427
"-Dhpssdetail More hpss details.\n"
11428
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11429
"-Dhttp Trace http connections, requests and responses.\n"
11430
"-Dindex Trace major index operations.\n"
11431
"-Dknit Trace knit operations.\n"
11432
"-Dlock Trace when lockdir locks are taken or released.\n"
11433
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11434
" retrying the request.\n"
11435
"-Dprogress Trace progress bar operations.\n"
11436
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11437
"-Dmerge Emit information for debugging merges.\n"
11438
"-Dno_apport Don't use apport to report crashes.\n"
11439
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11440
"-Dpack Emit information about pack operations.\n"
11441
"-Drelock Emit a message every time a branch or repository object "
11442
"is\n"
11443
" unlocked then relocked the same way.\n"
11444
"-Dsftp Trace SFTP internals.\n"
11445
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11446
"expected\n"
11447
"-Dstream Trace fetch streams.\n"
11448
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11449
"portable\n"
11450
" manner.\n"
11451
"-Dunlock Some errors during unlock are treated as warnings.\n"
11452
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11453
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11454
"appropriate\n"
11455
" for the format, even for non-local fetches.\n"
11456
msgstr ""
11457
11458
#: en/help_topics/diverged-branches.txt:1
11459
msgid ""
11460
"Diverged Branches\n"
11461
"================="
11462
msgstr ""
11463
11464
#: en/help_topics/diverged-branches.txt:4
11465
msgid ""
11466
"When Bazaar tries to push one branch onto another, it requires that the\n"
11467
"destination branch must be ready to receive the source branch. If this "
11468
"isn't\n"
11469
"the case, then we say that the branches have ``diverged``. Branches are\n"
11470
"considered diverged if the destination branch's most recent commit is one "
11471
"that\n"
11472
"has not been merged (directly or indirectly) by the source branch. To "
11473
"recover\n"
11474
"from diverged branches, one must merge the missing revisions into the "
11475
"source\n"
11476
"branch."
11477
msgstr ""
11478
11479
#: en/help_topics/diverged-branches.txt:12
11480
msgid ""
11481
"This situation commonly arises when using a centralized workflow with local\n"
11482
"commits. If someone else has committed new work to the mainline since your\n"
11483
"last pull and you have local commits that have not yet been pushed to the\n"
11484
"mainline, then your local branch and the mainline have diverged."
11485
msgstr ""
11486
11487
#: en/help_topics/diverged-branches.txt:17
11488
msgid ""
11489
"Discovering What Has Diverged\n"
11490
"-----------------------------"
11491
msgstr ""
11492
11493
#: en/help_topics/diverged-branches.txt:20
11494
msgid ""
11495
"The ``bzr missing`` command is used to find out what revisions are in "
11496
"another\n"
11497
"branch that are not present in the current branch, and vice-versa. It shows "
11498
"a\n"
11499
"summary of which extra revisions exist in each branch. If you want to see "
11500
"the\n"
11501
"precise effects of those revisions, you can use ``bzr diff --"
11502
"old=other_branch``\n"
11503
"to show the differences between other_branch and your current branch."
11504
msgstr ""
11505
11506
#: en/help_topics/diverged-branches.txt:26
11507
msgid ""
11508
"A Solution\n"
11509
"----------"
11510
msgstr ""
11511
11512
#: en/help_topics/diverged-branches.txt:29
11513
msgid ""
11514
"The solution is to merge the revisions from the mainline into your local\n"
11515
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11516
"mainline. This merge may result in conflicts if the other developer's "
11517
"changes\n"
11518
"overlap with your changes. These conflicts should be resolved before\n"
11519
"continuing. After any conflicts have been resolved, or even if there were "
11520
"no\n"
11521
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11522
"to your local branch. This requirement gives you an opportunity to test "
11523
"the\n"
11524
"resulting working tree for correctness, since the merged revisions could "
11525
"have\n"
11526
"made arbitrary changes. After testing, you should commit the merge using\n"
11527
"``bzr commit``. This clears up the diverged branches situation. Your "
11528
"local\n"
11529
"branch can now be pushed to the mainline.\n"
11530
msgstr ""
11531
11532
#: en/help_topics/env-variables.txt:1
11533
msgid "Environment Variables"
11534
msgstr ""
11535
11536
#: en/help_topics/env-variables.txt:3
11537
msgid "See bzr help configuration for more details."
11538
msgstr ""
11539
11540
#: en/help_topics/env-variables.txt:5
11541
msgid ""
11542
"=================== "
11543
"===========================================================\n"
11544
"BZRPATH Path where bzr is to look for shell plugin external\n"
11545
" commands.\n"
11546
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11547
"EMAIL E-Mail address of the user.\n"
11548
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11549
"EDITOR Editor for editing commit messages.\n"
11550
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11551
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11552
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11553
"BZR_PLUGIN_PATH.\n"
11554
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11555
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11556
"and\n"
11557
" HOME.\n"
11558
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11559
"URLs).\n"
11560
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11561
"sshcorp,\n"
11562
" plink or lsh.\n"
11563
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11564
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11565
"BZR_COLUMNS Override implicit terminal width.\n"
11566
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11567
"(selftest)\n"
11568
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11569
"'text'.\n"
11570
"BZR_PDB Control whether to launch a debugger on error.\n"
11571
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11572
" breakin debugger.\n"
11573
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11574
"(instead\n"
11575
" of char-based).\n"
11576
"=================== "
11577
"===========================================================\n"
11578
msgstr ""
11579
11580
#: en/help_topics/eol.txt:1
11581
msgid ""
11582
"End of Line Conversion\n"
11583
"======================"
11584
msgstr ""
11585
11586
#: en/help_topics/eol.txt:4
11587
msgid ""
11588
"EOL conversion is provided as a content filter where Bazaar internally\n"
11589
"stores a canonical format but outputs a convenience format. See\n"
11590
"``bzr help content-filters`` for general information about using these."
11591
msgstr ""
11592
11593
#: en/help_topics/eol.txt:8
11594
msgid ""
11595
"Note: Content filtering is only supported in recently added formats,\n"
11596
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11597
"in a recent format. (Just setting the format on the repository\n"
11598
"is not enough.) If content filtering does not appear to be working, use\n"
11599
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11600
"or later."
11601
msgstr ""
11602
11603
#: en/help_topics/eol.txt:15
11604
msgid ""
11605
"EOL conversion needs to be enabled for selected file patterns using\n"
11606
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11607
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11608
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11609
"supported in a future verison of Bazaar."
11610
msgstr ""
11611
11612
#: en/help_topics/eol.txt:21
11613
msgid ""
11614
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11615
"(If a value is not set, ``exact`` is the default.)"
11616
msgstr ""
11617
11618
#: en/help_topics/eol.txt:24
11619
msgid ""
11620
" ========== ===================================== ======================\n"
11621
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11622
" ========== ===================================== ======================\n"
11623
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11624
" ---------- ------------------------------------- ----------------------\n"
11625
" ``lf`` ``lf`` ``lf``\n"
11626
" ---------- ------------------------------------- ----------------------\n"
11627
" ``crlf`` ``crlf`` ``lf``\n"
11628
" ---------- ------------------------------------- ----------------------\n"
11629
" ``exact`` No conversion Exactly as in file\n"
11630
" ========== ===================================== ======================"
11631
msgstr ""
11632
11633
#: en/help_topics/eol.txt:36
11634
msgid ""
11635
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11636
"byte is detected in the file."
11637
msgstr ""
11638
11639
#: en/help_topics/eol.txt:39
11640
msgid ""
11641
"For users working on a cross-platform project, here is a suggested rule\n"
11642
"to use as a starting point::"
11643
msgstr ""
11644
11645
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11646
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11647
msgid ""
11648
" [name *]\n"
11649
" eol = native"
11650
msgstr ""
11651
11652
#: en/help_topics/eol.txt:45
11653
msgid ""
11654
"If you have binary files that do not contain a null byte though, be\n"
11655
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11656
"by giving more explicit patterns earlier in the rules file. For example::"
11657
msgstr ""
11658
11659
#: en/help_topics/eol.txt:49
11660
msgid ""
11661
" [name *.png]\n"
11662
" eol = exact"
11663
msgstr ""
11664
11665
#: en/help_topics/eol.txt:55
11666
msgid ""
11667
"If your working tree is on a network drive shared by users on different\n"
11668
"operating systems, you typically want to force certain conventions for\n"
11669
"certain files. In that way, if a file is created with the wrong line\n"
11670
"endings or line endings get mixed during editing, it gets committed\n"
11671
"correctly and gets checked out correctly. For example::"
11672
msgstr ""
11673
11674
#: en/help_topics/eol.txt:61
11675
msgid ""
11676
" [name *.bat]\n"
11677
" eol = crlf"
11678
msgstr ""
11679
11680
#: en/help_topics/eol.txt:64
11681
msgid ""
11682
" [name *.sh]\n"
11683
" eol = lf"
11684
msgstr ""
11685
11686
#: en/help_topics/eol.txt:70
11687
msgid ""
11688
"If you take the care to create files with their required endings, you can\n"
11689
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11690
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11691
"introducing mixed line endings will be corrected during commit for files\n"
11692
"with those settings."
11693
msgstr ""
11694
11695
#: en/help_topics/eol.txt:76
11696
msgid ""
11697
"If you have sample test data that deliberately has text files with mixed\n"
11698
"newline conventions, you can ask for those to be left alone like this::"
11699
msgstr ""
11700
11701
#: en/help_topics/eol.txt:79
11702
msgid ""
11703
" [name test_data/]\n"
11704
" eol = exact"
11705
msgstr ""
11706
11707
#: en/help_topics/eol.txt:85
11708
msgid ""
11709
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11710
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11711
"of content analysis to detect binary files for commands like ``diff``.\n"
11712
"In the future, a ``binary = true`` rule may be added but it is not\n"
11713
"supported yet.)"
11714
msgstr ""
11715
11716
#: en/help_topics/eol.txt:91
11717
msgid ""
11718
"If you have an existing repository with text files already stored using\n"
11719
"Windows newline conventions (``crlf``), then you may want to keep using "
11720
"that\n"
11721
"convention in the repository. Forcing certain files to this convention\n"
11722
"may also help users who do not have rules configured. To do this, set\n"
11723
"``eol`` to one of the values below."
11724
msgstr ""
11725
11726
#: en/help_topics/eol.txt:97
11727
msgid ""
11728
" ============================ ======================== "
11729
"======================\n"
11730
" Value Checkout end-of-lines as Commit end-of-lines "
11731
"as\n"
11732
" ============================ ======================== "
11733
"======================\n"
11734
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11735
" ``lf`` otherwise\n"
11736
" ---------------------------- ------------------------ ----------------------"
11737
"\n"
11738
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11739
" ---------------------------- ------------------------ ----------------------"
11740
"\n"
11741
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11742
" ============================ ======================== ======================"
11743
msgstr ""
11744
11745
#: en/help_topics/eol.txt:108
11746
msgid ""
11747
"For users working on an existing project that uses Windows newline\n"
11748
"conventions in their Bazaar repository, this rule is suggested as a\n"
11749
"starting point::"
11750
msgstr ""
11751
11752
#: en/help_topics/eol.txt:112
11753
msgid ""
11754
" [name *]\n"
11755
" eol = native-with-crlf-in-repo"
11756
msgstr ""
11757
11758
#: en/help_topics/eol.txt:115
11759
msgid ""
11760
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11761
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11762
"``crlf`` and ``exact``."
11763
msgstr ""
11764
11765
#: en/help_topics/eol.txt:119
11766
msgid ""
11767
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11768
"never reject files because a given line ending or mixed line endings\n"
11769
"are found. A precommit hook should be used if you wish to validate\n"
11770
"(and not just convert) content before committing.\n"
11771
msgstr ""
11772
11773
#: en/help_topics/hidden-commands.txt:1
11774
msgid ""
11775
"added List files added in working tree.\n"
11776
"ancestry List all revisions merged into this branch.\n"
11777
"assert-fail Test reporting of assertion failures\n"
11778
"bundle-info Output interesting stats about a bundle\n"
11779
"bundle-revisions Create a merge-directive for submitting changes.\n"
11780
"cat-revision Write out metadata for a revision.\n"
11781
"dump-btree Dump the contents of a btree index file to stdout.\n"
11782
"export-pot Export command helps and error messages in po format.\n"
11783
"file-id Print file_id of a particular file or directory.\n"
11784
"file-path Print path of file_ids to a file or directory.\n"
11785
"find-merge-base Find and print a base revision for merging two "
11786
"branches.\n"
11787
"hooks Show hooks.\n"
11788
"inventory Show inventory of the current working copy or a "
11789
"revision.\n"
11790
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11791
"lookup-revision Lookup the revision-id from a revision-number\n"
11792
"merge-directive Generate a merge directive for auto-merge tools.\n"
11793
"modified List files modified in working tree.\n"
11794
"re-sign Create a digital signature for an existing revision.\n"
11795
"reference list, view and set branch locations for nested trees.\n"
11796
"relpath Show path of a file relative to root\n"
11797
"repair-workingtree Reset the working tree state file.\n"
11798
"revision-history Display the list of revision ids on a branch.\n"
11799
"revision-info Show revision number and revision id for a given "
11800
"revision\n"
11801
" identifier.\n"
11802
"rocks Statement of optimism.\n"
11803
"selftest Run internal test suite.\n"
11804
"shell-complete Show appropriate completions for context.\n"
11805
"test-script Run a shell-like test from a file.\n"
11806
"touching-revisions Return revision-ids which affected a particular file.\n"
11807
"unknowns List unknown files.\n"
11808
"wait-until-signalled Test helper for\n"
11809
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11810
msgstr ""
11811
11812
#: en/help_topics/hooks.txt:1
11813
msgid ""
11814
"\n"
11815
"Hooks\n"
11816
"====="
11817
msgstr ""
11818
11819
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11820
msgid ""
11821
"Introduction\n"
11822
"------------"
11823
msgstr ""
11824
11825
#: en/help_topics/hooks.txt:8
11826
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11827
msgstr ""
11828
11829
#: en/help_topics/hooks.txt:10
11830
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11831
msgstr ""
11832
11833
#: en/help_topics/hooks.txt:12
11834
msgid ""
11835
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11836
msgstr ""
11837
11838
#: en/help_topics/hooks.txt:14
11839
msgid ""
11840
"The class that contains each hook is given before the hooks it supplies. "
11841
"For\n"
11842
"instance, BranchHooks as the class is the hooks class for\n"
11843
"`bzrlib.branch.Branch.hooks`."
11844
msgstr ""
11845
11846
#: en/help_topics/hooks.txt:18
11847
msgid ""
11848
"Each description also indicates whether the hook runs on the client (the\n"
11849
"machine where bzr was invoked) or the server (the machine addressed by\n"
11850
"the branch URL). These may be, but are not necessarily, the same machine."
11851
msgstr ""
11852
11853
#: en/help_topics/hooks.txt:22
11854
msgid ""
11855
"Plugins (including hooks) are run on the server if all of these is true:"
11856
msgstr ""
11857
11858
#: en/help_topics/hooks.txt:24
11859
msgid ""
11860
" * The connection is via a smart server (accessed with a URL starting with\n"
11861
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11862
"\"http://\"\n"
11863
" URL when a smart server is available via HTTP)."
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:28
11867
msgid ""
11868
" * The hook is either server specific or part of general infrastructure "
11869
"rather\n"
11870
" than client specific code (such as commit)."
11871
msgstr ""
11872
11873
#: en/help_topics/hooks.txt:31
11874
msgid ""
11875
"\n"
11876
"BranchHooks\n"
11877
"-----------"
11878
msgstr ""
11879
11880
#: en/help_topics/hooks.txt:35
11881
msgid ""
11882
"automatic_tag_name\n"
11883
"~~~~~~~~~~~~~~~~~~"
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11887
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11888
msgid "Introduced in: 2.2"
11889
msgstr ""
11890
11891
#: en/help_topics/hooks.txt:40
11892
msgid ""
11893
"Called to determine an automatic tag name for a revision.\n"
11894
"automatic_tag_name is called with (branch, revision_id) and should\n"
11895
"return a tag name or None if no tag name could be determined. The\n"
11896
"first non-None tag name returned will be used."
11897
msgstr ""
11898
11899
#: en/help_topics/hooks.txt:45
11900
msgid ""
11901
"open\n"
11902
"~~~~"
11903
msgstr ""
11904
11905
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11906
#: en/help_topics/hooks.txt:307
11907
msgid "Introduced in: 1.8"
11908
msgstr ""
11909
11910
#: en/help_topics/hooks.txt:50
11911
msgid ""
11912
"Called with the Branch object that has been opened after a branch is\n"
11913
"opened."
11914
msgstr ""
11915
11916
#: en/help_topics/hooks.txt:53
11917
msgid ""
11918
"post_branch_init\n"
11919
"~~~~~~~~~~~~~~~~"
11920
msgstr ""
11921
11922
#: en/help_topics/hooks.txt:58
11923
msgid ""
11924
"Called after new branch initialization completes. post_branch_init is\n"
11925
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11926
"branch and checkout (both heavyweight and lightweight) will all\n"
11927
"trigger this hook."
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:63
11931
msgid ""
11932
"post_change_branch_tip\n"
11933
"~~~~~~~~~~~~~~~~~~~~~~"
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11937
msgid "Introduced in: 1.4"
11938
msgstr ""
11939
11940
#: en/help_topics/hooks.txt:68
11941
msgid ""
11942
"Called in bzr client and server after a change to the tip of a branch\n"
11943
"is made. post_change_branch_tip is called with a\n"
11944
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11945
"uncommit will all trigger this hook."
11946
msgstr ""
11947
11948
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11949
msgid ""
11950
"post_commit\n"
11951
"~~~~~~~~~~~"
11952
msgstr ""
11953
11954
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11955
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11956
msgid "Introduced in: 0.15"
11957
msgstr ""
11958
11959
#: en/help_topics/hooks.txt:78
11960
msgid ""
11961
"Called in the bzr client after a commit has completed. post_commit is\n"
11962
"called with (local, master, old_revno, old_revid, new_revno,\n"
11963
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11964
"branch."
11965
msgstr ""
11966
11967
#: en/help_topics/hooks.txt:83
11968
msgid ""
11969
"post_pull\n"
11970
"~~~~~~~~~"
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:88
11974
msgid ""
11975
"Called after a pull operation completes. post_pull is called with a\n"
11976
"bzrlib.branch.PullResult object and only runs in the bzr client."
11977
msgstr ""
11978
11979
#: en/help_topics/hooks.txt:91
11980
msgid ""
11981
"post_push\n"
11982
"~~~~~~~~~"
11983
msgstr ""
11984
11985
#: en/help_topics/hooks.txt:96
11986
msgid ""
11987
"Called after a push operation completes. post_push is called with a\n"
11988
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11989
msgstr ""
11990
11991
#: en/help_topics/hooks.txt:99
11992
msgid ""
11993
"post_switch\n"
11994
"~~~~~~~~~~~"
11995
msgstr ""
11996
11997
#: en/help_topics/hooks.txt:104
11998
msgid ""
11999
"Called after a checkout switches branch. post_switch is called with a\n"
12000
"bzrlib.branch.SwitchHookParams."
12001
msgstr ""
12002
12003
#: en/help_topics/hooks.txt:107
12004
msgid ""
12005
"post_uncommit\n"
12006
"~~~~~~~~~~~~~"
12007
msgstr ""
12008
12009
#: en/help_topics/hooks.txt:112
12010
msgid ""
12011
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12012
"called with (local, master, old_revno, old_revid, new_revno,\n"
12013
"new_revid) where local is the local branch or None, master is the\n"
12014
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12015
"of None."
12016
msgstr ""
12017
12018
#: en/help_topics/hooks.txt:118
12019
msgid ""
12020
"pre_change_branch_tip\n"
12021
"~~~~~~~~~~~~~~~~~~~~~"
12022
msgstr ""
12023
12024
#: en/help_topics/hooks.txt:121
12025
msgid "Introduced in: 1.6"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:123
12029
msgid ""
12030
"Called in bzr client and server before a change to the tip of a branch\n"
12031
"is made. pre_change_branch_tip is called with a\n"
12032
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12033
"uncommit will all trigger this hook."
12034
msgstr ""
12035
12036
#: en/help_topics/hooks.txt:128
12037
msgid ""
12038
"pre_commit\n"
12039
"~~~~~~~~~~"
12040
msgstr ""
12041
12042
#: en/help_topics/hooks.txt:131
12043
msgid "Introduced in: 0.91"
12044
msgstr ""
12045
12046
#: en/help_topics/hooks.txt:133
12047
msgid ""
12048
"Called after a commit is calculated but before it is completed.\n"
12049
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12050
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12051
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12052
"TreeDelta object describing changes from the basis revision. hooks\n"
12053
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12054
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12055
"tree."
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:142
12059
msgid ""
12060
"transform_fallback_location\n"
12061
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12062
msgstr ""
12063
12064
#: en/help_topics/hooks.txt:145
12065
msgid "Introduced in: 1.9"
12066
msgstr ""
12067
12068
#: en/help_topics/hooks.txt:147
12069
msgid ""
12070
"Called when a stacked branch is activating its fallback locations.\n"
12071
"transform_fallback_location is called with (branch, url), and should\n"
12072
"return a new url. Returning the same url allows it to be used as-is,\n"
12073
"returning a different one can be used to cause the branch to stack on\n"
12074
"a closer copy of that fallback_location. Note that the branch cannot\n"
12075
"have history accessing methods called on it during this hook because\n"
12076
"the fallback locations have not been activated. When there are\n"
12077
"multiple hooks installed for transform_fallback_location, all are\n"
12078
"called with the url returned from the previous hook.The order is\n"
12079
"however undefined."
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:158
12083
msgid ""
12084
"CommandHooks\n"
12085
"------------"
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:161
12089
msgid ""
12090
"extend_command\n"
12091
"~~~~~~~~~~~~~~"
12092
msgstr ""
12093
12094
#: en/help_topics/hooks.txt:164
12095
msgid "Introduced in: 1.13"
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:166
12099
msgid ""
12100
"Called after creating a command object to allow modifications such as\n"
12101
"adding or removing options, docs etc. Called with the new\n"
12102
"bzrlib.commands.Command object."
12103
msgstr ""
12104
12105
#: en/help_topics/hooks.txt:170
12106
msgid ""
12107
"get_command\n"
12108
"~~~~~~~~~~~"
12109
msgstr ""
12110
12111
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12112
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12113
msgid "Introduced in: 1.17"
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:175
12117
msgid ""
12118
"Called when creating a single command. Called with (cmd_or_None,\n"
12119
"command_name). get_command should either return the cmd_or_None\n"
12120
"parameter, or a replacement Command object that should be used for the\n"
12121
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12122
"Many users will prefer to use bzrlib.commands.register_command or\n"
12123
"plugin_cmds.register_lazy."
12124
msgstr ""
12125
12126
#: en/help_topics/hooks.txt:182
12127
msgid ""
12128
"get_missing_command\n"
12129
"~~~~~~~~~~~~~~~~~~~"
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:187
12133
msgid ""
12134
"Called when creating a single command if no command could be found.\n"
12135
"Called with (command_name). get_missing_command should either return\n"
12136
"None, or a Command object to be used for the command."
12137
msgstr ""
12138
12139
#: en/help_topics/hooks.txt:191
12140
msgid ""
12141
"list_commands\n"
12142
"~~~~~~~~~~~~~"
12143
msgstr ""
12144
12145
#: en/help_topics/hooks.txt:196
12146
msgid ""
12147
"Called when enumerating commands. Called with a set of cmd_name\n"
12148
"strings for all the commands found so far. This set is safe to mutate\n"
12149
"- e.g. to remove a command. list_commands should return the updated\n"
12150
"set of command names."
12151
msgstr ""
12152
12153
#: en/help_topics/hooks.txt:201
12154
msgid ""
12155
"post_command\n"
12156
"~~~~~~~~~~~~"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12160
msgid "Introduced in: 2.6"
12161
msgstr ""
12162
12163
#: en/help_topics/hooks.txt:206
12164
msgid "Called after executing a command. Called with the command object."
12165
msgstr ""
12166
12167
#: en/help_topics/hooks.txt:208
12168
msgid ""
12169
"pre_command\n"
12170
"~~~~~~~~~~~"
12171
msgstr ""
12172
12173
#: en/help_topics/hooks.txt:213
12174
msgid "Called prior to executing a command. Called with the command object."
12175
msgstr ""
12176
12177
#: en/help_topics/hooks.txt:215
12178
msgid ""
12179
"_ConfigHooks\n"
12180
"------------"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:218
12184
msgid ""
12185
"get\n"
12186
"~~~"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12190
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12191
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12192
#: en/help_topics/hooks.txt:446
12193
msgid "Introduced in: 2.4"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:223
12197
msgid ""
12198
"Invoked when a config option is read. The signature is (stack, name,\n"
12199
"value)."
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:226
12203
msgid ""
12204
"load\n"
12205
"~~~~"
12206
msgstr ""
12207
"yükle\n"
12208
"~~~~"
12209
12210
#: en/help_topics/hooks.txt:231
12211
msgid "Invoked when a config store is loaded. The signature is (store)."
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:233
12215
msgid ""
12216
"remove\n"
12217
"~~~~~~"
12218
msgstr ""
12219
"kaldır\n"
12220
"~~~~~~"
12221
12222
#: en/help_topics/hooks.txt:238
12223
msgid ""
12224
"Invoked when a config option is removed. The signature is (stack,\n"
12225
"name)."
12226
msgstr ""
12227
12228
#: en/help_topics/hooks.txt:241
12229
msgid ""
12230
"save\n"
12231
"~~~~"
12232
msgstr ""
12233
"kaydet\n"
12234
"~~~~"
12235
12236
#: en/help_topics/hooks.txt:246
12237
msgid "Invoked when a config store is saved. The signature is (store)."
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:248
12241
msgid ""
12242
"set\n"
12243
"~~~"
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:253
12247
msgid ""
12248
"Invoked when a config option is set. The signature is (stack, name,\n"
12249
"value)."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:256
12253
msgid ""
12254
"ControlDirHooks\n"
12255
"---------------"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:259
12259
msgid ""
12260
"post_repo_init\n"
12261
"~~~~~~~~~~~~~~"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:264
12265
msgid ""
12266
"Invoked after a repository has been initialized. post_repo_init is\n"
12267
"called with a bzrlib.controldir.RepoInitHookParams."
12268
msgstr ""
12269
12270
#: en/help_topics/hooks.txt:267
12271
msgid ""
12272
"pre_open\n"
12273
"~~~~~~~~"
12274
msgstr ""
12275
12276
#: en/help_topics/hooks.txt:270
12277
msgid "Introduced in: 1.14"
12278
msgstr ""
12279
12280
#: en/help_topics/hooks.txt:272
12281
msgid ""
12282
"Invoked before attempting to open a ControlDir with the transport that\n"
12283
"the open will use."
12284
msgstr ""
12285
12286
#: en/help_topics/hooks.txt:275
12287
msgid ""
12288
"InfoHooks\n"
12289
"---------"
12290
msgstr ""
12291
12292
#: en/help_topics/hooks.txt:278
12293
msgid ""
12294
"repository\n"
12295
"~~~~~~~~~~"
12296
msgstr ""
12297
12298
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12299
#: en/help_topics/hooks.txt:524
12300
msgid "Introduced in: 1.15"
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:283
12304
msgid ""
12305
"Invoked when displaying the statistics for a repository. repository is\n"
12306
"called with a statistics dictionary as returned by the repository and\n"
12307
"a file-like object to write to."
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:287
12311
msgid ""
12312
"LockHooks\n"
12313
"---------"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:290
12317
msgid ""
12318
"lock_acquired\n"
12319
"~~~~~~~~~~~~~"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:295
12323
msgid ""
12324
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:297
12328
msgid ""
12329
"lock_broken\n"
12330
"~~~~~~~~~~~"
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:302
12334
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12335
msgstr ""
12336
12337
#: en/help_topics/hooks.txt:304
12338
msgid ""
12339
"lock_released\n"
12340
"~~~~~~~~~~~~~"
12341
msgstr ""
12342
12343
#: en/help_topics/hooks.txt:309
12344
msgid ""
12345
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:311
12349
msgid ""
12350
"MergeHooks\n"
12351
"----------"
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:314
12355
msgid ""
12356
"merge_file_content\n"
12357
"~~~~~~~~~~~~~~~~~~"
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:317
12361
msgid "Introduced in: 2.1"
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:319
12365
msgid ""
12366
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12367
"object when starting a merge. Should return either None or a subclass\n"
12368
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12369
"called per file that needs to be merged (including when one side has\n"
12370
"deleted the file and the other has changed it). See the\n"
12371
"AbstractPerFileMerger API docs for details on how it is used by merge."
12372
msgstr ""
12373
12374
#: en/help_topics/hooks.txt:326
12375
msgid ""
12376
"post_merge\n"
12377
"~~~~~~~~~~"
12378
msgstr ""
12379
12380
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12381
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12382
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12383
msgid "Introduced in: 2.5"
12384
msgstr ""
12385
12386
#: en/help_topics/hooks.txt:331
12387
msgid ""
12388
"Called after a merge. Receives a Merger object as the single argument.\n"
12389
"The return value is ignored."
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:334
12393
msgid ""
12394
"pre_merge\n"
12395
"~~~~~~~~~"
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:339
12399
msgid ""
12400
"Called before a merge. Receives a Merger object as the single\n"
12401
"argument."
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:342
12405
msgid ""
12406
"MergeDirectiveHooks\n"
12407
"-------------------"
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:345
12411
msgid ""
12412
"merge_request_body\n"
12413
"~~~~~~~~~~~~~~~~~~"
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:348
12417
msgid "Introduced in: 1.15.0"
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:350
12421
msgid ""
12422
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12423
"request. Callbacks must return a body. If more than one callback is\n"
12424
"registered, the output of one callback is provided to the next."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:354
12428
msgid ""
12429
"MessageEditorHooks\n"
12430
"------------------"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:357
12434
msgid ""
12435
"commit_message_template\n"
12436
"~~~~~~~~~~~~~~~~~~~~~~~"
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:360
12440
msgid "Introduced in: 1.10"
12441
msgstr ""
12442
12443
#: en/help_topics/hooks.txt:362
12444
msgid ""
12445
"Called when a commit message is being generated.\n"
12446
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12447
"and the message that is known so far. commit_message_template must\n"
12448
"return a new message to use (which could be the same as it was given).\n"
12449
"When there are multiple hooks registered for commit_message_template,\n"
12450
"they are chained with the result from the first passed into the\n"
12451
"second, and so on."
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:370
12455
msgid ""
12456
"set_commit_message\n"
12457
"~~~~~~~~~~~~~~~~~~"
12458
msgstr ""
12459
12460
#: en/help_topics/hooks.txt:375
12461
msgid ""
12462
"Set a fixed commit message. set_commit_message is called with the\n"
12463
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12464
"properties by editing commit.builder._revprops) and the message so\n"
12465
"far. set_commit_message must return the message to use or None if it\n"
12466
"should use the message editor as normal."
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:381
12470
msgid ""
12471
"MutableTreeHooks\n"
12472
"----------------"
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:384
12476
msgid ""
12477
"post_build_tree\n"
12478
"~~~~~~~~~~~~~~~"
12479
msgstr ""
12480
12481
#: en/help_topics/hooks.txt:389
12482
msgid ""
12483
"Called after a completely new tree is built. The hook is called with\n"
12484
"the tree as its only argument."
12485
msgstr ""
12486
12487
#: en/help_topics/hooks.txt:395
12488
msgid "Introduced in: 2.0"
12489
msgstr ""
12490
12491
#: en/help_topics/hooks.txt:397
12492
msgid ""
12493
"Called after a commit is performed on a tree. The hook is called with\n"
12494
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12495
"commit was performed on is available via the mutable_tree attribute of\n"
12496
"that object."
12497
msgstr ""
12498
12499
#: en/help_topics/hooks.txt:402
12500
msgid ""
12501
"post_transform\n"
12502
"~~~~~~~~~~~~~~"
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:407
12506
msgid ""
12507
"Called after a tree transform has been performed on a tree. The hook\n"
12508
"is called with the tree that is being transformed and the transform."
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:410
12512
msgid ""
12513
"pre_transform\n"
12514
"~~~~~~~~~~~~~"
12515
msgstr ""
12516
12517
#: en/help_topics/hooks.txt:415
12518
msgid ""
12519
"Called before a tree transform on this tree. The hook is called with\n"
12520
"the tree that is being transformed and the transform."
12521
msgstr ""
12522
12523
#: en/help_topics/hooks.txt:418
12524
msgid ""
12525
"start_commit\n"
12526
"~~~~~~~~~~~~"
12527
msgstr ""
12528
12529
#: en/help_topics/hooks.txt:423
12530
msgid ""
12531
"Called before a commit is performed on a tree. The start commit hook\n"
12532
"is able to change the tree before the commit takes place. start_commit\n"
12533
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12534
"being performed on."
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:428
12538
msgid ""
12539
"SmartClientHooks\n"
12540
"----------------"
12541
msgstr ""
12542
12543
#: en/help_topics/hooks.txt:431
12544
msgid ""
12545
"call\n"
12546
"~~~~"
12547
msgstr ""
12548
12549
#: en/help_topics/hooks.txt:434
12550
msgid "Introduced in: unknown"
12551
msgstr ""
12552
12553
#: en/help_topics/hooks.txt:436
12554
msgid ""
12555
"Called when the smart client is submitting a request to the smart\n"
12556
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12557
"Streaming request bodies, and responses, are not accessible."
12558
msgstr ""
12559
12560
#: en/help_topics/hooks.txt:440
12561
msgid ""
12562
"SmartServerHooks\n"
12563
"----------------"
12564
msgstr ""
12565
12566
#: en/help_topics/hooks.txt:443
12567
msgid ""
12568
"server_exception\n"
12569
"~~~~~~~~~~~~~~~~"
12570
msgstr ""
12571
12572
#: en/help_topics/hooks.txt:448
12573
msgid ""
12574
"Called by the bzr server when an exception occurs. server_exception is\n"
12575
"called with the sys.exc_info() tuple return true for the hook if the\n"
12576
"exception has been handled, in which case the server will exit\n"
12577
"normally."
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:453
12581
msgid ""
12582
"server_started\n"
12583
"~~~~~~~~~~~~~~"
12584
msgstr ""
12585
12586
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12587
msgid "Introduced in: 0.16"
12588
msgstr ""
12589
12590
#: en/help_topics/hooks.txt:458
12591
msgid ""
12592
"Called by the bzr server when it starts serving a directory.\n"
12593
"server_started is called with (backing urls, public url), where\n"
12594
"backing_url is a list of URLs giving the server-specific directory\n"
12595
"locations, and public_url is the public URL for the directory being\n"
12596
"served."
12597
msgstr ""
12598
12599
#: en/help_topics/hooks.txt:464
12600
msgid ""
12601
"server_started_ex\n"
12602
"~~~~~~~~~~~~~~~~~"
12603
msgstr ""
12604
12605
#: en/help_topics/hooks.txt:469
12606
msgid ""
12607
"Called by the bzr server when it starts serving a directory.\n"
12608
"server_started is called with (backing_urls, server_obj)."
12609
msgstr ""
12610
12611
#: en/help_topics/hooks.txt:472
12612
msgid ""
12613
"server_stopped\n"
12614
"~~~~~~~~~~~~~~"
12615
msgstr ""
12616
12617
#: en/help_topics/hooks.txt:477
12618
msgid ""
12619
"Called by the bzr server when it stops serving a directory.\n"
12620
"server_stopped is called with the same parameters as the\n"
12621
"server_started hook: (backing_urls, public_url)."
12622
msgstr ""
12623
12624
#: en/help_topics/hooks.txt:481
12625
msgid ""
12626
"StatusHooks\n"
12627
"-----------"
12628
msgstr ""
12629
12630
#: en/help_topics/hooks.txt:484
12631
msgid ""
12632
"post_status\n"
12633
"~~~~~~~~~~~"
12634
msgstr ""
12635
12636
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12637
msgid "Introduced in: 2.3"
12638
msgstr ""
12639
12640
#: en/help_topics/hooks.txt:489
12641
msgid ""
12642
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12643
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12644
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12645
"correspond to the command line options specified by the user for the\n"
12646
"status command. to_file is the output stream for writing."
12647
msgstr ""
12648
12649
#: en/help_topics/hooks.txt:495
12650
msgid ""
12651
"pre_status\n"
12652
"~~~~~~~~~~"
12653
msgstr ""
12654
12655
#: en/help_topics/hooks.txt:500
12656
msgid ""
12657
"Called with argument StatusHookParams before Bazaar displays the\n"
12658
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12659
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12660
"correspond to the command line options specified by the user for the\n"
12661
"status command. to_file is the output stream for writing."
12662
msgstr ""
12663
12664
#: en/help_topics/hooks.txt:506
12665
msgid ""
12666
"TransportHooks\n"
12667
"--------------"
12668
msgstr ""
12669
12670
#: en/help_topics/hooks.txt:509
12671
msgid ""
12672
"post_connect\n"
12673
"~~~~~~~~~~~~"
12674
msgstr ""
12675
12676
#: en/help_topics/hooks.txt:514
12677
msgid ""
12678
"Called after a new connection is established or a reconnect occurs.\n"
12679
"The sole argument passed is either the connected transport or smart\n"
12680
"medium instance."
12681
msgstr ""
12682
12683
#: en/help_topics/hooks.txt:518
12684
msgid ""
12685
"RioVersionInfoBuilderHooks\n"
12686
"--------------------------"
12687
msgstr ""
12688
12689
#: en/help_topics/hooks.txt:521
12690
msgid ""
12691
"revision\n"
12692
"~~~~~~~~"
12693
msgstr ""
12694
12695
#: en/help_topics/hooks.txt:526
12696
msgid ""
12697
"Invoked when adding information about a revision to the RIO stanza\n"
12698
"that is printed. revision is called with a revision object and a RIO\n"
12699
"stanza.\n"
12700
msgstr ""
12701
12702
#: en/help_topics/location-alias.txt:1
12703
msgid ""
12704
"Location aliases\n"
12705
"================"
12706
msgstr ""
12707
12708
#: en/help_topics/location-alias.txt:4
12709
msgid ""
12710
"Bazaar defines several aliases for locations associated with a branch. "
12711
"These\n"
12712
"can be used with most commands that expect a location, such as `bzr push`."
12713
msgstr ""
12714
12715
#: en/help_topics/location-alias.txt:7
12716
msgid "The aliases are::"
12717
msgstr ""
12718
12719
#: en/help_topics/location-alias.txt:9
12720
msgid ""
12721
" :bound The branch this branch is bound to, for bound branches.\n"
12722
" :parent The parent of this branch.\n"
12723
" :public The public location of this branch.\n"
12724
" :push The saved location used for `bzr push` with no arguments.\n"
12725
" :submit The submit branch for this branch.\n"
12726
" :this This branch."
12727
msgstr ""
12728
12729
#: en/help_topics/location-alias.txt:16
12730
msgid "For example, to push to the parent location::"
12731
msgstr ""
12732
12733
#: en/help_topics/location-alias.txt:18
12734
msgid " bzr push :parent\n"
12735
msgstr ""
12736
12737
#: en/help_topics/log-formats.txt:1
12738
msgid ""
12739
"Log Formats\n"
12740
"==========="
12741
msgstr ""
12742
12743
#: en/help_topics/log-formats.txt:4
12744
msgid ""
12745
"A log format controls how information about each revision is displayed.\n"
12746
"The standard log formats are compared below::"
12747
msgstr ""
12748
12749
#: en/help_topics/log-formats.txt:7
12750
msgid ""
12751
" Feature long short line\n"
12752
" ---------------------- ------------- ------------ -------------------\n"
12753
" design goal detailed view concise view 1 revision per line\n"
12754
" committer name+email name only name only\n"
12755
" author name+email - -\n"
12756
" date-time format full date only date only\n"
12757
" commit message full full top line\n"
12758
" tags yes yes yes\n"
12759
" merges indicator - yes -\n"
12760
" status/delta optional optional -\n"
12761
" diff/patch optional optional -\n"
12762
" revision-id optional optional -\n"
12763
" branch nick yes - -\n"
12764
" foreign vcs properties yes yes -\n"
12765
" preferred levels all 1 1\n"
12766
" digital signature optional - -"
12767
msgstr ""
12768
12769
#: en/help_topics/log-formats.txt:24
12770
msgid ""
12771
"The default format is ``long``. To change this, define the ``log_format``\n"
12772
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12773
msgstr ""
12774
12775
#: en/help_topics/log-formats.txt:27
12776
msgid ""
12777
" [DEFAULT]\n"
12778
" log_format = short"
12779
msgstr ""
12780
12781
#: en/help_topics/log-formats.txt:30
12782
msgid ""
12783
"Alternatively, to change the log format used for a given query, use the\n"
12784
"--long, --short or --line options."
12785
msgstr ""
12786
12787
#: en/help_topics/log-formats.txt:33
12788
msgid ""
12789
"If one of the standard log formats does not meet your needs, additional\n"
12790
"formats can be provided by plugins.\n"
12791
msgstr ""
12792
12793
#: en/help_topics/other-formats.txt:1
12794
msgid "Other Storage Formats"
12795
msgstr ""
12796
12797
#: en/help_topics/other-formats.txt:3
12798
msgid "Experimental formats are shown below."
12799
msgstr ""
12800
12801
#: en/help_topics/other-formats.txt:5
12802
msgid ""
12803
":development-colo:\n"
12804
" (native) The 2a format with experimental support for colocated\n"
12805
" branches."
12806
msgstr ""
12807
12808
#: en/help_topics/other-formats.txt:9
12809
msgid ""
12810
"\n"
12811
"Deprecated formats are shown below."
12812
msgstr ""
12813
12814
#: en/help_topics/other-formats.txt:12
12815
msgid ""
12816
":pack-0.92:\n"
12817
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12818
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12819
" by bzr < 0.92."
12820
msgstr ""
12821
12822
#: en/help_topics/patterns.txt:1
12823
msgid ""
12824
"Patterns\n"
12825
"========"
12826
msgstr ""
12827
12828
#: en/help_topics/patterns.txt:4
12829
msgid ""
12830
"Bazaar uses patterns to match files at various times. For example,\n"
12831
"the ``add`` command skips over files that match ignore patterns\n"
12832
"and preferences can be associated with files using rule patterns.\n"
12833
"The pattern syntax is described below."
12834
msgstr ""
12835
12836
#: en/help_topics/patterns.txt:9
12837
msgid ""
12838
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12839
"slash or is a regular expression, it is compared to the whole path\n"
12840
"from the branch root. Otherwise, it is compared to only the last\n"
12841
"component of the path. To match a file only in the root directory,\n"
12842
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12843
msgstr ""
12844
12845
#: en/help_topics/patterns.txt:15
12846
msgid "Patterns may include globbing wildcards such as::"
12847
msgstr ""
12848
12849
#: en/help_topics/patterns.txt:17
12850
msgid ""
12851
" ? - Matches any single character except '/'\n"
12852
" * - Matches 0 or more characters except '/'\n"
12853
" /**/ - Matches 0 or more directories in a path\n"
12854
" [a-z] - Matches a single character from within a group of characters"
12855
msgstr ""
12856
12857
#: en/help_topics/patterns.txt:22
12858
msgid ""
12859
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12860
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12861
"expression. Regular expression patterns may not include named or\n"
12862
"numbered groups."
12863
msgstr ""
12864
12865
#: en/help_topics/patterns.txt:27
12866
msgid ""
12867
"Case insensitive ignore patterns can be specified with regular expressions\n"
12868
"by using the ``i`` (for ignore case) flag in the pattern."
12869
msgstr ""
12870
12871
#: en/help_topics/patterns.txt:30
12872
msgid ""
12873
"For example, a case insensitive match for ``foo`` may be specified as::"
12874
msgstr ""
12875
12876
#: en/help_topics/patterns.txt:32
12877
msgid " RE:(?i)foo"
12878
msgstr ""
12879
12880
#: en/help_topics/patterns.txt:34
12881
msgid ""
12882
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12883
"matched by that pattern will not be ignored."
12884
msgstr ""
12885
12886
#: en/help_topics/patterns.txt:37
12887
msgid ""
12888
".. _Python regular expressions: http://docs.python.org/library/re.html"
12889
msgstr ""
12890
12891
#: en/help_topics/revisionspec.txt:1
12892
msgid "Revision Identifiers"
12893
msgstr ""
12894
12895
#: en/help_topics/revisionspec.txt:3
12896
msgid ""
12897
"A revision identifier refers to a specific state of a branch's history. It\n"
12898
"can be expressed in several ways. It can begin with a keyword to\n"
12899
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12900
"'before:yesterday' and 'submit:'."
12901
msgstr ""
12902
12903
#: en/help_topics/revisionspec.txt:8
12904
msgid ""
12905
"Alternately, it can be given without a keyword, in which case it will be\n"
12906
"checked as a revision number, a tag, a revision id, a date specification, or "
12907
"a\n"
12908
"branch specification, in that order. For example, 'date:today' could be\n"
12909
"written as simply 'today', though if you have a tag called 'today' that "
12910
"will\n"
12911
"be found first."
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:14
12915
msgid ""
12916
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12917
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12918
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12919
"or\n"
12920
"spaces around the '..')."
12921
msgstr ""
12922
12923
#: en/help_topics/revisionspec.txt:19
12924
msgid ""
12925
"Ranges are interpreted differently by different commands. To the \"log\" "
12926
"command,\n"
12927
"a range is a sequence of log messages, but to the \"diff\" command, the "
12928
"range\n"
12929
"denotes a change between revisions (and not a sequence of changes). In\n"
12930
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12931
"consider it\n"
12932
"to be open-ended, that is, they include one end but not the other. For "
12933
"example:\n"
12934
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12935
"3649,\n"
12936
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12937
"and\n"
12938
"3649, but not 3647."
12939
msgstr ""
12940
12941
#: en/help_topics/revisionspec.txt:28
12942
msgid "The keywords used as revision selection methods are the following:"
12943
msgstr ""
12944
12945
#: en/help_topics/revisionspec.txt:30
12946
msgid ""
12947
":revid:\n"
12948
"\tSelects a revision using the revision id.\n"
12949
":submit:\n"
12950
"\tSelects a common ancestor with the submit branch.\n"
12951
":ancestor:\n"
12952
"\tSelects a common ancestor with a second branch.\n"
12953
":date:\n"
12954
"\tSelects a revision on the basis of a datestamp.\n"
12955
":branch:\n"
12956
"\tSelects the last revision of a specified branch.\n"
12957
":tag:\n"
12958
"\tSelects a revision identified by a tag name.\n"
12959
":revno:\n"
12960
"\tSelects a revision using a number.\n"
12961
":before:\n"
12962
"\tSelects the parent of the revision specified.\n"
12963
":annotate:\n"
12964
"\tSelect the revision that last modified the specified line.\n"
12965
":mainline:\n"
12966
"\tSelect mainline revision that merged the specified revision.\n"
12967
":last:\n"
12968
"\tSelects the nth revision from the end."
12969
msgstr ""
12970
12971
#: en/help_topics/revisionspec.txt:53
12972
msgid "In addition, plugins can provide other keywords."
12973
msgstr "Ayrıca, eklentiler başka anahtar sözcükler sağlayabilir."
12974
12975
#: en/help_topics/revisionspec.txt:55
12976
msgid "A detailed description of each keyword is given below."
12977
msgstr "Her anahtar sözcüğün ayrıntılı tanımı aşağıda verilmiştir:"
12978
12979
#: en/help_topics/revisionspec.txt:57
12980
msgid ":revid:"
12981
msgstr ""
12982
12983
#: en/help_topics/revisionspec.txt:59
12984
msgid ""
12985
" Supply a specific revision id, that can be used to specify any\n"
12986
" revision id in the ancestry of the branch.\n"
12987
" Including merges, and pending merges.\n"
12988
" Examples::"
12989
msgstr ""
12990
12991
#: en/help_topics/revisionspec.txt:64
12992
msgid ""
12993
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12994
msgstr ""
12995
12996
#: en/help_topics/revisionspec.txt:66
12997
msgid ":submit:"
12998
msgstr ""
12999
13000
#: en/help_topics/revisionspec.txt:68
13001
msgid ""
13002
" Diffing against this shows all the changes that were made in this "
13003
"branch,\n"
13004
" and is a good predictor of what merge will do. The submit branch is\n"
13005
" used by the bundle and merge directive commands. If no submit branch\n"
13006
" is specified, the parent branch is used instead."
13007
msgstr ""
13008
13009
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13010
msgid ""
13011
" The common ancestor is the last revision that existed in both\n"
13012
" branches. Usually this is the branch point, but it could also be\n"
13013
" a revision that was merged."
13014
msgstr ""
13015
13016
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13017
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13018
#: en/help_topics/revisionspec.txt:153
13019
msgid " Examples::"
13020
msgstr " Örnekler::"
13021
13022
#: en/help_topics/revisionspec.txt:79
13023
msgid " $ bzr diff -r submit:"
13024
msgstr ""
13025
13026
#: en/help_topics/revisionspec.txt:81
13027
msgid ":ancestor:"
13028
msgstr ""
13029
13030
#: en/help_topics/revisionspec.txt:83
13031
msgid " Supply the path to a branch to select the common ancestor."
13032
msgstr ""
13033
13034
#: en/help_topics/revisionspec.txt:89
13035
msgid ""
13036
" This is frequently used with 'diff' to return all of the changes\n"
13037
" that your branch introduces, while excluding the changes that you\n"
13038
" have not merged from the remote branch."
13039
msgstr ""
13040
13041
#: en/help_topics/revisionspec.txt:95
13042
msgid ""
13043
" ancestor:/path/to/branch\n"
13044
" $ bzr diff -r ancestor:../../mainline/branch"
13045
msgstr ""
13046
13047
#: en/help_topics/revisionspec.txt:98
13048
msgid ":date:"
13049
msgstr ":tarih:"
13050
13051
#: en/help_topics/revisionspec.txt:100
13052
msgid ""
13053
" Supply a datestamp to select the first revision that matches the date.\n"
13054
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13055
" Matches the first entry after a given date (either at midnight or\n"
13056
" at a specified time)."
13057
msgstr ""
13058
13059
#: en/help_topics/revisionspec.txt:105
13060
msgid " One way to display all the changes since yesterday would be::"
13061
msgstr ""
13062
13063
#: en/help_topics/revisionspec.txt:107
13064
msgid " bzr log -r date:yesterday.."
13065
msgstr ""
13066
13067
#: en/help_topics/revisionspec.txt:111
13068
msgid ""
13069
" date:yesterday -> select the first revision since "
13070
"yesterday\n"
13071
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13072
" August 14th, 2006 at 5:10pm."
13073
msgstr ""
13074
13075
#: en/help_topics/revisionspec.txt:115
13076
msgid ":branch:"
13077
msgstr ""
13078
13079
#: en/help_topics/revisionspec.txt:117
13080
msgid " Supply the path to a branch to select its last revision."
13081
msgstr ""
13082
13083
#: en/help_topics/revisionspec.txt:121
13084
msgid " branch:/path/to/branch"
13085
msgstr ""
13086
13087
#: en/help_topics/revisionspec.txt:123
13088
msgid ":tag:"
13089
msgstr ""
13090
13091
#: en/help_topics/revisionspec.txt:125
13092
msgid " Tags are stored in the branch and created by the 'tag' command."
13093
msgstr ""
13094
13095
#: en/help_topics/revisionspec.txt:127
13096
msgid ":revno:"
13097
msgstr ""
13098
13099
#: en/help_topics/revisionspec.txt:129
13100
msgid ""
13101
" Use an integer to specify a revision in the history of the branch.\n"
13102
" Optionally a branch can be specified. A negative number will count\n"
13103
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13104
" one). If the negative number is larger than the branch's history, the\n"
13105
" first revision is returned.\n"
13106
" Examples::"
13107
msgstr ""
13108
13109
#: en/help_topics/revisionspec.txt:136
13110
msgid ""
13111
" revno:1 -> return the first revision of this branch\n"
13112
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13113
" the branch '/path/to/branch'\n"
13114
" revno:-1 -> The last revision in a branch.\n"
13115
" -2:http://other/branch -> The second to last revision in the\n"
13116
" remote branch.\n"
13117
" -1000000 -> Most likely the first revision, unless\n"
13118
" your history is very long."
13119
msgstr ""
13120
13121
#: en/help_topics/revisionspec.txt:145
13122
msgid ":before:"
13123
msgstr ""
13124
13125
#: en/help_topics/revisionspec.txt:147
13126
msgid ""
13127
" Supply any revision spec to return the parent of that revision. This "
13128
"is\n"
13129
" mostly useful when inspecting revisions that are not in the revision "
13130
"history\n"
13131
" of a branch."
13132
msgstr ""
13133
13134
#: en/help_topics/revisionspec.txt:151
13135
msgid ""
13136
" It is an error to request the parent of the null revision (before:0)."
13137
msgstr ""
13138
13139
#: en/help_topics/revisionspec.txt:155
13140
msgid ""
13141
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13142
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13143
" aaaa@bbbb-1234567890\n"
13144
" bzr diff -r before:1913..1913\n"
13145
" -> Find the changes between revision 1913 and its parent "
13146
"(1912).\n"
13147
" (What changes did revision 1913 introduce).\n"
13148
" This is equivalent to: bzr diff -c 1913"
13149
msgstr ""
13150
13151
#: en/help_topics/revisionspec.txt:163
13152
msgid ":annotate:"
13153
msgstr ""
13154
13155
#: en/help_topics/revisionspec.txt:165
13156
msgid ""
13157
" Select the revision that last modified the specified line. Line is\n"
13158
" specified as path:number. Path is a relative path to the file. "
13159
"Numbers\n"
13160
" start at 1, and are relative to the current version, not the last-\n"
13161
" committed version of the file."
13162
msgstr ""
13163
13164
#: en/help_topics/revisionspec.txt:170
13165
msgid ":mainline:"
13166
msgstr ""
13167
13168
#: en/help_topics/revisionspec.txt:172
13169
msgid ""
13170
" Select the revision that merged the specified revision into mainline."
13171
msgstr ""
13172
13173
#: en/help_topics/revisionspec.txt:174
13174
msgid ":last:"
13175
msgstr ""
13176
13177
#: en/help_topics/revisionspec.txt:176
13178
msgid ""
13179
" Supply a positive number to get the nth revision from the end.\n"
13180
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13181
" Examples::"
13182
msgstr ""
13183
13184
#: en/help_topics/revisionspec.txt:180
13185
msgid ""
13186
" last:1 -> return the last revision\n"
13187
" last:3 -> return the revision 2 before the end.\n"
13188
msgstr ""
13189
13190
#: en/help_topics/rules.txt:1
13191
msgid ""
13192
"Rules\n"
13193
"====="
13194
msgstr ""
13195
"Kurallar\n"
13196
"====="
13197
13198
#: en/help_topics/rules.txt:7
13199
msgid ""
13200
"Rules are defined in ini file format where the sections are file glob\n"
13201
"patterns and the contents of each section are the preferences for files\n"
13202
"matching that pattern(s). For example::"
13203
msgstr ""
13204
13205
#: en/help_topics/rules.txt:11
13206
msgid ""
13207
" [name *.bat]\n"
13208
" eol = native"
13209
msgstr ""
13210
13211
#: en/help_topics/rules.txt:14
13212
msgid ""
13213
" [name *.html *.xml]\n"
13214
" keywords = xml_escape"
13215
msgstr ""
13216
13217
#: en/help_topics/rules.txt:17
13218
msgid ""
13219
"Preferences like these are useful for commands and plugins wishing to\n"
13220
"provide custom behaviour for selected files. For more information on \n"
13221
"end of line conversion see :doc:`eol-help`.\n"
13222
"Keyword support is provided by the `keywords plugin\n"
13223
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13224
msgstr ""
13225
13226
#: en/help_topics/rules.txt:23
13227
msgid ""
13228
"Files\n"
13229
"-----"
13230
msgstr ""
13231
"Dosyalar\n"
13232
"-----"
13233
13234
#: en/help_topics/rules.txt:26
13235
msgid ""
13236
"Default rules for all branches are defined in the optional file\n"
13237
"``BZR_HOME/rules``. "
13238
msgstr ""
13239
13240
#: en/help_topics/rules.txt:29
13241
msgid ""
13242
"Rule Patterns\n"
13243
"-------------"
13244
msgstr ""
13245
13246
#: en/help_topics/rules.txt:32
13247
msgid ""
13248
"Patterns are ordered and searching stops as soon as one matches.\n"
13249
"As a consequence, more explicit patterns should be placed towards\n"
13250
"the top of the file. Rule patterns use exactly the same conventions\n"
13251
"as ignore patterns. See :doc:`patterns-help` for details."
13252
msgstr ""
13253
13254
#: en/help_topics/rules.txt:37
13255
msgid ".. note::"
13256
msgstr ".. not::"
13257
13258
#: en/help_topics/rules.txt:39
13259
msgid ""
13260
" Patterns containing square brackets or spaces should be\n"
13261
" surrounded in quotes to ensure they are correctly parsed.\n"
13262
msgstr ""
13263
13264
#: en/help_topics/topics.txt:1
13265
msgid ""
13266
"authentication Information on configuring authentication\n"
13267
"basic Basic commands\n"
13268
"branches Information on what a branch is\n"
13269
"bugs Bug tracker settings\n"
13270
"checkouts Information on what a checkout is\n"
13271
"commands Basic help for all commands\n"
13272
"configuration Details on the configuration settings available\n"
13273
"conflict-types Types of conflicts and what to do about them\n"
13274
"content-filters Conversion of content into/from working trees\n"
13275
"criss-cross Information on criss-cross merging\n"
13276
"current-formats Current storage formats\n"
13277
"debug-flags Options to show or record debug information\n"
13278
"diverged-branches How to fix diverged branches\n"
13279
"env-variables Environment variable names and values\n"
13280
"eol Information on end-of-line handling\n"
13281
"files Information on configuration and log files\n"
13282
"formats Information on choosing a storage format\n"
13283
"global-options Options that control how Bazaar runs\n"
13284
"hidden-commands All hidden commands\n"
13285
"hooks Points at which custom processing can be added\n"
13286
"launchpad Using Bazaar with Launchpad.net\n"
13287
"location-alias Aliases for remembered locations\n"
13288
"log-formats Details on the logging formats available\n"
13289
"other-formats Experimental and deprecated storage formats\n"
13290
"patterns Information on the pattern syntax\n"
13291
"repositories Basic information on shared repositories.\n"
13292
"revisionspec Explain how to use --revision\n"
13293
"rules Information on defining rule-based preferences\n"
13294
"standalone-trees Information on what a standalone tree is\n"
13295
"standard-options Options that can be used with any command\n"
13296
"status-flags Help on status flags\n"
13297
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13298
"topics Topics list\n"
13299
"url-special-chars Special character handling in URLs\n"
13300
"urlspec Supported transport protocols\n"
13301
"working-trees Information on working trees\n"
13302
msgstr ""
13303
13304
#: en/help_topics/url-special-chars.txt:1
13305
msgid ""
13306
"Special character handling in URLs\n"
13307
"=================================="
13308
msgstr ""
13309
13310
#: en/help_topics/url-special-chars.txt:4
13311
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13312
msgstr ""
13313
13314
#: en/help_topics/url-special-chars.txt:6
13315
msgid " * Fully qualified URLs"
13316
msgstr ""
13317
13318
#: en/help_topics/url-special-chars.txt:8
13319
msgid " * File system paths, relative or absolute"
13320
msgstr ""
13321
13322
#: en/help_topics/url-special-chars.txt:10
13323
msgid ""
13324
"Internally bzr treats all locations as URLs. For any file system paths\n"
13325
"that are specified it will automatically determine the appropriate URL\n"
13326
"representation, and escape special characters where necessary."
13327
msgstr ""
13328
13329
#: en/help_topics/url-special-chars.txt:14
13330
msgid ""
13331
"There are a few characters which have special meaning in URLs and need "
13332
"careful\n"
13333
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13334
"value in URLs. Any non-ASCII characters in a file path will automatically "
13335
"be\n"
13336
"urlencoded when the path is converted to a URL."
13337
msgstr ""
13338
13339
#: en/help_topics/url-special-chars.txt:19
13340
msgid ""
13341
"URLs represent non-ASCII characters in an encoding defined by the server, "
13342
"but\n"
13343
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13344
"be\n"
13345
"generous in what it accepts as a URL and to print them in a way that\n"
13346
"will be readable."
13347
msgstr ""
13348
13349
#: en/help_topics/url-special-chars.txt:24
13350
msgid ""
13351
"For example, if you have a directory named '/tmp/%2False' these are all "
13352
"valid\n"
13353
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13354
"slash)::"
13355
msgstr ""
13356
13357
#: en/help_topics/url-special-chars.txt:27
13358
msgid ""
13359
" cd /tmp\n"
13360
" bzr log /tmp/%2False\n"
13361
" bzr log %2False\n"
13362
" bzr log file:///tmp/%252False\n"
13363
" bzr log file://localhost/tmp/%252False\n"
13364
" bzr log file:%252False"
13365
msgstr ""
13366
13367
#: en/help_topics/url-special-chars.txt:34
13368
msgid "These are valid but do not refer to the same file::"
13369
msgstr ""
13370
13371
#: en/help_topics/url-special-chars.txt:36
13372
msgid ""
13373
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13374
" bzr log %252False (refers to a file called /tmp/%252False)"
13375
msgstr ""
13376
13377
#: en/help_topics/url-special-chars.txt:39
13378
msgid ""
13379
"Comma also has special meaning in URLs, because it denotes `segment "
13380
"parameters`_"
13381
msgstr ""
13382
13383
#: en/help_topics/url-special-chars.txt:41
13384
msgid ""
13385
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13386
msgstr ""
13387
13388
#: en/help_topics/url-special-chars.txt:43
13389
msgid ""
13390
"Comma is also special in any file system paths that are specified. To use a "
13391
"literal\n"
13392
"comma in a file system path, specify a URL and URL encode the comma::"
13393
msgstr ""
13394
13395
#: en/help_topics/url-special-chars.txt:46
13396
msgid ""
13397
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13398
"\"branch\" set to \"bla\"\n"
13399
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13400
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13401
"\"branch\" set to \"bla\"\n"
13402
msgstr ""
13403
13404
#: en/help_topics/urlspec.txt:1
13405
msgid "URL Identifiers"
13406
msgstr "Adres Tanımlayıcıları"
13407
13408
#: en/help_topics/urlspec.txt:3
13409
msgid "Supported URL prefixes::"
13410
msgstr "Desteklenen adres önekleri:"
13411
13412
#: en/help_topics/urlspec.txt:5
13413
msgid ""
13414
" aftp:// Access using active FTP.\n"
13415
" bzr:// Fast access using the Bazaar smart server.\n"
13416
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13417
" file:// Access using the standard filesystem (default)\n"
13418
" ftp:// Access using passive FTP.\n"
13419
" http:// Read-only access of branches exported on the web.\n"
13420
" https:// Read-only access of branches exported on the web using "
13421
"SSL.\n"
13422
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13423
msgstr ""
13424
13425
#: en/help_topics/urlspec.txt:14
13426
msgid "Supported modifiers::"
13427
msgstr ""
13428
13429
#: en/help_topics/urlspec.txt:16
13430
msgid " gio+ Access using any GIO supported protocols."
13431
msgstr ""
13432
13433
#: en/help_topics/urlspec.txt:18
13434
msgid "Bazaar supports all of the standard parts within the URL::"
13435
msgstr ""
13436
13437
#: en/help_topics/urlspec.txt:20
13438
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13439
msgstr ""
13440
13441
#: en/help_topics/urlspec.txt:22
13442
msgid "allowing URLs such as::"
13443
msgstr ""
13444
13445
#: en/help_topics/urlspec.txt:24
13446
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13447
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13448
13449
#: en/help_topics/urlspec.txt:26
13450
msgid ""
13451
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13452
"with '~' as meaning that the rest of the path should be interpreted\n"
13453
"relative to the remote user's home directory. For example if the user\n"
13454
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13455
"shell.example.com, then::"
13456
msgstr ""
13457
13458
#: en/help_topics/urlspec.txt:32
13459
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13460
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13461
13462
#: en/help_topics/urlspec.txt:34
13463
msgid "would refer to ``/home/remote/myproject/trunk``."
13464
msgstr ""
13465
13466
#: en/help_topics/urlspec.txt:36
13467
msgid ""
13468
"Many commands that accept URLs also accept location aliases too.\n"
13469
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13470
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1