« back to all changes in this revision
Viewing changes to po/gl.po
- browse files at revision 5912.4.8
- compare with another revision
- download diff
- download tarball
- view history from revision 5912.4.8
- Committer: Jonathan Riddell
- Date: 2011-06-02 12:46:20 UTC
- mto: This revision was merged to the branch mainline in revision 5965.
- Revision ID: jriddell@canonical.com-20110602124620-fbwhv52femfjxi6k
make set_commit_message hook syntax more consistent with generate_commit_message_template
- files added:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files renamed:
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/bzr_distutils.py => tools/build_mo.py
- files modified:
- .bzrignore
added
removed
po/gl.po
1
# Galician translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2011-09-16 21:13+0000\n"
12
"Last-Translator: Fran Diéguez <Unknown>\n"
13
"Language-Team: Galician <gl@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: 2012-07-11 04:32+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:2957
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:2960
42
msgid "No new revisions or tags to push."
43
msgstr "Non hai revisións ou etiquetas para empurar (push)."
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr "Non hai revisións novas para empurrar (push)."
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr "atopouse un erro: %s"
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignorando os ficheiros fóra da vista. A vista é %s"
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr "Mostrar o resumo do estado."
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Isto informa sobre ficheiros versionados e descoñecidos, informando\n"
78
"deles agrupados por estado. Os estados posíbeis son:"
79
80
#: bzrlib/builtins.py:320
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"engadido\n"
86
" Versionado na copia de traballo pero non na revisión anterior."
87
88
#: bzrlib/builtins.py:323
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"eliminado\n"
95
" Versionado na revisión anterior pero quitado ou eliminado\n"
96
" na copia de traballo."
97
98
#: bzrlib/builtins.py:327
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renomeado\n"
106
" A ruta a este ficheiro cambiou desde a revisión anterior;\n"
107
" o texto semella que cambiou. Isto inclúe os ficheiros cuxo\n"
108
" cartafol pai foi renomeado."
109
110
#: bzrlib/builtins.py:332
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modificado\n"
116
" O texto cambiou desde a última revisión."
117
118
#: bzrlib/builtins.py:335
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"semella cambiado\n"
124
" O ficheiro semella que foi cambiado (p.ex. de ficheiro a cartafol)"
125
126
#: bzrlib/builtins.py:338
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"descoñecido\n"
132
" Non versionado e non coincide cun patrón de ignorado."
133
134
#: bzrlib/builtins.py:341
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
142
#: bzrlib/builtins.py:346
143
msgid ""
144
"To see ignored files use 'bzr ignored'. For details on the\n"
145
"changes to file texts, use 'bzr diff'."
146
msgstr ""
147
"Para ver os ficheiros use «bzr ignored». Para máis información\n"
148
"sobre os cambios nos textos dos ficheiros use «bzr diff»."
149
150
#: bzrlib/builtins.py:349
151
msgid ""
152
"Note that --short or -S gives status flags for each item, similar\n"
153
"to Subversion's status command. To get output similar to svn -q,\n"
154
"use bzr status -SV."
155
msgstr ""
156
157
#: bzrlib/builtins.py:353
158
msgid ""
159
"If no arguments are specified, the status of the entire working\n"
160
"directory is shown. Otherwise, only the status of the specified\n"
161
"files or directories is reported. If a directory is given, status\n"
162
"is reported for everything inside that directory."
163
msgstr ""
164
165
#: bzrlib/builtins.py:358
166
msgid ""
167
"Before merges are committed, the pending merge tip revisions are\n"
168
"shown. To see all pending merge revisions, use the -v option.\n"
169
"To skip the display of pending merge information altogether, use\n"
170
"the no-pending option or specify a file/directory."
171
msgstr ""
172
173
#: bzrlib/builtins.py:363
174
msgid ""
175
"To compare the working directory to a specific revision, pass a\n"
176
"single revision to the revision argument."
177
msgstr ""
178
"Para comparar o cartafol de traballo con unha revisión específica, pase\n"
179
"unha revisión ao argumento «revision»."
180
181
#: bzrlib/builtins.py:366
182
msgid ""
183
"To see which files have changed in a specific revision, or between\n"
184
"two revisions, pass a revision range to the revision argument.\n"
185
"This will produce the same results as calling 'bzr diff --summarize'."
186
msgstr ""
187
188
#: bzrlib/builtins.py:375
189
msgid "Use short status indicators."
190
msgstr "Usar os indicadores de estado curtos"
191
192
#: bzrlib/builtins.py:377
193
msgid "Only show versioned files."
194
msgstr "Mostrar só os ficheiros versionados."
195
196
#: bzrlib/builtins.py:379
197
msgid "Don't show pending merges."
198
msgstr "Non mostrar as combinacións (merge) pendentes"
199
200
#: bzrlib/builtins.py:382
201
msgid "Do not mark object type using indicator."
202
msgstr ""
203
204
#: bzrlib/builtins.py:397
205
msgid "bzr status --revision takes exactly one or two revision specifiers"
206
msgstr ""
207
208
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
209
msgid "You can only supply one of revision_id or --revision"
210
msgstr ""
211
212
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
213
msgid "You must supply either --revision or a revision_id"
214
msgstr "Debe fornecer ou --revision ou un id_de_revision"
215
216
#: bzrlib/builtins.py:451
217
#, python-format
218
msgid "Repository %r does not support access to raw revision texts"
219
msgstr ""
220
221
#: bzrlib/builtins.py:462
222
msgid "The repository {0} contains no revision {1}."
223
msgstr ""
224
225
#: bzrlib/builtins.py:469
226
msgid "You cannot specify a NULL revision."
227
msgstr ""
228
229
#: bzrlib/builtins.py:561
230
msgid "Remove the working tree from a given branch/checkout."
231
msgstr ""
232
233
#: bzrlib/builtins.py:563
234
msgid ""
235
"Since a lightweight checkout is little more than a working tree\n"
236
"this will refuse to run against one."
237
msgstr ""
238
239
#: bzrlib/builtins.py:566
240
msgid "To re-create the working tree, use \"bzr checkout\"."
241
msgstr ""
242
243
#: bzrlib/builtins.py:572
244
msgid ""
245
"Remove the working tree even if it has uncommitted or shelved changes."
246
msgstr ""
247
248
#: bzrlib/builtins.py:586
249
msgid "No working tree to remove"
250
msgstr ""
251
252
#: bzrlib/builtins.py:588
253
msgid "You cannot remove the working tree of a remote path"
254
msgstr "Non pode eliminar o cartafol de traballo desde unha ruta remota"
255
256
#: bzrlib/builtins.py:597
257
msgid "You cannot remove the working tree from a lightweight checkout"
258
msgstr ""
259
260
#: bzrlib/builtins.py:637
261
msgid ""
262
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
263
"instead. Use \"--force\" if you are sure you want to reset the working tree."
264
msgstr ""
265
266
#: bzrlib/builtins.py:648
267
msgid ""
268
", the header appears corrupt, try passing -r -1 to set the state to the last "
269
"commit"
270
msgstr ""
271
272
#: bzrlib/builtins.py:652
273
msgid "failed to reset the tree state{0}"
274
msgstr ""
275
276
#: bzrlib/builtins.py:656
277
msgid "Show current revision number."
278
msgstr ""
279
280
#: bzrlib/builtins.py:658
281
msgid "This is equal to the number of revisions on this branch."
282
msgstr ""
283
284
#: bzrlib/builtins.py:671
285
msgid "--tree and --revision can not be used together"
286
msgstr ""
287
288
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
289
msgid "Tags can only be placed on a single revision, not on a range"
290
msgstr ""
291
292
#: bzrlib/builtins.py:712
293
msgid "Show revno of working tree."
294
msgstr ""
295
296
#: bzrlib/builtins.py:760
297
msgid "Add specified files or directories."
298
msgstr ""
299
300
#: bzrlib/builtins.py:762
301
msgid ""
302
"In non-recursive mode, all the named items are added, regardless\n"
303
"of whether they were previously ignored. A warning is given if\n"
304
"any of the named files are already versioned."
305
msgstr ""
306
307
#: bzrlib/builtins.py:766
308
msgid ""
309
"In recursive mode (the default), files are treated the same way\n"
310
"but the behaviour for directories is different. Directories that\n"
311
"are already versioned do not give a warning. All directories,\n"
312
"whether already versioned or not, are searched for files or\n"
313
"subdirectories that are neither versioned or ignored, and these\n"
314
"are added. This search proceeds recursively into versioned\n"
315
"directories. If no names are given '.' is assumed."
316
msgstr ""
317
318
#: bzrlib/builtins.py:774
319
msgid ""
320
"A warning will be printed when nested trees are encountered,\n"
321
"unless they are explicitly ignored."
322
msgstr ""
323
324
#: bzrlib/builtins.py:777
325
msgid ""
326
"Therefore simply saying 'bzr add' will version all files that\n"
327
"are currently unknown."
328
msgstr ""
329
330
#: bzrlib/builtins.py:780
331
msgid ""
332
"Adding a file whose parent directory is not versioned will\n"
333
"implicitly add the parent, and so on up to the root. This means\n"
334
"you should never need to explicitly add a directory, they'll just\n"
335
"get added when you add a file in the directory."
336
msgstr ""
337
338
#: bzrlib/builtins.py:785
339
msgid ""
340
"--dry-run will show which files would be added, but not actually\n"
341
"add them."
342
msgstr ""
343
344
#: bzrlib/builtins.py:788
345
msgid ""
346
"--file-ids-from will try to use the file ids from the supplied path.\n"
347
"It looks up ids trying to find a matching parent directory with the\n"
348
"same filename, and then by pure path. This option is rarely needed\n"
349
"but can be useful when adding the same logical file into two\n"
350
"branches that will be merged later (without showing the two different\n"
351
"adds as a conflict). It is also useful when merging another project\n"
352
"into a subdirectory of this one."
353
msgstr ""
354
355
#: bzrlib/builtins.py:796
356
msgid ""
357
"Any files matching patterns in the ignore list will not be added\n"
358
"unless they are explicitly mentioned."
359
msgstr ""
360
361
#: bzrlib/builtins.py:799
362
msgid ""
363
"In recursive mode, files larger than the configuration option \n"
364
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
365
"to file size."
366
msgstr ""
367
368
#: bzrlib/builtins.py:806
369
msgid "Don't recursively add the contents of directories."
370
msgstr ""
371
372
#: bzrlib/builtins.py:813
373
msgid "Lookup file ids from this tree."
374
msgstr ""
375
376
#: bzrlib/builtins.py:849
377
msgid "ignored {0} matching \"{1}\"\n"
378
msgstr ""
379
380
#: bzrlib/builtins.py:854
381
msgid "Create a new versioned directory."
382
msgstr ""
383
384
#: bzrlib/builtins.py:856
385
msgid "This is equivalent to creating the directory and then adding it."
386
msgstr ""
387
388
#: bzrlib/builtins.py:863
389
msgid "No error if existing, make parent directories as needed."
390
msgstr ""
391
392
#: bzrlib/builtins.py:897
393
#, python-format
394
msgid "added %s\n"
395
msgstr ""
396
397
#: bzrlib/builtins.py:939
398
#, python-format
399
msgid "invalid kind %r specified"
400
msgstr ""
401
402
#: bzrlib/builtins.py:976
403
msgid "Move or rename a file."
404
msgstr ""
405
406
#: bzrlib/builtins.py:978
407
msgid " bzr mv SOURCE... DESTINATION"
408
msgstr ""
409
410
#: bzrlib/builtins.py:980
411
msgid ""
412
"If the last argument is a versioned directory, all the other names\n"
413
"are moved into it. Otherwise, there must be exactly two arguments\n"
414
"and the file is changed to a new name."
415
msgstr ""
416
417
#: bzrlib/builtins.py:984
418
msgid ""
419
"If OLDNAME does not exist on the filesystem but is versioned and\n"
420
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
421
"assumes that the file has been manually moved and only updates\n"
422
"its internal inventory to reflect that change.\n"
423
"The same is valid when moving many SOURCE files to a DESTINATION."
424
msgstr ""
425
426
#: bzrlib/builtins.py:990
427
msgid "Files cannot be moved between branches."
428
msgstr ""
429
430
#: bzrlib/builtins.py:997
431
msgid ""
432
"Move only the bzr identifier of the file, because the file has already been "
433
"moved."
434
msgstr ""
435
436
#: bzrlib/builtins.py:999
437
msgid "Automatically guess renames."
438
msgstr ""
439
440
#: bzrlib/builtins.py:1000
441
msgid "Avoid making changes when guessing renames."
442
msgstr ""
443
444
#: bzrlib/builtins.py:1009
445
msgid "--dry-run requires --auto."
446
msgstr ""
447
448
#: bzrlib/builtins.py:1013
449
msgid "missing file argument"
450
msgstr ""
451
452
#: bzrlib/builtins.py:1017
453
msgid "can not move root of branch"
454
msgstr ""
455
456
#: bzrlib/builtins.py:1023
457
msgid "Only one path may be specified to --auto."
458
msgstr ""
459
460
#: bzrlib/builtins.py:1026
461
msgid "--after cannot be specified with --auto."
462
msgstr ""
463
464
#: bzrlib/builtins.py:1062
465
msgid "to mv multiple files the destination must be a versioned directory"
466
msgstr ""
467
468
#: bzrlib/builtins.py:1114
469
msgid "Turn this branch into a mirror of another branch."
470
msgstr ""
471
472
#: bzrlib/builtins.py:1116
473
msgid ""
474
"By default, this command only works on branches that have not diverged.\n"
475
"Branches are considered diverged if the destination branch's most recent \n"
476
"commit is one that has not been merged (directly or indirectly) into the \n"
477
"parent."
478
msgstr ""
479
480
#: bzrlib/builtins.py:1121
481
msgid ""
482
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
483
"from one into the other. Once one branch has merged, the other should\n"
484
"be able to pull it again."
485
msgstr ""
486
487
#: bzrlib/builtins.py:1125
488
msgid ""
489
"If you want to replace your local changes and just want your branch to\n"
490
"match the remote one, use pull --overwrite. This will work even if the two\n"
491
"branches have diverged."
492
msgstr ""
493
494
#: bzrlib/builtins.py:1129
495
msgid ""
496
"If there is no default location set, the first pull will set it (use\n"
497
"--no-remember to avoid setting it). After that, you can omit the\n"
498
"location to use the default. To change the default, use --remember. The\n"
499
"value will only be saved if the remote location can be accessed."
500
msgstr ""
501
502
#: bzrlib/builtins.py:1134
503
msgid ""
504
"The --verbose option will display the revisions pulled using the log_format\n"
505
"configuration option. You can use a different format by overriding it with\n"
506
"-Olog_format=<other_format>."
507
msgstr ""
508
509
#: bzrlib/builtins.py:1138
510
msgid ""
511
"Note: The location can be specified either in the form of a branch,\n"
512
"or in the form of a path to a file containing a merge directive generated\n"
513
"with bzr send."
514
msgstr ""
515
516
#: bzrlib/builtins.py:1146
517
msgid "Show logs of pulled revisions."
518
msgstr ""
519
520
#: bzrlib/builtins.py:1148
521
msgid ""
522
"Branch to pull into, rather than the one containing the working directory."
523
msgstr ""
524
525
#: bzrlib/builtins.py:1151
526
msgid ""
527
"Perform a local pull in a bound branch. Local pulls are not applied to the "
528
"master branch."
529
msgstr ""
530
531
#: bzrlib/builtins.py:1189
532
msgid "Need working tree for --show-base."
533
msgstr ""
534
535
#: bzrlib/builtins.py:1205
536
msgid "No pull location known or specified."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1211
540
#, python-format
541
msgid "Using saved parent location: %s\n"
542
msgstr ""
543
544
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
545
msgid "Cannot use -r with merge directives or bundles"
546
msgstr ""
547
548
#: bzrlib/builtins.py:1261
549
msgid "Update a mirror of this branch."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1263
553
msgid ""
554
"The target branch will not have its working tree populated because this\n"
555
"is both expensive, and is not supported on remote file systems."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1266
559
msgid ""
560
"Some smart servers or protocols *may* put the working tree in place in\n"
561
"the future."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1269
565
msgid ""
566
"This command only works on branches that have not diverged. Branches are\n"
567
"considered diverged if the destination branch's most recent commit is one\n"
568
"that has not been merged (directly or indirectly) by the source branch."
569
msgstr ""
570
571
#: bzrlib/builtins.py:1273
572
msgid ""
573
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
574
"the other branch completely, discarding its unmerged changes."
575
msgstr ""
576
577
#: bzrlib/builtins.py:1276
578
msgid ""
579
"If you want to ensure you have the different changes in the other branch,\n"
580
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
581
"After that you will be able to do a push without '--overwrite'."
582
msgstr ""
583
584
#: bzrlib/builtins.py:1280
585
msgid ""
586
"If there is no default push location set, the first push will set it (use\n"
587
"--no-remember to avoid setting it). After that, you can omit the\n"
588
"location to use the default. To change the default, use --remember. The\n"
589
"value will only be saved if the remote location can be accessed."
590
msgstr ""
591
592
#: bzrlib/builtins.py:1285
593
msgid ""
594
"The --verbose option will display the revisions pushed using the log_format\n"
595
"configuration option. You can use a different format by overriding it with\n"
596
"-Olog_format=<other_format>."
597
msgstr ""
598
599
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
600
msgid ""
601
"Branch to push from, rather than the one containing the working directory."
602
msgstr ""
603
604
#: bzrlib/builtins.py:1299
605
msgid ""
606
"By default push will fail if the target directory exists, but does not "
607
"already have a control directory. This flag will allow push to proceed."
608
msgstr ""
609
610
#: bzrlib/builtins.py:1304
611
msgid ""
612
"Create a stacked branch that references the public location of the parent "
613
"branch."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1307
617
msgid ""
618
"Create a stacked branch that refers to another branch for the commit "
619
"history. Only the work not present in the referenced branch is included in "
620
"the branch created."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
624
msgid ""
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
626
"strict disables the check."
627
msgstr ""
628
629
#: bzrlib/builtins.py:1315
630
msgid "Don't populate the working tree, even for protocols that support it."
631
msgstr ""
632
633
#: bzrlib/builtins.py:1318
634
msgid "Overwrite tags only."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1369
638
msgid "Could not determine branch to refer to."
639
msgstr ""
640
641
#: bzrlib/builtins.py:1378
642
#, python-format
643
msgid ""
644
"No push location known or specified. To push to the parent branch (at %s), "
645
"use 'bzr push :parent'."
646
msgstr ""
647
648
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
649
msgid "No push location known or specified."
650
msgstr ""
651
652
#: bzrlib/builtins.py:1388
653
#, python-format
654
msgid "Using saved push location: %s"
655
msgstr ""
656
657
#: bzrlib/builtins.py:1398
658
msgid "Create a new branch that is a copy of an existing branch."
659
msgstr ""
660
661
#: bzrlib/builtins.py:1400
662
msgid ""
663
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
664
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
665
"./bar.\n"
666
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
667
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
668
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
669
"create ./foo-bar."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1407
673
msgid ""
674
"To retrieve the branch as of a particular revision, supply the --revision\n"
675
"parameter, as in \"branch foo/bar -r 5\"."
676
msgstr ""
677
678
#: bzrlib/builtins.py:1410
679
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
680
msgstr ""
681
682
#: bzrlib/builtins.py:1420
683
msgid "Create a branch without a working-tree."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1422
687
msgid "Switch the checkout in the current directory to the new branch."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1425
691
msgid ""
692
"Create a stacked branch referring to the source branch. The new branch will "
693
"depend on the availability of the source branch for all operations."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1429
697
msgid "Do not use a shared repository, even if available."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1431
701
msgid ""
702
"By default branch will fail if the target directory exists, but does not "
703
"already have a control directory. This flag will allow branch to proceed."
704
msgstr ""
705
706
#: bzrlib/builtins.py:1436
707
msgid "Bind new branch to from location."
708
msgstr ""
709
710
#: bzrlib/builtins.py:1483
711
#, python-format
712
msgid "Target directory \"%s\" already exists."
713
msgstr ""
714
715
#: bzrlib/builtins.py:1495
716
#, python-format
717
msgid "Parent of \"%s\" does not exist."
718
msgstr ""
719
720
#: bzrlib/builtins.py:1514
721
msgid "The branch {0} has no revision {1}."
722
msgstr ""
723
724
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
725
#, python-format
726
msgid "Created new stacked branch referring to %s."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1533
730
#, python-format
731
msgid "Branched %d revision."
732
msgid_plural "Branched %d revisions."
733
msgstr[0] ""
734
msgstr[1] ""
735
736
#: bzrlib/builtins.py:1538
737
#, python-format
738
msgid "New branch bound to %s"
739
msgstr ""
740
741
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
742
#, python-format
743
msgid "Switched to branch: %s"
744
msgstr ""
745
746
#: bzrlib/builtins.py:1548
747
msgid "List the branches available at the current location."
748
msgstr ""
749
750
#: bzrlib/builtins.py:1550
751
msgid ""
752
"This command will print the names of all the branches at the current\n"
753
"location."
754
msgstr ""
755
756
#: bzrlib/builtins.py:1557
757
msgid ""
758
"Recursively scan for branches rather than just looking in the specified "
759
"location."
760
msgstr ""
761
762
#: bzrlib/builtins.py:1586
763
msgid "(default)"
764
msgstr ""
765
766
#: bzrlib/builtins.py:1598
767
msgid "Create a new checkout of an existing branch."
768
msgstr ""
769
770
#: bzrlib/builtins.py:1600
771
msgid ""
772
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
773
"for\n"
774
"the branch found in '.'. This is useful if you have removed the working "
775
"tree\n"
776
"or if it was never created - i.e. if you pushed the branch to its current\n"
777
"location using SFTP."
778
msgstr ""
779
780
#: bzrlib/builtins.py:1605
781
msgid ""
782
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
783
"will\n"
784
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
785
"./bar.\n"
786
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
787
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
788
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
789
"create ./foo-bar."
790
msgstr ""
791
792
#: bzrlib/builtins.py:1612
793
msgid ""
794
"To retrieve the branch as of a particular revision, supply the --revision\n"
795
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
796
"immediately\n"
797
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
798
"old\n"
799
"code.)"
800
msgstr ""
801
802
#: bzrlib/builtins.py:1622
803
msgid ""
804
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
805
"the branch for every operation. Normal checkouts can perform common "
806
"operations like diff and status without such access, and also support local "
807
"commits."
808
msgstr ""
809
810
#: bzrlib/builtins.py:1629
811
msgid "Get file contents from this tree."
812
msgstr ""
813
814
#: bzrlib/builtins.py:1631
815
msgid "Hard-link working tree files where possible."
816
msgstr ""
817
818
#: bzrlib/builtins.py:1672
819
msgid ""
820
"Show list of renamed files.\n"
821
" "
822
msgstr ""
823
824
#: bzrlib/builtins.py:1700
825
msgid "Update a working tree to a new revision."
826
msgstr ""
827
828
#: bzrlib/builtins.py:1702
829
msgid ""
830
"This will perform a merge of the destination revision (the tip of the\n"
831
"branch, or the specified revision) into the working tree, and then make\n"
832
"that revision the basis revision for the working tree. "
833
msgstr ""
834
835
#: bzrlib/builtins.py:1706
836
msgid ""
837
"You can use this to visit an older revision, or to update a working tree\n"
838
"that is out of date from its branch."
839
msgstr ""
840
841
#: bzrlib/builtins.py:1709
842
msgid ""
843
"If there are any uncommitted changes in the tree, they will be carried\n"
844
"across and remain as uncommitted changes after the update. To discard\n"
845
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
846
"with the changes brought in by the change in basis revision."
847
msgstr ""
848
849
#: bzrlib/builtins.py:1714
850
msgid ""
851
"If the tree's branch is bound to a master branch, bzr will also update\n"
852
"the branch from the master."
853
msgstr ""
854
855
#: bzrlib/builtins.py:1717
856
msgid ""
857
"You cannot update just a single file or directory, because each Bazaar\n"
858
"working tree has just a single basis revision. If you want to restore a\n"
859
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
860
"update'. If you want to restore a file to its state in a previous\n"
861
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
862
"out the old content of that file to a new location."
863
msgstr ""
864
865
#: bzrlib/builtins.py:1724
866
msgid ""
867
"The 'dir' argument, if given, must be the location of the root of a\n"
868
"working tree to update. By default, the working tree that contains the \n"
869
"current working directory is used."
870
msgstr ""
871
872
#: bzrlib/builtins.py:1740
873
msgid "bzr update --revision takes exactly one revision"
874
msgstr ""
875
876
#: bzrlib/builtins.py:1748
877
msgid "bzr update can only update a whole tree, not a file or subdirectory"
878
msgstr ""
879
880
#: bzrlib/builtins.py:1779
881
msgid "Tree is up to date at revision {0} of branch {1}"
882
msgstr ""
883
884
#: bzrlib/builtins.py:1795
885
#, python-format
886
msgid ""
887
"branch has no revision %s\n"
888
"bzr update --revision only works for a revision in the branch history"
889
msgstr ""
890
891
#: bzrlib/builtins.py:1801
892
msgid "Updated to revision {0} of branch {1}"
893
msgstr ""
894
895
#: bzrlib/builtins.py:1805
896
msgid ""
897
"Your local commits will now show as pending merges with 'bzr status', and "
898
"can be committed with 'bzr commit'."
899
msgstr ""
900
901
#: bzrlib/builtins.py:1814
902
msgid "Show information about a working tree, branch or repository."
903
msgstr ""
904
905
#: bzrlib/builtins.py:1816
906
msgid ""
907
"This command will show all known locations and formats associated to the\n"
908
"tree, branch or repository."
909
msgstr ""
910
911
#: bzrlib/builtins.py:1819
912
msgid ""
913
"In verbose mode, statistical information is included with each report.\n"
914
"To see extended statistic information, use a verbosity level of 2 or\n"
915
"higher by specifying the verbose option multiple times, e.g. -vv."
916
msgstr ""
917
918
#: bzrlib/builtins.py:1823
919
msgid "Branches and working trees will also report any missing revisions."
920
msgstr ""
921
922
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
923
#: bzrlib/builtins.py:6466
924
msgid ":Examples:"
925
msgstr ""
926
927
#: bzrlib/builtins.py:1827
928
msgid " Display information on the format and related locations:"
929
msgstr ""
930
931
#: bzrlib/builtins.py:1829
932
msgid " bzr info"
933
msgstr ""
934
935
#: bzrlib/builtins.py:1831
936
msgid ""
937
" Display the above together with extended format information and\n"
938
" basic statistics (like the number of files in the working tree and\n"
939
" number of revisions in the branch and repository):"
940
msgstr ""
941
942
#: bzrlib/builtins.py:1835
943
msgid " bzr info -v"
944
msgstr ""
945
946
#: bzrlib/builtins.py:1837
947
msgid " Display the above together with number of committers to the branch:"
948
msgstr ""
949
950
#: bzrlib/builtins.py:1839
951
msgid " bzr info -vv"
952
msgstr ""
953
954
#: bzrlib/builtins.py:1858
955
msgid "Remove files or directories."
956
msgstr ""
957
958
#: bzrlib/builtins.py:1860
959
msgid ""
960
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
961
"delete them if they can easily be recovered using revert otherwise they\n"
962
"will be backed up (adding an extension of the form .~#~). If no options or\n"
963
"parameters are given Bazaar will scan for files that are being tracked by\n"
964
"Bazaar but missing in your tree and stop tracking them for you."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1868
968
msgid "Only remove files that have never been committed."
969
msgstr ""
970
971
#: bzrlib/builtins.py:1870
972
msgid "The file deletion mode to be used."
973
msgstr ""
974
975
#: bzrlib/builtins.py:1871
976
msgid "Deletion Strategy"
977
msgstr ""
978
979
#: bzrlib/builtins.py:1872
980
msgid "Backup changed files (default)."
981
msgstr ""
982
983
#: bzrlib/builtins.py:1873
984
msgid "Delete from bzr but leave the working copy."
985
msgstr ""
986
987
#: bzrlib/builtins.py:1874
988
msgid "Don't backup changed files."
989
msgstr ""
990
991
#: bzrlib/builtins.py:1875
992
msgid ""
993
"Delete all the specified files, even if they can not be recovered and even "
994
"if they are non-empty directories. (deprecated, use no-backup)"
995
msgstr ""
996
997
#: bzrlib/builtins.py:1884
998
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1901
1002
msgid "No matching files."
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1962
1006
msgid "Reconcile bzr metadata in a branch."
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1964
1010
msgid ""
1011
"This can correct data mismatches that may have been caused by\n"
1012
"previous ghost operations or bzr upgrades. You should only\n"
1013
"need to run this command if 'bzr check' or a bzr developer\n"
1014
"advises you to run it."
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:1969
1018
msgid ""
1019
"If a second branch is provided, cross-branch reconciliation is\n"
1020
"also attempted, which will check that data like the tree root\n"
1021
"id which was not present in very early bzr versions is represented\n"
1022
"correctly in both branches."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1974
1026
msgid ""
1027
"At the same time it is run it may recompress data resulting in\n"
1028
"a potential saving in disk space or performance gain."
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:1977
1032
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1033
msgstr ""
1034
1035
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1036
msgid ""
1037
"Format for the bzr 2.0 series.\n"
1038
"Uses group-compress storage.\n"
1039
"Provides rich roots which are a one-way transition.\n"
1040
msgstr ""
1041
1042
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1043
msgid ""
1044
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1045
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1046
msgstr ""
1047
1048
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1049
msgid "The 2a format with experimental support for colocated branches.\n"
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:2045
1053
msgid "Make a directory into a versioned branch."
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:2047
1057
msgid ""
1058
"Use this to create an empty branch, or before importing an\n"
1059
"existing project."
1060
msgstr ""
1061
1062
#: bzrlib/builtins.py:2050
1063
msgid ""
1064
"If there is a repository in a parent directory of the location, then\n"
1065
"the history of the branch will be stored in the repository. Otherwise\n"
1066
"init creates a standalone branch which carries its own history\n"
1067
"in the .bzr directory."
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:2055
1071
msgid ""
1072
"If there is already a branch at the location but it has no working tree,\n"
1073
"the tree can be populated with 'bzr checkout'."
1074
msgstr ""
1075
1076
#: bzrlib/builtins.py:2058
1077
msgid "Recipe for importing a tree of files::"
1078
msgstr ""
1079
1080
#: bzrlib/builtins.py:2060
1081
msgid ""
1082
" cd ~/project\n"
1083
" bzr init\n"
1084
" bzr add .\n"
1085
" bzr status\n"
1086
" bzr commit -m \"imported project\""
1087
msgstr ""
1088
1089
#: bzrlib/builtins.py:2071
1090
msgid ""
1091
"Create the path leading up to the branch if it does not already exist."
1092
msgstr ""
1093
1094
#: bzrlib/builtins.py:2074
1095
msgid "Specify a format for this branch. See \"help formats\"."
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:2082
1099
msgid ""
1100
"Never change revnos or the existing log. Append revisions to it only."
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:2085
1104
msgid "Create a branch without a working tree."
1105
msgstr ""
1106
1107
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1108
#, python-format
1109
msgid ""
1110
"Parent directory of %s does not exist.\n"
1111
"You may supply --create-prefix to create all leading parent directories."
1112
msgstr ""
1113
1114
#: bzrlib/builtins.py:2139
1115
msgid ""
1116
"This branch format cannot be set to append-revisions-only. Try --default."
1117
msgstr ""
1118
1119
#: bzrlib/builtins.py:2150
1120
msgid "Created a {0} (format: {1})\n"
1121
msgstr ""
1122
1123
#: bzrlib/builtins.py:2159
1124
#, python-format
1125
msgid "Using shared repository: %s\n"
1126
msgstr ""
1127
1128
#: bzrlib/builtins.py:2163
1129
msgid "Create a shared repository for branches to share storage space."
1130
msgstr ""
1131
1132
#: bzrlib/builtins.py:2165
1133
msgid ""
1134
"New branches created under the repository directory will store their\n"
1135
"revisions in the repository, not in the branch directory. For branches\n"
1136
"with shared history, this reduces the amount of storage needed and \n"
1137
"speeds up the creation of new branches."
1138
msgstr ""
1139
1140
#: bzrlib/builtins.py:2170
1141
msgid ""
1142
"If the --no-trees option is given then the branches in the repository\n"
1143
"will not have working trees by default. They will still exist as \n"
1144
"directories on disk, but they will not have separate copies of the \n"
1145
"files at a certain revision. This can be useful for repositories that\n"
1146
"store branches which are interacted with through checkouts or remote\n"
1147
"branches, such as on a server."
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2177
1151
msgid ""
1152
":Examples:\n"
1153
" Create a shared repository holding just branches::"
1154
msgstr ""
1155
1156
#: bzrlib/builtins.py:2180
1157
msgid ""
1158
" bzr init-repo --no-trees repo\n"
1159
" bzr init repo/trunk"
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2183
1163
msgid " Make a lightweight checkout elsewhere::"
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2185
1167
msgid ""
1168
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1169
" cd trunk-checkout\n"
1170
" (add files here)"
1171
msgstr ""
1172
1173
#: bzrlib/builtins.py:2193
1174
msgid ""
1175
"Specify a format for this repository. See \"bzr help formats\" for details."
1176
msgstr ""
1177
1178
#: bzrlib/builtins.py:2197
1179
msgid "Repository format"
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:2199
1183
msgid "Branches in the repository will default to not having a working tree."
1184
msgstr ""
1185
1186
#: bzrlib/builtins.py:2225
1187
msgid "Show differences in the working tree, between revisions or branches."
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:2227
1191
msgid ""
1192
"If no arguments are given, all changes for the current tree are listed.\n"
1193
"If files are given, only the changes in those files are listed.\n"
1194
"Remote and multiple branches can be compared by using the --old and\n"
1195
"--new options. If not provided, the default for both is derived from\n"
1196
"the first argument, if any, or the current tree if no arguments are\n"
1197
"given."
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:2234
1201
msgid ""
1202
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1203
"produces patches suitable for \"patch -p1\"."
1204
msgstr ""
1205
1206
#: bzrlib/builtins.py:2237
1207
msgid ""
1208
"Note that when using the -r argument with a range of revisions, the\n"
1209
"differences are computed between the two specified revisions. That\n"
1210
"is, the command does not show the changes introduced by the first \n"
1211
"revision in the range. This differs from the interpretation of \n"
1212
"revision ranges used by \"bzr log\" which includes the first revision\n"
1213
"in the range."
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2244
1217
msgid ""
1218
":Exit values:\n"
1219
" 1 - changed\n"
1220
" 2 - unrepresentable changes\n"
1221
" 3 - error\n"
1222
" 0 - no change"
1223
msgstr ""
1224
1225
#: bzrlib/builtins.py:2250
1226
msgid ""
1227
":Examples:\n"
1228
" Shows the difference in the working tree versus the last commit::"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2253
1232
msgid " bzr diff"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2255
1236
msgid " Difference between the working tree and revision 1::"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2257
1240
msgid " bzr diff -r1"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2259
1244
msgid " Difference between revision 3 and revision 1::"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2261
1248
msgid " bzr diff -r1..3"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2263
1252
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:2265
1256
msgid " bzr diff -r1..3 xxx"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2267
1260
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1261
msgstr ""
1262
1263
#: bzrlib/builtins.py:2269
1264
msgid " bzr diff -c2"
1265
msgstr ""
1266
1267
#: bzrlib/builtins.py:2271
1268
msgid ""
1269
" To see the changes introduced by revision X::\n"
1270
" \n"
1271
" bzr diff -cX"
1272
msgstr ""
1273
1274
#: bzrlib/builtins.py:2275
1275
msgid ""
1276
" Note that in the case of a merge, the -c option shows the changes\n"
1277
" compared to the left hand parent. To see the changes against\n"
1278
" another parent, use::"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2279
1282
msgid " bzr diff -r<chosen_parent>..X"
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2281
1286
msgid ""
1287
" The changes between the current revision and the previous revision\n"
1288
" (equivalent to -c-1 and -r-2..-1)"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2284
1292
msgid " bzr diff -r-2.."
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2286
1296
msgid " Show just the differences for file NEWS::"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2288
1300
msgid " bzr diff NEWS"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2290
1304
msgid " Show the differences in working tree xxx for file NEWS::"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2292
1308
msgid " bzr diff xxx/NEWS"
1309
msgstr ""
1310
1311
#: bzrlib/builtins.py:2294
1312
msgid " Show the differences from branch xxx to this working tree:"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2296
1316
msgid " bzr diff --old xxx"
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2298
1320
msgid " Show the differences between two branches for file NEWS::"
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2300
1324
msgid " bzr diff --old xxx --new yyy NEWS"
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2302
1328
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2304
1332
msgid ""
1333
" bzr diff --prefix old/:new/\n"
1334
" \n"
1335
" Show the differences using a custom diff program with options::\n"
1336
" \n"
1337
" bzr diff --using /usr/bin/diff --diff-options -wu"
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2314
1341
msgid "Pass these options to the external diff program."
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2317
1345
msgid ""
1346
"Set prefixes added to old and new filenames, as two values separated by a "
1347
"colon. (eg \"old/:new/\")."
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2320
1351
msgid "Branch/tree to compare from."
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2324
1355
msgid "Branch/tree to compare to."
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2330
1359
msgid "Use this command to compare files."
1360
msgstr ""
1361
1362
#: bzrlib/builtins.py:2335
1363
msgid "Diff format to use."
1364
msgstr ""
1365
1366
#: bzrlib/builtins.py:2337
1367
msgid "Diff format"
1368
msgstr ""
1369
1370
#: bzrlib/builtins.py:2359
1371
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2363
1375
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1379
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1380
msgid "{0} and {1} are mutually exclusive"
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2388
1384
msgid ""
1385
"List files deleted in the working tree.\n"
1386
" "
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2465
1390
msgid "Show the tree root directory."
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2467
1394
msgid ""
1395
"The root is the nearest enclosing directory with a .bzr control\n"
1396
"directory."
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2482
1400
msgid "The limit argument must be an integer."
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2490
1404
msgid "The levels argument must be an integer."
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2495
1408
msgid "Show historical log for a branch or subset of a branch."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2497
1412
msgid ""
1413
"log is bzr's default tool for exploring the history of a branch.\n"
1414
"The branch to use is taken from the first parameter. If no parameters\n"
1415
"are given, the branch containing the working directory is logged.\n"
1416
"Here are some simple examples::"
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2502
1420
msgid ""
1421
" bzr log log the current branch\n"
1422
" bzr log foo.py log a file in its branch\n"
1423
" bzr log http://server/branch log a branch on a server"
1424
msgstr ""
1425
1426
#: bzrlib/builtins.py:2506
1427
msgid ""
1428
"The filtering, ordering and information shown for each revision can\n"
1429
"be controlled as explained below. By default, all revisions are\n"
1430
"shown sorted (topologically) so that newer revisions appear before\n"
1431
"older ones and descendants always appear before ancestors. If displayed,\n"
1432
"merged revisions are shown indented under the revision in which they\n"
1433
"were merged."
1434
msgstr ""
1435
1436
#: bzrlib/builtins.py:2513
1437
msgid ":Output control:"
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2515
1441
msgid ""
1442
" The log format controls how information about each revision is\n"
1443
" displayed. The standard log formats are called ``long``, ``short``\n"
1444
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1445
" for more details on log formats."
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2520
1449
msgid ""
1450
" The following options can be used to control what information is\n"
1451
" displayed::"
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2523
1455
msgid ""
1456
" -l N display a maximum of N revisions\n"
1457
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1458
" -v display a status summary (delta) for each revision\n"
1459
" -p display a diff (patch) for each revision\n"
1460
" --show-ids display revision-ids (and file-ids), not just revnos"
1461
msgstr ""
1462
1463
#: bzrlib/builtins.py:2529
1464
msgid ""
1465
" Note that the default number of levels to display is a function of the\n"
1466
" log format. If the -n option is not used, the standard log formats show\n"
1467
" just the top level (mainline)."
1468
msgstr ""
1469
1470
#: bzrlib/builtins.py:2533
1471
msgid ""
1472
" Status summaries are shown using status flags like A, M, etc. To see\n"
1473
" the changes explained using words like ``added`` and ``modified``\n"
1474
" instead, use the -vv option."
1475
msgstr ""
1476
1477
#: bzrlib/builtins.py:2537
1478
msgid ":Ordering control:"
1479
msgstr ""
1480
1481
#: bzrlib/builtins.py:2539
1482
msgid ""
1483
" To display revisions from oldest to newest, use the --forward option.\n"
1484
" In most cases, using this option will have little impact on the total\n"
1485
" time taken to produce a log, though --forward does not incrementally\n"
1486
" display revisions like --reverse does when it can."
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2544
1490
msgid ":Revision filtering:"
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2546
1494
msgid ""
1495
" The -r option can be used to specify what revision or range of revisions\n"
1496
" to filter against. The various forms are shown below::"
1497
msgstr ""
1498
1499
#: bzrlib/builtins.py:2549
1500
msgid ""
1501
" -rX display revision X\n"
1502
" -rX.. display revision X and later\n"
1503
" -r..Y display up to and including revision Y\n"
1504
" -rX..Y display from X to Y inclusive"
1505
msgstr ""
1506
1507
#: bzrlib/builtins.py:2554
1508
msgid ""
1509
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1510
" Some common examples are given below::"
1511
msgstr ""
1512
1513
#: bzrlib/builtins.py:2557
1514
msgid ""
1515
" -r-1 show just the tip\n"
1516
" -r-10.. show the last 10 mainline revisions\n"
1517
" -rsubmit:.. show what's new on this branch\n"
1518
" -rancestor:path.. show changes since the common ancestor of this\n"
1519
" branch and the one at location path\n"
1520
" -rdate:yesterday.. show changes since yesterday"
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2564
1524
msgid ""
1525
" When logging a range of revisions using -rX..Y, log starts at\n"
1526
" revision Y and searches back in history through the primary\n"
1527
" (\"left-hand\") parents until it finds X. When logging just the\n"
1528
" top level (using -n1), an error is reported if X is not found\n"
1529
" along the way. If multi-level logging is used (-n0), X may be\n"
1530
" a nested merge revision and the log will be truncated accordingly."
1531
msgstr ""
1532
1533
#: bzrlib/builtins.py:2571
1534
msgid ":Path filtering:"
1535
msgstr ""
1536
1537
#: bzrlib/builtins.py:2573
1538
msgid ""
1539
" If parameters are given and the first one is not a branch, the log\n"
1540
" will be filtered to show only those revisions that changed the\n"
1541
" nominated files or directories."
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2577
1545
msgid ""
1546
" Filenames are interpreted within their historical context. To log a\n"
1547
" deleted file, specify a revision range so that the file existed at\n"
1548
" the end or start of the range."
1549
msgstr ""
1550
1551
#: bzrlib/builtins.py:2581
1552
msgid ""
1553
" Historical context is also important when interpreting pathnames of\n"
1554
" renamed files/directories. Consider the following example:"
1555
msgstr ""
1556
1557
#: bzrlib/builtins.py:2584
1558
msgid ""
1559
" * revision 1: add tutorial.txt\n"
1560
" * revision 2: modify tutorial.txt\n"
1561
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2588
1565
msgid " In this case:"
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2590
1569
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2592
1573
msgid ""
1574
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1575
msgstr ""
1576
1577
#: bzrlib/builtins.py:2594
1578
msgid ""
1579
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1580
" the original file in revision 2."
1581
msgstr ""
1582
1583
#: bzrlib/builtins.py:2597
1584
msgid ""
1585
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1586
" was no file called guide.txt in revision 2."
1587
msgstr ""
1588
1589
#: bzrlib/builtins.py:2600
1590
msgid ""
1591
" Renames are always followed by log. By design, there is no need to\n"
1592
" explicitly ask for this (and no way to stop logging a file back\n"
1593
" until it was last renamed)."
1594
msgstr ""
1595
1596
#: bzrlib/builtins.py:2604
1597
msgid ":Other filtering:"
1598
msgstr ""
1599
1600
#: bzrlib/builtins.py:2606
1601
msgid ""
1602
" The --match option can be used for finding revisions that match a\n"
1603
" regular expression in a commit message, committer, author or bug.\n"
1604
" Specifying the option several times will match any of the supplied\n"
1605
" expressions. --match-author, --match-bugs, --match-committer and\n"
1606
" --match-message can be used to only match a specific field."
1607
msgstr ""
1608
1609
#: bzrlib/builtins.py:2612
1610
msgid ":Tips & tricks:"
1611
msgstr ""
1612
1613
#: bzrlib/builtins.py:2614
1614
msgid ""
1615
" GUI tools and IDEs are often better at exploring history than command\n"
1616
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1617
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1618
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1619
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1620
msgstr ""
1621
1622
#: bzrlib/builtins.py:2620
1623
msgid ""
1624
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1625
msgstr ""
1626
1627
#: bzrlib/builtins.py:2622
1628
msgid ""
1629
" [ALIASES]\n"
1630
" tip = log -r-1\n"
1631
" top = log -l10 --line\n"
1632
" show = log -v -p"
1633
msgstr ""
1634
1635
#: bzrlib/builtins.py:2627
1636
msgid ""
1637
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1638
" will show the last 10 mainline revisions. To see the details of a\n"
1639
" particular revision X, ``bzr show -rX``."
1640
msgstr ""
1641
1642
#: bzrlib/builtins.py:2631
1643
msgid ""
1644
" If you are interested in looking deeper into a particular merge X,\n"
1645
" use ``bzr log -n0 -rX``."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2634
1649
msgid ""
1650
" ``bzr log -v`` on a branch with lots of history is currently\n"
1651
" very slow. A fix for this issue is currently under development.\n"
1652
" With or without that fix, it is recommended that a revision range\n"
1653
" be given when using the -v option."
1654
msgstr ""
1655
1656
#: bzrlib/builtins.py:2639
1657
msgid ""
1658
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1659
" used to find revisions matching user names, commit messages, etc.\n"
1660
" Among other features, this plugin can find all revisions containing\n"
1661
" a list of words but not others."
1662
msgstr ""
1663
1664
#: bzrlib/builtins.py:2644
1665
msgid ""
1666
" When exploring non-mainline history on large projects with deep\n"
1667
" history, the performance of log can be greatly improved by installing\n"
1668
" the historycache plugin. This plugin buffers historical information\n"
1669
" trading disk space for faster speed."
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2653
1673
msgid "Show from oldest to newest."
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2656
1677
msgid "Show files changed in each revision."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2662
1681
msgid "Show just the specified revision. See also \"help revisionspec\"."
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2666
1685
msgid "What names to list as authors - first, all or committer."
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2667
1689
msgid "Authors"
1690
msgstr ""
1691
1692
#: bzrlib/builtins.py:2672
1693
msgid "Number of levels to display - 0 for all, 1 for flat."
1694
msgstr ""
1695
1696
#: bzrlib/builtins.py:2682
1697
msgid "Limit the output to the first N revisions."
1698
msgstr ""
1699
1700
#: bzrlib/builtins.py:2687
1701
msgid "Show changes made in each revision as a patch."
1702
msgstr ""
1703
1704
#: bzrlib/builtins.py:2689
1705
msgid "Show merged revisions like --levels 0 does."
1706
msgstr ""
1707
1708
#: bzrlib/builtins.py:2693
1709
msgid "Do not report commits with more than one parent."
1710
msgstr ""
1711
1712
#: bzrlib/builtins.py:2695
1713
msgid ""
1714
"Display only the revisions that are not part of both ancestries (require -"
1715
"rX..Y)."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2699
1719
msgid "Show digital signature validity."
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2702
1723
msgid "Show revisions whose properties match this expression."
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2706
1727
msgid "Show revisions whose message matches this expression."
1728
msgstr ""
1729
1730
#: bzrlib/builtins.py:2710
1731
msgid "Show revisions whose committer matches this expression."
1732
msgstr ""
1733
1734
#: bzrlib/builtins.py:2714
1735
msgid "Show revisions whose authors match this expression."
1736
msgstr ""
1737
1738
#: bzrlib/builtins.py:2718
1739
msgid "Show revisions whose bugs match this expression."
1740
msgstr ""
1741
1742
#: bzrlib/builtins.py:2772
1743
msgid "--exclude-common-ancestry requires -r with two revisions"
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2800
1747
#, python-format
1748
msgid "Path unknown at end or start of revision range: %s"
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2917
1752
#, python-format
1753
msgid "bzr %s doesn't accept two revisions in different branches."
1754
msgstr ""
1755
1756
#: bzrlib/builtins.py:2933
1757
#, python-format
1758
msgid "bzr %s --revision takes one or two values."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2978
1762
msgid ""
1763
"List files in a tree.\n"
1764
" "
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:2987
1768
msgid "Recurse into subdirectories."
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2989
1772
msgid "Print paths relative to the root of the branch."
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2991
1776
msgid "Print unknown files."
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2992
1780
msgid "Print versioned files."
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:2995
1784
msgid "Print ignored files."
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:2997
1788
msgid "List entries of a particular kind: file, directory, symlink."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:3010
1792
msgid "invalid kind specified"
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:3013
1796
msgid "Cannot set both --verbose and --null"
1797
msgstr ""
1798
1799
#: bzrlib/builtins.py:3022
1800
msgid "cannot specify both --from-root and PATH"
1801
msgstr ""
1802
1803
#: bzrlib/builtins.py:3109
1804
msgid "Ignore specified files or patterns."
1805
msgstr ""
1806
1807
#: bzrlib/builtins.py:3111
1808
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1809
msgstr ""
1810
1811
#: bzrlib/builtins.py:3113
1812
msgid ""
1813
"If a .bzrignore file does not exist, the ignore command\n"
1814
"will create one and add the specified files or patterns to the newly\n"
1815
"created file. The ignore command will also automatically add the \n"
1816
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1817
"the use of the ignore command will require an explicit add command."
1818
msgstr ""
1819
1820
#: bzrlib/builtins.py:3119
1821
msgid ""
1822
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1823
"After adding, editing or deleting that file either indirectly by\n"
1824
"using this command or directly by using an editor, be sure to commit\n"
1825
"it."
1826
msgstr ""
1827
1828
#: bzrlib/builtins.py:3124
1829
msgid ""
1830
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1831
"the global ignore file can be found in the application data directory as\n"
1832
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1833
"Global ignores are not touched by this command. The global ignore file\n"
1834
"can be edited directly using an editor."
1835
msgstr ""
1836
1837
#: bzrlib/builtins.py:3130
1838
msgid ""
1839
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1840
"precedence over regular ignores. Such exceptions are used to specify\n"
1841
"files that should be versioned which would otherwise be ignored."
1842
msgstr ""
1843
1844
#: bzrlib/builtins.py:3134
1845
msgid ""
1846
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1847
"precedence over the '!' exception patterns."
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:3137
1851
msgid ""
1852
":Notes: \n"
1853
" \n"
1854
"* Ignore patterns containing shell wildcards must be quoted from\n"
1855
" the shell on Unix."
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:3142
1859
msgid ""
1860
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1861
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:3145
1865
msgid ""
1866
":Examples:\n"
1867
" Ignore the top level Makefile::"
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3148
1871
msgid " bzr ignore ./Makefile"
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:3150
1875
msgid " Ignore .class files in all directories...::"
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3152
1879
msgid " bzr ignore \"*.class\""
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3154
1883
msgid " ...but do not ignore \"special.class\"::"
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3156
1887
msgid " bzr ignore \"!special.class\""
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3158
1891
msgid " Ignore files whose name begins with the \"#\" character::"
1892
msgstr ""
1893
1894
#: bzrlib/builtins.py:3160
1895
msgid " bzr ignore \"RE:^#\""
1896
msgstr ""
1897
1898
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1899
msgid " Ignore .o files under the lib directory::"
1900
msgstr ""
1901
1902
#: bzrlib/builtins.py:3164
1903
msgid " bzr ignore \"lib/**/*.o\""
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3168
1907
msgid " bzr ignore \"RE:lib/.*\\.o\""
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3170
1911
msgid " Ignore everything but the \"debian\" toplevel directory::"
1912
msgstr ""
1913
1914
#: bzrlib/builtins.py:3172
1915
msgid ""
1916
" bzr ignore \"RE:(?!debian/).*\"\n"
1917
" \n"
1918
" Ignore everything except the \"local\" toplevel directory,\n"
1919
" but always ignore autosave files ending in ~, even under local/::\n"
1920
" \n"
1921
" bzr ignore \"*\"\n"
1922
" bzr ignore \"!./local\"\n"
1923
" bzr ignore \"!!*~\""
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3186
1927
msgid "Display the default ignore rules that bzr uses."
1928
msgstr ""
1929
1930
#: bzrlib/builtins.py:3198
1931
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1932
msgstr ""
1933
1934
#: bzrlib/builtins.py:3209
1935
#, python-format
1936
msgid "Invalid ignore pattern found. %s"
1937
msgid_plural "Invalid ignore patterns found. %s"
1938
msgstr[0] ""
1939
msgstr[1] ""
1940
1941
#: bzrlib/builtins.py:3218
1942
msgid "NAME_PATTERN should not be an absolute path"
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:3231
1946
#, python-format
1947
msgid ""
1948
"Warning: the following files are version controlled and match your ignore "
1949
"pattern:\n"
1950
"%s\n"
1951
"These files will continue to be version controlled unless you 'bzr remove' "
1952
"them.\n"
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3238
1956
msgid "List ignored files and the patterns that matched them."
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3240
1960
msgid ""
1961
"List all the ignored files and the ignore pattern that caused the file to\n"
1962
"be ignored."
1963
msgstr ""
1964
1965
#: bzrlib/builtins.py:3243
1966
msgid "Alternatively, to list just the files::"
1967
msgstr ""
1968
1969
#: bzrlib/builtins.py:3245
1970
msgid " bzr ls --ignored"
1971
msgstr ""
1972
1973
#: bzrlib/builtins.py:3279
1974
#, python-format
1975
msgid "not a valid revision-number: %r"
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3286
1979
msgid ""
1980
"Export current or past revision to a destination directory or archive."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3288
1984
msgid "If no revision is specified this exports the last committed revision."
1985
msgstr ""
1986
1987
#: bzrlib/builtins.py:3290
1988
msgid ""
1989
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1990
"given, try to find the format with the extension. If no extension\n"
1991
"is found exports to a directory (equivalent to --format=dir)."
1992
msgstr ""
1993
1994
#: bzrlib/builtins.py:3294
1995
msgid ""
1996
"If root is supplied, it will be used as the root directory inside\n"
1997
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1998
"to the exported filename. The root option has no effect for 'dir' format."
1999
msgstr ""
2000
2001
#: bzrlib/builtins.py:3298
2002
msgid ""
2003
"If branch is omitted then the branch containing the current working\n"
2004
"directory will be used."
2005
msgstr ""
2006
2007
#: bzrlib/builtins.py:3301
2008
msgid ""
2009
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2010
msgstr ""
2011
2012
#: bzrlib/builtins.py:3303
2013
msgid ""
2014
" ================= =========================\n"
2015
" Supported formats Autodetected by extension\n"
2016
" ================= =========================\n"
2017
" dir (none)\n"
2018
" tar .tar\n"
2019
" tbz2 .tar.bz2, .tbz2\n"
2020
" tgz .tar.gz, .tgz\n"
2021
" zip .zip\n"
2022
" ================= ========================="
2023
msgstr ""
2024
2025
#: bzrlib/builtins.py:3317
2026
msgid "Type of file to export to."
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3320
2030
msgid "Apply content filters to export the convenient form."
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3324
2034
msgid "Name of the root directory inside the exported file."
2035
msgstr ""
2036
2037
#: bzrlib/builtins.py:3326
2038
msgid ""
2039
"Set modification time of files to that of the last revision in which it was "
2040
"changed."
2041
msgstr ""
2042
2043
#: bzrlib/builtins.py:3329
2044
msgid ""
2045
"Export the working tree contents rather than that of the last revision."
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3348
2049
msgid "--uncommitted requires a working tree"
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3357
2053
#, python-format
2054
msgid "Unsupported export format: %s"
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:3361
2058
msgid ""
2059
"Write the contents of a file as of a given revision to standard output."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3363
2063
msgid "If no revision is nominated, the last revision is used."
2064
msgstr ""
2065
2066
#: bzrlib/builtins.py:3365
2067
msgid ""
2068
"Note: Take care to redirect standard output when using this command on a\n"
2069
"binary file."
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3371
2073
msgid "The path name in the old tree."
2074
msgstr ""
2075
2076
#: bzrlib/builtins.py:3372
2077
msgid "Apply content filters to display the convenience form."
2078
msgstr ""
2079
2080
#: bzrlib/builtins.py:3383
2081
msgid "bzr cat --revision takes exactly one revision specifier"
2082
msgstr ""
2083
2084
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2085
msgid "{0!r} is not present in revision {1}"
2086
msgstr ""
2087
2088
#: bzrlib/builtins.py:3443
2089
msgid "Commit changes into a new revision."
2090
msgstr ""
2091
2092
#: bzrlib/builtins.py:3445
2093
msgid ""
2094
"An explanatory message needs to be given for each commit. This is\n"
2095
"often done by using the --message option (getting the message from the\n"
2096
"command line) or by using the --file option (getting the message from\n"
2097
"a file). If neither of these options is given, an editor is opened for\n"
2098
"the user to enter the message. To see the changed files in the\n"
2099
"boilerplate text loaded into the editor, use the --show-diff option."
2100
msgstr ""
2101
2102
#: bzrlib/builtins.py:3452
2103
msgid ""
2104
"By default, the entire tree is committed and the person doing the\n"
2105
"commit is assumed to be the author. These defaults can be overridden\n"
2106
"as explained below."
2107
msgstr ""
2108
2109
#: bzrlib/builtins.py:3456
2110
msgid ":Selective commits:"
2111
msgstr ""
2112
2113
#: bzrlib/builtins.py:3458
2114
msgid ""
2115
" If selected files are specified, only changes to those files are\n"
2116
" committed. If a directory is specified then the directory and\n"
2117
" everything within it is committed."
2118
msgstr ""
2119
2120
#: bzrlib/builtins.py:3462
2121
msgid ""
2122
" When excludes are given, they take precedence over selected files.\n"
2123
" For example, to commit only changes within foo, but not changes\n"
2124
" within foo/bar::"
2125
msgstr ""
2126
2127
#: bzrlib/builtins.py:3466
2128
msgid " bzr commit foo -x foo/bar"
2129
msgstr ""
2130
2131
#: bzrlib/builtins.py:3468
2132
msgid " A selective commit after a merge is not yet supported."
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3470
2136
msgid ":Custom authors:"
2137
msgstr ""
2138
2139
#: bzrlib/builtins.py:3472
2140
msgid ""
2141
" If the author of the change is not the same person as the committer,\n"
2142
" you can specify the author's name using the --author option. The\n"
2143
" name should be in the same format as a committer-id, e.g.\n"
2144
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2145
" the change you can specify the option multiple times, once for each\n"
2146
" author."
2147
msgstr ""
2148
2149
#: bzrlib/builtins.py:3479
2150
msgid ":Checks:"
2151
msgstr ""
2152
2153
#: bzrlib/builtins.py:3481
2154
msgid ""
2155
" A common mistake is to forget to add a new file or directory before\n"
2156
" running the commit command. The --strict option checks for unknown\n"
2157
" files and aborts the commit if any are found. More advanced pre-commit\n"
2158
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2159
" for details."
2160
msgstr ""
2161
2162
#: bzrlib/builtins.py:3487
2163
msgid ":Things to note:"
2164
msgstr ""
2165
2166
#: bzrlib/builtins.py:3489
2167
msgid ""
2168
" If you accidentially commit the wrong changes or make a spelling\n"
2169
" mistake in the commit message say, you can use the uncommit command\n"
2170
" to undo it. See ``bzr help uncommit`` for details."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3493
2174
msgid ""
2175
" Hooks can also be configured to run after a commit. This allows you\n"
2176
" to trigger updates to external systems like bug trackers. The --fixes\n"
2177
" option can be used to record the association between a revision and\n"
2178
" one or more bugs. See ``bzr help bugs`` for details."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3503
2182
msgid "Do not consider changes made to a given path."
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:3506
2186
msgid "Description of the new revision."
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:3509
2190
msgid "Commit even if nothing has changed."
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3513
2194
msgid "Take commit message from this file."
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3515
2198
msgid "Refuse to commit if there are unknown files in the working tree."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3518
2202
msgid ""
2203
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2204
"08:00:00 +0100'."
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3521
2208
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3524
2212
msgid "Set the author's name, if it's different from the committer."
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3527
2216
msgid ""
2217
"Perform a local commit in a bound branch. Local commits are not pushed to "
2218
"the master branch until a normal commit is performed."
2219
msgstr ""
2220
2221
#: bzrlib/builtins.py:3533
2222
msgid ""
2223
"When no message is supplied, show the diff along with the status summary in "
2224
"the message editor."
2225
msgstr ""
2226
2227
#: bzrlib/builtins.py:3536
2228
msgid ""
2229
"When committing to a foreign version control system do not push data that "
2230
"can not be natively represented."
2231
msgstr ""
2232
2233
#: bzrlib/builtins.py:3554
2234
#, python-format
2235
msgid ""
2236
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2237
"default bug tracker using the `bugtracker` option.\n"
2238
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3563
2242
#, python-format
2243
msgid ""
2244
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2245
"for more information on this feature.\n"
2246
"Commit refused."
2247
msgstr ""
2248
2249
#: bzrlib/builtins.py:3572
2250
#, python-format
2251
msgid "Unrecognized bug %s. Commit refused."
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3575
2255
#, python-format
2256
msgid ""
2257
"%s\n"
2258
"Commit refused."
2259
msgstr ""
2260
2261
#: bzrlib/builtins.py:3599
2262
msgid "Could not parse --commit-time: "
2263
msgstr ""
2264
2265
#: bzrlib/builtins.py:3639
2266
msgid "please specify either --message or --file"
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3668
2270
msgid "please specify a commit message with either --message or --file"
2271
msgstr ""
2272
2273
#: bzrlib/builtins.py:3671
2274
msgid ""
2275
"Empty commit message specified. Please specify a commit message with either -"
2276
"-message or --file or leave a blank message with --message \"\"."
2277
msgstr ""
2278
2279
#: bzrlib/builtins.py:3691
2280
msgid ""
2281
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2282
"-unchanged to force an empty commit."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3695
2286
msgid ""
2287
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2288
"resolve FILE\" to resolve."
2289
msgstr ""
2290
2291
#: bzrlib/builtins.py:3699
2292
msgid "Commit refused because there are unknown files in the working tree."
2293
msgstr ""
2294
2295
#: bzrlib/builtins.py:3702
2296
msgid ""
2297
"\n"
2298
"To commit to master branch, run update and then commit.\n"
2299
"You can also pass --local to commit to continue working disconnected."
2300
msgstr ""
2301
2302
#: bzrlib/builtins.py:3710
2303
msgid ""
2304
"Validate working tree structure, branch consistency and repository history."
2305
msgstr ""
2306
2307
#: bzrlib/builtins.py:3712
2308
msgid ""
2309
"This command checks various invariants about branch and repository storage\n"
2310
"to detect data corruption or bzr bugs."
2311
msgstr ""
2312
2313
#: bzrlib/builtins.py:3715
2314
msgid ""
2315
"The working tree and branch checks will only give output if a problem is\n"
2316
"detected. The output fields of the repository check are:"
2317
msgstr ""
2318
2319
#: bzrlib/builtins.py:3718
2320
msgid ""
2321
"revisions\n"
2322
" This is just the number of revisions checked. It doesn't\n"
2323
" indicate a problem."
2324
msgstr ""
2325
2326
#: bzrlib/builtins.py:3722
2327
msgid ""
2328
"versionedfiles\n"
2329
" This is just the number of versionedfiles checked. It\n"
2330
" doesn't indicate a problem."
2331
msgstr ""
2332
2333
#: bzrlib/builtins.py:3726
2334
msgid ""
2335
"unreferenced ancestors\n"
2336
" Texts that are ancestors of other texts, but\n"
2337
" are not properly referenced by the revision ancestry. This is a\n"
2338
" subtle problem that Bazaar can work around."
2339
msgstr ""
2340
2341
#: bzrlib/builtins.py:3731
2342
msgid ""
2343
"unique file texts\n"
2344
" This is the total number of unique file contents\n"
2345
" seen in the checked revisions. It does not indicate a problem."
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3735
2349
msgid ""
2350
"repeated file texts\n"
2351
" This is the total number of repeated texts seen\n"
2352
" in the checked revisions. Texts can be repeated when their file\n"
2353
" entries are modified, but the file contents are not. It does not\n"
2354
" indicate a problem."
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3741
2358
msgid ""
2359
"If no restrictions are specified, all Bazaar data that is found at the "
2360
"given\n"
2361
"location will be checked."
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3746
2365
msgid " Check the tree and branch at 'foo'::"
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3748
2369
msgid " bzr check --tree --branch foo"
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3750
2373
msgid " Check only the repository at 'bar'::"
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3752
2377
msgid " bzr check --repo bar"
2378
msgstr ""
2379
2380
#: bzrlib/builtins.py:3754
2381
msgid " Check everything at 'baz'::"
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3756
2385
msgid " bzr check baz"
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3762
2389
msgid "Check the branch related to the current directory."
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3764
2393
msgid "Check the repository related to the current directory."
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3766
2397
msgid "Check the working tree related to the current directory."
2398
msgstr ""
2399
2400
#: bzrlib/builtins.py:3780
2401
msgid "Upgrade a repository, branch or working tree to a newer format."
2402
msgstr ""
2403
2404
#: bzrlib/builtins.py:3782
2405
msgid ""
2406
"When the default format has changed after a major new release of\n"
2407
"Bazaar, you may be informed during certain operations that you\n"
2408
"should upgrade. Upgrading to a newer format may improve performance\n"
2409
"or make new features available. It may however limit interoperability\n"
2410
"with older repositories or with older versions of Bazaar."
2411
msgstr ""
2412
2413
#: bzrlib/builtins.py:3788
2414
msgid ""
2415
"If you wish to upgrade to a particular format rather than the\n"
2416
"current default, that can be specified using the --format option.\n"
2417
"As a consequence, you can use the upgrade command this way to\n"
2418
"\"downgrade\" to an earlier format, though some conversions are\n"
2419
"a one way process (e.g. changing from the 1.x default to the\n"
2420
"2.x default) so downgrading is not always possible."
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3795
2424
msgid ""
2425
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2426
"process (where # is a number). By default, this is left there on\n"
2427
"completion. If the conversion fails, delete the new .bzr directory\n"
2428
"and rename this one back in its place. Use the --clean option to ask\n"
2429
"for the backup.bzr directory to be removed on successful conversion.\n"
2430
"Alternatively, you can delete it by hand if everything looks good\n"
2431
"afterwards."
2432
msgstr ""
2433
2434
#: bzrlib/builtins.py:3803
2435
msgid ""
2436
"If the location given is a shared repository, dependent branches\n"
2437
"are also converted provided the repository converts successfully.\n"
2438
"If the conversion of a branch fails, remaining branches are still\n"
2439
"tried."
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3808
2443
msgid ""
2444
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2445
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2446
msgstr ""
2447
2448
#: bzrlib/builtins.py:3816
2449
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2450
msgstr ""
2451
2452
#: bzrlib/builtins.py:3820
2453
msgid "Branch format"
2454
msgstr ""
2455
2456
#: bzrlib/builtins.py:3822
2457
msgid "Remove the backup.bzr directory if successful."
2458
msgstr ""
2459
2460
#: bzrlib/builtins.py:3824
2461
msgid "Show what would be done, but don't actually do anything."
2462
msgstr ""
2463
2464
#: bzrlib/builtins.py:3839
2465
msgid "Show or set bzr user id."
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3841
2469
msgid ""
2470
":Examples:\n"
2471
" Show the email of the current user::"
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3844
2475
msgid " bzr whoami --email"
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3846
2479
msgid " Set the current user::"
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3848
2483
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2484
msgstr ""
2485
2486
#: bzrlib/builtins.py:3852
2487
msgid "Display email address only."
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3854
2491
msgid "Set identity for the current branch instead of globally."
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3880
2495
msgid "--email can only be used to display existing identity"
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3904
2499
msgid "Print or set the branch nickname."
2500
msgstr ""
2501
2502
#: bzrlib/builtins.py:3906
2503
msgid ""
2504
"If unset, the colocated branch name is used for colocated branches, and\n"
2505
"the branch directory name is used for other branches. To print the\n"
2506
"current nickname, execute with no argument."
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3910
2510
msgid ""
2511
"Bound branches use the nickname of its master branch unless it is set\n"
2512
"locally."
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:3930
2516
msgid "Set/unset and display aliases."
2517
msgstr ""
2518
2519
#: bzrlib/builtins.py:3932
2520
msgid ""
2521
":Examples:\n"
2522
" Show the current aliases::"
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3935
2526
msgid " bzr alias"
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3937
2530
msgid " Show the alias specified for 'll'::"
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:3939
2534
msgid " bzr alias ll"
2535
msgstr ""
2536
2537
#: bzrlib/builtins.py:3941
2538
msgid " Set an alias for 'll'::"
2539
msgstr ""
2540
2541
#: bzrlib/builtins.py:3943
2542
msgid " bzr alias ll=\"log --line -r-10..-1\""
2543
msgstr ""
2544
2545
#: bzrlib/builtins.py:3945
2546
msgid " To remove an alias for 'll'::"
2547
msgstr ""
2548
2549
#: bzrlib/builtins.py:3947
2550
msgid " bzr alias --remove ll"
2551
msgstr ""
2552
2553
#: bzrlib/builtins.py:3952
2554
msgid "Remove the alias."
2555
msgstr ""
2556
2557
#: bzrlib/builtins.py:3970
2558
msgid "bzr alias --remove expects an alias to remove."
2559
msgstr ""
2560
2561
#: bzrlib/builtins.py:4151
2562
msgid ""
2563
"subunit not available. subunit needs to be installed to use --subunit."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:4168
2567
msgid ""
2568
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:4215
2572
msgid "Show version of bzr."
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:4219
2576
msgid "Print just the version number."
2577
msgstr ""
2578
2579
#: bzrlib/builtins.py:4238
2580
msgid "It sure does!\n"
2581
msgstr ""
2582
2583
#: bzrlib/builtins.py:4262
2584
#, python-format
2585
msgid "merge base is revision %s\n"
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:4266
2589
msgid "Perform a three-way merge."
2590
msgstr ""
2591
2592
#: bzrlib/builtins.py:4268
2593
msgid ""
2594
"The source of the merge can be specified either in the form of a branch,\n"
2595
"or in the form of a path to a file containing a merge directive generated\n"
2596
"with bzr send. If neither is specified, the default is the upstream branch\n"
2597
"or the branch most recently merged using --remember. The source of the\n"
2598
"merge may also be specified in the form of a path to a file in another\n"
2599
"branch: in this case, only the modifications to that file are merged into\n"
2600
"the current working tree."
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:4276
2604
msgid ""
2605
"When merging from a branch, by default bzr will try to merge in all new\n"
2606
"work from the other branch, automatically determining an appropriate base\n"
2607
"revision. If this fails, you may need to give an explicit base."
2608
msgstr ""
2609
2610
#: bzrlib/builtins.py:4280
2611
msgid ""
2612
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2613
"try to merge in all new work up to and including revision OTHER."
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:4283
2617
msgid ""
2618
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2619
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2620
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2621
"not already contain revision BASE, such a merge is commonly referred to as\n"
2622
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2623
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2624
"changes from the other branch is not stored in the commit."
2625
msgstr ""
2626
2627
#: bzrlib/builtins.py:4291
2628
msgid "Revision numbers are always relative to the source branch."
2629
msgstr ""
2630
2631
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2632
msgid ""
2633
"Merge will do its best to combine the changes in two branches, but there\n"
2634
"are some kinds of problems only a human can fix. When it encounters those,\n"
2635
"it will mark a conflict. A conflict means that you need to fix something,\n"
2636
"before you can commit."
2637
msgstr ""
2638
2639
#: bzrlib/builtins.py:4298
2640
msgid ""
2641
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2642
msgstr ""
2643
2644
#: bzrlib/builtins.py:4300
2645
msgid ""
2646
"If there is no default branch set, the first merge will set it (use\n"
2647
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2648
"to use the default. To change the default, use --remember. The value will\n"
2649
"only be saved if the remote location can be accessed."
2650
msgstr ""
2651
2652
#: bzrlib/builtins.py:4305
2653
msgid ""
2654
"The results of the merge are placed into the destination working\n"
2655
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2656
"committed to record the result of the merge."
2657
msgstr ""
2658
2659
#: bzrlib/builtins.py:4309
2660
msgid ""
2661
"merge refuses to run if there are any uncommitted changes, unless\n"
2662
"--force is given. If --force is given, then the changes from the source \n"
2663
"will be merged with the current working tree, including any uncommitted\n"
2664
"changes in the tree. The --force option can also be used to create a\n"
2665
"merge revision which has more than two parents."
2666
msgstr ""
2667
2668
#: bzrlib/builtins.py:4315
2669
msgid ""
2670
"If one would like to merge changes from the working tree of the other\n"
2671
"branch without merging any committed revisions, the --uncommitted option\n"
2672
"can be given."
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:4319
2676
msgid ""
2677
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2678
"you to apply each diff hunk and file change, similar to \"shelve\"."
2679
msgstr ""
2680
2681
#: bzrlib/builtins.py:4322
2682
msgid ""
2683
":Examples:\n"
2684
" To merge all new revisions from bzr.dev::"
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:4325
2688
msgid " bzr merge ../bzr.dev"
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4327
2692
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4329
2696
msgid " bzr merge -r 82 ../bzr.dev"
2697
msgstr ""
2698
2699
#: bzrlib/builtins.py:4331
2700
msgid " To merge the changes introduced by 82, without previous changes::"
2701
msgstr ""
2702
2703
#: bzrlib/builtins.py:4333
2704
msgid " bzr merge -r 81..82 ../bzr.dev"
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:4335
2708
msgid " To apply a merge directive contained in /tmp/merge::"
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4337
2712
msgid " bzr merge /tmp/merge"
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:4339
2716
msgid ""
2717
" To create a merge revision with three parents from two branches\n"
2718
" feature1a and feature1b:"
2719
msgstr ""
2720
2721
#: bzrlib/builtins.py:4342
2722
msgid ""
2723
" bzr merge ../feature1a\n"
2724
" bzr merge ../feature1b --force\n"
2725
" bzr commit -m 'revision with three parents'"
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4354
2729
msgid "Merge even if the destination tree has uncommitted changes."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4360
2733
msgid ""
2734
"Apply uncommitted changes from a working copy, instead of branch changes."
2735
msgstr ""
2736
2737
#: bzrlib/builtins.py:4362
2738
msgid ""
2739
"If the destination is already completely merged into the source, pull from "
2740
"the source rather than merging. When this happens, you do not need to "
2741
"commit the result."
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:4367
2745
msgid ""
2746
"Branch to merge into, rather than the one containing the working directory."
2747
msgstr ""
2748
2749
#: bzrlib/builtins.py:4369
2750
msgid "Instead of merging, show a diff of the merge."
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:4371
2754
msgid "Select changes interactively."
2755
msgstr ""
2756
2757
#: bzrlib/builtins.py:4393
2758
msgid ""
2759
"Merging into empty branches not currently supported, "
2760
"https://bugs.launchpad.net/bzr/+bug/308562"
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4420
2764
msgid "Cannot use --uncommitted with bundles or merge directives."
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4431
2768
msgid "Cannot use --uncommitted and --revision at the same time."
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4451
2772
msgid "merger: "
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2776
msgid "Nothing to do."
2777
msgstr ""
2778
2779
#: bzrlib/builtins.py:4457
2780
msgid "Cannot pull individual files"
2781
msgstr ""
2782
2783
#: bzrlib/builtins.py:4465
2784
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2785
msgstr ""
2786
2787
#: bzrlib/builtins.py:4523
2788
#, python-format
2789
msgid "Show-base is not supported for this merge type. %s"
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4532
2793
#, python-format
2794
msgid "Conflict reduction is not supported for merge type %s."
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4536
2798
msgid "Cannot do conflict reduction and show base."
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4647
2802
msgid "No location specified or remembered"
2803
msgstr ""
2804
2805
#: bzrlib/builtins.py:4649
2806
msgid "{0} remembered {1} location {2}"
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4655
2810
msgid "Redo a merge."
2811
msgstr ""
2812
2813
#: bzrlib/builtins.py:4657
2814
msgid ""
2815
"Use this if you want to try a different merge technique while resolving\n"
2816
"conflicts. Some merge techniques are better than others, and remerge\n"
2817
"lets you try different ones on different files."
2818
msgstr ""
2819
2820
#: bzrlib/builtins.py:4661
2821
msgid ""
2822
"The options for remerge have the same meaning and defaults as the ones for\n"
2823
"merge. The difference is that remerge can (only) be run when there is a\n"
2824
"pending merge, and it lets you specify particular files."
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4665
2828
msgid ""
2829
":Examples:\n"
2830
" Re-do the merge of all conflicted files, and show the base text in\n"
2831
" conflict regions, in addition to the usual THIS and OTHER texts::"
2832
msgstr ""
2833
2834
#: bzrlib/builtins.py:4669
2835
msgid " bzr remerge --show-base"
2836
msgstr ""
2837
2838
#: bzrlib/builtins.py:4671
2839
msgid ""
2840
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2841
" additional processing to reduce the size of conflict regions::"
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4674
2845
msgid " bzr remerge --merge-type weave --reprocess foobar"
2846
msgstr ""
2847
2848
#: bzrlib/builtins.py:4681
2849
msgid "Show base revision text in conflicts."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4693
2853
msgid ""
2854
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2855
"merges."
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4751
2859
msgid ""
2860
"Set files in the working tree back to the contents of a previous revision."
2861
msgstr ""
2862
2863
#: bzrlib/builtins.py:4753
2864
msgid ""
2865
"Giving a list of files will revert only those files. Otherwise, all files\n"
2866
"will be reverted. If the revision is not specified with '--revision', the\n"
2867
"working tree basis revision is used. A revert operation affects only the\n"
2868
"working tree, not any revision history like the branch and repository or\n"
2869
"the working tree basis revision."
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:4759
2873
msgid ""
2874
"To remove only some changes, without reverting to a prior version, use\n"
2875
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2876
"will remove the changes introduced by the second last commit (-2), without\n"
2877
"affecting the changes introduced by the last commit (-1). To remove\n"
2878
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2879
"To update the branch to a specific revision or the latest revision and\n"
2880
"update the working tree accordingly while preserving local changes, see the\n"
2881
"update command."
2882
msgstr ""
2883
2884
#: bzrlib/builtins.py:4768
2885
msgid ""
2886
"Uncommitted changes to files that are reverted will be discarded.\n"
2887
"Howver, by default, any files that have been manually changed will be\n"
2888
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2889
"files have '.~#~' appended to their name, where # is a number."
2890
msgstr ""
2891
2892
#: bzrlib/builtins.py:4773
2893
msgid ""
2894
"When you provide files, you can use their current pathname or the pathname\n"
2895
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2896
"name. If you name a directory, all the contents of that directory will be\n"
2897
"reverted."
2898
msgstr ""
2899
2900
#: bzrlib/builtins.py:4778
2901
msgid ""
2902
"If you have newly added files since the target revision, they will be\n"
2903
"removed. If the files to be removed have been changed, backups will be\n"
2904
"created as above. Directories containing unknown files will not be\n"
2905
"deleted."
2906
msgstr ""
2907
2908
#: bzrlib/builtins.py:4783
2909
msgid ""
2910
"The working tree contains a list of revisions that have been merged but\n"
2911
"not yet committed. These revisions will be included as additional parents\n"
2912
"of the next commit. Normally, using revert clears that list as well as\n"
2913
"reverting the files. If any files are specified, revert leaves the list\n"
2914
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2915
".`` in the tree root to revert all files but keep the recorded merges,\n"
2916
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2917
"reverting any files."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4792
2921
msgid ""
2922
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2923
"changes from a branch in a single revision. To do this, perform the merge\n"
2924
"as desired. Then doing revert with the \"--forget-merges\" option will "
2925
"keep\n"
2926
"the content of the tree as it was, but it will clear the list of pending\n"
2927
"merges. The next commit will then contain all of the changes that are\n"
2928
"present in the other branch, but without any other parent revisions.\n"
2929
"Because this technique forgets where these changes originated, it may\n"
2930
"cause additional conflicts on later merges involving the same source and\n"
2931
"target branches."
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:4806
2935
msgid "Do not save backups of reverted files."
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:4808
2939
msgid "Remove pending merge marker, without changing any files."
2940
msgstr ""
2941
2942
#: bzrlib/builtins.py:4839
2943
msgid ""
2944
"Show help on a command or other topic.\n"
2945
" "
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:4844
2949
msgid "Show help on all commands."
2950
msgstr ""
2951
2952
#: bzrlib/builtins.py:4873
2953
msgid "Show unmerged/unpulled revisions between two branches."
2954
msgstr ""
2955
2956
#: bzrlib/builtins.py:4875
2957
msgid "OTHER_BRANCH may be local or remote."
2958
msgstr ""
2959
2960
#: bzrlib/builtins.py:4877
2961
msgid ""
2962
"To filter on a range of revisions, you can use the command -r begin..end\n"
2963
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2964
"also valid.\n"
2965
" \n"
2966
":Exit values:\n"
2967
" 1 - some missing revisions\n"
2968
" 0 - no missing revisions"
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:4887
2972
msgid ""
2973
" Determine the missing revisions between this and the branch at the\n"
2974
" remembered pull location::"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4890
2978
msgid " bzr missing"
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4892
2982
msgid " Determine the missing revisions between this and another branch::"
2983
msgstr ""
2984
2985
#: bzrlib/builtins.py:4894
2986
msgid " bzr missing http://server/branch"
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4896
2990
msgid ""
2991
" Determine the missing revisions up to a specific revision on the other\n"
2992
" branch::"
2993
msgstr ""
2994
2995
#: bzrlib/builtins.py:4899
2996
msgid " bzr missing -r ..-10"
2997
msgstr ""
2998
2999
#: bzrlib/builtins.py:4901
3000
msgid ""
3001
" Determine the missing revisions up to a specific revision on this\n"
3002
" branch::"
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4904
3006
msgid " bzr missing --my-revision ..-10"
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4911
3010
msgid "Reverse the order of revisions."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4913
3014
msgid "Display changes in the local branch only."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4914
3018
msgid "Same as --mine-only."
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4916
3022
msgid "Display changes in the remote branch only."
3023
msgstr ""
3024
3025
#: bzrlib/builtins.py:4917
3026
msgid "Same as --theirs-only."
3027
msgstr ""
3028
3029
#: bzrlib/builtins.py:4922
3030
msgid ""
3031
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3032
"details."
3033
msgstr ""
3034
3035
#: bzrlib/builtins.py:4926
3036
msgid ""
3037
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3038
"details."
3039
msgstr ""
3040
3041
#: bzrlib/builtins.py:4929
3042
msgid "Show all revisions in addition to the mainline ones."
3043
msgstr ""
3044
3045
#: bzrlib/builtins.py:4983
3046
msgid "No peer location known or specified."
3047
msgstr ""
3048
3049
#: bzrlib/builtins.py:4987
3050
msgid "Using saved parent location: {0}\n"
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:5020
3054
#, python-format
3055
msgid "You have %d extra revision:\n"
3056
msgid_plural "You have %d extra revisions:\n"
3057
msgstr[0] ""
3058
msgstr[1] ""
3059
3060
#: bzrlib/builtins.py:5040
3061
#, python-format
3062
msgid "You are missing %d revision:\n"
3063
msgid_plural "You are missing %d revisions:\n"
3064
msgstr[0] ""
3065
msgstr[1] ""
3066
3067
#: bzrlib/builtins.py:5055
3068
msgid "This branch has no new revisions.\n"
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:5058
3072
msgid "Other branch has no new revisions.\n"
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:5063
3076
msgid "Branches are up to date.\n"
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:5074
3080
msgid "Compress the data within a repository."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:5076
3084
msgid ""
3085
"This operation compresses the data within a bazaar repository. As\n"
3086
"bazaar supports automatic packing of repository, this operation is\n"
3087
"normally not required to be done manually."
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:5080
3091
msgid ""
3092
"During the pack operation, bazaar takes a backup of existing repository\n"
3093
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3094
"automatically when it is safe to do so. To save disk space by removing\n"
3095
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3096
"used."
3097
msgstr ""
3098
3099
#: bzrlib/builtins.py:5086
3100
msgid ""
3101
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3102
"during or immediately after repacking, you may be left with a state\n"
3103
"where the deletion has been written to disk but the new packs have not\n"
3104
"been. In this case the repository may be unusable."
3105
msgstr ""
3106
3107
#: bzrlib/builtins.py:5095
3108
msgid "Delete obsolete packs to save disk space."
3109
msgstr ""
3110
3111
#: bzrlib/builtins.py:5109
3112
msgid "List the installed plugins."
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:5111
3116
msgid ""
3117
"This command displays the list of installed plugins including\n"
3118
"version of plugin and a short description of each."
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:5114
3122
msgid "--verbose shows the path where each plugin is located."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:5116
3126
msgid ""
3127
"A plugin is an external component for Bazaar that extends the\n"
3128
"revision control system, by adding or replacing code in Bazaar.\n"
3129
"Plugins can do a variety of things, including overriding commands,\n"
3130
"adding new commands, providing additional network transports and\n"
3131
"customizing log output."
3132
msgstr ""
3133
3134
#: bzrlib/builtins.py:5122
3135
msgid ""
3136
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3137
"for further information on plugins including where to find them and how to\n"
3138
"install them. Instructions are also provided there on how to write new\n"
3139
"plugins using the Python programming language."
3140
msgstr ""
3141
3142
#: bzrlib/builtins.py:5138
3143
msgid "Show testament (signing-form) of a revision."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5141
3147
msgid "Produce long-format testament."
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:5143
3151
msgid "Produce a strict-format testament."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5169
3155
msgid "Show the origin of each line in a file."
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:5171
3159
msgid ""
3160
"This prints out the given file with an annotation on the left side\n"
3161
"indicating which revision, author and date introduced the change."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:5174
3165
msgid ""
3166
"If the origin is the same for a run of consecutive lines, it is\n"
3167
"shown only at the top, unless the --all option is given."
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:5182
3171
msgid "Show annotations on all lines."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5183
3175
msgid "Show commit date in annotations."
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5270
3179
msgid "Cannot sign a range of non-revision-history revisions"
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:5282
3183
msgid "Please supply either one revision, or a range."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5286
3187
msgid ""
3188
"Convert the current branch into a checkout of the supplied branch.\n"
3189
"If no branch is supplied, rebind to the last bound location."
3190
msgstr ""
3191
3192
#: bzrlib/builtins.py:5289
3193
msgid ""
3194
"Once converted into a checkout, commits must succeed on the master branch\n"
3195
"before they will be applied to the local branch."
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5292
3199
msgid ""
3200
"Bound branches use the nickname of its master branch unless it is set\n"
3201
"locally, in which case binding will update the local nickname to be\n"
3202
"that of the master."
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:5307
3206
msgid "No location supplied. This format does not remember old locations."
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:5313
3210
msgid "Branch is already bound"
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5316
3214
msgid "No location supplied and no previous location known"
3215
msgstr ""
3216
3217
#: bzrlib/builtins.py:5322
3218
msgid "These branches have diverged. Try merging, and then bind again."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5329
3222
msgid "Convert the current checkout into a regular branch."
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:5331
3226
msgid ""
3227
"After unbinding, the local branch is considered independent and subsequent\n"
3228
"commits will be local only."
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:5342
3232
msgid "Local branch is not bound"
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5346
3236
msgid "Remove the last committed revision."
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:5348
3240
msgid ""
3241
"--verbose will print out what is being removed.\n"
3242
"--dry-run will go through all the motions, but not actually\n"
3243
"remove anything."
3244
msgstr ""
3245
3246
#: bzrlib/builtins.py:5352
3247
msgid ""
3248
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3249
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3250
"branch at revision 15."
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5356
3254
msgid ""
3255
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3256
"it may make is to restore any pending merges that were present before\n"
3257
"the commit."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5367
3261
msgid "Don't actually make changes."
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5368
3265
msgid "Say yes to all questions."
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5370
3269
msgid "Keep tags that point to removed revisions."
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5372
3273
msgid "Only remove the commits from the local branch when in a checkout."
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5421
3277
msgid "No revisions to uncommit.\n"
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:5436
3281
msgid "Dry-run, pretending to remove the above revisions.\n"
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5439
3285
msgid "The above revision(s) will be removed.\n"
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5443
3289
msgid "Uncommit these revisions"
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5446
3293
msgid "Canceled\n"
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:5453
3297
#, python-format
3298
msgid ""
3299
"You can restore the old tip by running:\n"
3300
" bzr pull . -r revid:%s\n"
3301
msgstr ""
3302
3303
#: bzrlib/builtins.py:5458
3304
msgid "Break a dead lock."
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5460
3308
msgid ""
3309
"This command breaks a lock on a repository, branch, working directory or\n"
3310
"config file."
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5463
3314
msgid ""
3315
"CAUTION: Locks should only be broken when you are sure that the process\n"
3316
"holding the lock has been stopped."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5466
3320
msgid ""
3321
"You can get information on what locks are open via the 'bzr info\n"
3322
"[location]' command."
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5469
3326
msgid ""
3327
":Examples:\n"
3328
" bzr break-lock\n"
3329
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3330
" bzr break-lock --conf ~/.bazaar"
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5478
3334
msgid "LOCATION is the directory where the config lock is."
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5480
3338
msgid "Do not ask for confirmation before breaking the lock."
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5515
3342
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5516
3346
msgid "Run the bzr server."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5522
3350
msgid "Serve on stdin/out for use from inetd or sshd."
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5523
3354
msgid "protocol"
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5524
3358
msgid "Protocol to serve."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5528
3362
msgid "Listen for connections on nominated address."
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5530
3366
msgid ""
3367
"Listen for connections on nominated port. Passing 0 as the port number will "
3368
"result in a dynamically allocated port. The default port depends on the "
3369
"protocol."
3370
msgstr ""
3371
3372
#: bzrlib/builtins.py:5535
3373
msgid "Serve contents of this directory."
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5537
3377
msgid ""
3378
"By default the server is a readonly server. Supplying --allow-writes "
3379
"enables write access to the contents of the served directory and below. "
3380
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3381
"of external authentication is arranged supplying this option leads to global "
3382
"uncontrolled write access to your file system."
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:5546
3386
msgid "Override the default idle client timeout (5min)."
3387
msgstr ""
3388
3389
#: bzrlib/builtins.py:5564
3390
msgid "Combine a tree into its containing tree."
3391
msgstr ""
3392
3393
#: bzrlib/builtins.py:5566
3394
msgid "This command requires the target tree to be in a rich-root format."
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:5568
3398
msgid ""
3399
"The TREE argument should be an independent tree, inside another tree, but\n"
3400
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3401
"running \"bzr branch\" with the target inside a tree.)"
3402
msgstr ""
3403
3404
#: bzrlib/builtins.py:5572
3405
msgid ""
3406
"The result is a combined tree, with the subtree no longer an independent\n"
3407
"part. This is marked as a merge of the subtree into the containing tree,\n"
3408
"and all history is preserved."
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5590
3412
#, python-format
3413
msgid ""
3414
"Can't join trees because %s doesn't support rich root data.\n"
3415
"You can use bzr upgrade on the repository."
3416
msgstr ""
3417
3418
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3419
msgid "Cannot join {0}. {1}"
3420
msgstr ""
3421
3422
#: bzrlib/builtins.py:5610
3423
msgid "Split a subdirectory of a tree into a separate tree."
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:5612
3427
msgid ""
3428
"This command will produce a target tree in a format that supports\n"
3429
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3430
"converted into earlier formats like 'dirstate-tags'."
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5616
3434
msgid ""
3435
"The TREE argument should be a subdirectory of a working tree. That\n"
3436
"subdirectory will be converted into an independent tree, with its own\n"
3437
"branch. Commits in the top-level tree will not apply to the new subtree."
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5696
3441
msgid "No submit branch specified or known"
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3445
msgid "No public branch specified or known"
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:5710
3449
msgid "bzr merge-directive takes at most two one revision identifiers"
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5719
3453
msgid "No revisions to bundle."
3454
msgstr ""
3455
3456
#: bzrlib/builtins.py:5738
3457
msgid "Mail or create a merge-directive for submitting changes."
3458
msgstr ""
3459
3460
#: bzrlib/builtins.py:5740
3461
msgid "A merge directive provides many things needed for requesting merges:"
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5742
3465
msgid "* A machine-readable description of the merge to perform"
3466
msgstr ""
3467
3468
#: bzrlib/builtins.py:5744
3469
msgid "* An optional patch that is a preview of the changes requested"
3470
msgstr ""
3471
3472
#: bzrlib/builtins.py:5746
3473
msgid ""
3474
"* An optional bundle of revision data, so that the changes can be applied\n"
3475
" directly from the merge directive, without retrieving data from a\n"
3476
" branch."
3477
msgstr ""
3478
3479
#: bzrlib/builtins.py:5750
3480
msgid ""
3481
"`bzr send` creates a compact data set that, when applied using bzr\n"
3482
"merge, has the same effect as merging from the source branch. "
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5753
3486
msgid ""
3487
"By default the merge directive is self-contained and can be applied to any\n"
3488
"branch containing submit_branch in its ancestory without needing access to\n"
3489
"the source branch."
3490
msgstr ""
3491
3492
#: bzrlib/builtins.py:5757
3493
msgid ""
3494
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3495
"revisions, but only a structured request to merge from the\n"
3496
"public_location. In that case the public_branch is needed and it must be\n"
3497
"up-to-date and accessible to the recipient. The public_branch is always\n"
3498
"included if known, so that people can check it later."
3499
msgstr ""
3500
3501
#: bzrlib/builtins.py:5763
3502
msgid ""
3503
"The submit branch defaults to the parent of the source branch, but can be\n"
3504
"overridden. Both submit branch and public branch will be remembered in\n"
3505
"branch.conf the first time they are used for a particular branch. The\n"
3506
"source branch defaults to that containing the working directory, but can\n"
3507
"be changed using --from."
3508
msgstr ""
3509
3510
#: bzrlib/builtins.py:5769
3511
msgid ""
3512
"Both the submit branch and the public branch follow the usual behavior with\n"
3513
"respect to --remember: If there is no default location set, the first send\n"
3514
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3515
"omit the location to use the default. To change the default, use\n"
3516
"--remember. The value will only be saved if the location can be accessed."
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5775
3520
msgid ""
3521
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3522
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3523
"If a public location is known for the submit_branch, that location is used\n"
3524
"in the merge directive."
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:5780
3528
msgid ""
3529
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3530
"given, in which case it is sent to a file."
3531
msgstr ""
3532
3533
#: bzrlib/builtins.py:5783
3534
msgid ""
3535
"Mail is sent using your preferred mail program. This should be transparent\n"
3536
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3537
"If the preferred client can't be found (or used), your editor will be used."
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:5787
3541
msgid ""
3542
"To use a specific mail program, set the mail_client configuration option.\n"
3543
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3544
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3545
"(MacOS X's\n"
3546
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3547
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3548
"add\n"
3549
"supported clients."
3550
msgstr ""
3551
3552
#: bzrlib/builtins.py:5794
3553
msgid ""
3554
"If mail is being sent, a to address is required. This can be supplied\n"
3555
"either on the commandline, by setting the submit_to configuration\n"
3556
"option in the branch itself or the child_submit_to configuration option\n"
3557
"in the submit branch."
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5799
3561
msgid ""
3562
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3563
"and\n"
3564
"merge directive format 2. It is significantly faster and smaller than\n"
3565
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3566
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3567
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5805
3571
msgid ""
3572
"The merge directives created by bzr send may be applied using bzr merge or\n"
3573
"bzr pull by specifying a file containing a merge directive as the location."
3574
msgstr ""
3575
3576
#: bzrlib/builtins.py:5808
3577
msgid ""
3578
"bzr send makes extensive use of public locations to map local locations "
3579
"into\n"
3580
"URLs that can be used by other people. See `bzr help configuration` to\n"
3581
"set them, and use `bzr info` to display them."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5832
3585
msgid "Write merge directive to this file or directory; use - for stdout."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5836
3589
msgid ""
3590
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3591
"strict disables the check."
3592
msgstr ""
3593
3594
#: bzrlib/builtins.py:5838
3595
msgid "Mail the request to this address."
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:5842
3599
msgid "Body for the email."
3600
msgstr ""
3601
3602
#: bzrlib/builtins.py:5895
3603
msgid "Do not include a bundle in the merge directive."
3604
msgstr ""
3605
3606
#: bzrlib/builtins.py:5896
3607
msgid "Do not include a preview patch in the merge directive."
3608
msgstr ""
3609
3610
#: bzrlib/builtins.py:5899
3611
msgid "Remember submit and public branch."
3612
msgstr ""
3613
3614
#: bzrlib/builtins.py:5901
3615
msgid ""
3616
"Branch to generate the submission from, rather than the one containing the "
3617
"working directory."
3618
msgstr ""
3619
3620
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3621
msgid "format"
3622
msgstr ""
3623
3624
#: bzrlib/builtins.py:5912
3625
msgid "Use the specified output format."
3626
msgstr ""
3627
3628
#: bzrlib/builtins.py:5934
3629
msgid "Create, remove or modify a tag naming a revision."
3630
msgstr ""
3631
3632
#: bzrlib/builtins.py:5936
3633
msgid ""
3634
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3635
"(--revision) option can be given -rtag:X, where X is any previously\n"
3636
"created tag."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5940
3640
msgid ""
3641
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3642
"along when you branch, push, pull or merge."
3643
msgstr ""
3644
3645
#: bzrlib/builtins.py:5943
3646
msgid ""
3647
"It is an error to give a tag name that already exists unless you pass\n"
3648
"--force, in which case the tag is moved to point to the new revision."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5946
3652
msgid ""
3653
"To rename a tag (change the name but keep it on the same revsion), run "
3654
"``bzr\n"
3655
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5949
3659
msgid ""
3660
"If no tag name is specified it will be determined through the \n"
3661
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3662
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3663
"details."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5959
3667
msgid "Delete this tag rather than placing it."
3668
msgstr ""
3669
3670
#: bzrlib/builtins.py:5962
3671
msgid "Branch in which to place the tag."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5964
3675
msgid "Replace existing tags."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5979
3679
msgid "No tag specified to delete."
3680
msgstr ""
3681
3682
#: bzrlib/builtins.py:5981
3683
#, python-format
3684
msgid "Deleted tag %s."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5995
3688
msgid "Please specify a tag name."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:6003
3692
#, python-format
3693
msgid "Tag %s already exists for that revision."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:6007
3697
#, python-format
3698
msgid "Created tag %s."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:6009
3702
#, python-format
3703
msgid "Updated tag %s."
3704
msgstr ""
3705
3706
#: bzrlib/builtins.py:6013
3707
msgid "List tags."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:6015
3711
msgid ""
3712
"This command shows a table of tag names and the revisions they reference."
3713
msgstr ""
3714
3715
#: bzrlib/builtins.py:6021
3716
msgid "Branch whose tags should be displayed."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:6023
3720
msgid "Sort tags by different criteria."
3721
msgstr ""
3722
3723
#: bzrlib/builtins.py:6023
3724
msgid "Sorting"
3725
msgstr ""
3726
3727
#: bzrlib/builtins.py:6092
3728
msgid "Reconfigure the type of a bzr directory."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:6094
3732
msgid "A target configuration must be specified."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:6096
3736
msgid ""
3737
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3738
"The order of preference is\n"
3739
"1. For a lightweight checkout, the current bound location.\n"
3740
"2. For branches that used to be checkouts, the previously-bound location.\n"
3741
"3. The push location.\n"
3742
"4. The parent location.\n"
3743
"If none of these is available, --bind-to must be specified."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6110
3747
msgid "Tree type"
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:6111
3751
msgid "The relation between branch and tree."
3752
msgstr ""
3753
3754
#: bzrlib/builtins.py:6113
3755
msgid "Reconfigure to be an unbound branch with no working tree."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:6114
3759
msgid "Reconfigure to be an unbound branch with a working tree."
3760
msgstr ""
3761
3762
#: bzrlib/builtins.py:6115
3763
msgid "Reconfigure to be a bound branch with a working tree."
3764
msgstr ""
3765
3766
#: bzrlib/builtins.py:6116
3767
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:6121
3771
msgid "Repository type"
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:6122
3775
msgid "Location fo the repository."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6124
3779
msgid ""
3780
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3781
msgstr ""
3782
3783
#: bzrlib/builtins.py:6126
3784
msgid "Reconfigure to use a shared repository."
3785
msgstr ""
3786
3787
#: bzrlib/builtins.py:6130
3788
msgid "Trees in Repository"
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:6131
3792
msgid "Whether new branches in the repository have trees."
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:6133
3796
msgid ""
3797
"Reconfigure repository to create working trees on branches by default."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:6135
3801
msgid ""
3802
"Reconfigure repository to not create working trees on branches by default."
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:6138
3806
msgid "Branch to bind checkout to."
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:6140
3810
msgid "Perform reconfiguration even if local changes will be lost."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:6143
3814
msgid "Reconfigure a branch to be stacked on another branch."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:6147
3818
msgid ""
3819
"Reconfigure a branch to be unstacked. This may require copying substantial "
3820
"data into it."
3821
msgstr ""
3822
3823
#: bzrlib/builtins.py:6157
3824
msgid "Can't use both --stacked-on and --unstacked"
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:6171
3828
msgid "No target configuration specified"
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:6206
3832
msgid "Set the branch of a checkout and update."
3833
msgstr ""
3834
3835
#: bzrlib/builtins.py:6208
3836
msgid ""
3837
"For lightweight checkouts, this changes the branch being referenced.\n"
3838
"For heavyweight checkouts, this checks that there are no local commits\n"
3839
"versus the current bound branch, then it makes the local branch a mirror\n"
3840
"of the new location and binds to it."
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:6213
3844
msgid ""
3845
"In both cases, the working tree is updated and uncommitted changes\n"
3846
"are merged. The user can commit or revert these as they desire."
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:6216
3850
msgid "Pending merges need to be committed or reverted before using switch."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:6218
3854
msgid ""
3855
"The path to the branch to switch to can be specified relative to the parent\n"
3856
"directory of the current branch. For example, if you are currently in a\n"
3857
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3858
"/path/to/newbranch."
3859
msgstr ""
3860
3861
#: bzrlib/builtins.py:6223
3862
msgid ""
3863
"Bound branches use the nickname of its master branch unless it is set\n"
3864
"locally, in which case switching will update the local nickname to be\n"
3865
"that of the master."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6231
3869
msgid "Switch even if local commits will be lost."
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:6234
3873
msgid "Create the target branch from this one before switching to it."
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:6248
3877
msgid "You must supply either a revision or a location"
3878
msgstr ""
3879
3880
#: bzrlib/builtins.py:6261
3881
msgid "cannot create branch without source branch"
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:6286
3885
msgid "Manage filtered views."
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:6288
3889
msgid ""
3890
"Views provide a mask over the tree so that users can focus on\n"
3891
"a subset of a tree when doing their work. After creating a view,\n"
3892
"commands that support a list of files - status, diff, commit, etc -\n"
3893
"effectively have that list of files implicitly given each time.\n"
3894
"An explicit list of files can still be given but those files\n"
3895
"must be within the current view."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:6295
3899
msgid ""
3900
"In most cases, a view has a short life-span: it is created to make\n"
3901
"a selected change and is deleted once that change is committed.\n"
3902
"At other times, you may wish to create one or more named views\n"
3903
"and switch between them."
3904
msgstr ""
3905
3906
#: bzrlib/builtins.py:6300
3907
msgid ""
3908
"To disable the current view without deleting it, you can switch to\n"
3909
"the pseudo view called ``off``. This can be useful when you need\n"
3910
"to see the whole tree for an operation or two (e.g. merge) but\n"
3911
"want to switch back to your view after that."
3912
msgstr ""
3913
3914
#: bzrlib/builtins.py:6305
3915
msgid ""
3916
":Examples:\n"
3917
" To define the current view::"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6308
3921
msgid " bzr view file1 dir1 ..."
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6310
3925
msgid " To list the current view::"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6312
3929
msgid " bzr view"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6314
3933
msgid " To delete the current view::"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6316
3937
msgid " bzr view --delete"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6318
3941
msgid " To disable the current view without deleting it::"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6320
3945
msgid " bzr view --switch off"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6322
3949
msgid " To define a named view and switch to it::"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6324
3953
msgid " bzr view --name view-name file1 dir1 ..."
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6326
3957
msgid " To list a named view::"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6328
3961
msgid " bzr view --name view-name"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6330
3965
msgid " To delete a named view::"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6332
3969
msgid " bzr view --name view-name --delete"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6334
3973
msgid " To switch to a named view::"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6336
3977
msgid " bzr view --switch view-name"
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6338
3981
msgid " To list all views defined::"
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6340
3985
msgid " bzr view --all"
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6342
3989
msgid " To delete all views::"
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6344
3993
msgid " bzr view --delete --all"
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6351
3997
msgid "Apply list or delete action to all views."
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6354
4001
msgid "Delete the view."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6357
4005
msgid "Name of the view to define, list or delete."
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:6361
4009
msgid "Name of the view to switch to."
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6380
4013
msgid "Both --delete and a file list specified"
4014
msgstr ""
4015
4016
#: bzrlib/builtins.py:6383
4017
msgid "Both --delete and --switch specified"
4018
msgstr ""
4019
4020
#: bzrlib/builtins.py:6386
4021
msgid "Deleted all views.\n"
4022
msgstr ""
4023
4024
#: bzrlib/builtins.py:6388
4025
msgid "No current view to delete"
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6391
4029
#, python-format
4030
msgid "Deleted '%s' view.\n"
4031
msgstr ""
4032
4033
#: bzrlib/builtins.py:6395
4034
msgid "Both --switch and a file list specified"
4035
msgstr ""
4036
4037
#: bzrlib/builtins.py:6398
4038
msgid "Both --switch and --all specified"
4039
msgstr ""
4040
4041
#: bzrlib/builtins.py:6401
4042
msgid "No current view to disable"
4043
msgstr ""
4044
4045
#: bzrlib/builtins.py:6403
4046
#, python-format
4047
msgid "Disabled '%s' view.\n"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4051
msgid "Using '{0}' view: {1}\n"
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6410
4055
msgid "Views defined:\n"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6419
4059
msgid "No views defined.\n"
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6426
4063
msgid "Cannot change the 'off' pseudo view"
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6434
4067
msgid "No current view.\n"
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:6437
4071
msgid "'{0}' view is: {1}\n"
4072
msgstr ""
4073
4074
#: bzrlib/builtins.py:6457
4075
msgid " <no hooks installed>\n"
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6461
4079
msgid "Remove a branch."
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6463
4083
msgid ""
4084
"This will remove the branch from the specified location but \n"
4085
"will keep any working tree or repository in place."
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6468
4089
msgid " Remove the branch at repo/trunk::"
4090
msgstr ""
4091
4092
#: bzrlib/builtins.py:6470
4093
msgid " bzr remove-branch repo/trunk"
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:6477
4097
msgid "Remove branch even if it is the active branch."
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6491
4101
msgid "Branch is active. Use --force to remove it."
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6495
4105
msgid "Plaintext diff output."
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6496
4109
msgid "Temporarily set aside some changes from the current tree."
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6498
4113
msgid ""
4114
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4115
"ie. out of the way, until a later time when you can bring them back from\n"
4116
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4117
"your working tree, and so they aren't propagated along with your branch nor\n"
4118
"will they survive its deletion."
4119
msgstr ""
4120
4121
#: bzrlib/builtins.py:6504
4122
msgid "If shelve --list is specified, previously-shelved changes are listed."
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6506
4126
msgid ""
4127
"Shelve is intended to help separate several sets of changes that have\n"
4128
"been inappropriately mingled. If you just want to get rid of all changes\n"
4129
"and you don't need to restore them later, use revert. If you want to\n"
4130
"shelve all text changes at once, use shelve --all."
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6511
4134
msgid ""
4135
"If filenames are specified, only the changes to those files will be\n"
4136
"shelved. Other files will be left untouched."
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:6514
4140
msgid ""
4141
"If a revision is specified, changes since that revision will be shelved."
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6516
4145
msgid ""
4146
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4147
"restore the most recently shelved changes."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6519
4151
msgid ""
4152
"For complicated changes, it is possible to edit the changes in a separate\n"
4153
"editor program to decide what the file remaining in the working copy\n"
4154
"should look like. To do this, add the configuration option"
4155
msgstr ""
4156
4157
#: bzrlib/builtins.py:6523
4158
msgid " change_editor = PROGRAM @new_path @old_path"
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:6525
4162
msgid ""
4163
"where @new_path is replaced with the path of the new version of the \n"
4164
"file and @old_path is replaced with the path of the old version of \n"
4165
"the file. The PROGRAM should save the new file with the desired \n"
4166
"contents of the file in the working tree.\n"
4167
" "
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6537
4171
msgid "Shelve all changes."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6539
4175
msgid "Method to use for writing diffs."
4176
msgstr ""
4177
4178
#: bzrlib/builtins.py:6539
4179
msgid "writer"
4180
msgstr ""
4181
4182
#: bzrlib/builtins.py:6543
4183
msgid "List shelved changes."
4184
msgstr ""
4185
4186
#: bzrlib/builtins.py:6545
4187
msgid "Destroy removed changes instead of shelving them."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6574
4191
msgid "No shelved changes."
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6585
4195
msgid "Restore shelved changes."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6587
4199
msgid ""
4200
"By default, the most recently shelved changes are restored. However if you\n"
4201
"specify a shelf by id those changes will be restored instead. This works\n"
4202
"best when the changes don't depend on each other."
4203
msgstr ""
4204
4205
#: bzrlib/builtins.py:6596
4206
msgid "The action to perform."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4210
msgid "action"
4211
msgstr ""
4212
4213
#: bzrlib/builtins.py:6598
4214
msgid "Apply changes and remove from the shelf."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:6599
4218
msgid "Show changes, but do not apply or remove them."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6600
4222
msgid ""
4223
"Instead of unshelving the changes, show the diff that would result from "
4224
"unshelving."
4225
msgstr ""
4226
4227
#: bzrlib/builtins.py:6602
4228
msgid "Delete changes without applying them."
4229
msgstr ""
4230
4231
#: bzrlib/builtins.py:6603
4232
msgid "Apply changes but don't delete them."
4233
msgstr ""
4234
4235
#: bzrlib/builtins.py:6618
4236
msgid "Remove unwanted files from working tree."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6620
4240
msgid ""
4241
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4242
"files are never deleted."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6623
4246
msgid ""
4247
"Another class is 'detritus', which includes files emitted by bzr during\n"
4248
"normal operations and selftests. (The value of these files decreases with\n"
4249
"time.)"
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6627
4253
msgid ""
4254
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4255
"flags are respected, and may be combined."
4256
msgstr ""
4257
4258
#: bzrlib/builtins.py:6630
4259
msgid "To check what clean-tree will do, use --dry-run."
4260
msgstr ""
4261
4262
#: bzrlib/builtins.py:6633
4263
msgid "Delete all ignored files."
4264
msgstr ""
4265
4266
#: bzrlib/builtins.py:6634
4267
msgid ""
4268
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4269
msgstr ""
4270
4271
#: bzrlib/builtins.py:6637
4272
msgid "Delete files unknown to bzr (default)."
4273
msgstr ""
4274
4275
#: bzrlib/builtins.py:6638
4276
msgid "Show files to delete instead of deleting them."
4277
msgstr ""
4278
4279
#: bzrlib/builtins.py:6640
4280
msgid "Do not prompt before deleting."
4281
msgstr ""
4282
4283
#: bzrlib/bundle/__init__.py:59
4284
msgid "A directory cannot be a bundle"
4285
msgstr ""
4286
4287
#: bzrlib/bundle/apply_bundle.py:40
4288
msgid "Install revisions"
4289
msgstr ""
4290
4291
#: bzrlib/bundle/commands.py:64
4292
msgid "--verbose requires a merge directive"
4293
msgstr ""
4294
4295
#: bzrlib/bundle/commands.py:67
4296
msgid "Bundle format not supported"
4297
msgstr ""
4298
4299
#: bzrlib/bundle/commands.py:77
4300
msgid "Records\n"
4301
msgstr ""
4302
4303
#: bzrlib/bundle/commands.py:81
4304
msgid "{0}: {1} ({2} multiparent)\n"
4305
msgstr ""
4306
4307
#: bzrlib/bundle/commands.py:83
4308
#, python-format
4309
msgid "unique files: %d\n"
4310
msgstr ""
4311
4312
#: bzrlib/bundle/commands.py:92
4313
msgid "Revisions\n"
4314
msgstr ""
4315
4316
#: bzrlib/bundle/commands.py:93
4317
#, python-format
4318
msgid "nicks: %s\n"
4319
msgstr ""
4320
4321
#: bzrlib/bundle/commands.py:95
4322
#, python-format
4323
msgid ""
4324
"committers: \n"
4325
"%s\n"
4326
msgstr ""
4327
4328
#: bzrlib/bundle/commands.py:103
4329
msgid "Decoded contents\n"
4330
msgstr ""
4331
4332
#: bzrlib/bundle/serializer/v4.py:327
4333
#, python-format
4334
msgid "Bundling %d revision."
4335
msgid_plural "Bundling %d revisions."
4336
msgstr[0] ""
4337
msgstr[1] ""
4338
4339
#: bzrlib/bzrdir.py:487
4340
msgid ""
4341
"making backup of {0}\n"
4342
" to {1}"
4343
msgstr ""
4344
4345
#: bzrlib/bzrdir.py:510
4346
msgid "renamed {0} to {1}"
4347
msgstr ""
4348
4349
#: bzrlib/bzrdir.py:1639
4350
#, python-format
4351
msgid ""
4352
"Source repository format does not support stacking, using format:\n"
4353
" %s"
4354
msgstr ""
4355
4356
#: bzrlib/bzrdir.py:1659
4357
#, python-format
4358
msgid ""
4359
"Source branch format does not support stacking, using format:\n"
4360
" %s"
4361
msgstr ""
4362
4363
#: bzrlib/bzrdir.py:1805
4364
msgid "starting repository conversion"
4365
msgstr ""
4366
4367
#: bzrlib/bzrdir.py:2026
4368
msgid "Using default stacking branch {0} at {1}"
4369
msgstr ""
4370
4371
#: bzrlib/check.py:108
4372
msgid "check"
4373
msgstr ""
4374
4375
#: bzrlib/check.py:110
4376
msgid "checking revisions"
4377
msgstr ""
4378
4379
#: bzrlib/check.py:112
4380
msgid "checking commit contents"
4381
msgstr ""
4382
4383
#: bzrlib/check.py:114
4384
msgid "checking file graphs"
4385
msgstr ""
4386
4387
#: bzrlib/check.py:118
4388
msgid "checking branches and trees"
4389
msgstr ""
4390
4391
#: bzrlib/check.py:205
4392
msgid "checked repository {0} format {1}"
4393
msgstr ""
4394
4395
#: bzrlib/check.py:208
4396
#, python-format
4397
msgid "%6d revisions"
4398
msgstr ""
4399
4400
#: bzrlib/check.py:209
4401
#, python-format
4402
msgid "%6d file-ids"
4403
msgstr ""
4404
4405
#: bzrlib/check.py:211
4406
#, python-format
4407
msgid "%6d unreferenced text versions"
4408
msgstr ""
4409
4410
#: bzrlib/check.py:215
4411
msgid "unreferenced version: {{{0}}} in {1}"
4412
msgstr ""
4413
4414
#: bzrlib/check.py:218
4415
#, python-format
4416
msgid "%6d revisions are missing inventory_sha1"
4417
msgstr ""
4418
4419
#: bzrlib/check.py:221
4420
#, python-format
4421
msgid "%6d revisions are mentioned but not present"
4422
msgstr ""
4423
4424
#: bzrlib/check.py:224
4425
#, python-format
4426
msgid "%6d ghost revisions"
4427
msgstr ""
4428
4429
#: bzrlib/check.py:229
4430
#, python-format
4431
msgid "%6d revisions missing parents in ancestry"
4432
msgstr ""
4433
4434
#: bzrlib/check.py:233
4435
#, python-format
4436
msgid " %s should be in the ancestry for:"
4437
msgstr ""
4438
4439
#: bzrlib/check.py:237
4440
#, python-format
4441
msgid "%6d inconsistent parents"
4442
msgstr ""
4443
4444
#: bzrlib/check.py:241
4445
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4446
msgstr ""
4447
4448
#: bzrlib/check.py:247
4449
#, python-format
4450
msgid "%6d revisions have incorrect parents in the revision index"
4451
msgstr ""
4452
4453
#: bzrlib/check.py:253
4454
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4455
msgstr ""
4456
4457
#: bzrlib/check.py:267
4458
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4459
msgstr ""
4460
4461
#: bzrlib/check.py:296
4462
msgid ""
4463
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4464
"{{{4}}}"
4465
msgstr ""
4466
4467
#: bzrlib/check.py:354
4468
#, python-format
4469
msgid "Checking branch at '%s'."
4470
msgstr ""
4471
4472
#: bzrlib/check.py:374
4473
#, python-format
4474
msgid "Checking working tree at '%s'."
4475
msgstr ""
4476
4477
#: bzrlib/check.py:427 bzrlib/check.py:441
4478
msgid "No branch found at specified location."
4479
msgstr ""
4480
4481
#: bzrlib/check.py:429 bzrlib/check.py:439
4482
msgid "No working tree found at specified location."
4483
msgstr ""
4484
4485
#: bzrlib/check.py:432
4486
#, python-format
4487
msgid "Checking repository at '%s'."
4488
msgstr ""
4489
4490
#: bzrlib/check.py:443
4491
msgid "No repository found at specified location."
4492
msgstr ""
4493
4494
#: bzrlib/clean_tree.py:63
4495
msgid "Nothing to delete."
4496
msgstr ""
4497
4498
#: bzrlib/clean_tree.py:68
4499
msgid "Are you sure you wish to delete these"
4500
msgstr ""
4501
4502
#: bzrlib/clean_tree.py:70
4503
msgid "Canceled"
4504
msgstr ""
4505
4506
#: bzrlib/clean_tree.py:107
4507
#, python-format
4508
msgid "unable to remove %s"
4509
msgstr ""
4510
4511
#: bzrlib/clean_tree.py:111
4512
msgid "deleting paths:"
4513
msgstr ""
4514
4515
#: bzrlib/clean_tree.py:125
4516
msgid "unable to remove \"{0}\": {1}."
4517
msgstr ""
4518
4519
#: bzrlib/clean_tree.py:130
4520
msgid "No files deleted."
4521
msgstr ""
4522
4523
#: bzrlib/cmd_version_info.py:47
4524
msgid "No known version info format {0}. Supported types are: {1}"
4525
msgstr ""
4526
4527
#: bzrlib/cmd_version_info.py:52
4528
msgid "Version info in Custom template-based format."
4529
msgstr ""
4530
4531
#: bzrlib/cmd_version_info.py:52
4532
msgid "Version info in Python format."
4533
msgstr ""
4534
4535
#: bzrlib/cmd_version_info.py:52
4536
msgid "Version info in RIO (simple text) format (default)."
4537
msgstr ""
4538
4539
#: bzrlib/cmd_version_info.py:53
4540
msgid "Show version information about this tree."
4541
msgstr ""
4542
4543
#: bzrlib/cmd_version_info.py:55
4544
msgid ""
4545
"You can use this command to add information about version into\n"
4546
"source code of an application. The output can be in one of the\n"
4547
"supported formats or in a custom format based on a template."
4548
msgstr ""
4549
4550
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4551
#: en/help_topics/configuration.txt:722
4552
msgid "For example::"
4553
msgstr ""
4554
4555
#: bzrlib/cmd_version_info.py:61
4556
msgid ""
4557
" bzr version-info --custom \\\n"
4558
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4559
msgstr ""
4560
4561
#: bzrlib/cmd_version_info.py:64
4562
msgid ""
4563
"will produce a C header file with formatted string containing the\n"
4564
"current revision number. Other supported variables in templates are:"
4565
msgstr ""
4566
4567
#: bzrlib/cmd_version_info.py:67
4568
msgid ""
4569
" * {date} - date of the last revision\n"
4570
" * {build_date} - current date\n"
4571
" * {revno} - revision number\n"
4572
" * {revision_id} - revision id\n"
4573
" * {branch_nick} - branch nickname\n"
4574
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4575
" otherwise 1"
4576
msgstr ""
4577
4578
#: bzrlib/cmd_version_info.py:77
4579
msgid "Select the output format."
4580
msgstr ""
4581
4582
#: bzrlib/cmd_version_info.py:81
4583
msgid "Include all possible information."
4584
msgstr ""
4585
4586
#: bzrlib/cmd_version_info.py:82
4587
msgid "Check if tree is clean."
4588
msgstr ""
4589
4590
#: bzrlib/cmd_version_info.py:84
4591
msgid "Include the revision-history."
4592
msgstr ""
4593
4594
#: bzrlib/cmd_version_info.py:86
4595
msgid "Include the last revision for each file."
4596
msgstr ""
4597
4598
#: bzrlib/cmd_version_info.py:87
4599
msgid "Template for the output."
4600
msgstr ""
4601
4602
#: bzrlib/cmd_version_info.py:101
4603
msgid "bzr version-info --revision takes exactly one revision specifier"
4604
msgstr ""
4605
4606
#: bzrlib/commands.py:229
4607
#, python-format
4608
msgid "unknown command \"%s\""
4609
msgstr ""
4610
4611
#: bzrlib/commands.py:476
4612
msgid "No help for this command."
4613
msgstr ""
4614
4615
#: bzrlib/commands.py:489
4616
#, python-format
4617
msgid ":Purpose: %s\n"
4618
msgstr ""
4619
4620
#: bzrlib/commands.py:491
4621
#, python-format
4622
msgid ""
4623
":Usage:\n"
4624
"%s\n"
4625
msgstr ""
4626
4627
#: bzrlib/commands.py:493
4628
#, python-format
4629
msgid ":Usage: %s\n"
4630
msgstr ""
4631
4632
#: bzrlib/commands.py:512
4633
#, python-format
4634
msgid ":Options:%s"
4635
msgstr ""
4636
4637
#: bzrlib/commands.py:523
4638
#, python-format
4639
msgid ""
4640
":Description:\n"
4641
" %s\n"
4642
"\n"
4643
msgstr ""
4644
4645
#: bzrlib/commands.py:533
4646
#, python-format
4647
msgid ""
4648
"See bzr help %s for more details and examples.\n"
4649
"\n"
4650
msgstr ""
4651
4652
#: bzrlib/commands.py:538
4653
msgid ":Aliases: "
4654
msgstr ""
4655
4656
#: bzrlib/commands.py:542
4657
#, python-format
4658
msgid ":From: plugin \"%s\"\n"
4659
msgstr ""
4660
4661
#: bzrlib/commands.py:554
4662
msgid ":doc:`{0} <{1}-help>`"
4663
msgstr ""
4664
4665
#: bzrlib/commands.py:558
4666
#, python-format
4667
msgid ":See also: %s"
4668
msgstr ""
4669
4670
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4671
msgid "Only ASCII permitted in option names"
4672
msgstr ""
4673
4674
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4675
msgid "command {0!r} needs one or more {1}"
4676
msgstr ""
4677
4678
#: bzrlib/commands.py:868
4679
msgid "command {0!r} requires argument {1}"
4680
msgstr ""
4681
4682
#: bzrlib/commands.py:875
4683
msgid "extra argument to command {0}: {1}"
4684
msgstr ""
4685
4686
#: bzrlib/commands.py:972
4687
#, python-format
4688
msgid "Profile data written to \"%s\"."
4689
msgstr ""
4690
4691
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4692
msgid "added"
4693
msgstr ""
4694
4695
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4696
msgid "modified"
4697
msgstr ""
4698
4699
#: bzrlib/commit.py:131
4700
#, python-format
4701
msgid "Committing%s"
4702
msgstr ""
4703
4704
#: bzrlib/commit.py:134
4705
#, python-format
4706
msgid "Committed revision %d."
4707
msgstr ""
4708
4709
#: bzrlib/commit.py:143
4710
#, python-format
4711
msgid "deleted %s"
4712
msgstr ""
4713
4714
#: bzrlib/commit.py:146
4715
#, python-format
4716
msgid "missing %s"
4717
msgstr ""
4718
4719
#: bzrlib/commit.py:511
4720
msgid ""
4721
"Conflicting tags in bound branch:\n"
4722
"{0}"
4723
msgstr ""
4724
4725
#: bzrlib/commit.py:742
4726
msgid "renamed"
4727
msgstr ""
4728
4729
#: bzrlib/commit.py:976
4730
msgid "unchanged"
4731
msgstr ""
4732
4733
#: bzrlib/commit.py:998
4734
msgid "{0} [{1}] - Stage"
4735
msgstr ""
4736
4737
#: bzrlib/commit.py:1001
4738
#, python-format
4739
msgid "%s - Stage"
4740
msgstr ""
4741
4742
#: bzrlib/commit_signature_commands.py:34
4743
msgid "Sign all commits by a given committer."
4744
msgstr ""
4745
4746
#: bzrlib/commit_signature_commands.py:36
4747
msgid ""
4748
"If location is not specified the local tree is used.\n"
4749
"If committer is not specified the default committer is used."
4750
msgstr ""
4751
4752
#: bzrlib/commit_signature_commands.py:39
4753
msgid "This does not sign commits that already have signatures."
4754
msgstr ""
4755
4756
#: bzrlib/commit_signature_commands.py:47
4757
msgid ""
4758
"Don't actually sign anything, just print the revisions that would be signed."
4759
msgstr ""
4760
4761
#: bzrlib/commit_signature_commands.py:98
4762
#, python-format
4763
msgid "Signed %d revision.\n"
4764
msgid_plural "Signed %d revisions.\n"
4765
msgstr[0] ""
4766
msgstr[1] ""
4767
4768
#: bzrlib/commit_signature_commands.py:103
4769
msgid "Verify all commit signatures."
4770
msgstr ""
4771
4772
#: bzrlib/commit_signature_commands.py:105
4773
msgid ""
4774
"Verifies that all commits in the branch are signed by known GnuPG keys."
4775
msgstr ""
4776
4777
#: bzrlib/commit_signature_commands.py:110
4778
msgid ""
4779
"Comma separated list of GPG key patterns which are acceptable for "
4780
"verification."
4781
msgstr ""
4782
4783
#: bzrlib/commit_signature_commands.py:148
4784
msgid "Cannot verify a range of non-revision-history revisions"
4785
msgstr ""
4786
4787
#: bzrlib/commit_signature_commands.py:166
4788
msgid "All commits signed with verifiable keys"
4789
msgstr ""
4790
4791
#: bzrlib/config.py:436
4792
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4793
msgstr ""
4794
4795
#: bzrlib/config.py:2452
4796
msgid "{0} is not an SI unit."
4797
msgstr ""
4798
4799
#: bzrlib/config.py:2971
4800
msgid ""
4801
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4802
"will be saved."
4803
msgstr ""
4804
4805
#: bzrlib/config.py:3116
4806
#, python-format
4807
msgid "Invalid '%s', should be of the form 'name=value'"
4808
msgstr ""
4809
4810
#: bzrlib/config.py:4018
4811
msgid "Display, set or remove a configuration option."
4812
msgstr ""
4813
4814
#: bzrlib/config.py:4020
4815
msgid "Display the active value for a given option."
4816
msgstr ""
4817
4818
#: bzrlib/config.py:4022
4819
msgid ""
4820
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4821
"matching options are displayed mentioning their scope. The active value\n"
4822
"that bzr will take into account is the first one displayed for each option."
4823
msgstr ""
4824
4825
#: bzrlib/config.py:4026
4826
msgid "If no NAME is given, --all .* is implied."
4827
msgstr ""
4828
4829
#: bzrlib/config.py:4028
4830
msgid ""
4831
"Setting a value is achieved by using name=value without spaces. The value\n"
4832
"is set in the most relevant scope and can be checked by displaying the\n"
4833
"option again."
4834
msgstr ""
4835
4836
#: bzrlib/config.py:4040
4837
msgid "Reduce the scope to the specified configuration file."
4838
msgstr ""
4839
4840
#: bzrlib/config.py:4044
4841
msgid "Display all the defined values for the matching options."
4842
msgstr ""
4843
4844
#: bzrlib/config.py:4046
4845
msgid "Remove the option from the configuration file."
4846
msgstr ""
4847
4848
#: bzrlib/conflicts.py:50
4849
msgid "List files with conflicts."
4850
msgstr ""
4851
4852
#: bzrlib/conflicts.py:57
4853
msgid ""
4854
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4855
"is supplied, the pathnames of files with text conflicts are listed,\n"
4856
"instead. (This is useful for editing all files with text conflicts.)"
4857
msgstr ""
4858
4859
#: bzrlib/conflicts.py:61
4860
msgid "Use bzr resolve when you have fixed a problem."
4861
msgstr ""
4862
4863
#: bzrlib/conflicts.py:66
4864
msgid "List paths of files with text conflicts."
4865
msgstr ""
4866
4867
#: bzrlib/conflicts.py:85
4868
msgid "Marks the conflict as resolved."
4869
msgstr ""
4870
4871
#: bzrlib/conflicts.py:88
4872
msgid "Resolve the conflict preserving the version in the working tree."
4873
msgstr ""
4874
4875
#: bzrlib/conflicts.py:91
4876
msgid "Resolve the conflict taking the merged version into account."
4877
msgstr ""
4878
4879
#: bzrlib/conflicts.py:98
4880
msgid "How to resolve the conflict."
4881
msgstr ""
4882
4883
#: bzrlib/conflicts.py:104
4884
msgid "Mark a conflict as resolved."
4885
msgstr ""
4886
4887
#: bzrlib/conflicts.py:111
4888
msgid ""
4889
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4890
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4891
"as\n"
4892
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4893
msgstr ""
4894
4895
#: bzrlib/conflicts.py:119
4896
msgid "Resolve all conflicts in this tree."
4897
msgstr ""
4898
4899
#: bzrlib/conflicts.py:126
4900
msgid "If --all is specified, no FILE may be provided"
4901
msgstr ""
4902
4903
#: bzrlib/conflicts.py:151
4904
#, python-format
4905
msgid "%d conflict auto-resolved."
4906
msgid_plural "%d conflicts auto-resolved."
4907
msgstr[0] ""
4908
msgstr[1] ""
4909
4910
#: bzrlib/conflicts.py:154
4911
msgid "Remaining conflicts:"
4912
msgstr ""
4913
4914
#: bzrlib/conflicts.py:159
4915
msgid "All conflicts resolved."
4916
msgstr ""
4917
4918
#: bzrlib/conflicts.py:168
4919
msgid "{0} conflict resolved, {1} remaining"
4920
msgid_plural "{0} conflicts resolved, {1} remaining"
4921
msgstr[0] ""
4922
msgstr[1] ""
4923
4924
#: bzrlib/controldir.py:712
4925
msgid "{0} is{1} redirected to {2}"
4926
msgstr ""
4927
4928
#: bzrlib/diff.py:399
4929
#, python-format
4930
msgid "*** Ignoring files outside view. View is %s"
4931
msgstr ""
4932
4933
#: bzrlib/errors.py:157
4934
msgid "The tree builder is already building a tree."
4935
msgstr ""
4936
4937
#: bzrlib/errors.py:178
4938
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4939
msgstr ""
4940
4941
#: bzrlib/errors.py:197
4942
msgid ""
4943
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4944
"versions \"%(minimum)s\" to \"%(current)s\"."
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:209
4948
msgid "The transport '%(transport)s' is only accessible within this process."
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:227
4952
msgid "Invalid revision number %(revno)s"
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:236
4956
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:247
4960
msgid "Reserved revision-id {%(revision_id)s}"
4961
msgstr ""
4962
4963
#: bzrlib/errors.py:261
4964
msgid "There is no public branch set for \"%(branch_url)s\"."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:271
4968
msgid ""
4969
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4970
"obtain a list of topics."
4971
msgstr ""
4972
4973
#: bzrlib/errors.py:280
4974
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4975
msgstr ""
4976
4977
#: bzrlib/errors.py:290
4978
msgid ""
4979
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:299
4983
msgid "The branch '%(branch)s' is not stacked."
4984
msgstr ""
4985
4986
#: bzrlib/errors.py:313
4987
msgid "No WorkingTree exists for \"%(base)s\"."
4988
msgstr ""
4989
4990
#: bzrlib/errors.py:322
4991
msgid "Not currently building a tree."
4992
msgstr ""
4993
4994
#: bzrlib/errors.py:327
4995
msgid "%(url)s is not a local path."
4996
msgstr ""
4997
4998
#: bzrlib/errors.py:355
4999
msgid "%(not_locked)r is not write locked but needs to be."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:363
5003
msgid "Error in command line options"
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:368
5007
msgid "%(value)s is not an index of type %(_type)s."
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:378
5011
msgid "Error in data for index %(value)s."
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:387
5015
msgid "The key '%(key)s' is already in index '%(index)s'."
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:397
5019
msgid "The key '%(key)s' is not a valid key."
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:406
5023
msgid "Could not parse options for index %(value)s."
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:415
5027
msgid "The value '%(value)s' is not a valid value."
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:424
5031
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:443
5035
msgid "Generic path error: %(path)r%(extra)s)"
5036
msgstr ""
5037
5038
#: bzrlib/errors.py:456
5039
msgid "No such file: %(path)r%(extra)s"
5040
msgstr ""
5041
5042
#: bzrlib/errors.py:461
5043
msgid "File exists: %(path)r%(extra)s"
5044
msgstr ""
5045
5046
#: bzrlib/errors.py:467
5047
msgid ""
5048
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5049
"after to tell bzr about a rename that has already happened)%(extra)s"
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:483
5053
msgid "\"%(path)s\" is not a directory %(extra)s"
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:488
5057
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:493
5061
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:498
5065
msgid "Hard-linking \"%(path)s\" is not supported"
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:513
5069
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:518
5073
msgid "Permission denied: \"%(path)s\"%(extra)s"
5074
msgstr ""
5075
5076
#: bzrlib/errors.py:523
5077
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5078
msgstr ""
5079
5080
#: bzrlib/errors.py:528
5081
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5082
msgstr ""
5083
5084
#: bzrlib/errors.py:539
5085
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5086
msgstr ""
5087
5088
#: bzrlib/errors.py:561
5089
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5090
msgstr ""
5091
5092
#: bzrlib/errors.py:571
5093
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5094
msgstr ""
5095
5096
#: bzrlib/errors.py:579
5097
msgid ""
5098
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5099
"upgrade the branch to permit branch stacking."
5100
msgstr ""
5101
5102
#: bzrlib/errors.py:590
5103
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5104
msgstr ""
5105
5106
#: bzrlib/errors.py:600
5107
msgid ""
5108
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5109
"need to upgrade the repository to permit branch stacking."
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:611
5113
msgid "Error reading from %(path)r."
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:630
5117
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:646
5121
msgid "Path \"%(path)s\" is not unicode normalized"
5122
msgstr ""
5123
5124
#: bzrlib/errors.py:654
5125
msgid "Not a branch: \"%(path)s\"%(detail)s."
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:696
5129
msgid "No submit branch available for branch \"%(path)s\""
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:705
5133
msgid "A control directory already exists: \"%(path)s\"."
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:710
5137
msgid "Already a branch: \"%(path)s\"."
5138
msgstr ""
5139
5140
#: bzrlib/errors.py:715
5141
msgid "Invalid branch name: %(name)s"
5142
msgstr ""
5143
5144
#: bzrlib/errors.py:724
5145
msgid "Parent branch already exists: \"%(path)s\"."
5146
msgstr ""
5147
5148
#: bzrlib/errors.py:730
5149
msgid ""
5150
"Directory contains a branch, but no working tree (use bzr checkout if you "
5151
"wish to build a working tree): \"%(path)s\""
5152
msgstr ""
5153
5154
#: bzrlib/errors.py:735
5155
msgid ""
5156
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:745
5160
msgid ""
5161
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5162
msgstr ""
5163
5164
#: bzrlib/errors.py:755
5165
msgid "No repository present: \"%(path)s\""
5166
msgstr ""
5167
5168
#: bzrlib/errors.py:762
5169
msgid ""
5170
"Unsupported branch format: %(format)s\n"
5171
"Please run 'bzr upgrade'"
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:768
5175
msgid "Unknown %(kind)s format: %(format)r"
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:777
5179
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:787
5183
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:802
5187
msgid ""
5188
"%(target)s\n"
5189
"is not compatible with\n"
5190
"%(source)s\n"
5191
"%(details)s"
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:818
5195
msgid "Revision is not compatible with %(repo_format)s"
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:828
5199
msgid "%(context_info)s%(path)s is already versioned."
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:849
5203
msgid "%(context_info)s%(path)s is not versioned."
5204
msgstr ""
5205
5206
#: bzrlib/errors.py:870
5207
msgid "Path(s) are not versioned: %(paths_as_string)s"
5208
msgstr ""
5209
5210
#: bzrlib/errors.py:881
5211
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5212
msgstr ""
5213
5214
#: bzrlib/errors.py:900
5215
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5216
msgstr ""
5217
5218
#: bzrlib/errors.py:908
5219
msgid ""
5220
"Filename %(filename)r is not valid in your current filesystem encoding "
5221
"%(fs_encoding)s"
5222
msgstr ""
5223
5224
#: bzrlib/errors.py:919
5225
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5226
msgstr ""
5227
5228
#: bzrlib/errors.py:937
5229
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5230
msgstr ""
5231
5232
#: bzrlib/errors.py:976
5233
msgid "Cannot lock %(lock)s: %(why)s"
5234
msgstr ""
5235
5236
#: bzrlib/errors.py:986
5237
msgid ""
5238
"A transaction related operation was attempted after the transaction finished."
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:1013
5242
msgid "Cannot lock: transport is read only: %(transport)s"
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:1021
5246
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:1032
5250
msgid ""
5251
"Lock was broken while still open: %(lock)s - check storage consistency!"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1043
5255
msgid ""
5256
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5257
"%(holder)r, wanted to break %(target)r"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:1055
5261
msgid ""
5262
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5263
"Use 'bzr break-lock' to clear it"
5264
msgstr ""
5265
5266
#: bzrlib/errors.py:1068
5267
msgid "Lock not held: %(lock)s"
5268
msgstr ""
5269
5270
#: bzrlib/errors.py:1097
5271
msgid "No changes to commit"
5272
msgstr ""
5273
5274
#: bzrlib/errors.py:1102
5275
msgid ""
5276
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1112
5280
msgid ""
5281
"Excluding paths during commit is not supported by repository at "
5282
"%(repository)r."
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:1121
5286
msgid ""
5287
"The specified commit message contains characters unsupported by the current "
5288
"encoding."
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:1127
5292
msgid "Upgrade URL cannot work with readonly URLs."
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:1132
5296
msgid "The branch format %(format)s is already at the most recent format."
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:1155
5300
msgid "Option --change does not accept revision ranges"
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:1160
5304
msgid "No namespace registered for string: %(spec)r"
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1179
5308
msgid ""
5309
"Requested revision: '%(spec)s' does not exist in branch: "
5310
"%(branch_url)s%(extra)s"
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:1193
5314
msgid ""
5315
"Operation denied because it would change the main history, which is not "
5316
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:1204
5320
msgid ""
5321
"These branches have diverged. Use the missing command to see how.\n"
5322
"Use the merge command to reconcile them."
5323
msgstr ""
5324
5325
#: bzrlib/errors.py:1224
5326
msgid ""
5327
"Branches have no common ancestor, and no merge base revision was specified."
5328
msgstr ""
5329
5330
#: bzrlib/errors.py:1230
5331
msgid ""
5332
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:1236
5336
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:1245
5340
msgid ""
5341
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1254
5345
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5346
msgstr ""
5347
5348
#: bzrlib/errors.py:1263
5349
msgid "Branch %(branch)s has no commits."
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:1281
5353
msgid ""
5354
"Bound branch %(branch)s is out of date with master branch "
5355
"%(master)s.%(extra_help)s"
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1293
5359
msgid ""
5360
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5361
"bound to %(remote)s."
5362
msgstr ""
5363
5364
#: bzrlib/errors.py:1305
5365
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:1314
5369
msgid ""
5370
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5371
"%(error)s"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1326
5375
msgid "Error in processing weave: %(msg)s"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1335
5379
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1346
5383
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5384
msgstr ""
5385
5386
#: bzrlib/errors.py:1356
5387
msgid "Weave invariant violated: %(what)s"
5388
msgstr ""
5389
5390
#: bzrlib/errors.py:1365
5391
msgid "Parents are mismatched between two revisions. %(msg)s"
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1387
5395
msgid ""
5396
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5397
"%(weave_b)s"
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1399
5401
msgid "Versioned file error"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:1404
5405
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:1414
5409
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1424
5413
msgid "Text did not match its checksum: %(msg)s"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1550
5417
msgid "Export format %(format)r not supported"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:1559
5421
msgid "Transport error: %(msg)s %(orig_error)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:1585
5425
msgid "Generic bzr smart protocol error: %(details)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1593
5429
msgid "Received bad protocol version marker: %(marker)r"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1625
5433
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1630
5437
msgid "Connection error: %(msg)s %(orig_error)s"
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1635
5441
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1656
5445
msgid "Connection closed: %(msg)s %(orig_error)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1661
5449
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1666
5453
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:1676
5457
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:1691
5461
msgid "Certificate error: %(error)s"
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:1699
5465
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:1713
5469
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:1721
5473
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:1730
5477
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:1744
5481
msgid "Too many redirections"
5482
msgstr ""
5483
5484
#: bzrlib/errors.py:1749
5485
msgid "Working tree has conflicts."
5486
msgstr ""
5487
5488
#: bzrlib/errors.py:1753
5489
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1762
5493
msgid ""
5494
"Error(s) parsing config file %(filename)s:\n"
5495
"%(errors)s"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1772
5499
msgid ""
5500
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5501
"See ``bzr help %(name)s``"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1782
5505
msgid "%(username)r does not seem to contain a reasonable email address"
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:1791
5509
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:1799
5513
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1807
5517
msgid "Unable to import library \"%(library)s\": %(error)s"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1815
5521
msgid "python-gpgme is not installed, it is needed to verify signatures"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1823
5525
msgid ""
5526
"The working tree for %(basedir)s has changed since the last commit, but "
5527
"weave merge requires that it be unchanged"
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:1833
5531
msgid ""
5532
"Can't reprocess and show base, because reprocessing obscures the "
5533
"relationship of conflicting lines to the base"
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1839
5537
msgid "Cycle in graph %(graph)r"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1867
5541
msgid "File %(filename)s is not conflicted."
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1889
5545
msgid "No bundle was found in \"%(filename)s\"."
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1898
5549
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1908
5553
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1921
5557
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:1931
5561
msgid "Key %(key)s is already present in map"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:1936
5565
msgid "The prefix %(prefix)s is in the help search path twice."
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:1946
5569
msgid ""
5570
"No final name for trans_id %(trans_id)r\n"
5571
"file-id: %(file_id)r\n"
5572
"root trans-id: %(root_trans_id)r\n"
5573
msgstr ""
5574
5575
#: bzrlib/errors.py:1978
5576
msgid "Attempt to reuse a transform that has already been applied."
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:1983
5580
msgid "Moving the root directory is not supported at this time"
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:1988
5584
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5585
msgstr ""
5586
5587
#: bzrlib/errors.py:1999
5588
msgid ""
5589
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:2035
5593
msgid ""
5594
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:2065
5598
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5599
msgstr ""
5600
5601
#: bzrlib/errors.py:2073
5602
msgid "Nothing to merge."
5603
msgstr ""
5604
5605
#: bzrlib/errors.py:2078
5606
msgid "Format %(format)s cannot be initialised by this version of bzr."
5607
msgstr ""
5608
5609
#: bzrlib/errors.py:2087
5610
msgid ""
5611
"Cannot convert from format %(from_format)s to format %(format)s. "
5612
"%(problem)s"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2099
5616
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:2107
5620
msgid "%(exe_name)s could not be found on this machine"
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:2115
5624
msgid "Diff is not installed on this machine: %(msg)s"
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:2123
5628
msgid "Diff3 is not installed on this machine."
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:2129
5632
msgid "The content being inserted is already present."
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:2134
5636
msgid ""
5637
"This tree contains left-over files from a failed operation.\n"
5638
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5639
"to\n"
5640
" keep, and delete it when you are done."
5641
msgstr ""
5642
5643
#: bzrlib/errors.py:2145
5644
msgid ""
5645
"This tree contains left-over files from a failed operation.\n"
5646
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5647
" wish to keep, and delete it when you are done."
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:2155
5651
msgid ""
5652
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5653
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5654
"to\n"
5655
" keep, and delete it when you are done."
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:2166
5659
msgid ""
5660
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5661
"examine %(pending_deletion)s to see if it contains any files you wish to "
5662
"keep, and delete it when you are done."
5663
msgstr ""
5664
5665
#: bzrlib/errors.py:2176
5666
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5667
msgstr ""
5668
5669
#: bzrlib/errors.py:2190
5670
msgid ""
5671
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:2203
5675
msgid "Error in merge modified format"
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:2208
5679
msgid "Format error in conflict listings"
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2212
5683
msgid ""
5684
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5685
"Error: %(description)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2223
5689
msgid ""
5690
"An error has been detected in the repository %(repo_path)s.\n"
5691
"Please run bzr reconcile on this repository."
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2234
5695
msgid ""
5696
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5697
"reason: %(reason)s"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:2247
5701
msgid ""
5702
"An inconsistent delta was supplied: %(delta)r\n"
5703
"reason: %(reason)s"
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:2259
5707
msgid "To use this feature you must upgrade your branch at %(path)s."
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:2268
5711
msgid "To use this feature you must upgrade your repository at %(path)s."
5712
msgstr ""
5713
5714
#: bzrlib/errors.py:2273
5715
msgid ""
5716
"To use this feature you must upgrade your branch at %(path)s to a format "
5717
"which supports rich roots."
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2279
5721
msgid "Cannot perform local-only commits on unbound branches."
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:2284
5725
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:2305
5729
msgid "Ghost tags not supported by format %(format)r."
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:2313
5733
msgid "File is binary but should be text."
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2318
5737
msgid "The path %(path)s is not permitted on this platform"
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2327
5741
msgid ""
5742
"Testament did not match expected value.\n"
5743
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5744
" {%(measured)s}"
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2339
5748
msgid "Not a bzr revision-bundle: %(text)r"
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:2348
5752
msgid "Bad bzr revision-bundle: %(text)r"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2357
5756
msgid "Malformed bzr revision-bundle header: %(text)r"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2362
5760
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2367
5764
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2372
5768
msgid "End of line marker was not \\n in bzr revision-bundle"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2382
5772
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2392
5776
msgid "Root class for inventory serialization errors"
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2396
5780
msgid ""
5781
"The inventory was not in the expected format:\n"
5782
" %(msg)s"
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:2405
5786
msgid "This operation requires rich root data storage"
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2418
5790
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2427
5794
msgid ""
5795
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5796
"variable."
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2434
5800
msgid ""
5801
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5802
"ghost at {%(ghost_revision_id)s}"
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2444
5806
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:2495
5810
msgid ""
5811
"A merge directive must provide either a bundle or a public branch location."
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2502
5815
msgid "Bad merge directive payload %(start)r"
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2512
5819
msgid "Preview patch does not match requested changes."
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2518
5823
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2528
5827
msgid ""
5828
"Your branch does not have all of the revisions required in order to merge "
5829
"this merge directive and the target location specified in the merge "
5830
"directive is not a branch: %(location)s."
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2540
5834
msgid "Unsupported entry kind %(kind)s"
5835
msgstr ""
5836
5837
#: bzrlib/errors.py:2548
5838
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2558
5842
msgid "Subsume target %(other_tree)s needs to be upgraded."
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:2577
5846
msgid "No such tag: %(tag_name)s"
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:2585
5850
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:2594
5854
msgid "Tag %(tag_name)s already exists."
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2602
5858
msgid ""
5859
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5860
"bugs\" for more information on this feature."
5861
msgstr ""
5862
5863
#: bzrlib/errors.py:2612
5864
msgid ""
5865
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2622
5869
msgid ""
5870
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2632
5874
msgid "Invalid line in bugs property: '%(line)s'"
5875
msgstr ""
5876
5877
#: bzrlib/errors.py:2640
5878
msgid "Invalid bug status: '%(status)s'"
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2648
5882
msgid "Could not understand response from smart server: %(response_tuple)r"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2687
5886
msgid "Server sent an unexpected error: %(error_tuple)r"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2706
5890
msgid "Unrecognised container format: %(container_format)r"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2714
5894
msgid "Unexpected end of container stream"
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2719
5898
msgid "Unknown record type: %(record_type)r"
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2727
5902
msgid "Invalid record: %(reason)s"
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2735
5906
msgid "Container has data after end marker: %(excess)r"
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:2743
5910
msgid "Container has multiple records with the same name: %(name)s"
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2756
5914
msgid "Corrupt or incompatible data stream: %(reason)s"
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2764
5918
msgid "SMTP error: %(error)s"
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2772
5922
msgid "No message supplied."
5923
msgstr ""
5924
5925
#: bzrlib/errors.py:2777
5926
msgid "No mail-to address (--mail-to) or output (-o) specified."
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2782
5930
msgid ""
5931
"Unable to find mail client with the following names: "
5932
"%(mail_command_list_string)s"
5933
msgstr ""
5934
5935
#: bzrlib/errors.py:2792
5936
msgid "SMTP connection to %(host)s refused"
5937
msgstr ""
5938
5939
#: bzrlib/errors.py:2801
5940
msgid "Please specify smtp_server. No server at default %(host)s."
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2815
5944
msgid ""
5945
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5946
"reconfigure."
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2827
5950
msgid "'%(display_url)s' is already a branch."
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2832
5954
msgid "'%(display_url)s' is already a tree."
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:2837
5958
msgid "'%(display_url)s' is already a checkout."
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2842
5962
msgid "'%(display_url)s' is already a lightweight checkout."
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2847
5966
msgid "'%(display_url)s' is already using a shared repository."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2852
5970
msgid "'%(display_url)s' is already standalone."
5971
msgstr ""
5972
5973
#: bzrlib/errors.py:2857
5974
msgid "Shared repository '%(display_url)s' already creates working trees."
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2863
5978
msgid ""
5979
"Shared repository '%(display_url)s' already doesn't create working trees."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2869
5983
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2874
5987
msgid "No location could be found to bind to at %(display_url)s."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2879
5991
msgid ""
5992
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5993
"status).%(more)s"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2898
5997
msgid ""
5998
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5999
"list).%(more)s"
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:2904
6003
msgid "Variable {%(name)s} is not available."
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2912
6007
msgid "No template specified."
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:2917
6011
msgid "Unable to create symlink %(path_str)son this platform"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2932
6015
msgid ""
6016
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6017
"\"original\", \"local\"."
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:2966
6021
msgid ""
6022
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:2978
6026
msgid "The \"%(config_id)s\" configuration does not exist."
6027
msgstr ""
6028
6029
#: bzrlib/errors.py:2986
6030
msgid "The \"%(option_name)s\" configuration option does not exist."
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:2994
6034
msgid "The alias \"%(alias_name)s\" does not exist."
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:3008
6038
msgid "\"%(alias_name)s\" is not a valid location alias."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:3016
6042
msgid "No %(alias_name)s location assigned."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:3024
6046
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:3034
6050
msgid "Unknown rules detected: %(unknowns_str)s."
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:3045
6054
msgid "Tip change rejected: %(msg)s"
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:3053
6058
msgid "Shelf corrupt."
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:3058
6062
msgid "Corruption while decompressing repository file%(orig_error)s"
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:3070
6066
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:3078
6070
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:3086
6074
msgid ""
6075
"An attempt to access a url outside the server jail was made: '%(url)s'."
6076
msgstr ""
6077
6078
#: bzrlib/errors.py:3094
6079
msgid "The user aborted the operation."
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:3099
6083
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:3109
6087
msgid "No such view: %(view_name)s."
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:3119
6091
msgid ""
6092
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6093
"to a later format."
6094
msgstr ""
6095
6096
#: bzrlib/errors.py:3128
6097
msgid ""
6098
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:3195
6102
msgid "%(bzrdir)r does not support co-located branches."
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3201
6106
msgid ""
6107
"Unable to determine your name.\n"
6108
"Please, set your name with the 'whoami' command.\n"
6109
"E.g. bzr whoami \"Your Name <name@example.com>\""
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:3210
6113
msgid "Invalid pattern(s) found. %(msg)s"
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:3218
6117
msgid ""
6118
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6119
"unbind` to fix."
6120
msgstr ""
6121
6122
#: bzrlib/errors.py:3229
6123
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3238
6127
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:3247
6131
msgid ""
6132
"No compatible object available for operations from %(source)r to %(target)r."
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:3257
6136
msgid ""
6137
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6138
"%(arguments)s."
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:3267
6142
msgid ""
6143
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6144
"format %(format)r"
6145
msgstr ""
6146
6147
#: bzrlib/errors.py:3279
6148
msgid ""
6149
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6150
"plugin."
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:3292
6154
msgid "Binary files section encountered."
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:3300
6158
msgid ""
6159
"Malformed patch header. %(desc)s\n"
6160
"%(line)r"
6161
msgstr ""
6162
6163
#: bzrlib/errors.py:3309
6164
msgid ""
6165
"Malformed hunk header. %(desc)s\n"
6166
"%(line)r"
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:3318
6170
msgid ""
6171
"Malformed line. %(desc)s\n"
6172
"%(line)r"
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:3328
6176
msgid ""
6177
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6178
"but patch says it should be \"%(patch_line)s\""
6179
msgstr ""
6180
6181
#: bzrlib/errors.py:3339
6182
msgid "The feature %(feature)s has already been registered."
6183
msgstr ""
6184
6185
#: bzrlib/export_pot.py:252
6186
#, python-format
6187
msgid "Exporting messages from builtin command: %s"
6188
msgstr ""
6189
6190
#: bzrlib/export_pot.py:271
6191
msgid "Exporting messages from plugin command: {0} in {1}"
6192
msgstr ""
6193
6194
#: bzrlib/export_pot.py:292
6195
#, python-format
6196
msgid "Exporting message from error: %s"
6197
msgstr ""
6198
6199
#: bzrlib/fetch.py:98
6200
msgid "Finding revisions"
6201
msgstr ""
6202
6203
#: bzrlib/fetch.py:103
6204
msgid "Fetching revisions"
6205
msgstr ""
6206
6207
#: bzrlib/foreign.py:262
6208
msgid "Push into a different VCS without any custom bzr metadata."
6209
msgstr ""
6210
6211
#: bzrlib/foreign.py:264
6212
msgid ""
6213
"This will afterwards rebase the local branch on the remote\n"
6214
"branch unless the --no-rebase option is used, in which case \n"
6215
"the two branches will be out of sync after the push. "
6216
msgstr ""
6217
6218
#: bzrlib/foreign.py:277
6219
msgid "Do not rebase after push."
6220
msgstr ""
6221
6222
#: bzrlib/foreign.py:311
6223
#, python-format
6224
msgid "Using saved location: %s\n"
6225
msgstr ""
6226
6227
#: bzrlib/foreign.py:321
6228
msgid ""
6229
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6230
"regular push."
6231
msgstr ""
6232
6233
#: bzrlib/gpg.py:366
6234
msgid "No GnuPG key results for pattern: {0}"
6235
msgstr ""
6236
6237
#: bzrlib/gpg.py:439
6238
msgid "{0} commits with valid signatures"
6239
msgstr ""
6240
6241
#: bzrlib/gpg.py:445
6242
msgid "{0} commit with unknown key"
6243
msgid_plural "{0} commits with unknown keys"
6244
msgstr[0] ""
6245
msgstr[1] ""
6246
6247
#: bzrlib/gpg.py:453
6248
msgid "{0} commit not valid"
6249
msgid_plural "{0} commits not valid"
6250
msgstr[0] ""
6251
msgstr[1] ""
6252
6253
#: bzrlib/gpg.py:461
6254
msgid "{0} commit not signed"
6255
msgid_plural "{0} commits not signed"
6256
msgstr[0] ""
6257
msgstr[1] ""
6258
6259
#: bzrlib/gpg.py:469
6260
msgid "{0} commit with key now expired"
6261
msgid_plural "{0} commits with key now expired"
6262
msgstr[0] ""
6263
msgstr[1] ""
6264
6265
#: bzrlib/gpg.py:489
6266
msgid "{0} commit by author {1} with key {2} now expired"
6267
msgid_plural "{0} commits by author {1} with key {2} now expired"
6268
msgstr[0] ""
6269
msgstr[1] ""
6270
6271
#: bzrlib/gpg.py:505
6272
msgid "{0} signed {1} commit"
6273
msgid_plural "{0} signed {1} commits"
6274
msgstr[0] ""
6275
msgstr[1] ""
6276
6277
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6278
msgid "{0} commit by author {1}"
6279
msgid_plural "{0} commits by author {1}"
6280
msgstr[0] ""
6281
msgstr[1] ""
6282
6283
#: bzrlib/gpg.py:554
6284
msgid "Unknown key {0} signed {1} commit"
6285
msgid_plural "Unknown key {0} signed {1} commits"
6286
msgstr[0] ""
6287
msgstr[1] ""
6288
6289
#: bzrlib/groupcompress.py:1739
6290
#, python-format
6291
msgid "Insert claimed random_id=True, but then inserted %r two times"
6292
msgstr ""
6293
6294
#: bzrlib/hooks.py:313
6295
#, python-format
6296
msgid "Introduced in: %s"
6297
msgstr ""
6298
6299
#: bzrlib/hooks.py:316
6300
#, python-format
6301
msgid "Deprecated in: %s"
6302
msgstr ""
6303
6304
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6305
msgid "Walking content"
6306
msgstr ""
6307
6308
#: bzrlib/knit.py:3330
6309
msgid "annotating"
6310
msgstr ""
6311
6312
#: bzrlib/lock.py:548
6313
msgid "{0!r} was {1} locked again"
6314
msgstr ""
6315
6316
#: bzrlib/lockdir.py:321
6317
#, python-format
6318
msgid "error removing pending lock: %s"
6319
msgstr ""
6320
6321
#: bzrlib/lockdir.py:616
6322
msgid "Unable to obtain"
6323
msgstr ""
6324
6325
#: bzrlib/lockdir.py:618
6326
msgid "Lock owner changed for"
6327
msgstr ""
6328
6329
#: bzrlib/lockdir.py:620
6330
msgid "{0} lock {1} {2}."
6331
msgstr ""
6332
6333
#: bzrlib/lockdir.py:627
6334
#, python-format
6335
msgid "Will continue to try until %s, unless you press Ctrl-C."
6336
msgstr ""
6337
6338
#: bzrlib/lockdir.py:629
6339
msgid "See \"bzr help break-lock\" for more."
6340
msgstr ""
6341
6342
#: bzrlib/lockdir.py:739
6343
#, python-format
6344
msgid ""
6345
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6346
msgstr ""
6347
6348
#: bzrlib/log.py:563
6349
msgid "--exclude-common-ancestry requires two different revisions"
6350
msgstr ""
6351
6352
#: bzrlib/log.py:565
6353
#, python-format
6354
msgid "invalid direction %r"
6355
msgstr ""
6356
6357
#: bzrlib/log.py:653
6358
msgid "Start revision not found in history of end revision."
6359
msgstr ""
6360
6361
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6362
msgid "Logging revision 0 is invalid."
6363
msgstr ""
6364
6365
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6366
msgid "Start revision must be older than the end revision."
6367
msgstr ""
6368
6369
#: bzrlib/log.py:1818
6370
#, python-format
6371
msgid "unknown log formatter: %r"
6372
msgstr ""
6373
6374
#: bzrlib/log.py:2114
6375
msgid "fixes bug"
6376
msgid_plural "fixes bugs"
6377
msgstr[0] ""
6378
msgstr[1] ""
6379
6380
#: bzrlib/merge.py:689
6381
msgid "All changes applied successfully."
6382
msgstr ""
6383
6384
#: bzrlib/merge.py:691
6385
#, python-format
6386
msgid "%d conflicts encountered."
6387
msgstr ""
6388
6389
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6390
msgid "Preparing file merge"
6391
msgstr ""
6392
6393
#: bzrlib/multiparent.py:426
6394
msgid "Importing revisions"
6395
msgstr ""
6396
6397
#: bzrlib/option.py:526
6398
msgid "Show help message."
6399
msgstr ""
6400
6401
#: bzrlib/option.py:528
6402
msgid "Only display errors and warnings."
6403
msgstr ""
6404
6405
#: bzrlib/option.py:531
6406
msgid "Show usage message and options."
6407
msgstr ""
6408
6409
#: bzrlib/option.py:533
6410
msgid "Display more information."
6411
msgstr ""
6412
6413
#: bzrlib/option.py:541
6414
msgid ""
6415
"Select changes introduced by the specified revision. See also \"help "
6416
"revisionspec\"."
6417
msgstr ""
6418
6419
#: bzrlib/option.py:543
6420
msgid "Branch to operate on, instead of working directory."
6421
msgstr ""
6422
6423
#: bzrlib/option.py:545
6424
msgid "Detailed log format."
6425
msgstr ""
6426
6427
#: bzrlib/option.py:545
6428
msgid "Format used by GNU ChangeLog files."
6429
msgstr ""
6430
6431
#: bzrlib/option.py:545
6432
msgid "Log format with one line per revision."
6433
msgstr ""
6434
6435
#: bzrlib/option.py:545
6436
msgid "Moderately short log format."
6437
msgstr ""
6438
6439
#: bzrlib/option.py:545
6440
msgid "Use specified log format."
6441
msgstr ""
6442
6443
#: bzrlib/option.py:547
6444
msgid "Log format"
6445
msgstr ""
6446
6447
#: bzrlib/option.py:549
6448
msgid "LCA-newness merge."
6449
msgstr ""
6450
6451
#: bzrlib/option.py:549
6452
msgid "Merge using external diff3."
6453
msgstr ""
6454
6455
#: bzrlib/option.py:549
6456
msgid "Native diff3-style merge."
6457
msgstr ""
6458
6459
#: bzrlib/option.py:549
6460
msgid "Select a particular merge algorithm."
6461
msgstr ""
6462
6463
#: bzrlib/option.py:549
6464
msgid "Weave-based merge."
6465
msgstr ""
6466
6467
#: bzrlib/option.py:551
6468
msgid "Merge algorithm"
6469
msgstr ""
6470
6471
#: bzrlib/option.py:554
6472
msgid "Message string."
6473
msgstr ""
6474
6475
#: bzrlib/option.py:556
6476
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6477
msgstr ""
6478
6479
#: bzrlib/option.py:558
6480
msgid "Ignore differences between branches and overwrite unconditionally."
6481
msgstr ""
6482
6483
#: bzrlib/option.py:560
6484
msgid "Remember the specified location as a default."
6485
msgstr ""
6486
6487
#: bzrlib/option.py:562
6488
msgid "Reprocess to reduce spurious conflicts."
6489
msgstr ""
6490
6491
#: bzrlib/option.py:566
6492
msgid "See \"help revisionspec\" for details."
6493
msgstr ""
6494
6495
#: bzrlib/option.py:568
6496
msgid "Show internal object ids."
6497
msgstr ""
6498
6499
#: bzrlib/option.py:571
6500
msgid "Display timezone as local, original, or utc."
6501
msgstr ""
6502
6503
#: bzrlib/osutils.py:100
6504
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6505
msgstr ""
6506
6507
#: bzrlib/osutils.py:220
6508
msgid "lstat/stat of ({0!r}): {1!r}"
6509
msgstr ""
6510
6511
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6512
#, python-format
6513
msgid "sorry, %r not allowed in path"
6514
msgstr ""
6515
6516
#: bzrlib/osutils.py:1259
6517
#, python-format
6518
msgid "%r is too short to calculate a relative path"
6519
msgstr ""
6520
6521
#: bzrlib/plugin.py:143
6522
#, python-format
6523
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6524
msgstr ""
6525
6526
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6527
msgid "Enable completions for the selected plugin (default: all plugins)"
6528
msgstr ""
6529
6530
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6531
msgid "Generate a shell function for bash command line completion."
6532
msgstr ""
6533
6534
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6535
msgid ""
6536
"This command generates a shell function which can be used by bash to\n"
6537
"automatically complete the currently typed command when the user presses\n"
6538
"the completion key (usually tab)."
6539
msgstr ""
6540
6541
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6542
msgid ""
6543
"Commonly used like this:\n"
6544
" eval \"`bzr bash-completion`\""
6545
msgstr ""
6546
6547
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6548
msgid "Name of the generated function (default: _bzr)"
6549
msgstr ""
6550
6551
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6552
msgid "Generate only the shell function, don't enable it"
6553
msgstr ""
6554
6555
#: bzrlib/plugins/launchpad/account.py:66
6556
msgid "Setting ssh/sftp usernames for launchpad.net."
6557
msgstr ""
6558
6559
#: bzrlib/plugins/launchpad/cmds.py:44
6560
msgid "Register a branch with launchpad.net."
6561
msgstr ""
6562
6563
#: bzrlib/plugins/launchpad/cmds.py:46
6564
msgid ""
6565
"This command lists a bzr branch in the directory of branches on\n"
6566
"launchpad.net. Registration allows the branch to be associated with\n"
6567
"bugs or specifications."
6568
msgstr ""
6569
6570
#: bzrlib/plugins/launchpad/cmds.py:50
6571
msgid ""
6572
"Before using this command you must register the project to which the\n"
6573
"branch belongs, and create an account for yourself on launchpad.net."
6574
msgstr ""
6575
6576
#: bzrlib/plugins/launchpad/cmds.py:53
6577
msgid ""
6578
"arguments:\n"
6579
" public_url: The publicly visible url for the branch to register.\n"
6580
" This must be an http or https url (which Launchpad can read\n"
6581
" from to access the branch). Local file urls, SFTP urls, and\n"
6582
" bzr+ssh urls will not work.\n"
6583
" If no public_url is provided, bzr will use the configured\n"
6584
" public_url if there is one for the current branch, and\n"
6585
" otherwise error."
6586
msgstr ""
6587
6588
#: bzrlib/plugins/launchpad/cmds.py:62
6589
msgid ""
6590
"example:\n"
6591
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6592
" --project fooproject"
6593
msgstr ""
6594
6595
#: bzrlib/plugins/launchpad/cmds.py:69
6596
msgid "Launchpad project short name to associate with the branch."
6597
msgstr ""
6598
6599
#: bzrlib/plugins/launchpad/cmds.py:76
6600
msgid ""
6601
"Short name for the branch; by default taken from the last component of the "
6602
"url."
6603
msgstr ""
6604
6605
#: bzrlib/plugins/launchpad/cmds.py:80
6606
msgid "One-sentence description of the branch."
6607
msgstr ""
6608
6609
#: bzrlib/plugins/launchpad/cmds.py:83
6610
msgid "Longer description of the purpose or contents of the branch."
6611
msgstr ""
6612
6613
#: bzrlib/plugins/launchpad/cmds.py:86
6614
msgid "Branch author's email address, if not yourself."
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/cmds.py:89
6618
msgid "The bug this branch fixes."
6619
msgstr ""
6620
6621
#: bzrlib/plugins/launchpad/cmds.py:92
6622
msgid "Prepare the request but don't actually send it."
6623
msgstr ""
6624
6625
#: bzrlib/plugins/launchpad/cmds.py:114
6626
msgid ""
6627
"register-branch requires a public branch url - see bzr help register-branch."
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/cmds.py:122
6631
msgid "--product is deprecated; please use --project."
6632
msgstr ""
6633
6634
#: bzrlib/plugins/launchpad/cmds.py:152
6635
msgid "Open a Launchpad branch page in your web browser."
6636
msgstr ""
6637
6638
#: bzrlib/plugins/launchpad/cmds.py:157
6639
msgid "Do not actually open the browser. Just say the URL we would use."
6640
msgstr ""
6641
6642
#: bzrlib/plugins/launchpad/cmds.py:192
6643
#, python-format
6644
msgid "Opening %s in web browser"
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/cmds.py:200
6648
msgid "Show or set the Launchpad user ID."
6649
msgstr ""
6650
6651
#: bzrlib/plugins/launchpad/cmds.py:202
6652
msgid ""
6653
"When communicating with Launchpad, some commands need to know your\n"
6654
"Launchpad user ID. This command can be used to set or show the\n"
6655
"user ID that Bazaar will use for such communication."
6656
msgstr ""
6657
6658
#: bzrlib/plugins/launchpad/cmds.py:206
6659
msgid ""
6660
":Examples:\n"
6661
" Show the Launchpad ID of the current user::"
6662
msgstr ""
6663
6664
#: bzrlib/plugins/launchpad/cmds.py:209
6665
msgid " bzr launchpad-login"
6666
msgstr ""
6667
6668
#: bzrlib/plugins/launchpad/cmds.py:211
6669
msgid " Set the Launchpad ID of the current user to 'bob'::"
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/cmds.py:213
6673
msgid " bzr launchpad-login bob"
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/cmds.py:220
6677
msgid "Don't check that the user name is valid."
6678
msgstr ""
6679
6680
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6681
msgid "Launchpad user ID exists and has SSH keys.\n"
6682
msgstr ""
6683
6684
#: bzrlib/plugins/launchpad/cmds.py:238
6685
msgid "No Launchpad user ID configured.\n"
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/cmds.py:249
6689
#, python-format
6690
msgid "Launchpad user ID set to '%s'.\n"
6691
msgstr ""
6692
6693
#: bzrlib/plugins/launchpad/cmds.py:255
6694
msgid "Ask Launchpad to mirror a branch now."
6695
msgstr ""
6696
6697
#: bzrlib/plugins/launchpad/cmds.py:272
6698
msgid "Propose merging a branch on Launchpad."
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/cmds.py:274
6702
msgid ""
6703
"This will open your usual editor to provide the initial comment. When it\n"
6704
"has created the proposal, it will open it in your default web browser."
6705
msgstr ""
6706
6707
#: bzrlib/plugins/launchpad/cmds.py:277
6708
msgid ""
6709
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6710
"is not supplied, the remembered submit branch will be used. If no submit\n"
6711
"branch is remembered, the development focus will be used."
6712
msgstr ""
6713
6714
#: bzrlib/plugins/launchpad/cmds.py:281
6715
msgid ""
6716
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6717
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6718
"The parameter the launchpad account name of the desired reviewer. This\n"
6719
"may optionally be followed by '=' and the review type. For example:"
6720
msgstr ""
6721
6722
#: bzrlib/plugins/launchpad/cmds.py:286
6723
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/cmds.py:288
6727
msgid ""
6728
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6729
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6730
msgstr ""
6731
6732
#: bzrlib/plugins/launchpad/cmds.py:293
6733
msgid "Propose the merge on staging."
6734
msgstr ""
6735
6736
#: bzrlib/plugins/launchpad/cmds.py:295
6737
msgid "Commit message."
6738
msgstr ""
6739
6740
#: bzrlib/plugins/launchpad/cmds.py:297
6741
msgid "Mark the proposal as approved immediately."
6742
msgstr ""
6743
6744
#: bzrlib/plugins/launchpad/cmds.py:298
6745
msgid "The bug this proposal fixes."
6746
msgstr ""
6747
6748
#: bzrlib/plugins/launchpad/cmds.py:300
6749
msgid "Requested reviewer and optional type."
6750
msgstr ""
6751
6752
#: bzrlib/plugins/launchpad/cmds.py:335
6753
msgid "Find the proposal to merge this revision."
6754
msgstr ""
6755
6756
#: bzrlib/plugins/launchpad/cmds.py:337
6757
msgid ""
6758
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6759
"This works only if the selected branch was the merge proposal target, and\n"
6760
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6761
"are opened in a web browser."
6762
msgstr ""
6763
6764
#: bzrlib/plugins/launchpad/cmds.py:342
6765
msgid ""
6766
"Any revision involved in the merge may be specified-- the revision in\n"
6767
"which the merge was performed, or one of the revisions that was merged."
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/cmds.py:345
6771
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6772
msgstr ""
6773
6774
#: bzrlib/plugins/launchpad/cmds.py:347
6775
msgid " bzr lp-find-proposal -r annotate:README:1"
6776
msgstr ""
6777
6778
#: bzrlib/plugins/launchpad/cmds.py:363
6779
msgid "No review found."
6780
msgstr ""
6781
6782
#: bzrlib/plugins/launchpad/cmds.py:364
6783
#, python-format
6784
msgid "%d proposals(s) found."
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/cmds.py:374
6788
msgid "Finding revision-id"
6789
msgstr ""
6790
6791
#: bzrlib/plugins/launchpad/cmds.py:381
6792
msgid "Finding merge"
6793
msgstr ""
6794
6795
#: bzrlib/plugins/launchpad/cmds.py:386
6796
msgid "Finding revno"
6797
msgstr ""
6798
6799
#: bzrlib/plugins/launchpad/cmds.py:392
6800
msgid "Finding Launchpad branch"
6801
msgstr ""
6802
6803
#: bzrlib/plugins/launchpad/cmds.py:395
6804
msgid "Finding proposals"
6805
msgstr ""
6806
6807
#: bzrlib/plugins/launchpad/lp_api.py:241
6808
#: bzrlib/plugins/launchpad/lp_api.py:246
6809
#, python-format
6810
msgid "%s is not registered on Launchpad"
6811
msgstr ""
6812
6813
#: bzrlib/plugins/launchpad/lp_api.py:256
6814
#, python-format
6815
msgid "%s has no development focus."
6816
msgstr ""
6817
6818
#: bzrlib/plugins/launchpad/lp_api.py:261
6819
#, python-format
6820
msgid "development focus %s has no branch."
6821
msgstr ""
6822
6823
#: bzrlib/plugins/launchpad/lp_api.py:266
6824
#, python-format
6825
msgid "source package %s has no branch."
6826
msgstr ""
6827
6828
#: bzrlib/plugins/launchpad/lp_api.py:270
6829
#, python-format
6830
msgid "%s has no associated product or source package."
6831
msgstr ""
6832
6833
#: bzrlib/plugins/launchpad/lp_api.py:282
6834
#, python-format
6835
msgid "%s is already up-to-date."
6836
msgstr ""
6837
6838
#: bzrlib/plugins/launchpad/lp_api.py:289
6839
#, python-format
6840
msgid "Pushing to %s"
6841
msgstr ""
6842
6843
#: bzrlib/plugins/launchpad/lp_directory.py:170
6844
msgid ""
6845
"resolution for {0}\n"
6846
" local: {1}\n"
6847
" remote: {2}"
6848
msgstr ""
6849
6850
#: bzrlib/plugins/launchpad/lp_propose.py:150
6851
#, python-format
6852
msgid "There is already a branch merge proposal: %s"
6853
msgstr ""
6854
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6856
msgid "pb parameter to convert() is deprecated"
6857
msgstr ""
6858
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6860
msgid "starting upgrade from format 4 to 5"
6861
msgstr ""
6862
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6864
msgid "note: upgrade may be faster if all store files are ungzipped first"
6865
msgstr ""
6866
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6868
msgid "converting revision"
6869
msgstr ""
6870
6871
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6872
msgid "upgraded to weaves:"
6873
msgstr ""
6874
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6876
#, python-format
6877
msgid "%6d revisions and inventories"
6878
msgstr ""
6879
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6881
#, python-format
6882
msgid "%6d revisions not present"
6883
msgstr ""
6884
6885
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6886
#, python-format
6887
msgid "%6d texts"
6888
msgstr ""
6889
6890
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6891
msgid "writing weave"
6892
msgstr ""
6893
6894
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6896
msgid "inventory"
6897
msgstr ""
6898
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6900
msgid "write revision"
6901
msgstr ""
6902
6903
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6904
msgid "loading revision"
6905
msgstr ""
6906
6907
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6908
#, python-format
6909
msgid "revision {%s} not present in branch; will be converted as a ghost"
6910
msgstr ""
6911
6912
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6913
msgid "starting upgrade from format 5 to 6"
6914
msgstr ""
6915
6916
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6917
#, python-format
6918
msgid "adding prefixes to %s"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6922
msgid "starting upgrade from format 6 to metadir"
6923
msgstr ""
6924
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6926
msgid "Removing ancestry.weave"
6927
msgstr ""
6928
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6930
msgid "Finding branch files"
6931
msgstr ""
6932
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6934
msgid "Upgrading repository"
6935
msgstr ""
6936
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6938
msgid "Upgrading branch"
6939
msgstr ""
6940
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6942
msgid "No working tree."
6943
msgstr ""
6944
6945
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6946
msgid "Upgrading working tree"
6947
msgstr ""
6948
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6950
#, python-format
6951
msgid "Make %s lock"
6952
msgstr ""
6953
6954
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6955
#, python-format
6956
msgid "Moving %s"
6957
msgstr ""
6958
6959
#: bzrlib/push.py:56
6960
msgid "Created new branch."
6961
msgstr ""
6962
6963
#: bzrlib/push.py:97
6964
#, python-format
6965
msgid ""
6966
"Target directory %s already contains a .bzr directory, but it is not valid."
6967
msgstr ""
6968
6969
#: bzrlib/push.py:101
6970
#, python-format
6971
msgid ""
6972
"Target directory %s already exists, but does not have a .bzr directory. "
6973
"Supply --use-existing-dir to push there anyway."
6974
msgstr ""
6975
6976
#: bzrlib/push.py:122
6977
#, python-format
6978
msgid "Too many redirections trying to make %s."
6979
msgstr ""
6980
6981
#: bzrlib/push.py:148
6982
msgid ""
6983
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6984
"information."
6985
msgstr ""
6986
6987
#: bzrlib/push.py:152
6988
#, python-format
6989
msgid ""
6990
"It is not possible to losslessly push to %s. You may want to use dpush "
6991
"instead."
6992
msgstr ""
6993
6994
#: bzrlib/push.py:158
6995
#, python-format
6996
msgid ""
6997
"At %s you have a valid .bzr control directory, but not a branch or "
6998
"repository. This is an unsupported configuration. Please move the target "
6999
"directory out of the way and try again."
7000
msgstr ""
7001
7002
#: bzrlib/reconcile.py:97
7003
#, python-format
7004
msgid "Reconciling branch %s"
7005
msgstr ""
7006
7007
#: bzrlib/reconcile.py:103
7008
#, python-format
7009
msgid "Reconciling repository %s"
7010
msgstr ""
7011
7012
#: bzrlib/reconcile.py:105
7013
msgid "Reconciling repository"
7014
msgstr ""
7015
7016
#: bzrlib/reconcile.py:111
7017
#, python-format
7018
msgid "%s cannot canonicalize CHKs."
7019
msgstr ""
7020
7021
#: bzrlib/reconcile.py:119
7022
msgid "Reconcile aborted: revision index has inconsistent parents."
7023
msgstr ""
7024
7025
#: bzrlib/reconcile.py:121
7026
msgid "Run \"bzr check\" for more details."
7027
msgstr ""
7028
7029
#: bzrlib/reconcile.py:123
7030
msgid "Reconciliation complete."
7031
msgstr ""
7032
7033
#: bzrlib/reconcile.py:166
7034
msgid "Fixing last revision info {0} => {1}"
7035
msgstr ""
7036
7037
#: bzrlib/reconcile.py:173
7038
msgid "revision_history ok."
7039
msgstr ""
7040
7041
#: bzrlib/reconcile.py:234
7042
msgid "Reading inventory data"
7043
msgstr ""
7044
7045
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7046
msgid "Inventory ok."
7047
msgstr ""
7048
7049
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7050
msgid "Backing up inventory"
7051
msgstr ""
7052
7053
#: bzrlib/reconcile.py:258
7054
msgid "Backup inventory created."
7055
msgstr ""
7056
7057
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7058
msgid "Writing weave"
7059
msgstr ""
7060
7061
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7062
msgid "Inventory regenerated."
7063
msgstr ""
7064
7065
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7066
msgid "Reading indexes"
7067
msgstr ""
7068
7069
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7070
msgid "Checking unused inventories"
7071
msgstr ""
7072
7073
#: bzrlib/reconcile.py:388
7074
msgid "Backup Inventory created"
7075
msgstr ""
7076
7077
#: bzrlib/reconcile.py:446
7078
msgid "Fixing text parents"
7079
msgstr ""
7080
7081
#: bzrlib/reconfigure.py:54
7082
msgid "{0} is now stacked on {1}\n"
7083
msgstr ""
7084
7085
#: bzrlib/reconfigure.py:69
7086
#, python-format
7087
msgid "%s is now not stacked\n"
7088
msgstr ""
7089
7090
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7091
#, python-format
7092
msgid "bzr: ERROR (ignored): %s"
7093
msgstr ""
7094
7095
#: bzrlib/remote.py:2534
7096
msgid "Copying repository content as tarball..."
7097
msgstr ""
7098
7099
#: bzrlib/rename_map.py:69
7100
msgid "Calculating hashes"
7101
msgstr ""
7102
7103
#: bzrlib/rename_map.py:107
7104
msgid "Determining hash hits"
7105
msgstr ""
7106
7107
#: bzrlib/rename_map.py:242
7108
msgid "{0} => {1}"
7109
msgstr ""
7110
7111
#: bzrlib/repository.py:1738
7112
msgid "Moving repository to repository.backup"
7113
msgstr ""
7114
7115
#: bzrlib/repository.py:1745
7116
msgid "Creating new repository"
7117
msgstr ""
7118
7119
#: bzrlib/repository.py:1750
7120
msgid "Copying content"
7121
msgstr ""
7122
7123
#: bzrlib/repository.py:1754
7124
msgid "Deleting old repository content"
7125
msgstr ""
7126
7127
#: bzrlib/repository.py:1756
7128
msgid "repository converted"
7129
msgstr ""
7130
7131
#: bzrlib/revisionspec.py:903
7132
msgid "Using {0} {1}"
7133
msgstr ""
7134
7135
#: bzrlib/send.py:59
7136
#, python-format
7137
msgid "Mail client \"%s\" does not support specifying body"
7138
msgstr ""
7139
7140
#: bzrlib/send.py:63
7141
msgid "--remember requires a branch to be specified."
7142
msgstr ""
7143
7144
#: bzrlib/send.py:78
7145
msgid "No submit branch known or specified"
7146
msgstr ""
7147
7148
#: bzrlib/send.py:81
7149
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7150
msgstr ""
7151
7152
#: bzrlib/send.py:99
7153
#, python-format
7154
msgid "No such send format '%s'."
7155
msgstr ""
7156
7157
#: bzrlib/send.py:115
7158
msgid "bzr send takes at most two one revision identifiers"
7159
msgstr ""
7160
7161
#: bzrlib/send.py:128
7162
msgid "No revisions to submit."
7163
msgstr ""
7164
7165
#: bzrlib/send.py:140
7166
msgid ""
7167
"- not supported for merge directives that use more than one output file."
7168
msgstr ""
7169
7170
#: bzrlib/send.py:186
7171
msgid "Format 0.9 does not permit bundle with no patch"
7172
msgstr ""
7173
7174
#: bzrlib/shelf_ui.py:46
7175
#, python-format
7176
msgid "Shelve adding file \"%(path)s\"?"
7177
msgstr ""
7178
7179
#: bzrlib/shelf_ui.py:47
7180
msgid "Shelve binary changes?"
7181
msgstr ""
7182
7183
#: bzrlib/shelf_ui.py:48
7184
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7185
msgstr ""
7186
7187
#: bzrlib/shelf_ui.py:50
7188
#, python-format
7189
msgid "Shelve removing file \"%(path)s\"?"
7190
msgstr ""
7191
7192
#: bzrlib/shelf_ui.py:51
7193
#, python-format
7194
msgid "Shelve %d change(s)?"
7195
msgstr ""
7196
7197
#: bzrlib/shelf_ui.py:52
7198
msgid "Shelve?"
7199
msgstr ""
7200
7201
#: bzrlib/shelf_ui.py:53
7202
#, python-format
7203
msgid ""
7204
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7205
msgstr ""
7206
7207
#: bzrlib/shelf_ui.py:55
7208
#, python-format
7209
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7210
msgstr ""
7211
7212
#: bzrlib/shelf_ui.py:70
7213
#, python-format
7214
msgid "Changes shelved with id \"%d\"."
7215
msgstr ""
7216
7217
#: bzrlib/shelf_ui.py:74
7218
msgid "Selected changes destroyed."
7219
msgstr ""
7220
7221
#: bzrlib/shelf_ui.py:78
7222
msgid "Selected changes:"
7223
msgstr ""
7224
7225
#: bzrlib/shelf_ui.py:98
7226
#, python-format
7227
msgid "Delete file \"%(path)s\"?"
7228
msgstr ""
7229
7230
#: bzrlib/shelf_ui.py:99
7231
msgid "Apply binary changes?"
7232
msgstr ""
7233
7234
#: bzrlib/shelf_ui.py:100
7235
#, python-format
7236
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7237
msgstr ""
7238
7239
#: bzrlib/shelf_ui.py:102
7240
#, python-format
7241
msgid "Add file \"%(path)s\"?"
7242
msgstr ""
7243
7244
#: bzrlib/shelf_ui.py:103
7245
#, python-format
7246
msgid "Apply %d change(s)?"
7247
msgstr ""
7248
7249
#: bzrlib/shelf_ui.py:104
7250
msgid "Apply change?"
7251
msgstr ""
7252
7253
#: bzrlib/shelf_ui.py:105
7254
#, python-format
7255
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7256
msgstr ""
7257
7258
#: bzrlib/shelf_ui.py:107
7259
#, python-format
7260
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7261
msgstr ""
7262
7263
#: bzrlib/shelf_ui.py:402
7264
msgid "No changes are shelved."
7265
msgstr ""
7266
7267
#: bzrlib/shelf_ui.py:460
7268
#, python-format
7269
msgid "Using changes with id \"%d\"."
7270
msgstr ""
7271
7272
#: bzrlib/shelf_ui.py:464
7273
#, python-format
7274
msgid "Message: %s"
7275
msgstr ""
7276
7277
#: bzrlib/shelf_ui.py:476
7278
#, python-format
7279
msgid "Deleted changes with id \"%d\"."
7280
msgstr ""
7281
7282
#: bzrlib/smart/medium.py:714
7283
msgid "HPSS calls: {0} ({1} vfs) {2}"
7284
msgstr ""
7285
7286
#: bzrlib/smart/server.py:169
7287
msgid "Requested to stop gracefully"
7288
msgstr ""
7289
7290
#: bzrlib/smart/server.py:179
7291
#, python-format
7292
msgid "Waiting for %d client(s) to finish"
7293
msgstr ""
7294
7295
#: bzrlib/smart/server.py:185
7296
#, python-format
7297
msgid "Still waiting for %d client(s) to finish"
7298
msgstr ""
7299
7300
#: bzrlib/smart/server.py:219
7301
#, python-format
7302
msgid "listening socket error: %s"
7303
msgstr ""
7304
7305
#: bzrlib/smart/server.py:452
7306
#, python-format
7307
msgid "listening on port: %s"
7308
msgstr ""
7309
7310
#: bzrlib/switch.py:73
7311
msgid "Pending merges must be committed or reverted before using switch."
7312
msgstr ""
7313
7314
#: bzrlib/switch.py:100
7315
msgid ""
7316
"Cannot switch as local commits found in the checkout. Commit these to the "
7317
"bound branch or use --force to throw them away."
7318
msgstr ""
7319
7320
#: bzrlib/switch.py:105
7321
#, python-format
7322
msgid ""
7323
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7324
"anyway, use --force."
7325
msgstr ""
7326
7327
#: bzrlib/switch.py:129
7328
msgid "Cannot switch a branch, only a checkout."
7329
msgstr ""
7330
7331
#: bzrlib/switch.py:167
7332
#, python-format
7333
msgid "Tree is up to date at revision %d."
7334
msgstr ""
7335
7336
#: bzrlib/switch.py:173
7337
#, python-format
7338
msgid "Updated to revision %d."
7339
msgstr ""
7340
7341
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7342
msgid "Apply phase"
7343
msgstr ""
7344
7345
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7346
msgid "removing file"
7347
msgstr ""
7348
7349
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7350
msgid "adding file"
7351
msgstr ""
7352
7353
#: bzrlib/transform.py:2598
7354
msgid "Building tree"
7355
msgstr ""
7356
7357
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7358
msgid "Adding file contents"
7359
msgstr ""
7360
7361
#: bzrlib/transform.py:3017
7362
msgid "Resolution pass"
7363
msgstr ""
7364
7365
#: bzrlib/transport/ftp/_gssapi.py:88
7366
#, python-format
7367
msgid "Authenticated as %s"
7368
msgstr ""
7369
7370
#: bzrlib/tree.py:647
7371
msgid "*** {0} content-filter: {1} => {2!r}"
7372
msgstr ""
7373
7374
#: bzrlib/upgrade.py:77
7375
#, python-format
7376
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7377
msgstr ""
7378
7379
#: bzrlib/upgrade.py:100
7380
#, python-format
7381
msgid "cannot upgrade from bzrdir format %s"
7382
msgstr ""
7383
7384
#: bzrlib/upgrade.py:103
7385
#, python-format
7386
msgid "starting upgrade of %s"
7387
msgstr ""
7388
7389
#: bzrlib/upgrade.py:110
7390
msgid "finished"
7391
msgstr ""
7392
7393
#: bzrlib/upgrade.py:120
7394
msgid "Deleting backup.bzr"
7395
msgstr ""
7396
7397
#: bzrlib/upgrade.py:151
7398
msgid ""
7399
"\n"
7400
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7401
msgstr ""
7402
7403
#: bzrlib/upgrade.py:208
7404
#, python-format
7405
msgid "Found %d dependent branches - upgrading ..."
7406
msgstr ""
7407
7408
#: bzrlib/upgrade.py:276
7409
msgid "Upgrading bzrdirs"
7410
msgstr ""
7411
7412
#: bzrlib/upgrade.py:282
7413
#, python-format
7414
msgid "Upgrading %s"
7415
msgstr ""
7416
7417
#: bzrlib/upgrade.py:283
7418
msgid "Upgrading {0} {1} ..."
7419
msgstr ""
7420
7421
#: bzrlib/upgrade.py:301
7422
msgid "Removing backup ..."
7423
msgstr ""
7424
7425
#: bzrlib/upgrade.py:305
7426
msgid "failed to clean-up {0}: {1}"
7427
msgstr ""
7428
7429
#: bzrlib/vf_repository.py:1091
7430
msgid "inventories"
7431
msgstr ""
7432
7433
#: bzrlib/vf_repository.py:1117
7434
msgid "texts"
7435
msgstr ""
7436
7437
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7438
msgid "Calculating text parents"
7439
msgstr ""
7440
7441
#: bzrlib/vf_repository.py:1707
7442
msgid "Fetch texts"
7443
msgstr ""
7444
7445
#: bzrlib/vf_repository.py:2536
7446
msgid "loading text store"
7447
msgstr ""
7448
7449
#: bzrlib/vf_repository.py:2542
7450
msgid "checking text graph"
7451
msgstr ""
7452
7453
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7454
#: bzrlib/vf_repository.py:3127
7455
msgid "Transferring revisions"
7456
msgstr ""
7457
7458
#: bzrlib/win32utils.py:146
7459
msgid "Failed to GetProcessMemoryInfo()"
7460
msgstr ""
7461
7462
#: bzrlib/win32utils.py:167
7463
msgid "Cannot debug memory on win32 without ctypes or win32process"
7464
msgstr ""
7465
7466
#: bzrlib/win32utils.py:172
7467
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7468
msgstr ""
7469
7470
#: bzrlib/win32utils.py:180
7471
#, python-format
7472
msgid "WorkingSize %8d KiB"
7473
msgstr ""
7474
7475
#: bzrlib/win32utils.py:181
7476
#, python-format
7477
msgid "PeakWorking %8d KiB"
7478
msgstr ""
7479
7480
#: bzrlib/win32utils.py:182
7481
#, python-format
7482
msgid "PagefileUsage %8d KiB"
7483
msgstr ""
7484
7485
#: bzrlib/win32utils.py:183
7486
#, python-format
7487
msgid "PeakPagefileUsage %8d KiB"
7488
msgstr ""
7489
7490
#: bzrlib/win32utils.py:185
7491
#, python-format
7492
msgid "PrivateUsage %8d KiB"
7493
msgstr ""
7494
7495
#: bzrlib/win32utils.py:186
7496
#, python-format
7497
msgid "PageFaultCount %8d"
7498
msgstr ""
7499
7500
#: bzrlib/workingtree.py:1482
7501
msgid "Rerun update after fixing the conflicts."
7502
msgstr ""
7503
7504
#: dummy/help_topics/authentication/summary.txt:1
7505
msgid "Information on configuring authentication"
7506
msgstr ""
7507
7508
#: dummy/help_topics/basic/detail.txt:1
7509
msgid ""
7510
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7511
"http://bazaar.canonical.com/"
7512
msgstr ""
7513
7514
#: dummy/help_topics/basic/detail.txt:4
7515
msgid ""
7516
"Basic commands:\n"
7517
" bzr init makes this directory a versioned branch\n"
7518
" bzr branch make a copy of another branch"
7519
msgstr ""
7520
7521
#: dummy/help_topics/basic/detail.txt:8
7522
msgid ""
7523
" bzr add make files or directories versioned\n"
7524
" bzr ignore ignore a file or pattern\n"
7525
" bzr mv move or rename a versioned file"
7526
msgstr ""
7527
7528
#: dummy/help_topics/basic/detail.txt:12
7529
msgid ""
7530
" bzr status summarize changes in working copy\n"
7531
" bzr diff show detailed diffs"
7532
msgstr ""
7533
7534
#: dummy/help_topics/basic/detail.txt:15
7535
msgid ""
7536
" bzr merge pull in changes from another branch\n"
7537
" bzr commit save some or all changes\n"
7538
" bzr send send changes via email"
7539
msgstr ""
7540
7541
#: dummy/help_topics/basic/detail.txt:19
7542
msgid ""
7543
" bzr log show history of changes\n"
7544
" bzr check validate storage"
7545
msgstr ""
7546
7547
#: dummy/help_topics/basic/detail.txt:22
7548
msgid ""
7549
" bzr help init more help on e.g. init command\n"
7550
" bzr help commands list all commands\n"
7551
" bzr help topics list all help topics\n"
7552
msgstr ""
7553
7554
#: dummy/help_topics/basic/summary.txt:1
7555
msgid "Basic commands"
7556
msgstr ""
7557
7558
#: dummy/help_topics/branches/detail.txt:1
7559
msgid "Branches"
7560
msgstr ""
7561
7562
#: dummy/help_topics/branches/detail.txt:3
7563
msgid ""
7564
"A branch consists of the state of a project, including all of its\n"
7565
"history. All branches have a repository associated (which is where the\n"
7566
"branch history is stored), but multiple branches may share the same\n"
7567
"repository (a shared repository). Branches can be copied and merged."
7568
msgstr ""
7569
7570
#: dummy/help_topics/branches/detail.txt:8
7571
msgid ""
7572
"In addition, one branch may be bound to another one. Binding to another\n"
7573
"branch indicates that commits which happen in this branch must also \n"
7574
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7575
"commits when the two branches are out of date. In order for a commit \n"
7576
"to succeed, it may be necessary to update the current branch using \n"
7577
"``bzr update``."
7578
msgstr ""
7579
7580
#: dummy/help_topics/branches/detail.txt:15
7581
#: dummy/help_topics/checkouts/detail.txt:66
7582
#: dummy/help_topics/repositories/detail.txt:36
7583
msgid "Related commands::"
7584
msgstr ""
7585
7586
#: dummy/help_topics/branches/detail.txt:17
7587
msgid ""
7588
" init Change a directory into a versioned branch.\n"
7589
" branch Create a new branch that is a copy of an existing branch.\n"
7590
" merge Perform a three-way merge.\n"
7591
" bind Bind a branch to another one.\n"
7592
msgstr ""
7593
7594
#: dummy/help_topics/branches/summary.txt:1
7595
msgid "Information on what a branch is"
7596
msgstr ""
7597
7598
#: dummy/help_topics/bugs/summary.txt:1
7599
msgid "Bug tracker settings"
7600
msgstr ""
7601
7602
#: dummy/help_topics/checkouts/detail.txt:1
7603
msgid "Checkouts"
7604
msgstr ""
7605
7606
#: dummy/help_topics/checkouts/detail.txt:3
7607
msgid ""
7608
"Checkouts are source trees that are connected to a branch, so that when\n"
7609
"you commit in the source tree, the commit goes into that branch. They\n"
7610
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7611
"Bazaar's decentralized features until you want them. Using checkouts\n"
7612
"with shared repositories is very similar to working with SVN or CVS, but\n"
7613
"doesn't have the same restrictions. And using checkouts still allows\n"
7614
"others working on the project to use whatever workflow they like."
7615
msgstr ""
7616
7617
#: dummy/help_topics/checkouts/detail.txt:11
7618
msgid ""
7619
"A checkout is created with the bzr checkout command (see \"help "
7620
"checkout\").\n"
7621
"You pass it a reference to another branch, and it will create a local copy\n"
7622
"for you that still contains a reference to the branch you created the\n"
7623
"checkout from (the master branch). Then if you make any commits they will "
7624
"be\n"
7625
"made on the other branch first. This creates an instant mirror of your work, "
7626
"or\n"
7627
"facilitates lockstep development, where each developer is working together,\n"
7628
"continuously integrating the changes of others."
7629
msgstr ""
7630
7631
#: dummy/help_topics/checkouts/detail.txt:19
7632
msgid ""
7633
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7634
"you have the full history locally. As you have a first class branch you "
7635
"can\n"
7636
"also commit locally if you want, for instance due to the temporary loss af "
7637
"a\n"
7638
"network connection. Use the --local option to commit to do this. All the "
7639
"local\n"
7640
"commits will then be made on the master branch the next time you do a non-"
7641
"local\n"
7642
"commit."
7643
msgstr ""
7644
7645
#: dummy/help_topics/checkouts/detail.txt:26
7646
msgid ""
7647
"If you are using a checkout from a shared branch you will periodically want "
7648
"to\n"
7649
"pull in all the changes made by others. This is done using the \"update\"\n"
7650
"command. The changes need to be applied before any non-local commit, but\n"
7651
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7652
"command when needed."
7653
msgstr ""
7654
7655
#: dummy/help_topics/checkouts/detail.txt:32
7656
msgid ""
7657
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7658
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7659
"SVN checkout in that it is not a first class branch, it mainly consists of "
7660
"the\n"
7661
"working tree. This means that any history operations must query the master\n"
7662
"branch, which could be slow if a network connection is involved. Also, as "
7663
"you\n"
7664
"don't have a local branch, then you cannot commit locally."
7665
msgstr ""
7666
7667
#: dummy/help_topics/checkouts/detail.txt:39
7668
msgid ""
7669
"Lightweight checkouts work best when you have fast reliable access to the\n"
7670
"master branch. This means that if the master branch is on the same disk or "
7671
"LAN\n"
7672
"a lightweight checkout will be faster than a heavyweight one for any "
7673
"commands\n"
7674
"that modify the revision history (as only one copy of the branch needs to\n"
7675
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7676
"that uses the history but does not change it, but if the master branch is "
7677
"on\n"
7678
"the same disk then there won't be a noticeable difference."
7679
msgstr ""
7680
7681
#: dummy/help_topics/checkouts/detail.txt:47
7682
msgid ""
7683
"Another possible use for a checkout is to use it with a treeless repository\n"
7684
"containing your branches, where you maintain only one working tree by\n"
7685
"switching the master branch that the checkout points to when you want to\n"
7686
"work on a different branch."
7687
msgstr ""
7688
7689
#: dummy/help_topics/checkouts/detail.txt:52
7690
msgid ""
7691
"Obviously to commit on a checkout you need to be able to write to the "
7692
"master\n"
7693
"branch. This means that the master branch must be accessible over a "
7694
"writeable\n"
7695
"protocol , such as sftp://, and that you have write permissions at the "
7696
"other\n"
7697
"end. Checkouts also work on the local file system, so that all that matters "
7698
"is\n"
7699
"file permissions."
7700
msgstr ""
7701
7702
#: dummy/help_topics/checkouts/detail.txt:58
7703
msgid ""
7704
"You can change the master of a checkout by using the \"switch\" command "
7705
"(see\n"
7706
"\"help switch\"). This will change the location that the commits are sent "
7707
"to.\n"
7708
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7709
"checkout. If you would like to convert your heavy checkout into a normal\n"
7710
"branch so that every commit is local, you can use the \"unbind\" command. To "
7711
"see\n"
7712
"whether or not a branch is bound or not you can use the \"info\" command. If "
7713
"the\n"
7714
"branch is bound it will tell you the location of the bound branch."
7715
msgstr ""
7716
7717
#: dummy/help_topics/checkouts/detail.txt:68
7718
msgid ""
7719
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7720
" checkout\n"
7721
" update Pull any changes in the master branch in to your checkout\n"
7722
" commit Make a commit that is sent to the master branch. If you have\n"
7723
" a heavy checkout then the --local option will commit to the\n"
7724
" checkout without sending the commit to the master\n"
7725
" switch Change the master branch that the commits in the checkout "
7726
"will\n"
7727
" be sent to\n"
7728
" bind Turn a standalone branch into a heavy checkout so that any\n"
7729
" commits will be sent to the master branch\n"
7730
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7731
" commits are only made locally\n"
7732
" info Displays whether a branch is bound or unbound. If the branch "
7733
"is\n"
7734
" bound, then it will also display the location of the bound "
7735
"branch\n"
7736
msgstr ""
7737
7738
#: dummy/help_topics/checkouts/summary.txt:1
7739
msgid "Information on what a checkout is"
7740
msgstr ""
7741
7742
#: dummy/help_topics/commands/summary.txt:1
7743
msgid "Basic help for all commands"
7744
msgstr ""
7745
7746
#: dummy/help_topics/configuration/summary.txt:1
7747
msgid "Details on the configuration settings available"
7748
msgstr ""
7749
7750
#: dummy/help_topics/conflict-types/summary.txt:1
7751
msgid "Types of conflicts and what to do about them"
7752
msgstr ""
7753
7754
#: dummy/help_topics/content-filters/summary.txt:1
7755
msgid "Conversion of content into/from working trees"
7756
msgstr ""
7757
7758
#: dummy/help_topics/criss-cross/detail.txt:1
7759
msgid "Criss-Cross"
7760
msgstr ""
7761
7762
#: dummy/help_topics/criss-cross/detail.txt:3
7763
msgid ""
7764
"A criss-cross in the branch history can cause the default merge technique\n"
7765
"to emit more conflicts than would normally be expected."
7766
msgstr ""
7767
7768
#: dummy/help_topics/criss-cross/detail.txt:6
7769
msgid ""
7770
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7771
"give\n"
7772
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7773
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7774
msgstr ""
7775
7776
#: dummy/help_topics/criss-cross/detail.txt:10
7777
msgid ""
7778
"Criss-crosses occur in a branch's history if two branches merge the same "
7779
"thing\n"
7780
"and then merge one another, or if two branches merge one another at the "
7781
"same\n"
7782
"time. They can be avoided by having each branch only merge from or into a\n"
7783
"designated central branch (a \"star topology\")."
7784
msgstr ""
7785
7786
#: dummy/help_topics/criss-cross/detail.txt:15
7787
msgid ""
7788
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7789
"default\n"
7790
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7791
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7792
"differences between THIS and OTHER are due to one side adding lines, or\n"
7793
"from another side removing lines."
7794
msgstr ""
7795
7796
#: dummy/help_topics/criss-cross/detail.txt:21
7797
msgid ""
7798
"Criss-crosses mean there is no good choice for a base. Selecting the "
7799
"recent\n"
7800
"merge points could cause one side's changes to be silently discarded.\n"
7801
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7802
"are emitted."
7803
msgstr ""
7804
7805
#: dummy/help_topics/criss-cross/detail.txt:26
7806
msgid ""
7807
"The ``weave`` merge type is not affected by this problem because it uses\n"
7808
"line-origin detection instead of a basis revision to determine the cause of\n"
7809
"differences.\n"
7810
msgstr ""
7811
7812
#: dummy/help_topics/criss-cross/summary.txt:1
7813
msgid "Information on criss-cross merging"
7814
msgstr ""
7815
7816
#: dummy/help_topics/current-formats/summary.txt:1
7817
msgid "Current storage formats"
7818
msgstr ""
7819
7820
#: dummy/help_topics/debug-flags/summary.txt:1
7821
msgid "Options to show or record debug information"
7822
msgstr ""
7823
7824
#: dummy/help_topics/diverged-branches/summary.txt:1
7825
msgid "How to fix diverged branches"
7826
msgstr ""
7827
7828
#: dummy/help_topics/env-variables/summary.txt:1
7829
msgid "Environment variable names and values"
7830
msgstr ""
7831
7832
#: dummy/help_topics/eol/summary.txt:1
7833
msgid "Information on end-of-line handling"
7834
msgstr ""
7835
7836
#: dummy/help_topics/files/detail.txt:1
7837
msgid "Files"
7838
msgstr ""
7839
7840
#: dummy/help_topics/files/detail.txt:3
7841
msgid ""
7842
":On Unix: ~/.bazaar/bazaar.conf\n"
7843
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7844
"bazaar\\\\2.0\\\\bazaar.conf"
7845
msgstr ""
7846
7847
#: dummy/help_topics/files/detail.txt:6
7848
msgid ""
7849
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7850
"used to define general configuration that will be applied everywhere.\n"
7851
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7852
"commonly used options."
7853
msgstr ""
7854
7855
#: dummy/help_topics/files/detail.txt:11
7856
msgid "A typical config file might look something like::"
7857
msgstr ""
7858
7859
#: dummy/help_topics/files/detail.txt:13
7860
msgid ""
7861
" [DEFAULT]\n"
7862
" email=John Doe <jdoe@isp.com>"
7863
msgstr ""
7864
7865
#: dummy/help_topics/files/detail.txt:16
7866
msgid ""
7867
" [ALIASES]\n"
7868
" commit = commit --strict\n"
7869
" log10 = log --short -r -10..-1\n"
7870
msgstr ""
7871
7872
#: dummy/help_topics/files/summary.txt:1
7873
msgid "Information on configuration and log files"
7874
msgstr ""
7875
7876
#: dummy/help_topics/formats/detail.txt:1
7877
msgid "Storage Formats"
7878
msgstr ""
7879
7880
#: dummy/help_topics/formats/detail.txt:3
7881
msgid ""
7882
"To ensure that older clients do not access data incorrectly,\n"
7883
"Bazaar's policy is to introduce a new storage format whenever\n"
7884
"new features requiring new metadata are added. New storage\n"
7885
"formats may also be introduced to improve performance and\n"
7886
"scalability."
7887
msgstr ""
7888
7889
#: dummy/help_topics/formats/detail.txt:9
7890
msgid ""
7891
"The newest format, 2a, is highly recommended. If your\n"
7892
"project is not using 2a, then you should suggest to the\n"
7893
"project owner to upgrade."
7894
msgstr ""
7895
7896
#: dummy/help_topics/formats/detail.txt:13
7897
msgid ""
7898
"\n"
7899
".. note::"
7900
msgstr ""
7901
7902
#: dummy/help_topics/formats/detail.txt:16
7903
msgid ""
7904
" Some of the older formats have two variants:\n"
7905
" a plain one and a rich-root one. The latter include an additional\n"
7906
" field about the root of the tree. There is no performance cost\n"
7907
" for using a rich-root format but you cannot easily merge changes\n"
7908
" from a rich-root format into a plain format. As a consequence,\n"
7909
" moving a project to a rich-root format takes some co-ordination\n"
7910
" in that all contributors need to upgrade their repositories\n"
7911
" around the same time. 2a and all future formats will be\n"
7912
" implicitly rich-root."
7913
msgstr ""
7914
7915
#: dummy/help_topics/formats/detail.txt:26
7916
msgid ""
7917
"See :doc:`current-formats-help` for the complete list of\n"
7918
"currently supported formats. See :doc:`other-formats-help` for\n"
7919
"descriptions of any available experimental and deprecated formats.\n"
7920
msgstr ""
7921
7922
#: dummy/help_topics/formats/summary.txt:1
7923
msgid "Information on choosing a storage format"
7924
msgstr ""
7925
7926
#: dummy/help_topics/global-options/detail.txt:1
7927
msgid "Global Options"
7928
msgstr ""
7929
7930
#: dummy/help_topics/global-options/detail.txt:3
7931
msgid ""
7932
"These options may be used with any command, and may appear in front of any\n"
7933
"command. (e.g. ``bzr --profile help``)."
7934
msgstr ""
7935
7936
#: dummy/help_topics/global-options/detail.txt:6
7937
msgid ""
7938
"--version Print the version number. Must be supplied before the "
7939
"command.\n"
7940
"--no-aliases Do not process command aliases when running this command.\n"
7941
"--builtin Use the built-in version of a command, not the plugin "
7942
"version.\n"
7943
" This does not suppress other plugin effects.\n"
7944
"--no-plugins Do not process any plugins.\n"
7945
"--no-l10n Do not translate messages.\n"
7946
"--concurrency Number of processes that can be run concurrently (selftest)."
7947
msgstr ""
7948
7949
#: dummy/help_topics/global-options/detail.txt:14
7950
msgid ""
7951
"--profile Profile execution using the hotshot profiler.\n"
7952
"--lsprof Profile execution using the lsprof profiler.\n"
7953
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7954
" results to a specified file. If the filename ends with "
7955
"\".txt\",\n"
7956
" text format will be used. If the filename either starts "
7957
"with\n"
7958
" \"callgrind.out\" or end with \".callgrind\", the output will "
7959
"be\n"
7960
" formatted for use with KCacheGrind. Otherwise, the output\n"
7961
" will be a pickle.\n"
7962
"--coverage Generate line coverage report in the specified directory."
7963
msgstr ""
7964
7965
#: dummy/help_topics/global-options/detail.txt:24
7966
msgid ""
7967
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7968
"for\n"
7969
" the duration of the command. This can be used multiple times "
7970
"if\n"
7971
" several options need to be overridden."
7972
msgstr ""
7973
7974
#: dummy/help_topics/global-options/detail.txt:28
7975
msgid ""
7976
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7977
"information on profiling."
7978
msgstr ""
7979
7980
#: dummy/help_topics/global-options/detail.txt:31
7981
msgid ""
7982
"A number of debug flags are also available to assist troubleshooting and\n"
7983
"development. See :doc:`debug-flags-help`.\n"
7984
msgstr ""
7985
7986
#: dummy/help_topics/global-options/summary.txt:1
7987
msgid "Options that control how Bazaar runs"
7988
msgstr ""
7989
7990
#: dummy/help_topics/hidden-commands/summary.txt:1
7991
msgid "All hidden commands"
7992
msgstr ""
7993
7994
#: dummy/help_topics/hooks/summary.txt:1
7995
msgid "Points at which custom processing can be added"
7996
msgstr ""
7997
7998
#: dummy/help_topics/launchpad/detail.txt:1
7999
msgid "Integration with Launchpad.net"
8000
msgstr ""
8001
8002
#: dummy/help_topics/launchpad/detail.txt:3
8003
msgid ""
8004
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8005
"specification tracking."
8006
msgstr ""
8007
8008
#: dummy/help_topics/launchpad/detail.txt:6
8009
msgid ""
8010
"The bzr client (through the plugin called 'launchpad') has special\n"
8011
"features to communicate with Launchpad:"
8012
msgstr ""
8013
8014
#: dummy/help_topics/launchpad/detail.txt:9
8015
msgid ""
8016
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8017
"This\n"
8018
" is then used by the 'lp:' transport to download your branches using\n"
8019
" bzr+ssh://."
8020
msgstr ""
8021
8022
#: dummy/help_topics/launchpad/detail.txt:13
8023
msgid ""
8024
" * The 'lp:' transport uses Launchpad as a directory service: for "
8025
"example\n"
8026
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8027
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8028
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8029
msgstr ""
8030
8031
#: dummy/help_topics/launchpad/detail.txt:18
8032
msgid ""
8033
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8034
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8035
"lp:12345'\n"
8036
" will record a revision property that marks that revision as fixing\n"
8037
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8038
" automatically be linked to the bug report."
8039
msgstr ""
8040
8041
#: dummy/help_topics/launchpad/detail.txt:24
8042
msgid ""
8043
" * The register-branch command tells Launchpad about the url of a\n"
8044
" public branch. Launchpad will then mirror the branch, display\n"
8045
" its contents and allow it to be attached to bugs and other\n"
8046
" objects."
8047
msgstr ""
8048
8049
#: dummy/help_topics/launchpad/detail.txt:29
8050
msgid "For more information see http://help.launchpad.net/\n"
8051
msgstr ""
8052
8053
#: dummy/help_topics/launchpad/summary.txt:1
8054
msgid "Using Bazaar with Launchpad.net"
8055
msgstr ""
8056
8057
#: dummy/help_topics/location-alias/summary.txt:1
8058
msgid "Aliases for remembered locations"
8059
msgstr ""
8060
8061
#: dummy/help_topics/log-formats/summary.txt:1
8062
msgid "Details on the logging formats available"
8063
msgstr ""
8064
8065
#: dummy/help_topics/other-formats/summary.txt:1
8066
msgid "Experimental and deprecated storage formats"
8067
msgstr ""
8068
8069
#: dummy/help_topics/patterns/summary.txt:1
8070
msgid "Information on the pattern syntax"
8071
msgstr ""
8072
8073
#: dummy/help_topics/repositories/detail.txt:1
8074
msgid "Repositories"
8075
msgstr ""
8076
8077
#: dummy/help_topics/repositories/detail.txt:3
8078
msgid ""
8079
"Repositories in Bazaar are where committed information is stored. There is\n"
8080
"a repository associated with every branch."
8081
msgstr ""
8082
8083
#: dummy/help_topics/repositories/detail.txt:6
8084
msgid ""
8085
"Repositories are a form of database. Bzr will usually maintain this for\n"
8086
"good performance automatically, but in some situations (e.g. when doing\n"
8087
"very many commits in a short time period) you may want to ask bzr to\n"
8088
"optimise the database indices. This can be done by the 'bzr pack' command."
8089
msgstr ""
8090
8091
#: dummy/help_topics/repositories/detail.txt:11
8092
msgid ""
8093
"By default just running 'bzr init' will create a repository within the new\n"
8094
"branch but it is possible to create a shared repository which allows "
8095
"multiple\n"
8096
"branches to share their information in the same location. When a new branch "
8097
"is\n"
8098
"created it will first look to see if there is a containing shared repository "
8099
"it\n"
8100
"can use."
8101
msgstr ""
8102
8103
#: dummy/help_topics/repositories/detail.txt:17
8104
msgid ""
8105
"When two branches of the same project share a repository, there is\n"
8106
"generally a large space saving. For some operations (e.g. branching\n"
8107
"within the repository) this translates in to a large time saving."
8108
msgstr ""
8109
8110
#: dummy/help_topics/repositories/detail.txt:21
8111
msgid ""
8112
"To create a shared repository use the init-repository command (or the alias\n"
8113
"init-repo). This command takes the location of the repository to create. "
8114
"This\n"
8115
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8116
"which contains a shared repository. Any new branches that are created in "
8117
"this\n"
8118
"directory will then use it for storage."
8119
msgstr ""
8120
8121
#: dummy/help_topics/repositories/detail.txt:27
8122
msgid ""
8123
"It is a good idea to create a repository whenever you might create more\n"
8124
"than one branch of a project. This is true for both working areas where you\n"
8125
"are doing the development, and any server areas that you use for hosting\n"
8126
"projects. In the latter case, it is common to want branches without working\n"
8127
"trees. Since the files in the branch will not be edited directly there is "
8128
"no\n"
8129
"need to use up disk space for a working tree. To create a repository in "
8130
"which\n"
8131
"the branches will not have working trees pass the '--no-trees' option to\n"
8132
"'init-repository'."
8133
msgstr ""
8134
8135
#: dummy/help_topics/repositories/detail.txt:38
8136
msgid ""
8137
" init-repository Create a shared repository. Use --no-trees to create "
8138
"one\n"
8139
" in which new branches won't get a working tree.\n"
8140
msgstr ""
8141
8142
#: dummy/help_topics/repositories/summary.txt:1
8143
msgid "Basic information on shared repositories."
8144
msgstr ""
8145
8146
#: dummy/help_topics/revisionspec/summary.txt:1
8147
msgid "Explain how to use --revision"
8148
msgstr ""
8149
8150
#: dummy/help_topics/rules/summary.txt:1
8151
msgid "Information on defining rule-based preferences"
8152
msgstr ""
8153
8154
#: dummy/help_topics/standalone-trees/detail.txt:1
8155
msgid "Standalone Trees"
8156
msgstr ""
8157
8158
#: dummy/help_topics/standalone-trees/detail.txt:3
8159
msgid ""
8160
"A standalone tree is a working tree with an associated repository. It\n"
8161
"is an independently usable branch, with no dependencies on any other.\n"
8162
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8163
"an existing project under version control."
8164
msgstr ""
8165
8166
#: dummy/help_topics/standalone-trees/detail.txt:8
8167
msgid "Related Commands::"
8168
msgstr ""
8169
8170
#: dummy/help_topics/standalone-trees/detail.txt:10
8171
msgid " init Make a directory into a versioned branch.\n"
8172
msgstr ""
8173
8174
#: dummy/help_topics/standalone-trees/summary.txt:1
8175
msgid "Information on what a standalone tree is"
8176
msgstr ""
8177
8178
#: dummy/help_topics/standard-options/detail.txt:1
8179
msgid "Standard Options"
8180
msgstr ""
8181
8182
#: dummy/help_topics/standard-options/detail.txt:3
8183
msgid "Standard options are legal for all commands."
8184
msgstr ""
8185
8186
#: dummy/help_topics/standard-options/detail.txt:5
8187
msgid ""
8188
"--help, -h Show help message.\n"
8189
"--verbose, -v Display more information.\n"
8190
"--quiet, -q Only display errors and warnings."
8191
msgstr ""
8192
8193
#: dummy/help_topics/standard-options/detail.txt:9
8194
msgid "Unlike global options, standard options can be used in aliases.\n"
8195
msgstr ""
8196
8197
#: dummy/help_topics/standard-options/summary.txt:1
8198
msgid "Options that can be used with any command"
8199
msgstr ""
8200
8201
#: dummy/help_topics/status-flags/detail.txt:1
8202
msgid "Status Flags"
8203
msgstr ""
8204
8205
#: dummy/help_topics/status-flags/detail.txt:3
8206
msgid ""
8207
"Status flags are used to summarise changes to the working tree in a concise\n"
8208
"manner. They are in the form::"
8209
msgstr ""
8210
8211
#: dummy/help_topics/status-flags/detail.txt:6
8212
msgid " xxx <filename>"
8213
msgstr ""
8214
8215
#: dummy/help_topics/status-flags/detail.txt:8
8216
msgid "where the columns' meanings are as follows."
8217
msgstr ""
8218
8219
#: dummy/help_topics/status-flags/detail.txt:10
8220
msgid "Column 1 - versioning/renames::"
8221
msgstr ""
8222
8223
#: dummy/help_topics/status-flags/detail.txt:12
8224
msgid ""
8225
" + File versioned\n"
8226
" - File unversioned\n"
8227
" R File renamed\n"
8228
" ? File unknown\n"
8229
" X File nonexistent (and unknown to bzr)\n"
8230
" C File has conflicts\n"
8231
" P Entry for a pending merge (not a file)"
8232
msgstr ""
8233
8234
#: dummy/help_topics/status-flags/detail.txt:20
8235
msgid "Column 2 - contents::"
8236
msgstr ""
8237
8238
#: dummy/help_topics/status-flags/detail.txt:22
8239
msgid ""
8240
" N File created\n"
8241
" D File deleted\n"
8242
" K File kind changed\n"
8243
" M File modified"
8244
msgstr ""
8245
8246
#: dummy/help_topics/status-flags/detail.txt:27
8247
msgid "Column 3 - execute::"
8248
msgstr ""
8249
8250
#: dummy/help_topics/status-flags/detail.txt:29
8251
msgid " * The execute bit was changed\n"
8252
msgstr ""
8253
8254
#: dummy/help_topics/status-flags/summary.txt:1
8255
msgid "Help on status flags"
8256
msgstr ""
8257
8258
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8259
msgid "Branches Out of Sync"
8260
msgstr ""
8261
8262
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8263
msgid ""
8264
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8265
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8266
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8267
"have the same last revision as the new reference branch for the lightweight\n"
8268
"checkout, data could be lost, so Bazaar refuses."
8269
msgstr ""
8270
8271
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8272
msgid "How you deal with this depends on *why* the branches are out of sync."
8273
msgstr ""
8274
8275
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8276
msgid ""
8277
"If you have a checkout and have done local commits, you can get back in "
8278
"sync\n"
8279
"by running \"bzr update\" (and possibly \"bzr commit\")."
8280
msgstr ""
8281
8282
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8283
msgid ""
8284
"If you have a branch and the remote branch is out-of-date, you can push\n"
8285
"the local changes using \"bzr push\". If the local branch is out of date, "
8286
"you\n"
8287
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8288
"commit\n"
8289
"and then push your changes. If you decide that some of the changes aren't\n"
8290
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8291
msgstr ""
8292
8293
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8294
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8295
msgstr ""
8296
8297
#: dummy/help_topics/topics/summary.txt:1
8298
msgid "Topics list"
8299
msgstr ""
8300
8301
#: dummy/help_topics/url-special-chars/summary.txt:1
8302
msgid "Special character handling in URLs"
8303
msgstr ""
8304
8305
#: dummy/help_topics/urlspec/summary.txt:1
8306
msgid "Supported transport protocols"
8307
msgstr ""
8308
8309
#: dummy/help_topics/working-trees/detail.txt:1
8310
msgid "Working Trees"
8311
msgstr ""
8312
8313
#: dummy/help_topics/working-trees/detail.txt:3
8314
msgid ""
8315
"A working tree is the contents of a branch placed on disk so that you can\n"
8316
"see the files and edit them. The working tree is where you make changes to "
8317
"a\n"
8318
"branch, and when you commit the current state of the working tree is the\n"
8319
"snapshot that is recorded in the commit."
8320
msgstr ""
8321
8322
#: dummy/help_topics/working-trees/detail.txt:8
8323
msgid ""
8324
"When you push a branch to a remote system, a working tree will not be\n"
8325
"created. If one is already present the files will not be updated. The\n"
8326
"branch information will be updated and the working tree will be marked\n"
8327
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8328
"may be uncommitted changes or the update may cause content conflicts that "
8329
"are\n"
8330
"difficult to deal with remotely."
8331
msgstr ""
8332
8333
#: dummy/help_topics/working-trees/detail.txt:15
8334
msgid ""
8335
"If you have a branch with no working tree you can use the 'checkout' "
8336
"command\n"
8337
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8338
"will\n"
8339
"create the working tree. If the branch is updated remotely, you can update "
8340
"the\n"
8341
"working tree by running 'bzr update' in that directory."
8342
msgstr ""
8343
8344
#: dummy/help_topics/working-trees/detail.txt:20
8345
msgid ""
8346
"If you have a branch with a working tree that you do not want the 'remove-"
8347
"tree'\n"
8348
"command will remove the tree if it is safe. This can be done to avoid the\n"
8349
"warning about the remote working tree not being updated when pushing to the\n"
8350
"branch. It can also be useful when working with a '--no-trees' repository\n"
8351
"(see 'bzr help repositories')."
8352
msgstr ""
8353
8354
#: dummy/help_topics/working-trees/detail.txt:26
8355
msgid ""
8356
"If you want to have a working tree on a remote machine that you push to you\n"
8357
"can either run 'bzr update' in the remote branch after each push, or use "
8358
"some\n"
8359
"other method to update the tree during the push. There is an 'rspush' "
8360
"plugin\n"
8361
"that will update the working tree using rsync as well as doing a push. "
8362
"There\n"
8363
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8364
"SSH\n"
8365
"after each push."
8366
msgstr ""
8367
8368
#: dummy/help_topics/working-trees/detail.txt:33
8369
msgid "Useful commands::"
8370
msgstr ""
8371
8372
#: dummy/help_topics/working-trees/detail.txt:35
8373
msgid ""
8374
" checkout Create a working tree when a branch does not have one.\n"
8375
" remove-tree Removes the working tree from a branch when it is safe to do "
8376
"so.\n"
8377
" update When a working tree is out of sync with its associated "
8378
"branch\n"
8379
" this will update the tree to match the branch.\n"
8380
msgstr ""
8381
8382
#: dummy/help_topics/working-trees/summary.txt:1
8383
msgid "Information on working trees"
8384
msgstr ""
8385
8386
#: en/help_topics/authentication.txt:1
8387
msgid ""
8388
"Authentication Settings\n"
8389
"======================="
8390
msgstr ""
8391
8392
#: en/help_topics/authentication.txt:4
8393
msgid ""
8394
"\n"
8395
"Intent\n"
8396
"------"
8397
msgstr ""
8398
8399
#: en/help_topics/authentication.txt:8
8400
msgid ""
8401
"Many different authentication policies can be described in the\n"
8402
"``authentication.conf`` file but a particular user should need only a few\n"
8403
"definitions to cover his needs without having to specify a user and a "
8404
"password\n"
8405
"for every branch he uses."
8406
msgstr ""
8407
8408
#: en/help_topics/authentication.txt:13
8409
msgid ""
8410
"The definitions found in this file are used to find the credentials to use "
8411
"for\n"
8412
"a given url. The same credentials can generally be used for as many branches "
8413
"as\n"
8414
"possible by grouping their declaration around the remote servers that need\n"
8415
"them. It's even possible to declare credentials that will be used by "
8416
"different\n"
8417
"servers."
8418
msgstr ""
8419
8420
#: en/help_topics/authentication.txt:19
8421
msgid ""
8422
"The intent is to make this file as small as possible to minimize maintenance."
8423
msgstr ""
8424
8425
#: en/help_topics/authentication.txt:21
8426
msgid ""
8427
"Once the relevant credentials are declared in this file you may use branch "
8428
"urls\n"
8429
"without embedding passwords (security hazard) or even users (enabling "
8430
"sharing\n"
8431
"of your urls with others)."
8432
msgstr ""
8433
8434
#: en/help_topics/authentication.txt:25
8435
msgid "Instead of using::"
8436
msgstr ""
8437
8438
#: en/help_topics/authentication.txt:27
8439
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8440
msgstr ""
8441
8442
#: en/help_topics/authentication.txt:29
8443
msgid "you simply use::"
8444
msgstr ""
8445
8446
#: en/help_topics/authentication.txt:31
8447
msgid " bzr branch ftp://host.com/path/to/my/branch"
8448
msgstr ""
8449
8450
#: en/help_topics/authentication.txt:33
8451
msgid ""
8452
"provided you have created the following ``authentication.conf`` file::"
8453
msgstr ""
8454
8455
#: en/help_topics/authentication.txt:35
8456
msgid ""
8457
" [myprojects]\n"
8458
" scheme=ftp\n"
8459
" host=host.com\n"
8460
" user=joe\n"
8461
" password=secret\n"
8462
" "
8463
msgstr ""
8464
8465
#: en/help_topics/authentication.txt:42
8466
msgid ""
8467
"Authentication definitions\n"
8468
"--------------------------"
8469
msgstr ""
8470
8471
#: en/help_topics/authentication.txt:45
8472
msgid ""
8473
"There are two kinds of authentication used by the various schemes supported "
8474
"by\n"
8475
"bzr:"
8476
msgstr ""
8477
8478
#: en/help_topics/authentication.txt:48
8479
msgid "1. user and password"
8480
msgstr ""
8481
8482
#: en/help_topics/authentication.txt:50
8483
msgid ""
8484
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8485
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8486
"ssh agents are a better, more secure solution. So we have chosen to not "
8487
"provide\n"
8488
"our own less secure method."
8489
msgstr ""
8490
8491
#: en/help_topics/authentication.txt:55
8492
msgid "2. user, realm and password"
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:57
8496
msgid ""
8497
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8498
"against a host. But, by using ``.htaccess`` files, for example, it is "
8499
"possible\n"
8500
"to define several (``user, realm, password``) for a given ``host``. So what "
8501
"is\n"
8502
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8503
"is\n"
8504
"not taken into account in the definitions, but will displayed if bzr "
8505
"prompts\n"
8506
"you for a password."
8507
msgstr ""
8508
8509
#: en/help_topics/authentication.txt:64
8510
msgid ""
8511
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8512
"specifying the appropriate port."
8513
msgstr ""
8514
8515
#: en/help_topics/authentication.txt:67
8516
msgid ""
8517
"To take all schemes into account, the password will be deduced from a set "
8518
"of\n"
8519
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8520
"``user``,\n"
8521
"``password``)."
8522
msgstr ""
8523
8524
#: en/help_topics/authentication.txt:71
8525
msgid ""
8526
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8527
"used\n"
8528
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8529
"``ssh``\n"
8530
" should be used instead since this is the real scheme regarding\n"
8531
" authentication,"
8532
msgstr ""
8533
8534
#: en/help_topics/authentication.txt:76
8535
msgid " * ``host``: can be empty (to act as a default for any host),"
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:78
8539
msgid ""
8540
" * ``port`` can be empty (useful when an host provides several servers for "
8541
"the\n"
8542
" same scheme), only numerical values are allowed, this should be used "
8543
"only\n"
8544
" when the server uses a port different than the scheme standard port,"
8545
msgstr ""
8546
8547
#: en/help_topics/authentication.txt:82
8548
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:84
8552
msgid ""
8553
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8554
" ``getpass.get_user()``),"
8555
msgstr ""
8556
8557
#: en/help_topics/authentication.txt:87
8558
msgid ""
8559
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8560
" password."
8561
msgstr ""
8562
8563
#: en/help_topics/authentication.txt:90
8564
msgid ""
8565
"Multiple definitions can be provided and, for a given URL, bzr will select "
8566
"a\n"
8567
"(``user`` [, ``password``]) based on the following rules :"
8568
msgstr ""
8569
8570
#: en/help_topics/authentication.txt:93
8571
msgid " 1. the first match wins,"
8572
msgstr ""
8573
8574
#: en/help_topics/authentication.txt:95
8575
msgid " 2. empty fields match everything,"
8576
msgstr ""
8577
8578
#: en/help_topics/authentication.txt:97
8579
msgid ""
8580
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8581
msgstr ""
8582
8583
#: en/help_topics/authentication.txt:99
8584
msgid ""
8585
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8586
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8587
"``projectbzr.sf.net``\n"
8588
" will not match ``bzr.sf.net``)."
8589
msgstr ""
8590
8591
#: en/help_topics/authentication.txt:103
8592
msgid ""
8593
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8594
msgstr ""
8595
8596
#: en/help_topics/authentication.txt:105
8597
msgid ""
8598
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8599
"above,\n"
8600
" empty paths will match any provided path)."
8601
msgstr ""
8602
8603
#: en/help_topics/authentication.txt:110
8604
msgid ""
8605
"File format\n"
8606
"-----------"
8607
msgstr ""
8608
8609
#: en/help_topics/authentication.txt:113
8610
msgid ""
8611
"The general rules for :doc:`configuration files <configuration-help>`\n"
8612
"apply except for the variable policies."
8613
msgstr ""
8614
8615
#: en/help_topics/authentication.txt:116
8616
msgid "Each section describes an authentication definition."
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:118
8620
msgid ""
8621
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8622
"reserved\n"
8623
"and should appear as the *last* section."
8624
msgstr ""
8625
8626
#: en/help_topics/authentication.txt:121
8627
msgid "Each section should define:"
8628
msgstr ""
8629
8630
#: en/help_topics/authentication.txt:123
8631
msgid "* ``user``: the login to be used,"
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:125
8635
msgid "Each section could define:"
8636
msgstr ""
8637
8638
#: en/help_topics/authentication.txt:127
8639
msgid "* ``host``: the remote server,"
8640
msgstr ""
8641
8642
#: en/help_topics/authentication.txt:129
8643
msgid "* ``port``: the port the server is listening,"
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:131
8647
msgid "* ``path``: the branch location,"
8648
msgstr ""
8649
8650
#: en/help_topics/authentication.txt:133
8651
msgid "* ``password``: the password."
8652
msgstr ""
8653
8654
#: en/help_topics/authentication.txt:135
8655
msgid ""
8656
"\n"
8657
"Examples\n"
8658
"--------"
8659
msgstr ""
8660
8661
#: en/help_topics/authentication.txt:139
8662
msgid ""
8663
"\n"
8664
"Personal projects hosted outside\n"
8665
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8666
msgstr ""
8667
8668
#: en/help_topics/authentication.txt:143
8669
msgid ""
8670
"All connections are done with the same ``user`` (the remote one for which "
8671
"the\n"
8672
"default bzr one is not appropriate) and the password is always prompted "
8673
"with\n"
8674
"some exceptions::"
8675
msgstr ""
8676
8677
#: en/help_topics/authentication.txt:147
8678
msgid ""
8679
" # Pet projects on hobby.net\n"
8680
" [hobby]\n"
8681
" host=r.hobby.net\n"
8682
" user=jim\n"
8683
" password=obvious1234\n"
8684
" \n"
8685
" # Home server\n"
8686
" [home]\n"
8687
" scheme=https\n"
8688
" host=home.net\n"
8689
" user=joe\n"
8690
" password=1essobV10us\n"
8691
" \n"
8692
" [DEFAULT]\n"
8693
" # Our local user is barbaz, on all remote sites we're known as "
8694
"foobar\n"
8695
" user=foobar"
8696
msgstr ""
8697
8698
#: en/help_topics/authentication.txt:164
8699
msgid ""
8700
"\n"
8701
"Source hosting provider\n"
8702
"~~~~~~~~~~~~~~~~~~~~~~~"
8703
msgstr ""
8704
8705
#: en/help_topics/authentication.txt:168
8706
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8707
msgstr ""
8708
8709
#: en/help_topics/authentication.txt:170
8710
msgid ""
8711
" [shpnet domain]\n"
8712
" # we use sftp, but ssh is the scheme used for authentication\n"
8713
" scheme=ssh\n"
8714
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8715
" host=.shp.net\n"
8716
" user=joe\n"
8717
" # bzr don't support supplying a password for sftp,\n"
8718
" # consider using an ssh agent if you don't want to supply\n"
8719
" # a password interactively. (pageant, ssh-agent, etc)"
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:180
8723
msgid ""
8724
"HTTPS, SFTP servers and their proxy\n"
8725
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8726
msgstr ""
8727
8728
#: en/help_topics/authentication.txt:183
8729
msgid ""
8730
"At company.com, the server hosting release and integration branches is "
8731
"behind a\n"
8732
"proxy, and the two branches use different authentication policies::"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:186
8736
msgid ""
8737
" [reference code]\n"
8738
" scheme=https\n"
8739
" host=dev.company.com\n"
8740
" path=/dev\n"
8741
" user=user1\n"
8742
" password=pass1"
8743
msgstr ""
8744
8745
#: en/help_topics/authentication.txt:193
8746
msgid ""
8747
" # development branches on dev server\n"
8748
" [dev]\n"
8749
" scheme=ssh # bzr+ssh and sftp are available here\n"
8750
" host=dev.company.com\n"
8751
" path=/dev/integration\n"
8752
" user=user2\n"
8753
" \n"
8754
" # proxy\n"
8755
" [proxy]\n"
8756
" scheme=http\n"
8757
" host=proxy.company.com\n"
8758
" port=3128\n"
8759
" user=proxyuser1\n"
8760
" password=proxypass1"
8761
msgstr ""
8762
8763
#: en/help_topics/authentication.txt:208
8764
msgid ""
8765
"\n"
8766
"Planned enhancements\n"
8767
"--------------------"
8768
msgstr ""
8769
8770
#: en/help_topics/authentication.txt:212
8771
msgid ""
8772
"The following are not yet implemented but planned as parts of a work in\n"
8773
"progress:"
8774
msgstr ""
8775
8776
#: en/help_topics/authentication.txt:215
8777
msgid "* add a ``password_encoding`` field allowing:"
8778
msgstr ""
8779
8780
#: en/help_topics/authentication.txt:217
8781
msgid ""
8782
" - storing the passwords in various obfuscating encodings (base64 for one),"
8783
msgstr ""
8784
8785
#: en/help_topics/authentication.txt:219
8786
msgid " - delegate password storage to plugins (.netrc for example)."
8787
msgstr ""
8788
8789
#: en/help_topics/authentication.txt:221
8790
msgid ""
8791
"* update the credentials when the user is prompted for user or password,"
8792
msgstr ""
8793
8794
#: en/help_topics/authentication.txt:223
8795
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:225
8799
msgid ""
8800
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8801
"but\n"
8802
"ignored in the actual implementation.\n"
8803
msgstr ""
8804
8805
#: en/help_topics/bugs.txt:1
8806
msgid "Bug Tracker Settings"
8807
msgstr ""
8808
8809
#: en/help_topics/bugs.txt:3
8810
msgid ""
8811
"When making a commit, metadata about bugs fixed by that change can be\n"
8812
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8813
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8814
"(The only ``status`` value currently supported is ``fixed.``)"
8815
msgstr ""
8816
8817
#: en/help_topics/bugs.txt:8
8818
msgid ""
8819
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8820
"identifier\n"
8821
"rather than a full URL. This looks like::"
8822
msgstr ""
8823
8824
#: en/help_topics/bugs.txt:11
8825
msgid " bzr commit --fixes <tracker>:<id>"
8826
msgstr ""
8827
8828
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8829
msgid "or::"
8830
msgstr ""
8831
8832
#: en/help_topics/bugs.txt:15
8833
msgid " bzr commit --fixes <id>"
8834
msgstr ""
8835
8836
#: en/help_topics/bugs.txt:17
8837
msgid ""
8838
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8839
"the\n"
8840
"identifier for that bug within the bugtracker, usually the bug number.\n"
8841
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8842
"or global configuration is used."
8843
msgstr ""
8844
8845
#: en/help_topics/bugs.txt:22
8846
msgid ""
8847
"Bazaar knows about a few bug trackers that have many users. If\n"
8848
"you use one of these bug trackers then there is no setup required to\n"
8849
"use this feature, you just need to know the tracker identifier to use.\n"
8850
"These are the bugtrackers that are built in:"
8851
msgstr ""
8852
8853
#: en/help_topics/bugs.txt:27
8854
msgid ""
8855
" ============================ ============ ============\n"
8856
" URL Abbreviation Example\n"
8857
" ============================ ============ ============\n"
8858
" https://bugs.launchpad.net/ lp lp:12345\n"
8859
" http://bugs.debian.org/ deb deb:12345\n"
8860
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8861
" ============================ ============ ============"
8862
msgstr ""
8863
8864
#: en/help_topics/bugs.txt:35
8865
msgid ""
8866
"For the bug trackers not listed above configuration is required.\n"
8867
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8868
"is built in, along with a template mechanism for other bugtrackers with\n"
8869
"simple URL schemes. If your bug tracker can't be described by one\n"
8870
"of the schemes described below then you can write a plugin to support\n"
8871
"it."
8872
msgstr ""
8873
8874
#: en/help_topics/bugs.txt:42
8875
msgid ""
8876
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8877
"variable which contains the base URL of the bug tracker. These options\n"
8878
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8879
"configuration section in ``locations.conf``. You can set up these values\n"
8880
"for each of the projects you work on."
8881
msgstr ""
8882
8883
#: en/help_topics/bugs.txt:48
8884
msgid ""
8885
"Note: As you provide a short name for each tracker, you can specify one or\n"
8886
"more bugs in one or more trackers at commit time if you wish."
8887
msgstr ""
8888
8889
#: en/help_topics/bugs.txt:51
8890
msgid ""
8891
"Launchpad\n"
8892
"---------"
8893
msgstr ""
8894
8895
#: en/help_topics/bugs.txt:54
8896
msgid ""
8897
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8898
msgstr ""
8899
8900
#: en/help_topics/bugs.txt:56
8901
msgid ""
8902
"bugzilla_<tracker>_url\n"
8903
"----------------------"
8904
msgstr ""
8905
8906
#: en/help_topics/bugs.txt:59
8907
msgid ""
8908
"If present, the location of the Bugzilla bug tracker referred to by\n"
8909
"<tracker>. This option can then be used together with ``bzr commit\n"
8910
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8911
"example::"
8912
msgstr ""
8913
8914
#: en/help_topics/bugs.txt:64
8915
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8916
msgstr ""
8917
8918
#: en/help_topics/bugs.txt:66
8919
msgid ""
8920
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8921
"fixed."
8922
msgstr ""
8923
8924
#: en/help_topics/bugs.txt:69
8925
msgid ""
8926
"trac_<tracker>_url\n"
8927
"------------------"
8928
msgstr ""
8929
8930
#: en/help_topics/bugs.txt:72
8931
msgid ""
8932
"If present, the location of the Trac instance referred to by\n"
8933
"<tracker>. This option can then be used together with ``bzr commit\n"
8934
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8935
"example::"
8936
msgstr ""
8937
8938
#: en/help_topics/bugs.txt:77
8939
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8940
msgstr ""
8941
8942
#: en/help_topics/bugs.txt:79
8943
msgid ""
8944
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8945
"as\n"
8946
"fixed."
8947
msgstr ""
8948
8949
#: en/help_topics/bugs.txt:82
8950
msgid ""
8951
"bugtracker_<tracker>_url\n"
8952
"------------------------"
8953
msgstr ""
8954
8955
#: en/help_topics/bugs.txt:85
8956
msgid ""
8957
"If present, the location of a generic bug tracker instance referred to by\n"
8958
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8959
"which will be replaced by a specific bug ID. This option can then be used\n"
8960
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8961
"fixed by that commit. For example::"
8962
msgstr ""
8963
8964
#: en/help_topics/bugs.txt:91
8965
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8966
msgstr ""
8967
8968
#: en/help_topics/bugs.txt:93
8969
msgid ""
8970
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8971
"Roundup bug tracker as fixed, or::"
8972
msgstr ""
8973
8974
#: en/help_topics/bugs.txt:96
8975
msgid ""
8976
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8977
msgstr ""
8978
8979
#: en/help_topics/bugs.txt:98
8980
msgid ""
8981
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8982
"RT bug tracker as fixed, or::"
8983
msgstr ""
8984
8985
#: en/help_topics/bugs.txt:101
8986
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8987
msgstr ""
8988
8989
#: en/help_topics/bugs.txt:103
8990
msgid ""
8991
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8992
"1234\n"
8993
"in Hudson's JIRA bug tracker as fixed.\n"
8994
msgstr ""
8995
8996
#: en/help_topics/commands.txt:1
8997
msgid ""
8998
"add Add specified files or directories.\n"
8999
"alias Set/unset and display aliases.\n"
9000
"annotate Show the origin of each line in a file.\n"
9001
"bash-completion Generate a shell function for bash command line "
9002
"completion.\n"
9003
" [bash_completion]\n"
9004
"bind Convert the current branch into a checkout of the "
9005
"supplied\n"
9006
" branch.\n"
9007
"branch Create a new branch that is a copy of an existing branch.\n"
9008
"branches List the branches available at the current location.\n"
9009
"break-lock Break a dead lock.\n"
9010
"cat Write the contents of a file as of a given revision to\n"
9011
" standard output.\n"
9012
"check Validate working tree structure, branch consistency and\n"
9013
" repository history.\n"
9014
"checkout Create a new checkout of an existing branch.\n"
9015
"clean-tree Remove unwanted files from working tree.\n"
9016
"commit Commit changes into a new revision.\n"
9017
"config Display, set or remove a configuration option.\n"
9018
"conflicts List files with conflicts.\n"
9019
"deleted List files deleted in the working tree.\n"
9020
"diff Show differences in the working tree, between revisions "
9021
"or\n"
9022
" branches.\n"
9023
"dpush Push into a different VCS without any custom bzr "
9024
"metadata.\n"
9025
"export Export current or past revision to a destination directory "
9026
"or\n"
9027
" archive.\n"
9028
"help Show help on a command or other topic.\n"
9029
"ignore Ignore specified files or patterns.\n"
9030
"ignored List ignored files and the patterns that matched them.\n"
9031
"info Show information about a working tree, branch or "
9032
"repository.\n"
9033
"init Make a directory into a versioned branch.\n"
9034
"init-repository Create a shared repository for branches to share storage\n"
9035
" space.\n"
9036
"join Combine a tree into its containing tree.\n"
9037
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9038
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9039
"launchpad-open Open a Launchpad branch page in your web browser. "
9040
"[launchpad]\n"
9041
"log Show historical log for a branch or subset of a branch.\n"
9042
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9043
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9044
"ls List files in a tree.\n"
9045
"merge Perform a three-way merge.\n"
9046
"missing Show unmerged/unpulled revisions between two branches.\n"
9047
"mkdir Create a new versioned directory.\n"
9048
"mv Move or rename a file.\n"
9049
"nick Print or set the branch nickname.\n"
9050
"pack Compress the data within a repository.\n"
9051
"plugins List the installed plugins.\n"
9052
"pull Turn this branch into a mirror of another branch.\n"
9053
"push Update a mirror of this branch.\n"
9054
"reconcile Reconcile bzr metadata in a branch.\n"
9055
"reconfigure Reconfigure the type of a bzr directory.\n"
9056
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9057
"remerge Redo a merge.\n"
9058
"remove Remove files or directories.\n"
9059
"remove-branch Remove a branch.\n"
9060
"remove-tree Remove the working tree from a given branch/checkout.\n"
9061
"renames Show list of renamed files.\n"
9062
"resolve Mark a conflict as resolved.\n"
9063
"revert Set files in the working tree back to the contents of a\n"
9064
" previous revision.\n"
9065
"revno Show current revision number.\n"
9066
"root Show the tree root directory.\n"
9067
"send Mail or create a merge-directive for submitting changes.\n"
9068
"serve Run the bzr server.\n"
9069
"shelve Temporarily set aside some changes from the current tree.\n"
9070
"sign-my-commits Sign all commits by a given committer.\n"
9071
"split Split a subdirectory of a tree into a separate tree.\n"
9072
"status Display status summary.\n"
9073
"switch Set the branch of a checkout and update.\n"
9074
"tag Create, remove or modify a tag naming a revision.\n"
9075
"tags List tags.\n"
9076
"testament Show testament (signing-form) of a revision.\n"
9077
"unbind Convert the current checkout into a regular branch.\n"
9078
"uncommit Remove the last committed revision.\n"
9079
"unshelve Restore shelved changes.\n"
9080
"update Update a working tree to a new revision.\n"
9081
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9082
" format.\n"
9083
"verify-signatures Verify all commit signatures.\n"
9084
"version Show version of bzr.\n"
9085
"version-info Show version information about this tree.\n"
9086
"view Manage filtered views.\n"
9087
"whoami Show or set bzr user id.\n"
9088
msgstr ""
9089
9090
#: en/help_topics/configuration.txt:1
9091
msgid ""
9092
"Configuration Settings\n"
9093
"======================="
9094
msgstr ""
9095
9096
#: en/help_topics/configuration.txt:4
9097
msgid ""
9098
"Environment settings\n"
9099
"---------------------"
9100
msgstr ""
9101
9102
#: en/help_topics/configuration.txt:7
9103
msgid ""
9104
"While most configuration is handled by configuration files, some options\n"
9105
"which may be semi-permanent can also be controlled through the environment."
9106
msgstr ""
9107
9108
#: en/help_topics/configuration.txt:10
9109
msgid ""
9110
"BZR_EMAIL\n"
9111
"~~~~~~~~~"
9112
msgstr ""
9113
9114
#: en/help_topics/configuration.txt:13
9115
msgid "Override the email id used by Bazaar. Typical format::"
9116
msgstr ""
9117
9118
#: en/help_topics/configuration.txt:15
9119
msgid " \"John Doe <jdoe@example.com>\""
9120
msgstr ""
9121
9122
#: en/help_topics/configuration.txt:17
9123
msgid "See also the ``email`` configuration option."
9124
msgstr ""
9125
9126
#: en/help_topics/configuration.txt:19
9127
msgid ""
9128
"BZR_PROGRESS_BAR\n"
9129
"~~~~~~~~~~~~~~~~"
9130
msgstr ""
9131
9132
#: en/help_topics/configuration.txt:22
9133
msgid ""
9134
"Override the progress display. Possible values are \"none\" or \"text\". "
9135
"If\n"
9136
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9137
"draws\n"
9138
"the ordinary command line progress bar."
9139
msgstr ""
9140
9141
#: en/help_topics/configuration.txt:26
9142
msgid ""
9143
"BZR_SIGQUIT_PDB\n"
9144
"~~~~~~~~~~~~~~~"
9145
msgstr ""
9146
9147
#: en/help_topics/configuration.txt:29
9148
msgid ""
9149
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9150
msgstr ""
9151
9152
#: en/help_topics/configuration.txt:31
9153
msgid ""
9154
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9155
"* 1 = Invoke breakin debugger (default)"
9156
msgstr ""
9157
9158
#: en/help_topics/configuration.txt:34
9159
msgid ""
9160
"BZR_HOME\n"
9161
"~~~~~~~~"
9162
msgstr ""
9163
9164
#: en/help_topics/configuration.txt:37
9165
msgid "Override the home directory used by Bazaar."
9166
msgstr ""
9167
9168
#: en/help_topics/configuration.txt:39
9169
msgid ""
9170
"BZR_SSH\n"
9171
"~~~~~~~"
9172
msgstr ""
9173
9174
#: en/help_topics/configuration.txt:42
9175
msgid "Select a different SSH implementation."
9176
msgstr ""
9177
9178
#: en/help_topics/configuration.txt:44
9179
msgid ""
9180
"BZR_PDB\n"
9181
"~~~~~~~"
9182
msgstr ""
9183
9184
#: en/help_topics/configuration.txt:47
9185
msgid "Control whether to launch a debugger on error."
9186
msgstr ""
9187
9188
#: en/help_topics/configuration.txt:49
9189
msgid ""
9190
"* 0 = Standard behavior\n"
9191
"* 1 = Launch debugger"
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:52
9195
msgid ""
9196
"BZR_REMOTE_PATH\n"
9197
"~~~~~~~~~~~~~~~"
9198
msgstr ""
9199
9200
#: en/help_topics/configuration.txt:55
9201
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9202
msgstr ""
9203
9204
#: en/help_topics/configuration.txt:57
9205
msgid "See also the ``bzr_remote_path`` configuration option."
9206
msgstr ""
9207
9208
#: en/help_topics/configuration.txt:59
9209
msgid ""
9210
"BZR_EDITOR\n"
9211
"~~~~~~~~~~"
9212
msgstr ""
9213
9214
#: en/help_topics/configuration.txt:62
9215
msgid "Path to the editor Bazaar should use for commit messages, etc."
9216
msgstr ""
9217
9218
#: en/help_topics/configuration.txt:64
9219
msgid ""
9220
"BZR_LOG\n"
9221
"~~~~~~~"
9222
msgstr ""
9223
9224
#: en/help_topics/configuration.txt:67
9225
msgid ""
9226
"Location of the Bazaar log file. You can check the current location by\n"
9227
"running ``bzr version``."
9228
msgstr ""
9229
9230
#: en/help_topics/configuration.txt:70
9231
msgid ""
9232
"The log file contains debug information that is useful for diagnosing or\n"
9233
"reporting problems with Bazaar."
9234
msgstr ""
9235
9236
#: en/help_topics/configuration.txt:73
9237
msgid ""
9238
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9239
"will disable logging."
9240
msgstr ""
9241
9242
#: en/help_topics/configuration.txt:76
9243
msgid ""
9244
"\n"
9245
"BZR_PLUGIN_PATH\n"
9246
"~~~~~~~~~~~~~~~"
9247
msgstr ""
9248
9249
#: en/help_topics/configuration.txt:80
9250
msgid ""
9251
"The path to the plugins directory that Bazaar should use.\n"
9252
"If not set, Bazaar will search for plugins in:"
9253
msgstr ""
9254
9255
#: en/help_topics/configuration.txt:83
9256
msgid ""
9257
"* the user specific plugin directory (containing the ``user`` plugins),"
9258
msgstr ""
9259
9260
#: en/help_topics/configuration.txt:85
9261
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9262
msgstr ""
9263
9264
#: en/help_topics/configuration.txt:87
9265
msgid ""
9266
"* the site specific plugin directory if applicable (containing\n"
9267
" the ``site`` plugins)."
9268
msgstr ""
9269
9270
#: en/help_topics/configuration.txt:90
9271
msgid ""
9272
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9273
"the way the plugin are searched. "
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:93
9277
msgid ""
9278
"As for the ``PATH`` variables, if multiple directories are\n"
9279
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9280
"platform specific appropriate character (':' on Unix,\n"
9281
"';' on windows)"
9282
msgstr ""
9283
9284
#: en/help_topics/configuration.txt:98
9285
msgid ""
9286
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9287
"in ``user``. However it will continue to search in ``core`` and\n"
9288
"``site`` unless they are explicitly removed."
9289
msgstr ""
9290
9291
#: en/help_topics/configuration.txt:102
9292
msgid ""
9293
"If you need to change the order or remove one of these\n"
9294
"directories, you should use special values:"
9295
msgstr ""
9296
9297
#: en/help_topics/configuration.txt:105
9298
msgid ""
9299
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9300
" path from the default values,"
9301
msgstr ""
9302
9303
#: en/help_topics/configuration.txt:108
9304
msgid ""
9305
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9306
" before the remaining default values (and also remove it from\n"
9307
" the default values)."
9308
msgstr ""
9309
9310
#: en/help_topics/configuration.txt:112
9311
msgid ""
9312
"Note that the special values 'user', 'core' and 'site' should be\n"
9313
"used literally, they will be substituted by the corresponding,\n"
9314
"platform specific, values."
9315
msgstr ""
9316
9317
#: en/help_topics/configuration.txt:116
9318
msgid ""
9319
"The examples below use ':' as the separator, windows users\n"
9320
"should use ';'."
9321
msgstr ""
9322
9323
#: en/help_topics/configuration.txt:119
9324
msgid "Overriding the default user plugin directory::"
9325
msgstr ""
9326
9327
#: en/help_topics/configuration.txt:121
9328
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9329
msgstr ""
9330
9331
#: en/help_topics/configuration.txt:123
9332
msgid "Disabling the site directory while retaining the user directory::"
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:125
9336
msgid " BZR_PLUGIN_PATH='-site:+user'"
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:127
9340
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9341
msgstr ""
9342
9343
#: en/help_topics/configuration.txt:129
9344
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:131
9348
msgid "Overriding the default site plugin directory::"
9349
msgstr ""
9350
9351
#: en/help_topics/configuration.txt:133
9352
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:135
9356
msgid ""
9357
"BZR_DISABLE_PLUGINS\n"
9358
"~~~~~~~~~~~~~~~~~~~"
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:138
9362
msgid ""
9363
"Under special circumstances (mostly when trying to diagnose a\n"
9364
"bug), it's better to disable a plugin (or several) rather than\n"
9365
"uninstalling them completely. Such plugins can be specified in\n"
9366
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:143
9370
msgid ""
9371
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9372
"will raise an import error if they are explicitly imported (by\n"
9373
"another plugin that depends on them for example)."
9374
msgstr ""
9375
9376
#: en/help_topics/configuration.txt:147
9377
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9378
msgstr ""
9379
9380
#: en/help_topics/configuration.txt:149
9381
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9382
msgstr ""
9383
9384
#: en/help_topics/configuration.txt:151
9385
msgid ""
9386
"BZR_PLUGINS_AT\n"
9387
"~~~~~~~~~~~~~~"
9388
msgstr ""
9389
9390
#: en/help_topics/configuration.txt:154
9391
msgid ""
9392
"When adding a new feature or working on a bug in a plugin,\n"
9393
"developers often need to use a specific version of a given\n"
9394
"plugin. Since python requires that the directory containing the\n"
9395
"code is named like the plugin itself this make it impossible to\n"
9396
"use arbitrary directory names (using a two-level directory scheme\n"
9397
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9398
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9399
msgstr ""
9400
9401
#: en/help_topics/configuration.txt:162
9402
msgid ""
9403
"Plugins specified in this environment variable takes precedence\n"
9404
"over the ones in ``BZR_PLUGIN_PATH``."
9405
msgstr ""
9406
9407
#: en/help_topics/configuration.txt:165
9408
msgid ""
9409
"The variable specified a list of ``plugin_name@plugin path``,\n"
9410
"``plugin_name`` being the name of the plugin as it appears in\n"
9411
"python module paths, ``plugin_path`` being the path to the\n"
9412
"directory containing the plugin code itself\n"
9413
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9414
"separator, use ';' on windows."
9415
msgstr ""
9416
9417
#: en/help_topics/configuration.txt:172
9418
msgid ""
9419
"Example:\n"
9420
"~~~~~~~~"
9421
msgstr ""
9422
9423
#: en/help_topics/configuration.txt:175
9424
msgid ""
9425
"Using a specific version of ``myplugin``:\n"
9426
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9427
msgstr ""
9428
9429
#: en/help_topics/configuration.txt:178
9430
msgid ""
9431
"BZRPATH\n"
9432
"~~~~~~~"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:181
9436
msgid "The path where Bazaar should look for shell plugin external commands."
9437
msgstr ""
9438
9439
#: en/help_topics/configuration.txt:183
9440
msgid ""
9441
"\n"
9442
"http_proxy, https_proxy\n"
9443
"~~~~~~~~~~~~~~~~~~~~~~~"
9444
msgstr ""
9445
9446
#: en/help_topics/configuration.txt:187
9447
msgid "Specifies the network proxy for outgoing connections, for example::"
9448
msgstr ""
9449
9450
#: en/help_topics/configuration.txt:189
9451
msgid ""
9452
" http_proxy=http://proxy.example.com:3128/ \n"
9453
" https_proxy=http://proxy.example.com:3128/"
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:192
9457
msgid ""
9458
"\n"
9459
"Configuration files\n"
9460
"-------------------"
9461
msgstr ""
9462
9463
#: en/help_topics/configuration.txt:196
9464
msgid ""
9465
"Location\n"
9466
"~~~~~~~~"
9467
msgstr ""
9468
9469
#: en/help_topics/configuration.txt:199
9470
msgid ""
9471
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9472
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9473
"on\n"
9474
"Windows. (You can check the location for your system by using\n"
9475
"``bzr version``.)"
9476
msgstr ""
9477
9478
#: en/help_topics/configuration.txt:204
9479
msgid "There are three primary configuration files in this location:"
9480
msgstr ""
9481
9482
#: en/help_topics/configuration.txt:206
9483
msgid "* ``bazaar.conf`` describes default configuration options,"
9484
msgstr ""
9485
9486
#: en/help_topics/configuration.txt:208
9487
msgid ""
9488
"* ``locations.conf`` describes configuration information for\n"
9489
" specific branch locations,"
9490
msgstr ""
9491
9492
#: en/help_topics/configuration.txt:211
9493
msgid ""
9494
"* ``authentication.conf`` describes credential information for\n"
9495
" remote servers."
9496
msgstr ""
9497
9498
#: en/help_topics/configuration.txt:214
9499
msgid ""
9500
"Each branch can also contain a configuration file that sets values specific\n"
9501
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9502
"the\n"
9503
"branch. This file is visible to all users of a branch, if you wish to "
9504
"override\n"
9505
"one of the values for a branch with a setting that is specific to you then "
9506
"you\n"
9507
"can do so in ``locations.conf``."
9508
msgstr ""
9509
9510
#: en/help_topics/configuration.txt:220
9511
msgid ""
9512
"General format\n"
9513
"~~~~~~~~~~~~~~"
9514
msgstr ""
9515
9516
#: en/help_topics/configuration.txt:223
9517
msgid ""
9518
"An ini file has three types of contructs: section headers, section\n"
9519
"options and comments."
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:226
9523
msgid ""
9524
"Comments\n"
9525
"^^^^^^^^"
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:229
9529
msgid ""
9530
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9531
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9532
"Bazaar when parsing ini files."
9533
msgstr ""
9534
9535
#: en/help_topics/configuration.txt:233
9536
msgid ""
9537
"Section headers\n"
9538
"^^^^^^^^^^^^^^^"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:236
9542
msgid ""
9543
"A section header is a word enclosed in brackets that starts at the begining\n"
9544
"of a line. A typical section header looks like this::"
9545
msgstr ""
9546
9547
#: en/help_topics/configuration.txt:239
9548
msgid " [DEFAULT]"
9549
msgstr ""
9550
9551
#: en/help_topics/configuration.txt:241
9552
msgid ""
9553
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9554
"[ALIASES]. Section headers are case sensitive. The default section provides "
9555
"for\n"
9556
"setting options which can be overridden with the branch config file."
9557
msgstr ""
9558
9559
#: en/help_topics/configuration.txt:245
9560
msgid ""
9561
"For ``locations.conf``, the options from the section with the\n"
9562
"longest matching section header are used to the exclusion of other\n"
9563
"potentially valid section headers. A section header uses the path for\n"
9564
"the branch as the section header. Some examples include::"
9565
msgstr ""
9566
9567
#: en/help_topics/configuration.txt:250
9568
msgid ""
9569
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9570
" [/home/jdoe/branches/]"
9571
msgstr ""
9572
9573
#: en/help_topics/configuration.txt:253
9574
msgid ""
9575
"\n"
9576
"Section options\n"
9577
"^^^^^^^^^^^^^^^"
9578
msgstr ""
9579
9580
#: en/help_topics/configuration.txt:257
9581
msgid ""
9582
"A section option resides within a section. A section option contains an\n"
9583
"option name, an equals sign and a value. For example::"
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:260
9587
msgid ""
9588
" email = John Doe <jdoe@isp.com>\n"
9589
" gpg_signing_key = Amy Pond <amy@example.com>"
9590
msgstr ""
9591
9592
#: en/help_topics/configuration.txt:263
9593
msgid ""
9594
"A option can reference other options by enclosing them in curly brackets::"
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:265
9598
msgid ""
9599
" my_branch_name = feature_x\n"
9600
" my_server = bzr+ssh://example.com\n"
9601
" push_location = {my_server}/project/{my_branch_name}"
9602
msgstr ""
9603
9604
#: en/help_topics/configuration.txt:269
9605
msgid ""
9606
"Option policies\n"
9607
"^^^^^^^^^^^^^^^"
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:272
9611
msgid ""
9612
"Options defined in a section affect the named directory or URL plus\n"
9613
"any locations they contain. Policies can be used to change how an\n"
9614
"option value is interpreted for contained locations. Currently\n"
9615
"there are three policies available:"
9616
msgstr ""
9617
9618
#: en/help_topics/configuration.txt:277
9619
msgid ""
9620
" none:\n"
9621
" the value is interpreted the same for contained locations. This is\n"
9622
" the default behaviour.\n"
9623
" norecurse:\n"
9624
" the value is only used for the exact location specified by the\n"
9625
" section name.\n"
9626
" appendpath:\n"
9627
" for contained locations, any additional path components are\n"
9628
" appended to the value."
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:287
9632
msgid ""
9633
"Policies are specified by keys with names of the form "
9634
"\"<option_name>:policy\".\n"
9635
"For example, to define the push location for a tree of branches, the\n"
9636
"following could be used::"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:291
9640
msgid ""
9641
" [/top/location]\n"
9642
" push_location = sftp://example.com/location\n"
9643
" push_location:policy = appendpath"
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:295
9647
msgid ""
9648
"With this configuration, the push location for ``/top/location/branch1``\n"
9649
"would be ``sftp://example.com/location/branch1``."
9650
msgstr ""
9651
9652
#: en/help_topics/configuration.txt:298
9653
msgid ""
9654
"Section local options\n"
9655
"^^^^^^^^^^^^^^^^^^^^^"
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:301
9659
msgid ""
9660
"Some options are defined automatically inside a given section and can be\n"
9661
"refered to in this section only. "
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:304
9665
msgid "For example, the ``appendpath`` policy can be used like this::"
9666
msgstr ""
9667
9668
#: en/help_topics/configuration.txt:306
9669
msgid ""
9670
" [/home/vila/src/bzr/bugs]\n"
9671
" mypush = lp:~vila/bzr\n"
9672
" mypush:policy=appendpath"
9673
msgstr ""
9674
9675
#: en/help_topics/configuration.txt:310
9676
msgid "Using ``relpath`` to achieve the same result is done like this::"
9677
msgstr ""
9678
9679
#: en/help_topics/configuration.txt:312
9680
msgid ""
9681
" [/home/vila/src/bzr/bugs]\n"
9682
" mypush = lp:~vila/bzr/{relpath}"
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:315
9686
msgid ""
9687
"In both cases, when used in a directory like\n"
9688
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9692
msgid ""
9693
" $ bzr config mypush\n"
9694
" lp:~vila/bzr/832013-expand-in-stack"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:321
9698
msgid "Another such option is ``basename`` which can be used like this::"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:323
9702
msgid ""
9703
" [/home/vila/src/bzr]\n"
9704
" mypush = lp:~vila/bzr/{basename}"
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:326
9708
msgid ""
9709
"When used in a directory like\n"
9710
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9711
msgstr ""
9712
9713
#: en/help_topics/configuration.txt:332
9714
msgid ""
9715
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9716
"itself is defined as the relative path between the section name and the\n"
9717
"location it matches."
9718
msgstr ""
9719
9720
#: en/help_topics/configuration.txt:336
9721
msgid ""
9722
"Another such option is ``branchname``, which refers to the name of a "
9723
"colocated\n"
9724
"branch. For non-colocated branches, it behaves like basename. It can be "
9725
"used\n"
9726
"like this::"
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:340
9730
msgid ""
9731
" [/home/vila/src/bzr/bugs]\n"
9732
" mypush = lp:~vila/bzr/{branchname}"
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:343
9736
msgid ""
9737
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9738
"get::"
9739
msgstr ""
9740
9741
#: en/help_topics/configuration.txt:345
9742
msgid ""
9743
" bzr config mypush\n"
9744
" lp:~vila/bzr/832013-expand-in-stack"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:348
9748
msgid ""
9749
"When an option is local to a Section, it cannot be referred to from option\n"
9750
"values in any other section from the same ``Store`` nor from any other\n"
9751
"``Store``."
9752
msgstr ""
9753
9754
#: en/help_topics/configuration.txt:352
9755
msgid ""
9756
"\n"
9757
"The main configuration file, bazaar.conf\n"
9758
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:356
9762
msgid ""
9763
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9764
"The default section contains the default\n"
9765
"configuration options for all branches. The default section can be\n"
9766
"overriden by providing a branch-specific section in ``locations.conf``."
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:361
9770
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:363
9774
msgid ""
9775
" [DEFAULT]\n"
9776
" email = John Doe <jdoe@isp.com>\n"
9777
" editor = /usr/bin/vim\n"
9778
" create_signatures = when-required"
9779
msgstr ""
9780
9781
#: en/help_topics/configuration.txt:368
9782
msgid ""
9783
"\n"
9784
"The branch location configuration file, locations.conf\n"
9785
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:372
9789
msgid ""
9790
"``locations.conf`` allows one to specify overriding settings for\n"
9791
"a specific branch. The format is almost identical to the default section in\n"
9792
"bazaar.conf with one significant change: The section header, instead of "
9793
"saying\n"
9794
"default, will be the path to a branch that you wish to override a value\n"
9795
"for. The '?' and '*' wildcards are supported::"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:378
9799
msgid ""
9800
" [/home/jdoe/branches/nethack]\n"
9801
" email = Nethack Admin <nethack@nethack.com>"
9802
msgstr ""
9803
9804
#: en/help_topics/configuration.txt:381
9805
msgid ""
9806
" [http://hypothetical.site.com/branches/devel-branch]\n"
9807
" create_signatures = always"
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:384
9811
msgid ""
9812
"The authentication configuration file, authentication.conf\n"
9813
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9814
msgstr ""
9815
9816
#: en/help_topics/configuration.txt:387
9817
msgid ""
9818
"``authentication.conf`` allows one to specify credentials for\n"
9819
"remote servers. This can be used for all the supported transports and any "
9820
"part\n"
9821
"of bzr that requires authentication (smtp for example)."
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:391
9825
msgid ""
9826
"The syntax of the file obeys the same rules as the others except for the\n"
9827
"option policies which don't apply."
9828
msgstr ""
9829
9830
#: en/help_topics/configuration.txt:394
9831
msgid ""
9832
"For more information on the possible uses of the authentication "
9833
"configuration\n"
9834
"file see :doc:`authentication-help`."
9835
msgstr ""
9836
9837
#: en/help_topics/configuration.txt:397
9838
msgid ""
9839
"\n"
9840
"Common options\n"
9841
"--------------"
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:401
9845
msgid ""
9846
"debug_flags\n"
9847
"~~~~~~~~~~~"
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:404
9851
msgid ""
9852
"A comma-separated list of debugging options to turn on. The same values\n"
9853
"can be used as with the -D command-line option (see `help global-options`).\n"
9854
"For example::"
9855
msgstr ""
9856
9857
#: en/help_topics/configuration.txt:408
9858
msgid " debug_flags = hpss"
9859
msgstr ""
9860
9861
#: en/help_topics/configuration.txt:412
9862
msgid " debug_flags = hpss,evil"
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:414
9866
msgid ""
9867
"email\n"
9868
"~~~~~"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:417
9872
msgid ""
9873
"The email address to use when committing a branch. Typically takes the form\n"
9874
"of::"
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:420
9878
msgid " email = Full Name <account@hostname.tld>"
9879
msgstr ""
9880
9881
#: en/help_topics/configuration.txt:422
9882
msgid ""
9883
"editor\n"
9884
"~~~~~~"
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:425
9888
msgid ""
9889
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9890
"a commit message. This setting is trumped by the environment variable\n"
9891
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9892
"variables."
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:430
9896
msgid ""
9897
"log_format\n"
9898
"~~~~~~~~~~"
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:433
9902
msgid ""
9903
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9904
"and ``line``. Additional formats may be provided by plugins. The default\n"
9905
"value is ``long``."
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:437
9909
msgid ""
9910
"check_signatures\n"
9911
"~~~~~~~~~~~~~~~~"
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:440
9915
msgid ""
9916
"Reserved for future use. These options will allow a policy for branches to\n"
9917
"require signatures."
9918
msgstr ""
9919
9920
#: en/help_topics/configuration.txt:443
9921
msgid ""
9922
"require\n"
9923
" The gnupg signature for revisions must be present and must be valid."
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:446
9927
msgid ""
9928
"ignore\n"
9929
" Do not check gnupg signatures of revisions."
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:449
9933
msgid ""
9934
"check-available\n"
9935
" (default) If gnupg signatures for revisions are present, check them.\n"
9936
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9937
" no signature is present."
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:454
9941
msgid ""
9942
"create_signatures\n"
9943
"~~~~~~~~~~~~~~~~~"
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:457
9947
msgid ""
9948
"Defines the behaviour of signing revisions on commits. By default bzr will "
9949
"not\n"
9950
"sign new commits."
9951
msgstr ""
9952
9953
#: en/help_topics/configuration.txt:460
9954
msgid ""
9955
"always\n"
9956
" Sign every new revision that is committed. If the signing fails then "
9957
"the\n"
9958
" commit will not be made."
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:464
9962
msgid ""
9963
"when-required\n"
9964
" Reserved for future use."
9965
msgstr ""
9966
9967
#: en/help_topics/configuration.txt:467
9968
msgid ""
9969
"never\n"
9970
" Reserved for future use."
9971
msgstr ""
9972
9973
#: en/help_topics/configuration.txt:470
9974
msgid ""
9975
"In future it is planned that ``when-required`` will sign newly\n"
9976
"committed revisions only when the branch requires them. ``never`` will "
9977
"refuse\n"
9978
"to sign newly committed revisions, even if the branch requires signatures."
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:474
9982
msgid ""
9983
"dirstate.fdatasync\n"
9984
"~~~~~~~~~~~~~~~~~~"
9985
msgstr ""
9986
9987
#: en/help_topics/configuration.txt:477
9988
msgid ""
9989
"If true (default), working tree metadata changes are flushed through the\n"
9990
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9991
"should not be lost if the machine crashes. See also repository.fdatasync."
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:481
9995
msgid ""
9996
"gpg_signing_key\n"
9997
"~~~~~~~~~~~~~~~"
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:484
10001
msgid ""
10002
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10003
"address, key fingerprint or full key ID. When unset or when set to\n"
10004
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10005
msgstr ""
10006
10007
#: en/help_topics/configuration.txt:488
10008
msgid ""
10009
"recurse\n"
10010
"~~~~~~~"
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:491
10014
msgid ""
10015
"Only useful in ``locations.conf``. Defines whether or not the\n"
10016
"configuration for this section applies to subdirectories:"
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:494
10020
msgid ""
10021
"true\n"
10022
" (default) This section applies to subdirectories as well."
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:497
10026
msgid ""
10027
"false\n"
10028
" This section only applies to the branch at this directory and not\n"
10029
" branches below it."
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:501
10033
msgid ""
10034
"gpg_signing_command\n"
10035
"~~~~~~~~~~~~~~~~~~~"
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:504
10039
msgid ""
10040
"(Default: \"gpg\"). Which program should be used to sign and check "
10041
"revisions.\n"
10042
"For example::"
10043
msgstr ""
10044
10045
#: en/help_topics/configuration.txt:507
10046
msgid " gpg_signing_command = /usr/bin/gnpg"
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:509
10050
msgid ""
10051
"The specified command must accept the options \"--clearsign\" and \"-u "
10052
"<email>\"."
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:511
10056
msgid ""
10057
"bzr_remote_path\n"
10058
"~~~~~~~~~~~~~~~"
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:514
10062
msgid ""
10063
"(Default: \"bzr\"). The path to the command that should be used to run the "
10064
"smart\n"
10065
"server for bzr. This value may only be specified in locations.conf, because:"
10066
msgstr ""
10067
10068
#: en/help_topics/configuration.txt:517
10069
msgid ""
10070
"- it's needed before branch.conf is accessible\n"
10071
"- allowing remote branch.conf files to specify commands would be a security\n"
10072
" risk"
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:521
10076
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:523
10080
msgid ""
10081
"smtp_server\n"
10082
"~~~~~~~~~~~"
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:526
10086
msgid ""
10087
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10088
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:529
10092
msgid ""
10093
"smtp_username, smtp_password\n"
10094
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:532
10098
msgid ""
10099
"User and password to authenticate to the SMTP server. If smtp_username\n"
10100
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10101
"These settings are only needed if the SMTP server requires authentication\n"
10102
"to send mail."
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:537
10106
msgid ""
10107
"locks.steal_dead\n"
10108
"~~~~~~~~~~~~~~~~"
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:540
10112
msgid ""
10113
"If set to true, bzr will automatically break locks held by processes from\n"
10114
"the same machine and user that are no longer alive. Otherwise, it will\n"
10115
"print a message and you can break the lock manually, if you are satisfied\n"
10116
"the object is no longer in use."
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:545
10120
msgid ""
10121
"mail_client\n"
10122
"~~~~~~~~~~~"
10123
msgstr ""
10124
10125
#: en/help_topics/configuration.txt:548
10126
msgid ""
10127
"A mail client to use for sending merge requests.\n"
10128
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10129
"it\n"
10130
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10131
"``editor``."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:553
10135
msgid "Supported values for specific clients:"
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:555
10139
msgid ""
10140
":claws: Use Claws. This skips a dialog for attaching files.\n"
10141
":evolution: Use Evolution.\n"
10142
":kmail: Use KMail.\n"
10143
":mutt: Use Mutt.\n"
10144
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10145
"1.5,\n"
10146
" this works around some bugs that xdg-email doesn't handle."
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:562
10150
msgid "Supported generic values are:"
10151
msgstr ""
10152
10153
#: en/help_topics/configuration.txt:564
10154
msgid ""
10155
":default: See above.\n"
10156
":editor: Use your editor to compose the merge request. This also uses\n"
10157
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10158
" smtp_username and smtp_password.\n"
10159
":mapi: Use your preferred e-mail client on Windows.\n"
10160
":xdg-email: Use xdg-email to run your preferred mail program"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:571
10164
msgid ""
10165
"repository.fdatasync\n"
10166
"~~~~~~~~~~~~~~~~~~~~"
10167
msgstr ""
10168
10169
#: en/help_topics/configuration.txt:574
10170
msgid ""
10171
"If true (default), repository changes are flushed through the OS buffers\n"
10172
"to physical disk. This is somewhat slower, but means data should not be\n"
10173
"lost if the machine crashes. See also dirstate.fdatasync."
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:578
10177
msgid ""
10178
"submit_branch\n"
10179
"~~~~~~~~~~~~~"
10180
msgstr ""
10181
10182
#: en/help_topics/configuration.txt:581
10183
msgid ""
10184
"The branch you intend to submit your current work to. This is "
10185
"automatically\n"
10186
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10187
"This\n"
10188
"should usually be set on a per-branch or per-location basis."
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:585
10192
msgid ""
10193
"public_branch\n"
10194
"~~~~~~~~~~~~~"
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:588
10198
msgid ""
10199
"A publically-accessible version of this branch (implying that this version "
10200
"is\n"
10201
"not publically-accessible). Used (and set) by ``bzr send``."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:591
10205
msgid ""
10206
"suppress_warnings\n"
10207
"~~~~~~~~~~~~~~~~~"
10208
msgstr ""
10209
10210
#: en/help_topics/configuration.txt:594
10211
msgid ""
10212
"A list of strings, each string represent a warning that can be emitted by\n"
10213
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10214
msgstr ""
10215
10216
#: en/help_topics/configuration.txt:597
10217
msgid "Valid values:"
10218
msgstr ""
10219
10220
#: en/help_topics/configuration.txt:599
10221
msgid ""
10222
"* ``format_deprecation``:\n"
10223
" whether the format deprecation warning is shown on repositories that "
10224
"are\n"
10225
" using deprecated formats."
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:603
10229
msgid ""
10230
"default_format\n"
10231
"~~~~~~~~~~~~~~"
10232
msgstr ""
10233
10234
#: en/help_topics/configuration.txt:606
10235
msgid ""
10236
"A format name for the default format used when creating branches. See "
10237
"``bzr\n"
10238
"help formats`` for possible values."
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:609
10242
msgid ""
10243
"\n"
10244
"Unicode options\n"
10245
"---------------"
10246
msgstr ""
10247
10248
#: en/help_topics/configuration.txt:613
10249
msgid ""
10250
"output_encoding\n"
10251
"~~~~~~~~~~~~~~~"
10252
msgstr ""
10253
10254
#: en/help_topics/configuration.txt:616
10255
msgid ""
10256
"A Python unicode encoding name for text output from bzr, such as log\n"
10257
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10258
"is the terminal encoding prefered by the operating system."
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:620
10262
msgid ""
10263
"\n"
10264
"Branch type specific options\n"
10265
"----------------------------"
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:624
10269
msgid ""
10270
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10271
"later format. They\n"
10272
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10273
"manually set in ``locations.conf`` or ``bazaar.conf``."
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:629
10277
msgid ""
10278
"append_revisions_only\n"
10279
"~~~~~~~~~~~~~~~~~~~~~"
10280
msgstr ""
10281
10282
#: en/help_topics/configuration.txt:632
10283
msgid ""
10284
"If set to \"True\" then revisions can only be appended to the log, not\n"
10285
"removed. A branch with this setting enabled can only pull from another\n"
10286
"branch if the other branch's log is a longer version of its own. This is\n"
10287
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10288
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10289
"compatibility with previous bzr versions (older than 2.2)."
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:639
10293
msgid ""
10294
"parent_location\n"
10295
"~~~~~~~~~~~~~~~"
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:642
10299
msgid ""
10300
"If present, the location of the default branch for pull or merge. This "
10301
"option\n"
10302
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10303
"--remember``."
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:646
10307
msgid ""
10308
"push_location\n"
10309
"~~~~~~~~~~~~~"
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:649
10313
msgid ""
10314
"If present, the location of the default branch for push. This option\n"
10315
"is normally set by the first ``push`` or ``push --remember``."
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:652
10319
msgid ""
10320
"push_strict\n"
10321
"~~~~~~~~~~~"
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:655
10325
msgid ""
10326
"If present, defines the ``--strict`` option default value for checking\n"
10327
"uncommitted changes before pushing."
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:658
10331
msgid ""
10332
"dpush_strict\n"
10333
"~~~~~~~~~~~~"
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:661
10337
msgid ""
10338
"If present, defines the ``--strict`` option default value for checking\n"
10339
"uncommitted changes before pushing into a different VCS without any\n"
10340
"custom bzr metadata."
10341
msgstr ""
10342
10343
#: en/help_topics/configuration.txt:665
10344
msgid ""
10345
"bound_location\n"
10346
"~~~~~~~~~~~~~~"
10347
msgstr ""
10348
10349
#: en/help_topics/configuration.txt:668
10350
msgid ""
10351
"The location that commits should go to when acting as a checkout.\n"
10352
"This option is normally set by ``bind``."
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:671
10356
msgid ""
10357
"bound\n"
10358
"~~~~~"
10359
msgstr ""
10360
10361
#: en/help_topics/configuration.txt:674
10362
msgid ""
10363
"If set to \"True\", the branch should act as a checkout, and push each "
10364
"commit to\n"
10365
"the bound_location. This option is normally set by ``bind``/``unbind``."
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:677
10369
msgid ""
10370
"send_strict\n"
10371
"~~~~~~~~~~~"
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:680
10375
msgid ""
10376
"If present, defines the ``--strict`` option default value for checking\n"
10377
"uncommitted changes before sending a merge directive."
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:683
10381
msgid ""
10382
"add.maximum_file_size\n"
10383
"~~~~~~~~~~~~~~~~~~~~~"
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:686
10387
msgid ""
10388
"Defines the maximum file size the command line \"add\" operation will allow\n"
10389
"in recursive mode, with files larger than this value being skipped. You may "
10390
"\n"
10391
"specify this value as an integer (in which case it is interpreted as bytes), "
10392
"\n"
10393
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10394
"0 \n"
10395
"will disable skipping."
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:692
10399
msgid ""
10400
"External Merge Tools\n"
10401
"--------------------"
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:695
10405
msgid ""
10406
"bzr.mergetool.<name>\n"
10407
"~~~~~~~~~~~~~~~~~~~~"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:698
10411
msgid ""
10412
"Defines an external merge tool called <name> with the given command-line.\n"
10413
"Arguments containing spaces should be quoted using single or double quotes. "
10414
"The\n"
10415
"executable may omit its path if it can be found on the PATH."
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:702
10419
msgid ""
10420
"The following markers can be used in the command-line to substitute "
10421
"filenames\n"
10422
"involved in the merge conflict::"
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:705
10426
msgid ""
10427
" {base} file.BASE\n"
10428
" {this} file.THIS\n"
10429
" {other} file.OTHER\n"
10430
" {result} output file\n"
10431
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10432
"merge\n"
10433
" succeeds."
10434
msgstr ""
10435
10436
#: en/help_topics/configuration.txt:714
10437
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10438
msgstr ""
10439
10440
#: en/help_topics/configuration.txt:716
10441
msgid ""
10442
"bzr.default_mergetool\n"
10443
"~~~~~~~~~~~~~~~~~~~~~"
10444
msgstr ""
10445
10446
#: en/help_topics/configuration.txt:719
10447
msgid ""
10448
"Specifies which external merge tool (as defined above) should be selected "
10449
"by\n"
10450
"default in tools such as ``bzr qconflicts``."
10451
msgstr ""
10452
10453
#: en/help_topics/configuration.txt:724
10454
msgid " bzr.default_mergetool = kdiff3\n"
10455
msgstr ""
10456
10457
#: en/help_topics/conflict-types.txt:1
10458
msgid ""
10459
"Conflict Types\n"
10460
"=============="
10461
msgstr ""
10462
10463
#: en/help_topics/conflict-types.txt:4
10464
msgid ""
10465
"Some operations, like merge, revert and pull, modify the contents of your\n"
10466
"working tree. These modifications are programmatically generated, and so "
10467
"they\n"
10468
"may conflict with the current state of your working tree. "
10469
msgstr ""
10470
10471
#: en/help_topics/conflict-types.txt:8
10472
msgid ""
10473
"When conflicts are present in your working tree (as shown by ``bzr\n"
10474
"conflicts``), you should resolve them and then inform bzr that the "
10475
"conflicts\n"
10476
"have been resolved."
10477
msgstr ""
10478
10479
#: en/help_topics/conflict-types.txt:12
10480
msgid ""
10481
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10482
"should resolve them is not the one responsible for their occurrence, as is "
10483
"the\n"
10484
"case when merging other people's work or because some conflicts are "
10485
"presented\n"
10486
"in a way that is not easy to understand."
10487
msgstr ""
10488
10489
#: en/help_topics/conflict-types.txt:17
10490
msgid ""
10491
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10492
"conflict if and only if there's an actual conceptual conflict in the source\n"
10493
"tree. Because Bazaar doesn't understand the real meaning of the files "
10494
"being\n"
10495
"versioned, it can, when faced with ambiguities, fall short in either "
10496
"direction\n"
10497
"trying to resolve the conflict itself. Many kinds of changes can be "
10498
"combined\n"
10499
"programmatically, but sometimes only a human can determine the right thing "
10500
"to\n"
10501
"do."
10502
msgstr ""
10503
10504
#: en/help_topics/conflict-types.txt:25
10505
msgid ""
10506
"When Bazaar generates a conflict, it adds information into the working tree "
10507
"to\n"
10508
"present the conflicting versions, and it's up to you to find the correct\n"
10509
"resolution."
10510
msgstr ""
10511
10512
#: en/help_topics/conflict-types.txt:29
10513
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10514
msgstr ""
10515
10516
#: en/help_topics/conflict-types.txt:31
10517
msgid ""
10518
"1. Modify the working tree content so that the conflicted item is now in "
10519
"the\n"
10520
" state you want to keep, then"
10521
msgstr ""
10522
10523
#: en/help_topics/conflict-types.txt:34
10524
msgid ""
10525
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10526
" remaining generated information (``bzr resolve <item>``)."
10527
msgstr ""
10528
10529
#: en/help_topics/conflict-types.txt:37
10530
msgid ""
10531
"For most conflict types, there are some obvious ways to modify the working\n"
10532
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10533
"itself already made a choice, when possible."
10534
msgstr ""
10535
10536
#: en/help_topics/conflict-types.txt:41
10537
msgid ""
10538
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10539
"different ways to resolve the conflict."
10540
msgstr ""
10541
10542
#: en/help_topics/conflict-types.txt:44
10543
msgid ""
10544
"Each type of conflict is explained below, and the action which must be done "
10545
"to\n"
10546
"resolve the conflict is outlined."
10547
msgstr ""
10548
10549
#: en/help_topics/conflict-types.txt:47
10550
msgid ""
10551
"Various actions are available depending on the kind of conflict, for some "
10552
"of\n"
10553
"these actions, Bazaar can provide some help. In the end you should at least\n"
10554
"inform Bazaar that you're done with the conflict with::"
10555
msgstr ""
10556
10557
#: en/help_topics/conflict-types.txt:51
10558
msgid " ``bzr resolve FILE --action=done'"
10559
msgstr ""
10560
10561
#: en/help_topics/conflict-types.txt:53
10562
msgid ""
10563
"Note that this is the default action when a single file is involved so you "
10564
"can\n"
10565
"simply use::"
10566
msgstr ""
10567
10568
#: en/help_topics/conflict-types.txt:56
10569
msgid " ``bzr resolve FILE``"
10570
msgstr ""
10571
10572
#: en/help_topics/conflict-types.txt:58
10573
msgid "See ``bzr help resolve`` for more details."
10574
msgstr ""
10575
10576
#: en/help_topics/conflict-types.txt:60
10577
msgid ""
10578
"Text conflicts\n"
10579
"--------------"
10580
msgstr ""
10581
10582
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10583
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10584
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10585
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10586
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10587
msgid "Typical message::"
10588
msgstr ""
10589
10590
#: en/help_topics/conflict-types.txt:65
10591
msgid " Text conflict in FILE"
10592
msgstr ""
10593
10594
#: en/help_topics/conflict-types.txt:67
10595
msgid ""
10596
"These are produced when a text merge cannot completely reconcile two sets "
10597
"of\n"
10598
"text changes. Bazaar will emit files for each version with the extensions\n"
10599
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10600
"tree,\n"
10601
"i.e. the tree that you are merging changes into. OTHER is the version that "
10602
"you\n"
10603
"are merging into the target. BASE is an older version that is used as a "
10604
"basis\n"
10605
"for comparison."
10606
msgstr ""
10607
10608
#: en/help_topics/conflict-types.txt:74
10609
msgid ""
10610
"In the main copy of the file, Bazaar will include all the changes that it\n"
10611
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10612
"\"herringbone\" markers like ``<<<<<<<``."
10613
msgstr ""
10614
10615
#: en/help_topics/conflict-types.txt:78
10616
msgid ""
10617
"Say the initial text is \"The project leader released it.\", and THIS "
10618
"modifies it\n"
10619
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10620
"leader\n"
10621
"released Bazaar.\" A conflict would look like this::"
10622
msgstr ""
10623
10624
#: en/help_topics/conflict-types.txt:82
10625
msgid ""
10626
" <<<<<<< TREE\n"
10627
" Martin Pool released it.\n"
10628
" =======\n"
10629
" The project leader released Bazaar.\n"
10630
" >>>>>>> MERGE-SOURCE"
10631
msgstr ""
10632
10633
#: en/help_topics/conflict-types.txt:88
10634
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10635
msgstr ""
10636
10637
#: en/help_topics/conflict-types.txt:90
10638
msgid ""
10639
"You can handle text conflicts either by editing the main copy of the file,\n"
10640
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10641
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10642
"set of changes over the other (but see below when you encounter these\n"
10643
"cases). More often, the two sets of changes must be intelligently combined."
10644
msgstr ""
10645
10646
#: en/help_topics/conflict-types.txt:96
10647
msgid ""
10648
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10649
"you are done editing, the file should look like it never had a conflict, and "
10650
"be\n"
10651
"ready to commit."
10652
msgstr ""
10653
10654
#: en/help_topics/conflict-types.txt:100
10655
msgid ""
10656
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10657
"Bazaar will auto-detect which conflicts you have resolved."
10658
msgstr ""
10659
10660
#: en/help_topics/conflict-types.txt:103
10661
msgid ""
10662
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10663
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10664
"working tree."
10665
msgstr ""
10666
10667
#: en/help_topics/conflict-types.txt:107
10668
msgid ""
10669
"\n"
10670
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10671
"resolve`` with one of the following actions:"
10672
msgstr ""
10673
10674
#: en/help_topics/conflict-types.txt:111
10675
msgid ""
10676
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10677
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10678
msgstr ""
10679
10680
#: en/help_topics/conflict-types.txt:114
10681
msgid ""
10682
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10683
"modifications will be taken into account."
10684
msgstr ""
10685
10686
#: en/help_topics/conflict-types.txt:117
10687
msgid ""
10688
"Content conflicts\n"
10689
"-----------------"
10690
msgstr ""
10691
10692
#: en/help_topics/conflict-types.txt:122
10693
msgid " Contents conflict in FILE"
10694
msgstr ""
10695
10696
#: en/help_topics/conflict-types.txt:124
10697
msgid ""
10698
"This conflict happens when there are conflicting changes in the working "
10699
"tree\n"
10700
"and the merge source, but the conflicted items are not text files. They "
10701
"may\n"
10702
"be binary files, or symlinks, or directories. It can even happen with "
10703
"files\n"
10704
"that are deleted on one side, and modified on the other."
10705
msgstr ""
10706
10707
#: en/help_topics/conflict-types.txt:129
10708
msgid ""
10709
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10710
"be\n"
10711
"regular files, symlinks or directories). But it will not include a \"main "
10712
"copy\"\n"
10713
"of the file with herringbone conflict markers. It will appear that the "
10714
"\"main\n"
10715
"copy\" has been renamed to THIS or OTHER."
10716
msgstr ""
10717
10718
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10719
msgid ""
10720
"To resolve that kind of conflict, you should rebuild FILE from either "
10721
"version\n"
10722
"or a combination of both."
10723
msgstr ""
10724
10725
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10726
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10727
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10728
#: en/help_topics/conflict-types.txt:361
10729
msgid "``bzr resolve`` recognizes the following actions:"
10730
msgstr ""
10731
10732
#: en/help_topics/conflict-types.txt:139
10733
msgid ""
10734
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10735
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10736
"* ``--action=done`` will just mark the conflict as resolved."
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:143
10740
msgid ""
10741
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10742
"and\n"
10743
"``.OTHER`` files if they are still present in the working tree."
10744
msgstr ""
10745
10746
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10747
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10748
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10749
#: en/help_topics/conflict-types.txt:369
10750
msgid ""
10751
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10752
msgstr ""
10753
10754
#: en/help_topics/conflict-types.txt:148
10755
msgid ""
10756
"Tag conflicts\n"
10757
"-------------"
10758
msgstr ""
10759
10760
#: en/help_topics/conflict-types.txt:153
10761
msgid ""
10762
" Conflicting tags:\n"
10763
" version-0.1"
10764
msgstr ""
10765
10766
#: en/help_topics/conflict-types.txt:156
10767
msgid ""
10768
"When pulling from or pushing to another branch, Bazaar informs you about "
10769
"tags\n"
10770
"that conflict between the two branches; that is the same tag points to two\n"
10771
"different revisions. You need not resolve these conflicts, but subsequent\n"
10772
"uses of pull or push will result in the same message."
10773
msgstr ""
10774
10775
#: en/help_topics/conflict-types.txt:161
10776
msgid ""
10777
"To resolve the conflict, you must apply the correct tags to either the "
10778
"target\n"
10779
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10780
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10781
"target branch's tags match the source branch, then in the target branch do\n"
10782
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10783
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10784
"source\n"
10785
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10786
"favor of the target branch, you need to similarly use ``tag --force`` in "
10787
"the\n"
10788
"source branch. (Note that pulling or pushing using --overwrite will "
10789
"overwrite\n"
10790
"all tags as well.)"
10791
msgstr ""
10792
10793
#: en/help_topics/conflict-types.txt:172
10794
msgid ""
10795
"Duplicate paths\n"
10796
"---------------"
10797
msgstr ""
10798
10799
#: en/help_topics/conflict-types.txt:177
10800
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:179
10804
msgid ""
10805
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10806
"already been used. The existing file will be renamed to \"FILE.moved\". "
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:187
10810
msgid ""
10811
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10812
"FILE``,\n"
10813
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10814
"* ``--action=done`` will just mark the conflict as resolved."
10815
msgstr ""
10816
10817
#: en/help_topics/conflict-types.txt:191
10818
msgid ""
10819
"Note that you must get rid of FILE.moved before using ``--action=done``."
10820
msgstr ""
10821
10822
#: en/help_topics/conflict-types.txt:195
10823
msgid ""
10824
"Unversioned parent\n"
10825
"------------------"
10826
msgstr ""
10827
10828
#: en/help_topics/conflict-types.txt:200
10829
msgid ""
10830
" Conflict because FILE is not versioned, but has versioned children."
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:202
10834
msgid ""
10835
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10836
"not\n"
10837
"versioned. This happens when the directory has been deleted in the target,\n"
10838
"but has a new child in the source, or vice versa. In this situation, "
10839
"Bazaar\n"
10840
"will version the parent directory as well. Resolving this issue depends\n"
10841
"very much on the particular scenario. You may wish to rename or delete "
10842
"either\n"
10843
"the file or the directory. When you are satisfied, you can run \"bzr "
10844
"resolve\n"
10845
"FILE\" to mark the conflict as resolved."
10846
msgstr ""
10847
10848
#: en/help_topics/conflict-types.txt:210
10849
msgid ""
10850
"Missing parent\n"
10851
"--------------"
10852
msgstr ""
10853
10854
#: en/help_topics/conflict-types.txt:215
10855
msgid " Conflict adding files to FILE. Created directory."
10856
msgstr ""
10857
10858
#: en/help_topics/conflict-types.txt:217
10859
msgid ""
10860
"This happens when a directory has been deleted in the target, but has new\n"
10861
"children in the source. This is similar to the \"unversioned parent\" "
10862
"conflict,\n"
10863
"except that the parent directory does not *exist*, instead of just being\n"
10864
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10865
"Resolving this issue depends very much on the particular scenario."
10866
msgstr ""
10867
10868
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10869
msgid ""
10870
"To resolve that kind of conflict, you should either remove or rename the\n"
10871
"children or the directory or a combination of both."
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:228
10875
msgid ""
10876
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10877
" children,\n"
10878
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10879
"children\n"
10880
" and restoring the directory,\n"
10881
"* ``--action=done`` will just mark the conflict as resolved."
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:236
10885
msgid ""
10886
"Deleting parent\n"
10887
"---------------"
10888
msgstr ""
10889
10890
#: en/help_topics/conflict-types.txt:241
10891
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:243
10895
msgid ""
10896
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10897
"source, but has new children in the target (either because a directory\n"
10898
"deletion is merged or because the merge introduce new children). Bazaar\n"
10899
"will retain the directory. Resolving this issue depends very much on the\n"
10900
"particular scenario."
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:254
10904
msgid ""
10905
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10906
"directory,"
10907
msgstr ""
10908
10909
#: en/help_topics/conflict-types.txt:256
10910
msgid ""
10911
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10912
" children,"
10913
msgstr ""
10914
10915
#: en/help_topics/conflict-types.txt:259
10916
msgid "* ``--action=done`` will just mark the conflict as resolved."
10917
msgstr ""
10918
10919
#: en/help_topics/conflict-types.txt:261
10920
msgid ""
10921
"Note that when merging a directory deletion, if unversioned files are\n"
10922
"present, they become potential orphans has they don't have a directory\n"
10923
"parent anymore."
10924
msgstr ""
10925
10926
#: en/help_topics/conflict-types.txt:265
10927
msgid ""
10928
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10929
"setting the ``bzr.transform.orphan_policy`` configuration option."
10930
msgstr ""
10931
10932
#: en/help_topics/conflict-types.txt:268
10933
msgid "There are two possible values for this option:"
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:270
10937
msgid ""
10938
"* ``conflict`` (the default): will leave the orphans in place and\n"
10939
" generate a conflicts,"
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:273
10943
msgid ""
10944
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10945
"root\n"
10946
" of the working tree with names like ``<file>.~#~``."
10947
msgstr ""
10948
10949
#: en/help_topics/conflict-types.txt:278
10950
msgid ""
10951
"Path conflict\n"
10952
"-------------"
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:283
10956
msgid " Path conflict: PATH1 / PATH2"
10957
msgstr ""
10958
10959
#: en/help_topics/conflict-types.txt:285
10960
msgid ""
10961
"This happens when the source and target have each modified the name or "
10962
"parent\n"
10963
"directory of a file. Bazaar will use the path elements from the source."
10964
msgstr ""
10965
10966
#: en/help_topics/conflict-types.txt:288
10967
msgid ""
10968
"To resolve that kind of conflict, you just have to decide what name should "
10969
"be\n"
10970
"retained for the file involved."
10971
msgstr ""
10972
10973
#: en/help_topics/conflict-types.txt:293
10974
msgid ""
10975
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10976
" issuing ``bzr mv PATH2 PATH1``,\n"
10977
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10978
"``PATH2``,\n"
10979
"* ``--action=done`` will just mark the conflict as resolved."
10980
msgstr ""
10981
10982
#: en/help_topics/conflict-types.txt:300
10983
msgid ""
10984
"Parent loop\n"
10985
"-----------"
10986
msgstr ""
10987
10988
#: en/help_topics/conflict-types.txt:305
10989
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10990
msgstr ""
10991
10992
#: en/help_topics/conflict-types.txt:307
10993
msgid ""
10994
"This happens when the source and the target have each moved directories, so\n"
10995
"that, if the change could be applied, a directory would be contained by "
10996
"itself.\n"
10997
"For example::"
10998
msgstr ""
10999
11000
#: en/help_topics/conflict-types.txt:311
11001
msgid ""
11002
" $ bzr init\n"
11003
" $ bzr mkdir white\n"
11004
" $ bzr mkdir black\n"
11005
" $ bzr commit -m \"BASE\"\n"
11006
" $ bzr branch . ../other\n"
11007
" $ bzr mv white black\n"
11008
" $ bzr commit -m \"THIS\"\n"
11009
" $ bzr mv ../other/black ../other/white\n"
11010
" $ bzr commit ../other -m \"OTHER\"\n"
11011
" $ bzr merge ../other"
11012
msgstr ""
11013
11014
#: en/help_topics/conflict-types.txt:322
11015
msgid ""
11016
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11017
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11018
"name should be retained for the directories involved."
11019
msgstr ""
11020
11021
#: en/help_topics/conflict-types.txt:328
11022
msgid ""
11023
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11024
"\n"
11025
" in ``black``,\n"
11026
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11027
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11028
"* ``--action=done`` will just mark the conflict as resolved."
11029
msgstr ""
11030
11031
#: en/help_topics/conflict-types.txt:336
11032
msgid ""
11033
"Non-directory parent\n"
11034
"--------------------"
11035
msgstr ""
11036
11037
#: en/help_topics/conflict-types.txt:341
11038
msgid ""
11039
" Conflict: foo.new is not a directory, but has files in it.\n"
11040
" Created directory."
11041
msgstr ""
11042
11043
#: en/help_topics/conflict-types.txt:344
11044
msgid ""
11045
"This happens when one side has added files to a directory, and the other "
11046
"side\n"
11047
"has changed the directory into a file or symlink. For example::"
11048
msgstr ""
11049
11050
#: en/help_topics/conflict-types.txt:347
11051
msgid ""
11052
" $ bzr init\n"
11053
" $ bzr mkdir foo\n"
11054
" $ bzr commit -m \"BASE\"\n"
11055
" $ bzr branch . ../other\n"
11056
" $ rmdir foo\n"
11057
" $ touch foo\n"
11058
" $ bzr commit -m \"THIS\"\n"
11059
" $ bzr mkdir ../other/foo/bar\n"
11060
" $ bzr commit ../other -m \"OTHER\"\n"
11061
" $ bzr merge ../other"
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:358
11065
msgid ""
11066
"To resolve that kind of conflict, you have to decide what name should be\n"
11067
"retained for the file, directory or symlink involved."
11068
msgstr ""
11069
11070
#: en/help_topics/conflict-types.txt:363
11071
msgid ""
11072
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11073
" ``bzr add foo``,\n"
11074
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11075
" ``bzr mv foo.new foo``,\n"
11076
"* ``--action=done`` will just mark the conflict as resolved."
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:371
11080
msgid ""
11081
"MalformedTransform\n"
11082
"------------------"
11083
msgstr ""
11084
11085
#: en/help_topics/conflict-types.txt:374
11086
msgid ""
11087
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11088
"exception. This means that Bazaar encountered a filesystem conflict that it "
11089
"was\n"
11090
"unable to resolve. This usually indicates a bug. Please let us know if "
11091
"you\n"
11092
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11093
msgstr ""
11094
11095
#: en/help_topics/content-filters.txt:1
11096
msgid ""
11097
"Content Filters\n"
11098
"==============="
11099
msgstr ""
11100
11101
#: en/help_topics/content-filters.txt:4
11102
msgid ""
11103
"Content formats\n"
11104
"---------------"
11105
msgstr ""
11106
11107
#: en/help_topics/content-filters.txt:7
11108
msgid ""
11109
"Bazaar's content filtering allows you to store files in a different\n"
11110
"format from the copy in your working tree. This lets you, or your\n"
11111
"co-developers, use Windows development tools that expect CRLF files\n"
11112
"on projects that use other line-ending conventions. Among other things,\n"
11113
"content filters also let Unix developers more easily work on projects\n"
11114
"using Windows line-ending conventions, keyword expansion/compression,\n"
11115
"and trailing spaces on lines in text files to be implicitly stripped\n"
11116
"when committed."
11117
msgstr ""
11118
11119
#: en/help_topics/content-filters.txt:16
11120
msgid "To generalize, there are two content formats supported by Bazaar:"
11121
msgstr ""
11122
11123
#: en/help_topics/content-filters.txt:18
11124
msgid ""
11125
"* a canonical format - how files are stored internally\n"
11126
"* a convenience format - how files are created in a working tree."
11127
msgstr ""
11128
11129
#: en/help_topics/content-filters.txt:21
11130
msgid ""
11131
"\n"
11132
"Format conversion\n"
11133
"-----------------"
11134
msgstr ""
11135
11136
#: en/help_topics/content-filters.txt:25
11137
msgid ""
11138
"The conversion between these formats is done by content filters.\n"
11139
"A content filter has two parts:"
11140
msgstr ""
11141
11142
#: en/help_topics/content-filters.txt:28
11143
msgid ""
11144
"* a read converter - converts from convenience to canonical format\n"
11145
"* a write converter - converts from canonical to convenience format."
11146
msgstr ""
11147
11148
#: en/help_topics/content-filters.txt:31
11149
msgid ""
11150
"Many of these converters will provide *round-trip* conversion,\n"
11151
"i.e. applying the read converter followed by the write converter\n"
11152
"gives back the original content. However, others may provide an\n"
11153
"asymmetric conversion. For example, a read converter might strip\n"
11154
"trailing whitespace off lines in source code while the matching\n"
11155
"write converter might pass content through unchanged."
11156
msgstr ""
11157
11158
#: en/help_topics/content-filters.txt:38
11159
msgid ""
11160
"\n"
11161
"Enabling content filters\n"
11162
"------------------------"
11163
msgstr ""
11164
11165
#: en/help_topics/content-filters.txt:42
11166
msgid ""
11167
"Content filters are typically provided by plugins, so the first step\n"
11168
"in using them is to install the relevant plugins and read their\n"
11169
"documentation. Some plugins may be very specific about which files\n"
11170
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11171
"In other cases, the plugin may leave it in the user's hands to\n"
11172
"define which files are to be filtered. This is typically done\n"
11173
"using rule-based preferences. See ``bzr help rules`` for general\n"
11174
"information about defining these."
11175
msgstr ""
11176
11177
#: en/help_topics/content-filters.txt:51
11178
msgid ""
11179
"\n"
11180
"Impact on commands\n"
11181
"------------------"
11182
msgstr ""
11183
11184
#: en/help_topics/content-filters.txt:55
11185
msgid ""
11186
"Read converters are only applied to commands that read content from\n"
11187
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11188
"will apply read converters to files in the working tree, then compare\n"
11189
"the results to the content last committed."
11190
msgstr ""
11191
11192
#: en/help_topics/content-filters.txt:60
11193
msgid ""
11194
"Write converters are only applied by commands that **create files in a\n"
11195
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11196
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11197
"respectively."
11198
msgstr ""
11199
11200
#: en/help_topics/content-filters.txt:65
11201
msgid ""
11202
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11203
"comitting files. If this makes sense for a given plugin providing\n"
11204
"a content filter, the plugin can usually achieve this effect by using a\n"
11205
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11206
"for more information on hooks."
11207
msgstr ""
11208
11209
#: en/help_topics/content-filters.txt:71
11210
msgid ""
11211
"\n"
11212
"Refreshing your working tree\n"
11213
"----------------------------"
11214
msgstr ""
11215
11216
#: en/help_topics/content-filters.txt:75
11217
msgid ""
11218
"For performance reasons, Bazaar caches the timestamps of files in\n"
11219
"a working tree, and assumes files are unchanged if their timestamps\n"
11220
"match the cached values. As a consequence, there are times when\n"
11221
"you may need to explicitly ask for content filtering to be reapplied\n"
11222
"in one or both directions, e.g. after installing or reconfiguring\n"
11223
"plugins providing it."
11224
msgstr ""
11225
11226
#: en/help_topics/content-filters.txt:82
11227
msgid "Here are some general guidelines for doing this:"
11228
msgstr ""
11229
11230
#: en/help_topics/content-filters.txt:84
11231
msgid ""
11232
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11233
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11234
" relevant read converters and compare the end result with the\n"
11235
" canonical format."
11236
msgstr ""
11237
11238
#: en/help_topics/content-filters.txt:89
11239
msgid ""
11240
" * To reapply write converters, ensure there are no local changes,\n"
11241
" delete the relevant files and run ``bzr revert`` on those files."
11242
msgstr ""
11243
11244
#: en/help_topics/content-filters.txt:92
11245
msgid ""
11246
"Note: In the future, it is likely that additional options will be added\n"
11247
"to commands to make this refreshing process faster and safer.\n"
11248
msgstr ""
11249
11250
#: en/help_topics/current-formats.txt:1
11251
msgid "Current Storage Formats"
11252
msgstr ""
11253
11254
#: en/help_topics/current-formats.txt:3
11255
msgid ""
11256
":2a:\n"
11257
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11258
" compress storage. Provides rich roots which are a one-way\n"
11259
" transition."
11260
msgstr ""
11261
11262
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11263
msgid ""
11264
"\n"
11265
"See :doc:`formats-help` for more about storage formats."
11266
msgstr ""
11267
11268
#: en/help_topics/debug-flags.txt:1
11269
msgid ""
11270
"Debug Flags\n"
11271
"==========="
11272
msgstr ""
11273
11274
#: en/help_topics/debug-flags.txt:4
11275
msgid ""
11276
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11277
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11278
msgstr ""
11279
11280
#: en/help_topics/debug-flags.txt:7
11281
msgid ""
11282
"-Dauth Trace authentication sections used.\n"
11283
"-Dbytes Print out how many bytes were transferred\n"
11284
"-Ddirstate Trace dirstate activity (verbose!)\n"
11285
"-Derror Instead of normal error handling, always print a "
11286
"traceback\n"
11287
" on error.\n"
11288
"-Devil Capture call sites that do expensive or badly-scaling\n"
11289
" operations.\n"
11290
"-Dfetch Trace history copying between repositories.\n"
11291
"-Dfilters Emit information for debugging content filtering.\n"
11292
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11293
"fetch.\n"
11294
"-Dgraph Trace graph traversal.\n"
11295
"-Dhashcache Log every time a working file is read to determine its "
11296
"hash.\n"
11297
"-Dhooks Trace hook execution.\n"
11298
"-Dhpss Trace smart protocol requests and responses.\n"
11299
"-Dhpssdetail More hpss details.\n"
11300
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11301
"-Dhttp Trace http connections, requests and responses.\n"
11302
"-Dindex Trace major index operations.\n"
11303
"-Dknit Trace knit operations.\n"
11304
"-Dlock Trace when lockdir locks are taken or released.\n"
11305
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11306
" retrying the request.\n"
11307
"-Dprogress Trace progress bar operations.\n"
11308
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11309
"-Dmerge Emit information for debugging merges.\n"
11310
"-Dno_apport Don't use apport to report crashes.\n"
11311
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11312
"-Dpack Emit information about pack operations.\n"
11313
"-Drelock Emit a message every time a branch or repository object "
11314
"is\n"
11315
" unlocked then relocked the same way.\n"
11316
"-Dsftp Trace SFTP internals.\n"
11317
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11318
"expected\n"
11319
"-Dstream Trace fetch streams.\n"
11320
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11321
"portable\n"
11322
" manner.\n"
11323
"-Dunlock Some errors during unlock are treated as warnings.\n"
11324
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11325
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11326
"appropriate\n"
11327
" for the format, even for non-local fetches.\n"
11328
msgstr ""
11329
11330
#: en/help_topics/diverged-branches.txt:1
11331
msgid ""
11332
"Diverged Branches\n"
11333
"================="
11334
msgstr ""
11335
11336
#: en/help_topics/diverged-branches.txt:4
11337
msgid ""
11338
"When Bazaar tries to push one branch onto another, it requires that the\n"
11339
"destination branch must be ready to receive the source branch. If this "
11340
"isn't\n"
11341
"the case, then we say that the branches have ``diverged``. Branches are\n"
11342
"considered diverged if the destination branch's most recent commit is one "
11343
"that\n"
11344
"has not been merged (directly or indirectly) by the source branch. To "
11345
"recover\n"
11346
"from diverged branches, one must merge the missing revisions into the "
11347
"source\n"
11348
"branch."
11349
msgstr ""
11350
11351
#: en/help_topics/diverged-branches.txt:12
11352
msgid ""
11353
"This situation commonly arises when using a centralized workflow with local\n"
11354
"commits. If someone else has committed new work to the mainline since your\n"
11355
"last pull and you have local commits that have not yet been pushed to the\n"
11356
"mainline, then your local branch and the mainline have diverged."
11357
msgstr ""
11358
11359
#: en/help_topics/diverged-branches.txt:17
11360
msgid ""
11361
"Discovering What Has Diverged\n"
11362
"-----------------------------"
11363
msgstr ""
11364
11365
#: en/help_topics/diverged-branches.txt:20
11366
msgid ""
11367
"The ``bzr missing`` command is used to find out what revisions are in "
11368
"another\n"
11369
"branch that are not present in the current branch, and vice-versa. It shows "
11370
"a\n"
11371
"summary of which extra revisions exist in each branch. If you want to see "
11372
"the\n"
11373
"precise effects of those revisions, you can use ``bzr diff --"
11374
"old=other_branch``\n"
11375
"to show the differences between other_branch and your current branch."
11376
msgstr ""
11377
11378
#: en/help_topics/diverged-branches.txt:26
11379
msgid ""
11380
"A Solution\n"
11381
"----------"
11382
msgstr ""
11383
11384
#: en/help_topics/diverged-branches.txt:29
11385
msgid ""
11386
"The solution is to merge the revisions from the mainline into your local\n"
11387
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11388
"mainline. This merge may result in conflicts if the other developer's "
11389
"changes\n"
11390
"overlap with your changes. These conflicts should be resolved before\n"
11391
"continuing. After any conflicts have been resolved, or even if there were "
11392
"no\n"
11393
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11394
"to your local branch. This requirement gives you an opportunity to test "
11395
"the\n"
11396
"resulting working tree for correctness, since the merged revisions could "
11397
"have\n"
11398
"made arbitrary changes. After testing, you should commit the merge using\n"
11399
"``bzr commit``. This clears up the diverged branches situation. Your "
11400
"local\n"
11401
"branch can now be pushed to the mainline.\n"
11402
msgstr ""
11403
11404
#: en/help_topics/env-variables.txt:1
11405
msgid "Environment Variables"
11406
msgstr ""
11407
11408
#: en/help_topics/env-variables.txt:3
11409
msgid ""
11410
"=================== "
11411
"===========================================================\n"
11412
"BZRPATH Path where bzr is to look for shell plugin external\n"
11413
" commands.\n"
11414
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11415
"EMAIL E-Mail address of the user.\n"
11416
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11417
"EDITOR Editor for editing commit messages.\n"
11418
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11419
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11420
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11421
"BZR_PLUGIN_PATH.\n"
11422
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11423
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11424
"and\n"
11425
" HOME.\n"
11426
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11427
"URLs).\n"
11428
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11429
"sshcorp,\n"
11430
" plink or lsh.\n"
11431
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11432
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11433
"BZR_COLUMNS Override implicit terminal width.\n"
11434
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11435
"(selftest)\n"
11436
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11437
"'text'.\n"
11438
"BZR_PDB Control whether to launch a debugger on error.\n"
11439
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11440
" breakin debugger.\n"
11441
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11442
"(instead\n"
11443
" of char-based).\n"
11444
"=================== "
11445
"===========================================================\n"
11446
msgstr ""
11447
11448
#: en/help_topics/eol.txt:1
11449
msgid ""
11450
"End of Line Conversion\n"
11451
"======================"
11452
msgstr ""
11453
11454
#: en/help_topics/eol.txt:4
11455
msgid ""
11456
"EOL conversion is provided as a content filter where Bazaar internally\n"
11457
"stores a canonical format but outputs a convenience format. See\n"
11458
"``bzr help content-filters`` for general information about using these."
11459
msgstr ""
11460
11461
#: en/help_topics/eol.txt:8
11462
msgid ""
11463
"Note: Content filtering is only supported in recently added formats,\n"
11464
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11465
"in a recent format. (Just setting the format on the repository\n"
11466
"is not enough.) If content filtering does not appear to be working, use\n"
11467
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11468
"or later."
11469
msgstr ""
11470
11471
#: en/help_topics/eol.txt:15
11472
msgid ""
11473
"EOL conversion needs to be enabled for selected file patterns using\n"
11474
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11475
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11476
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11477
"supported in a future verison of Bazaar."
11478
msgstr ""
11479
11480
#: en/help_topics/eol.txt:21
11481
msgid ""
11482
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11483
"(If a value is not set, ``exact`` is the default.)"
11484
msgstr ""
11485
11486
#: en/help_topics/eol.txt:24
11487
msgid ""
11488
" ========== ===================================== ======================\n"
11489
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11490
" ========== ===================================== ======================\n"
11491
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11492
" ---------- ------------------------------------- ----------------------\n"
11493
" ``lf`` ``lf`` ``lf``\n"
11494
" ---------- ------------------------------------- ----------------------\n"
11495
" ``crlf`` ``crlf`` ``lf``\n"
11496
" ---------- ------------------------------------- ----------------------\n"
11497
" ``exact`` No conversion Exactly as in file\n"
11498
" ========== ===================================== ======================"
11499
msgstr ""
11500
11501
#: en/help_topics/eol.txt:36
11502
msgid ""
11503
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11504
"byte is detected in the file."
11505
msgstr ""
11506
11507
#: en/help_topics/eol.txt:39
11508
msgid ""
11509
"For users working on a cross-platform project, here is a suggested rule\n"
11510
"to use as a starting point::"
11511
msgstr ""
11512
11513
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11514
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11515
msgid ""
11516
" [name *]\n"
11517
" eol = native"
11518
msgstr ""
11519
11520
#: en/help_topics/eol.txt:45
11521
msgid ""
11522
"If you have binary files that do not contain a null byte though, be\n"
11523
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11524
"by giving more explicit patterns earlier in the rules file. For example::"
11525
msgstr ""
11526
11527
#: en/help_topics/eol.txt:49
11528
msgid ""
11529
" [name *.png]\n"
11530
" eol = exact"
11531
msgstr ""
11532
11533
#: en/help_topics/eol.txt:55
11534
msgid ""
11535
"If your working tree is on a network drive shared by users on different\n"
11536
"operating systems, you typically want to force certain conventions for\n"
11537
"certain files. In that way, if a file is created with the wrong line\n"
11538
"endings or line endings get mixed during editing, it gets committed\n"
11539
"correctly and gets checked out correctly. For example::"
11540
msgstr ""
11541
11542
#: en/help_topics/eol.txt:61
11543
msgid ""
11544
" [name *.bat]\n"
11545
" eol = crlf"
11546
msgstr ""
11547
11548
#: en/help_topics/eol.txt:64
11549
msgid ""
11550
" [name *.sh]\n"
11551
" eol = lf"
11552
msgstr ""
11553
11554
#: en/help_topics/eol.txt:70
11555
msgid ""
11556
"If you take the care to create files with their required endings, you can\n"
11557
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11558
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11559
"introducing mixed line endings will be corrected during commit for files\n"
11560
"with those settings."
11561
msgstr ""
11562
11563
#: en/help_topics/eol.txt:76
11564
msgid ""
11565
"If you have sample test data that deliberately has text files with mixed\n"
11566
"newline conventions, you can ask for those to be left alone like this::"
11567
msgstr ""
11568
11569
#: en/help_topics/eol.txt:79
11570
msgid ""
11571
" [name test_data/]\n"
11572
" eol = exact"
11573
msgstr ""
11574
11575
#: en/help_topics/eol.txt:85
11576
msgid ""
11577
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11578
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11579
"of content analysis to detect binary files for commands like ``diff``.\n"
11580
"In the future, a ``binary = true`` rule may be added but it is not\n"
11581
"supported yet.)"
11582
msgstr ""
11583
11584
#: en/help_topics/eol.txt:91
11585
msgid ""
11586
"If you have an existing repository with text files already stored using\n"
11587
"Windows newline conventions (``crlf``), then you may want to keep using "
11588
"that\n"
11589
"convention in the repository. Forcing certain files to this convention\n"
11590
"may also help users who do not have rules configured. To do this, set\n"
11591
"``eol`` to one of the values below."
11592
msgstr ""
11593
11594
#: en/help_topics/eol.txt:97
11595
msgid ""
11596
" ============================ ======================== "
11597
"======================\n"
11598
" Value Checkout end-of-lines as Commit end-of-lines "
11599
"as\n"
11600
" ============================ ======================== "
11601
"======================\n"
11602
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11603
" ``lf`` otherwise\n"
11604
" ---------------------------- ------------------------ ----------------------"
11605
"\n"
11606
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11607
" ---------------------------- ------------------------ ----------------------"
11608
"\n"
11609
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11610
" ============================ ======================== ======================"
11611
msgstr ""
11612
11613
#: en/help_topics/eol.txt:108
11614
msgid ""
11615
"For users working on an existing project that uses Windows newline\n"
11616
"conventions in their Bazaar repository, this rule is suggested as a\n"
11617
"starting point::"
11618
msgstr ""
11619
11620
#: en/help_topics/eol.txt:112
11621
msgid ""
11622
" [name *]\n"
11623
" eol = native-with-crlf-in-repo"
11624
msgstr ""
11625
11626
#: en/help_topics/eol.txt:115
11627
msgid ""
11628
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11629
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11630
"``crlf`` and ``exact``."
11631
msgstr ""
11632
11633
#: en/help_topics/eol.txt:119
11634
msgid ""
11635
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11636
"never reject files because a given line ending or mixed line endings\n"
11637
"are found. A precommit hook should be used if you wish to validate\n"
11638
"(and not just convert) content before committing.\n"
11639
msgstr ""
11640
11641
#: en/help_topics/hidden-commands.txt:1
11642
msgid ""
11643
"added List files added in working tree.\n"
11644
"ancestry List all revisions merged into this branch.\n"
11645
"assert-fail Test reporting of assertion failures\n"
11646
"bundle-info Output interesting stats about a bundle\n"
11647
"bundle-revisions Create a merge-directive for submitting changes.\n"
11648
"cat-revision Write out metadata for a revision.\n"
11649
"dump-btree Dump the contents of a btree index file to stdout.\n"
11650
"export-pot Export command helps and error messages in po format.\n"
11651
"file-id Print file_id of a particular file or directory.\n"
11652
"file-path Print path of file_ids to a file or directory.\n"
11653
"find-merge-base Find and print a base revision for merging two "
11654
"branches.\n"
11655
"hooks Show hooks.\n"
11656
"inventory Show inventory of the current working copy or a "
11657
"revision.\n"
11658
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11659
"lookup-revision Lookup the revision-id from a revision-number\n"
11660
"merge-directive Generate a merge directive for auto-merge tools.\n"
11661
"modified List files modified in working tree.\n"
11662
"re-sign Create a digital signature for an existing revision.\n"
11663
"reference list, view and set branch locations for nested trees.\n"
11664
"relpath Show path of a file relative to root\n"
11665
"repair-workingtree Reset the working tree state file.\n"
11666
"revision-history Display the list of revision ids on a branch.\n"
11667
"revision-info Show revision number and revision id for a given "
11668
"revision\n"
11669
" identifier.\n"
11670
"rocks Statement of optimism.\n"
11671
"selftest Run internal test suite.\n"
11672
"shell-complete Show appropriate completions for context.\n"
11673
"test-script Run a shell-like test from a file.\n"
11674
"touching-revisions Return revision-ids which affected a particular file.\n"
11675
"unknowns List unknown files.\n"
11676
"wait-until-signalled Test helper for\n"
11677
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11678
msgstr ""
11679
11680
#: en/help_topics/hooks.txt:1
11681
msgid ""
11682
"\n"
11683
"Hooks\n"
11684
"====="
11685
msgstr ""
11686
11687
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11688
msgid ""
11689
"Introduction\n"
11690
"------------"
11691
msgstr ""
11692
11693
#: en/help_topics/hooks.txt:8
11694
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11695
msgstr ""
11696
11697
#: en/help_topics/hooks.txt:10
11698
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11699
msgstr ""
11700
11701
#: en/help_topics/hooks.txt:12
11702
msgid ""
11703
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11704
msgstr ""
11705
11706
#: en/help_topics/hooks.txt:14
11707
msgid ""
11708
"The class that contains each hook is given before the hooks it supplies. "
11709
"For\n"
11710
"instance, BranchHooks as the class is the hooks class for\n"
11711
"`bzrlib.branch.Branch.hooks`."
11712
msgstr ""
11713
11714
#: en/help_topics/hooks.txt:18
11715
msgid ""
11716
"Each description also indicates whether the hook runs on the client (the\n"
11717
"machine where bzr was invoked) or the server (the machine addressed by\n"
11718
"the branch URL). These may be, but are not necessarily, the same machine."
11719
msgstr ""
11720
11721
#: en/help_topics/hooks.txt:22
11722
msgid ""
11723
"Plugins (including hooks) are run on the server if all of these is true:"
11724
msgstr ""
11725
11726
#: en/help_topics/hooks.txt:24
11727
msgid ""
11728
" * The connection is via a smart server (accessed with a URL starting with\n"
11729
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11730
"\"http://\"\n"
11731
" URL when a smart server is available via HTTP)."
11732
msgstr ""
11733
11734
#: en/help_topics/hooks.txt:28
11735
msgid ""
11736
" * The hook is either server specific or part of general infrastructure "
11737
"rather\n"
11738
" than client specific code (such as commit)."
11739
msgstr ""
11740
11741
#: en/help_topics/hooks.txt:31
11742
msgid ""
11743
"\n"
11744
"BranchHooks\n"
11745
"-----------"
11746
msgstr ""
11747
11748
#: en/help_topics/hooks.txt:35
11749
msgid ""
11750
"automatic_tag_name\n"
11751
"~~~~~~~~~~~~~~~~~~"
11752
msgstr ""
11753
11754
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11755
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11756
msgid "Introduced in: 2.2"
11757
msgstr ""
11758
11759
#: en/help_topics/hooks.txt:40
11760
msgid ""
11761
"Called to determine an automatic tag name for a revision.\n"
11762
"automatic_tag_name is called with (branch, revision_id) and should\n"
11763
"return a tag name or None if no tag name could be determined. The\n"
11764
"first non-None tag name returned will be used."
11765
msgstr ""
11766
11767
#: en/help_topics/hooks.txt:45
11768
msgid ""
11769
"open\n"
11770
"~~~~"
11771
msgstr ""
11772
11773
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11774
#: en/help_topics/hooks.txt:307
11775
msgid "Introduced in: 1.8"
11776
msgstr ""
11777
11778
#: en/help_topics/hooks.txt:50
11779
msgid ""
11780
"Called with the Branch object that has been opened after a branch is\n"
11781
"opened."
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:53
11785
msgid ""
11786
"post_branch_init\n"
11787
"~~~~~~~~~~~~~~~~"
11788
msgstr ""
11789
11790
#: en/help_topics/hooks.txt:58
11791
msgid ""
11792
"Called after new branch initialization completes. post_branch_init is\n"
11793
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11794
"branch and checkout (both heavyweight and lightweight) will all\n"
11795
"trigger this hook."
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:63
11799
msgid ""
11800
"post_change_branch_tip\n"
11801
"~~~~~~~~~~~~~~~~~~~~~~"
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11805
msgid "Introduced in: 1.4"
11806
msgstr ""
11807
11808
#: en/help_topics/hooks.txt:68
11809
msgid ""
11810
"Called in bzr client and server after a change to the tip of a branch\n"
11811
"is made. post_change_branch_tip is called with a\n"
11812
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11813
"uncommit will all trigger this hook."
11814
msgstr ""
11815
11816
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11817
msgid ""
11818
"post_commit\n"
11819
"~~~~~~~~~~~"
11820
msgstr ""
11821
11822
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11823
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11824
msgid "Introduced in: 0.15"
11825
msgstr ""
11826
11827
#: en/help_topics/hooks.txt:78
11828
msgid ""
11829
"Called in the bzr client after a commit has completed. post_commit is\n"
11830
"called with (local, master, old_revno, old_revid, new_revno,\n"
11831
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11832
"branch."
11833
msgstr ""
11834
11835
#: en/help_topics/hooks.txt:83
11836
msgid ""
11837
"post_pull\n"
11838
"~~~~~~~~~"
11839
msgstr ""
11840
11841
#: en/help_topics/hooks.txt:88
11842
msgid ""
11843
"Called after a pull operation completes. post_pull is called with a\n"
11844
"bzrlib.branch.PullResult object and only runs in the bzr client."
11845
msgstr ""
11846
11847
#: en/help_topics/hooks.txt:91
11848
msgid ""
11849
"post_push\n"
11850
"~~~~~~~~~"
11851
msgstr ""
11852
11853
#: en/help_topics/hooks.txt:96
11854
msgid ""
11855
"Called after a push operation completes. post_push is called with a\n"
11856
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11857
msgstr ""
11858
11859
#: en/help_topics/hooks.txt:99
11860
msgid ""
11861
"post_switch\n"
11862
"~~~~~~~~~~~"
11863
msgstr ""
11864
11865
#: en/help_topics/hooks.txt:104
11866
msgid ""
11867
"Called after a checkout switches branch. post_switch is called with a\n"
11868
"bzrlib.branch.SwitchHookParams."
11869
msgstr ""
11870
11871
#: en/help_topics/hooks.txt:107
11872
msgid ""
11873
"post_uncommit\n"
11874
"~~~~~~~~~~~~~"
11875
msgstr ""
11876
11877
#: en/help_topics/hooks.txt:112
11878
msgid ""
11879
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11880
"called with (local, master, old_revno, old_revid, new_revno,\n"
11881
"new_revid) where local is the local branch or None, master is the\n"
11882
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11883
"of None."
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:118
11887
msgid ""
11888
"pre_change_branch_tip\n"
11889
"~~~~~~~~~~~~~~~~~~~~~"
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:121
11893
msgid "Introduced in: 1.6"
11894
msgstr ""
11895
11896
#: en/help_topics/hooks.txt:123
11897
msgid ""
11898
"Called in bzr client and server before a change to the tip of a branch\n"
11899
"is made. pre_change_branch_tip is called with a\n"
11900
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11901
"uncommit will all trigger this hook."
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:128
11905
msgid ""
11906
"pre_commit\n"
11907
"~~~~~~~~~~"
11908
msgstr ""
11909
11910
#: en/help_topics/hooks.txt:131
11911
msgid "Introduced in: 0.91"
11912
msgstr ""
11913
11914
#: en/help_topics/hooks.txt:133
11915
msgid ""
11916
"Called after a commit is calculated but before it is completed.\n"
11917
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11918
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11919
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11920
"TreeDelta object describing changes from the basis revision. hooks\n"
11921
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11922
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11923
"tree."
11924
msgstr ""
11925
11926
#: en/help_topics/hooks.txt:142
11927
msgid ""
11928
"transform_fallback_location\n"
11929
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11930
msgstr ""
11931
11932
#: en/help_topics/hooks.txt:145
11933
msgid "Introduced in: 1.9"
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:147
11937
msgid ""
11938
"Called when a stacked branch is activating its fallback locations.\n"
11939
"transform_fallback_location is called with (branch, url), and should\n"
11940
"return a new url. Returning the same url allows it to be used as-is,\n"
11941
"returning a different one can be used to cause the branch to stack on\n"
11942
"a closer copy of that fallback_location. Note that the branch cannot\n"
11943
"have history accessing methods called on it during this hook because\n"
11944
"the fallback locations have not been activated. When there are\n"
11945
"multiple hooks installed for transform_fallback_location, all are\n"
11946
"called with the url returned from the previous hook.The order is\n"
11947
"however undefined."
11948
msgstr ""
11949
11950
#: en/help_topics/hooks.txt:158
11951
msgid ""
11952
"CommandHooks\n"
11953
"------------"
11954
msgstr ""
11955
11956
#: en/help_topics/hooks.txt:161
11957
msgid ""
11958
"extend_command\n"
11959
"~~~~~~~~~~~~~~"
11960
msgstr ""
11961
11962
#: en/help_topics/hooks.txt:164
11963
msgid "Introduced in: 1.13"
11964
msgstr ""
11965
11966
#: en/help_topics/hooks.txt:166
11967
msgid ""
11968
"Called after creating a command object to allow modifications such as\n"
11969
"adding or removing options, docs etc. Called with the new\n"
11970
"bzrlib.commands.Command object."
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:170
11974
msgid ""
11975
"get_command\n"
11976
"~~~~~~~~~~~"
11977
msgstr ""
11978
11979
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11980
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11981
msgid "Introduced in: 1.17"
11982
msgstr ""
11983
11984
#: en/help_topics/hooks.txt:175
11985
msgid ""
11986
"Called when creating a single command. Called with (cmd_or_None,\n"
11987
"command_name). get_command should either return the cmd_or_None\n"
11988
"parameter, or a replacement Command object that should be used for the\n"
11989
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11990
"Many users will prefer to use bzrlib.commands.register_command or\n"
11991
"plugin_cmds.register_lazy."
11992
msgstr ""
11993
11994
#: en/help_topics/hooks.txt:182
11995
msgid ""
11996
"get_missing_command\n"
11997
"~~~~~~~~~~~~~~~~~~~"
11998
msgstr ""
11999
12000
#: en/help_topics/hooks.txt:187
12001
msgid ""
12002
"Called when creating a single command if no command could be found.\n"
12003
"Called with (command_name). get_missing_command should either return\n"
12004
"None, or a Command object to be used for the command."
12005
msgstr ""
12006
12007
#: en/help_topics/hooks.txt:191
12008
msgid ""
12009
"list_commands\n"
12010
"~~~~~~~~~~~~~"
12011
msgstr ""
12012
12013
#: en/help_topics/hooks.txt:196
12014
msgid ""
12015
"Called when enumerating commands. Called with a set of cmd_name\n"
12016
"strings for all the commands found so far. This set is safe to mutate\n"
12017
"- e.g. to remove a command. list_commands should return the updated\n"
12018
"set of command names."
12019
msgstr ""
12020
12021
#: en/help_topics/hooks.txt:201
12022
msgid ""
12023
"post_command\n"
12024
"~~~~~~~~~~~~"
12025
msgstr ""
12026
12027
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12028
msgid "Introduced in: 2.6"
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:206
12032
msgid "Called after executing a command. Called with the command object."
12033
msgstr ""
12034
12035
#: en/help_topics/hooks.txt:208
12036
msgid ""
12037
"pre_command\n"
12038
"~~~~~~~~~~~"
12039
msgstr ""
12040
12041
#: en/help_topics/hooks.txt:213
12042
msgid "Called prior to executing a command. Called with the command object."
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:215
12046
msgid ""
12047
"_ConfigHooks\n"
12048
"------------"
12049
msgstr ""
12050
12051
#: en/help_topics/hooks.txt:218
12052
msgid ""
12053
"get\n"
12054
"~~~"
12055
msgstr ""
12056
12057
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12058
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12059
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12060
#: en/help_topics/hooks.txt:446
12061
msgid "Introduced in: 2.4"
12062
msgstr ""
12063
12064
#: en/help_topics/hooks.txt:223
12065
msgid ""
12066
"Invoked when a config option is read. The signature is (stack, name,\n"
12067
"value)."
12068
msgstr ""
12069
12070
#: en/help_topics/hooks.txt:226
12071
msgid ""
12072
"load\n"
12073
"~~~~"
12074
msgstr ""
12075
12076
#: en/help_topics/hooks.txt:231
12077
msgid "Invoked when a config store is loaded. The signature is (store)."
12078
msgstr ""
12079
12080
#: en/help_topics/hooks.txt:233
12081
msgid ""
12082
"remove\n"
12083
"~~~~~~"
12084
msgstr ""
12085
12086
#: en/help_topics/hooks.txt:238
12087
msgid ""
12088
"Invoked when a config option is removed. The signature is (stack,\n"
12089
"name)."
12090
msgstr ""
12091
12092
#: en/help_topics/hooks.txt:241
12093
msgid ""
12094
"save\n"
12095
"~~~~"
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:246
12099
msgid "Invoked when a config store is saved. The signature is (store)."
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:248
12103
msgid ""
12104
"set\n"
12105
"~~~"
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:253
12109
msgid ""
12110
"Invoked when a config option is set. The signature is (stack, name,\n"
12111
"value)."
12112
msgstr ""
12113
12114
#: en/help_topics/hooks.txt:256
12115
msgid ""
12116
"ControlDirHooks\n"
12117
"---------------"
12118
msgstr ""
12119
12120
#: en/help_topics/hooks.txt:259
12121
msgid ""
12122
"post_repo_init\n"
12123
"~~~~~~~~~~~~~~"
12124
msgstr ""
12125
12126
#: en/help_topics/hooks.txt:264
12127
msgid ""
12128
"Invoked after a repository has been initialized. post_repo_init is\n"
12129
"called with a bzrlib.controldir.RepoInitHookParams."
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:267
12133
msgid ""
12134
"pre_open\n"
12135
"~~~~~~~~"
12136
msgstr ""
12137
12138
#: en/help_topics/hooks.txt:270
12139
msgid "Introduced in: 1.14"
12140
msgstr ""
12141
12142
#: en/help_topics/hooks.txt:272
12143
msgid ""
12144
"Invoked before attempting to open a ControlDir with the transport that\n"
12145
"the open will use."
12146
msgstr ""
12147
12148
#: en/help_topics/hooks.txt:275
12149
msgid ""
12150
"InfoHooks\n"
12151
"---------"
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:278
12155
msgid ""
12156
"repository\n"
12157
"~~~~~~~~~~"
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12161
#: en/help_topics/hooks.txt:524
12162
msgid "Introduced in: 1.15"
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:283
12166
msgid ""
12167
"Invoked when displaying the statistics for a repository. repository is\n"
12168
"called with a statistics dictionary as returned by the repository and\n"
12169
"a file-like object to write to."
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:287
12173
msgid ""
12174
"LockHooks\n"
12175
"---------"
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:290
12179
msgid ""
12180
"lock_acquired\n"
12181
"~~~~~~~~~~~~~"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:295
12185
msgid ""
12186
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:297
12190
msgid ""
12191
"lock_broken\n"
12192
"~~~~~~~~~~~"
12193
msgstr ""
12194
12195
#: en/help_topics/hooks.txt:302
12196
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:304
12200
msgid ""
12201
"lock_released\n"
12202
"~~~~~~~~~~~~~"
12203
msgstr ""
12204
12205
#: en/help_topics/hooks.txt:309
12206
msgid ""
12207
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12208
msgstr ""
12209
12210
#: en/help_topics/hooks.txt:311
12211
msgid ""
12212
"MergeHooks\n"
12213
"----------"
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:314
12217
msgid ""
12218
"merge_file_content\n"
12219
"~~~~~~~~~~~~~~~~~~"
12220
msgstr ""
12221
12222
#: en/help_topics/hooks.txt:317
12223
msgid "Introduced in: 2.1"
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:319
12227
msgid ""
12228
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12229
"object when starting a merge. Should return either None or a subclass\n"
12230
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12231
"called per file that needs to be merged (including when one side has\n"
12232
"deleted the file and the other has changed it). See the\n"
12233
"AbstractPerFileMerger API docs for details on how it is used by merge."
12234
msgstr ""
12235
12236
#: en/help_topics/hooks.txt:326
12237
msgid ""
12238
"post_merge\n"
12239
"~~~~~~~~~~"
12240
msgstr ""
12241
12242
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12243
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12244
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12245
msgid "Introduced in: 2.5"
12246
msgstr ""
12247
12248
#: en/help_topics/hooks.txt:331
12249
msgid ""
12250
"Called after a merge. Receives a Merger object as the single argument.\n"
12251
"The return value is ignored."
12252
msgstr ""
12253
12254
#: en/help_topics/hooks.txt:334
12255
msgid ""
12256
"pre_merge\n"
12257
"~~~~~~~~~"
12258
msgstr ""
12259
12260
#: en/help_topics/hooks.txt:339
12261
msgid ""
12262
"Called before a merge. Receives a Merger object as the single\n"
12263
"argument."
12264
msgstr ""
12265
12266
#: en/help_topics/hooks.txt:342
12267
msgid ""
12268
"MergeDirectiveHooks\n"
12269
"-------------------"
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:345
12273
msgid ""
12274
"merge_request_body\n"
12275
"~~~~~~~~~~~~~~~~~~"
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:348
12279
msgid "Introduced in: 1.15.0"
12280
msgstr ""
12281
12282
#: en/help_topics/hooks.txt:350
12283
msgid ""
12284
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12285
"request. Callbacks must return a body. If more than one callback is\n"
12286
"registered, the output of one callback is provided to the next."
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:354
12290
msgid ""
12291
"MessageEditorHooks\n"
12292
"------------------"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:357
12296
msgid ""
12297
"commit_message_template\n"
12298
"~~~~~~~~~~~~~~~~~~~~~~~"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:360
12302
msgid "Introduced in: 1.10"
12303
msgstr ""
12304
12305
#: en/help_topics/hooks.txt:362
12306
msgid ""
12307
"Called when a commit message is being generated.\n"
12308
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12309
"and the message that is known so far. commit_message_template must\n"
12310
"return a new message to use (which could be the same as it was given).\n"
12311
"When there are multiple hooks registered for commit_message_template,\n"
12312
"they are chained with the result from the first passed into the\n"
12313
"second, and so on."
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:370
12317
msgid ""
12318
"set_commit_message\n"
12319
"~~~~~~~~~~~~~~~~~~"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:375
12323
msgid ""
12324
"Set a fixed commit message. set_commit_message is called with the\n"
12325
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12326
"properties by editing commit.builder._revprops) and the message so\n"
12327
"far. set_commit_message must return the message to use or None if it\n"
12328
"should use the message editor as normal."
12329
msgstr ""
12330
12331
#: en/help_topics/hooks.txt:381
12332
msgid ""
12333
"MutableTreeHooks\n"
12334
"----------------"
12335
msgstr ""
12336
12337
#: en/help_topics/hooks.txt:384
12338
msgid ""
12339
"post_build_tree\n"
12340
"~~~~~~~~~~~~~~~"
12341
msgstr ""
12342
12343
#: en/help_topics/hooks.txt:389
12344
msgid ""
12345
"Called after a completely new tree is built. The hook is called with\n"
12346
"the tree as its only argument."
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:395
12350
msgid "Introduced in: 2.0"
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:397
12354
msgid ""
12355
"Called after a commit is performed on a tree. The hook is called with\n"
12356
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12357
"commit was performed on is available via the mutable_tree attribute of\n"
12358
"that object."
12359
msgstr ""
12360
12361
#: en/help_topics/hooks.txt:402
12362
msgid ""
12363
"post_transform\n"
12364
"~~~~~~~~~~~~~~"
12365
msgstr ""
12366
12367
#: en/help_topics/hooks.txt:407
12368
msgid ""
12369
"Called after a tree transform has been performed on a tree. The hook\n"
12370
"is called with the tree that is being transformed and the transform."
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:410
12374
msgid ""
12375
"pre_transform\n"
12376
"~~~~~~~~~~~~~"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:415
12380
msgid ""
12381
"Called before a tree transform on this tree. The hook is called with\n"
12382
"the tree that is being transformed and the transform."
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:418
12386
msgid ""
12387
"start_commit\n"
12388
"~~~~~~~~~~~~"
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:423
12392
msgid ""
12393
"Called before a commit is performed on a tree. The start commit hook\n"
12394
"is able to change the tree before the commit takes place. start_commit\n"
12395
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12396
"being performed on."
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:428
12400
msgid ""
12401
"SmartClientHooks\n"
12402
"----------------"
12403
msgstr ""
12404
12405
#: en/help_topics/hooks.txt:431
12406
msgid ""
12407
"call\n"
12408
"~~~~"
12409
msgstr ""
12410
12411
#: en/help_topics/hooks.txt:434
12412
msgid "Introduced in: unknown"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:436
12416
msgid ""
12417
"Called when the smart client is submitting a request to the smart\n"
12418
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12419
"Streaming request bodies, and responses, are not accessible."
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:440
12423
msgid ""
12424
"SmartServerHooks\n"
12425
"----------------"
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:443
12429
msgid ""
12430
"server_exception\n"
12431
"~~~~~~~~~~~~~~~~"
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:448
12435
msgid ""
12436
"Called by the bzr server when an exception occurs. server_exception is\n"
12437
"called with the sys.exc_info() tuple return true for the hook if the\n"
12438
"exception has been handled, in which case the server will exit\n"
12439
"normally."
12440
msgstr ""
12441
12442
#: en/help_topics/hooks.txt:453
12443
msgid ""
12444
"server_started\n"
12445
"~~~~~~~~~~~~~~"
12446
msgstr ""
12447
12448
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12449
msgid "Introduced in: 0.16"
12450
msgstr ""
12451
12452
#: en/help_topics/hooks.txt:458
12453
msgid ""
12454
"Called by the bzr server when it starts serving a directory.\n"
12455
"server_started is called with (backing urls, public url), where\n"
12456
"backing_url is a list of URLs giving the server-specific directory\n"
12457
"locations, and public_url is the public URL for the directory being\n"
12458
"served."
12459
msgstr ""
12460
12461
#: en/help_topics/hooks.txt:464
12462
msgid ""
12463
"server_started_ex\n"
12464
"~~~~~~~~~~~~~~~~~"
12465
msgstr ""
12466
12467
#: en/help_topics/hooks.txt:469
12468
msgid ""
12469
"Called by the bzr server when it starts serving a directory.\n"
12470
"server_started is called with (backing_urls, server_obj)."
12471
msgstr ""
12472
12473
#: en/help_topics/hooks.txt:472
12474
msgid ""
12475
"server_stopped\n"
12476
"~~~~~~~~~~~~~~"
12477
msgstr ""
12478
12479
#: en/help_topics/hooks.txt:477
12480
msgid ""
12481
"Called by the bzr server when it stops serving a directory.\n"
12482
"server_stopped is called with the same parameters as the\n"
12483
"server_started hook: (backing_urls, public_url)."
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:481
12487
msgid ""
12488
"StatusHooks\n"
12489
"-----------"
12490
msgstr ""
12491
12492
#: en/help_topics/hooks.txt:484
12493
msgid ""
12494
"post_status\n"
12495
"~~~~~~~~~~~"
12496
msgstr ""
12497
12498
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12499
msgid "Introduced in: 2.3"
12500
msgstr ""
12501
12502
#: en/help_topics/hooks.txt:489
12503
msgid ""
12504
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12505
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12506
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12507
"correspond to the command line options specified by the user for the\n"
12508
"status command. to_file is the output stream for writing."
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:495
12512
msgid ""
12513
"pre_status\n"
12514
"~~~~~~~~~~"
12515
msgstr ""
12516
12517
#: en/help_topics/hooks.txt:500
12518
msgid ""
12519
"Called with argument StatusHookParams before Bazaar displays the\n"
12520
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12521
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12522
"correspond to the command line options specified by the user for the\n"
12523
"status command. to_file is the output stream for writing."
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:506
12527
msgid ""
12528
"TransportHooks\n"
12529
"--------------"
12530
msgstr ""
12531
12532
#: en/help_topics/hooks.txt:509
12533
msgid ""
12534
"post_connect\n"
12535
"~~~~~~~~~~~~"
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:514
12539
msgid ""
12540
"Called after a new connection is established or a reconnect occurs.\n"
12541
"The sole argument passed is either the connected transport or smart\n"
12542
"medium instance."
12543
msgstr ""
12544
12545
#: en/help_topics/hooks.txt:518
12546
msgid ""
12547
"RioVersionInfoBuilderHooks\n"
12548
"--------------------------"
12549
msgstr ""
12550
12551
#: en/help_topics/hooks.txt:521
12552
msgid ""
12553
"revision\n"
12554
"~~~~~~~~"
12555
msgstr ""
12556
12557
#: en/help_topics/hooks.txt:526
12558
msgid ""
12559
"Invoked when adding information about a revision to the RIO stanza\n"
12560
"that is printed. revision is called with a revision object and a RIO\n"
12561
"stanza.\n"
12562
msgstr ""
12563
12564
#: en/help_topics/location-alias.txt:1
12565
msgid ""
12566
"Location aliases\n"
12567
"================"
12568
msgstr ""
12569
12570
#: en/help_topics/location-alias.txt:4
12571
msgid ""
12572
"Bazaar defines several aliases for locations associated with a branch. "
12573
"These\n"
12574
"can be used with most commands that expect a location, such as `bzr push`."
12575
msgstr ""
12576
12577
#: en/help_topics/location-alias.txt:7
12578
msgid "The aliases are::"
12579
msgstr ""
12580
12581
#: en/help_topics/location-alias.txt:9
12582
msgid ""
12583
" :bound The branch this branch is bound to, for bound branches.\n"
12584
" :parent The parent of this branch.\n"
12585
" :public The public location of this branch.\n"
12586
" :push The saved location used for `bzr push` with no arguments.\n"
12587
" :submit The submit branch for this branch.\n"
12588
" :this This branch."
12589
msgstr ""
12590
12591
#: en/help_topics/location-alias.txt:16
12592
msgid "For example, to push to the parent location::"
12593
msgstr ""
12594
12595
#: en/help_topics/location-alias.txt:18
12596
msgid " bzr push :parent\n"
12597
msgstr ""
12598
12599
#: en/help_topics/log-formats.txt:1
12600
msgid ""
12601
"Log Formats\n"
12602
"==========="
12603
msgstr ""
12604
12605
#: en/help_topics/log-formats.txt:4
12606
msgid ""
12607
"A log format controls how information about each revision is displayed.\n"
12608
"The standard log formats are compared below::"
12609
msgstr ""
12610
12611
#: en/help_topics/log-formats.txt:7
12612
msgid ""
12613
" Feature long short line\n"
12614
" ---------------------- ------------- ------------ -------------------\n"
12615
" design goal detailed view concise view 1 revision per line\n"
12616
" committer name+email name only name only\n"
12617
" author name+email - -\n"
12618
" date-time format full date only date only\n"
12619
" commit message full full top line\n"
12620
" tags yes yes yes\n"
12621
" merges indicator - yes -\n"
12622
" status/delta optional optional -\n"
12623
" diff/patch optional optional -\n"
12624
" revision-id optional optional -\n"
12625
" branch nick yes - -\n"
12626
" foreign vcs properties yes yes -\n"
12627
" preferred levels all 1 1\n"
12628
" digital signature optional - -"
12629
msgstr ""
12630
12631
#: en/help_topics/log-formats.txt:24
12632
msgid ""
12633
"The default format is ``long``. To change this, define the ``log_format``\n"
12634
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12635
msgstr ""
12636
12637
#: en/help_topics/log-formats.txt:27
12638
msgid ""
12639
" [DEFAULT]\n"
12640
" log_format = short"
12641
msgstr ""
12642
12643
#: en/help_topics/log-formats.txt:30
12644
msgid ""
12645
"Alternatively, to change the log format used for a given query, use the\n"
12646
"--long, --short or --line options."
12647
msgstr ""
12648
12649
#: en/help_topics/log-formats.txt:33
12650
msgid ""
12651
"If one of the standard log formats does not meet your needs, additional\n"
12652
"formats can be provided by plugins.\n"
12653
msgstr ""
12654
12655
#: en/help_topics/other-formats.txt:1
12656
msgid "Other Storage Formats"
12657
msgstr ""
12658
12659
#: en/help_topics/other-formats.txt:3
12660
msgid "Experimental formats are shown below."
12661
msgstr ""
12662
12663
#: en/help_topics/other-formats.txt:5
12664
msgid ""
12665
":development-colo:\n"
12666
" (native) The 2a format with experimental support for colocated\n"
12667
" branches."
12668
msgstr ""
12669
12670
#: en/help_topics/other-formats.txt:9
12671
msgid ""
12672
"\n"
12673
"Deprecated formats are shown below."
12674
msgstr ""
12675
12676
#: en/help_topics/other-formats.txt:12
12677
msgid ""
12678
":pack-0.92:\n"
12679
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12680
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12681
" by bzr < 0.92."
12682
msgstr ""
12683
12684
#: en/help_topics/patterns.txt:1
12685
msgid ""
12686
"Patterns\n"
12687
"========"
12688
msgstr ""
12689
12690
#: en/help_topics/patterns.txt:4
12691
msgid ""
12692
"Bazaar uses patterns to match files at various times. For example,\n"
12693
"the ``add`` command skips over files that match ignore patterns\n"
12694
"and preferences can be associated with files using rule patterns.\n"
12695
"The pattern syntax is described below."
12696
msgstr ""
12697
12698
#: en/help_topics/patterns.txt:9
12699
msgid ""
12700
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12701
"slash or is a regular expression, it is compared to the whole path\n"
12702
"from the branch root. Otherwise, it is compared to only the last\n"
12703
"component of the path. To match a file only in the root directory,\n"
12704
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12705
msgstr ""
12706
12707
#: en/help_topics/patterns.txt:15
12708
msgid "Patterns may include globbing wildcards such as::"
12709
msgstr ""
12710
12711
#: en/help_topics/patterns.txt:17
12712
msgid ""
12713
" ? - Matches any single character except '/'\n"
12714
" * - Matches 0 or more characters except '/'\n"
12715
" /**/ - Matches 0 or more directories in a path\n"
12716
" [a-z] - Matches a single character from within a group of characters"
12717
msgstr ""
12718
12719
#: en/help_topics/patterns.txt:22
12720
msgid ""
12721
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12722
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12723
"expression. Regular expression patterns may not include named or\n"
12724
"numbered groups."
12725
msgstr ""
12726
12727
#: en/help_topics/patterns.txt:27
12728
msgid ""
12729
"Case insensitive ignore patterns can be specified with regular expressions\n"
12730
"by using the ``i`` (for ignore case) flag in the pattern."
12731
msgstr ""
12732
12733
#: en/help_topics/patterns.txt:30
12734
msgid ""
12735
"For example, a case insensitive match for ``foo`` may be specified as::"
12736
msgstr ""
12737
12738
#: en/help_topics/patterns.txt:32
12739
msgid " RE:(?i)foo"
12740
msgstr ""
12741
12742
#: en/help_topics/patterns.txt:34
12743
msgid ""
12744
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12745
"matched by that pattern will not be ignored."
12746
msgstr ""
12747
12748
#: en/help_topics/patterns.txt:37
12749
msgid ""
12750
".. _Python regular expressions: http://docs.python.org/library/re.html"
12751
msgstr ""
12752
12753
#: en/help_topics/revisionspec.txt:1
12754
msgid "Revision Identifiers"
12755
msgstr ""
12756
12757
#: en/help_topics/revisionspec.txt:3
12758
msgid ""
12759
"A revision identifier refers to a specific state of a branch's history. It\n"
12760
"can be expressed in several ways. It can begin with a keyword to\n"
12761
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12762
"'before:yesterday' and 'submit:'."
12763
msgstr ""
12764
12765
#: en/help_topics/revisionspec.txt:8
12766
msgid ""
12767
"Alternately, it can be given without a keyword, in which case it will be\n"
12768
"checked as a revision number, a tag, a revision id, a date specification, or "
12769
"a\n"
12770
"branch specification, in that order. For example, 'date:today' could be\n"
12771
"written as simply 'today', though if you have a tag called 'today' that "
12772
"will\n"
12773
"be found first."
12774
msgstr ""
12775
12776
#: en/help_topics/revisionspec.txt:14
12777
msgid ""
12778
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12779
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12780
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12781
"or\n"
12782
"spaces around the '..')."
12783
msgstr ""
12784
12785
#: en/help_topics/revisionspec.txt:19
12786
msgid ""
12787
"Ranges are interpreted differently by different commands. To the \"log\" "
12788
"command,\n"
12789
"a range is a sequence of log messages, but to the \"diff\" command, the "
12790
"range\n"
12791
"denotes a change between revisions (and not a sequence of changes). In\n"
12792
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12793
"consider it\n"
12794
"to be open-ended, that is, they include one end but not the other. For "
12795
"example:\n"
12796
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12797
"3649,\n"
12798
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12799
"and\n"
12800
"3649, but not 3647."
12801
msgstr ""
12802
12803
#: en/help_topics/revisionspec.txt:28
12804
msgid "The keywords used as revision selection methods are the following:"
12805
msgstr ""
12806
12807
#: en/help_topics/revisionspec.txt:30
12808
msgid ""
12809
":revid:\n"
12810
"\tSelects a revision using the revision id.\n"
12811
":submit:\n"
12812
"\tSelects a common ancestor with the submit branch.\n"
12813
":ancestor:\n"
12814
"\tSelects a common ancestor with a second branch.\n"
12815
":date:\n"
12816
"\tSelects a revision on the basis of a datestamp.\n"
12817
":branch:\n"
12818
"\tSelects the last revision of a specified branch.\n"
12819
":tag:\n"
12820
"\tSelects a revision identified by a tag name.\n"
12821
":revno:\n"
12822
"\tSelects a revision using a number.\n"
12823
":before:\n"
12824
"\tSelects the parent of the revision specified.\n"
12825
":annotate:\n"
12826
"\tSelect the revision that last modified the specified line.\n"
12827
":mainline:\n"
12828
"\tSelect mainline revision that merged the specified revision.\n"
12829
":last:\n"
12830
"\tSelects the nth revision from the end."
12831
msgstr ""
12832
12833
#: en/help_topics/revisionspec.txt:53
12834
msgid "In addition, plugins can provide other keywords."
12835
msgstr ""
12836
12837
#: en/help_topics/revisionspec.txt:55
12838
msgid "A detailed description of each keyword is given below."
12839
msgstr ""
12840
12841
#: en/help_topics/revisionspec.txt:57
12842
msgid ":revid:"
12843
msgstr ""
12844
12845
#: en/help_topics/revisionspec.txt:59
12846
msgid ""
12847
" Supply a specific revision id, that can be used to specify any\n"
12848
" revision id in the ancestry of the branch.\n"
12849
" Including merges, and pending merges.\n"
12850
" Examples::"
12851
msgstr ""
12852
12853
#: en/help_topics/revisionspec.txt:64
12854
msgid ""
12855
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12856
msgstr ""
12857
12858
#: en/help_topics/revisionspec.txt:66
12859
msgid ":submit:"
12860
msgstr ""
12861
12862
#: en/help_topics/revisionspec.txt:68
12863
msgid ""
12864
" Diffing against this shows all the changes that were made in this "
12865
"branch,\n"
12866
" and is a good predictor of what merge will do. The submit branch is\n"
12867
" used by the bundle and merge directive commands. If no submit branch\n"
12868
" is specified, the parent branch is used instead."
12869
msgstr ""
12870
12871
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12872
msgid ""
12873
" The common ancestor is the last revision that existed in both\n"
12874
" branches. Usually this is the branch point, but it could also be\n"
12875
" a revision that was merged."
12876
msgstr ""
12877
12878
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12879
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12880
#: en/help_topics/revisionspec.txt:153
12881
msgid " Examples::"
12882
msgstr ""
12883
12884
#: en/help_topics/revisionspec.txt:79
12885
msgid " $ bzr diff -r submit:"
12886
msgstr ""
12887
12888
#: en/help_topics/revisionspec.txt:81
12889
msgid ":ancestor:"
12890
msgstr ""
12891
12892
#: en/help_topics/revisionspec.txt:83
12893
msgid " Supply the path to a branch to select the common ancestor."
12894
msgstr ""
12895
12896
#: en/help_topics/revisionspec.txt:89
12897
msgid ""
12898
" This is frequently used with 'diff' to return all of the changes\n"
12899
" that your branch introduces, while excluding the changes that you\n"
12900
" have not merged from the remote branch."
12901
msgstr ""
12902
12903
#: en/help_topics/revisionspec.txt:95
12904
msgid ""
12905
" ancestor:/path/to/branch\n"
12906
" $ bzr diff -r ancestor:../../mainline/branch"
12907
msgstr ""
12908
12909
#: en/help_topics/revisionspec.txt:98
12910
msgid ":date:"
12911
msgstr ""
12912
12913
#: en/help_topics/revisionspec.txt:100
12914
msgid ""
12915
" Supply a datestamp to select the first revision that matches the date.\n"
12916
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12917
" Matches the first entry after a given date (either at midnight or\n"
12918
" at a specified time)."
12919
msgstr ""
12920
12921
#: en/help_topics/revisionspec.txt:105
12922
msgid " One way to display all the changes since yesterday would be::"
12923
msgstr ""
12924
12925
#: en/help_topics/revisionspec.txt:107
12926
msgid " bzr log -r date:yesterday.."
12927
msgstr ""
12928
12929
#: en/help_topics/revisionspec.txt:111
12930
msgid ""
12931
" date:yesterday -> select the first revision since "
12932
"yesterday\n"
12933
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12934
" August 14th, 2006 at 5:10pm."
12935
msgstr ""
12936
12937
#: en/help_topics/revisionspec.txt:115
12938
msgid ":branch:"
12939
msgstr ""
12940
12941
#: en/help_topics/revisionspec.txt:117
12942
msgid " Supply the path to a branch to select its last revision."
12943
msgstr ""
12944
12945
#: en/help_topics/revisionspec.txt:121
12946
msgid " branch:/path/to/branch"
12947
msgstr ""
12948
12949
#: en/help_topics/revisionspec.txt:123
12950
msgid ":tag:"
12951
msgstr ""
12952
12953
#: en/help_topics/revisionspec.txt:125
12954
msgid " Tags are stored in the branch and created by the 'tag' command."
12955
msgstr ""
12956
12957
#: en/help_topics/revisionspec.txt:127
12958
msgid ":revno:"
12959
msgstr ""
12960
12961
#: en/help_topics/revisionspec.txt:129
12962
msgid ""
12963
" Use an integer to specify a revision in the history of the branch.\n"
12964
" Optionally a branch can be specified. A negative number will count\n"
12965
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12966
" one). If the negative number is larger than the branch's history, the\n"
12967
" first revision is returned.\n"
12968
" Examples::"
12969
msgstr ""
12970
12971
#: en/help_topics/revisionspec.txt:136
12972
msgid ""
12973
" revno:1 -> return the first revision of this branch\n"
12974
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12975
" the branch '/path/to/branch'\n"
12976
" revno:-1 -> The last revision in a branch.\n"
12977
" -2:http://other/branch -> The second to last revision in the\n"
12978
" remote branch.\n"
12979
" -1000000 -> Most likely the first revision, unless\n"
12980
" your history is very long."
12981
msgstr ""
12982
12983
#: en/help_topics/revisionspec.txt:145
12984
msgid ":before:"
12985
msgstr ""
12986
12987
#: en/help_topics/revisionspec.txt:147
12988
msgid ""
12989
" Supply any revision spec to return the parent of that revision. This "
12990
"is\n"
12991
" mostly useful when inspecting revisions that are not in the revision "
12992
"history\n"
12993
" of a branch."
12994
msgstr ""
12995
12996
#: en/help_topics/revisionspec.txt:151
12997
msgid ""
12998
" It is an error to request the parent of the null revision (before:0)."
12999
msgstr ""
13000
13001
#: en/help_topics/revisionspec.txt:155
13002
msgid ""
13003
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13004
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13005
" aaaa@bbbb-1234567890\n"
13006
" bzr diff -r before:1913..1913\n"
13007
" -> Find the changes between revision 1913 and its parent "
13008
"(1912).\n"
13009
" (What changes did revision 1913 introduce).\n"
13010
" This is equivalent to: bzr diff -c 1913"
13011
msgstr ""
13012
13013
#: en/help_topics/revisionspec.txt:163
13014
msgid ":annotate:"
13015
msgstr ""
13016
13017
#: en/help_topics/revisionspec.txt:165
13018
msgid ""
13019
" Select the revision that last modified the specified line. Line is\n"
13020
" specified as path:number. Path is a relative path to the file. "
13021
"Numbers\n"
13022
" start at 1, and are relative to the current version, not the last-\n"
13023
" committed version of the file."
13024
msgstr ""
13025
13026
#: en/help_topics/revisionspec.txt:170
13027
msgid ":mainline:"
13028
msgstr ""
13029
13030
#: en/help_topics/revisionspec.txt:172
13031
msgid ""
13032
" Select the revision that merged the specified revision into mainline."
13033
msgstr ""
13034
13035
#: en/help_topics/revisionspec.txt:174
13036
msgid ":last:"
13037
msgstr ""
13038
13039
#: en/help_topics/revisionspec.txt:176
13040
msgid ""
13041
" Supply a positive number to get the nth revision from the end.\n"
13042
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13043
" Examples::"
13044
msgstr ""
13045
13046
#: en/help_topics/revisionspec.txt:180
13047
msgid ""
13048
" last:1 -> return the last revision\n"
13049
" last:3 -> return the revision 2 before the end.\n"
13050
msgstr ""
13051
13052
#: en/help_topics/rules.txt:1
13053
msgid ""
13054
"Rules\n"
13055
"====="
13056
msgstr ""
13057
13058
#: en/help_topics/rules.txt:7
13059
msgid ""
13060
"Rules are defined in ini file format where the sections are file glob\n"
13061
"patterns and the contents of each section are the preferences for files\n"
13062
"matching that pattern(s). For example::"
13063
msgstr ""
13064
13065
#: en/help_topics/rules.txt:11
13066
msgid ""
13067
" [name *.bat]\n"
13068
" eol = native"
13069
msgstr ""
13070
13071
#: en/help_topics/rules.txt:14
13072
msgid ""
13073
" [name *.html *.xml]\n"
13074
" keywords = xml_escape"
13075
msgstr ""
13076
13077
#: en/help_topics/rules.txt:17
13078
msgid ""
13079
"Preferences like these are useful for commands and plugins wishing to\n"
13080
"provide custom behaviour for selected files. For more information on \n"
13081
"end of line conversion see :doc:`eol-help`.\n"
13082
"Keyword support is provided by the `keywords plugin\n"
13083
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13084
msgstr ""
13085
13086
#: en/help_topics/rules.txt:23
13087
msgid ""
13088
"Files\n"
13089
"-----"
13090
msgstr ""
13091
13092
#: en/help_topics/rules.txt:26
13093
msgid ""
13094
"Default rules for all branches are defined in the optional file\n"
13095
"``BZR_HOME/rules``. "
13096
msgstr ""
13097
13098
#: en/help_topics/rules.txt:29
13099
msgid ""
13100
"Rule Patterns\n"
13101
"-------------"
13102
msgstr ""
13103
13104
#: en/help_topics/rules.txt:32
13105
msgid ""
13106
"Patterns are ordered and searching stops as soon as one matches.\n"
13107
"As a consequence, more explicit patterns should be placed towards\n"
13108
"the top of the file. Rule patterns use exactly the same conventions\n"
13109
"as ignore patterns. See :doc:`patterns-help` for details."
13110
msgstr ""
13111
13112
#: en/help_topics/rules.txt:37
13113
msgid ".. note::"
13114
msgstr ""
13115
13116
#: en/help_topics/rules.txt:39
13117
msgid ""
13118
" Patterns containing square brackets or spaces should be\n"
13119
" surrounded in quotes to ensure they are correctly parsed.\n"
13120
msgstr ""
13121
13122
#: en/help_topics/topics.txt:1
13123
msgid ""
13124
"authentication Information on configuring authentication\n"
13125
"basic Basic commands\n"
13126
"branches Information on what a branch is\n"
13127
"bugs Bug tracker settings\n"
13128
"checkouts Information on what a checkout is\n"
13129
"commands Basic help for all commands\n"
13130
"configuration Details on the configuration settings available\n"
13131
"conflict-types Types of conflicts and what to do about them\n"
13132
"content-filters Conversion of content into/from working trees\n"
13133
"criss-cross Information on criss-cross merging\n"
13134
"current-formats Current storage formats\n"
13135
"debug-flags Options to show or record debug information\n"
13136
"diverged-branches How to fix diverged branches\n"
13137
"env-variables Environment variable names and values\n"
13138
"eol Information on end-of-line handling\n"
13139
"files Information on configuration and log files\n"
13140
"formats Information on choosing a storage format\n"
13141
"global-options Options that control how Bazaar runs\n"
13142
"hidden-commands All hidden commands\n"
13143
"hooks Points at which custom processing can be added\n"
13144
"launchpad Using Bazaar with Launchpad.net\n"
13145
"location-alias Aliases for remembered locations\n"
13146
"log-formats Details on the logging formats available\n"
13147
"other-formats Experimental and deprecated storage formats\n"
13148
"patterns Information on the pattern syntax\n"
13149
"repositories Basic information on shared repositories.\n"
13150
"revisionspec Explain how to use --revision\n"
13151
"rules Information on defining rule-based preferences\n"
13152
"standalone-trees Information on what a standalone tree is\n"
13153
"standard-options Options that can be used with any command\n"
13154
"status-flags Help on status flags\n"
13155
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13156
"topics Topics list\n"
13157
"url-special-chars Special character handling in URLs\n"
13158
"urlspec Supported transport protocols\n"
13159
"working-trees Information on working trees\n"
13160
msgstr ""
13161
13162
#: en/help_topics/url-special-chars.txt:1
13163
msgid ""
13164
"Special character handling in URLs\n"
13165
"=================================="
13166
msgstr ""
13167
13168
#: en/help_topics/url-special-chars.txt:4
13169
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13170
msgstr ""
13171
13172
#: en/help_topics/url-special-chars.txt:6
13173
msgid " * Fully qualified URLs"
13174
msgstr ""
13175
13176
#: en/help_topics/url-special-chars.txt:8
13177
msgid " * File system paths, relative or absolute"
13178
msgstr ""
13179
13180
#: en/help_topics/url-special-chars.txt:10
13181
msgid ""
13182
"Internally bzr treats all locations as URLs. For any file system paths\n"
13183
"that are specified it will automatically determine the appropriate URL\n"
13184
"representation, and escape special characters where necessary."
13185
msgstr ""
13186
13187
#: en/help_topics/url-special-chars.txt:14
13188
msgid ""
13189
"There are a few characters which have special meaning in URLs and need "
13190
"careful\n"
13191
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13192
"value in URLs. Any non-ASCII characters in a file path will automatically "
13193
"be\n"
13194
"urlencoded when the path is converted to a URL."
13195
msgstr ""
13196
13197
#: en/help_topics/url-special-chars.txt:19
13198
msgid ""
13199
"URLs represent non-ASCII characters in an encoding defined by the server, "
13200
"but\n"
13201
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13202
"be\n"
13203
"generous in what it accepts as a URL and to print them in a way that\n"
13204
"will be readable."
13205
msgstr ""
13206
13207
#: en/help_topics/url-special-chars.txt:24
13208
msgid ""
13209
"For example, if you have a directory named '/tmp/%2False' these are all "
13210
"valid\n"
13211
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13212
"slash)::"
13213
msgstr ""
13214
13215
#: en/help_topics/url-special-chars.txt:27
13216
msgid ""
13217
" cd /tmp\n"
13218
" bzr log /tmp/%2False\n"
13219
" bzr log %2False\n"
13220
" bzr log file:///tmp/%252False\n"
13221
" bzr log file://localhost/tmp/%252False\n"
13222
" bzr log file:%252False"
13223
msgstr ""
13224
13225
#: en/help_topics/url-special-chars.txt:34
13226
msgid "These are valid but do not refer to the same file::"
13227
msgstr ""
13228
13229
#: en/help_topics/url-special-chars.txt:36
13230
msgid ""
13231
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13232
" bzr log %252False (refers to a file called /tmp/%252False)"
13233
msgstr ""
13234
13235
#: en/help_topics/url-special-chars.txt:39
13236
msgid ""
13237
"Comma also has special meaning in URLs, because it denotes `segment "
13238
"parameters`_"
13239
msgstr ""
13240
13241
#: en/help_topics/url-special-chars.txt:41
13242
msgid ""
13243
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13244
msgstr ""
13245
13246
#: en/help_topics/url-special-chars.txt:43
13247
msgid ""
13248
"Comma is also special in any file system paths that are specified. To use a "
13249
"literal\n"
13250
"comma in a file system path, specify a URL and URL encode the comma::"
13251
msgstr ""
13252
13253
#: en/help_topics/url-special-chars.txt:46
13254
msgid ""
13255
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13256
"\"branch\" set to \"bla\"\n"
13257
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13258
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13259
"\"branch\" set to \"bla\"\n"
13260
msgstr ""
13261
13262
#: en/help_topics/urlspec.txt:1
13263
msgid "URL Identifiers"
13264
msgstr ""
13265
13266
#: en/help_topics/urlspec.txt:3
13267
msgid "Supported URL prefixes::"
13268
msgstr ""
13269
13270
#: en/help_topics/urlspec.txt:5
13271
msgid ""
13272
" aftp:// Access using active FTP.\n"
13273
" bzr:// Fast access using the Bazaar smart server.\n"
13274
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13275
" file:// Access using the standard filesystem (default)\n"
13276
" ftp:// Access using passive FTP.\n"
13277
" http:// Read-only access of branches exported on the web.\n"
13278
" https:// Read-only access of branches exported on the web using "
13279
"SSL.\n"
13280
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13281
msgstr ""
13282
13283
#: en/help_topics/urlspec.txt:14
13284
msgid "Supported modifiers::"
13285
msgstr ""
13286
13287
#: en/help_topics/urlspec.txt:16
13288
msgid " gio+ Access using any GIO supported protocols."
13289
msgstr ""
13290
13291
#: en/help_topics/urlspec.txt:18
13292
msgid "Bazaar supports all of the standard parts within the URL::"
13293
msgstr ""
13294
13295
#: en/help_topics/urlspec.txt:20
13296
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13297
msgstr ""
13298
13299
#: en/help_topics/urlspec.txt:22
13300
msgid "allowing URLs such as::"
13301
msgstr ""
13302
13303
#: en/help_topics/urlspec.txt:24
13304
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13305
msgstr ""
13306
13307
#: en/help_topics/urlspec.txt:26
13308
msgid ""
13309
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13310
"with '~' as meaning that the rest of the path should be interpreted\n"
13311
"relative to the remote user's home directory. For example if the user\n"
13312
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13313
"shell.example.com, then::"
13314
msgstr ""
13315
13316
#: en/help_topics/urlspec.txt:32
13317
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13318
msgstr ""
13319
13320
#: en/help_topics/urlspec.txt:34
13321
msgid "would refer to ``/home/remote/myproject/trunk``."
13322
msgstr ""
13323
13324
#: en/help_topics/urlspec.txt:36
13325
msgid ""
13326
"Many commands that accept URLs also accept location aliases too.\n"
13327
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13328
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1