« back to all changes in this revision
Viewing changes to po/gl.po
- browse files at revision 5802.4.1
- compare with another revision
- download diff
- download tarball
- view history from revision 5802.4.1
- Committer: Martin Pool
- Date: 2011-04-19 07:52:11 UTC
- mto: This revision was merged to the branch mainline in revision 5833.
- Revision ID: mbp@sourcefrog.net-20110419075211-3m94qorhr0rg3gzg
Add and test _RulesSearcher.get_single_value
- files added:
- bzrlib/deprecated_graph.py
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/bzr_distutils.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- po
- files renamed:
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- files modified:
- Makefile
added
removed
po/gl.po
1
# Galician translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-02-04 06:19+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3207
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:3210
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:3212
46
msgid "No new revisions to push."
47
msgstr "Non hai revisións novas para empurrar (push)."
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "atopouse un erro: %s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
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:218
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:303
69
msgid "Display status summary."
70
msgstr "Mostrar o resumo do estado."
71
72
#: bzrlib/builtins.py:305
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:308
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:311
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:315
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:320
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:323
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:326
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:329
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:334
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:337
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:341
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:346
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:351
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:354
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:363
189
msgid "Use short status indicators."
190
msgstr "Usar os indicadores de estado curtos"
191
192
#: bzrlib/builtins.py:365
193
msgid "Only show versioned files."
194
msgstr "Mostrar só os ficheiros versionados."
195
196
#: bzrlib/builtins.py:367
197
msgid "Don't show pending merges."
198
msgstr "Non mostrar as combinacións (merge) pendentes"
199
200
#: bzrlib/builtins.py:370
201
msgid "Do not mark object type using indicator."
202
msgstr ""
203
204
#: bzrlib/builtins.py:385
205
msgid "bzr status --revision takes exactly one or two revision specifiers"
206
msgstr ""
207
208
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
209
msgid "You can only supply one of revision_id or --revision"
210
msgstr ""
211
212
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
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:439
217
#, python-format
218
msgid "Repository %r does not support access to raw revision texts"
219
msgstr ""
220
221
#: bzrlib/builtins.py:450
222
msgid "The repository {0} contains no revision {1}."
223
msgstr ""
224
225
#: bzrlib/builtins.py:457
226
msgid "You cannot specify a NULL revision."
227
msgstr ""
228
229
#: bzrlib/builtins.py:549
230
msgid "Remove the working tree from a given branch/checkout."
231
msgstr ""
232
233
#: bzrlib/builtins.py:551
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:554
240
msgid "To re-create the working tree, use \"bzr checkout\"."
241
msgstr ""
242
243
#: bzrlib/builtins.py:560
244
msgid ""
245
"Remove the working tree even if it has uncommitted or shelved changes."
246
msgstr ""
247
248
#: bzrlib/builtins.py:574
249
msgid "No working tree to remove"
250
msgstr ""
251
252
#: bzrlib/builtins.py:576
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:585
257
msgid "You cannot remove the working tree from a lightweight checkout"
258
msgstr ""
259
260
#: bzrlib/builtins.py:625
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:636
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:640
273
msgid "failed to reset the tree state{0}"
274
msgstr ""
275
276
#: bzrlib/builtins.py:644
277
msgid "Show current revision number."
278
msgstr ""
279
280
#: bzrlib/builtins.py:646
281
msgid "This is equal to the number of revisions on this branch."
282
msgstr ""
283
284
#: bzrlib/builtins.py:659
285
msgid "--tree and --revision can not be used together"
286
msgstr ""
287
288
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
289
msgid "Tags can only be placed on a single revision, not on a range"
290
msgstr ""
291
292
#: bzrlib/builtins.py:700
293
msgid "Show revno of working tree."
294
msgstr ""
295
296
#: bzrlib/builtins.py:748
297
msgid "Add specified files or directories."
298
msgstr ""
299
300
#: bzrlib/builtins.py:750
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:754
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:762
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:765
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:768
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:773
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:776
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:784
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:787
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:794
369
msgid "Don't recursively add the contents of directories."
370
msgstr ""
371
372
#: bzrlib/builtins.py:800
373
msgid "Lookup file ids from this tree."
374
msgstr ""
375
376
#: bzrlib/builtins.py:836
377
msgid "ignored {0} matching \"{1}\"\n"
378
msgstr ""
379
380
#: bzrlib/builtins.py:841
381
msgid "Create a new versioned directory."
382
msgstr ""
383
384
#: bzrlib/builtins.py:843
385
msgid "This is equivalent to creating the directory and then adding it."
386
msgstr ""
387
388
#: bzrlib/builtins.py:850
389
msgid "No error if existing, make parent directories as needed."
390
msgstr ""
391
392
#: bzrlib/builtins.py:884
393
#, python-format
394
msgid "added %s\n"
395
msgstr ""
396
397
#: bzrlib/builtins.py:926
398
#, python-format
399
msgid "invalid kind %r specified"
400
msgstr ""
401
402
#: bzrlib/builtins.py:963
403
msgid "Move or rename a file."
404
msgstr ""
405
406
#: bzrlib/builtins.py:965
407
msgid " bzr mv SOURCE... DESTINATION"
408
msgstr ""
409
410
#: bzrlib/builtins.py:967
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:971
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:977
427
msgid "Files cannot be moved between branches."
428
msgstr ""
429
430
#: bzrlib/builtins.py:984
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:986
437
msgid "Automatically guess renames."
438
msgstr ""
439
440
#: bzrlib/builtins.py:987
441
msgid "Avoid making changes when guessing renames."
442
msgstr ""
443
444
#: bzrlib/builtins.py:996
445
msgid "--dry-run requires --auto."
446
msgstr ""
447
448
#: bzrlib/builtins.py:1000
449
msgid "missing file argument"
450
msgstr ""
451
452
#: bzrlib/builtins.py:1004
453
msgid "can not move root of branch"
454
msgstr ""
455
456
#: bzrlib/builtins.py:1010
457
msgid "Only one path may be specified to --auto."
458
msgstr ""
459
460
#: bzrlib/builtins.py:1013
461
msgid "--after cannot be specified with --auto."
462
msgstr ""
463
464
#: bzrlib/builtins.py:1050
465
msgid "to mv multiple files the destination must be a versioned directory"
466
msgstr ""
467
468
#: bzrlib/builtins.py:1102
469
msgid "Turn this branch into a mirror of another branch."
470
msgstr ""
471
472
#: bzrlib/builtins.py:1104
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:1109
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:1113
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:1117
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:1122
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:1126
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:1134
517
msgid "Show logs of pulled revisions."
518
msgstr ""
519
520
#: bzrlib/builtins.py:1136
521
msgid ""
522
"Branch to pull into, rather than the one containing the working directory."
523
msgstr ""
524
525
#: bzrlib/builtins.py:1139
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:1168
532
msgid "Need working tree for --show-base."
533
msgstr ""
534
535
#: bzrlib/builtins.py:1184
536
msgid "No pull location known or specified."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1190
540
#, python-format
541
msgid "Using saved parent location: %s\n"
542
msgstr ""
543
544
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
545
msgid "Cannot use -r with merge directives or bundles"
546
msgstr ""
547
548
#: bzrlib/builtins.py:1238
549
msgid "Update a mirror of this branch."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1240
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:1243
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:1246
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:1250
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:1253
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:1257
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:1262
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:1273 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:1276
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:1281
611
msgid ""
612
"Create a stacked branch that references the public location of the parent "
613
"branch."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1284
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:1289 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:1292
630
msgid "Don't populate the working tree, even for protocols that support it."
631
msgstr ""
632
633
#: bzrlib/builtins.py:1336
634
msgid "Could not determine branch to refer to."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1345
638
#, python-format
639
msgid ""
640
"No push location known or specified. To push to the parent branch (at %s), "
641
"use 'bzr push :parent'."
642
msgstr ""
643
644
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
645
msgid "No push location known or specified."
646
msgstr ""
647
648
#: bzrlib/builtins.py:1355
649
#, python-format
650
msgid "Using saved push location: %s"
651
msgstr ""
652
653
#: bzrlib/builtins.py:1365
654
msgid "Create a new branch that is a copy of an existing branch."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1367
658
msgid ""
659
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
660
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
661
"./bar.\n"
662
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
663
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
664
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
665
"create ./foo-bar."
666
msgstr ""
667
668
#: bzrlib/builtins.py:1374
669
msgid ""
670
"To retrieve the branch as of a particular revision, supply the --revision\n"
671
"parameter, as in \"branch foo/bar -r 5\"."
672
msgstr ""
673
674
#: bzrlib/builtins.py:1377
675
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
676
msgstr ""
677
678
#: bzrlib/builtins.py:1387
679
msgid "Create a branch without a working-tree."
680
msgstr ""
681
682
#: bzrlib/builtins.py:1389
683
msgid "Switch the checkout in the current directory to the new branch."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1392
687
msgid ""
688
"Create a stacked branch referring to the source branch. The new branch will "
689
"depend on the availability of the source branch for all operations."
690
msgstr ""
691
692
#: bzrlib/builtins.py:1396
693
msgid "Do not use a shared repository, even if available."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1398
697
msgid ""
698
"By default branch will fail if the target directory exists, but does not "
699
"already have a control directory. This flag will allow branch to proceed."
700
msgstr ""
701
702
#: bzrlib/builtins.py:1403
703
msgid "Bind new branch to from location."
704
msgstr ""
705
706
#: bzrlib/builtins.py:1450
707
#, python-format
708
msgid "Target directory \"%s\" already exists."
709
msgstr ""
710
711
#: bzrlib/builtins.py:1462
712
#, python-format
713
msgid "Parent of \"%s\" does not exist."
714
msgstr ""
715
716
#: bzrlib/builtins.py:1481
717
msgid "The branch {0} has no revision {1}."
718
msgstr ""
719
720
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
721
#, python-format
722
msgid "Created new stacked branch referring to %s."
723
msgstr ""
724
725
#: bzrlib/builtins.py:1500
726
#, python-format
727
msgid "Branched %d revision."
728
msgid_plural "Branched %d revisions."
729
msgstr[0] ""
730
msgstr[1] ""
731
732
#: bzrlib/builtins.py:1505
733
#, python-format
734
msgid "New branch bound to %s"
735
msgstr ""
736
737
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
738
#, python-format
739
msgid "Switched to branch: %s"
740
msgstr ""
741
742
#: bzrlib/builtins.py:1515
743
msgid "List the branches available at the current location."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1517
747
msgid ""
748
"This command will print the names of all the branches at the current\n"
749
"location."
750
msgstr ""
751
752
#: bzrlib/builtins.py:1524
753
msgid ""
754
"Recursively scan for branches rather than just looking in the specified "
755
"location."
756
msgstr ""
757
758
#: bzrlib/builtins.py:1554
759
msgid "(default)"
760
msgstr ""
761
762
#: bzrlib/builtins.py:1566
763
msgid "Create a new checkout of an existing branch."
764
msgstr ""
765
766
#: bzrlib/builtins.py:1568
767
msgid ""
768
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
769
"for\n"
770
"the branch found in '.'. This is useful if you have removed the working "
771
"tree\n"
772
"or if it was never created - i.e. if you pushed the branch to its current\n"
773
"location using SFTP."
774
msgstr ""
775
776
#: bzrlib/builtins.py:1573
777
msgid ""
778
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
779
"will\n"
780
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
781
"./bar.\n"
782
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
783
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
784
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
785
"create ./foo-bar."
786
msgstr ""
787
788
#: bzrlib/builtins.py:1580
789
msgid ""
790
"To retrieve the branch as of a particular revision, supply the --revision\n"
791
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
792
"immediately\n"
793
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
794
"old\n"
795
"code.)"
796
msgstr ""
797
798
#: bzrlib/builtins.py:1590
799
msgid ""
800
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
801
"the branch for every operation. Normal checkouts can perform common "
802
"operations like diff and status without such access, and also support local "
803
"commits."
804
msgstr ""
805
806
#: bzrlib/builtins.py:1597
807
msgid "Get file contents from this tree."
808
msgstr ""
809
810
#: bzrlib/builtins.py:1599
811
msgid "Hard-link working tree files where possible."
812
msgstr ""
813
814
#: bzrlib/builtins.py:1640
815
msgid ""
816
"Show list of renamed files.\n"
817
" "
818
msgstr ""
819
820
#: bzrlib/builtins.py:1670
821
msgid "Update a working tree to a new revision."
822
msgstr ""
823
824
#: bzrlib/builtins.py:1672
825
msgid ""
826
"This will perform a merge of the destination revision (the tip of the\n"
827
"branch, or the specified revision) into the working tree, and then make\n"
828
"that revision the basis revision for the working tree. "
829
msgstr ""
830
831
#: bzrlib/builtins.py:1676
832
msgid ""
833
"You can use this to visit an older revision, or to update a working tree\n"
834
"that is out of date from its branch."
835
msgstr ""
836
837
#: bzrlib/builtins.py:1679
838
msgid ""
839
"If there are any uncommitted changes in the tree, they will be carried\n"
840
"across and remain as uncommitted changes after the update. To discard\n"
841
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
842
"with the changes brought in by the change in basis revision."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1684
846
msgid ""
847
"If the tree's branch is bound to a master branch, bzr will also update\n"
848
"the branch from the master."
849
msgstr ""
850
851
#: bzrlib/builtins.py:1687
852
msgid ""
853
"You cannot update just a single file or directory, because each Bazaar\n"
854
"working tree has just a single basis revision. If you want to restore a\n"
855
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
856
"update'. If you want to restore a file to its state in a previous\n"
857
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
858
"out the old content of that file to a new location."
859
msgstr ""
860
861
#: bzrlib/builtins.py:1694
862
msgid ""
863
"The 'dir' argument, if given, must be the location of the root of a\n"
864
"working tree to update. By default, the working tree that contains the \n"
865
"current working directory is used."
866
msgstr ""
867
868
#: bzrlib/builtins.py:1710
869
msgid "bzr update --revision takes exactly one revision"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1718
873
msgid "bzr update can only update a whole tree, not a file or subdirectory"
874
msgstr ""
875
876
#: bzrlib/builtins.py:1749
877
msgid "Tree is up to date at revision {0} of branch {1}"
878
msgstr ""
879
880
#: bzrlib/builtins.py:1765
881
#, python-format
882
msgid ""
883
"branch has no revision %s\n"
884
"bzr update --revision only works for a revision in the branch history"
885
msgstr ""
886
887
#: bzrlib/builtins.py:1771
888
msgid "Updated to revision {0} of branch {1}"
889
msgstr ""
890
891
#: bzrlib/builtins.py:1775
892
msgid ""
893
"Your local commits will now show as pending merges with 'bzr status', and "
894
"can be committed with 'bzr commit'."
895
msgstr ""
896
897
#: bzrlib/builtins.py:1784
898
msgid "Show information about a working tree, branch or repository."
899
msgstr ""
900
901
#: bzrlib/builtins.py:1786
902
msgid ""
903
"This command will show all known locations and formats associated to the\n"
904
"tree, branch or repository."
905
msgstr ""
906
907
#: bzrlib/builtins.py:1789
908
msgid ""
909
"In verbose mode, statistical information is included with each report.\n"
910
"To see extended statistic information, use a verbosity level of 2 or\n"
911
"higher by specifying the verbose option multiple times, e.g. -vv."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1793
915
msgid "Branches and working trees will also report any missing revisions."
916
msgstr ""
917
918
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
919
#: bzrlib/builtins.py:6442
920
msgid ":Examples:"
921
msgstr ""
922
923
#: bzrlib/builtins.py:1797
924
msgid " Display information on the format and related locations:"
925
msgstr ""
926
927
#: bzrlib/builtins.py:1799
928
msgid " bzr info"
929
msgstr ""
930
931
#: bzrlib/builtins.py:1801
932
msgid ""
933
" Display the above together with extended format information and\n"
934
" basic statistics (like the number of files in the working tree and\n"
935
" number of revisions in the branch and repository):"
936
msgstr ""
937
938
#: bzrlib/builtins.py:1805
939
msgid " bzr info -v"
940
msgstr ""
941
942
#: bzrlib/builtins.py:1807
943
msgid " Display the above together with number of committers to the branch:"
944
msgstr ""
945
946
#: bzrlib/builtins.py:1809
947
msgid " bzr info -vv"
948
msgstr ""
949
950
#: bzrlib/builtins.py:1828
951
msgid "Remove files or directories."
952
msgstr ""
953
954
#: bzrlib/builtins.py:1830
955
msgid ""
956
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
957
"delete them if they can easily be recovered using revert otherwise they\n"
958
"will be backed up (adding an extention of the form .~#~). If no options or\n"
959
"parameters are given Bazaar will scan for files that are being tracked by\n"
960
"Bazaar but missing in your tree and stop tracking them for you."
961
msgstr ""
962
963
#: bzrlib/builtins.py:1838
964
msgid "Only remove files that have never been committed."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1840
968
msgid "The file deletion mode to be used."
969
msgstr ""
970
971
#: bzrlib/builtins.py:1841
972
msgid "Deletion Strategy"
973
msgstr ""
974
975
#: bzrlib/builtins.py:1842
976
msgid "Backup changed files (default)."
977
msgstr ""
978
979
#: bzrlib/builtins.py:1843
980
msgid "Delete from bzr but leave the working copy."
981
msgstr ""
982
983
#: bzrlib/builtins.py:1844
984
msgid "Don't backup changed files."
985
msgstr ""
986
987
#: bzrlib/builtins.py:1845
988
msgid ""
989
"Delete all the specified files, even if they can not be recovered and even "
990
"if they are non-empty directories. (deprecated, use no-backup)"
991
msgstr ""
992
993
#: bzrlib/builtins.py:1854
994
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
995
msgstr ""
996
997
#: bzrlib/builtins.py:1871
998
msgid "No matching files."
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1932
1002
msgid "Reconcile bzr metadata in a branch."
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1934
1006
msgid ""
1007
"This can correct data mismatches that may have been caused by\n"
1008
"previous ghost operations or bzr upgrades. You should only\n"
1009
"need to run this command if 'bzr check' or a bzr developer\n"
1010
"advises you to run it."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1939
1014
msgid ""
1015
"If a second branch is provided, cross-branch reconciliation is\n"
1016
"also attempted, which will check that data like the tree root\n"
1017
"id which was not present in very early bzr versions is represented\n"
1018
"correctly in both branches."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1944
1022
msgid ""
1023
"At the same time it is run it may recompress data resulting in\n"
1024
"a potential saving in disk space or performance gain."
1025
msgstr ""
1026
1027
#: bzrlib/builtins.py:1947
1028
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1032
msgid ""
1033
"Format for the bzr 2.0 series.\n"
1034
"Uses group-compress storage.\n"
1035
"Provides rich roots which are a one-way transition.\n"
1036
msgstr ""
1037
1038
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1039
msgid ""
1040
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1041
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1042
msgstr ""
1043
1044
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1045
msgid "The 2a format with experimental support for colocated branches.\n"
1046
msgstr ""
1047
1048
#: bzrlib/builtins.py:2015
1049
msgid "Make a directory into a versioned branch."
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:2017
1053
msgid ""
1054
"Use this to create an empty branch, or before importing an\n"
1055
"existing project."
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:2020
1059
msgid ""
1060
"If there is a repository in a parent directory of the location, then\n"
1061
"the history of the branch will be stored in the repository. Otherwise\n"
1062
"init creates a standalone branch which carries its own history\n"
1063
"in the .bzr directory."
1064
msgstr ""
1065
1066
#: bzrlib/builtins.py:2025
1067
msgid ""
1068
"If there is already a branch at the location but it has no working tree,\n"
1069
"the tree can be populated with 'bzr checkout'."
1070
msgstr ""
1071
1072
#: bzrlib/builtins.py:2028
1073
msgid "Recipe for importing a tree of files::"
1074
msgstr ""
1075
1076
#: bzrlib/builtins.py:2030
1077
msgid ""
1078
" cd ~/project\n"
1079
" bzr init\n"
1080
" bzr add .\n"
1081
" bzr status\n"
1082
" bzr commit -m \"imported project\""
1083
msgstr ""
1084
1085
#: bzrlib/builtins.py:2041
1086
msgid ""
1087
"Create the path leading up to the branch if it does not already exist."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2044
1091
msgid "Specify a format for this branch. See \"help formats\"."
1092
msgstr ""
1093
1094
#: bzrlib/builtins.py:2052
1095
msgid ""
1096
"Never change revnos or the existing log. Append revisions to it only."
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:2055
1100
msgid "Create a branch without a working tree."
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1104
#, python-format
1105
msgid ""
1106
"Parent directory of %s does not exist.\n"
1107
"You may supply --create-prefix to create all leading parent directories."
1108
msgstr ""
1109
1110
#: bzrlib/builtins.py:2109
1111
msgid ""
1112
"This branch format cannot be set to append-revisions-only. Try --default."
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:2120
1116
msgid "Created a {0} (format: {1})\n"
1117
msgstr ""
1118
1119
#: bzrlib/builtins.py:2129
1120
#, python-format
1121
msgid "Using shared repository: %s\n"
1122
msgstr ""
1123
1124
#: bzrlib/builtins.py:2133
1125
msgid "Create a shared repository for branches to share storage space."
1126
msgstr ""
1127
1128
#: bzrlib/builtins.py:2135
1129
msgid ""
1130
"New branches created under the repository directory will store their\n"
1131
"revisions in the repository, not in the branch directory. For branches\n"
1132
"with shared history, this reduces the amount of storage needed and \n"
1133
"speeds up the creation of new branches."
1134
msgstr ""
1135
1136
#: bzrlib/builtins.py:2140
1137
msgid ""
1138
"If the --no-trees option is given then the branches in the repository\n"
1139
"will not have working trees by default. They will still exist as \n"
1140
"directories on disk, but they will not have separate copies of the \n"
1141
"files at a certain revision. This can be useful for repositories that\n"
1142
"store branches which are interacted with through checkouts or remote\n"
1143
"branches, such as on a server."
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2147
1147
msgid ""
1148
":Examples:\n"
1149
" Create a shared repository holding just branches::"
1150
msgstr ""
1151
1152
#: bzrlib/builtins.py:2150
1153
msgid ""
1154
" bzr init-repo --no-trees repo\n"
1155
" bzr init repo/trunk"
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2153
1159
msgid " Make a lightweight checkout elsewhere::"
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2155
1163
msgid ""
1164
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1165
" cd trunk-checkout\n"
1166
" (add files here)"
1167
msgstr ""
1168
1169
#: bzrlib/builtins.py:2163
1170
msgid ""
1171
"Specify a format for this repository. See \"bzr help formats\" for details."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2167
1175
msgid "Repository format"
1176
msgstr ""
1177
1178
#: bzrlib/builtins.py:2169
1179
msgid "Branches in the repository will default to not having a working tree."
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:2195
1183
msgid "Show differences in the working tree, between revisions or branches."
1184
msgstr ""
1185
1186
#: bzrlib/builtins.py:2197
1187
msgid ""
1188
"If no arguments are given, all changes for the current tree are listed.\n"
1189
"If files are given, only the changes in those files are listed.\n"
1190
"Remote and multiple branches can be compared by using the --old and\n"
1191
"--new options. If not provided, the default for both is derived from\n"
1192
"the first argument, if any, or the current tree if no arguments are\n"
1193
"given."
1194
msgstr ""
1195
1196
#: bzrlib/builtins.py:2204
1197
msgid ""
1198
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1199
"produces patches suitable for \"patch -p1\"."
1200
msgstr ""
1201
1202
#: bzrlib/builtins.py:2207
1203
msgid ""
1204
"Note that when using the -r argument with a range of revisions, the\n"
1205
"differences are computed between the two specified revisions. That\n"
1206
"is, the command does not show the changes introduced by the first \n"
1207
"revision in the range. This differs from the interpretation of \n"
1208
"revision ranges used by \"bzr log\" which includes the first revision\n"
1209
"in the range."
1210
msgstr ""
1211
1212
#: bzrlib/builtins.py:2214
1213
msgid ""
1214
":Exit values:\n"
1215
" 1 - changed\n"
1216
" 2 - unrepresentable changes\n"
1217
" 3 - error\n"
1218
" 0 - no change"
1219
msgstr ""
1220
1221
#: bzrlib/builtins.py:2220
1222
msgid ""
1223
":Examples:\n"
1224
" Shows the difference in the working tree versus the last commit::"
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2223
1228
msgid " bzr diff"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2225
1232
msgid " Difference between the working tree and revision 1::"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2227
1236
msgid " bzr diff -r1"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2229
1240
msgid " Difference between revision 3 and revision 1::"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2231
1244
msgid " bzr diff -r1..3"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2233
1248
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2235
1252
msgid " bzr diff -r1..3 xxx"
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:2237
1256
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2239
1260
msgid " bzr diff -c2"
1261
msgstr ""
1262
1263
#: bzrlib/builtins.py:2241
1264
msgid ""
1265
" To see the changes introduced by revision X::\n"
1266
" \n"
1267
" bzr diff -cX"
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2245
1271
msgid ""
1272
" Note that in the case of a merge, the -c option shows the changes\n"
1273
" compared to the left hand parent. To see the changes against\n"
1274
" another parent, use::"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2249
1278
msgid " bzr diff -r<chosen_parent>..X"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2251
1282
msgid ""
1283
" The changes between the current revision and the previous revision\n"
1284
" (equivalent to -c-1 and -r-2..-1)"
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2254
1288
msgid " bzr diff -r-2.."
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2256
1292
msgid " Show just the differences for file NEWS::"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2258
1296
msgid " bzr diff NEWS"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2260
1300
msgid " Show the differences in working tree xxx for file NEWS::"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2262
1304
msgid " bzr diff xxx/NEWS"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2264
1308
msgid " Show the differences from branch xxx to this working tree:"
1309
msgstr ""
1310
1311
#: bzrlib/builtins.py:2266
1312
msgid " bzr diff --old xxx"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2268
1316
msgid " Show the differences between two branches for file NEWS::"
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2270
1320
msgid " bzr diff --old xxx --new yyy NEWS"
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2272
1324
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2274
1328
msgid ""
1329
" bzr diff --prefix old/:new/\n"
1330
" \n"
1331
" Show the differences using a custom diff program with options::\n"
1332
" \n"
1333
" bzr diff --using /usr/bin/diff --diff-options -wu"
1334
msgstr ""
1335
1336
#: bzrlib/builtins.py:2284
1337
msgid "Pass these options to the external diff program."
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2287
1341
msgid ""
1342
"Set prefixes added to old and new filenames, as two values separated by a "
1343
"colon. (eg \"old/:new/\")."
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2290
1347
msgid "Branch/tree to compare from."
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2294
1351
msgid "Branch/tree to compare to."
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2300
1355
msgid "Use this command to compare files."
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2305
1359
msgid "Diff format to use."
1360
msgstr ""
1361
1362
#: bzrlib/builtins.py:2307
1363
msgid "Diff format"
1364
msgstr ""
1365
1366
#: bzrlib/builtins.py:2329
1367
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1368
msgstr ""
1369
1370
#: bzrlib/builtins.py:2333
1371
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1375
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1376
msgid "{0} and {1} are mutually exclusive"
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2358
1380
msgid ""
1381
"List files deleted in the working tree.\n"
1382
" "
1383
msgstr ""
1384
1385
#: bzrlib/builtins.py:2436
1386
msgid "Show the tree root directory."
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2438
1390
msgid ""
1391
"The root is the nearest enclosing directory with a .bzr control\n"
1392
"directory."
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2453
1396
msgid "The limit argument must be an integer."
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2461
1400
msgid "The levels argument must be an integer."
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2466
1404
msgid "Show historical log for a branch or subset of a branch."
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2468
1408
msgid ""
1409
"log is bzr's default tool for exploring the history of a branch.\n"
1410
"The branch to use is taken from the first parameter. If no parameters\n"
1411
"are given, the branch containing the working directory is logged.\n"
1412
"Here are some simple examples::"
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2473
1416
msgid ""
1417
" bzr log log the current branch\n"
1418
" bzr log foo.py log a file in its branch\n"
1419
" bzr log http://server/branch log a branch on a server"
1420
msgstr ""
1421
1422
#: bzrlib/builtins.py:2477
1423
msgid ""
1424
"The filtering, ordering and information shown for each revision can\n"
1425
"be controlled as explained below. By default, all revisions are\n"
1426
"shown sorted (topologically) so that newer revisions appear before\n"
1427
"older ones and descendants always appear before ancestors. If displayed,\n"
1428
"merged revisions are shown indented under the revision in which they\n"
1429
"were merged."
1430
msgstr ""
1431
1432
#: bzrlib/builtins.py:2484
1433
msgid ":Output control:"
1434
msgstr ""
1435
1436
#: bzrlib/builtins.py:2486
1437
msgid ""
1438
" The log format controls how information about each revision is\n"
1439
" displayed. The standard log formats are called ``long``, ``short``\n"
1440
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1441
" for more details on log formats."
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2491
1445
msgid ""
1446
" The following options can be used to control what information is\n"
1447
" displayed::"
1448
msgstr ""
1449
1450
#: bzrlib/builtins.py:2494
1451
msgid ""
1452
" -l N display a maximum of N revisions\n"
1453
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1454
" -v display a status summary (delta) for each revision\n"
1455
" -p display a diff (patch) for each revision\n"
1456
" --show-ids display revision-ids (and file-ids), not just revnos"
1457
msgstr ""
1458
1459
#: bzrlib/builtins.py:2500
1460
msgid ""
1461
" Note that the default number of levels to display is a function of the\n"
1462
" log format. If the -n option is not used, the standard log formats show\n"
1463
" just the top level (mainline)."
1464
msgstr ""
1465
1466
#: bzrlib/builtins.py:2504
1467
msgid ""
1468
" Status summaries are shown using status flags like A, M, etc. To see\n"
1469
" the changes explained using words like ``added`` and ``modified``\n"
1470
" instead, use the -vv option."
1471
msgstr ""
1472
1473
#: bzrlib/builtins.py:2508
1474
msgid ":Ordering control:"
1475
msgstr ""
1476
1477
#: bzrlib/builtins.py:2510
1478
msgid ""
1479
" To display revisions from oldest to newest, use the --forward option.\n"
1480
" In most cases, using this option will have little impact on the total\n"
1481
" time taken to produce a log, though --forward does not incrementally\n"
1482
" display revisions like --reverse does when it can."
1483
msgstr ""
1484
1485
#: bzrlib/builtins.py:2515
1486
msgid ":Revision filtering:"
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2517
1490
msgid ""
1491
" The -r option can be used to specify what revision or range of revisions\n"
1492
" to filter against. The various forms are shown below::"
1493
msgstr ""
1494
1495
#: bzrlib/builtins.py:2520
1496
msgid ""
1497
" -rX display revision X\n"
1498
" -rX.. display revision X and later\n"
1499
" -r..Y display up to and including revision Y\n"
1500
" -rX..Y display from X to Y inclusive"
1501
msgstr ""
1502
1503
#: bzrlib/builtins.py:2525
1504
msgid ""
1505
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1506
" Some common examples are given below::"
1507
msgstr ""
1508
1509
#: bzrlib/builtins.py:2528
1510
msgid ""
1511
" -r-1 show just the tip\n"
1512
" -r-10.. show the last 10 mainline revisions\n"
1513
" -rsubmit:.. show what's new on this branch\n"
1514
" -rancestor:path.. show changes since the common ancestor of this\n"
1515
" branch and the one at location path\n"
1516
" -rdate:yesterday.. show changes since yesterday"
1517
msgstr ""
1518
1519
#: bzrlib/builtins.py:2535
1520
msgid ""
1521
" When logging a range of revisions using -rX..Y, log starts at\n"
1522
" revision Y and searches back in history through the primary\n"
1523
" (\"left-hand\") parents until it finds X. When logging just the\n"
1524
" top level (using -n1), an error is reported if X is not found\n"
1525
" along the way. If multi-level logging is used (-n0), X may be\n"
1526
" a nested merge revision and the log will be truncated accordingly."
1527
msgstr ""
1528
1529
#: bzrlib/builtins.py:2542
1530
msgid ":Path filtering:"
1531
msgstr ""
1532
1533
#: bzrlib/builtins.py:2544
1534
msgid ""
1535
" If parameters are given and the first one is not a branch, the log\n"
1536
" will be filtered to show only those revisions that changed the\n"
1537
" nominated files or directories."
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2548
1541
msgid ""
1542
" Filenames are interpreted within their historical context. To log a\n"
1543
" deleted file, specify a revision range so that the file existed at\n"
1544
" the end or start of the range."
1545
msgstr ""
1546
1547
#: bzrlib/builtins.py:2552
1548
msgid ""
1549
" Historical context is also important when interpreting pathnames of\n"
1550
" renamed files/directories. Consider the following example:"
1551
msgstr ""
1552
1553
#: bzrlib/builtins.py:2555
1554
msgid ""
1555
" * revision 1: add tutorial.txt\n"
1556
" * revision 2: modify tutorial.txt\n"
1557
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1558
msgstr ""
1559
1560
#: bzrlib/builtins.py:2559
1561
msgid " In this case:"
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2561
1565
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2563
1569
msgid ""
1570
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2565
1574
msgid ""
1575
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1576
" the original file in revision 2."
1577
msgstr ""
1578
1579
#: bzrlib/builtins.py:2568
1580
msgid ""
1581
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1582
" was no file called guide.txt in revision 2."
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2571
1586
msgid ""
1587
" Renames are always followed by log. By design, there is no need to\n"
1588
" explicitly ask for this (and no way to stop logging a file back\n"
1589
" until it was last renamed)."
1590
msgstr ""
1591
1592
#: bzrlib/builtins.py:2575
1593
msgid ":Other filtering:"
1594
msgstr ""
1595
1596
#: bzrlib/builtins.py:2577
1597
msgid ""
1598
" The --match option can be used for finding revisions that match a\n"
1599
" regular expression in a commit message, committer, author or bug.\n"
1600
" Specifying the option several times will match any of the supplied\n"
1601
" expressions. --match-author, --match-bugs, --match-committer and\n"
1602
" --match-message can be used to only match a specific field."
1603
msgstr ""
1604
1605
#: bzrlib/builtins.py:2583
1606
msgid ":Tips & tricks:"
1607
msgstr ""
1608
1609
#: bzrlib/builtins.py:2585
1610
msgid ""
1611
" GUI tools and IDEs are often better at exploring history than command\n"
1612
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1613
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1614
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1615
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1616
msgstr ""
1617
1618
#: bzrlib/builtins.py:2591
1619
msgid ""
1620
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2593
1624
msgid ""
1625
" [ALIASES]\n"
1626
" tip = log -r-1\n"
1627
" top = log -l10 --line\n"
1628
" show = log -v -p"
1629
msgstr ""
1630
1631
#: bzrlib/builtins.py:2598
1632
msgid ""
1633
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1634
" will show the last 10 mainline revisions. To see the details of a\n"
1635
" particular revision X, ``bzr show -rX``."
1636
msgstr ""
1637
1638
#: bzrlib/builtins.py:2602
1639
msgid ""
1640
" If you are interested in looking deeper into a particular merge X,\n"
1641
" use ``bzr log -n0 -rX``."
1642
msgstr ""
1643
1644
#: bzrlib/builtins.py:2605
1645
msgid ""
1646
" ``bzr log -v`` on a branch with lots of history is currently\n"
1647
" very slow. A fix for this issue is currently under development.\n"
1648
" With or without that fix, it is recommended that a revision range\n"
1649
" be given when using the -v option."
1650
msgstr ""
1651
1652
#: bzrlib/builtins.py:2610
1653
msgid ""
1654
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1655
" used to find revisions matching user names, commit messages, etc.\n"
1656
" Among other features, this plugin can find all revisions containing\n"
1657
" a list of words but not others."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2615
1661
msgid ""
1662
" When exploring non-mainline history on large projects with deep\n"
1663
" history, the performance of log can be greatly improved by installing\n"
1664
" the historycache plugin. This plugin buffers historical information\n"
1665
" trading disk space for faster speed."
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2624
1669
msgid "Show from oldest to newest."
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2627
1673
msgid "Show files changed in each revision."
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2633
1677
msgid "Show just the specified revision. See also \"help revisionspec\"."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2637
1681
msgid "What names to list as authors - first, all or committer."
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2638
1685
msgid "Authors"
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2643
1689
msgid "Number of levels to display - 0 for all, 1 for flat."
1690
msgstr ""
1691
1692
#: bzrlib/builtins.py:2653
1693
msgid "Limit the output to the first N revisions."
1694
msgstr ""
1695
1696
#: bzrlib/builtins.py:2658
1697
msgid "Show changes made in each revision as a patch."
1698
msgstr ""
1699
1700
#: bzrlib/builtins.py:2660
1701
msgid "Show merged revisions like --levels 0 does."
1702
msgstr ""
1703
1704
#: bzrlib/builtins.py:2664
1705
msgid "Do not report commits with more than one parent."
1706
msgstr ""
1707
1708
#: bzrlib/builtins.py:2666
1709
msgid ""
1710
"Display only the revisions that are not part of both ancestries (require -"
1711
"rX..Y)."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2670
1715
msgid "Show digital signature validity."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2673
1719
msgid "Show revisions whose properties match this expression."
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2677
1723
msgid "Show revisions whose message matches this expression."
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2681
1727
msgid "Show revisions whose committer matches this expression."
1728
msgstr ""
1729
1730
#: bzrlib/builtins.py:2685
1731
msgid "Show revisions whose authors match this expression."
1732
msgstr ""
1733
1734
#: bzrlib/builtins.py:2689
1735
msgid "Show revisions whose bugs match this expression."
1736
msgstr ""
1737
1738
#: bzrlib/builtins.py:2743
1739
msgid "--exclude-common-ancestry requires -r with two revisions"
1740
msgstr ""
1741
1742
#: bzrlib/builtins.py:2771
1743
#, python-format
1744
msgid "Path unknown at end or start of revision range: %s"
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2888
1748
#, python-format
1749
msgid "bzr %s doesn't accept two revisions in different branches."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2904
1753
#, python-format
1754
msgid "bzr %s --revision takes one or two values."
1755
msgstr ""
1756
1757
#: bzrlib/builtins.py:2949
1758
msgid ""
1759
"List files in a tree.\n"
1760
" "
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:2958
1764
msgid "Recurse into subdirectories."
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:2960
1768
msgid "Print paths relative to the root of the branch."
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2962
1772
msgid "Print unknown files."
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2963
1776
msgid "Print versioned files."
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2966
1780
msgid "Print ignored files."
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:2968
1784
msgid "List entries of a particular kind: file, directory, symlink."
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:2981
1788
msgid "invalid kind specified"
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2984
1792
msgid "Cannot set both --verbose and --null"
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:2993
1796
msgid "cannot specify both --from-root and PATH"
1797
msgstr ""
1798
1799
#: bzrlib/builtins.py:3080
1800
msgid "Ignore specified files or patterns."
1801
msgstr ""
1802
1803
#: bzrlib/builtins.py:3082
1804
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1805
msgstr ""
1806
1807
#: bzrlib/builtins.py:3084
1808
msgid ""
1809
"If a .bzrignore file does not exist, the ignore command\n"
1810
"will create one and add the specified files or patterns to the newly\n"
1811
"created file. The ignore command will also automatically add the \n"
1812
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1813
"the use of the ignore command will require an explicit add command."
1814
msgstr ""
1815
1816
#: bzrlib/builtins.py:3090
1817
msgid ""
1818
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1819
"After adding, editing or deleting that file either indirectly by\n"
1820
"using this command or directly by using an editor, be sure to commit\n"
1821
"it."
1822
msgstr ""
1823
1824
#: bzrlib/builtins.py:3095
1825
msgid ""
1826
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1827
"the global ignore file can be found in the application data directory as\n"
1828
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1829
"Global ignores are not touched by this command. The global ignore file\n"
1830
"can be edited directly using an editor."
1831
msgstr ""
1832
1833
#: bzrlib/builtins.py:3101
1834
msgid ""
1835
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1836
"precedence over regular ignores. Such exceptions are used to specify\n"
1837
"files that should be versioned which would otherwise be ignored."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:3105
1841
msgid ""
1842
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1843
"precedence over the '!' exception patterns."
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:3108
1847
msgid ""
1848
":Notes: \n"
1849
" \n"
1850
"* Ignore patterns containing shell wildcards must be quoted from\n"
1851
" the shell on Unix."
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3113
1855
msgid ""
1856
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1857
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1858
msgstr ""
1859
1860
#: bzrlib/builtins.py:3116
1861
msgid ""
1862
":Examples:\n"
1863
" Ignore the top level Makefile::"
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:3119
1867
msgid " bzr ignore ./Makefile"
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3121
1871
msgid " Ignore .class files in all directories...::"
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:3123
1875
msgid " bzr ignore \"*.class\""
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3125
1879
msgid " ...but do not ignore \"special.class\"::"
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3127
1883
msgid " bzr ignore \"!special.class\""
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3129
1887
msgid " Ignore files whose name begins with the \"#\" character::"
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3131
1891
msgid " bzr ignore \"RE:^#\""
1892
msgstr ""
1893
1894
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1895
msgid " Ignore .o files under the lib directory::"
1896
msgstr ""
1897
1898
#: bzrlib/builtins.py:3135
1899
msgid " bzr ignore \"lib/**/*.o\""
1900
msgstr ""
1901
1902
#: bzrlib/builtins.py:3139
1903
msgid " bzr ignore \"RE:lib/.*\\.o\""
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3141
1907
msgid " Ignore everything but the \"debian\" toplevel directory::"
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3143
1911
msgid ""
1912
" bzr ignore \"RE:(?!debian/).*\"\n"
1913
" \n"
1914
" Ignore everything except the \"local\" toplevel directory,\n"
1915
" but always ignore autosave files ending in ~, even under local/::\n"
1916
" \n"
1917
" bzr ignore \"*\"\n"
1918
" bzr ignore \"!./local\"\n"
1919
" bzr ignore \"!!*~\""
1920
msgstr ""
1921
1922
#: bzrlib/builtins.py:3157
1923
msgid "Display the default ignore rules that bzr uses."
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3169
1927
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1928
msgstr ""
1929
1930
#: bzrlib/builtins.py:3180
1931
#, python-format
1932
msgid "Invalid ignore pattern found. %s"
1933
msgid_plural "Invalid ignore patterns found. %s"
1934
msgstr[0] ""
1935
msgstr[1] ""
1936
1937
#: bzrlib/builtins.py:3189
1938
msgid "NAME_PATTERN should not be an absolute path"
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3202
1942
#, python-format
1943
msgid ""
1944
"Warning: the following files are version controlled and match your ignore "
1945
"pattern:\n"
1946
"%s\n"
1947
"These files will continue to be version controlled unless you 'bzr remove' "
1948
"them.\n"
1949
msgstr ""
1950
1951
#: bzrlib/builtins.py:3209
1952
msgid "List ignored files and the patterns that matched them."
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3211
1956
msgid ""
1957
"List all the ignored files and the ignore pattern that caused the file to\n"
1958
"be ignored."
1959
msgstr ""
1960
1961
#: bzrlib/builtins.py:3214
1962
msgid "Alternatively, to list just the files::"
1963
msgstr ""
1964
1965
#: bzrlib/builtins.py:3216
1966
msgid " bzr ls --ignored"
1967
msgstr ""
1968
1969
#: bzrlib/builtins.py:3250
1970
#, python-format
1971
msgid "not a valid revision-number: %r"
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3257
1975
msgid ""
1976
"Export current or past revision to a destination directory or archive."
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:3259
1980
msgid "If no revision is specified this exports the last committed revision."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3261
1984
msgid ""
1985
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1986
"given, try to find the format with the extension. If no extension\n"
1987
"is found exports to a directory (equivalent to --format=dir)."
1988
msgstr ""
1989
1990
#: bzrlib/builtins.py:3265
1991
msgid ""
1992
"If root is supplied, it will be used as the root directory inside\n"
1993
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1994
"to the exported filename. The root option has no effect for 'dir' format."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3269
1998
msgid ""
1999
"If branch is omitted then the branch containing the current working\n"
2000
"directory will be used."
2001
msgstr ""
2002
2003
#: bzrlib/builtins.py:3272
2004
msgid ""
2005
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3274
2009
msgid ""
2010
" ================= =========================\n"
2011
" Supported formats Autodetected by extension\n"
2012
" ================= =========================\n"
2013
" dir (none)\n"
2014
" tar .tar\n"
2015
" tbz2 .tar.bz2, .tbz2\n"
2016
" tgz .tar.gz, .tgz\n"
2017
" zip .zip\n"
2018
" ================= ========================="
2019
msgstr ""
2020
2021
#: bzrlib/builtins.py:3288
2022
msgid "Type of file to export to."
2023
msgstr ""
2024
2025
#: bzrlib/builtins.py:3291
2026
msgid "Apply content filters to export the convenient form."
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3295
2030
msgid "Name of the root directory inside the exported file."
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3297
2034
msgid ""
2035
"Set modification time of files to that of the last revision in which it was "
2036
"changed."
2037
msgstr ""
2038
2039
#: bzrlib/builtins.py:3300
2040
msgid ""
2041
"Export the working tree contents rather than that of the last revision."
2042
msgstr ""
2043
2044
#: bzrlib/builtins.py:3319
2045
msgid "--uncommitted requires a working tree"
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3328
2049
#, python-format
2050
msgid "Unsupported export format: %s"
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3332
2054
msgid ""
2055
"Write the contents of a file as of a given revision to standard output."
2056
msgstr ""
2057
2058
#: bzrlib/builtins.py:3334
2059
msgid "If no revision is nominated, the last revision is used."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3336
2063
msgid ""
2064
"Note: Take care to redirect standard output when using this command on a\n"
2065
"binary file."
2066
msgstr ""
2067
2068
#: bzrlib/builtins.py:3342
2069
msgid "The path name in the old tree."
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3343
2073
msgid "Apply content filters to display the convenience form."
2074
msgstr ""
2075
2076
#: bzrlib/builtins.py:3354
2077
msgid "bzr cat --revision takes exactly one revision specifier"
2078
msgstr ""
2079
2080
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2081
msgid "{0!r} is not present in revision {1}"
2082
msgstr ""
2083
2084
#: bzrlib/builtins.py:3414
2085
msgid "Commit changes into a new revision."
2086
msgstr ""
2087
2088
#: bzrlib/builtins.py:3416
2089
msgid ""
2090
"An explanatory message needs to be given for each commit. This is\n"
2091
"often done by using the --message option (getting the message from the\n"
2092
"command line) or by using the --file option (getting the message from\n"
2093
"a file). If neither of these options is given, an editor is opened for\n"
2094
"the user to enter the message. To see the changed files in the\n"
2095
"boilerplate text loaded into the editor, use the --show-diff option."
2096
msgstr ""
2097
2098
#: bzrlib/builtins.py:3423
2099
msgid ""
2100
"By default, the entire tree is committed and the person doing the\n"
2101
"commit is assumed to be the author. These defaults can be overridden\n"
2102
"as explained below."
2103
msgstr ""
2104
2105
#: bzrlib/builtins.py:3427
2106
msgid ":Selective commits:"
2107
msgstr ""
2108
2109
#: bzrlib/builtins.py:3429
2110
msgid ""
2111
" If selected files are specified, only changes to those files are\n"
2112
" committed. If a directory is specified then the directory and\n"
2113
" everything within it is committed."
2114
msgstr ""
2115
2116
#: bzrlib/builtins.py:3433
2117
msgid ""
2118
" When excludes are given, they take precedence over selected files.\n"
2119
" For example, to commit only changes within foo, but not changes\n"
2120
" within foo/bar::"
2121
msgstr ""
2122
2123
#: bzrlib/builtins.py:3437
2124
msgid " bzr commit foo -x foo/bar"
2125
msgstr ""
2126
2127
#: bzrlib/builtins.py:3439
2128
msgid " A selective commit after a merge is not yet supported."
2129
msgstr ""
2130
2131
#: bzrlib/builtins.py:3441
2132
msgid ":Custom authors:"
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3443
2136
msgid ""
2137
" If the author of the change is not the same person as the committer,\n"
2138
" you can specify the author's name using the --author option. The\n"
2139
" name should be in the same format as a committer-id, e.g.\n"
2140
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2141
" the change you can specify the option multiple times, once for each\n"
2142
" author."
2143
msgstr ""
2144
2145
#: bzrlib/builtins.py:3450
2146
msgid ":Checks:"
2147
msgstr ""
2148
2149
#: bzrlib/builtins.py:3452
2150
msgid ""
2151
" A common mistake is to forget to add a new file or directory before\n"
2152
" running the commit command. The --strict option checks for unknown\n"
2153
" files and aborts the commit if any are found. More advanced pre-commit\n"
2154
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2155
" for details."
2156
msgstr ""
2157
2158
#: bzrlib/builtins.py:3458
2159
msgid ":Things to note:"
2160
msgstr ""
2161
2162
#: bzrlib/builtins.py:3460
2163
msgid ""
2164
" If you accidentially commit the wrong changes or make a spelling\n"
2165
" mistake in the commit message say, you can use the uncommit command\n"
2166
" to undo it. See ``bzr help uncommit`` for details."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3464
2170
msgid ""
2171
" Hooks can also be configured to run after a commit. This allows you\n"
2172
" to trigger updates to external systems like bug trackers. The --fixes\n"
2173
" option can be used to record the association between a revision and\n"
2174
" one or more bugs. See ``bzr help bugs`` for details."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3474
2178
msgid "Do not consider changes made to a given path."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3477
2182
msgid "Description of the new revision."
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:3480
2186
msgid "Commit even if nothing has changed."
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:3484
2190
msgid "Take commit message from this file."
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3486
2194
msgid "Refuse to commit if there are unknown files in the working tree."
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3489
2198
msgid ""
2199
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2200
"08:00:00 +0100'."
2201
msgstr ""
2202
2203
#: bzrlib/builtins.py:3492
2204
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3495
2208
msgid "Set the author's name, if it's different from the committer."
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3498
2212
msgid ""
2213
"Perform a local commit in a bound branch. Local commits are not pushed to "
2214
"the master branch until a normal commit is performed."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3504
2218
msgid ""
2219
"When no message is supplied, show the diff along with the status summary in "
2220
"the message editor."
2221
msgstr ""
2222
2223
#: bzrlib/builtins.py:3507
2224
msgid ""
2225
"When committing to a foreign version control system do not push data that "
2226
"can not be natively represented."
2227
msgstr ""
2228
2229
#: bzrlib/builtins.py:3525
2230
#, python-format
2231
msgid ""
2232
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2233
"default bug tracker using the `bugtracker` option.\n"
2234
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2235
msgstr ""
2236
2237
#: bzrlib/builtins.py:3534
2238
#, python-format
2239
msgid ""
2240
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2241
"for more information on this feature.\n"
2242
"Commit refused."
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3543
2246
#, python-format
2247
msgid "Unrecognized bug %s. Commit refused."
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3546
2251
#, python-format
2252
msgid ""
2253
"%s\n"
2254
"Commit refused."
2255
msgstr ""
2256
2257
#: bzrlib/builtins.py:3570
2258
msgid "Could not parse --commit-time: "
2259
msgstr ""
2260
2261
#: bzrlib/builtins.py:3610
2262
msgid "please specify either --message or --file"
2263
msgstr ""
2264
2265
#: bzrlib/builtins.py:3639
2266
msgid "please specify a commit message with either --message or --file"
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3642
2270
msgid ""
2271
"Empty commit message specified. Please specify a commit message with either -"
2272
"-message or --file or leave a blank message with --message \"\"."
2273
msgstr ""
2274
2275
#: bzrlib/builtins.py:3662
2276
msgid ""
2277
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2278
"-unchanged to force an empty commit."
2279
msgstr ""
2280
2281
#: bzrlib/builtins.py:3666
2282
msgid ""
2283
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2284
"resolve FILE\" to resolve."
2285
msgstr ""
2286
2287
#: bzrlib/builtins.py:3670
2288
msgid "Commit refused because there are unknown files in the working tree."
2289
msgstr ""
2290
2291
#: bzrlib/builtins.py:3673
2292
msgid ""
2293
"\n"
2294
"To commit to master branch, run update and then commit.\n"
2295
"You can also pass --local to commit to continue working disconnected."
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3681
2299
msgid ""
2300
"Validate working tree structure, branch consistency and repository history."
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3683
2304
msgid ""
2305
"This command checks various invariants about branch and repository storage\n"
2306
"to detect data corruption or bzr bugs."
2307
msgstr ""
2308
2309
#: bzrlib/builtins.py:3686
2310
msgid ""
2311
"The working tree and branch checks will only give output if a problem is\n"
2312
"detected. The output fields of the repository check are:"
2313
msgstr ""
2314
2315
#: bzrlib/builtins.py:3689
2316
msgid ""
2317
"revisions\n"
2318
" This is just the number of revisions checked. It doesn't\n"
2319
" indicate a problem."
2320
msgstr ""
2321
2322
#: bzrlib/builtins.py:3693
2323
msgid ""
2324
"versionedfiles\n"
2325
" This is just the number of versionedfiles checked. It\n"
2326
" doesn't indicate a problem."
2327
msgstr ""
2328
2329
#: bzrlib/builtins.py:3697
2330
msgid ""
2331
"unreferenced ancestors\n"
2332
" Texts that are ancestors of other texts, but\n"
2333
" are not properly referenced by the revision ancestry. This is a\n"
2334
" subtle problem that Bazaar can work around."
2335
msgstr ""
2336
2337
#: bzrlib/builtins.py:3702
2338
msgid ""
2339
"unique file texts\n"
2340
" This is the total number of unique file contents\n"
2341
" seen in the checked revisions. It does not indicate a problem."
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3706
2345
msgid ""
2346
"repeated file texts\n"
2347
" This is the total number of repeated texts seen\n"
2348
" in the checked revisions. Texts can be repeated when their file\n"
2349
" entries are modified, but the file contents are not. It does not\n"
2350
" indicate a problem."
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3712
2354
msgid ""
2355
"If no restrictions are specified, all Bazaar data that is found at the "
2356
"given\n"
2357
"location will be checked."
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3717
2361
msgid " Check the tree and branch at 'foo'::"
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3719
2365
msgid " bzr check --tree --branch foo"
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3721
2369
msgid " Check only the repository at 'bar'::"
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3723
2373
msgid " bzr check --repo bar"
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3725
2377
msgid " Check everything at 'baz'::"
2378
msgstr ""
2379
2380
#: bzrlib/builtins.py:3727
2381
msgid " bzr check baz"
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3733
2385
msgid "Check the branch related to the current directory."
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3735
2389
msgid "Check the repository related to the current directory."
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3737
2393
msgid "Check the working tree related to the current directory."
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3751
2397
msgid "Upgrade a repository, branch or working tree to a newer format."
2398
msgstr ""
2399
2400
#: bzrlib/builtins.py:3753
2401
msgid ""
2402
"When the default format has changed after a major new release of\n"
2403
"Bazaar, you may be informed during certain operations that you\n"
2404
"should upgrade. Upgrading to a newer format may improve performance\n"
2405
"or make new features available. It may however limit interoperability\n"
2406
"with older repositories or with older versions of Bazaar."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3759
2410
msgid ""
2411
"If you wish to upgrade to a particular format rather than the\n"
2412
"current default, that can be specified using the --format option.\n"
2413
"As a consequence, you can use the upgrade command this way to\n"
2414
"\"downgrade\" to an earlier format, though some conversions are\n"
2415
"a one way process (e.g. changing from the 1.x default to the\n"
2416
"2.x default) so downgrading is not always possible."
2417
msgstr ""
2418
2419
#: bzrlib/builtins.py:3766
2420
msgid ""
2421
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2422
"process (where # is a number). By default, this is left there on\n"
2423
"completion. If the conversion fails, delete the new .bzr directory\n"
2424
"and rename this one back in its place. Use the --clean option to ask\n"
2425
"for the backup.bzr directory to be removed on successful conversion.\n"
2426
"Alternatively, you can delete it by hand if everything looks good\n"
2427
"afterwards."
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3774
2431
msgid ""
2432
"If the location given is a shared repository, dependent branches\n"
2433
"are also converted provided the repository converts successfully.\n"
2434
"If the conversion of a branch fails, remaining branches are still\n"
2435
"tried."
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3779
2439
msgid ""
2440
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2441
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3787
2445
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2446
msgstr ""
2447
2448
#: bzrlib/builtins.py:3791
2449
msgid "Branch format"
2450
msgstr ""
2451
2452
#: bzrlib/builtins.py:3793
2453
msgid "Remove the backup.bzr directory if successful."
2454
msgstr ""
2455
2456
#: bzrlib/builtins.py:3795
2457
msgid "Show what would be done, but don't actually do anything."
2458
msgstr ""
2459
2460
#: bzrlib/builtins.py:3810
2461
msgid "Show or set bzr user id."
2462
msgstr ""
2463
2464
#: bzrlib/builtins.py:3812
2465
msgid ""
2466
":Examples:\n"
2467
" Show the email of the current user::"
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3815
2471
msgid " bzr whoami --email"
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3817
2475
msgid " Set the current user::"
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3819
2479
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3823
2483
msgid "Display email address only."
2484
msgstr ""
2485
2486
#: bzrlib/builtins.py:3825
2487
msgid "Set identity for the current branch instead of globally."
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3851
2491
msgid "--email can only be used to display existing identity"
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3873
2495
msgid "Print or set the branch nickname."
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3875
2499
msgid ""
2500
"If unset, the tree root directory name is used as the nickname.\n"
2501
"To print the current nickname, execute with no argument."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3878
2505
msgid ""
2506
"Bound branches use the nickname of its master branch unless it is set\n"
2507
"locally."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3898
2511
msgid "Set/unset and display aliases."
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3900
2515
msgid ""
2516
":Examples:\n"
2517
" Show the current aliases::"
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3903
2521
msgid " bzr alias"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3905
2525
msgid " Show the alias specified for 'll'::"
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3907
2529
msgid " bzr alias ll"
2530
msgstr ""
2531
2532
#: bzrlib/builtins.py:3909
2533
msgid " Set an alias for 'll'::"
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:3911
2537
msgid " bzr alias ll=\"log --line -r-10..-1\""
2538
msgstr ""
2539
2540
#: bzrlib/builtins.py:3913
2541
msgid " To remove an alias for 'll'::"
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3915
2545
msgid " bzr alias --remove ll"
2546
msgstr ""
2547
2548
#: bzrlib/builtins.py:3920
2549
msgid "Remove the alias."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:3938
2553
msgid "bzr alias --remove expects an alias to remove."
2554
msgstr ""
2555
2556
#: bzrlib/builtins.py:4119
2557
msgid ""
2558
"subunit not available. subunit needs to be installed to use --subunit."
2559
msgstr ""
2560
2561
#: bzrlib/builtins.py:4136
2562
msgid ""
2563
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:4183
2567
msgid "Show version of bzr."
2568
msgstr ""
2569
2570
#: bzrlib/builtins.py:4187
2571
msgid "Print just the version number."
2572
msgstr ""
2573
2574
#: bzrlib/builtins.py:4206
2575
msgid "It sure does!\n"
2576
msgstr ""
2577
2578
#: bzrlib/builtins.py:4230
2579
#, python-format
2580
msgid "merge base is revision %s\n"
2581
msgstr ""
2582
2583
#: bzrlib/builtins.py:4234
2584
msgid "Perform a three-way merge."
2585
msgstr ""
2586
2587
#: bzrlib/builtins.py:4236
2588
msgid ""
2589
"The source of the merge can be specified either in the form of a branch,\n"
2590
"or in the form of a path to a file containing a merge directive generated\n"
2591
"with bzr send. If neither is specified, the default is the upstream branch\n"
2592
"or the branch most recently merged using --remember. The source of the\n"
2593
"merge may also be specified in the form of a path to a file in another\n"
2594
"branch: in this case, only the modifications to that file are merged into\n"
2595
"the current working tree."
2596
msgstr ""
2597
2598
#: bzrlib/builtins.py:4244
2599
msgid ""
2600
"When merging from a branch, by default bzr will try to merge in all new\n"
2601
"work from the other branch, automatically determining an appropriate base\n"
2602
"revision. If this fails, you may need to give an explicit base."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:4248
2606
msgid ""
2607
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2608
"try to merge in all new work up to and including revision OTHER."
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:4251
2612
msgid ""
2613
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2614
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2615
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2616
"not already contain revision BASE, such a merge is commonly referred to as\n"
2617
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2618
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2619
"changes from the other branch is not stored in the commit."
2620
msgstr ""
2621
2622
#: bzrlib/builtins.py:4259
2623
msgid "Revision numbers are always relative to the source branch."
2624
msgstr ""
2625
2626
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2627
msgid ""
2628
"Merge will do its best to combine the changes in two branches, but there\n"
2629
"are some kinds of problems only a human can fix. When it encounters those,\n"
2630
"it will mark a conflict. A conflict means that you need to fix something,\n"
2631
"before you can commit."
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4266
2635
msgid ""
2636
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2637
msgstr ""
2638
2639
#: bzrlib/builtins.py:4268
2640
msgid ""
2641
"If there is no default branch set, the first merge will set it (use\n"
2642
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2643
"to use the default. To change the default, use --remember. The value will\n"
2644
"only be saved if the remote location can be accessed."
2645
msgstr ""
2646
2647
#: bzrlib/builtins.py:4273
2648
msgid ""
2649
"The results of the merge are placed into the destination working\n"
2650
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2651
"committed to record the result of the merge."
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:4277
2655
msgid ""
2656
"merge refuses to run if there are any uncommitted changes, unless\n"
2657
"--force is given. If --force is given, then the changes from the source \n"
2658
"will be merged with the current working tree, including any uncommitted\n"
2659
"changes in the tree. The --force option can also be used to create a\n"
2660
"merge revision which has more than two parents."
2661
msgstr ""
2662
2663
#: bzrlib/builtins.py:4283
2664
msgid ""
2665
"If one would like to merge changes from the working tree of the other\n"
2666
"branch without merging any committed revisions, the --uncommitted option\n"
2667
"can be given."
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4287
2671
msgid ""
2672
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2673
"you to apply each diff hunk and file change, similar to \"shelve\"."
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4290
2677
msgid ""
2678
":Examples:\n"
2679
" To merge all new revisions from bzr.dev::"
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4293
2683
msgid " bzr merge ../bzr.dev"
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4295
2687
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:4297
2691
msgid " bzr merge -r 82 ../bzr.dev"
2692
msgstr ""
2693
2694
#: bzrlib/builtins.py:4299
2695
msgid " To merge the changes introduced by 82, without previous changes::"
2696
msgstr ""
2697
2698
#: bzrlib/builtins.py:4301
2699
msgid " bzr merge -r 81..82 ../bzr.dev"
2700
msgstr ""
2701
2702
#: bzrlib/builtins.py:4303
2703
msgid " To apply a merge directive contained in /tmp/merge::"
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:4305
2707
msgid " bzr merge /tmp/merge"
2708
msgstr ""
2709
2710
#: bzrlib/builtins.py:4307
2711
msgid ""
2712
" To create a merge revision with three parents from two branches\n"
2713
" feature1a and feature1b:"
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4310
2717
msgid ""
2718
" bzr merge ../feature1a\n"
2719
" bzr merge ../feature1b --force\n"
2720
" bzr commit -m 'revision with three parents'"
2721
msgstr ""
2722
2723
#: bzrlib/builtins.py:4322
2724
msgid "Merge even if the destination tree has uncommitted changes."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4328
2728
msgid ""
2729
"Apply uncommitted changes from a working copy, instead of branch changes."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4330
2733
msgid ""
2734
"If the destination is already completely merged into the source, pull from "
2735
"the source rather than merging. When this happens, you do not need to "
2736
"commit the result."
2737
msgstr ""
2738
2739
#: bzrlib/builtins.py:4335
2740
msgid ""
2741
"Branch to merge into, rather than the one containing the working directory."
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:4337
2745
msgid "Instead of merging, show a diff of the merge."
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4339
2749
msgid "Select changes interactively."
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4361
2753
msgid ""
2754
"Merging into empty branches not currently supported, "
2755
"https://bugs.launchpad.net/bzr/+bug/308562"
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4388
2759
msgid "Cannot use --uncommitted with bundles or merge directives."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4399
2763
msgid "Cannot use --uncommitted and --revision at the same time."
2764
msgstr ""
2765
2766
#: bzrlib/builtins.py:4419
2767
msgid "merger: "
2768
msgstr ""
2769
2770
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2771
msgid "Nothing to do."
2772
msgstr ""
2773
2774
#: bzrlib/builtins.py:4425
2775
msgid "Cannot pull individual files"
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4433
2779
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2780
msgstr ""
2781
2782
#: bzrlib/builtins.py:4491
2783
#, python-format
2784
msgid "Show-base is not supported for this merge type. %s"
2785
msgstr ""
2786
2787
#: bzrlib/builtins.py:4500
2788
#, python-format
2789
msgid "Conflict reduction is not supported for merge type %s."
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4504
2793
msgid "Cannot do conflict reduction and show base."
2794
msgstr ""
2795
2796
#: bzrlib/builtins.py:4615
2797
msgid "No location specified or remembered"
2798
msgstr ""
2799
2800
#: bzrlib/builtins.py:4617
2801
msgid "{0} remembered {1} location {2}"
2802
msgstr ""
2803
2804
#: bzrlib/builtins.py:4623
2805
msgid "Redo a merge."
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:4625
2809
msgid ""
2810
"Use this if you want to try a different merge technique while resolving\n"
2811
"conflicts. Some merge techniques are better than others, and remerge\n"
2812
"lets you try different ones on different files."
2813
msgstr ""
2814
2815
#: bzrlib/builtins.py:4629
2816
msgid ""
2817
"The options for remerge have the same meaning and defaults as the ones for\n"
2818
"merge. The difference is that remerge can (only) be run when there is a\n"
2819
"pending merge, and it lets you specify particular files."
2820
msgstr ""
2821
2822
#: bzrlib/builtins.py:4633
2823
msgid ""
2824
":Examples:\n"
2825
" Re-do the merge of all conflicted files, and show the base text in\n"
2826
" conflict regions, in addition to the usual THIS and OTHER texts::"
2827
msgstr ""
2828
2829
#: bzrlib/builtins.py:4637
2830
msgid " bzr remerge --show-base"
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4639
2834
msgid ""
2835
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2836
" additional processing to reduce the size of conflict regions::"
2837
msgstr ""
2838
2839
#: bzrlib/builtins.py:4642
2840
msgid " bzr remerge --merge-type weave --reprocess foobar"
2841
msgstr ""
2842
2843
#: bzrlib/builtins.py:4649
2844
msgid "Show base revision text in conflicts."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4661
2848
msgid ""
2849
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2850
"merges."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4717
2854
msgid "Revert files to a previous revision."
2855
msgstr ""
2856
2857
#: bzrlib/builtins.py:4719
2858
msgid ""
2859
"Giving a list of files will revert only those files. Otherwise, all files\n"
2860
"will be reverted. If the revision is not specified with '--revision', the\n"
2861
"last committed revision is used."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4723
2865
msgid ""
2866
"To remove only some changes, without reverting to a prior version, use\n"
2867
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2868
"will remove the changes introduced by the second last commit (-2), without\n"
2869
"affecting the changes introduced by the last commit (-1). To remove\n"
2870
"certain changes on a hunk-by-hunk basis, see the shelve command."
2871
msgstr ""
2872
2873
#: bzrlib/builtins.py:4729
2874
msgid ""
2875
"By default, any files that have been manually changed will be backed up\n"
2876
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2877
"'.~#~' appended to their name, where # is a number."
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4733
2881
msgid ""
2882
"When you provide files, you can use their current pathname or the pathname\n"
2883
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2884
"name. If you name a directory, all the contents of that directory will be\n"
2885
"reverted."
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4738
2889
msgid ""
2890
"If you have newly added files since the target revision, they will be\n"
2891
"removed. If the files to be removed have been changed, backups will be\n"
2892
"created as above. Directories containing unknown files will not be\n"
2893
"deleted."
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:4743
2897
msgid ""
2898
"The working tree contains a list of revisions that have been merged but\n"
2899
"not yet committed. These revisions will be included as additional parents\n"
2900
"of the next commit. Normally, using revert clears that list as well as\n"
2901
"reverting the files. If any files are specified, revert leaves the list\n"
2902
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2903
".`` in the tree root to revert all files but keep the recorded merges,\n"
2904
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2905
"reverting any files."
2906
msgstr ""
2907
2908
#: bzrlib/builtins.py:4752
2909
msgid ""
2910
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2911
"changes from a branch in a single revision. To do this, perform the merge\n"
2912
"as desired. Then doing revert with the \"--forget-merges\" option will "
2913
"keep\n"
2914
"the content of the tree as it was, but it will clear the list of pending\n"
2915
"merges. The next commit will then contain all of the changes that are\n"
2916
"present in the other branch, but without any other parent revisions.\n"
2917
"Because this technique forgets where these changes originated, it may\n"
2918
"cause additional conflicts on later merges involving the same source and\n"
2919
"target branches."
2920
msgstr ""
2921
2922
#: bzrlib/builtins.py:4766
2923
msgid "Do not save backups of reverted files."
2924
msgstr ""
2925
2926
#: bzrlib/builtins.py:4768
2927
msgid "Remove pending merge marker, without changing any files."
2928
msgstr ""
2929
2930
#: bzrlib/builtins.py:4799
2931
msgid ""
2932
"Show help on a command or other topic.\n"
2933
" "
2934
msgstr ""
2935
2936
#: bzrlib/builtins.py:4804
2937
msgid "Show help on all commands."
2938
msgstr ""
2939
2940
#: bzrlib/builtins.py:4833
2941
msgid "Show unmerged/unpulled revisions between two branches."
2942
msgstr ""
2943
2944
#: bzrlib/builtins.py:4835
2945
msgid "OTHER_BRANCH may be local or remote."
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:4837
2949
msgid ""
2950
"To filter on a range of revisions, you can use the command -r begin..end\n"
2951
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2952
"also valid.\n"
2953
" \n"
2954
":Exit values:\n"
2955
" 1 - some missing revisions\n"
2956
" 0 - no missing revisions"
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4847
2960
msgid ""
2961
" Determine the missing revisions between this and the branch at the\n"
2962
" remembered pull location::"
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4850
2966
msgid " bzr missing"
2967
msgstr ""
2968
2969
#: bzrlib/builtins.py:4852
2970
msgid " Determine the missing revisions between this and another branch::"
2971
msgstr ""
2972
2973
#: bzrlib/builtins.py:4854
2974
msgid " bzr missing http://server/branch"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4856
2978
msgid ""
2979
" Determine the missing revisions up to a specific revision on the other\n"
2980
" branch::"
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:4859
2984
msgid " bzr missing -r ..-10"
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4861
2988
msgid ""
2989
" Determine the missing revisions up to a specific revision on this\n"
2990
" branch::"
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4864
2994
msgid " bzr missing --my-revision ..-10"
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4871
2998
msgid "Reverse the order of revisions."
2999
msgstr ""
3000
3001
#: bzrlib/builtins.py:4873
3002
msgid "Display changes in the local branch only."
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4874
3006
msgid "Same as --mine-only."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4876
3010
msgid "Display changes in the remote branch only."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4877
3014
msgid "Same as --theirs-only."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4882
3018
msgid ""
3019
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3020
"details."
3021
msgstr ""
3022
3023
#: bzrlib/builtins.py:4886
3024
msgid ""
3025
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3026
"details."
3027
msgstr ""
3028
3029
#: bzrlib/builtins.py:4889
3030
msgid "Show all revisions in addition to the mainline ones."
3031
msgstr ""
3032
3033
#: bzrlib/builtins.py:4943
3034
msgid "No peer location known or specified."
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:4947
3038
msgid "Using saved parent location: {0}\n"
3039
msgstr ""
3040
3041
#: bzrlib/builtins.py:4980
3042
#, python-format
3043
msgid "You have %d extra revision:\n"
3044
msgid_plural "You have %d extra revisions:\n"
3045
msgstr[0] ""
3046
msgstr[1] ""
3047
3048
#: bzrlib/builtins.py:4996
3049
#, python-format
3050
msgid "You are missing %d revision:\n"
3051
msgid_plural "You are missing %d revisions:\n"
3052
msgstr[0] ""
3053
msgstr[1] ""
3054
3055
#: bzrlib/builtins.py:5008
3056
msgid "This branch has no new revisions.\n"
3057
msgstr ""
3058
3059
#: bzrlib/builtins.py:5011
3060
msgid "Other branch has no new revisions.\n"
3061
msgstr ""
3062
3063
#: bzrlib/builtins.py:5016
3064
msgid "Branches are up to date.\n"
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:5027
3068
msgid "Compress the data within a repository."
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:5029
3072
msgid ""
3073
"This operation compresses the data within a bazaar repository. As\n"
3074
"bazaar supports automatic packing of repository, this operation is\n"
3075
"normally not required to be done manually."
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:5033
3079
msgid ""
3080
"During the pack operation, bazaar takes a backup of existing repository\n"
3081
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3082
"automatically when it is safe to do so. To save disk space by removing\n"
3083
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3084
"used."
3085
msgstr ""
3086
3087
#: bzrlib/builtins.py:5039
3088
msgid ""
3089
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3090
"during or immediately after repacking, you may be left with a state\n"
3091
"where the deletion has been written to disk but the new packs have not\n"
3092
"been. In this case the repository may be unusable."
3093
msgstr ""
3094
3095
#: bzrlib/builtins.py:5048
3096
msgid "Delete obsolete packs to save disk space."
3097
msgstr ""
3098
3099
#: bzrlib/builtins.py:5062
3100
msgid "List the installed plugins."
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:5064
3104
msgid ""
3105
"This command displays the list of installed plugins including\n"
3106
"version of plugin and a short description of each."
3107
msgstr ""
3108
3109
#: bzrlib/builtins.py:5067
3110
msgid "--verbose shows the path where each plugin is located."
3111
msgstr ""
3112
3113
#: bzrlib/builtins.py:5069
3114
msgid ""
3115
"A plugin is an external component for Bazaar that extends the\n"
3116
"revision control system, by adding or replacing code in Bazaar.\n"
3117
"Plugins can do a variety of things, including overriding commands,\n"
3118
"adding new commands, providing additional network transports and\n"
3119
"customizing log output."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5075
3123
msgid ""
3124
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3125
"for further information on plugins including where to find them and how to\n"
3126
"install them. Instructions are also provided there on how to write new\n"
3127
"plugins using the Python programming language."
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:5091
3131
msgid "Show testament (signing-form) of a revision."
3132
msgstr ""
3133
3134
#: bzrlib/builtins.py:5094
3135
msgid "Produce long-format testament."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:5096
3139
msgid "Produce a strict-format testament."
3140
msgstr ""
3141
3142
#: bzrlib/builtins.py:5122
3143
msgid "Show the origin of each line in a file."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5124
3147
msgid ""
3148
"This prints out the given file with an annotation on the left side\n"
3149
"indicating which revision, author and date introduced the change."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:5127
3153
msgid ""
3154
"If the origin is the same for a run of consecutive lines, it is\n"
3155
"shown only at the top, unless the --all option is given."
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:5135
3159
msgid "Show annotations on all lines."
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:5136
3163
msgid "Show commit date in annotations."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:5223
3167
msgid "Cannot sign a range of non-revision-history revisions"
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:5235
3171
msgid "Please supply either one revision, or a range."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5239
3175
msgid ""
3176
"Convert the current branch into a checkout of the supplied branch.\n"
3177
"If no branch is supplied, rebind to the last bound location."
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5242
3181
msgid ""
3182
"Once converted into a checkout, commits must succeed on the master branch\n"
3183
"before they will be applied to the local branch."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5245
3187
msgid ""
3188
"Bound branches use the nickname of its master branch unless it is set\n"
3189
"locally, in which case binding will update the local nickname to be\n"
3190
"that of the master."
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5260
3194
msgid "No location supplied. This format does not remember old locations."
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5265
3198
msgid "Branch is already bound"
3199
msgstr ""
3200
3201
#: bzrlib/builtins.py:5267
3202
msgid "No location supplied and no previous location known"
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:5273
3206
msgid "These branches have diverged. Try merging, and then bind again."
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:5280
3210
msgid "Convert the current checkout into a regular branch."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5282
3214
msgid ""
3215
"After unbinding, the local branch is considered independent and subsequent\n"
3216
"commits will be local only."
3217
msgstr ""
3218
3219
#: bzrlib/builtins.py:5293
3220
msgid "Local branch is not bound"
3221
msgstr ""
3222
3223
#: bzrlib/builtins.py:5297
3224
msgid "Remove the last committed revision."
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5299
3228
msgid ""
3229
"--verbose will print out what is being removed.\n"
3230
"--dry-run will go through all the motions, but not actually\n"
3231
"remove anything."
3232
msgstr ""
3233
3234
#: bzrlib/builtins.py:5303
3235
msgid ""
3236
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3237
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3238
"branch at revision 15."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5307
3242
msgid ""
3243
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3244
"it may make is to restore any pending merges that were present before\n"
3245
"the commit."
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5318
3249
msgid "Don't actually make changes."
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5319
3253
msgid "Say yes to all questions."
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:5321
3257
msgid "Keep tags that point to removed revisions."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5323
3261
msgid "Only remove the commits from the local branch when in a checkout."
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5372
3265
msgid "No revisions to uncommit.\n"
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5387
3269
msgid "Dry-run, pretending to remove the above revisions.\n"
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5390
3273
msgid "The above revision(s) will be removed.\n"
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5394
3277
msgid "Uncommit these revisions"
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:5397
3281
msgid "Canceled\n"
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5404
3285
#, python-format
3286
msgid ""
3287
"You can restore the old tip by running:\n"
3288
" bzr pull . -r revid:%s\n"
3289
msgstr ""
3290
3291
#: bzrlib/builtins.py:5409
3292
msgid "Break a dead lock."
3293
msgstr ""
3294
3295
#: bzrlib/builtins.py:5411
3296
msgid ""
3297
"This command breaks a lock on a repository, branch, working directory or\n"
3298
"config file."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5414
3302
msgid ""
3303
"CAUTION: Locks should only be broken when you are sure that the process\n"
3304
"holding the lock has been stopped."
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5417
3308
msgid ""
3309
"You can get information on what locks are open via the 'bzr info\n"
3310
"[location]' command."
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5420
3314
msgid ""
3315
":Examples:\n"
3316
" bzr break-lock\n"
3317
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3318
" bzr break-lock --conf ~/.bazaar"
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5429
3322
msgid "LOCATION is the directory where the config lock is."
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5431
3326
msgid "Do not ask for confirmation before breaking the lock."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5466
3330
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5467
3334
msgid "Run the bzr server."
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5473
3338
msgid "Serve on stdin/out for use from inetd or sshd."
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5474
3342
msgid "protocol"
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5475
3346
msgid "Protocol to serve."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5479
3350
msgid ""
3351
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3352
"Passing 0 as the port number will result in a dynamically allocated port. "
3353
"The default port depends on the protocol."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5485
3357
msgid "Serve contents of this directory."
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:5487
3361
msgid ""
3362
"By default the server is a readonly server. Supplying --allow-writes "
3363
"enables write access to the contents of the served directory and below. "
3364
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3365
"of external authentication is arranged supplying this option leads to global "
3366
"uncontrolled write access to your file system."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5496
3370
msgid "Override the default idle client timeout (5min)."
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:5546
3374
msgid "Combine a tree into its containing tree."
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:5548
3378
msgid "This command requires the target tree to be in a rich-root format."
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:5550
3382
msgid ""
3383
"The TREE argument should be an independent tree, inside another tree, but\n"
3384
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3385
"running \"bzr branch\" with the target inside a tree.)"
3386
msgstr ""
3387
3388
#: bzrlib/builtins.py:5554
3389
msgid ""
3390
"The result is a combined tree, with the subtree no longer an independent\n"
3391
"part. This is marked as a merge of the subtree into the containing tree,\n"
3392
"and all history is preserved."
3393
msgstr ""
3394
3395
#: bzrlib/builtins.py:5572
3396
#, python-format
3397
msgid ""
3398
"Can't join trees because %s doesn't support rich root data.\n"
3399
"You can use bzr upgrade on the repository."
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3403
msgid "Cannot join {0}. {1}"
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:5592
3407
msgid "Split a subdirectory of a tree into a separate tree."
3408
msgstr ""
3409
3410
#: bzrlib/builtins.py:5594
3411
msgid ""
3412
"This command will produce a target tree in a format that supports\n"
3413
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3414
"converted into earlier formats like 'dirstate-tags'."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5598
3418
msgid ""
3419
"The TREE argument should be a subdirectory of a working tree. That\n"
3420
"subdirectory will be converted into an independent tree, with its own\n"
3421
"branch. Commits in the top-level tree will not apply to the new subtree."
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5678
3425
msgid "No submit branch specified or known"
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3429
msgid "No public branch specified or known"
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5691
3433
msgid "bzr merge-directive takes at most two one revision identifiers"
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5700
3437
msgid "No revisions to bundle."
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5719
3441
msgid "Mail or create a merge-directive for submitting changes."
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5721
3445
msgid "A merge directive provides many things needed for requesting merges:"
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:5723
3449
msgid "* A machine-readable description of the merge to perform"
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5725
3453
msgid "* An optional patch that is a preview of the changes requested"
3454
msgstr ""
3455
3456
#: bzrlib/builtins.py:5727
3457
msgid ""
3458
"* An optional bundle of revision data, so that the changes can be applied\n"
3459
" directly from the merge directive, without retrieving data from a\n"
3460
" branch."
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:5731
3464
msgid ""
3465
"`bzr send` creates a compact data set that, when applied using bzr\n"
3466
"merge, has the same effect as merging from the source branch. "
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:5734
3470
msgid ""
3471
"By default the merge directive is self-contained and can be applied to any\n"
3472
"branch containing submit_branch in its ancestory without needing access to\n"
3473
"the source branch."
3474
msgstr ""
3475
3476
#: bzrlib/builtins.py:5738
3477
msgid ""
3478
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3479
"revisions, but only a structured request to merge from the\n"
3480
"public_location. In that case the public_branch is needed and it must be\n"
3481
"up-to-date and accessible to the recipient. The public_branch is always\n"
3482
"included if known, so that people can check it later."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5744
3486
msgid ""
3487
"The submit branch defaults to the parent of the source branch, but can be\n"
3488
"overridden. Both submit branch and public branch will be remembered in\n"
3489
"branch.conf the first time they are used for a particular branch. The\n"
3490
"source branch defaults to that containing the working directory, but can\n"
3491
"be changed using --from."
3492
msgstr ""
3493
3494
#: bzrlib/builtins.py:5750
3495
msgid ""
3496
"Both the submit branch and the public branch follow the usual behavior with\n"
3497
"respect to --remember: If there is no default location set, the first send\n"
3498
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3499
"omit the location to use the default. To change the default, use\n"
3500
"--remember. The value will only be saved if the location can be accessed."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5756
3504
msgid ""
3505
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3506
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3507
"If a public location is known for the submit_branch, that location is used\n"
3508
"in the merge directive."
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5761
3512
msgid ""
3513
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3514
"given, in which case it is sent to a file."
3515
msgstr ""
3516
3517
#: bzrlib/builtins.py:5764
3518
msgid ""
3519
"Mail is sent using your preferred mail program. This should be transparent\n"
3520
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3521
"If the preferred client can't be found (or used), your editor will be used."
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:5768
3525
msgid ""
3526
"To use a specific mail program, set the mail_client configuration option.\n"
3527
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3528
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3529
"(MacOS X's\n"
3530
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3531
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3532
"add\n"
3533
"supported clients."
3534
msgstr ""
3535
3536
#: bzrlib/builtins.py:5775
3537
msgid ""
3538
"If mail is being sent, a to address is required. This can be supplied\n"
3539
"either on the commandline, by setting the submit_to configuration\n"
3540
"option in the branch itself or the child_submit_to configuration option\n"
3541
"in the submit branch."
3542
msgstr ""
3543
3544
#: bzrlib/builtins.py:5780
3545
msgid ""
3546
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3547
"and\n"
3548
"merge directive format 2. It is significantly faster and smaller than\n"
3549
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3550
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3551
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5786
3555
msgid ""
3556
"The merge directives created by bzr send may be applied using bzr merge or\n"
3557
"bzr pull by specifying a file containing a merge directive as the location."
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5789
3561
msgid ""
3562
"bzr send makes extensive use of public locations to map local locations "
3563
"into\n"
3564
"URLs that can be used by other people. See `bzr help configuration` to\n"
3565
"set them, and use `bzr info` to display them."
3566
msgstr ""
3567
3568
#: bzrlib/builtins.py:5813
3569
msgid "Write merge directive to this file or directory; use - for stdout."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:5817
3573
msgid ""
3574
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3575
"strict disables the check."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5819
3579
msgid "Mail the request to this address."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5823
3583
msgid "Body for the email."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5876
3587
msgid "Do not include a bundle in the merge directive."
3588
msgstr ""
3589
3590
#: bzrlib/builtins.py:5877
3591
msgid "Do not include a preview patch in the merge directive."
3592
msgstr ""
3593
3594
#: bzrlib/builtins.py:5880
3595
msgid "Remember submit and public branch."
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:5882
3599
msgid ""
3600
"Branch to generate the submission from, rather than the one containing the "
3601
"working directory."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3605
msgid "format"
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5893
3609
msgid "Use the specified output format."
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5915
3613
msgid "Create, remove or modify a tag naming a revision."
3614
msgstr ""
3615
3616
#: bzrlib/builtins.py:5917
3617
msgid ""
3618
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3619
"(--revision) option can be given -rtag:X, where X is any previously\n"
3620
"created tag."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5921
3624
msgid ""
3625
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3626
"along when you branch, push, pull or merge."
3627
msgstr ""
3628
3629
#: bzrlib/builtins.py:5924
3630
msgid ""
3631
"It is an error to give a tag name that already exists unless you pass\n"
3632
"--force, in which case the tag is moved to point to the new revision."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5927
3636
msgid ""
3637
"To rename a tag (change the name but keep it on the same revsion), run "
3638
"``bzr\n"
3639
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5930
3643
msgid ""
3644
"If no tag name is specified it will be determined through the \n"
3645
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3646
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3647
"details."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5940
3651
msgid "Delete this tag rather than placing it."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5943
3655
msgid "Branch in which to place the tag."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5945
3659
msgid "Replace existing tags."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5960
3663
msgid "No tag specified to delete."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5962
3667
#, python-format
3668
msgid "Deleted tag %s."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:5976
3672
msgid "Please specify a tag name."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5984
3676
#, python-format
3677
msgid "Tag %s already exists for that revision."
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5988
3681
#, python-format
3682
msgid "Created tag %s."
3683
msgstr ""
3684
3685
#: bzrlib/builtins.py:5990
3686
#, python-format
3687
msgid "Updated tag %s."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5994
3691
msgid "List tags."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5996
3695
msgid ""
3696
"This command shows a table of tag names and the revisions they reference."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:6002
3700
msgid "Branch whose tags should be displayed."
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:6004
3704
msgid "Sort tags by different criteria."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:6004
3708
msgid "Sorting"
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:6073
3712
msgid "Reconfigure the type of a bzr directory."
3713
msgstr ""
3714
3715
#: bzrlib/builtins.py:6075
3716
msgid "A target configuration must be specified."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:6077
3720
msgid ""
3721
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3722
"The order of preference is\n"
3723
"1. For a lightweight checkout, the current bound location.\n"
3724
"2. For branches that used to be checkouts, the previously-bound location.\n"
3725
"3. The push location.\n"
3726
"4. The parent location.\n"
3727
"If none of these is available, --bind-to must be specified."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6091
3731
msgid "Tree type"
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:6092
3735
msgid "The relation between branch and tree."
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6094
3739
msgid "Reconfigure to be an unbound branch with no working tree."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6095
3743
msgid "Reconfigure to be an unbound branch with a working tree."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6096
3747
msgid "Reconfigure to be a bound branch with a working tree."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:6097
3751
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3752
msgstr ""
3753
3754
#: bzrlib/builtins.py:6102
3755
msgid "Repository type"
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:6103
3759
msgid "Location fo the repository."
3760
msgstr ""
3761
3762
#: bzrlib/builtins.py:6105
3763
msgid ""
3764
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:6107
3768
msgid "Reconfigure to use a shared repository."
3769
msgstr ""
3770
3771
#: bzrlib/builtins.py:6111
3772
msgid "Trees in Repository"
3773
msgstr ""
3774
3775
#: bzrlib/builtins.py:6112
3776
msgid "Whether new branches in the repository have trees."
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:6114
3780
msgid ""
3781
"Reconfigure repository to create working trees on branches by default."
3782
msgstr ""
3783
3784
#: bzrlib/builtins.py:6116
3785
msgid ""
3786
"Reconfigure repository to not create working trees on branches by default."
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:6119
3790
msgid "Branch to bind checkout to."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:6121
3794
msgid "Perform reconfiguration even if local changes will be lost."
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:6124
3798
msgid "Reconfigure a branch to be stacked on another branch."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:6128
3802
msgid ""
3803
"Reconfigure a branch to be unstacked. This may require copying substantial "
3804
"data into it."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6138
3808
msgid "Can't use both --stacked-on and --unstacked"
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:6152
3812
msgid "No target configuration specified"
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:6187
3816
msgid "Set the branch of a checkout and update."
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:6189
3820
msgid ""
3821
"For lightweight checkouts, this changes the branch being referenced.\n"
3822
"For heavyweight checkouts, this checks that there are no local commits\n"
3823
"versus the current bound branch, then it makes the local branch a mirror\n"
3824
"of the new location and binds to it."
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:6194
3828
msgid ""
3829
"In both cases, the working tree is updated and uncommitted changes\n"
3830
"are merged. The user can commit or revert these as they desire."
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:6197
3834
msgid "Pending merges need to be committed or reverted before using switch."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:6199
3838
msgid ""
3839
"The path to the branch to switch to can be specified relative to the parent\n"
3840
"directory of the current branch. For example, if you are currently in a\n"
3841
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3842
"/path/to/newbranch."
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:6204
3846
msgid ""
3847
"Bound branches use the nickname of its master branch unless it is set\n"
3848
"locally, in which case switching will update the local nickname to be\n"
3849
"that of the master."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6212
3853
msgid "Switch even if local commits will be lost."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6215
3857
msgid "Create the target branch from this one before switching to it."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6229
3861
msgid "You must supply either a revision or a location"
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6242
3865
msgid "cannot create branch without source branch"
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6262
3869
msgid "Manage filtered views."
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:6264
3873
msgid ""
3874
"Views provide a mask over the tree so that users can focus on\n"
3875
"a subset of a tree when doing their work. After creating a view,\n"
3876
"commands that support a list of files - status, diff, commit, etc -\n"
3877
"effectively have that list of files implicitly given each time.\n"
3878
"An explicit list of files can still be given but those files\n"
3879
"must be within the current view."
3880
msgstr ""
3881
3882
#: bzrlib/builtins.py:6271
3883
msgid ""
3884
"In most cases, a view has a short life-span: it is created to make\n"
3885
"a selected change and is deleted once that change is committed.\n"
3886
"At other times, you may wish to create one or more named views\n"
3887
"and switch between them."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:6276
3891
msgid ""
3892
"To disable the current view without deleting it, you can switch to\n"
3893
"the pseudo view called ``off``. This can be useful when you need\n"
3894
"to see the whole tree for an operation or two (e.g. merge) but\n"
3895
"want to switch back to your view after that."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:6281
3899
msgid ""
3900
":Examples:\n"
3901
" To define the current view::"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6284
3905
msgid " bzr view file1 dir1 ..."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6286
3909
msgid " To list the current view::"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6288
3913
msgid " bzr view"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6290
3917
msgid " To delete the current view::"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6292
3921
msgid " bzr view --delete"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6294
3925
msgid " To disable the current view without deleting it::"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6296
3929
msgid " bzr view --switch off"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6298
3933
msgid " To define a named view and switch to it::"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6300
3937
msgid " bzr view --name view-name file1 dir1 ..."
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6302
3941
msgid " To list a named view::"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6304
3945
msgid " bzr view --name view-name"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6306
3949
msgid " To delete a named view::"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6308
3953
msgid " bzr view --name view-name --delete"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6310
3957
msgid " To switch to a named view::"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6312
3961
msgid " bzr view --switch view-name"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6314
3965
msgid " To list all views defined::"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6316
3969
msgid " bzr view --all"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6318
3973
msgid " To delete all views::"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6320
3977
msgid " bzr view --delete --all"
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6327
3981
msgid "Apply list or delete action to all views."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6330
3985
msgid "Delete the view."
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6333
3989
msgid "Name of the view to define, list or delete."
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6337
3993
msgid "Name of the view to switch to."
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6356
3997
msgid "Both --delete and a file list specified"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6359
4001
msgid "Both --delete and --switch specified"
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6362
4005
msgid "Deleted all views.\n"
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:6364
4009
msgid "No current view to delete"
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6367
4013
#, python-format
4014
msgid "Deleted '%s' view.\n"
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6371
4018
msgid "Both --switch and a file list specified"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:6374
4022
msgid "Both --switch and --all specified"
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:6377
4026
msgid "No current view to disable"
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6379
4030
#, python-format
4031
msgid "Disabled '%s' view.\n"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4035
msgid "Using '{0}' view: {1}\n"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6386
4039
msgid "Views defined:\n"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6395
4043
msgid "No views defined.\n"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6402
4047
msgid "Cannot change the 'off' pseudo view"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6410
4051
msgid "No current view.\n"
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6413
4055
msgid "'{0}' view is: {1}\n"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6433
4059
msgid " <no hooks installed>\n"
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6437
4063
msgid "Remove a branch."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6439
4067
msgid ""
4068
"This will remove the branch from the specified location but \n"
4069
"will keep any working tree or repository in place."
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6444
4073
msgid " Remove the branch at repo/trunk::"
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6446
4077
msgid " bzr remove-branch repo/trunk"
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6461
4081
msgid "Plaintext diff output."
4082
msgstr ""
4083
4084
#: bzrlib/builtins.py:6462
4085
msgid "Temporarily set aside some changes from the current tree."
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6464
4089
msgid ""
4090
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4091
"ie. out of the way, until a later time when you can bring them back from\n"
4092
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4093
"your working tree, and so they aren't propagated along with your branch nor\n"
4094
"will they survive its deletion."
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:6470
4098
msgid "If shelve --list is specified, previously-shelved changes are listed."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6472
4102
msgid ""
4103
"Shelve is intended to help separate several sets of changes that have\n"
4104
"been inappropriately mingled. If you just want to get rid of all changes\n"
4105
"and you don't need to restore them later, use revert. If you want to\n"
4106
"shelve all text changes at once, use shelve --all."
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6477
4110
msgid ""
4111
"If filenames are specified, only the changes to those files will be\n"
4112
"shelved. Other files will be left untouched."
4113
msgstr ""
4114
4115
#: bzrlib/builtins.py:6480
4116
msgid ""
4117
"If a revision is specified, changes since that revision will be shelved."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6482
4121
msgid ""
4122
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4123
"restore the most recently shelved changes."
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6485
4127
msgid ""
4128
"For complicated changes, it is possible to edit the changes in a separate\n"
4129
"editor program to decide what the file remaining in the working copy\n"
4130
"should look like. To do this, add the configuration option"
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6489
4134
msgid " change_editor = PROGRAM @new_path @old_path"
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6491
4138
msgid ""
4139
"where @new_path is replaced with the path of the new version of the \n"
4140
"file and @old_path is replaced with the path of the old version of \n"
4141
"the file. The PROGRAM should save the new file with the desired \n"
4142
"contents of the file in the working tree.\n"
4143
" "
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6503
4147
msgid "Shelve all changes."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6505
4151
msgid "Method to use for writing diffs."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6505
4155
msgid "writer"
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6509
4159
msgid "List shelved changes."
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6511
4163
msgid "Destroy removed changes instead of shelving them."
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6540
4167
msgid "No shelved changes."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6551
4171
msgid "Restore shelved changes."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6553
4175
msgid ""
4176
"By default, the most recently shelved changes are restored. However if you\n"
4177
"specify a shelf by id those changes will be restored instead. This works\n"
4178
"best when the changes don't depend on each other."
4179
msgstr ""
4180
4181
#: bzrlib/builtins.py:6562
4182
msgid "The action to perform."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4186
msgid "action"
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6564
4190
msgid "Apply changes and remove from the shelf."
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6565
4194
msgid "Show changes, but do not apply or remove them."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6566
4198
msgid ""
4199
"Instead of unshelving the changes, show the diff that would result from "
4200
"unshelving."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6568
4204
msgid "Delete changes without applying them."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6569
4208
msgid "Apply changes but don't delete them."
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:6584
4212
msgid "Remove unwanted files from working tree."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6586
4216
msgid ""
4217
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4218
"files are never deleted."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6589
4222
msgid ""
4223
"Another class is 'detritus', which includes files emitted by bzr during\n"
4224
"normal operations and selftests. (The value of these files decreases with\n"
4225
"time.)"
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6593
4229
msgid ""
4230
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4231
"flags are respected, and may be combined."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6596
4235
msgid "To check what clean-tree will do, use --dry-run."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6599
4239
msgid "Delete all ignored files."
4240
msgstr ""
4241
4242
#: bzrlib/builtins.py:6600
4243
msgid ""
4244
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6603
4248
msgid "Delete files unknown to bzr (default)."
4249
msgstr ""
4250
4251
#: bzrlib/builtins.py:6604
4252
msgid "Show files to delete instead of deleting them."
4253
msgstr ""
4254
4255
#: bzrlib/builtins.py:6606
4256
msgid "Do not prompt before deleting."
4257
msgstr ""
4258
4259
#: bzrlib/bundle/__init__.py:59
4260
msgid "A directory cannot be a bundle"
4261
msgstr ""
4262
4263
#: bzrlib/bundle/apply_bundle.py:40
4264
msgid "Install revisions"
4265
msgstr ""
4266
4267
#: bzrlib/bundle/commands.py:64
4268
msgid "--verbose requires a merge directive"
4269
msgstr ""
4270
4271
#: bzrlib/bundle/commands.py:67
4272
msgid "Bundle format not supported"
4273
msgstr ""
4274
4275
#: bzrlib/bundle/commands.py:77
4276
msgid "Records\n"
4277
msgstr ""
4278
4279
#: bzrlib/bundle/commands.py:81
4280
msgid "{0}: {1} ({2} multiparent)\n"
4281
msgstr ""
4282
4283
#: bzrlib/bundle/commands.py:83
4284
#, python-format
4285
msgid "unique files: %d\n"
4286
msgstr ""
4287
4288
#: bzrlib/bundle/commands.py:92
4289
msgid "Revisions\n"
4290
msgstr ""
4291
4292
#: bzrlib/bundle/commands.py:93
4293
#, python-format
4294
msgid "nicks: %s\n"
4295
msgstr ""
4296
4297
#: bzrlib/bundle/commands.py:95
4298
#, python-format
4299
msgid ""
4300
"committers: \n"
4301
"%s\n"
4302
msgstr ""
4303
4304
#: bzrlib/bundle/commands.py:103
4305
msgid "Decoded contents\n"
4306
msgstr ""
4307
4308
#: bzrlib/bundle/serializer/v4.py:327
4309
#, python-format
4310
msgid "Bundling %d revision."
4311
msgid_plural "Bundling %d revisions."
4312
msgstr[0] ""
4313
msgstr[1] ""
4314
4315
#: bzrlib/bzrdir.py:490
4316
msgid ""
4317
"making backup of {0}\n"
4318
" to {1}"
4319
msgstr ""
4320
4321
#: bzrlib/bzrdir.py:513
4322
msgid "renamed {0} to {1}"
4323
msgstr ""
4324
4325
#: bzrlib/bzrdir.py:1652
4326
#, python-format
4327
msgid ""
4328
"Source repository format does not support stacking, using format:\n"
4329
" %s"
4330
msgstr ""
4331
4332
#: bzrlib/bzrdir.py:1672
4333
#, python-format
4334
msgid ""
4335
"Source branch format does not support stacking, using format:\n"
4336
" %s"
4337
msgstr ""
4338
4339
#: bzrlib/bzrdir.py:1818
4340
msgid "starting repository conversion"
4341
msgstr ""
4342
4343
#: bzrlib/bzrdir.py:2039
4344
msgid "Using default stacking branch {0} at {1}"
4345
msgstr ""
4346
4347
#: bzrlib/check.py:108
4348
msgid "check"
4349
msgstr ""
4350
4351
#: bzrlib/check.py:110
4352
msgid "checking revisions"
4353
msgstr ""
4354
4355
#: bzrlib/check.py:112
4356
msgid "checking commit contents"
4357
msgstr ""
4358
4359
#: bzrlib/check.py:114
4360
msgid "checking file graphs"
4361
msgstr ""
4362
4363
#: bzrlib/check.py:118
4364
msgid "checking branches and trees"
4365
msgstr ""
4366
4367
#: bzrlib/check.py:205
4368
msgid "checked repository {0} format {1}"
4369
msgstr ""
4370
4371
#: bzrlib/check.py:208
4372
#, python-format
4373
msgid "%6d revisions"
4374
msgstr ""
4375
4376
#: bzrlib/check.py:209
4377
#, python-format
4378
msgid "%6d file-ids"
4379
msgstr ""
4380
4381
#: bzrlib/check.py:211
4382
#, python-format
4383
msgid "%6d unreferenced text versions"
4384
msgstr ""
4385
4386
#: bzrlib/check.py:215
4387
msgid "unreferenced version: {{{0}}} in {1}"
4388
msgstr ""
4389
4390
#: bzrlib/check.py:218
4391
#, python-format
4392
msgid "%6d revisions are missing inventory_sha1"
4393
msgstr ""
4394
4395
#: bzrlib/check.py:221
4396
#, python-format
4397
msgid "%6d revisions are mentioned but not present"
4398
msgstr ""
4399
4400
#: bzrlib/check.py:224
4401
#, python-format
4402
msgid "%6d ghost revisions"
4403
msgstr ""
4404
4405
#: bzrlib/check.py:229
4406
#, python-format
4407
msgid "%6d revisions missing parents in ancestry"
4408
msgstr ""
4409
4410
#: bzrlib/check.py:233
4411
#, python-format
4412
msgid " %s should be in the ancestry for:"
4413
msgstr ""
4414
4415
#: bzrlib/check.py:237
4416
#, python-format
4417
msgid "%6d inconsistent parents"
4418
msgstr ""
4419
4420
#: bzrlib/check.py:241
4421
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4422
msgstr ""
4423
4424
#: bzrlib/check.py:247
4425
#, python-format
4426
msgid "%6d revisions have incorrect parents in the revision index"
4427
msgstr ""
4428
4429
#: bzrlib/check.py:253
4430
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4431
msgstr ""
4432
4433
#: bzrlib/check.py:267
4434
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4435
msgstr ""
4436
4437
#: bzrlib/check.py:296
4438
msgid ""
4439
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4440
"{{{4}}}"
4441
msgstr ""
4442
4443
#: bzrlib/check.py:354
4444
#, python-format
4445
msgid "Checking branch at '%s'."
4446
msgstr ""
4447
4448
#: bzrlib/check.py:374
4449
#, python-format
4450
msgid "Checking working tree at '%s'."
4451
msgstr ""
4452
4453
#: bzrlib/check.py:427 bzrlib/check.py:441
4454
msgid "No branch found at specified location."
4455
msgstr ""
4456
4457
#: bzrlib/check.py:429 bzrlib/check.py:439
4458
msgid "No working tree found at specified location."
4459
msgstr ""
4460
4461
#: bzrlib/check.py:432
4462
#, python-format
4463
msgid "Checking repository at '%s'."
4464
msgstr ""
4465
4466
#: bzrlib/check.py:443
4467
msgid "No repository found at specified location."
4468
msgstr ""
4469
4470
#: bzrlib/clean_tree.py:63
4471
msgid "Nothing to delete."
4472
msgstr ""
4473
4474
#: bzrlib/clean_tree.py:68
4475
msgid "Are you sure you wish to delete these"
4476
msgstr ""
4477
4478
#: bzrlib/clean_tree.py:70
4479
msgid "Canceled"
4480
msgstr ""
4481
4482
#: bzrlib/clean_tree.py:107
4483
#, python-format
4484
msgid "unable to remove %s"
4485
msgstr ""
4486
4487
#: bzrlib/clean_tree.py:111
4488
msgid "deleting paths:"
4489
msgstr ""
4490
4491
#: bzrlib/clean_tree.py:125
4492
msgid "unable to remove \"{0}\": {1}."
4493
msgstr ""
4494
4495
#: bzrlib/clean_tree.py:130
4496
msgid "No files deleted."
4497
msgstr ""
4498
4499
#: bzrlib/cmd_version_info.py:47
4500
msgid "No known version info format {0}. Supported types are: {1}"
4501
msgstr ""
4502
4503
#: bzrlib/cmd_version_info.py:52
4504
msgid "Version info in Custom template-based format."
4505
msgstr ""
4506
4507
#: bzrlib/cmd_version_info.py:52
4508
msgid "Version info in Python format."
4509
msgstr ""
4510
4511
#: bzrlib/cmd_version_info.py:52
4512
msgid "Version info in RIO (simple text) format (default)."
4513
msgstr ""
4514
4515
#: bzrlib/cmd_version_info.py:53
4516
msgid "Show version information about this tree."
4517
msgstr ""
4518
4519
#: bzrlib/cmd_version_info.py:55
4520
msgid ""
4521
"You can use this command to add information about version into\n"
4522
"source code of an application. The output can be in one of the\n"
4523
"supported formats or in a custom format based on a template."
4524
msgstr ""
4525
4526
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4527
#: en/help_topics/configuration.txt:710
4528
msgid "For example::"
4529
msgstr ""
4530
4531
#: bzrlib/cmd_version_info.py:61
4532
msgid ""
4533
" bzr version-info --custom \\\n"
4534
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4535
msgstr ""
4536
4537
#: bzrlib/cmd_version_info.py:64
4538
msgid ""
4539
"will produce a C header file with formatted string containing the\n"
4540
"current revision number. Other supported variables in templates are:"
4541
msgstr ""
4542
4543
#: bzrlib/cmd_version_info.py:67
4544
msgid ""
4545
" * {date} - date of the last revision\n"
4546
" * {build_date} - current date\n"
4547
" * {revno} - revision number\n"
4548
" * {revision_id} - revision id\n"
4549
" * {branch_nick} - branch nickname\n"
4550
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4551
" otherwise 1"
4552
msgstr ""
4553
4554
#: bzrlib/cmd_version_info.py:77
4555
msgid "Select the output format."
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:81
4559
msgid "Include all possible information."
4560
msgstr ""
4561
4562
#: bzrlib/cmd_version_info.py:82
4563
msgid "Check if tree is clean."
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:84
4567
msgid "Include the revision-history."
4568
msgstr ""
4569
4570
#: bzrlib/cmd_version_info.py:86
4571
msgid "Include the last revision for each file."
4572
msgstr ""
4573
4574
#: bzrlib/cmd_version_info.py:87
4575
msgid "Template for the output."
4576
msgstr ""
4577
4578
#: bzrlib/cmd_version_info.py:101
4579
msgid "bzr version-info --revision takes exactly one revision specifier"
4580
msgstr ""
4581
4582
#: bzrlib/commands.py:229
4583
#, python-format
4584
msgid "unknown command \"%s\""
4585
msgstr ""
4586
4587
#: bzrlib/commands.py:476
4588
msgid "No help for this command."
4589
msgstr ""
4590
4591
#: bzrlib/commands.py:489
4592
#, python-format
4593
msgid ":Purpose: %s\n"
4594
msgstr ""
4595
4596
#: bzrlib/commands.py:491
4597
#, python-format
4598
msgid ""
4599
":Usage:\n"
4600
"%s\n"
4601
msgstr ""
4602
4603
#: bzrlib/commands.py:493
4604
#, python-format
4605
msgid ":Usage: %s\n"
4606
msgstr ""
4607
4608
#: bzrlib/commands.py:512
4609
#, python-format
4610
msgid ":Options:%s"
4611
msgstr ""
4612
4613
#: bzrlib/commands.py:523
4614
#, python-format
4615
msgid ""
4616
":Description:\n"
4617
" %s\n"
4618
"\n"
4619
msgstr ""
4620
4621
#: bzrlib/commands.py:533
4622
#, python-format
4623
msgid ""
4624
"See bzr help %s for more details and examples.\n"
4625
"\n"
4626
msgstr ""
4627
4628
#: bzrlib/commands.py:538
4629
msgid ":Aliases: "
4630
msgstr ""
4631
4632
#: bzrlib/commands.py:542
4633
#, python-format
4634
msgid ":From: plugin \"%s\"\n"
4635
msgstr ""
4636
4637
#: bzrlib/commands.py:554
4638
msgid ":doc:`{0} <{1}-help>`"
4639
msgstr ""
4640
4641
#: bzrlib/commands.py:558
4642
#, python-format
4643
msgid ":See also: %s"
4644
msgstr ""
4645
4646
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4647
msgid "Only ASCII permitted in option names"
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4651
msgid "command {0!r} needs one or more {1}"
4652
msgstr ""
4653
4654
#: bzrlib/commands.py:858
4655
msgid "command {0!r} requires argument {1}"
4656
msgstr ""
4657
4658
#: bzrlib/commands.py:865
4659
msgid "extra argument to command {0}: {1}"
4660
msgstr ""
4661
4662
#: bzrlib/commands.py:962
4663
#, python-format
4664
msgid "Profile data written to \"%s\"."
4665
msgstr ""
4666
4667
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4668
msgid "added"
4669
msgstr ""
4670
4671
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4672
msgid "modified"
4673
msgstr ""
4674
4675
#: bzrlib/commit.py:131
4676
#, python-format
4677
msgid "Committing%s"
4678
msgstr ""
4679
4680
#: bzrlib/commit.py:134
4681
#, python-format
4682
msgid "Committed revision %d."
4683
msgstr ""
4684
4685
#: bzrlib/commit.py:143
4686
#, python-format
4687
msgid "deleted %s"
4688
msgstr ""
4689
4690
#: bzrlib/commit.py:146
4691
#, python-format
4692
msgid "missing %s"
4693
msgstr ""
4694
4695
#: bzrlib/commit.py:511
4696
msgid ""
4697
"Conflicting tags in bound branch:\n"
4698
"{0}"
4699
msgstr ""
4700
4701
#: bzrlib/commit.py:742
4702
msgid "renamed"
4703
msgstr ""
4704
4705
#: bzrlib/commit.py:977
4706
msgid "unchanged"
4707
msgstr ""
4708
4709
#: bzrlib/commit.py:999
4710
msgid "{0} [{1}] - Stage"
4711
msgstr ""
4712
4713
#: bzrlib/commit.py:1002
4714
#, python-format
4715
msgid "%s - Stage"
4716
msgstr ""
4717
4718
#: bzrlib/commit_signature_commands.py:36
4719
msgid "Sign all commits by a given committer."
4720
msgstr ""
4721
4722
#: bzrlib/commit_signature_commands.py:38
4723
msgid ""
4724
"If location is not specified the local tree is used.\n"
4725
"If committer is not specified the default committer is used."
4726
msgstr ""
4727
4728
#: bzrlib/commit_signature_commands.py:41
4729
msgid "This does not sign commits that already have signatures."
4730
msgstr ""
4731
4732
#: bzrlib/commit_signature_commands.py:49
4733
msgid ""
4734
"Don't actually sign anything, just print the revisions that would be signed."
4735
msgstr ""
4736
4737
#: bzrlib/commit_signature_commands.py:103
4738
msgid "Verify all commit signatures."
4739
msgstr ""
4740
4741
#: bzrlib/commit_signature_commands.py:105
4742
msgid ""
4743
"Verifies that all commits in the branch are signed by known GnuPG keys."
4744
msgstr ""
4745
4746
#: bzrlib/commit_signature_commands.py:110
4747
msgid ""
4748
"Comma separated list of GPG key patterns which are acceptable for "
4749
"verification."
4750
msgstr ""
4751
4752
#: bzrlib/commit_signature_commands.py:147
4753
msgid "Cannot verify a range of non-revision-history revisions"
4754
msgstr ""
4755
4756
#: bzrlib/commit_signature_commands.py:168
4757
msgid "All commits signed with verifiable keys"
4758
msgstr ""
4759
4760
#: bzrlib/config.py:475
4761
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4762
msgstr ""
4763
4764
#: bzrlib/config.py:2485
4765
msgid "{0} is not an SI unit."
4766
msgstr ""
4767
4768
#: bzrlib/config.py:2949
4769
msgid ""
4770
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4771
"will be saved."
4772
msgstr ""
4773
4774
#: bzrlib/config.py:3093
4775
#, python-format
4776
msgid "Invalid '%s', should be of the form 'name=value'"
4777
msgstr ""
4778
4779
#: bzrlib/config.py:3962
4780
msgid "Display, set or remove a configuration option."
4781
msgstr ""
4782
4783
#: bzrlib/config.py:3964
4784
msgid "Display the active value for a given option."
4785
msgstr ""
4786
4787
#: bzrlib/config.py:3966
4788
msgid ""
4789
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4790
"matching options are displayed mentioning their scope. The active value\n"
4791
"that bzr will take into account is the first one displayed for each option."
4792
msgstr ""
4793
4794
#: bzrlib/config.py:3970
4795
msgid "If no NAME is given, --all .* is implied."
4796
msgstr ""
4797
4798
#: bzrlib/config.py:3972
4799
msgid ""
4800
"Setting a value is achieved by using name=value without spaces. The value\n"
4801
"is set in the most relevant scope and can be checked by displaying the\n"
4802
"option again."
4803
msgstr ""
4804
4805
#: bzrlib/config.py:3984
4806
msgid "Reduce the scope to the specified configuration file."
4807
msgstr ""
4808
4809
#: bzrlib/config.py:3988
4810
msgid "Display all the defined values for the matching options."
4811
msgstr ""
4812
4813
#: bzrlib/config.py:3990
4814
msgid "Remove the option from the configuration file."
4815
msgstr ""
4816
4817
#: bzrlib/conflicts.py:50
4818
msgid "List files with conflicts."
4819
msgstr ""
4820
4821
#: bzrlib/conflicts.py:57
4822
msgid ""
4823
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4824
"is supplied, the pathnames of files with text conflicts are listed,\n"
4825
"instead. (This is useful for editing all files with text conflicts.)"
4826
msgstr ""
4827
4828
#: bzrlib/conflicts.py:61
4829
msgid "Use bzr resolve when you have fixed a problem."
4830
msgstr ""
4831
4832
#: bzrlib/conflicts.py:66
4833
msgid "List paths of files with text conflicts."
4834
msgstr ""
4835
4836
#: bzrlib/conflicts.py:85
4837
msgid "Marks the conflict as resolved."
4838
msgstr ""
4839
4840
#: bzrlib/conflicts.py:88
4841
msgid "Resolve the conflict preserving the version in the working tree."
4842
msgstr ""
4843
4844
#: bzrlib/conflicts.py:91
4845
msgid "Resolve the conflict taking the merged version into account."
4846
msgstr ""
4847
4848
#: bzrlib/conflicts.py:98
4849
msgid "How to resolve the conflict."
4850
msgstr ""
4851
4852
#: bzrlib/conflicts.py:104
4853
msgid "Mark a conflict as resolved."
4854
msgstr ""
4855
4856
#: bzrlib/conflicts.py:111
4857
msgid ""
4858
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4859
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4860
"as\n"
4861
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4862
msgstr ""
4863
4864
#: bzrlib/conflicts.py:119
4865
msgid "Resolve all conflicts in this tree."
4866
msgstr ""
4867
4868
#: bzrlib/conflicts.py:126
4869
msgid "If --all is specified, no FILE may be provided"
4870
msgstr ""
4871
4872
#: bzrlib/conflicts.py:151
4873
#, python-format
4874
msgid "%d conflict auto-resolved."
4875
msgid_plural "%d conflicts auto-resolved."
4876
msgstr[0] ""
4877
msgstr[1] ""
4878
4879
#: bzrlib/conflicts.py:154
4880
msgid "Remaining conflicts:"
4881
msgstr ""
4882
4883
#: bzrlib/conflicts.py:159
4884
msgid "All conflicts resolved."
4885
msgstr ""
4886
4887
#: bzrlib/conflicts.py:168
4888
msgid "{0} conflict resolved, {1} remaining"
4889
msgid_plural "{0} conflicts resolved, {1} remaining"
4890
msgstr[0] ""
4891
msgstr[1] ""
4892
4893
#: bzrlib/controldir.py:710
4894
msgid "{0} is{1} redirected to {2}"
4895
msgstr ""
4896
4897
#: bzrlib/diff.py:399
4898
#, python-format
4899
msgid "*** Ignoring files outside view. View is %s"
4900
msgstr ""
4901
4902
#: bzrlib/errors.py:157
4903
msgid "The tree builder is already building a tree."
4904
msgstr ""
4905
4906
#: bzrlib/errors.py:178
4907
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4908
msgstr ""
4909
4910
#: bzrlib/errors.py:197
4911
msgid ""
4912
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4913
"versions \"%(minimum)s\" to \"%(current)s\"."
4914
msgstr ""
4915
4916
#: bzrlib/errors.py:209
4917
msgid "The transport '%(transport)s' is only accessible within this process."
4918
msgstr ""
4919
4920
#: bzrlib/errors.py:227
4921
msgid "Invalid revision number %(revno)s"
4922
msgstr ""
4923
4924
#: bzrlib/errors.py:236
4925
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4926
msgstr ""
4927
4928
#: bzrlib/errors.py:247
4929
msgid "Reserved revision-id {%(revision_id)s}"
4930
msgstr ""
4931
4932
#: bzrlib/errors.py:261
4933
msgid "There is no public branch set for \"%(branch_url)s\"."
4934
msgstr ""
4935
4936
#: bzrlib/errors.py:271
4937
msgid ""
4938
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4939
"obtain a list of topics."
4940
msgstr ""
4941
4942
#: bzrlib/errors.py:280
4943
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4944
msgstr ""
4945
4946
#: bzrlib/errors.py:290
4947
msgid ""
4948
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:299
4952
msgid "The branch '%(branch)s' is not stacked."
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:313
4956
msgid "No WorkingTree exists for \"%(base)s\"."
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:322
4960
msgid "Not currently building a tree."
4961
msgstr ""
4962
4963
#: bzrlib/errors.py:327
4964
msgid "%(url)s is not a local path."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:355
4968
msgid "%(not_locked)r is not write locked but needs to be."
4969
msgstr ""
4970
4971
#: bzrlib/errors.py:363
4972
msgid "Error in command line options"
4973
msgstr ""
4974
4975
#: bzrlib/errors.py:368
4976
msgid "%(value)s is not an index of type %(_type)s."
4977
msgstr ""
4978
4979
#: bzrlib/errors.py:378
4980
msgid "Error in data for index %(value)s."
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:387
4984
msgid "The key '%(key)s' is already in index '%(index)s'."
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:397
4988
msgid "The key '%(key)s' is not a valid key."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:406
4992
msgid "Could not parse options for index %(value)s."
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:415
4996
msgid "The value '%(value)s' is not a valid value."
4997
msgstr ""
4998
4999
#: bzrlib/errors.py:424
5000
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:443
5004
msgid "Generic path error: %(path)r%(extra)s)"
5005
msgstr ""
5006
5007
#: bzrlib/errors.py:456
5008
msgid "No such file: %(path)r%(extra)s"
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:461
5012
msgid "File exists: %(path)r%(extra)s"
5013
msgstr ""
5014
5015
#: bzrlib/errors.py:467
5016
msgid ""
5017
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5018
"after to tell bzr about a rename that has already happened)%(extra)s"
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:483
5022
msgid "\"%(path)s\" is not a directory %(extra)s"
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:488
5026
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5027
msgstr ""
5028
5029
#: bzrlib/errors.py:493
5030
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:498
5034
msgid "Hard-linking \"%(path)s\" is not supported"
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:513
5038
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5039
msgstr ""
5040
5041
#: bzrlib/errors.py:518
5042
msgid "Permission denied: \"%(path)s\"%(extra)s"
5043
msgstr ""
5044
5045
#: bzrlib/errors.py:523
5046
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5047
msgstr ""
5048
5049
#: bzrlib/errors.py:528
5050
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5051
msgstr ""
5052
5053
#: bzrlib/errors.py:539
5054
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:561
5058
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:571
5062
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:579
5066
msgid ""
5067
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5068
"upgrade the branch to permit branch stacking."
5069
msgstr ""
5070
5071
#: bzrlib/errors.py:590
5072
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5073
msgstr ""
5074
5075
#: bzrlib/errors.py:600
5076
msgid ""
5077
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5078
"need to upgrade the repository to permit branch stacking."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:611
5082
msgid "Error reading from %(path)r."
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:630
5086
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:646
5090
msgid "Path \"%(path)s\" is not unicode normalized"
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:654
5094
msgid "Not a branch: \"%(path)s\"%(detail)s."
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:696
5098
msgid "No submit branch available for branch \"%(path)s\""
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:705
5102
msgid "A control directory already exists: \"%(path)s\"."
5103
msgstr ""
5104
5105
#: bzrlib/errors.py:710
5106
msgid "Already a branch: \"%(path)s\"."
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:715
5110
msgid "Parent branch already exists: \"%(path)s\"."
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:721
5114
msgid ""
5115
"Directory contains a branch, but no working tree (use bzr checkout if you "
5116
"wish to build a working tree): \"%(path)s\""
5117
msgstr ""
5118
5119
#: bzrlib/errors.py:726
5120
msgid ""
5121
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5122
msgstr ""
5123
5124
#: bzrlib/errors.py:736
5125
msgid ""
5126
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:746
5130
msgid "No repository present: \"%(path)s\""
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:753
5134
msgid ""
5135
"Unsupported branch format: %(format)s\n"
5136
"Please run 'bzr upgrade'"
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:759
5140
msgid "Unknown %(kind)s format: %(format)r"
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:768
5144
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:778
5148
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:793
5152
msgid ""
5153
"%(target)s\n"
5154
"is not compatible with\n"
5155
"%(source)s\n"
5156
"%(details)s"
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:809
5160
msgid "Revision is not compatible with %(repo_format)s"
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:819
5164
msgid "%(context_info)s%(path)s is already versioned."
5165
msgstr ""
5166
5167
#: bzrlib/errors.py:840
5168
msgid "%(context_info)s%(path)s is not versioned."
5169
msgstr ""
5170
5171
#: bzrlib/errors.py:861
5172
msgid "Path(s) are not versioned: %(paths_as_string)s"
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:872
5176
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5177
msgstr ""
5178
5179
#: bzrlib/errors.py:891
5180
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:899
5184
msgid ""
5185
"Filename %(filename)r is not valid in your current filesystem encoding "
5186
"%(fs_encoding)s"
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:910
5190
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5191
msgstr ""
5192
5193
#: bzrlib/errors.py:928
5194
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5195
msgstr ""
5196
5197
#: bzrlib/errors.py:967
5198
msgid "Cannot lock %(lock)s: %(why)s"
5199
msgstr ""
5200
5201
#: bzrlib/errors.py:977
5202
msgid ""
5203
"A transaction related operation was attempted after the transaction finished."
5204
msgstr ""
5205
5206
#: bzrlib/errors.py:1004
5207
msgid "Cannot lock: transport is read only: %(transport)s"
5208
msgstr ""
5209
5210
#: bzrlib/errors.py:1012
5211
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5212
msgstr ""
5213
5214
#: bzrlib/errors.py:1023
5215
msgid ""
5216
"Lock was broken while still open: %(lock)s - check storage consistency!"
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:1034
5220
msgid ""
5221
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5222
"%(holder)r, wanted to break %(target)r"
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:1046
5226
msgid ""
5227
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5228
"Use 'bzr break-lock' to clear it"
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:1059
5232
msgid "Lock not held: %(lock)s"
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:1088
5236
msgid "No changes to commit"
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:1093
5240
msgid ""
5241
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5242
msgstr ""
5243
5244
#: bzrlib/errors.py:1103
5245
msgid ""
5246
"Excluding paths during commit is not supported by repository at "
5247
"%(repository)r."
5248
msgstr ""
5249
5250
#: bzrlib/errors.py:1112
5251
msgid ""
5252
"The specified commit message contains characters unsupported by the current "
5253
"encoding."
5254
msgstr ""
5255
5256
#: bzrlib/errors.py:1118
5257
msgid "Upgrade URL cannot work with readonly URLs."
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:1123
5261
msgid "The branch format %(format)s is already at the most recent format."
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:1146
5265
msgid "Option --change does not accept revision ranges"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:1151
5269
msgid "No namespace registered for string: %(spec)r"
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:1170
5273
msgid ""
5274
"Requested revision: '%(spec)s' does not exist in branch: "
5275
"%(branch_url)s%(extra)s"
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:1184
5279
msgid ""
5280
"Operation denied because it would change the main history, which is not "
5281
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:1195
5285
msgid ""
5286
"These branches have diverged. Use the missing command to see how.\n"
5287
"Use the merge command to reconcile them."
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:1215
5291
msgid ""
5292
"Branches have no common ancestor, and no merge base revision was specified."
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:1221
5296
msgid ""
5297
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:1227
5301
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:1236
5305
msgid ""
5306
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5307
msgstr ""
5308
5309
#: bzrlib/errors.py:1245
5310
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:1254
5314
msgid "Branch %(branch)s has no commits."
5315
msgstr ""
5316
5317
#: bzrlib/errors.py:1272
5318
msgid ""
5319
"Bound branch %(branch)s is out of date with master branch "
5320
"%(master)s.%(extra_help)s"
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:1284
5324
msgid ""
5325
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5326
"bound to %(remote)s."
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1296
5330
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1305
5334
msgid ""
5335
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5336
"%(error)s"
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:1317
5340
msgid "Error in processing weave: %(msg)s"
5341
msgstr ""
5342
5343
#: bzrlib/errors.py:1326
5344
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5345
msgstr ""
5346
5347
#: bzrlib/errors.py:1337
5348
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5349
msgstr ""
5350
5351
#: bzrlib/errors.py:1347
5352
msgid "Weave invariant violated: %(what)s"
5353
msgstr ""
5354
5355
#: bzrlib/errors.py:1356
5356
msgid "Parents are mismatched between two revisions. %(msg)s"
5357
msgstr ""
5358
5359
#: bzrlib/errors.py:1378
5360
msgid ""
5361
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5362
"%(weave_b)s"
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:1390
5366
msgid "Versioned file error"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1395
5370
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1405
5374
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:1415
5378
msgid "Text did not match its checksum: %(msg)s"
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:1541
5382
msgid "Export format %(format)r not supported"
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:1550
5386
msgid "Transport error: %(msg)s %(orig_error)s"
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1576
5390
msgid "Generic bzr smart protocol error: %(details)s"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1584
5394
msgid "Received bad protocol version marker: %(marker)r"
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1616
5398
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:1621
5402
msgid "Connection error: %(msg)s %(orig_error)s"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1626
5406
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1647
5410
msgid "Connection closed: %(msg)s %(orig_error)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1652
5414
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1657
5418
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1667
5422
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1682
5426
msgid "Certificate error: %(error)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1690
5430
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1704
5434
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1712
5438
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1721
5442
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1735
5446
msgid "Too many redirections"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1740
5450
msgid "Working tree has conflicts."
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1744
5454
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1753
5458
msgid ""
5459
"Error(s) parsing config file %(filename)s:\n"
5460
"%(errors)s"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1763
5464
msgid ""
5465
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5466
"See ``bzr help %(name)s``"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1773
5470
msgid "%(username)r does not seem to contain a reasonable email address"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1782
5474
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1790
5478
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1798
5482
msgid "Unable to import library \"%(library)s\": %(error)s"
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:1806
5486
msgid "python-gpgme is not installed, it is needed to verify signatures"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1814
5490
msgid ""
5491
"The working tree for %(basedir)s has changed since the last commit, but "
5492
"weave merge requires that it be unchanged"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1824
5496
msgid ""
5497
"Can't reprocess and show base, because reprocessing obscures the "
5498
"relationship of conflicting lines to the base"
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1830
5502
msgid "Cycle in graph %(graph)r"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1858
5506
msgid "File %(filename)s is not conflicted."
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1880
5510
msgid "No bundle was found in \"%(filename)s\"."
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1889
5514
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:1899
5518
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:1912
5522
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:1922
5526
msgid "Key %(key)s is already present in map"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:1927
5530
msgid "The prefix %(prefix)s is in the help search path twice."
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:1937
5534
msgid ""
5535
"No final name for trans_id %(trans_id)r\n"
5536
"file-id: %(file_id)r\n"
5537
"root trans-id: %(root_trans_id)r\n"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1969
5541
msgid "Attempt to reuse a transform that has already been applied."
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1974
5545
msgid "Moving the root directory is not supported at this time"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1979
5549
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1990
5553
msgid ""
5554
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:2026
5558
msgid ""
5559
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:2056
5563
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:2064
5567
msgid "Nothing to merge."
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:2069
5571
msgid "Format %(format)s cannot be initialised by this version of bzr."
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:2078
5575
msgid ""
5576
"Cannot convert from format %(from_format)s to format %(format)s. "
5577
"%(problem)s"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:2090
5581
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:2098
5585
msgid "%(exe_name)s could not be found on this machine"
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:2106
5589
msgid "Diff is not installed on this machine: %(msg)s"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:2114
5593
msgid "Diff3 is not installed on this machine."
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:2120
5597
msgid "The content being inserted is already present."
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:2125
5601
msgid ""
5602
"This tree contains left-over files from a failed operation.\n"
5603
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5604
"to\n"
5605
" keep, and delete it when you are done."
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:2136
5609
msgid ""
5610
"This tree contains left-over files from a failed operation.\n"
5611
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5612
" wish to keep, and delete it when you are done."
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2146
5616
msgid ""
5617
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5618
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5619
"to\n"
5620
" keep, and delete it when you are done."
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:2157
5624
msgid ""
5625
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5626
"examine %(pending_deletion)s to see if it contains any files you wish to "
5627
"keep, and delete it when you are done."
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:2167
5631
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:2181
5635
msgid ""
5636
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5637
msgstr ""
5638
5639
#: bzrlib/errors.py:2194
5640
msgid "Error in merge modified format"
5641
msgstr ""
5642
5643
#: bzrlib/errors.py:2199
5644
msgid "Format error in conflict listings"
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:2203
5648
msgid ""
5649
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5650
"Error: %(description)s"
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:2214
5654
msgid ""
5655
"An error has been detected in the repository %(repo_path)s.\n"
5656
"Please run bzr reconcile on this repository."
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2225
5660
msgid ""
5661
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5662
"reason: %(reason)s"
5663
msgstr ""
5664
5665
#: bzrlib/errors.py:2238
5666
msgid ""
5667
"An inconsistent delta was supplied: %(delta)r\n"
5668
"reason: %(reason)s"
5669
msgstr ""
5670
5671
#: bzrlib/errors.py:2250
5672
msgid "To use this feature you must upgrade your branch at %(path)s."
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:2259
5676
msgid "To use this feature you must upgrade your repository at %(path)s."
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2264
5680
msgid ""
5681
"To use this feature you must upgrade your branch at %(path)s to a format "
5682
"which supports rich roots."
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:2270
5686
msgid "Cannot perform local-only commits on unbound branches."
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:2275
5690
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5691
msgstr ""
5692
5693
#: bzrlib/errors.py:2296
5694
msgid "Ghost tags not supported by format %(format)r."
5695
msgstr ""
5696
5697
#: bzrlib/errors.py:2304
5698
msgid "File is binary but should be text."
5699
msgstr ""
5700
5701
#: bzrlib/errors.py:2309
5702
msgid "The path %(path)s is not permitted on this platform"
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:2318
5706
msgid ""
5707
"Testament did not match expected value.\n"
5708
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5709
" {%(measured)s}"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:2330
5713
msgid "Not a bzr revision-bundle: %(text)r"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:2339
5717
msgid "Bad bzr revision-bundle: %(text)r"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2348
5721
msgid "Malformed bzr revision-bundle header: %(text)r"
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:2353
5725
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:2358
5729
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:2363
5733
msgid "End of line marker was not \\n in bzr revision-bundle"
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2373
5737
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2383
5741
msgid "Root class for inventory serialization errors"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:2387
5745
msgid ""
5746
"The inventory was not in the expected format:\n"
5747
" %(msg)s"
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:2396
5751
msgid "This operation requires rich root data storage"
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:2409
5755
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:2418
5759
msgid ""
5760
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5761
"variable."
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:2425
5765
msgid ""
5766
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5767
"ghost at {%(ghost_revision_id)s}"
5768
msgstr ""
5769
5770
#: bzrlib/errors.py:2435
5771
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:2486
5775
msgid ""
5776
"A merge directive must provide either a bundle or a public branch location."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2493
5780
msgid "Bad merge directive payload %(start)r"
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2503
5784
msgid "Preview patch does not match requested changes."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2509
5788
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:2519
5792
msgid ""
5793
"Your branch does not have all of the revisions required in order to merge "
5794
"this merge directive and the target location specified in the merge "
5795
"directive is not a branch: %(location)s."
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:2531
5799
msgid "Unsupported entry kind %(kind)s"
5800
msgstr ""
5801
5802
#: bzrlib/errors.py:2539
5803
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:2549
5807
msgid "Subsume target %(other_tree)s needs to be upgraded."
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2568
5811
msgid "No such tag: %(tag_name)s"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2576
5815
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2585
5819
msgid "Tag %(tag_name)s already exists."
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2593
5823
msgid ""
5824
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5825
"bugs\" for more information on this feature."
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:2603
5829
msgid ""
5830
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2613
5834
msgid ""
5835
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2623
5839
msgid "Invalid line in bugs property: '%(line)s'"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2631
5843
msgid "Invalid bug status: '%(status)s'"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2639
5847
msgid "Could not understand response from smart server: %(response_tuple)r"
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2678
5851
msgid "Server sent an unexpected error: %(error_tuple)r"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2697
5855
msgid "Unrecognised container format: %(container_format)r"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2705
5859
msgid "Unexpected end of container stream"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2710
5863
msgid "Unknown record type: %(record_type)r"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2718
5867
msgid "Invalid record: %(reason)s"
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2726
5871
msgid "Container has data after end marker: %(excess)r"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2734
5875
msgid "Container has multiple records with the same name: %(name)s"
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2747
5879
msgid "Corrupt or incompatible data stream: %(reason)s"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2755
5883
msgid "SMTP error: %(error)s"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2763
5887
msgid "No message supplied."
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2768
5891
msgid "No mail-to address (--mail-to) or output (-o) specified."
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2773
5895
msgid "Unknown mail client: %(mail_client)s"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2781
5899
msgid ""
5900
"Unable to find mail client with the following names: "
5901
"%(mail_command_list_string)s"
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:2791
5905
msgid "SMTP connection to %(host)s refused"
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2800
5909
msgid "Please specify smtp_server. No server at default %(host)s."
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2814
5913
msgid ""
5914
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5915
"reconfigure."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2826
5919
msgid "'%(display_url)s' is already a branch."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2831
5923
msgid "'%(display_url)s' is already a tree."
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2836
5927
msgid "'%(display_url)s' is already a checkout."
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2841
5931
msgid "'%(display_url)s' is already a lightweight checkout."
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2846
5935
msgid "'%(display_url)s' is already using a shared repository."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2851
5939
msgid "'%(display_url)s' is already standalone."
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:2856
5943
msgid "Shared repository '%(display_url)s' already creates working trees."
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2862
5947
msgid ""
5948
"Shared repository '%(display_url)s' already doesn't create working trees."
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2868
5952
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2873
5956
msgid "No location could be found to bind to at %(display_url)s."
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2878
5960
msgid ""
5961
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5962
"status).%(more)s"
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2897
5966
msgid ""
5967
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5968
"list).%(more)s"
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2903
5972
msgid "Variable {%(name)s} is not available."
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:2911
5976
msgid "No template specified."
5977
msgstr ""
5978
5979
#: bzrlib/errors.py:2916
5980
msgid "Unable to create symlink %(path_str)son this platform"
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:2931
5984
msgid ""
5985
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5986
"\"original\", \"local\"."
5987
msgstr ""
5988
5989
#: bzrlib/errors.py:2965
5990
msgid ""
5991
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:2977
5995
msgid "The \"%(config_id)s\" configuration does not exist."
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:2985
5999
msgid "The \"%(option_name)s\" configuration option does not exist."
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:2993
6003
msgid "The alias \"%(alias_name)s\" does not exist."
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:3007
6007
msgid "\"%(alias_name)s\" is not a valid location alias."
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:3015
6011
msgid "No %(alias_name)s location assigned."
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:3023
6015
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:3033
6019
msgid "Unknown rules detected: %(unknowns_str)s."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:3044
6023
msgid "Tip change rejected: %(msg)s"
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:3052
6027
msgid "Shelf corrupt."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:3057
6031
msgid "Corruption while decompressing repository file%(orig_error)s"
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:3069
6035
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:3077
6039
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:3085
6043
msgid ""
6044
"An attempt to access a url outside the server jail was made: '%(url)s'."
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:3093
6048
msgid "The user aborted the operation."
6049
msgstr ""
6050
6051
#: bzrlib/errors.py:3098
6052
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6053
msgstr ""
6054
6055
#: bzrlib/errors.py:3108
6056
msgid "No such view: %(view_name)s."
6057
msgstr ""
6058
6059
#: bzrlib/errors.py:3118
6060
msgid ""
6061
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6062
"to a later format."
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:3127
6066
msgid ""
6067
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6068
msgstr ""
6069
6070
#: bzrlib/errors.py:3194
6071
msgid "%(bzrdir)r does not support co-located branches."
6072
msgstr ""
6073
6074
#: bzrlib/errors.py:3200
6075
msgid ""
6076
"Unable to determine your name.\n"
6077
"Please, set your name with the 'whoami' command.\n"
6078
"E.g. bzr whoami \"Your Name <name@example.com>\""
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:3209
6082
msgid "Invalid pattern(s) found. %(msg)s"
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:3217
6086
msgid ""
6087
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6088
"unbind` to fix."
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:3228
6092
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:3237
6096
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:3246
6100
msgid ""
6101
"No compatible object available for operations from %(source)r to %(target)r."
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:3256
6105
msgid ""
6106
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6107
"%(arguments)s."
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:3266
6111
msgid ""
6112
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6113
"format %(format)r"
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:3278
6117
msgid ""
6118
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6119
"plugin."
6120
msgstr ""
6121
6122
#: bzrlib/errors.py:3291
6123
msgid "Binary files section encountered."
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3299
6127
msgid ""
6128
"Malformed patch header. %(desc)s\n"
6129
"%(line)r"
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:3308
6133
msgid ""
6134
"Malformed hunk header. %(desc)s\n"
6135
"%(line)r"
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:3317
6139
msgid ""
6140
"Malformed line. %(desc)s\n"
6141
"%(line)r"
6142
msgstr ""
6143
6144
#: bzrlib/errors.py:3327
6145
msgid ""
6146
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6147
"but patch says it should be \"%(patch_line)s\""
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:3338
6151
msgid "The feature %(feature)s has already been registered."
6152
msgstr ""
6153
6154
#: bzrlib/export_pot.py:252
6155
#, python-format
6156
msgid "Exporting messages from builtin command: %s"
6157
msgstr ""
6158
6159
#: bzrlib/export_pot.py:271
6160
msgid "Exporting messages from plugin command: {0} in {1}"
6161
msgstr ""
6162
6163
#: bzrlib/export_pot.py:292
6164
#, python-format
6165
msgid "Exporting message from error: %s"
6166
msgstr ""
6167
6168
#: bzrlib/fetch.py:98
6169
msgid "Finding revisions"
6170
msgstr ""
6171
6172
#: bzrlib/fetch.py:103
6173
msgid "Fetching revisions"
6174
msgstr ""
6175
6176
#: bzrlib/foreign.py:262
6177
msgid "Push into a different VCS without any custom bzr metadata."
6178
msgstr ""
6179
6180
#: bzrlib/foreign.py:264
6181
msgid ""
6182
"This will afterwards rebase the local branch on the remote\n"
6183
"branch unless the --no-rebase option is used, in which case \n"
6184
"the two branches will be out of sync after the push. "
6185
msgstr ""
6186
6187
#: bzrlib/foreign.py:277
6188
msgid "Do not rebase after push."
6189
msgstr ""
6190
6191
#: bzrlib/foreign.py:311
6192
#, python-format
6193
msgid "Using saved location: %s\n"
6194
msgstr ""
6195
6196
#: bzrlib/foreign.py:321
6197
msgid ""
6198
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6199
"regular push."
6200
msgstr ""
6201
6202
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6203
msgid "{0} commits with valid signatures"
6204
msgstr ""
6205
6206
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6207
msgid "{0} commit with unknown key"
6208
msgid_plural "{0} commits with unknown keys"
6209
msgstr[0] ""
6210
msgstr[1] ""
6211
6212
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6213
msgid "{0} commit not valid"
6214
msgid_plural "{0} commits not valid"
6215
msgstr[0] ""
6216
msgstr[1] ""
6217
6218
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6219
msgid "{0} commit not signed"
6220
msgid_plural "{0} commits not signed"
6221
msgstr[0] ""
6222
msgstr[1] ""
6223
6224
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6225
msgid "{0} commit with key now expired"
6226
msgid_plural "{0} commits with key now expired"
6227
msgstr[0] ""
6228
msgstr[1] ""
6229
6230
#: bzrlib/gpg.py:343
6231
msgid "No GnuPG key results for pattern: {0}"
6232
msgstr ""
6233
6234
#: bzrlib/gpg.py:386
6235
msgid "{0} signed {1} commit"
6236
msgid_plural "{0} signed {1} commits"
6237
msgstr[0] ""
6238
msgstr[1] ""
6239
6240
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6241
msgid "{0} commit by author {1}"
6242
msgid_plural "{0} commits by author {1}"
6243
msgstr[0] ""
6244
msgstr[1] ""
6245
6246
#: bzrlib/gpg.py:433
6247
msgid "Unknown key {0} signed {1} commit"
6248
msgid_plural "Unknown key {0} signed {1} commits"
6249
msgstr[0] ""
6250
msgstr[1] ""
6251
6252
#: bzrlib/gpg.py:452
6253
msgid "{0} commit by author {1} with key {2} now expired"
6254
msgid_plural "{0} commits by author {1} with key {2} now expired"
6255
msgstr[0] ""
6256
msgstr[1] ""
6257
6258
#: bzrlib/groupcompress.py:1739
6259
#, python-format
6260
msgid "Insert claimed random_id=True, but then inserted %r two times"
6261
msgstr ""
6262
6263
#: bzrlib/hooks.py:331
6264
#, python-format
6265
msgid "Introduced in: %s"
6266
msgstr ""
6267
6268
#: bzrlib/hooks.py:334
6269
#, python-format
6270
msgid "Deprecated in: %s"
6271
msgstr ""
6272
6273
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6274
msgid "Walking content"
6275
msgstr ""
6276
6277
#: bzrlib/knit.py:3330
6278
msgid "annotating"
6279
msgstr ""
6280
6281
#: bzrlib/lock.py:548
6282
msgid "{0!r} was {1} locked again"
6283
msgstr ""
6284
6285
#: bzrlib/lockdir.py:321
6286
#, python-format
6287
msgid "error removing pending lock: %s"
6288
msgstr ""
6289
6290
#: bzrlib/lockdir.py:616
6291
msgid "Unable to obtain"
6292
msgstr ""
6293
6294
#: bzrlib/lockdir.py:618
6295
msgid "Lock owner changed for"
6296
msgstr ""
6297
6298
#: bzrlib/lockdir.py:620
6299
msgid "{0} lock {1} {2}."
6300
msgstr ""
6301
6302
#: bzrlib/lockdir.py:627
6303
#, python-format
6304
msgid "Will continue to try until %s, unless you press Ctrl-C."
6305
msgstr ""
6306
6307
#: bzrlib/lockdir.py:629
6308
msgid "See \"bzr help break-lock\" for more."
6309
msgstr ""
6310
6311
#: bzrlib/lockdir.py:739
6312
#, python-format
6313
msgid ""
6314
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6315
msgstr ""
6316
6317
#: bzrlib/log.py:572
6318
msgid "--exclude-common-ancestry requires two different revisions"
6319
msgstr ""
6320
6321
#: bzrlib/log.py:574
6322
#, python-format
6323
msgid "invalid direction %r"
6324
msgstr ""
6325
6326
#: bzrlib/log.py:662
6327
msgid "Start revision not found in history of end revision."
6328
msgstr ""
6329
6330
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6331
msgid "Logging revision 0 is invalid."
6332
msgstr ""
6333
6334
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6335
msgid "Start revision must be older than the end revision."
6336
msgstr ""
6337
6338
#: bzrlib/log.py:1827
6339
#, python-format
6340
msgid "unknown log formatter: %r"
6341
msgstr ""
6342
6343
#: bzrlib/log.py:2123
6344
msgid "fixes bug"
6345
msgid_plural "fixes bugs"
6346
msgstr[0] ""
6347
msgstr[1] ""
6348
6349
#: bzrlib/merge.py:689
6350
msgid "All changes applied successfully."
6351
msgstr ""
6352
6353
#: bzrlib/merge.py:691
6354
#, python-format
6355
msgid "%d conflicts encountered."
6356
msgstr ""
6357
6358
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6359
msgid "Preparing file merge"
6360
msgstr ""
6361
6362
#: bzrlib/multiparent.py:426
6363
msgid "Importing revisions"
6364
msgstr ""
6365
6366
#: bzrlib/option.py:526
6367
msgid "Show help message."
6368
msgstr ""
6369
6370
#: bzrlib/option.py:528
6371
msgid "Only display errors and warnings."
6372
msgstr ""
6373
6374
#: bzrlib/option.py:531
6375
msgid "Show usage message and options."
6376
msgstr ""
6377
6378
#: bzrlib/option.py:533
6379
msgid "Display more information."
6380
msgstr ""
6381
6382
#: bzrlib/option.py:541
6383
msgid ""
6384
"Select changes introduced by the specified revision. See also \"help "
6385
"revisionspec\"."
6386
msgstr ""
6387
6388
#: bzrlib/option.py:543
6389
msgid "Branch to operate on, instead of working directory."
6390
msgstr ""
6391
6392
#: bzrlib/option.py:545
6393
msgid "Detailed log format."
6394
msgstr ""
6395
6396
#: bzrlib/option.py:545
6397
msgid "Format used by GNU ChangeLog files."
6398
msgstr ""
6399
6400
#: bzrlib/option.py:545
6401
msgid "Log format with one line per revision."
6402
msgstr ""
6403
6404
#: bzrlib/option.py:545
6405
msgid "Moderately short log format."
6406
msgstr ""
6407
6408
#: bzrlib/option.py:545
6409
msgid "Use specified log format."
6410
msgstr ""
6411
6412
#: bzrlib/option.py:547
6413
msgid "Log format"
6414
msgstr ""
6415
6416
#: bzrlib/option.py:549
6417
msgid "LCA-newness merge."
6418
msgstr ""
6419
6420
#: bzrlib/option.py:549
6421
msgid "Merge using external diff3."
6422
msgstr ""
6423
6424
#: bzrlib/option.py:549
6425
msgid "Native diff3-style merge."
6426
msgstr ""
6427
6428
#: bzrlib/option.py:549
6429
msgid "Select a particular merge algorithm."
6430
msgstr ""
6431
6432
#: bzrlib/option.py:549
6433
msgid "Weave-based merge."
6434
msgstr ""
6435
6436
#: bzrlib/option.py:551
6437
msgid "Merge algorithm"
6438
msgstr ""
6439
6440
#: bzrlib/option.py:554
6441
msgid "Message string."
6442
msgstr ""
6443
6444
#: bzrlib/option.py:556
6445
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6446
msgstr ""
6447
6448
#: bzrlib/option.py:558
6449
msgid "Ignore differences between branches and overwrite unconditionally."
6450
msgstr ""
6451
6452
#: bzrlib/option.py:560
6453
msgid "Remember the specified location as a default."
6454
msgstr ""
6455
6456
#: bzrlib/option.py:562
6457
msgid "Reprocess to reduce spurious conflicts."
6458
msgstr ""
6459
6460
#: bzrlib/option.py:566
6461
msgid "See \"help revisionspec\" for details."
6462
msgstr ""
6463
6464
#: bzrlib/option.py:568
6465
msgid "Show internal object ids."
6466
msgstr ""
6467
6468
#: bzrlib/option.py:571
6469
msgid "Display timezone as local, original, or utc."
6470
msgstr ""
6471
6472
#: bzrlib/osutils.py:100
6473
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6474
msgstr ""
6475
6476
#: bzrlib/osutils.py:220
6477
msgid "lstat/stat of ({0!r}): {1!r}"
6478
msgstr ""
6479
6480
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6481
#, python-format
6482
msgid "sorry, %r not allowed in path"
6483
msgstr ""
6484
6485
#: bzrlib/osutils.py:1237
6486
#, python-format
6487
msgid "%r is too short to calculate a relative path"
6488
msgstr ""
6489
6490
#: bzrlib/plugin.py:143
6491
#, python-format
6492
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6493
msgstr ""
6494
6495
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6496
msgid "Enable completions for the selected plugin (default: all plugins)"
6497
msgstr ""
6498
6499
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6500
msgid "Generate a shell function for bash command line completion."
6501
msgstr ""
6502
6503
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6504
msgid ""
6505
"This command generates a shell function which can be used by bash to\n"
6506
"automatically complete the currently typed command when the user presses\n"
6507
"the completion key (usually tab)."
6508
msgstr ""
6509
6510
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6511
msgid ""
6512
"Commonly used like this:\n"
6513
" eval \"`bzr bash-completion`\""
6514
msgstr ""
6515
6516
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6517
msgid "Name of the generated function (default: _bzr)"
6518
msgstr ""
6519
6520
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6521
msgid "Generate only the shell function, don't enable it"
6522
msgstr ""
6523
6524
#: bzrlib/plugins/launchpad/__init__.py:81
6525
msgid "Register a branch with launchpad.net."
6526
msgstr ""
6527
6528
#: bzrlib/plugins/launchpad/__init__.py:83
6529
msgid ""
6530
"This command lists a bzr branch in the directory of branches on\n"
6531
"launchpad.net. Registration allows the branch to be associated with\n"
6532
"bugs or specifications."
6533
msgstr ""
6534
6535
#: bzrlib/plugins/launchpad/__init__.py:87
6536
msgid ""
6537
"Before using this command you must register the project to which the\n"
6538
"branch belongs, and create an account for yourself on launchpad.net."
6539
msgstr ""
6540
6541
#: bzrlib/plugins/launchpad/__init__.py:90
6542
msgid ""
6543
"arguments:\n"
6544
" public_url: The publicly visible url for the branch to register.\n"
6545
" This must be an http or https url (which Launchpad can read\n"
6546
" from to access the branch). Local file urls, SFTP urls, and\n"
6547
" bzr+ssh urls will not work.\n"
6548
" If no public_url is provided, bzr will use the configured\n"
6549
" public_url if there is one for the current branch, and\n"
6550
" otherwise error."
6551
msgstr ""
6552
6553
#: bzrlib/plugins/launchpad/__init__.py:99
6554
msgid ""
6555
"example:\n"
6556
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6557
" --project fooproject"
6558
msgstr ""
6559
6560
#: bzrlib/plugins/launchpad/__init__.py:106
6561
msgid "Launchpad project short name to associate with the branch."
6562
msgstr ""
6563
6564
#: bzrlib/plugins/launchpad/__init__.py:113
6565
msgid ""
6566
"Short name for the branch; by default taken from the last component of the "
6567
"url."
6568
msgstr ""
6569
6570
#: bzrlib/plugins/launchpad/__init__.py:117
6571
msgid "One-sentence description of the branch."
6572
msgstr ""
6573
6574
#: bzrlib/plugins/launchpad/__init__.py:120
6575
msgid "Longer description of the purpose or contents of the branch."
6576
msgstr ""
6577
6578
#: bzrlib/plugins/launchpad/__init__.py:123
6579
msgid "Branch author's email address, if not yourself."
6580
msgstr ""
6581
6582
#: bzrlib/plugins/launchpad/__init__.py:126
6583
msgid "The bug this branch fixes."
6584
msgstr ""
6585
6586
#: bzrlib/plugins/launchpad/__init__.py:129
6587
msgid "Prepare the request but don't actually send it."
6588
msgstr ""
6589
6590
#: bzrlib/plugins/launchpad/__init__.py:151
6591
msgid ""
6592
"register-branch requires a public branch url - see bzr help register-branch."
6593
msgstr ""
6594
6595
#: bzrlib/plugins/launchpad/__init__.py:159
6596
msgid "--product is deprecated; please use --project."
6597
msgstr ""
6598
6599
#: bzrlib/plugins/launchpad/__init__.py:191
6600
msgid "Open a Launchpad branch page in your web browser."
6601
msgstr ""
6602
6603
#: bzrlib/plugins/launchpad/__init__.py:196
6604
msgid "Do not actually open the browser. Just say the URL we would use."
6605
msgstr ""
6606
6607
#: bzrlib/plugins/launchpad/__init__.py:231
6608
#, python-format
6609
msgid "Opening %s in web browser"
6610
msgstr ""
6611
6612
#: bzrlib/plugins/launchpad/__init__.py:241
6613
msgid "Show or set the Launchpad user ID."
6614
msgstr ""
6615
6616
#: bzrlib/plugins/launchpad/__init__.py:243
6617
msgid ""
6618
"When communicating with Launchpad, some commands need to know your\n"
6619
"Launchpad user ID. This command can be used to set or show the\n"
6620
"user ID that Bazaar will use for such communication."
6621
msgstr ""
6622
6623
#: bzrlib/plugins/launchpad/__init__.py:247
6624
msgid ""
6625
":Examples:\n"
6626
" Show the Launchpad ID of the current user::"
6627
msgstr ""
6628
6629
#: bzrlib/plugins/launchpad/__init__.py:250
6630
msgid " bzr launchpad-login"
6631
msgstr ""
6632
6633
#: bzrlib/plugins/launchpad/__init__.py:252
6634
msgid " Set the Launchpad ID of the current user to 'bob'::"
6635
msgstr ""
6636
6637
#: bzrlib/plugins/launchpad/__init__.py:254
6638
msgid " bzr launchpad-login bob"
6639
msgstr ""
6640
6641
#: bzrlib/plugins/launchpad/__init__.py:261
6642
msgid "Don't check that the user name is valid."
6643
msgstr ""
6644
6645
#: bzrlib/plugins/launchpad/__init__.py:276
6646
#: bzrlib/plugins/launchpad/__init__.py:287
6647
msgid "Launchpad user ID exists and has SSH keys.\n"
6648
msgstr ""
6649
6650
#: bzrlib/plugins/launchpad/__init__.py:279
6651
msgid "No Launchpad user ID configured.\n"
6652
msgstr ""
6653
6654
#: bzrlib/plugins/launchpad/__init__.py:290
6655
#, python-format
6656
msgid "Launchpad user ID set to '%s'.\n"
6657
msgstr ""
6658
6659
#: bzrlib/plugins/launchpad/__init__.py:298
6660
msgid "Ask Launchpad to mirror a branch now."
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/__init__.py:318
6664
msgid "Propose merging a branch on Launchpad."
6665
msgstr ""
6666
6667
#: bzrlib/plugins/launchpad/__init__.py:320
6668
msgid ""
6669
"This will open your usual editor to provide the initial comment. When it\n"
6670
"has created the proposal, it will open it in your default web browser."
6671
msgstr ""
6672
6673
#: bzrlib/plugins/launchpad/__init__.py:323
6674
msgid ""
6675
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6676
"is not supplied, the remembered submit branch will be used. If no submit\n"
6677
"branch is remembered, the development focus will be used."
6678
msgstr ""
6679
6680
#: bzrlib/plugins/launchpad/__init__.py:327
6681
msgid ""
6682
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6683
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6684
"The parameter the launchpad account name of the desired reviewer. This\n"
6685
"may optionally be followed by '=' and the review type. For example:"
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/__init__.py:332
6689
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6690
msgstr ""
6691
6692
#: bzrlib/plugins/launchpad/__init__.py:334
6693
msgid ""
6694
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6695
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6696
msgstr ""
6697
6698
#: bzrlib/plugins/launchpad/__init__.py:339
6699
msgid "Propose the merge on staging."
6700
msgstr ""
6701
6702
#: bzrlib/plugins/launchpad/__init__.py:341
6703
msgid "Commit message."
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/__init__.py:343
6707
msgid "Mark the proposal as approved immediately."
6708
msgstr ""
6709
6710
#: bzrlib/plugins/launchpad/__init__.py:345
6711
msgid "Requested reviewer and optional type."
6712
msgstr ""
6713
6714
#: bzrlib/plugins/launchpad/__init__.py:382
6715
msgid "Find the proposal to merge this revision."
6716
msgstr ""
6717
6718
#: bzrlib/plugins/launchpad/__init__.py:384
6719
msgid ""
6720
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6721
"This works only if the selected branch was the merge proposal target, and\n"
6722
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6723
"are opened in a web browser."
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/__init__.py:389
6727
msgid ""
6728
"Any revision involved in the merge may be specified-- the revision in\n"
6729
"which the merge was performed, or one of the revisions that was merged."
6730
msgstr ""
6731
6732
#: bzrlib/plugins/launchpad/__init__.py:392
6733
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6734
msgstr ""
6735
6736
#: bzrlib/plugins/launchpad/__init__.py:394
6737
msgid " bzr lp-find-proposal -r annotate:README:1"
6738
msgstr ""
6739
6740
#: bzrlib/plugins/launchpad/__init__.py:409
6741
msgid "No review found."
6742
msgstr ""
6743
6744
#: bzrlib/plugins/launchpad/__init__.py:410
6745
#, python-format
6746
msgid "%d proposals(s) found."
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/__init__.py:420
6750
msgid "Finding revision-id"
6751
msgstr ""
6752
6753
#: bzrlib/plugins/launchpad/__init__.py:427
6754
msgid "Finding merge"
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/__init__.py:432
6758
msgid "Finding revno"
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/__init__.py:437
6762
msgid "Finding Launchpad branch"
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/__init__.py:440
6766
msgid "Finding proposals"
6767
msgstr ""
6768
6769
#: bzrlib/plugins/launchpad/account.py:66
6770
msgid "Setting ssh/sftp usernames for launchpad.net."
6771
msgstr ""
6772
6773
#: bzrlib/plugins/launchpad/lp_api.py:241
6774
#: bzrlib/plugins/launchpad/lp_api.py:246
6775
#, python-format
6776
msgid "%s is not registered on Launchpad"
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/lp_api.py:256
6780
#, python-format
6781
msgid "%s has no development focus."
6782
msgstr ""
6783
6784
#: bzrlib/plugins/launchpad/lp_api.py:261
6785
#, python-format
6786
msgid "development focus %s has no branch."
6787
msgstr ""
6788
6789
#: bzrlib/plugins/launchpad/lp_api.py:266
6790
#, python-format
6791
msgid "source package %s has no branch."
6792
msgstr ""
6793
6794
#: bzrlib/plugins/launchpad/lp_api.py:270
6795
#, python-format
6796
msgid "%s has no associated product or source package."
6797
msgstr ""
6798
6799
#: bzrlib/plugins/launchpad/lp_api.py:282
6800
#, python-format
6801
msgid "%s is already up-to-date."
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/lp_api.py:289
6805
#, python-format
6806
msgid "Pushing to %s"
6807
msgstr ""
6808
6809
#: bzrlib/plugins/launchpad/lp_directory.py:170
6810
msgid ""
6811
"resolution for {0}\n"
6812
" local: {1}\n"
6813
" remote: {2}"
6814
msgstr ""
6815
6816
#: bzrlib/plugins/launchpad/lp_propose.py:149
6817
#, python-format
6818
msgid "There is already a branch merge proposal: %s"
6819
msgstr ""
6820
6821
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6822
msgid "pb parameter to convert() is deprecated"
6823
msgstr ""
6824
6825
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6826
msgid "starting upgrade from format 4 to 5"
6827
msgstr ""
6828
6829
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6830
msgid "note: upgrade may be faster if all store files are ungzipped first"
6831
msgstr ""
6832
6833
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6834
msgid "converting revision"
6835
msgstr ""
6836
6837
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6838
msgid "upgraded to weaves:"
6839
msgstr ""
6840
6841
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6842
#, python-format
6843
msgid "%6d revisions and inventories"
6844
msgstr ""
6845
6846
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6847
#, python-format
6848
msgid "%6d revisions not present"
6849
msgstr ""
6850
6851
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6852
#, python-format
6853
msgid "%6d texts"
6854
msgstr ""
6855
6856
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6857
msgid "writing weave"
6858
msgstr ""
6859
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6862
msgid "inventory"
6863
msgstr ""
6864
6865
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6866
msgid "write revision"
6867
msgstr ""
6868
6869
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6870
msgid "loading revision"
6871
msgstr ""
6872
6873
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6874
#, python-format
6875
msgid "revision {%s} not present in branch; will be converted as a ghost"
6876
msgstr ""
6877
6878
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6879
msgid "starting upgrade from format 5 to 6"
6880
msgstr ""
6881
6882
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6883
#, python-format
6884
msgid "adding prefixes to %s"
6885
msgstr ""
6886
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6888
msgid "starting upgrade from format 6 to metadir"
6889
msgstr ""
6890
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6892
msgid "Removing ancestry.weave"
6893
msgstr ""
6894
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6896
msgid "Finding branch files"
6897
msgstr ""
6898
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6900
msgid "Upgrading repository"
6901
msgstr ""
6902
6903
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6904
msgid "Upgrading branch"
6905
msgstr ""
6906
6907
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6908
msgid "No working tree."
6909
msgstr ""
6910
6911
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6912
msgid "Upgrading working tree"
6913
msgstr ""
6914
6915
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6916
#, python-format
6917
msgid "Make %s lock"
6918
msgstr ""
6919
6920
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6921
#, python-format
6922
msgid "Moving %s"
6923
msgstr ""
6924
6925
#: bzrlib/push.py:56
6926
msgid "Created new branch."
6927
msgstr ""
6928
6929
#: bzrlib/push.py:97
6930
#, python-format
6931
msgid ""
6932
"Target directory %s already contains a .bzr directory, but it is not valid."
6933
msgstr ""
6934
6935
#: bzrlib/push.py:101
6936
#, python-format
6937
msgid ""
6938
"Target directory %s already exists, but does not have a .bzr directory. "
6939
"Supply --use-existing-dir to push there anyway."
6940
msgstr ""
6941
6942
#: bzrlib/push.py:122
6943
#, python-format
6944
msgid "Too many redirections trying to make %s."
6945
msgstr ""
6946
6947
#: bzrlib/push.py:147
6948
msgid ""
6949
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6950
"information."
6951
msgstr ""
6952
6953
#: bzrlib/push.py:151
6954
#, python-format
6955
msgid ""
6956
"It is not possible to losslessly push to %s. You may want to use dpush "
6957
"instead."
6958
msgstr ""
6959
6960
#: bzrlib/push.py:157
6961
#, python-format
6962
msgid ""
6963
"At %s you have a valid .bzr control directory, but not a branch or "
6964
"repository. This is an unsupported configuration. Please move the target "
6965
"directory out of the way and try again."
6966
msgstr ""
6967
6968
#: bzrlib/reconcile.py:97
6969
#, python-format
6970
msgid "Reconciling branch %s"
6971
msgstr ""
6972
6973
#: bzrlib/reconcile.py:103
6974
#, python-format
6975
msgid "Reconciling repository %s"
6976
msgstr ""
6977
6978
#: bzrlib/reconcile.py:105
6979
msgid "Reconciling repository"
6980
msgstr ""
6981
6982
#: bzrlib/reconcile.py:111
6983
#, python-format
6984
msgid "%s cannot canonicalize CHKs."
6985
msgstr ""
6986
6987
#: bzrlib/reconcile.py:119
6988
msgid "Reconcile aborted: revision index has inconsistent parents."
6989
msgstr ""
6990
6991
#: bzrlib/reconcile.py:121
6992
msgid "Run \"bzr check\" for more details."
6993
msgstr ""
6994
6995
#: bzrlib/reconcile.py:123
6996
msgid "Reconciliation complete."
6997
msgstr ""
6998
6999
#: bzrlib/reconcile.py:166
7000
msgid "Fixing last revision info {0} => {1}"
7001
msgstr ""
7002
7003
#: bzrlib/reconcile.py:173
7004
msgid "revision_history ok."
7005
msgstr ""
7006
7007
#: bzrlib/reconcile.py:234
7008
msgid "Reading inventory data"
7009
msgstr ""
7010
7011
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7012
msgid "Inventory ok."
7013
msgstr ""
7014
7015
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7016
msgid "Backing up inventory"
7017
msgstr ""
7018
7019
#: bzrlib/reconcile.py:258
7020
msgid "Backup inventory created."
7021
msgstr ""
7022
7023
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7024
msgid "Writing weave"
7025
msgstr ""
7026
7027
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7028
msgid "Inventory regenerated."
7029
msgstr ""
7030
7031
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7032
msgid "Reading indexes"
7033
msgstr ""
7034
7035
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7036
msgid "Checking unused inventories"
7037
msgstr ""
7038
7039
#: bzrlib/reconcile.py:388
7040
msgid "Backup Inventory created"
7041
msgstr ""
7042
7043
#: bzrlib/reconcile.py:446
7044
msgid "Fixing text parents"
7045
msgstr ""
7046
7047
#: bzrlib/reconfigure.py:54
7048
msgid "{0} is now stacked on {1}\n"
7049
msgstr ""
7050
7051
#: bzrlib/reconfigure.py:69
7052
#, python-format
7053
msgid "%s is now not stacked\n"
7054
msgstr ""
7055
7056
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7057
#, python-format
7058
msgid "bzr: ERROR (ignored): %s"
7059
msgstr ""
7060
7061
#: bzrlib/remote.py:2541
7062
msgid "Copying repository content as tarball..."
7063
msgstr ""
7064
7065
#: bzrlib/rename_map.py:69
7066
msgid "Calculating hashes"
7067
msgstr ""
7068
7069
#: bzrlib/rename_map.py:107
7070
msgid "Determining hash hits"
7071
msgstr ""
7072
7073
#: bzrlib/rename_map.py:242
7074
msgid "{0} => {1}"
7075
msgstr ""
7076
7077
#: bzrlib/repository.py:1787
7078
msgid "Moving repository to repository.backup"
7079
msgstr ""
7080
7081
#: bzrlib/repository.py:1794
7082
msgid "Creating new repository"
7083
msgstr ""
7084
7085
#: bzrlib/repository.py:1799
7086
msgid "Copying content"
7087
msgstr ""
7088
7089
#: bzrlib/repository.py:1803
7090
msgid "Deleting old repository content"
7091
msgstr ""
7092
7093
#: bzrlib/repository.py:1805
7094
msgid "repository converted"
7095
msgstr ""
7096
7097
#: bzrlib/revisionspec.py:903
7098
msgid "Using {0} {1}"
7099
msgstr ""
7100
7101
#: bzrlib/send.py:58
7102
#, python-format
7103
msgid "Mail client \"%s\" does not support specifying body"
7104
msgstr ""
7105
7106
#: bzrlib/send.py:62
7107
msgid "--remember requires a branch to be specified."
7108
msgstr ""
7109
7110
#: bzrlib/send.py:77
7111
msgid "No submit branch known or specified"
7112
msgstr ""
7113
7114
#: bzrlib/send.py:80
7115
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7116
msgstr ""
7117
7118
#: bzrlib/send.py:98
7119
#, python-format
7120
msgid "No such send format '%s'."
7121
msgstr ""
7122
7123
#: bzrlib/send.py:114
7124
msgid "bzr send takes at most two one revision identifiers"
7125
msgstr ""
7126
7127
#: bzrlib/send.py:127
7128
msgid "No revisions to submit."
7129
msgstr ""
7130
7131
#: bzrlib/send.py:139
7132
msgid ""
7133
"- not supported for merge directives that use more than one output file."
7134
msgstr ""
7135
7136
#: bzrlib/send.py:185
7137
msgid "Format 0.9 does not permit bundle with no patch"
7138
msgstr ""
7139
7140
#: bzrlib/shelf_ui.py:46
7141
#, python-format
7142
msgid "Shelve adding file \"%(path)s\"?"
7143
msgstr ""
7144
7145
#: bzrlib/shelf_ui.py:47
7146
msgid "Shelve binary changes?"
7147
msgstr ""
7148
7149
#: bzrlib/shelf_ui.py:48
7150
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7151
msgstr ""
7152
7153
#: bzrlib/shelf_ui.py:50
7154
#, python-format
7155
msgid "Shelve removing file \"%(path)s\"?"
7156
msgstr ""
7157
7158
#: bzrlib/shelf_ui.py:51
7159
#, python-format
7160
msgid "Shelve %d change(s)?"
7161
msgstr ""
7162
7163
#: bzrlib/shelf_ui.py:52
7164
msgid "Shelve?"
7165
msgstr ""
7166
7167
#: bzrlib/shelf_ui.py:53
7168
#, python-format
7169
msgid ""
7170
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7171
msgstr ""
7172
7173
#: bzrlib/shelf_ui.py:55
7174
#, python-format
7175
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7176
msgstr ""
7177
7178
#: bzrlib/shelf_ui.py:70
7179
#, python-format
7180
msgid "Changes shelved with id \"%d\"."
7181
msgstr ""
7182
7183
#: bzrlib/shelf_ui.py:74
7184
msgid "Selected changes destroyed."
7185
msgstr ""
7186
7187
#: bzrlib/shelf_ui.py:78
7188
msgid "Selected changes:"
7189
msgstr ""
7190
7191
#: bzrlib/shelf_ui.py:98
7192
#, python-format
7193
msgid "Delete file \"%(path)s\"?"
7194
msgstr ""
7195
7196
#: bzrlib/shelf_ui.py:99
7197
msgid "Apply binary changes?"
7198
msgstr ""
7199
7200
#: bzrlib/shelf_ui.py:100
7201
#, python-format
7202
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7203
msgstr ""
7204
7205
#: bzrlib/shelf_ui.py:102
7206
#, python-format
7207
msgid "Add file \"%(path)s\"?"
7208
msgstr ""
7209
7210
#: bzrlib/shelf_ui.py:103
7211
#, python-format
7212
msgid "Apply %d change(s)?"
7213
msgstr ""
7214
7215
#: bzrlib/shelf_ui.py:104
7216
msgid "Apply change?"
7217
msgstr ""
7218
7219
#: bzrlib/shelf_ui.py:105
7220
#, python-format
7221
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7222
msgstr ""
7223
7224
#: bzrlib/shelf_ui.py:107
7225
#, python-format
7226
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7227
msgstr ""
7228
7229
#: bzrlib/shelf_ui.py:402
7230
msgid "No changes are shelved."
7231
msgstr ""
7232
7233
#: bzrlib/shelf_ui.py:460
7234
#, python-format
7235
msgid "Using changes with id \"%d\"."
7236
msgstr ""
7237
7238
#: bzrlib/shelf_ui.py:464
7239
#, python-format
7240
msgid "Message: %s"
7241
msgstr ""
7242
7243
#: bzrlib/shelf_ui.py:476
7244
#, python-format
7245
msgid "Deleted changes with id \"%d\"."
7246
msgstr ""
7247
7248
#: bzrlib/smart/medium.py:714
7249
msgid "HPSS calls: {0} ({1} vfs) {2}"
7250
msgstr ""
7251
7252
#: bzrlib/smart/server.py:169
7253
msgid "Requested to stop gracefully"
7254
msgstr ""
7255
7256
#: bzrlib/smart/server.py:179
7257
#, python-format
7258
msgid "Waiting for %d client(s) to finish"
7259
msgstr ""
7260
7261
#: bzrlib/smart/server.py:185
7262
#, python-format
7263
msgid "Still waiting for %d client(s) to finish"
7264
msgstr ""
7265
7266
#: bzrlib/smart/server.py:219
7267
#, python-format
7268
msgid "listening socket error: %s"
7269
msgstr ""
7270
7271
#: bzrlib/smart/server.py:452
7272
#, python-format
7273
msgid "listening on port: %s"
7274
msgstr ""
7275
7276
#: bzrlib/switch.py:73
7277
msgid "Pending merges must be committed or reverted before using switch."
7278
msgstr ""
7279
7280
#: bzrlib/switch.py:100
7281
msgid ""
7282
"Cannot switch as local commits found in the checkout. Commit these to the "
7283
"bound branch or use --force to throw them away."
7284
msgstr ""
7285
7286
#: bzrlib/switch.py:105
7287
#, python-format
7288
msgid ""
7289
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7290
"anyway, use --force."
7291
msgstr ""
7292
7293
#: bzrlib/switch.py:125
7294
msgid "Cannot switch a branch, only a checkout."
7295
msgstr ""
7296
7297
#: bzrlib/switch.py:163
7298
#, python-format
7299
msgid "Tree is up to date at revision %d."
7300
msgstr ""
7301
7302
#: bzrlib/switch.py:169
7303
#, python-format
7304
msgid "Updated to revision %d."
7305
msgstr ""
7306
7307
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7308
msgid "Apply phase"
7309
msgstr ""
7310
7311
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7312
msgid "removing file"
7313
msgstr ""
7314
7315
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7316
msgid "adding file"
7317
msgstr ""
7318
7319
#: bzrlib/transform.py:2591
7320
msgid "Building tree"
7321
msgstr ""
7322
7323
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7324
msgid "Adding file contents"
7325
msgstr ""
7326
7327
#: bzrlib/transform.py:3028
7328
msgid "Resolution pass"
7329
msgstr ""
7330
7331
#: bzrlib/transport/ftp/_gssapi.py:88
7332
#, python-format
7333
msgid "Authenticated as %s"
7334
msgstr ""
7335
7336
#: bzrlib/tree.py:634
7337
msgid "*** {0} content-filter: {1} => {2!r}"
7338
msgstr ""
7339
7340
#: bzrlib/upgrade.py:77
7341
#, python-format
7342
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7343
msgstr ""
7344
7345
#: bzrlib/upgrade.py:100
7346
#, python-format
7347
msgid "cannot upgrade from bzrdir format %s"
7348
msgstr ""
7349
7350
#: bzrlib/upgrade.py:103
7351
#, python-format
7352
msgid "starting upgrade of %s"
7353
msgstr ""
7354
7355
#: bzrlib/upgrade.py:110
7356
msgid "finished"
7357
msgstr ""
7358
7359
#: bzrlib/upgrade.py:120
7360
msgid "Deleting backup.bzr"
7361
msgstr ""
7362
7363
#: bzrlib/upgrade.py:151
7364
msgid ""
7365
"\n"
7366
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7367
msgstr ""
7368
7369
#: bzrlib/upgrade.py:208
7370
#, python-format
7371
msgid "Found %d dependent branches - upgrading ..."
7372
msgstr ""
7373
7374
#: bzrlib/upgrade.py:276
7375
msgid "Upgrading bzrdirs"
7376
msgstr ""
7377
7378
#: bzrlib/upgrade.py:282
7379
#, python-format
7380
msgid "Upgrading %s"
7381
msgstr ""
7382
7383
#: bzrlib/upgrade.py:283
7384
msgid "Upgrading {0} {1} ..."
7385
msgstr ""
7386
7387
#: bzrlib/upgrade.py:301
7388
msgid "Removing backup ..."
7389
msgstr ""
7390
7391
#: bzrlib/upgrade.py:305
7392
msgid "failed to clean-up {0}: {1}"
7393
msgstr ""
7394
7395
#: bzrlib/vf_repository.py:1090
7396
msgid "inventories"
7397
msgstr ""
7398
7399
#: bzrlib/vf_repository.py:1116
7400
msgid "texts"
7401
msgstr ""
7402
7403
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7404
msgid "Calculating text parents"
7405
msgstr ""
7406
7407
#: bzrlib/vf_repository.py:1706
7408
msgid "Fetch texts"
7409
msgstr ""
7410
7411
#: bzrlib/vf_repository.py:2535
7412
msgid "loading text store"
7413
msgstr ""
7414
7415
#: bzrlib/vf_repository.py:2541
7416
msgid "checking text graph"
7417
msgstr ""
7418
7419
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7420
#: bzrlib/vf_repository.py:3124
7421
msgid "Transferring revisions"
7422
msgstr ""
7423
7424
#: bzrlib/win32utils.py:146
7425
msgid "Failed to GetProcessMemoryInfo()"
7426
msgstr ""
7427
7428
#: bzrlib/win32utils.py:167
7429
msgid "Cannot debug memory on win32 without ctypes or win32process"
7430
msgstr ""
7431
7432
#: bzrlib/win32utils.py:172
7433
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7434
msgstr ""
7435
7436
#: bzrlib/win32utils.py:180
7437
#, python-format
7438
msgid "WorkingSize %8d KiB"
7439
msgstr ""
7440
7441
#: bzrlib/win32utils.py:181
7442
#, python-format
7443
msgid "PeakWorking %8d KiB"
7444
msgstr ""
7445
7446
#: bzrlib/win32utils.py:182
7447
#, python-format
7448
msgid "PagefileUsage %8d KiB"
7449
msgstr ""
7450
7451
#: bzrlib/win32utils.py:183
7452
#, python-format
7453
msgid "PeakPagefileUsage %8d KiB"
7454
msgstr ""
7455
7456
#: bzrlib/win32utils.py:185
7457
#, python-format
7458
msgid "PrivateUsage %8d KiB"
7459
msgstr ""
7460
7461
#: bzrlib/win32utils.py:186
7462
#, python-format
7463
msgid "PageFaultCount %8d"
7464
msgstr ""
7465
7466
#: bzrlib/workingtree.py:1478
7467
msgid "Rerun update after fixing the conflicts."
7468
msgstr ""
7469
7470
#: dummy/help_topics/authentication/summary.txt:1
7471
msgid "Information on configuring authentication"
7472
msgstr ""
7473
7474
#: dummy/help_topics/basic/detail.txt:1
7475
msgid ""
7476
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7477
"http://bazaar.canonical.com/"
7478
msgstr ""
7479
7480
#: dummy/help_topics/basic/detail.txt:4
7481
msgid ""
7482
"Basic commands:\n"
7483
" bzr init makes this directory a versioned branch\n"
7484
" bzr branch make a copy of another branch"
7485
msgstr ""
7486
7487
#: dummy/help_topics/basic/detail.txt:8
7488
msgid ""
7489
" bzr add make files or directories versioned\n"
7490
" bzr ignore ignore a file or pattern\n"
7491
" bzr mv move or rename a versioned file"
7492
msgstr ""
7493
7494
#: dummy/help_topics/basic/detail.txt:12
7495
msgid ""
7496
" bzr status summarize changes in working copy\n"
7497
" bzr diff show detailed diffs"
7498
msgstr ""
7499
7500
#: dummy/help_topics/basic/detail.txt:15
7501
msgid ""
7502
" bzr merge pull in changes from another branch\n"
7503
" bzr commit save some or all changes\n"
7504
" bzr send send changes via email"
7505
msgstr ""
7506
7507
#: dummy/help_topics/basic/detail.txt:19
7508
msgid ""
7509
" bzr log show history of changes\n"
7510
" bzr check validate storage"
7511
msgstr ""
7512
7513
#: dummy/help_topics/basic/detail.txt:22
7514
msgid ""
7515
" bzr help init more help on e.g. init command\n"
7516
" bzr help commands list all commands\n"
7517
" bzr help topics list all help topics\n"
7518
msgstr ""
7519
7520
#: dummy/help_topics/basic/summary.txt:1
7521
msgid "Basic commands"
7522
msgstr ""
7523
7524
#: dummy/help_topics/branches/detail.txt:1
7525
msgid "Branches"
7526
msgstr ""
7527
7528
#: dummy/help_topics/branches/detail.txt:3
7529
msgid ""
7530
"A branch consists of the state of a project, including all of its\n"
7531
"history. All branches have a repository associated (which is where the\n"
7532
"branch history is stored), but multiple branches may share the same\n"
7533
"repository (a shared repository). Branches can be copied and merged."
7534
msgstr ""
7535
7536
#: dummy/help_topics/branches/detail.txt:8
7537
msgid ""
7538
"In addition, one branch may be bound to another one. Binding to another\n"
7539
"branch indicates that commits which happen in this branch must also \n"
7540
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7541
"commits when the two branches are out of date. In order for a commit \n"
7542
"to succeed, it may be necessary to update the current branch using \n"
7543
"``bzr update``."
7544
msgstr ""
7545
7546
#: dummy/help_topics/branches/detail.txt:15
7547
#: dummy/help_topics/checkouts/detail.txt:66
7548
#: dummy/help_topics/repositories/detail.txt:36
7549
msgid "Related commands::"
7550
msgstr ""
7551
7552
#: dummy/help_topics/branches/detail.txt:17
7553
msgid ""
7554
" init Change a directory into a versioned branch.\n"
7555
" branch Create a new branch that is a copy of an existing branch.\n"
7556
" merge Perform a three-way merge.\n"
7557
" bind Bind a branch to another one.\n"
7558
msgstr ""
7559
7560
#: dummy/help_topics/branches/summary.txt:1
7561
msgid "Information on what a branch is"
7562
msgstr ""
7563
7564
#: dummy/help_topics/bugs/summary.txt:1
7565
msgid "Bug tracker settings"
7566
msgstr ""
7567
7568
#: dummy/help_topics/checkouts/detail.txt:1
7569
msgid "Checkouts"
7570
msgstr ""
7571
7572
#: dummy/help_topics/checkouts/detail.txt:3
7573
msgid ""
7574
"Checkouts are source trees that are connected to a branch, so that when\n"
7575
"you commit in the source tree, the commit goes into that branch. They\n"
7576
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7577
"Bazaar's decentralized features until you want them. Using checkouts\n"
7578
"with shared repositories is very similar to working with SVN or CVS, but\n"
7579
"doesn't have the same restrictions. And using checkouts still allows\n"
7580
"others working on the project to use whatever workflow they like."
7581
msgstr ""
7582
7583
#: dummy/help_topics/checkouts/detail.txt:11
7584
msgid ""
7585
"A checkout is created with the bzr checkout command (see \"help "
7586
"checkout\").\n"
7587
"You pass it a reference to another branch, and it will create a local copy\n"
7588
"for you that still contains a reference to the branch you created the\n"
7589
"checkout from (the master branch). Then if you make any commits they will "
7590
"be\n"
7591
"made on the other branch first. This creates an instant mirror of your work, "
7592
"or\n"
7593
"facilitates lockstep development, where each developer is working together,\n"
7594
"continuously integrating the changes of others."
7595
msgstr ""
7596
7597
#: dummy/help_topics/checkouts/detail.txt:19
7598
msgid ""
7599
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7600
"you have the full history locally. As you have a first class branch you "
7601
"can\n"
7602
"also commit locally if you want, for instance due to the temporary loss af "
7603
"a\n"
7604
"network connection. Use the --local option to commit to do this. All the "
7605
"local\n"
7606
"commits will then be made on the master branch the next time you do a non-"
7607
"local\n"
7608
"commit."
7609
msgstr ""
7610
7611
#: dummy/help_topics/checkouts/detail.txt:26
7612
msgid ""
7613
"If you are using a checkout from a shared branch you will periodically want "
7614
"to\n"
7615
"pull in all the changes made by others. This is done using the \"update\"\n"
7616
"command. The changes need to be applied before any non-local commit, but\n"
7617
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7618
"command when needed."
7619
msgstr ""
7620
7621
#: dummy/help_topics/checkouts/detail.txt:32
7622
msgid ""
7623
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7624
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7625
"SVN checkout in that it is not a first class branch, it mainly consists of "
7626
"the\n"
7627
"working tree. This means that any history operations must query the master\n"
7628
"branch, which could be slow if a network connection is involved. Also, as "
7629
"you\n"
7630
"don't have a local branch, then you cannot commit locally."
7631
msgstr ""
7632
7633
#: dummy/help_topics/checkouts/detail.txt:39
7634
msgid ""
7635
"Lightweight checkouts work best when you have fast reliable access to the\n"
7636
"master branch. This means that if the master branch is on the same disk or "
7637
"LAN\n"
7638
"a lightweight checkout will be faster than a heavyweight one for any "
7639
"commands\n"
7640
"that modify the revision history (as only one copy of the branch needs to\n"
7641
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7642
"that uses the history but does not change it, but if the master branch is "
7643
"on\n"
7644
"the same disk then there won't be a noticeable difference."
7645
msgstr ""
7646
7647
#: dummy/help_topics/checkouts/detail.txt:47
7648
msgid ""
7649
"Another possible use for a checkout is to use it with a treeless repository\n"
7650
"containing your branches, where you maintain only one working tree by\n"
7651
"switching the master branch that the checkout points to when you want to\n"
7652
"work on a different branch."
7653
msgstr ""
7654
7655
#: dummy/help_topics/checkouts/detail.txt:52
7656
msgid ""
7657
"Obviously to commit on a checkout you need to be able to write to the "
7658
"master\n"
7659
"branch. This means that the master branch must be accessible over a "
7660
"writeable\n"
7661
"protocol , such as sftp://, and that you have write permissions at the "
7662
"other\n"
7663
"end. Checkouts also work on the local file system, so that all that matters "
7664
"is\n"
7665
"file permissions."
7666
msgstr ""
7667
7668
#: dummy/help_topics/checkouts/detail.txt:58
7669
msgid ""
7670
"You can change the master of a checkout by using the \"switch\" command "
7671
"(see\n"
7672
"\"help switch\"). This will change the location that the commits are sent "
7673
"to.\n"
7674
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7675
"checkout. If you would like to convert your heavy checkout into a normal\n"
7676
"branch so that every commit is local, you can use the \"unbind\" command. To "
7677
"see\n"
7678
"whether or not a branch is bound or not you can use the \"info\" command. If "
7679
"the\n"
7680
"branch is bound it will tell you the location of the bound branch."
7681
msgstr ""
7682
7683
#: dummy/help_topics/checkouts/detail.txt:68
7684
msgid ""
7685
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7686
" checkout\n"
7687
" update Pull any changes in the master branch in to your checkout\n"
7688
" commit Make a commit that is sent to the master branch. If you have\n"
7689
" a heavy checkout then the --local option will commit to the\n"
7690
" checkout without sending the commit to the master\n"
7691
" switch Change the master branch that the commits in the checkout "
7692
"will\n"
7693
" be sent to\n"
7694
" bind Turn a standalone branch into a heavy checkout so that any\n"
7695
" commits will be sent to the master branch\n"
7696
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7697
" commits are only made locally\n"
7698
" info Displays whether a branch is bound or unbound. If the branch "
7699
"is\n"
7700
" bound, then it will also display the location of the bound "
7701
"branch\n"
7702
msgstr ""
7703
7704
#: dummy/help_topics/checkouts/summary.txt:1
7705
msgid "Information on what a checkout is"
7706
msgstr ""
7707
7708
#: dummy/help_topics/commands/summary.txt:1
7709
msgid "Basic help for all commands"
7710
msgstr ""
7711
7712
#: dummy/help_topics/configuration/summary.txt:1
7713
msgid "Details on the configuration settings available"
7714
msgstr ""
7715
7716
#: dummy/help_topics/conflict-types/summary.txt:1
7717
msgid "Types of conflicts and what to do about them"
7718
msgstr ""
7719
7720
#: dummy/help_topics/content-filters/summary.txt:1
7721
msgid "Conversion of content into/from working trees"
7722
msgstr ""
7723
7724
#: dummy/help_topics/criss-cross/detail.txt:1
7725
msgid "Criss-Cross"
7726
msgstr ""
7727
7728
#: dummy/help_topics/criss-cross/detail.txt:3
7729
msgid ""
7730
"A criss-cross in the branch history can cause the default merge technique\n"
7731
"to emit more conflicts than would normally be expected."
7732
msgstr ""
7733
7734
#: dummy/help_topics/criss-cross/detail.txt:6
7735
msgid ""
7736
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7737
"give\n"
7738
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7739
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7740
msgstr ""
7741
7742
#: dummy/help_topics/criss-cross/detail.txt:10
7743
msgid ""
7744
"Criss-crosses occur in a branch's history if two branches merge the same "
7745
"thing\n"
7746
"and then merge one another, or if two branches merge one another at the "
7747
"same\n"
7748
"time. They can be avoided by having each branch only merge from or into a\n"
7749
"designated central branch (a \"star topology\")."
7750
msgstr ""
7751
7752
#: dummy/help_topics/criss-cross/detail.txt:15
7753
msgid ""
7754
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7755
"default\n"
7756
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7757
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7758
"differences between THIS and OTHER are due to one side adding lines, or\n"
7759
"from another side removing lines."
7760
msgstr ""
7761
7762
#: dummy/help_topics/criss-cross/detail.txt:21
7763
msgid ""
7764
"Criss-crosses mean there is no good choice for a base. Selecting the "
7765
"recent\n"
7766
"merge points could cause one side's changes to be silently discarded.\n"
7767
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7768
"are emitted."
7769
msgstr ""
7770
7771
#: dummy/help_topics/criss-cross/detail.txt:26
7772
msgid ""
7773
"The ``weave`` merge type is not affected by this problem because it uses\n"
7774
"line-origin detection instead of a basis revision to determine the cause of\n"
7775
"differences.\n"
7776
msgstr ""
7777
7778
#: dummy/help_topics/criss-cross/summary.txt:1
7779
msgid "Information on criss-cross merging"
7780
msgstr ""
7781
7782
#: dummy/help_topics/current-formats/summary.txt:1
7783
msgid "Current storage formats"
7784
msgstr ""
7785
7786
#: dummy/help_topics/debug-flags/summary.txt:1
7787
msgid "Options to show or record debug information"
7788
msgstr ""
7789
7790
#: dummy/help_topics/diverged-branches/summary.txt:1
7791
msgid "How to fix diverged branches"
7792
msgstr ""
7793
7794
#: dummy/help_topics/env-variables/detail.txt:1
7795
msgid "Environment Variables"
7796
msgstr ""
7797
7798
#: dummy/help_topics/env-variables/detail.txt:3
7799
msgid ""
7800
"=================== "
7801
"===========================================================\n"
7802
"BZRPATH Path where bzr is to look for shell plugin external\n"
7803
" commands.\n"
7804
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7805
"EMAIL E-Mail address of the user.\n"
7806
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7807
"EDITOR Editor for editing commit messages.\n"
7808
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7809
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7810
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7811
"BZR_PLUGIN_PATH.\n"
7812
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7813
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7814
"and\n"
7815
" HOME.\n"
7816
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7817
"URLs).\n"
7818
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7819
"sshcorp,\n"
7820
" plink or lsh.\n"
7821
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7822
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7823
"BZR_COLUMNS Override implicit terminal width.\n"
7824
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7825
"(selftest)\n"
7826
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7827
"'text'.\n"
7828
"BZR_PDB Control whether to launch a debugger on error.\n"
7829
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7830
" breakin debugger.\n"
7831
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7832
"(instead\n"
7833
" of char-based).\n"
7834
"=================== "
7835
"===========================================================\n"
7836
msgstr ""
7837
7838
#: dummy/help_topics/env-variables/summary.txt:1
7839
msgid "Environment variable names and values"
7840
msgstr ""
7841
7842
#: dummy/help_topics/eol/summary.txt:1
7843
msgid "Information on end-of-line handling"
7844
msgstr ""
7845
7846
#: dummy/help_topics/files/detail.txt:1
7847
msgid "Files"
7848
msgstr ""
7849
7850
#: dummy/help_topics/files/detail.txt:3
7851
msgid ""
7852
":On Unix: ~/.bazaar/bazaar.conf\n"
7853
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7854
"bazaar\\\\2.0\\\\bazaar.conf"
7855
msgstr ""
7856
7857
#: dummy/help_topics/files/detail.txt:6
7858
msgid ""
7859
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7860
"used to define general configuration that will be applied everywhere.\n"
7861
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7862
"commonly used options."
7863
msgstr ""
7864
7865
#: dummy/help_topics/files/detail.txt:11
7866
msgid "A typical config file might look something like::"
7867
msgstr ""
7868
7869
#: dummy/help_topics/files/detail.txt:13
7870
msgid ""
7871
" [DEFAULT]\n"
7872
" email=John Doe <jdoe@isp.com>"
7873
msgstr ""
7874
7875
#: dummy/help_topics/files/detail.txt:16
7876
msgid ""
7877
" [ALIASES]\n"
7878
" commit = commit --strict\n"
7879
" log10 = log --short -r -10..-1\n"
7880
msgstr ""
7881
7882
#: dummy/help_topics/files/summary.txt:1
7883
msgid "Information on configuration and log files"
7884
msgstr ""
7885
7886
#: dummy/help_topics/formats/detail.txt:1
7887
msgid "Storage Formats"
7888
msgstr ""
7889
7890
#: dummy/help_topics/formats/detail.txt:3
7891
msgid ""
7892
"To ensure that older clients do not access data incorrectly,\n"
7893
"Bazaar's policy is to introduce a new storage format whenever\n"
7894
"new features requiring new metadata are added. New storage\n"
7895
"formats may also be introduced to improve performance and\n"
7896
"scalability."
7897
msgstr ""
7898
7899
#: dummy/help_topics/formats/detail.txt:9
7900
msgid ""
7901
"The newest format, 2a, is highly recommended. If your\n"
7902
"project is not using 2a, then you should suggest to the\n"
7903
"project owner to upgrade."
7904
msgstr ""
7905
7906
#: dummy/help_topics/formats/detail.txt:13
7907
msgid ""
7908
"\n"
7909
".. note::"
7910
msgstr ""
7911
7912
#: dummy/help_topics/formats/detail.txt:16
7913
msgid ""
7914
" Some of the older formats have two variants:\n"
7915
" a plain one and a rich-root one. The latter include an additional\n"
7916
" field about the root of the tree. There is no performance cost\n"
7917
" for using a rich-root format but you cannot easily merge changes\n"
7918
" from a rich-root format into a plain format. As a consequence,\n"
7919
" moving a project to a rich-root format takes some co-ordination\n"
7920
" in that all contributors need to upgrade their repositories\n"
7921
" around the same time. 2a and all future formats will be\n"
7922
" implicitly rich-root."
7923
msgstr ""
7924
7925
#: dummy/help_topics/formats/detail.txt:26
7926
msgid ""
7927
"See :doc:`current-formats-help` for the complete list of\n"
7928
"currently supported formats. See :doc:`other-formats-help` for\n"
7929
"descriptions of any available experimental and deprecated formats.\n"
7930
msgstr ""
7931
7932
#: dummy/help_topics/formats/summary.txt:1
7933
msgid "Information on choosing a storage format"
7934
msgstr ""
7935
7936
#: dummy/help_topics/global-options/detail.txt:1
7937
msgid "Global Options"
7938
msgstr ""
7939
7940
#: dummy/help_topics/global-options/detail.txt:3
7941
msgid ""
7942
"These options may be used with any command, and may appear in front of any\n"
7943
"command. (e.g. ``bzr --profile help``)."
7944
msgstr ""
7945
7946
#: dummy/help_topics/global-options/detail.txt:6
7947
msgid ""
7948
"--version Print the version number. Must be supplied before the "
7949
"command.\n"
7950
"--no-aliases Do not process command aliases when running this command.\n"
7951
"--builtin Use the built-in version of a command, not the plugin "
7952
"version.\n"
7953
" This does not suppress other plugin effects.\n"
7954
"--no-plugins Do not process any plugins.\n"
7955
"--no-l10n Do not translate messages.\n"
7956
"--concurrency Number of processes that can be run concurrently (selftest)."
7957
msgstr ""
7958
7959
#: dummy/help_topics/global-options/detail.txt:14
7960
msgid ""
7961
"--profile Profile execution using the hotshot profiler.\n"
7962
"--lsprof Profile execution using the lsprof profiler.\n"
7963
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7964
" results to a specified file. If the filename ends with "
7965
"\".txt\",\n"
7966
" text format will be used. If the filename either starts "
7967
"with\n"
7968
" \"callgrind.out\" or end with \".callgrind\", the output will "
7969
"be\n"
7970
" formatted for use with KCacheGrind. Otherwise, the output\n"
7971
" will be a pickle.\n"
7972
"--coverage Generate line coverage report in the specified directory."
7973
msgstr ""
7974
7975
#: dummy/help_topics/global-options/detail.txt:24
7976
msgid ""
7977
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7978
"for\n"
7979
" the duration of the command. This can be used multiple times "
7980
"if\n"
7981
" several options need to be overridden."
7982
msgstr ""
7983
7984
#: dummy/help_topics/global-options/detail.txt:28
7985
msgid ""
7986
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7987
"information on profiling."
7988
msgstr ""
7989
7990
#: dummy/help_topics/global-options/detail.txt:31
7991
msgid ""
7992
"A number of debug flags are also available to assist troubleshooting and\n"
7993
"development. See :doc:`debug-flags-help`.\n"
7994
msgstr ""
7995
7996
#: dummy/help_topics/global-options/summary.txt:1
7997
msgid "Options that control how Bazaar runs"
7998
msgstr ""
7999
8000
#: dummy/help_topics/hidden-commands/summary.txt:1
8001
msgid "All hidden commands"
8002
msgstr ""
8003
8004
#: dummy/help_topics/hooks/summary.txt:1
8005
msgid "Points at which custom processing can be added"
8006
msgstr ""
8007
8008
#: dummy/help_topics/launchpad/detail.txt:1
8009
msgid "Integration with Launchpad.net"
8010
msgstr ""
8011
8012
#: dummy/help_topics/launchpad/detail.txt:3
8013
msgid ""
8014
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8015
"specification tracking."
8016
msgstr ""
8017
8018
#: dummy/help_topics/launchpad/detail.txt:6
8019
msgid ""
8020
"The bzr client (through the plugin called 'launchpad') has special\n"
8021
"features to communicate with Launchpad:"
8022
msgstr ""
8023
8024
#: dummy/help_topics/launchpad/detail.txt:9
8025
msgid ""
8026
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8027
"This\n"
8028
" is then used by the 'lp:' transport to download your branches using\n"
8029
" bzr+ssh://."
8030
msgstr ""
8031
8032
#: dummy/help_topics/launchpad/detail.txt:13
8033
msgid ""
8034
" * The 'lp:' transport uses Launchpad as a directory service: for "
8035
"example\n"
8036
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8037
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8038
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8039
msgstr ""
8040
8041
#: dummy/help_topics/launchpad/detail.txt:18
8042
msgid ""
8043
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8044
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8045
"lp:12345'\n"
8046
" will record a revision property that marks that revision as fixing\n"
8047
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8048
" automatically be linked to the bug report."
8049
msgstr ""
8050
8051
#: dummy/help_topics/launchpad/detail.txt:24
8052
msgid ""
8053
" * The register-branch command tells Launchpad about the url of a\n"
8054
" public branch. Launchpad will then mirror the branch, display\n"
8055
" its contents and allow it to be attached to bugs and other\n"
8056
" objects."
8057
msgstr ""
8058
8059
#: dummy/help_topics/launchpad/detail.txt:29
8060
msgid "For more information see http://help.launchpad.net/\n"
8061
msgstr ""
8062
8063
#: dummy/help_topics/launchpad/summary.txt:1
8064
msgid "Using Bazaar with Launchpad.net"
8065
msgstr ""
8066
8067
#: dummy/help_topics/location-alias/summary.txt:1
8068
msgid "Aliases for remembered locations"
8069
msgstr ""
8070
8071
#: dummy/help_topics/log-formats/summary.txt:1
8072
msgid "Details on the logging formats available"
8073
msgstr ""
8074
8075
#: dummy/help_topics/other-formats/summary.txt:1
8076
msgid "Experimental and deprecated storage formats"
8077
msgstr ""
8078
8079
#: dummy/help_topics/patterns/summary.txt:1
8080
msgid "Information on the pattern syntax"
8081
msgstr ""
8082
8083
#: dummy/help_topics/repositories/detail.txt:1
8084
msgid "Repositories"
8085
msgstr ""
8086
8087
#: dummy/help_topics/repositories/detail.txt:3
8088
msgid ""
8089
"Repositories in Bazaar are where committed information is stored. There is\n"
8090
"a repository associated with every branch."
8091
msgstr ""
8092
8093
#: dummy/help_topics/repositories/detail.txt:6
8094
msgid ""
8095
"Repositories are a form of database. Bzr will usually maintain this for\n"
8096
"good performance automatically, but in some situations (e.g. when doing\n"
8097
"very many commits in a short time period) you may want to ask bzr to\n"
8098
"optimise the database indices. This can be done by the 'bzr pack' command."
8099
msgstr ""
8100
8101
#: dummy/help_topics/repositories/detail.txt:11
8102
msgid ""
8103
"By default just running 'bzr init' will create a repository within the new\n"
8104
"branch but it is possible to create a shared repository which allows "
8105
"multiple\n"
8106
"branches to share their information in the same location. When a new branch "
8107
"is\n"
8108
"created it will first look to see if there is a containing shared repository "
8109
"it\n"
8110
"can use."
8111
msgstr ""
8112
8113
#: dummy/help_topics/repositories/detail.txt:17
8114
msgid ""
8115
"When two branches of the same project share a repository, there is\n"
8116
"generally a large space saving. For some operations (e.g. branching\n"
8117
"within the repository) this translates in to a large time saving."
8118
msgstr ""
8119
8120
#: dummy/help_topics/repositories/detail.txt:21
8121
msgid ""
8122
"To create a shared repository use the init-repository command (or the alias\n"
8123
"init-repo). This command takes the location of the repository to create. "
8124
"This\n"
8125
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8126
"which contains a shared repository. Any new branches that are created in "
8127
"this\n"
8128
"directory will then use it for storage."
8129
msgstr ""
8130
8131
#: dummy/help_topics/repositories/detail.txt:27
8132
msgid ""
8133
"It is a good idea to create a repository whenever you might create more\n"
8134
"than one branch of a project. This is true for both working areas where you\n"
8135
"are doing the development, and any server areas that you use for hosting\n"
8136
"projects. In the latter case, it is common to want branches without working\n"
8137
"trees. Since the files in the branch will not be edited directly there is "
8138
"no\n"
8139
"need to use up disk space for a working tree. To create a repository in "
8140
"which\n"
8141
"the branches will not have working trees pass the '--no-trees' option to\n"
8142
"'init-repository'."
8143
msgstr ""
8144
8145
#: dummy/help_topics/repositories/detail.txt:38
8146
msgid ""
8147
" init-repository Create a shared repository. Use --no-trees to create "
8148
"one\n"
8149
" in which new branches won't get a working tree.\n"
8150
msgstr ""
8151
8152
#: dummy/help_topics/repositories/summary.txt:1
8153
msgid "Basic information on shared repositories."
8154
msgstr ""
8155
8156
#: dummy/help_topics/revisionspec/summary.txt:1
8157
msgid "Explain how to use --revision"
8158
msgstr ""
8159
8160
#: dummy/help_topics/rules/summary.txt:1
8161
msgid "Information on defining rule-based preferences"
8162
msgstr ""
8163
8164
#: dummy/help_topics/standalone-trees/detail.txt:1
8165
msgid "Standalone Trees"
8166
msgstr ""
8167
8168
#: dummy/help_topics/standalone-trees/detail.txt:3
8169
msgid ""
8170
"A standalone tree is a working tree with an associated repository. It\n"
8171
"is an independently usable branch, with no dependencies on any other.\n"
8172
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8173
"an existing project under version control."
8174
msgstr ""
8175
8176
#: dummy/help_topics/standalone-trees/detail.txt:8
8177
msgid "Related Commands::"
8178
msgstr ""
8179
8180
#: dummy/help_topics/standalone-trees/detail.txt:10
8181
msgid " init Make a directory into a versioned branch.\n"
8182
msgstr ""
8183
8184
#: dummy/help_topics/standalone-trees/summary.txt:1
8185
msgid "Information on what a standalone tree is"
8186
msgstr ""
8187
8188
#: dummy/help_topics/standard-options/detail.txt:1
8189
msgid "Standard Options"
8190
msgstr ""
8191
8192
#: dummy/help_topics/standard-options/detail.txt:3
8193
msgid "Standard options are legal for all commands."
8194
msgstr ""
8195
8196
#: dummy/help_topics/standard-options/detail.txt:5
8197
msgid ""
8198
"--help, -h Show help message.\n"
8199
"--verbose, -v Display more information.\n"
8200
"--quiet, -q Only display errors and warnings."
8201
msgstr ""
8202
8203
#: dummy/help_topics/standard-options/detail.txt:9
8204
msgid "Unlike global options, standard options can be used in aliases.\n"
8205
msgstr ""
8206
8207
#: dummy/help_topics/standard-options/summary.txt:1
8208
msgid "Options that can be used with any command"
8209
msgstr ""
8210
8211
#: dummy/help_topics/status-flags/detail.txt:1
8212
msgid "Status Flags"
8213
msgstr ""
8214
8215
#: dummy/help_topics/status-flags/detail.txt:3
8216
msgid ""
8217
"Status flags are used to summarise changes to the working tree in a concise\n"
8218
"manner. They are in the form::"
8219
msgstr ""
8220
8221
#: dummy/help_topics/status-flags/detail.txt:6
8222
msgid " xxx <filename>"
8223
msgstr ""
8224
8225
#: dummy/help_topics/status-flags/detail.txt:8
8226
msgid "where the columns' meanings are as follows."
8227
msgstr ""
8228
8229
#: dummy/help_topics/status-flags/detail.txt:10
8230
msgid "Column 1 - versioning/renames::"
8231
msgstr ""
8232
8233
#: dummy/help_topics/status-flags/detail.txt:12
8234
msgid ""
8235
" + File versioned\n"
8236
" - File unversioned\n"
8237
" R File renamed\n"
8238
" ? File unknown\n"
8239
" X File nonexistent (and unknown to bzr)\n"
8240
" C File has conflicts\n"
8241
" P Entry for a pending merge (not a file)"
8242
msgstr ""
8243
8244
#: dummy/help_topics/status-flags/detail.txt:20
8245
msgid "Column 2 - contents::"
8246
msgstr ""
8247
8248
#: dummy/help_topics/status-flags/detail.txt:22
8249
msgid ""
8250
" N File created\n"
8251
" D File deleted\n"
8252
" K File kind changed\n"
8253
" M File modified"
8254
msgstr ""
8255
8256
#: dummy/help_topics/status-flags/detail.txt:27
8257
msgid "Column 3 - execute::"
8258
msgstr ""
8259
8260
#: dummy/help_topics/status-flags/detail.txt:29
8261
msgid " * The execute bit was changed\n"
8262
msgstr ""
8263
8264
#: dummy/help_topics/status-flags/summary.txt:1
8265
msgid "Help on status flags"
8266
msgstr ""
8267
8268
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8269
msgid "Branches Out of Sync"
8270
msgstr ""
8271
8272
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8273
msgid ""
8274
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8275
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8276
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8277
"have the same last revision as the new reference branch for the lightweight\n"
8278
"checkout, data could be lost, so Bazaar refuses."
8279
msgstr ""
8280
8281
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8282
msgid "How you deal with this depends on *why* the branches are out of sync."
8283
msgstr ""
8284
8285
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8286
msgid ""
8287
"If you have a checkout and have done local commits, you can get back in "
8288
"sync\n"
8289
"by running \"bzr update\" (and possibly \"bzr commit\")."
8290
msgstr ""
8291
8292
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8293
msgid ""
8294
"If you have a branch and the remote branch is out-of-date, you can push\n"
8295
"the local changes using \"bzr push\". If the local branch is out of date, "
8296
"you\n"
8297
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8298
"commit\n"
8299
"and then push your changes. If you decide that some of the changes aren't\n"
8300
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8301
msgstr ""
8302
8303
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8304
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8305
msgstr ""
8306
8307
#: dummy/help_topics/topics/summary.txt:1
8308
msgid "Topics list"
8309
msgstr ""
8310
8311
#: dummy/help_topics/url-special-chars/summary.txt:1
8312
msgid "Special character handling in URLs"
8313
msgstr ""
8314
8315
#: dummy/help_topics/urlspec/summary.txt:1
8316
msgid "Supported transport protocols"
8317
msgstr ""
8318
8319
#: dummy/help_topics/working-trees/detail.txt:1
8320
msgid "Working Trees"
8321
msgstr ""
8322
8323
#: dummy/help_topics/working-trees/detail.txt:3
8324
msgid ""
8325
"A working tree is the contents of a branch placed on disk so that you can\n"
8326
"see the files and edit them. The working tree is where you make changes to "
8327
"a\n"
8328
"branch, and when you commit the current state of the working tree is the\n"
8329
"snapshot that is recorded in the commit."
8330
msgstr ""
8331
8332
#: dummy/help_topics/working-trees/detail.txt:8
8333
msgid ""
8334
"When you push a branch to a remote system, a working tree will not be\n"
8335
"created. If one is already present the files will not be updated. The\n"
8336
"branch information will be updated and the working tree will be marked\n"
8337
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8338
"may be uncommitted changes or the update may cause content conflicts that "
8339
"are\n"
8340
"difficult to deal with remotely."
8341
msgstr ""
8342
8343
#: dummy/help_topics/working-trees/detail.txt:15
8344
msgid ""
8345
"If you have a branch with no working tree you can use the 'checkout' "
8346
"command\n"
8347
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8348
"will\n"
8349
"create the working tree. If the branch is updated remotely, you can update "
8350
"the\n"
8351
"working tree by running 'bzr update' in that directory."
8352
msgstr ""
8353
8354
#: dummy/help_topics/working-trees/detail.txt:20
8355
msgid ""
8356
"If you have a branch with a working tree that you do not want the 'remove-"
8357
"tree'\n"
8358
"command will remove the tree if it is safe. This can be done to avoid the\n"
8359
"warning about the remote working tree not being updated when pushing to the\n"
8360
"branch. It can also be useful when working with a '--no-trees' repository\n"
8361
"(see 'bzr help repositories')."
8362
msgstr ""
8363
8364
#: dummy/help_topics/working-trees/detail.txt:26
8365
msgid ""
8366
"If you want to have a working tree on a remote machine that you push to you\n"
8367
"can either run 'bzr update' in the remote branch after each push, or use "
8368
"some\n"
8369
"other method to update the tree during the push. There is an 'rspush' "
8370
"plugin\n"
8371
"that will update the working tree using rsync as well as doing a push. "
8372
"There\n"
8373
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8374
"SSH\n"
8375
"after each push."
8376
msgstr ""
8377
8378
#: dummy/help_topics/working-trees/detail.txt:33
8379
msgid "Useful commands::"
8380
msgstr ""
8381
8382
#: dummy/help_topics/working-trees/detail.txt:35
8383
msgid ""
8384
" checkout Create a working tree when a branch does not have one.\n"
8385
" remove-tree Removes the working tree from a branch when it is safe to do "
8386
"so.\n"
8387
" update When a working tree is out of sync with its associated "
8388
"branch\n"
8389
" this will update the tree to match the branch.\n"
8390
msgstr ""
8391
8392
#: dummy/help_topics/working-trees/summary.txt:1
8393
msgid "Information on working trees"
8394
msgstr ""
8395
8396
#: en/help_topics/authentication.txt:1
8397
msgid ""
8398
"Authentication Settings\n"
8399
"======================="
8400
msgstr ""
8401
8402
#: en/help_topics/authentication.txt:4
8403
msgid ""
8404
"\n"
8405
"Intent\n"
8406
"------"
8407
msgstr ""
8408
8409
#: en/help_topics/authentication.txt:8
8410
msgid ""
8411
"Many different authentication policies can be described in the\n"
8412
"``authentication.conf`` file but a particular user should need only a few\n"
8413
"definitions to cover his needs without having to specify a user and a "
8414
"password\n"
8415
"for every branch he uses."
8416
msgstr ""
8417
8418
#: en/help_topics/authentication.txt:13
8419
msgid ""
8420
"The definitions found in this file are used to find the credentials to use "
8421
"for\n"
8422
"a given url. The same credentials can generally be used for as many branches "
8423
"as\n"
8424
"possible by grouping their declaration around the remote servers that need\n"
8425
"them. It's even possible to declare credentials that will be used by "
8426
"different\n"
8427
"servers."
8428
msgstr ""
8429
8430
#: en/help_topics/authentication.txt:19
8431
msgid ""
8432
"The intent is to make this file as small as possible to minimize maintenance."
8433
msgstr ""
8434
8435
#: en/help_topics/authentication.txt:21
8436
msgid ""
8437
"Once the relevant credentials are declared in this file you may use branch "
8438
"urls\n"
8439
"without embedding passwords (security hazard) or even users (enabling "
8440
"sharing\n"
8441
"of your urls with others)."
8442
msgstr ""
8443
8444
#: en/help_topics/authentication.txt:25
8445
msgid "Instead of using::"
8446
msgstr ""
8447
8448
#: en/help_topics/authentication.txt:27
8449
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8450
msgstr ""
8451
8452
#: en/help_topics/authentication.txt:29
8453
msgid "you simply use::"
8454
msgstr ""
8455
8456
#: en/help_topics/authentication.txt:31
8457
msgid " bzr branch ftp://host.com/path/to/my/branch"
8458
msgstr ""
8459
8460
#: en/help_topics/authentication.txt:33
8461
msgid ""
8462
"provided you have created the following ``authentication.conf`` file::"
8463
msgstr ""
8464
8465
#: en/help_topics/authentication.txt:35
8466
msgid ""
8467
" [myprojects]\n"
8468
" scheme=ftp\n"
8469
" host=host.com\n"
8470
" user=joe\n"
8471
" password=secret\n"
8472
" "
8473
msgstr ""
8474
8475
#: en/help_topics/authentication.txt:42
8476
msgid ""
8477
"Authentication definitions\n"
8478
"--------------------------"
8479
msgstr ""
8480
8481
#: en/help_topics/authentication.txt:45
8482
msgid ""
8483
"There are two kinds of authentication used by the various schemes supported "
8484
"by\n"
8485
"bzr:"
8486
msgstr ""
8487
8488
#: en/help_topics/authentication.txt:48
8489
msgid "1. user and password"
8490
msgstr ""
8491
8492
#: en/help_topics/authentication.txt:50
8493
msgid ""
8494
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8495
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8496
"ssh agents are a better, more secure solution. So we have chosen to not "
8497
"provide\n"
8498
"our own less secure method."
8499
msgstr ""
8500
8501
#: en/help_topics/authentication.txt:55
8502
msgid "2. user, realm and password"
8503
msgstr ""
8504
8505
#: en/help_topics/authentication.txt:57
8506
msgid ""
8507
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8508
"against a host. But, by using ``.htaccess`` files, for example, it is "
8509
"possible\n"
8510
"to define several (``user, realm, password``) for a given ``host``. So what "
8511
"is\n"
8512
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8513
"is\n"
8514
"not taken into account in the definitions, but will displayed if bzr "
8515
"prompts\n"
8516
"you for a password."
8517
msgstr ""
8518
8519
#: en/help_topics/authentication.txt:64
8520
msgid ""
8521
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8522
"specifying the appropriate port."
8523
msgstr ""
8524
8525
#: en/help_topics/authentication.txt:67
8526
msgid ""
8527
"To take all schemes into account, the password will be deduced from a set "
8528
"of\n"
8529
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8530
"``user``,\n"
8531
"``password``)."
8532
msgstr ""
8533
8534
#: en/help_topics/authentication.txt:71
8535
msgid ""
8536
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8537
"used\n"
8538
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8539
"``ssh``\n"
8540
" should be used instead since this is the real scheme regarding\n"
8541
" authentication,"
8542
msgstr ""
8543
8544
#: en/help_topics/authentication.txt:76
8545
msgid " * ``host``: can be empty (to act as a default for any host),"
8546
msgstr ""
8547
8548
#: en/help_topics/authentication.txt:78
8549
msgid ""
8550
" * ``port`` can be empty (useful when an host provides several servers for "
8551
"the\n"
8552
" same scheme), only numerical values are allowed, this should be used "
8553
"only\n"
8554
" when the server uses a port different than the scheme standard port,"
8555
msgstr ""
8556
8557
#: en/help_topics/authentication.txt:82
8558
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8559
msgstr ""
8560
8561
#: en/help_topics/authentication.txt:84
8562
msgid ""
8563
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8564
" ``getpass.get_user()``),"
8565
msgstr ""
8566
8567
#: en/help_topics/authentication.txt:87
8568
msgid ""
8569
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8570
" password."
8571
msgstr ""
8572
8573
#: en/help_topics/authentication.txt:90
8574
msgid ""
8575
"Multiple definitions can be provided and, for a given URL, bzr will select "
8576
"a\n"
8577
"(``user`` [, ``password``]) based on the following rules :"
8578
msgstr ""
8579
8580
#: en/help_topics/authentication.txt:93
8581
msgid " 1. the first match wins,"
8582
msgstr ""
8583
8584
#: en/help_topics/authentication.txt:95
8585
msgid " 2. empty fields match everything,"
8586
msgstr ""
8587
8588
#: en/help_topics/authentication.txt:97
8589
msgid ""
8590
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8591
msgstr ""
8592
8593
#: en/help_topics/authentication.txt:99
8594
msgid ""
8595
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8596
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8597
"``projectbzr.sf.net``\n"
8598
" will not match ``bzr.sf.net``)."
8599
msgstr ""
8600
8601
#: en/help_topics/authentication.txt:103
8602
msgid ""
8603
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8604
msgstr ""
8605
8606
#: en/help_topics/authentication.txt:105
8607
msgid ""
8608
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8609
"above,\n"
8610
" empty paths will match any provided path)."
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:110
8614
msgid ""
8615
"File format\n"
8616
"-----------"
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:113
8620
msgid ""
8621
"The general rules for :doc:`configuration files <configuration-help>`\n"
8622
"apply except for the variable policies."
8623
msgstr ""
8624
8625
#: en/help_topics/authentication.txt:116
8626
msgid "Each section describes an authentication definition."
8627
msgstr ""
8628
8629
#: en/help_topics/authentication.txt:118
8630
msgid ""
8631
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8632
"reserved\n"
8633
"and should appear as the *last* section."
8634
msgstr ""
8635
8636
#: en/help_topics/authentication.txt:121
8637
msgid "Each section should define:"
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:123
8641
msgid "* ``user``: the login to be used,"
8642
msgstr ""
8643
8644
#: en/help_topics/authentication.txt:125
8645
msgid "Each section could define:"
8646
msgstr ""
8647
8648
#: en/help_topics/authentication.txt:127
8649
msgid "* ``host``: the remote server,"
8650
msgstr ""
8651
8652
#: en/help_topics/authentication.txt:129
8653
msgid "* ``port``: the port the server is listening,"
8654
msgstr ""
8655
8656
#: en/help_topics/authentication.txt:131
8657
msgid "* ``path``: the branch location,"
8658
msgstr ""
8659
8660
#: en/help_topics/authentication.txt:133
8661
msgid "* ``password``: the password."
8662
msgstr ""
8663
8664
#: en/help_topics/authentication.txt:135
8665
msgid ""
8666
"\n"
8667
"Examples\n"
8668
"--------"
8669
msgstr ""
8670
8671
#: en/help_topics/authentication.txt:139
8672
msgid ""
8673
"\n"
8674
"Personal projects hosted outside\n"
8675
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8676
msgstr ""
8677
8678
#: en/help_topics/authentication.txt:143
8679
msgid ""
8680
"All connections are done with the same ``user`` (the remote one for which "
8681
"the\n"
8682
"default bzr one is not appropriate) and the password is always prompted "
8683
"with\n"
8684
"some exceptions::"
8685
msgstr ""
8686
8687
#: en/help_topics/authentication.txt:147
8688
msgid ""
8689
" # Pet projects on hobby.net\n"
8690
" [hobby]\n"
8691
" host=r.hobby.net\n"
8692
" user=jim\n"
8693
" password=obvious1234\n"
8694
" \n"
8695
" # Home server\n"
8696
" [home]\n"
8697
" scheme=https\n"
8698
" host=home.net\n"
8699
" user=joe\n"
8700
" password=1essobV10us\n"
8701
" \n"
8702
" [DEFAULT]\n"
8703
" # Our local user is barbaz, on all remote sites we're known as "
8704
"foobar\n"
8705
" user=foobar"
8706
msgstr ""
8707
8708
#: en/help_topics/authentication.txt:164
8709
msgid ""
8710
"\n"
8711
"Source hosting provider\n"
8712
"~~~~~~~~~~~~~~~~~~~~~~~"
8713
msgstr ""
8714
8715
#: en/help_topics/authentication.txt:168
8716
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8717
msgstr ""
8718
8719
#: en/help_topics/authentication.txt:170
8720
msgid ""
8721
" [shpnet domain]\n"
8722
" # we use sftp, but ssh is the scheme used for authentication\n"
8723
" scheme=ssh\n"
8724
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8725
" host=.shp.net\n"
8726
" user=joe\n"
8727
" # bzr don't support supplying a password for sftp,\n"
8728
" # consider using an ssh agent if you don't want to supply\n"
8729
" # a password interactively. (pageant, ssh-agent, etc)"
8730
msgstr ""
8731
8732
#: en/help_topics/authentication.txt:180
8733
msgid ""
8734
"HTTPS, SFTP servers and their proxy\n"
8735
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8736
msgstr ""
8737
8738
#: en/help_topics/authentication.txt:183
8739
msgid ""
8740
"At company.com, the server hosting release and integration branches is "
8741
"behind a\n"
8742
"proxy, and the two branches use different authentication policies::"
8743
msgstr ""
8744
8745
#: en/help_topics/authentication.txt:186
8746
msgid ""
8747
" [reference code]\n"
8748
" scheme=https\n"
8749
" host=dev.company.com\n"
8750
" path=/dev\n"
8751
" user=user1\n"
8752
" password=pass1"
8753
msgstr ""
8754
8755
#: en/help_topics/authentication.txt:193
8756
msgid ""
8757
" # development branches on dev server\n"
8758
" [dev]\n"
8759
" scheme=ssh # bzr+ssh and sftp are available here\n"
8760
" host=dev.company.com\n"
8761
" path=/dev/integration\n"
8762
" user=user2\n"
8763
" \n"
8764
" # proxy\n"
8765
" [proxy]\n"
8766
" scheme=http\n"
8767
" host=proxy.company.com\n"
8768
" port=3128\n"
8769
" user=proxyuser1\n"
8770
" password=proxypass1"
8771
msgstr ""
8772
8773
#: en/help_topics/authentication.txt:208
8774
msgid ""
8775
"\n"
8776
"Planned enhancements\n"
8777
"--------------------"
8778
msgstr ""
8779
8780
#: en/help_topics/authentication.txt:212
8781
msgid ""
8782
"The following are not yet implemented but planned as parts of a work in\n"
8783
"progress:"
8784
msgstr ""
8785
8786
#: en/help_topics/authentication.txt:215
8787
msgid "* add a ``password_encoding`` field allowing:"
8788
msgstr ""
8789
8790
#: en/help_topics/authentication.txt:217
8791
msgid ""
8792
" - storing the passwords in various obfuscating encodings (base64 for one),"
8793
msgstr ""
8794
8795
#: en/help_topics/authentication.txt:219
8796
msgid " - delegate password storage to plugins (.netrc for example)."
8797
msgstr ""
8798
8799
#: en/help_topics/authentication.txt:221
8800
msgid ""
8801
"* update the credentials when the user is prompted for user or password,"
8802
msgstr ""
8803
8804
#: en/help_topics/authentication.txt:223
8805
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8806
msgstr ""
8807
8808
#: en/help_topics/authentication.txt:225
8809
msgid ""
8810
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8811
"but\n"
8812
"ignored in the actual implementation.\n"
8813
msgstr ""
8814
8815
#: en/help_topics/bugs.txt:1
8816
msgid "Bug Tracker Settings"
8817
msgstr ""
8818
8819
#: en/help_topics/bugs.txt:3
8820
msgid ""
8821
"When making a commit, metadata about bugs fixed by that change can be\n"
8822
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8823
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8824
"(The only ``status`` value currently supported is ``fixed.``)"
8825
msgstr ""
8826
8827
#: en/help_topics/bugs.txt:8
8828
msgid ""
8829
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8830
"identifier\n"
8831
"rather than a full URL. This looks like::"
8832
msgstr ""
8833
8834
#: en/help_topics/bugs.txt:11
8835
msgid " bzr commit --fixes <tracker>:<id>"
8836
msgstr ""
8837
8838
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8839
msgid "or::"
8840
msgstr ""
8841
8842
#: en/help_topics/bugs.txt:15
8843
msgid " bzr commit --fixes <id>"
8844
msgstr ""
8845
8846
#: en/help_topics/bugs.txt:17
8847
msgid ""
8848
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8849
"the\n"
8850
"identifier for that bug within the bugtracker, usually the bug number.\n"
8851
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8852
"or global configuration is used."
8853
msgstr ""
8854
8855
#: en/help_topics/bugs.txt:22
8856
msgid ""
8857
"Bazaar knows about a few bug trackers that have many users. If\n"
8858
"you use one of these bug trackers then there is no setup required to\n"
8859
"use this feature, you just need to know the tracker identifier to use.\n"
8860
"These are the bugtrackers that are built in:"
8861
msgstr ""
8862
8863
#: en/help_topics/bugs.txt:27
8864
msgid ""
8865
" ============================ ============ ============\n"
8866
" URL Abbreviation Example\n"
8867
" ============================ ============ ============\n"
8868
" https://bugs.launchpad.net/ lp lp:12345\n"
8869
" http://bugs.debian.org/ deb deb:12345\n"
8870
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8871
" ============================ ============ ============"
8872
msgstr ""
8873
8874
#: en/help_topics/bugs.txt:35
8875
msgid ""
8876
"For the bug trackers not listed above configuration is required.\n"
8877
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8878
"is built in, along with a template mechanism for other bugtrackers with\n"
8879
"simple URL schemes. If your bug tracker can't be described by one\n"
8880
"of the schemes described below then you can write a plugin to support\n"
8881
"it."
8882
msgstr ""
8883
8884
#: en/help_topics/bugs.txt:42
8885
msgid ""
8886
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8887
"variable which contains the base URL of the bug tracker. These options\n"
8888
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8889
"configuration section in ``locations.conf``. You can set up these values\n"
8890
"for each of the projects you work on."
8891
msgstr ""
8892
8893
#: en/help_topics/bugs.txt:48
8894
msgid ""
8895
"Note: As you provide a short name for each tracker, you can specify one or\n"
8896
"more bugs in one or more trackers at commit time if you wish."
8897
msgstr ""
8898
8899
#: en/help_topics/bugs.txt:51
8900
msgid ""
8901
"Launchpad\n"
8902
"---------"
8903
msgstr ""
8904
8905
#: en/help_topics/bugs.txt:54
8906
msgid ""
8907
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8908
msgstr ""
8909
8910
#: en/help_topics/bugs.txt:56
8911
msgid ""
8912
"bugzilla_<tracker>_url\n"
8913
"----------------------"
8914
msgstr ""
8915
8916
#: en/help_topics/bugs.txt:59
8917
msgid ""
8918
"If present, the location of the Bugzilla bug tracker referred to by\n"
8919
"<tracker>. This option can then be used together with ``bzr commit\n"
8920
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8921
"example::"
8922
msgstr ""
8923
8924
#: en/help_topics/bugs.txt:64
8925
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:66
8929
msgid ""
8930
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8931
"fixed."
8932
msgstr ""
8933
8934
#: en/help_topics/bugs.txt:69
8935
msgid ""
8936
"trac_<tracker>_url\n"
8937
"------------------"
8938
msgstr ""
8939
8940
#: en/help_topics/bugs.txt:72
8941
msgid ""
8942
"If present, the location of the Trac instance referred to by\n"
8943
"<tracker>. This option can then be used together with ``bzr commit\n"
8944
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8945
"example::"
8946
msgstr ""
8947
8948
#: en/help_topics/bugs.txt:77
8949
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8950
msgstr ""
8951
8952
#: en/help_topics/bugs.txt:79
8953
msgid ""
8954
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8955
"as\n"
8956
"fixed."
8957
msgstr ""
8958
8959
#: en/help_topics/bugs.txt:82
8960
msgid ""
8961
"bugtracker_<tracker>_url\n"
8962
"------------------------"
8963
msgstr ""
8964
8965
#: en/help_topics/bugs.txt:85
8966
msgid ""
8967
"If present, the location of a generic bug tracker instance referred to by\n"
8968
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8969
"which will be replaced by a specific bug ID. This option can then be used\n"
8970
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8971
"fixed by that commit. For example::"
8972
msgstr ""
8973
8974
#: en/help_topics/bugs.txt:91
8975
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8976
msgstr ""
8977
8978
#: en/help_topics/bugs.txt:93
8979
msgid ""
8980
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8981
"Roundup bug tracker as fixed, or::"
8982
msgstr ""
8983
8984
#: en/help_topics/bugs.txt:96
8985
msgid ""
8986
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8987
msgstr ""
8988
8989
#: en/help_topics/bugs.txt:98
8990
msgid ""
8991
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8992
"RT bug tracker as fixed, or::"
8993
msgstr ""
8994
8995
#: en/help_topics/bugs.txt:101
8996
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8997
msgstr ""
8998
8999
#: en/help_topics/bugs.txt:103
9000
msgid ""
9001
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9002
"1234\n"
9003
"in Hudson's JIRA bug tracker as fixed.\n"
9004
msgstr ""
9005
9006
#: en/help_topics/commands.txt:1
9007
msgid ""
9008
"add Add specified files or directories.\n"
9009
"alias Set/unset and display aliases.\n"
9010
"annotate Show the origin of each line in a file.\n"
9011
"bash-completion Generate a shell function for bash command line "
9012
"completion.\n"
9013
" [bash_completion]\n"
9014
"bind Convert the current branch into a checkout of the "
9015
"supplied\n"
9016
" branch.\n"
9017
"branch Create a new branch that is a copy of an existing branch.\n"
9018
"branches List the branches available at the current location.\n"
9019
"break-lock Break a dead lock.\n"
9020
"cat Write the contents of a file as of a given revision to\n"
9021
" standard output.\n"
9022
"check Validate working tree structure, branch consistency and\n"
9023
" repository history.\n"
9024
"checkout Create a new checkout of an existing branch.\n"
9025
"clean-tree Remove unwanted files from working tree.\n"
9026
"commit Commit changes into a new revision.\n"
9027
"config Display, set or remove a configuration option.\n"
9028
"conflicts List files with conflicts.\n"
9029
"deleted List files deleted in the working tree.\n"
9030
"diff Show differences in the working tree, between revisions "
9031
"or\n"
9032
" branches.\n"
9033
"dpush Push into a different VCS without any custom bzr "
9034
"metadata.\n"
9035
"export Export current or past revision to a destination directory "
9036
"or\n"
9037
" archive.\n"
9038
"help Show help on a command or other topic.\n"
9039
"ignore Ignore specified files or patterns.\n"
9040
"ignored List ignored files and the patterns that matched them.\n"
9041
"info Show information about a working tree, branch or "
9042
"repository.\n"
9043
"init Make a directory into a versioned branch.\n"
9044
"init-repository Create a shared repository for branches to share storage\n"
9045
" space.\n"
9046
"join Combine a tree into its containing tree.\n"
9047
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9048
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9049
"launchpad-open Open a Launchpad branch page in your web browser. "
9050
"[launchpad]\n"
9051
"log Show historical log for a branch or subset of a branch.\n"
9052
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9053
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9054
"ls List files in a tree.\n"
9055
"merge Perform a three-way merge.\n"
9056
"missing Show unmerged/unpulled revisions between two branches.\n"
9057
"mkdir Create a new versioned directory.\n"
9058
"mv Move or rename a file.\n"
9059
"nick Print or set the branch nickname.\n"
9060
"pack Compress the data within a repository.\n"
9061
"plugins List the installed plugins.\n"
9062
"pull Turn this branch into a mirror of another branch.\n"
9063
"push Update a mirror of this branch.\n"
9064
"reconcile Reconcile bzr metadata in a branch.\n"
9065
"reconfigure Reconfigure the type of a bzr directory.\n"
9066
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9067
"remerge Redo a merge.\n"
9068
"remove Remove files or directories.\n"
9069
"remove-branch Remove a branch.\n"
9070
"remove-tree Remove the working tree from a given branch/checkout.\n"
9071
"renames Show list of renamed files.\n"
9072
"resolve Mark a conflict as resolved.\n"
9073
"revert Revert files to a previous revision.\n"
9074
"revno Show current revision number.\n"
9075
"root Show the tree root directory.\n"
9076
"send Mail or create a merge-directive for submitting changes.\n"
9077
"serve Run the bzr server.\n"
9078
"shelve Temporarily set aside some changes from the current tree.\n"
9079
"sign-my-commits Sign all commits by a given committer.\n"
9080
"split Split a subdirectory of a tree into a separate tree.\n"
9081
"status Display status summary.\n"
9082
"switch Set the branch of a checkout and update.\n"
9083
"tag Create, remove or modify a tag naming a revision.\n"
9084
"tags List tags.\n"
9085
"testament Show testament (signing-form) of a revision.\n"
9086
"unbind Convert the current checkout into a regular branch.\n"
9087
"uncommit Remove the last committed revision.\n"
9088
"unshelve Restore shelved changes.\n"
9089
"update Update a working tree to a new revision.\n"
9090
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9091
" format.\n"
9092
"verify-signatures Verify all commit signatures.\n"
9093
"version Show version of bzr.\n"
9094
"version-info Show version information about this tree.\n"
9095
"view Manage filtered views.\n"
9096
"whoami Show or set bzr user id.\n"
9097
msgstr ""
9098
9099
#: en/help_topics/configuration.txt:1
9100
msgid ""
9101
"Configuration Settings\n"
9102
"======================="
9103
msgstr ""
9104
9105
#: en/help_topics/configuration.txt:4
9106
msgid ""
9107
"Environment settings\n"
9108
"---------------------"
9109
msgstr ""
9110
9111
#: en/help_topics/configuration.txt:7
9112
msgid ""
9113
"While most configuration is handled by configuration files, some options\n"
9114
"which may be semi-permanent can also be controlled through the environment."
9115
msgstr ""
9116
9117
#: en/help_topics/configuration.txt:10
9118
msgid ""
9119
"BZR_EMAIL\n"
9120
"~~~~~~~~~"
9121
msgstr ""
9122
9123
#: en/help_topics/configuration.txt:13
9124
msgid "Override the email id used by Bazaar. Typical format::"
9125
msgstr ""
9126
9127
#: en/help_topics/configuration.txt:15
9128
msgid " \"John Doe <jdoe@example.com>\""
9129
msgstr ""
9130
9131
#: en/help_topics/configuration.txt:17
9132
msgid "See also the ``email`` configuration option."
9133
msgstr ""
9134
9135
#: en/help_topics/configuration.txt:19
9136
msgid ""
9137
"BZR_PROGRESS_BAR\n"
9138
"~~~~~~~~~~~~~~~~"
9139
msgstr ""
9140
9141
#: en/help_topics/configuration.txt:22
9142
msgid ""
9143
"Override the progress display. Possible values are \"none\" or \"text\". "
9144
"If\n"
9145
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9146
"draws\n"
9147
"the ordinary command line progress bar."
9148
msgstr ""
9149
9150
#: en/help_topics/configuration.txt:26
9151
msgid ""
9152
"BZR_SIGQUIT_PDB\n"
9153
"~~~~~~~~~~~~~~~"
9154
msgstr ""
9155
9156
#: en/help_topics/configuration.txt:29
9157
msgid ""
9158
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9159
msgstr ""
9160
9161
#: en/help_topics/configuration.txt:31
9162
msgid ""
9163
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9164
"* 1 = Invoke breakin debugger (default)"
9165
msgstr ""
9166
9167
#: en/help_topics/configuration.txt:34
9168
msgid ""
9169
"BZR_HOME\n"
9170
"~~~~~~~~"
9171
msgstr ""
9172
9173
#: en/help_topics/configuration.txt:37
9174
msgid "Override the home directory used by Bazaar."
9175
msgstr ""
9176
9177
#: en/help_topics/configuration.txt:39
9178
msgid ""
9179
"BZR_SSH\n"
9180
"~~~~~~~"
9181
msgstr ""
9182
9183
#: en/help_topics/configuration.txt:42
9184
msgid "Select a different SSH implementation."
9185
msgstr ""
9186
9187
#: en/help_topics/configuration.txt:44
9188
msgid ""
9189
"BZR_PDB\n"
9190
"~~~~~~~"
9191
msgstr ""
9192
9193
#: en/help_topics/configuration.txt:47
9194
msgid "Control whether to launch a debugger on error."
9195
msgstr ""
9196
9197
#: en/help_topics/configuration.txt:49
9198
msgid ""
9199
"* 0 = Standard behavior\n"
9200
"* 1 = Launch debugger"
9201
msgstr ""
9202
9203
#: en/help_topics/configuration.txt:52
9204
msgid ""
9205
"BZR_REMOTE_PATH\n"
9206
"~~~~~~~~~~~~~~~"
9207
msgstr ""
9208
9209
#: en/help_topics/configuration.txt:55
9210
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9211
msgstr ""
9212
9213
#: en/help_topics/configuration.txt:57
9214
msgid "See also the ``bzr_remote_path`` configuration option."
9215
msgstr ""
9216
9217
#: en/help_topics/configuration.txt:59
9218
msgid ""
9219
"BZR_EDITOR\n"
9220
"~~~~~~~~~~"
9221
msgstr ""
9222
9223
#: en/help_topics/configuration.txt:62
9224
msgid "Path to the editor Bazaar should use for commit messages, etc."
9225
msgstr ""
9226
9227
#: en/help_topics/configuration.txt:64
9228
msgid ""
9229
"BZR_LOG\n"
9230
"~~~~~~~"
9231
msgstr ""
9232
9233
#: en/help_topics/configuration.txt:67
9234
msgid ""
9235
"Location of the Bazaar log file. You can check the current location by\n"
9236
"running ``bzr version``."
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:70
9240
msgid ""
9241
"The log file contains debug information that is useful for diagnosing or\n"
9242
"reporting problems with Bazaar."
9243
msgstr ""
9244
9245
#: en/help_topics/configuration.txt:73
9246
msgid ""
9247
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9248
"will disable logging."
9249
msgstr ""
9250
9251
#: en/help_topics/configuration.txt:76
9252
msgid ""
9253
"\n"
9254
"BZR_PLUGIN_PATH\n"
9255
"~~~~~~~~~~~~~~~"
9256
msgstr ""
9257
9258
#: en/help_topics/configuration.txt:80
9259
msgid ""
9260
"The path to the plugins directory that Bazaar should use.\n"
9261
"If not set, Bazaar will search for plugins in:"
9262
msgstr ""
9263
9264
#: en/help_topics/configuration.txt:83
9265
msgid ""
9266
"* the user specific plugin directory (containing the ``user`` plugins),"
9267
msgstr ""
9268
9269
#: en/help_topics/configuration.txt:85
9270
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9271
msgstr ""
9272
9273
#: en/help_topics/configuration.txt:87
9274
msgid ""
9275
"* the site specific plugin directory if applicable (containing\n"
9276
" the ``site`` plugins)."
9277
msgstr ""
9278
9279
#: en/help_topics/configuration.txt:90
9280
msgid ""
9281
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9282
"the way the plugin are searched. "
9283
msgstr ""
9284
9285
#: en/help_topics/configuration.txt:93
9286
msgid ""
9287
"As for the ``PATH`` variables, if multiple directories are\n"
9288
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9289
"platform specific appropriate character (':' on Unix,\n"
9290
"';' on windows)"
9291
msgstr ""
9292
9293
#: en/help_topics/configuration.txt:98
9294
msgid ""
9295
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9296
"in ``user``. However it will continue to search in ``core`` and\n"
9297
"``site`` unless they are explicitly removed."
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:102
9301
msgid ""
9302
"If you need to change the order or remove one of these\n"
9303
"directories, you should use special values:"
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:105
9307
msgid ""
9308
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9309
" path from the default values,"
9310
msgstr ""
9311
9312
#: en/help_topics/configuration.txt:108
9313
msgid ""
9314
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9315
" before the remaining default values (and also remove it from\n"
9316
" the default values)."
9317
msgstr ""
9318
9319
#: en/help_topics/configuration.txt:112
9320
msgid ""
9321
"Note that the special values 'user', 'core' and 'site' should be\n"
9322
"used literally, they will be substituted by the corresponding,\n"
9323
"platform specific, values."
9324
msgstr ""
9325
9326
#: en/help_topics/configuration.txt:116
9327
msgid ""
9328
"The examples below use ':' as the separator, windows users\n"
9329
"should use ';'."
9330
msgstr ""
9331
9332
#: en/help_topics/configuration.txt:119
9333
msgid "Overriding the default user plugin directory::"
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:121
9337
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:123
9341
msgid "Disabling the site directory while retaining the user directory::"
9342
msgstr ""
9343
9344
#: en/help_topics/configuration.txt:125
9345
msgid " BZR_PLUGIN_PATH='-site:+user'"
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:127
9349
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:129
9353
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9354
msgstr ""
9355
9356
#: en/help_topics/configuration.txt:131
9357
msgid "Overriding the default site plugin directory::"
9358
msgstr ""
9359
9360
#: en/help_topics/configuration.txt:133
9361
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9362
msgstr ""
9363
9364
#: en/help_topics/configuration.txt:135
9365
msgid ""
9366
"BZR_DISABLE_PLUGINS\n"
9367
"~~~~~~~~~~~~~~~~~~~"
9368
msgstr ""
9369
9370
#: en/help_topics/configuration.txt:138
9371
msgid ""
9372
"Under special circumstances (mostly when trying to diagnose a\n"
9373
"bug), it's better to disable a plugin (or several) rather than\n"
9374
"uninstalling them completely. Such plugins can be specified in\n"
9375
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9376
msgstr ""
9377
9378
#: en/help_topics/configuration.txt:143
9379
msgid ""
9380
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9381
"will raise an import error if they are explicitly imported (by\n"
9382
"another plugin that depends on them for example)."
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:147
9386
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:149
9390
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9391
msgstr ""
9392
9393
#: en/help_topics/configuration.txt:151
9394
msgid ""
9395
"BZR_PLUGINS_AT\n"
9396
"~~~~~~~~~~~~~~"
9397
msgstr ""
9398
9399
#: en/help_topics/configuration.txt:154
9400
msgid ""
9401
"When adding a new feature or working on a bug in a plugin,\n"
9402
"developers often need to use a specific version of a given\n"
9403
"plugin. Since python requires that the directory containing the\n"
9404
"code is named like the plugin itself this make it impossible to\n"
9405
"use arbitrary directory names (using a two-level directory scheme\n"
9406
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9407
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9408
msgstr ""
9409
9410
#: en/help_topics/configuration.txt:162
9411
msgid ""
9412
"Plugins specified in this environment variable takes precedence\n"
9413
"over the ones in ``BZR_PLUGIN_PATH``."
9414
msgstr ""
9415
9416
#: en/help_topics/configuration.txt:165
9417
msgid ""
9418
"The variable specified a list of ``plugin_name@plugin path``,\n"
9419
"``plugin_name`` being the name of the plugin as it appears in\n"
9420
"python module paths, ``plugin_path`` being the path to the\n"
9421
"directory containing the plugin code itself\n"
9422
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9423
"separator, use ';' on windows."
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:172
9427
msgid ""
9428
"Example:\n"
9429
"~~~~~~~~"
9430
msgstr ""
9431
9432
#: en/help_topics/configuration.txt:175
9433
msgid ""
9434
"Using a specific version of ``myplugin``:\n"
9435
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9436
msgstr ""
9437
9438
#: en/help_topics/configuration.txt:178
9439
msgid ""
9440
"BZRPATH\n"
9441
"~~~~~~~"
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:181
9445
msgid "The path where Bazaar should look for shell plugin external commands."
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:183
9449
msgid ""
9450
"\n"
9451
"http_proxy, https_proxy\n"
9452
"~~~~~~~~~~~~~~~~~~~~~~~"
9453
msgstr ""
9454
9455
#: en/help_topics/configuration.txt:187
9456
msgid "Specifies the network proxy for outgoing connections, for example::"
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:189
9460
msgid ""
9461
" http_proxy=http://proxy.example.com:3128/ \n"
9462
" https_proxy=http://proxy.example.com:3128/"
9463
msgstr ""
9464
9465
#: en/help_topics/configuration.txt:192
9466
msgid ""
9467
"\n"
9468
"Configuration files\n"
9469
"-------------------"
9470
msgstr ""
9471
9472
#: en/help_topics/configuration.txt:196
9473
msgid ""
9474
"Location\n"
9475
"~~~~~~~~"
9476
msgstr ""
9477
9478
#: en/help_topics/configuration.txt:199
9479
msgid ""
9480
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9481
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9482
"on\n"
9483
"Windows. (You can check the location for your system by using\n"
9484
"``bzr version``.)"
9485
msgstr ""
9486
9487
#: en/help_topics/configuration.txt:204
9488
msgid "There are three primary configuration files in this location:"
9489
msgstr ""
9490
9491
#: en/help_topics/configuration.txt:206
9492
msgid "* ``bazaar.conf`` describes default configuration options,"
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:208
9496
msgid ""
9497
"* ``locations.conf`` describes configuration information for\n"
9498
" specific branch locations,"
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:211
9502
msgid ""
9503
"* ``authentication.conf`` describes credential information for\n"
9504
" remote servers."
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:214
9508
msgid ""
9509
"Each branch can also contain a configuration file that sets values specific\n"
9510
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9511
"the\n"
9512
"branch. This file is visible to all users of a branch, if you wish to "
9513
"override\n"
9514
"one of the values for a branch with a setting that is specific to you then "
9515
"you\n"
9516
"can do so in ``locations.conf``."
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:220
9520
msgid ""
9521
"General format\n"
9522
"~~~~~~~~~~~~~~"
9523
msgstr ""
9524
9525
#: en/help_topics/configuration.txt:223
9526
msgid ""
9527
"An ini file has three types of contructs: section headers, section\n"
9528
"options and comments."
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:226
9532
msgid ""
9533
"Comments\n"
9534
"^^^^^^^^"
9535
msgstr ""
9536
9537
#: en/help_topics/configuration.txt:229
9538
msgid ""
9539
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9540
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9541
"Bazaar when parsing ini files."
9542
msgstr ""
9543
9544
#: en/help_topics/configuration.txt:233
9545
msgid ""
9546
"Section headers\n"
9547
"^^^^^^^^^^^^^^^"
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:236
9551
msgid ""
9552
"A section header is a word enclosed in brackets that starts at the begining\n"
9553
"of a line. A typical section header looks like this::"
9554
msgstr ""
9555
9556
#: en/help_topics/configuration.txt:239
9557
msgid " [DEFAULT]"
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:241
9561
msgid ""
9562
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9563
"[ALIASES]. Section headers are case sensitive. The default section provides "
9564
"for\n"
9565
"setting options which can be overridden with the branch config file."
9566
msgstr ""
9567
9568
#: en/help_topics/configuration.txt:245
9569
msgid ""
9570
"For ``locations.conf``, the options from the section with the\n"
9571
"longest matching section header are used to the exclusion of other\n"
9572
"potentially valid section headers. A section header uses the path for\n"
9573
"the branch as the section header. Some examples include::"
9574
msgstr ""
9575
9576
#: en/help_topics/configuration.txt:250
9577
msgid ""
9578
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9579
" [/home/jdoe/branches/]"
9580
msgstr ""
9581
9582
#: en/help_topics/configuration.txt:253
9583
msgid ""
9584
"\n"
9585
"Section options\n"
9586
"^^^^^^^^^^^^^^^"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:257
9590
msgid ""
9591
"A section option resides within a section. A section option contains an\n"
9592
"option name, an equals sign and a value. For example::"
9593
msgstr ""
9594
9595
#: en/help_topics/configuration.txt:260
9596
msgid ""
9597
" email = John Doe <jdoe@isp.com>\n"
9598
" gpg_signing_key = Amy Pond <amy@example.com>"
9599
msgstr ""
9600
9601
#: en/help_topics/configuration.txt:263
9602
msgid ""
9603
"A option can reference other options by enclosing them in curly brackets::"
9604
msgstr ""
9605
9606
#: en/help_topics/configuration.txt:265
9607
msgid ""
9608
" my_branch_name = feature_x\n"
9609
" my_server = bzr+ssh://example.com\n"
9610
" push_location = {my_server}/project/{my_branch_name}"
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:269
9614
msgid ""
9615
"Option policies\n"
9616
"^^^^^^^^^^^^^^^"
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:272
9620
msgid ""
9621
"Options defined in a section affect the named directory or URL plus\n"
9622
"any locations they contain. Policies can be used to change how an\n"
9623
"option value is interpreted for contained locations. Currently\n"
9624
"there are three policies available:"
9625
msgstr ""
9626
9627
#: en/help_topics/configuration.txt:277
9628
msgid ""
9629
" none:\n"
9630
" the value is interpreted the same for contained locations. This is\n"
9631
" the default behaviour.\n"
9632
" norecurse:\n"
9633
" the value is only used for the exact location specified by the\n"
9634
" section name.\n"
9635
" appendpath:\n"
9636
" for contained locations, any additional path components are\n"
9637
" appended to the value."
9638
msgstr ""
9639
9640
#: en/help_topics/configuration.txt:287
9641
msgid ""
9642
"Policies are specified by keys with names of the form "
9643
"\"<option_name>:policy\".\n"
9644
"For example, to define the push location for a tree of branches, the\n"
9645
"following could be used::"
9646
msgstr ""
9647
9648
#: en/help_topics/configuration.txt:291
9649
msgid ""
9650
" [/top/location]\n"
9651
" push_location = sftp://example.com/location\n"
9652
" push_location:policy = appendpath"
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:295
9656
msgid ""
9657
"With this configuration, the push location for ``/top/location/branch1``\n"
9658
"would be ``sftp://example.com/location/branch1``."
9659
msgstr ""
9660
9661
#: en/help_topics/configuration.txt:298
9662
msgid ""
9663
"Section local options\n"
9664
"^^^^^^^^^^^^^^^^^^^^^"
9665
msgstr ""
9666
9667
#: en/help_topics/configuration.txt:301
9668
msgid ""
9669
"Some options are defined automatically inside a given section and can be\n"
9670
"refered to in this section only. "
9671
msgstr ""
9672
9673
#: en/help_topics/configuration.txt:304
9674
msgid "For example, the ``appendpath`` policy can be used like this::"
9675
msgstr ""
9676
9677
#: en/help_topics/configuration.txt:306
9678
msgid ""
9679
" [/home/vila/src/bzr/bugs]\n"
9680
" mypush = lp:~vila/bzr\n"
9681
" mypush:policy=appendpath"
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:310
9685
msgid "Using ``relpath`` to achieve the same result is done like this::"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:312
9689
msgid ""
9690
" [/home/vila/src/bzr/bugs]\n"
9691
" mypush = lp:~vila/bzr/{relpath}"
9692
msgstr ""
9693
9694
#: en/help_topics/configuration.txt:315
9695
msgid ""
9696
"In both cases, when used in a directory like\n"
9697
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9698
msgstr ""
9699
9700
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9701
msgid ""
9702
" $ bzr config mypush\n"
9703
" lp:~vila/bzr/832013-expand-in-stack"
9704
msgstr ""
9705
9706
#: en/help_topics/configuration.txt:321
9707
msgid "Another such option is ``basename`` which can be used like this::"
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:323
9711
msgid ""
9712
" [/home/vila/src/bzr]\n"
9713
" mypush = lp:~vila/bzr/{basename}"
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:326
9717
msgid ""
9718
"When used in a directory like\n"
9719
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9720
msgstr ""
9721
9722
#: en/help_topics/configuration.txt:332
9723
msgid ""
9724
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9725
"itself is defined as the relative path between the section name and the\n"
9726
"location it matches."
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:336
9730
msgid ""
9731
"When an option is local to a Section, it cannot be referred to from option\n"
9732
"values in any other section from the same ``Store`` nor from any other\n"
9733
"``Store``."
9734
msgstr ""
9735
9736
#: en/help_topics/configuration.txt:340
9737
msgid ""
9738
"\n"
9739
"The main configuration file, bazaar.conf\n"
9740
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:344
9744
msgid ""
9745
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9746
"The default section contains the default\n"
9747
"configuration options for all branches. The default section can be\n"
9748
"overriden by providing a branch-specific section in ``locations.conf``."
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:349
9752
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:351
9756
msgid ""
9757
" [DEFAULT]\n"
9758
" email = John Doe <jdoe@isp.com>\n"
9759
" editor = /usr/bin/vim\n"
9760
" create_signatures = when-required"
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:356
9764
msgid ""
9765
"\n"
9766
"The branch location configuration file, locations.conf\n"
9767
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9768
msgstr ""
9769
9770
#: en/help_topics/configuration.txt:360
9771
msgid ""
9772
"``locations.conf`` allows one to specify overriding settings for\n"
9773
"a specific branch. The format is almost identical to the default section in\n"
9774
"bazaar.conf with one significant change: The section header, instead of "
9775
"saying\n"
9776
"default, will be the path to a branch that you wish to override a value\n"
9777
"for. The '?' and '*' wildcards are supported::"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:366
9781
msgid ""
9782
" [/home/jdoe/branches/nethack]\n"
9783
" email = Nethack Admin <nethack@nethack.com>"
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:369
9787
msgid ""
9788
" [http://hypothetical.site.com/branches/devel-branch]\n"
9789
" create_signatures = always"
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:372
9793
msgid ""
9794
"The authentication configuration file, authentication.conf\n"
9795
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:375
9799
msgid ""
9800
"``authentication.conf`` allows one to specify credentials for\n"
9801
"remote servers. This can be used for all the supported transports and any "
9802
"part\n"
9803
"of bzr that requires authentication (smtp for example)."
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:379
9807
msgid ""
9808
"The syntax of the file obeys the same rules as the others except for the\n"
9809
"option policies which don't apply."
9810
msgstr ""
9811
9812
#: en/help_topics/configuration.txt:382
9813
msgid ""
9814
"For more information on the possible uses of the authentication "
9815
"configuration\n"
9816
"file see :doc:`authentication-help`."
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:385
9820
msgid ""
9821
"\n"
9822
"Common options\n"
9823
"--------------"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:389
9827
msgid ""
9828
"debug_flags\n"
9829
"~~~~~~~~~~~"
9830
msgstr ""
9831
9832
#: en/help_topics/configuration.txt:392
9833
msgid ""
9834
"A comma-separated list of debugging options to turn on. The same values\n"
9835
"can be used as with the -D command-line option (see `help global-options`).\n"
9836
"For example::"
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:396
9840
msgid " debug_flags = hpss"
9841
msgstr ""
9842
9843
#: en/help_topics/configuration.txt:400
9844
msgid " debug_flags = hpss,evil"
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:402
9848
msgid ""
9849
"email\n"
9850
"~~~~~"
9851
msgstr ""
9852
9853
#: en/help_topics/configuration.txt:405
9854
msgid ""
9855
"The email address to use when committing a branch. Typically takes the form\n"
9856
"of::"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:408
9860
msgid " email = Full Name <account@hostname.tld>"
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:410
9864
msgid ""
9865
"editor\n"
9866
"~~~~~~"
9867
msgstr ""
9868
9869
#: en/help_topics/configuration.txt:413
9870
msgid ""
9871
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9872
"a commit message. This setting is trumped by the environment variable\n"
9873
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9874
"variables."
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:418
9878
msgid ""
9879
"log_format\n"
9880
"~~~~~~~~~~"
9881
msgstr ""
9882
9883
#: en/help_topics/configuration.txt:421
9884
msgid ""
9885
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9886
"and ``line``. Additional formats may be provided by plugins. The default\n"
9887
"value is ``long``."
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:425
9891
msgid ""
9892
"check_signatures\n"
9893
"~~~~~~~~~~~~~~~~"
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:428
9897
msgid ""
9898
"Reserved for future use. These options will allow a policy for branches to\n"
9899
"require signatures."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:431
9903
msgid ""
9904
"require\n"
9905
" The gnupg signature for revisions must be present and must be valid."
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:434
9909
msgid ""
9910
"ignore\n"
9911
" Do not check gnupg signatures of revisions."
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:437
9915
msgid ""
9916
"check-available\n"
9917
" (default) If gnupg signatures for revisions are present, check them.\n"
9918
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9919
" no signature is present."
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:442
9923
msgid ""
9924
"create_signatures\n"
9925
"~~~~~~~~~~~~~~~~~"
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:445
9929
msgid ""
9930
"Defines the behaviour of signing revisions on commits. By default bzr will "
9931
"not\n"
9932
"sign new commits."
9933
msgstr ""
9934
9935
#: en/help_topics/configuration.txt:448
9936
msgid ""
9937
"always\n"
9938
" Sign every new revision that is committed. If the signing fails then "
9939
"the\n"
9940
" commit will not be made."
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:452
9944
msgid ""
9945
"when-required\n"
9946
" Reserved for future use."
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:455
9950
msgid ""
9951
"never\n"
9952
" Reserved for future use."
9953
msgstr ""
9954
9955
#: en/help_topics/configuration.txt:458
9956
msgid ""
9957
"In future it is planned that ``when-required`` will sign newly\n"
9958
"committed revisions only when the branch requires them. ``never`` will "
9959
"refuse\n"
9960
"to sign newly committed revisions, even if the branch requires signatures."
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:462
9964
msgid ""
9965
"dirstate.fdatasync\n"
9966
"~~~~~~~~~~~~~~~~~~"
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:465
9970
msgid ""
9971
"If true (default), working tree metadata changes are flushed through the\n"
9972
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9973
"should not be lost if the machine crashes. See also repository.fdatasync."
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:469
9977
msgid ""
9978
"gpg_signing_key\n"
9979
"~~~~~~~~~~~~~~~"
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:472
9983
msgid ""
9984
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9985
"address, key fingerprint or full key ID. When unset or when set to\n"
9986
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:476
9990
msgid ""
9991
"recurse\n"
9992
"~~~~~~~"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:479
9996
msgid ""
9997
"Only useful in ``locations.conf``. Defines whether or not the\n"
9998
"configuration for this section applies to subdirectories:"
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:482
10002
msgid ""
10003
"true\n"
10004
" (default) This section applies to subdirectories as well."
10005
msgstr ""
10006
10007
#: en/help_topics/configuration.txt:485
10008
msgid ""
10009
"false\n"
10010
" This section only applies to the branch at this directory and not\n"
10011
" branches below it."
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:489
10015
msgid ""
10016
"gpg_signing_command\n"
10017
"~~~~~~~~~~~~~~~~~~~"
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:492
10021
msgid ""
10022
"(Default: \"gpg\"). Which program should be used to sign and check "
10023
"revisions.\n"
10024
"For example::"
10025
msgstr ""
10026
10027
#: en/help_topics/configuration.txt:495
10028
msgid " gpg_signing_command = /usr/bin/gnpg"
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:497
10032
msgid ""
10033
"The specified command must accept the options \"--clearsign\" and \"-u "
10034
"<email>\"."
10035
msgstr ""
10036
10037
#: en/help_topics/configuration.txt:499
10038
msgid ""
10039
"bzr_remote_path\n"
10040
"~~~~~~~~~~~~~~~"
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:502
10044
msgid ""
10045
"(Default: \"bzr\"). The path to the command that should be used to run the "
10046
"smart\n"
10047
"server for bzr. This value may only be specified in locations.conf, because:"
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:505
10051
msgid ""
10052
"- it's needed before branch.conf is accessible\n"
10053
"- allowing remote branch.conf files to specify commands would be a security\n"
10054
" risk"
10055
msgstr ""
10056
10057
#: en/help_topics/configuration.txt:509
10058
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:511
10062
msgid ""
10063
"smtp_server\n"
10064
"~~~~~~~~~~~"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:514
10068
msgid ""
10069
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10070
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:517
10074
msgid ""
10075
"smtp_username, smtp_password\n"
10076
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:520
10080
msgid ""
10081
"User and password to authenticate to the SMTP server. If smtp_username\n"
10082
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10083
"These settings are only needed if the SMTP server requires authentication\n"
10084
"to send mail."
10085
msgstr ""
10086
10087
#: en/help_topics/configuration.txt:525
10088
msgid ""
10089
"locks.steal_dead\n"
10090
"~~~~~~~~~~~~~~~~"
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:528
10094
msgid ""
10095
"If set to true, bzr will automatically break locks held by processes from\n"
10096
"the same machine and user that are no longer alive. Otherwise, it will\n"
10097
"print a message and you can break the lock manually, if you are satisfied\n"
10098
"the object is no longer in use."
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:533
10102
msgid ""
10103
"mail_client\n"
10104
"~~~~~~~~~~~"
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:536
10108
msgid ""
10109
"A mail client to use for sending merge requests.\n"
10110
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10111
"it\n"
10112
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10113
"``editor``."
10114
msgstr ""
10115
10116
#: en/help_topics/configuration.txt:541
10117
msgid "Supported values for specific clients:"
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:543
10121
msgid ""
10122
":claws: Use Claws. This skips a dialog for attaching files.\n"
10123
":evolution: Use Evolution.\n"
10124
":kmail: Use KMail.\n"
10125
":mutt: Use Mutt.\n"
10126
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10127
"1.5,\n"
10128
" this works around some bugs that xdg-email doesn't handle."
10129
msgstr ""
10130
10131
#: en/help_topics/configuration.txt:550
10132
msgid "Supported generic values are:"
10133
msgstr ""
10134
10135
#: en/help_topics/configuration.txt:552
10136
msgid ""
10137
":default: See above.\n"
10138
":editor: Use your editor to compose the merge request. This also uses\n"
10139
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10140
" smtp_username and smtp_password.\n"
10141
":mapi: Use your preferred e-mail client on Windows.\n"
10142
":xdg-email: Use xdg-email to run your preferred mail program"
10143
msgstr ""
10144
10145
#: en/help_topics/configuration.txt:559
10146
msgid ""
10147
"repository.fdatasync\n"
10148
"~~~~~~~~~~~~~~~~~~~~"
10149
msgstr ""
10150
10151
#: en/help_topics/configuration.txt:562
10152
msgid ""
10153
"If true (default), repository changes are flushed through the OS buffers\n"
10154
"to physical disk. This is somewhat slower, but means data should not be\n"
10155
"lost if the machine crashes. See also dirstate.fdatasync."
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:566
10159
msgid ""
10160
"submit_branch\n"
10161
"~~~~~~~~~~~~~"
10162
msgstr ""
10163
10164
#: en/help_topics/configuration.txt:569
10165
msgid ""
10166
"The branch you intend to submit your current work to. This is "
10167
"automatically\n"
10168
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10169
"This\n"
10170
"should usually be set on a per-branch or per-location basis."
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:573
10174
msgid ""
10175
"public_branch\n"
10176
"~~~~~~~~~~~~~"
10177
msgstr ""
10178
10179
#: en/help_topics/configuration.txt:576
10180
msgid ""
10181
"A publically-accessible version of this branch (implying that this version "
10182
"is\n"
10183
"not publically-accessible). Used (and set) by ``bzr send``."
10184
msgstr ""
10185
10186
#: en/help_topics/configuration.txt:579
10187
msgid ""
10188
"suppress_warnings\n"
10189
"~~~~~~~~~~~~~~~~~"
10190
msgstr ""
10191
10192
#: en/help_topics/configuration.txt:582
10193
msgid ""
10194
"A list of strings, each string represent a warning that can be emitted by\n"
10195
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:585
10199
msgid "Valid values:"
10200
msgstr ""
10201
10202
#: en/help_topics/configuration.txt:587
10203
msgid ""
10204
"* ``format_deprecation``:\n"
10205
" whether the format deprecation warning is shown on repositories that "
10206
"are\n"
10207
" using deprecated formats."
10208
msgstr ""
10209
10210
#: en/help_topics/configuration.txt:591
10211
msgid ""
10212
"default_format\n"
10213
"~~~~~~~~~~~~~~"
10214
msgstr ""
10215
10216
#: en/help_topics/configuration.txt:594
10217
msgid ""
10218
"A format name for the default format used when creating branches. See "
10219
"``bzr\n"
10220
"help formats`` for possible values."
10221
msgstr ""
10222
10223
#: en/help_topics/configuration.txt:597
10224
msgid ""
10225
"\n"
10226
"Unicode options\n"
10227
"---------------"
10228
msgstr ""
10229
10230
#: en/help_topics/configuration.txt:601
10231
msgid ""
10232
"output_encoding\n"
10233
"~~~~~~~~~~~~~~~"
10234
msgstr ""
10235
10236
#: en/help_topics/configuration.txt:604
10237
msgid ""
10238
"A Python unicode encoding name for text output from bzr, such as log\n"
10239
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10240
"is the terminal encoding prefered by the operating system."
10241
msgstr ""
10242
10243
#: en/help_topics/configuration.txt:608
10244
msgid ""
10245
"\n"
10246
"Branch type specific options\n"
10247
"----------------------------"
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:612
10251
msgid ""
10252
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10253
"later format. They\n"
10254
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10255
"manually set in ``locations.conf`` or ``bazaar.conf``."
10256
msgstr ""
10257
10258
#: en/help_topics/configuration.txt:617
10259
msgid ""
10260
"append_revisions_only\n"
10261
"~~~~~~~~~~~~~~~~~~~~~"
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:620
10265
msgid ""
10266
"If set to \"True\" then revisions can only be appended to the log, not\n"
10267
"removed. A branch with this setting enabled can only pull from another\n"
10268
"branch if the other branch's log is a longer version of its own. This is\n"
10269
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10270
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10271
"compatibility with previous bzr versions (older than 2.2)."
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:627
10275
msgid ""
10276
"parent_location\n"
10277
"~~~~~~~~~~~~~~~"
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:630
10281
msgid ""
10282
"If present, the location of the default branch for pull or merge. This "
10283
"option\n"
10284
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10285
"--remember``."
10286
msgstr ""
10287
10288
#: en/help_topics/configuration.txt:634
10289
msgid ""
10290
"push_location\n"
10291
"~~~~~~~~~~~~~"
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:637
10295
msgid ""
10296
"If present, the location of the default branch for push. This option\n"
10297
"is normally set by the first ``push`` or ``push --remember``."
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:640
10301
msgid ""
10302
"push_strict\n"
10303
"~~~~~~~~~~~"
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:643
10307
msgid ""
10308
"If present, defines the ``--strict`` option default value for checking\n"
10309
"uncommitted changes before pushing."
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:646
10313
msgid ""
10314
"dpush_strict\n"
10315
"~~~~~~~~~~~~"
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:649
10319
msgid ""
10320
"If present, defines the ``--strict`` option default value for checking\n"
10321
"uncommitted changes before pushing into a different VCS without any\n"
10322
"custom bzr metadata."
10323
msgstr ""
10324
10325
#: en/help_topics/configuration.txt:653
10326
msgid ""
10327
"bound_location\n"
10328
"~~~~~~~~~~~~~~"
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:656
10332
msgid ""
10333
"The location that commits should go to when acting as a checkout.\n"
10334
"This option is normally set by ``bind``."
10335
msgstr ""
10336
10337
#: en/help_topics/configuration.txt:659
10338
msgid ""
10339
"bound\n"
10340
"~~~~~"
10341
msgstr ""
10342
10343
#: en/help_topics/configuration.txt:662
10344
msgid ""
10345
"If set to \"True\", the branch should act as a checkout, and push each "
10346
"commit to\n"
10347
"the bound_location. This option is normally set by ``bind``/``unbind``."
10348
msgstr ""
10349
10350
#: en/help_topics/configuration.txt:665
10351
msgid ""
10352
"send_strict\n"
10353
"~~~~~~~~~~~"
10354
msgstr ""
10355
10356
#: en/help_topics/configuration.txt:668
10357
msgid ""
10358
"If present, defines the ``--strict`` option default value for checking\n"
10359
"uncommitted changes before sending a merge directive."
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:671
10363
msgid ""
10364
"add.maximum_file_size\n"
10365
"~~~~~~~~~~~~~~~~~~~~~"
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:674
10369
msgid ""
10370
"Defines the maximum file size the command line \"add\" operation will allow\n"
10371
"in recursive mode, with files larger than this value being skipped. You may "
10372
"\n"
10373
"specify this value as an integer (in which case it is interpreted as bytes), "
10374
"\n"
10375
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10376
"0 \n"
10377
"will disable skipping."
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:680
10381
msgid ""
10382
"External Merge Tools\n"
10383
"--------------------"
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:683
10387
msgid ""
10388
"bzr.mergetool.<name>\n"
10389
"~~~~~~~~~~~~~~~~~~~~"
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:686
10393
msgid ""
10394
"Defines an external merge tool called <name> with the given command-line.\n"
10395
"Arguments containing spaces should be quoted using single or double quotes. "
10396
"The\n"
10397
"executable may omit its path if it can be found on the PATH."
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:690
10401
msgid ""
10402
"The following markers can be used in the command-line to substitute "
10403
"filenames\n"
10404
"involved in the merge conflict::"
10405
msgstr ""
10406
10407
#: en/help_topics/configuration.txt:693
10408
msgid ""
10409
" {base} file.BASE\n"
10410
" {this} file.THIS\n"
10411
" {other} file.OTHER\n"
10412
" {result} output file\n"
10413
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10414
"merge\n"
10415
" succeeds."
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:702
10419
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10420
msgstr ""
10421
10422
#: en/help_topics/configuration.txt:704
10423
msgid ""
10424
"bzr.default_mergetool\n"
10425
"~~~~~~~~~~~~~~~~~~~~~"
10426
msgstr ""
10427
10428
#: en/help_topics/configuration.txt:707
10429
msgid ""
10430
"Specifies which external merge tool (as defined above) should be selected "
10431
"by\n"
10432
"default in tools such as ``bzr qconflicts``."
10433
msgstr ""
10434
10435
#: en/help_topics/configuration.txt:712
10436
msgid " bzr.default_mergetool = kdiff3\n"
10437
msgstr ""
10438
10439
#: en/help_topics/conflict-types.txt:1
10440
msgid ""
10441
"Conflict Types\n"
10442
"=============="
10443
msgstr ""
10444
10445
#: en/help_topics/conflict-types.txt:4
10446
msgid ""
10447
"Some operations, like merge, revert and pull, modify the contents of your\n"
10448
"working tree. These modifications are programmatically generated, and so "
10449
"they\n"
10450
"may conflict with the current state of your working tree. "
10451
msgstr ""
10452
10453
#: en/help_topics/conflict-types.txt:8
10454
msgid ""
10455
"When conflicts are present in your working tree (as shown by ``bzr\n"
10456
"conflicts``), you should resolve them and then inform bzr that the "
10457
"conflicts\n"
10458
"have been resolved."
10459
msgstr ""
10460
10461
#: en/help_topics/conflict-types.txt:12
10462
msgid ""
10463
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10464
"should resolve them is not the one responsible for their occurrence, as is "
10465
"the\n"
10466
"case when merging other people's work or because some conflicts are "
10467
"presented\n"
10468
"in a way that is not easy to understand."
10469
msgstr ""
10470
10471
#: en/help_topics/conflict-types.txt:17
10472
msgid ""
10473
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10474
"conflict if and only if there's an actual conceptual conflict in the source\n"
10475
"tree. Because Bazaar doesn't understand the real meaning of the files "
10476
"being\n"
10477
"versioned, it can, when faced with ambiguities, fall short in either "
10478
"direction\n"
10479
"trying to resolve the conflict itself. Many kinds of changes can be "
10480
"combined\n"
10481
"programmatically, but sometimes only a human can determine the right thing "
10482
"to\n"
10483
"do."
10484
msgstr ""
10485
10486
#: en/help_topics/conflict-types.txt:25
10487
msgid ""
10488
"When Bazaar generates a conflict, it adds information into the working tree "
10489
"to\n"
10490
"present the conflicting versions, and it's up to you to find the correct\n"
10491
"resolution."
10492
msgstr ""
10493
10494
#: en/help_topics/conflict-types.txt:29
10495
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10496
msgstr ""
10497
10498
#: en/help_topics/conflict-types.txt:31
10499
msgid ""
10500
"1. Modify the working tree content so that the conflicted item is now in "
10501
"the\n"
10502
" state you want to keep, then"
10503
msgstr ""
10504
10505
#: en/help_topics/conflict-types.txt:34
10506
msgid ""
10507
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10508
" remaining generated information (``bzr resolve <item>``)."
10509
msgstr ""
10510
10511
#: en/help_topics/conflict-types.txt:37
10512
msgid ""
10513
"For most conflict types, there are some obvious ways to modify the working\n"
10514
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10515
"itself already made a choice, when possible."
10516
msgstr ""
10517
10518
#: en/help_topics/conflict-types.txt:41
10519
msgid ""
10520
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10521
"different ways to resolve the conflict."
10522
msgstr ""
10523
10524
#: en/help_topics/conflict-types.txt:44
10525
msgid ""
10526
"Each type of conflict is explained below, and the action which must be done "
10527
"to\n"
10528
"resolve the conflict is outlined."
10529
msgstr ""
10530
10531
#: en/help_topics/conflict-types.txt:47
10532
msgid ""
10533
"Various actions are available depending on the kind of conflict, for some "
10534
"of\n"
10535
"these actions, Bazaar can provide some help. In the end you should at least\n"
10536
"inform Bazaar that you're done with the conflict with::"
10537
msgstr ""
10538
10539
#: en/help_topics/conflict-types.txt:51
10540
msgid " ``bzr resolve FILE --action=done'"
10541
msgstr ""
10542
10543
#: en/help_topics/conflict-types.txt:53
10544
msgid ""
10545
"Note that this is the default action when a single file is involved so you "
10546
"can\n"
10547
"simply use::"
10548
msgstr ""
10549
10550
#: en/help_topics/conflict-types.txt:56
10551
msgid " ``bzr resolve FILE``"
10552
msgstr ""
10553
10554
#: en/help_topics/conflict-types.txt:58
10555
msgid "See ``bzr help resolve`` for more details."
10556
msgstr ""
10557
10558
#: en/help_topics/conflict-types.txt:60
10559
msgid ""
10560
"Text conflicts\n"
10561
"--------------"
10562
msgstr ""
10563
10564
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10565
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10566
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10567
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10568
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10569
msgid "Typical message::"
10570
msgstr ""
10571
10572
#: en/help_topics/conflict-types.txt:65
10573
msgid " Text conflict in FILE"
10574
msgstr ""
10575
10576
#: en/help_topics/conflict-types.txt:67
10577
msgid ""
10578
"These are produced when a text merge cannot completely reconcile two sets "
10579
"of\n"
10580
"text changes. Bazaar will emit files for each version with the extensions\n"
10581
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10582
"tree,\n"
10583
"i.e. the tree that you are merging changes into. OTHER is the version that "
10584
"you\n"
10585
"are merging into the target. BASE is an older version that is used as a "
10586
"basis\n"
10587
"for comparison."
10588
msgstr ""
10589
10590
#: en/help_topics/conflict-types.txt:74
10591
msgid ""
10592
"In the main copy of the file, Bazaar will include all the changes that it\n"
10593
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10594
"\"herringbone\" markers like ``<<<<<<<``."
10595
msgstr ""
10596
10597
#: en/help_topics/conflict-types.txt:78
10598
msgid ""
10599
"Say the initial text is \"The project leader released it.\", and THIS "
10600
"modifies it\n"
10601
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10602
"leader\n"
10603
"released Bazaar.\" A conflict would look like this::"
10604
msgstr ""
10605
10606
#: en/help_topics/conflict-types.txt:82
10607
msgid ""
10608
" <<<<<<< TREE\n"
10609
" Martin Pool released it.\n"
10610
" =======\n"
10611
" The project leader released Bazaar.\n"
10612
" >>>>>>> MERGE-SOURCE"
10613
msgstr ""
10614
10615
#: en/help_topics/conflict-types.txt:88
10616
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10617
msgstr ""
10618
10619
#: en/help_topics/conflict-types.txt:90
10620
msgid ""
10621
"You can handle text conflicts either by editing the main copy of the file,\n"
10622
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10623
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10624
"set of changes over the other (but see below when you encounter these\n"
10625
"cases). More often, the two sets of changes must be intelligently combined."
10626
msgstr ""
10627
10628
#: en/help_topics/conflict-types.txt:96
10629
msgid ""
10630
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10631
"you are done editing, the file should look like it never had a conflict, and "
10632
"be\n"
10633
"ready to commit."
10634
msgstr ""
10635
10636
#: en/help_topics/conflict-types.txt:100
10637
msgid ""
10638
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10639
"Bazaar will auto-detect which conflicts you have resolved."
10640
msgstr ""
10641
10642
#: en/help_topics/conflict-types.txt:103
10643
msgid ""
10644
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10645
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10646
"working tree."
10647
msgstr ""
10648
10649
#: en/help_topics/conflict-types.txt:107
10650
msgid ""
10651
"\n"
10652
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10653
"resolve`` with one of the following actions:"
10654
msgstr ""
10655
10656
#: en/help_topics/conflict-types.txt:111
10657
msgid ""
10658
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10659
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10660
msgstr ""
10661
10662
#: en/help_topics/conflict-types.txt:114
10663
msgid ""
10664
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10665
"modifications will be taken into account."
10666
msgstr ""
10667
10668
#: en/help_topics/conflict-types.txt:117
10669
msgid ""
10670
"Content conflicts\n"
10671
"-----------------"
10672
msgstr ""
10673
10674
#: en/help_topics/conflict-types.txt:122
10675
msgid " Contents conflict in FILE"
10676
msgstr ""
10677
10678
#: en/help_topics/conflict-types.txt:124
10679
msgid ""
10680
"This conflict happens when there are conflicting changes in the working "
10681
"tree\n"
10682
"and the merge source, but the conflicted items are not text files. They "
10683
"may\n"
10684
"be binary files, or symlinks, or directories. It can even happen with "
10685
"files\n"
10686
"that are deleted on one side, and modified on the other."
10687
msgstr ""
10688
10689
#: en/help_topics/conflict-types.txt:129
10690
msgid ""
10691
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10692
"be\n"
10693
"regular files, symlinks or directories). But it will not include a \"main "
10694
"copy\"\n"
10695
"of the file with herringbone conflict markers. It will appear that the "
10696
"\"main\n"
10697
"copy\" has been renamed to THIS or OTHER."
10698
msgstr ""
10699
10700
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10701
msgid ""
10702
"To resolve that kind of conflict, you should rebuild FILE from either "
10703
"version\n"
10704
"or a combination of both."
10705
msgstr ""
10706
10707
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10708
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10709
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10710
#: en/help_topics/conflict-types.txt:361
10711
msgid "``bzr resolve`` recognizes the following actions:"
10712
msgstr ""
10713
10714
#: en/help_topics/conflict-types.txt:139
10715
msgid ""
10716
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10717
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10718
"* ``--action=done`` will just mark the conflict as resolved."
10719
msgstr ""
10720
10721
#: en/help_topics/conflict-types.txt:143
10722
msgid ""
10723
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10724
"and\n"
10725
"``.OTHER`` files if they are still present in the working tree."
10726
msgstr ""
10727
10728
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10729
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10730
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10731
#: en/help_topics/conflict-types.txt:369
10732
msgid ""
10733
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10734
msgstr ""
10735
10736
#: en/help_topics/conflict-types.txt:148
10737
msgid ""
10738
"Tag conflicts\n"
10739
"-------------"
10740
msgstr ""
10741
10742
#: en/help_topics/conflict-types.txt:153
10743
msgid ""
10744
" Conflicting tags:\n"
10745
" version-0.1"
10746
msgstr ""
10747
10748
#: en/help_topics/conflict-types.txt:156
10749
msgid ""
10750
"When pulling from or pushing to another branch, Bazaar informs you about "
10751
"tags\n"
10752
"that conflict between the two branches; that is the same tag points to two\n"
10753
"different revisions. You need not resolve these conflicts, but subsequent\n"
10754
"uses of pull or push will result in the same message."
10755
msgstr ""
10756
10757
#: en/help_topics/conflict-types.txt:161
10758
msgid ""
10759
"To resolve the conflict, you must apply the correct tags to either the "
10760
"target\n"
10761
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10762
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10763
"target branch's tags match the source branch, then in the target branch do\n"
10764
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10765
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10766
"source\n"
10767
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10768
"favor of the target branch, you need to similarly use ``tag --force`` in "
10769
"the\n"
10770
"source branch. (Note that pulling or pushing using --overwrite will "
10771
"overwrite\n"
10772
"all tags as well.)"
10773
msgstr ""
10774
10775
#: en/help_topics/conflict-types.txt:172
10776
msgid ""
10777
"Duplicate paths\n"
10778
"---------------"
10779
msgstr ""
10780
10781
#: en/help_topics/conflict-types.txt:177
10782
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10783
msgstr ""
10784
10785
#: en/help_topics/conflict-types.txt:179
10786
msgid ""
10787
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10788
"already been used. The existing file will be renamed to \"FILE.moved\". "
10789
msgstr ""
10790
10791
#: en/help_topics/conflict-types.txt:187
10792
msgid ""
10793
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10794
"FILE``,\n"
10795
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10796
"* ``--action=done`` will just mark the conflict as resolved."
10797
msgstr ""
10798
10799
#: en/help_topics/conflict-types.txt:191
10800
msgid ""
10801
"Note that you must get rid of FILE.moved before using ``--action=done``."
10802
msgstr ""
10803
10804
#: en/help_topics/conflict-types.txt:195
10805
msgid ""
10806
"Unversioned parent\n"
10807
"------------------"
10808
msgstr ""
10809
10810
#: en/help_topics/conflict-types.txt:200
10811
msgid ""
10812
" Conflict because FILE is not versioned, but has versioned children."
10813
msgstr ""
10814
10815
#: en/help_topics/conflict-types.txt:202
10816
msgid ""
10817
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10818
"not\n"
10819
"versioned. This happens when the directory has been deleted in the target,\n"
10820
"but has a new child in the source, or vice versa. In this situation, "
10821
"Bazaar\n"
10822
"will version the parent directory as well. Resolving this issue depends\n"
10823
"very much on the particular scenario. You may wish to rename or delete "
10824
"either\n"
10825
"the file or the directory. When you are satisfied, you can run \"bzr "
10826
"resolve\n"
10827
"FILE\" to mark the conflict as resolved."
10828
msgstr ""
10829
10830
#: en/help_topics/conflict-types.txt:210
10831
msgid ""
10832
"Missing parent\n"
10833
"--------------"
10834
msgstr ""
10835
10836
#: en/help_topics/conflict-types.txt:215
10837
msgid " Conflict adding files to FILE. Created directory."
10838
msgstr ""
10839
10840
#: en/help_topics/conflict-types.txt:217
10841
msgid ""
10842
"This happens when a directory has been deleted in the target, but has new\n"
10843
"children in the source. This is similar to the \"unversioned parent\" "
10844
"conflict,\n"
10845
"except that the parent directory does not *exist*, instead of just being\n"
10846
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10847
"Resolving this issue depends very much on the particular scenario."
10848
msgstr ""
10849
10850
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10851
msgid ""
10852
"To resolve that kind of conflict, you should either remove or rename the\n"
10853
"children or the directory or a combination of both."
10854
msgstr ""
10855
10856
#: en/help_topics/conflict-types.txt:228
10857
msgid ""
10858
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10859
" children,\n"
10860
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10861
"children\n"
10862
" and restoring the directory,\n"
10863
"* ``--action=done`` will just mark the conflict as resolved."
10864
msgstr ""
10865
10866
#: en/help_topics/conflict-types.txt:236
10867
msgid ""
10868
"Deleting parent\n"
10869
"---------------"
10870
msgstr ""
10871
10872
#: en/help_topics/conflict-types.txt:241
10873
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10874
msgstr ""
10875
10876
#: en/help_topics/conflict-types.txt:243
10877
msgid ""
10878
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10879
"source, but has new children in the target (either because a directory\n"
10880
"deletion is merged or because the merge introduce new children). Bazaar\n"
10881
"will retain the directory. Resolving this issue depends very much on the\n"
10882
"particular scenario."
10883
msgstr ""
10884
10885
#: en/help_topics/conflict-types.txt:254
10886
msgid ""
10887
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10888
"directory,"
10889
msgstr ""
10890
10891
#: en/help_topics/conflict-types.txt:256
10892
msgid ""
10893
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10894
" children,"
10895
msgstr ""
10896
10897
#: en/help_topics/conflict-types.txt:259
10898
msgid "* ``--action=done`` will just mark the conflict as resolved."
10899
msgstr ""
10900
10901
#: en/help_topics/conflict-types.txt:261
10902
msgid ""
10903
"Note that when merging a directory deletion, if unversioned files are\n"
10904
"present, they become potential orphans has they don't have a directory\n"
10905
"parent anymore."
10906
msgstr ""
10907
10908
#: en/help_topics/conflict-types.txt:265
10909
msgid ""
10910
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10911
"setting the ``bzr.transform.orphan_policy`` configuration option."
10912
msgstr ""
10913
10914
#: en/help_topics/conflict-types.txt:268
10915
msgid "There are two possible values for this option:"
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:270
10919
msgid ""
10920
"* ``conflict`` (the default): will leave the orphans in place and\n"
10921
" generate a conflicts,"
10922
msgstr ""
10923
10924
#: en/help_topics/conflict-types.txt:273
10925
msgid ""
10926
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10927
"root\n"
10928
" of the working tree with names like ``<file>.~#~``."
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:278
10932
msgid ""
10933
"Path conflict\n"
10934
"-------------"
10935
msgstr ""
10936
10937
#: en/help_topics/conflict-types.txt:283
10938
msgid " Path conflict: PATH1 / PATH2"
10939
msgstr ""
10940
10941
#: en/help_topics/conflict-types.txt:285
10942
msgid ""
10943
"This happens when the source and target have each modified the name or "
10944
"parent\n"
10945
"directory of a file. Bazaar will use the path elements from the source."
10946
msgstr ""
10947
10948
#: en/help_topics/conflict-types.txt:288
10949
msgid ""
10950
"To resolve that kind of conflict, you just have to decide what name should "
10951
"be\n"
10952
"retained for the file involved."
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:293
10956
msgid ""
10957
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10958
" issuing ``bzr mv PATH2 PATH1``,\n"
10959
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10960
"``PATH2``,\n"
10961
"* ``--action=done`` will just mark the conflict as resolved."
10962
msgstr ""
10963
10964
#: en/help_topics/conflict-types.txt:300
10965
msgid ""
10966
"Parent loop\n"
10967
"-----------"
10968
msgstr ""
10969
10970
#: en/help_topics/conflict-types.txt:305
10971
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10972
msgstr ""
10973
10974
#: en/help_topics/conflict-types.txt:307
10975
msgid ""
10976
"This happens when the source and the target have each moved directories, so\n"
10977
"that, if the change could be applied, a directory would be contained by "
10978
"itself.\n"
10979
"For example::"
10980
msgstr ""
10981
10982
#: en/help_topics/conflict-types.txt:311
10983
msgid ""
10984
" $ bzr init\n"
10985
" $ bzr mkdir white\n"
10986
" $ bzr mkdir black\n"
10987
" $ bzr commit -m \"BASE\"\n"
10988
" $ bzr branch . ../other\n"
10989
" $ bzr mv white black\n"
10990
" $ bzr commit -m \"THIS\"\n"
10991
" $ bzr mv ../other/black ../other/white\n"
10992
" $ bzr commit ../other -m \"OTHER\"\n"
10993
" $ bzr merge ../other"
10994
msgstr ""
10995
10996
#: en/help_topics/conflict-types.txt:322
10997
msgid ""
10998
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10999
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11000
"name should be retained for the directories involved."
11001
msgstr ""
11002
11003
#: en/help_topics/conflict-types.txt:328
11004
msgid ""
11005
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11006
"\n"
11007
" in ``black``,\n"
11008
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11009
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11010
"* ``--action=done`` will just mark the conflict as resolved."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:336
11014
msgid ""
11015
"Non-directory parent\n"
11016
"--------------------"
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:341
11020
msgid ""
11021
" Conflict: foo.new is not a directory, but has files in it.\n"
11022
" Created directory."
11023
msgstr ""
11024
11025
#: en/help_topics/conflict-types.txt:344
11026
msgid ""
11027
"This happens when one side has added files to a directory, and the other "
11028
"side\n"
11029
"has changed the directory into a file or symlink. For example::"
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:347
11033
msgid ""
11034
" $ bzr init\n"
11035
" $ bzr mkdir foo\n"
11036
" $ bzr commit -m \"BASE\"\n"
11037
" $ bzr branch . ../other\n"
11038
" $ rmdir foo\n"
11039
" $ touch foo\n"
11040
" $ bzr commit -m \"THIS\"\n"
11041
" $ bzr mkdir ../other/foo/bar\n"
11042
" $ bzr commit ../other -m \"OTHER\"\n"
11043
" $ bzr merge ../other"
11044
msgstr ""
11045
11046
#: en/help_topics/conflict-types.txt:358
11047
msgid ""
11048
"To resolve that kind of conflict, you have to decide what name should be\n"
11049
"retained for the file, directory or symlink involved."
11050
msgstr ""
11051
11052
#: en/help_topics/conflict-types.txt:363
11053
msgid ""
11054
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11055
" ``bzr add foo``,\n"
11056
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11057
" ``bzr mv foo.new foo``,\n"
11058
"* ``--action=done`` will just mark the conflict as resolved."
11059
msgstr ""
11060
11061
#: en/help_topics/conflict-types.txt:371
11062
msgid ""
11063
"MalformedTransform\n"
11064
"------------------"
11065
msgstr ""
11066
11067
#: en/help_topics/conflict-types.txt:374
11068
msgid ""
11069
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11070
"exception. This means that Bazaar encountered a filesystem conflict that it "
11071
"was\n"
11072
"unable to resolve. This usually indicates a bug. Please let us know if "
11073
"you\n"
11074
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11075
msgstr ""
11076
11077
#: en/help_topics/content-filters.txt:1
11078
msgid ""
11079
"Content Filters\n"
11080
"==============="
11081
msgstr ""
11082
11083
#: en/help_topics/content-filters.txt:4
11084
msgid ""
11085
"Content formats\n"
11086
"---------------"
11087
msgstr ""
11088
11089
#: en/help_topics/content-filters.txt:7
11090
msgid ""
11091
"Bazaar's content filtering allows you to store files in a different\n"
11092
"format from the copy in your working tree. This lets you, or your\n"
11093
"co-developers, use Windows development tools that expect CRLF files\n"
11094
"on projects that use other line-ending conventions. Among other things,\n"
11095
"content filters also let Unix developers more easily work on projects\n"
11096
"using Windows line-ending conventions, keyword expansion/compression,\n"
11097
"and trailing spaces on lines in text files to be implicitly stripped\n"
11098
"when committed."
11099
msgstr ""
11100
11101
#: en/help_topics/content-filters.txt:16
11102
msgid "To generalize, there are two content formats supported by Bazaar:"
11103
msgstr ""
11104
11105
#: en/help_topics/content-filters.txt:18
11106
msgid ""
11107
"* a canonical format - how files are stored internally\n"
11108
"* a convenience format - how files are created in a working tree."
11109
msgstr ""
11110
11111
#: en/help_topics/content-filters.txt:21
11112
msgid ""
11113
"\n"
11114
"Format conversion\n"
11115
"-----------------"
11116
msgstr ""
11117
11118
#: en/help_topics/content-filters.txt:25
11119
msgid ""
11120
"The conversion between these formats is done by content filters.\n"
11121
"A content filter has two parts:"
11122
msgstr ""
11123
11124
#: en/help_topics/content-filters.txt:28
11125
msgid ""
11126
"* a read converter - converts from convenience to canonical format\n"
11127
"* a write converter - converts from canonical to convenience format."
11128
msgstr ""
11129
11130
#: en/help_topics/content-filters.txt:31
11131
msgid ""
11132
"Many of these converters will provide *round-trip* conversion,\n"
11133
"i.e. applying the read converter followed by the write converter\n"
11134
"gives back the original content. However, others may provide an\n"
11135
"asymmetric conversion. For example, a read converter might strip\n"
11136
"trailing whitespace off lines in source code while the matching\n"
11137
"write converter might pass content through unchanged."
11138
msgstr ""
11139
11140
#: en/help_topics/content-filters.txt:38
11141
msgid ""
11142
"\n"
11143
"Enabling content filters\n"
11144
"------------------------"
11145
msgstr ""
11146
11147
#: en/help_topics/content-filters.txt:42
11148
msgid ""
11149
"Content filters are typically provided by plugins, so the first step\n"
11150
"in using them is to install the relevant plugins and read their\n"
11151
"documentation. Some plugins may be very specific about which files\n"
11152
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11153
"In other cases, the plugin may leave it in the user's hands to\n"
11154
"define which files are to be filtered. This is typically done\n"
11155
"using rule-based preferences. See ``bzr help rules`` for general\n"
11156
"information about defining these."
11157
msgstr ""
11158
11159
#: en/help_topics/content-filters.txt:51
11160
msgid ""
11161
"\n"
11162
"Impact on commands\n"
11163
"------------------"
11164
msgstr ""
11165
11166
#: en/help_topics/content-filters.txt:55
11167
msgid ""
11168
"Read converters are only applied to commands that read content from\n"
11169
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11170
"will apply read converters to files in the working tree, then compare\n"
11171
"the results to the content last committed."
11172
msgstr ""
11173
11174
#: en/help_topics/content-filters.txt:60
11175
msgid ""
11176
"Write converters are only applied by commands that **create files in a\n"
11177
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11178
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11179
"respectively."
11180
msgstr ""
11181
11182
#: en/help_topics/content-filters.txt:65
11183
msgid ""
11184
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11185
"comitting files. If this makes sense for a given plugin providing\n"
11186
"a content filter, the plugin can usually achieve this effect by using a\n"
11187
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11188
"for more information on hooks."
11189
msgstr ""
11190
11191
#: en/help_topics/content-filters.txt:71
11192
msgid ""
11193
"\n"
11194
"Refreshing your working tree\n"
11195
"----------------------------"
11196
msgstr ""
11197
11198
#: en/help_topics/content-filters.txt:75
11199
msgid ""
11200
"For performance reasons, Bazaar caches the timestamps of files in\n"
11201
"a working tree, and assumes files are unchanged if their timestamps\n"
11202
"match the cached values. As a consequence, there are times when\n"
11203
"you may need to explicitly ask for content filtering to be reapplied\n"
11204
"in one or both directions, e.g. after installing or reconfiguring\n"
11205
"plugins providing it."
11206
msgstr ""
11207
11208
#: en/help_topics/content-filters.txt:82
11209
msgid "Here are some general guidelines for doing this:"
11210
msgstr ""
11211
11212
#: en/help_topics/content-filters.txt:84
11213
msgid ""
11214
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11215
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11216
" relevant read converters and compare the end result with the\n"
11217
" canonical format."
11218
msgstr ""
11219
11220
#: en/help_topics/content-filters.txt:89
11221
msgid ""
11222
" * To reapply write converters, ensure there are no local changes,\n"
11223
" delete the relevant files and run ``bzr revert`` on those files."
11224
msgstr ""
11225
11226
#: en/help_topics/content-filters.txt:92
11227
msgid ""
11228
"Note: In the future, it is likely that additional options will be added\n"
11229
"to commands to make this refreshing process faster and safer.\n"
11230
msgstr ""
11231
11232
#: en/help_topics/current-formats.txt:1
11233
msgid "Current Storage Formats"
11234
msgstr ""
11235
11236
#: en/help_topics/current-formats.txt:3
11237
msgid ""
11238
":2a:\n"
11239
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11240
" compress storage. Provides rich roots which are a one-way\n"
11241
" transition."
11242
msgstr ""
11243
11244
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11245
msgid ""
11246
"\n"
11247
"See :doc:`formats-help` for more about storage formats."
11248
msgstr ""
11249
11250
#: en/help_topics/debug-flags.txt:1
11251
msgid ""
11252
"Debug Flags\n"
11253
"==========="
11254
msgstr ""
11255
11256
#: en/help_topics/debug-flags.txt:4
11257
msgid ""
11258
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11259
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11260
msgstr ""
11261
11262
#: en/help_topics/debug-flags.txt:7
11263
msgid ""
11264
"-Dauth Trace authentication sections used.\n"
11265
"-Dbytes Print out how many bytes were transferred\n"
11266
"-Ddirstate Trace dirstate activity (verbose!)\n"
11267
"-Derror Instead of normal error handling, always print a "
11268
"traceback\n"
11269
" on error.\n"
11270
"-Devil Capture call sites that do expensive or badly-scaling\n"
11271
" operations.\n"
11272
"-Dfetch Trace history copying between repositories.\n"
11273
"-Dfilters Emit information for debugging content filtering.\n"
11274
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11275
"fetch.\n"
11276
"-Dgraph Trace graph traversal.\n"
11277
"-Dhashcache Log every time a working file is read to determine its "
11278
"hash.\n"
11279
"-Dhooks Trace hook execution.\n"
11280
"-Dhpss Trace smart protocol requests and responses.\n"
11281
"-Dhpssdetail More hpss details.\n"
11282
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11283
"-Dhttp Trace http connections, requests and responses.\n"
11284
"-Dindex Trace major index operations.\n"
11285
"-Dknit Trace knit operations.\n"
11286
"-Dlock Trace when lockdir locks are taken or released.\n"
11287
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11288
" retrying the request.\n"
11289
"-Dprogress Trace progress bar operations.\n"
11290
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11291
"-Dmerge Emit information for debugging merges.\n"
11292
"-Dno_apport Don't use apport to report crashes.\n"
11293
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11294
"-Dpack Emit information about pack operations.\n"
11295
"-Drelock Emit a message every time a branch or repository object "
11296
"is\n"
11297
" unlocked then relocked the same way.\n"
11298
"-Dsftp Trace SFTP internals.\n"
11299
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11300
"expected\n"
11301
"-Dstream Trace fetch streams.\n"
11302
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11303
"portable\n"
11304
" manner.\n"
11305
"-Dunlock Some errors during unlock are treated as warnings.\n"
11306
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11307
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11308
"appropriate\n"
11309
" for the format, even for non-local fetches.\n"
11310
msgstr ""
11311
11312
#: en/help_topics/diverged-branches.txt:1
11313
msgid ""
11314
"Diverged Branches\n"
11315
"================="
11316
msgstr ""
11317
11318
#: en/help_topics/diverged-branches.txt:4
11319
msgid ""
11320
"When Bazaar tries to push one branch onto another, it requires that the\n"
11321
"destination branch must be ready to receive the source branch. If this "
11322
"isn't\n"
11323
"the case, then we say that the branches have ``diverged``. Branches are\n"
11324
"considered diverged if the destination branch's most recent commit is one "
11325
"that\n"
11326
"has not been merged (directly or indirectly) by the source branch. To "
11327
"recover\n"
11328
"from diverged branches, one must merge the missing revisions into the "
11329
"source\n"
11330
"branch."
11331
msgstr ""
11332
11333
#: en/help_topics/diverged-branches.txt:12
11334
msgid ""
11335
"This situation commonly arises when using a centralized workflow with local\n"
11336
"commits. If someone else has committed new work to the mainline since your\n"
11337
"last pull and you have local commits that have not yet been pushed to the\n"
11338
"mainline, then your local branch and the mainline have diverged."
11339
msgstr ""
11340
11341
#: en/help_topics/diverged-branches.txt:17
11342
msgid ""
11343
"Discovering What Has Diverged\n"
11344
"-----------------------------"
11345
msgstr ""
11346
11347
#: en/help_topics/diverged-branches.txt:20
11348
msgid ""
11349
"The ``bzr missing`` command is used to find out what revisions are in "
11350
"another\n"
11351
"branch that are not present in the current branch, and vice-versa. It shows "
11352
"a\n"
11353
"summary of which extra revisions exist in each branch. If you want to see "
11354
"the\n"
11355
"precise effects of those revisions, you can use ``bzr diff --"
11356
"old=other_branch``\n"
11357
"to show the differences between other_branch and your current branch."
11358
msgstr ""
11359
11360
#: en/help_topics/diverged-branches.txt:26
11361
msgid ""
11362
"A Solution\n"
11363
"----------"
11364
msgstr ""
11365
11366
#: en/help_topics/diverged-branches.txt:29
11367
msgid ""
11368
"The solution is to merge the revisions from the mainline into your local\n"
11369
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11370
"mainline. This merge may result in conflicts if the other developer's "
11371
"changes\n"
11372
"overlap with your changes. These conflicts should be resolved before\n"
11373
"continuing. After any conflicts have been resolved, or even if there were "
11374
"no\n"
11375
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11376
"to your local branch. This requirement gives you an opportunity to test "
11377
"the\n"
11378
"resulting working tree for correctness, since the merged revisions could "
11379
"have\n"
11380
"made arbitrary changes. After testing, you should commit the merge using\n"
11381
"``bzr commit``. This clears up the diverged branches situation. Your "
11382
"local\n"
11383
"branch can now be pushed to the mainline.\n"
11384
msgstr ""
11385
11386
#: en/help_topics/eol.txt:1
11387
msgid ""
11388
"End of Line Conversion\n"
11389
"======================"
11390
msgstr ""
11391
11392
#: en/help_topics/eol.txt:4
11393
msgid ""
11394
"EOL conversion is provided as a content filter where Bazaar internally\n"
11395
"stores a canonical format but outputs a convenience format. See\n"
11396
"``bzr help content-filters`` for general information about using these."
11397
msgstr ""
11398
11399
#: en/help_topics/eol.txt:8
11400
msgid ""
11401
"Note: Content filtering is only supported in recently added formats,\n"
11402
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11403
"in a recent format. (Just setting the format on the repository\n"
11404
"is not enough.) If content filtering does not appear to be working, use\n"
11405
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11406
"or later."
11407
msgstr ""
11408
11409
#: en/help_topics/eol.txt:15
11410
msgid ""
11411
"EOL conversion needs to be enabled for selected file patterns using\n"
11412
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11413
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11414
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11415
"supported in a future verison of Bazaar."
11416
msgstr ""
11417
11418
#: en/help_topics/eol.txt:21
11419
msgid ""
11420
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11421
"(If a value is not set, ``exact`` is the default.)"
11422
msgstr ""
11423
11424
#: en/help_topics/eol.txt:24
11425
msgid ""
11426
" ========== ===================================== ======================\n"
11427
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11428
" ========== ===================================== ======================\n"
11429
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11430
" ---------- ------------------------------------- ----------------------\n"
11431
" ``lf`` ``lf`` ``lf``\n"
11432
" ---------- ------------------------------------- ----------------------\n"
11433
" ``crlf`` ``crlf`` ``lf``\n"
11434
" ---------- ------------------------------------- ----------------------\n"
11435
" ``exact`` No conversion Exactly as in file\n"
11436
" ========== ===================================== ======================"
11437
msgstr ""
11438
11439
#: en/help_topics/eol.txt:36
11440
msgid ""
11441
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11442
"byte is detected in the file."
11443
msgstr ""
11444
11445
#: en/help_topics/eol.txt:39
11446
msgid ""
11447
"For users working on a cross-platform project, here is a suggested rule\n"
11448
"to use as a starting point::"
11449
msgstr ""
11450
11451
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11452
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11453
msgid ""
11454
" [name *]\n"
11455
" eol = native"
11456
msgstr ""
11457
11458
#: en/help_topics/eol.txt:45
11459
msgid ""
11460
"If you have binary files that do not contain a null byte though, be\n"
11461
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11462
"by giving more explicit patterns earlier in the rules file. For example::"
11463
msgstr ""
11464
11465
#: en/help_topics/eol.txt:49
11466
msgid ""
11467
" [name *.png]\n"
11468
" eol = exact"
11469
msgstr ""
11470
11471
#: en/help_topics/eol.txt:55
11472
msgid ""
11473
"If your working tree is on a network drive shared by users on different\n"
11474
"operating systems, you typically want to force certain conventions for\n"
11475
"certain files. In that way, if a file is created with the wrong line\n"
11476
"endings or line endings get mixed during editing, it gets committed\n"
11477
"correctly and gets checked out correctly. For example::"
11478
msgstr ""
11479
11480
#: en/help_topics/eol.txt:61
11481
msgid ""
11482
" [name *.bat]\n"
11483
" eol = crlf"
11484
msgstr ""
11485
11486
#: en/help_topics/eol.txt:64
11487
msgid ""
11488
" [name *.sh]\n"
11489
" eol = lf"
11490
msgstr ""
11491
11492
#: en/help_topics/eol.txt:70
11493
msgid ""
11494
"If you take the care to create files with their required endings, you can\n"
11495
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11496
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11497
"introducing mixed line endings will be corrected during commit for files\n"
11498
"with those settings."
11499
msgstr ""
11500
11501
#: en/help_topics/eol.txt:76
11502
msgid ""
11503
"If you have sample test data that deliberately has text files with mixed\n"
11504
"newline conventions, you can ask for those to be left alone like this::"
11505
msgstr ""
11506
11507
#: en/help_topics/eol.txt:79
11508
msgid ""
11509
" [name test_data/]\n"
11510
" eol = exact"
11511
msgstr ""
11512
11513
#: en/help_topics/eol.txt:85
11514
msgid ""
11515
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11516
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11517
"of content analysis to detect binary files for commands like ``diff``.\n"
11518
"In the future, a ``binary = true`` rule may be added but it is not\n"
11519
"supported yet.)"
11520
msgstr ""
11521
11522
#: en/help_topics/eol.txt:91
11523
msgid ""
11524
"If you have an existing repository with text files already stored using\n"
11525
"Windows newline conventions (``crlf``), then you may want to keep using "
11526
"that\n"
11527
"convention in the repository. Forcing certain files to this convention\n"
11528
"may also help users who do not have rules configured. To do this, set\n"
11529
"``eol`` to one of the values below."
11530
msgstr ""
11531
11532
#: en/help_topics/eol.txt:97
11533
msgid ""
11534
" ============================ ======================== "
11535
"======================\n"
11536
" Value Checkout end-of-lines as Commit end-of-lines "
11537
"as\n"
11538
" ============================ ======================== "
11539
"======================\n"
11540
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11541
" ``lf`` otherwise\n"
11542
" ---------------------------- ------------------------ ----------------------"
11543
"\n"
11544
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11545
" ---------------------------- ------------------------ ----------------------"
11546
"\n"
11547
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11548
" ============================ ======================== ======================"
11549
msgstr ""
11550
11551
#: en/help_topics/eol.txt:108
11552
msgid ""
11553
"For users working on an existing project that uses Windows newline\n"
11554
"conventions in their Bazaar repository, this rule is suggested as a\n"
11555
"starting point::"
11556
msgstr ""
11557
11558
#: en/help_topics/eol.txt:112
11559
msgid ""
11560
" [name *]\n"
11561
" eol = native-with-crlf-in-repo"
11562
msgstr ""
11563
11564
#: en/help_topics/eol.txt:115
11565
msgid ""
11566
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11567
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11568
"``crlf`` and ``exact``."
11569
msgstr ""
11570
11571
#: en/help_topics/eol.txt:119
11572
msgid ""
11573
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11574
"never reject files because a given line ending or mixed line endings\n"
11575
"are found. A precommit hook should be used if you wish to validate\n"
11576
"(and not just convert) content before committing.\n"
11577
msgstr ""
11578
11579
#: en/help_topics/hidden-commands.txt:1
11580
msgid ""
11581
"added List files added in working tree.\n"
11582
"ancestry List all revisions merged into this branch.\n"
11583
"assert-fail Test reporting of assertion failures\n"
11584
"bundle-info Output interesting stats about a bundle\n"
11585
"bundle-revisions Create a merge-directive for submitting changes.\n"
11586
"cat-revision Write out metadata for a revision.\n"
11587
"dump-btree Dump the contents of a btree index file to stdout.\n"
11588
"export-pot Export command helps and error messages in po format.\n"
11589
"file-id Print file_id of a particular file or directory.\n"
11590
"file-path Print path of file_ids to a file or directory.\n"
11591
"find-merge-base Find and print a base revision for merging two "
11592
"branches.\n"
11593
"hooks Show hooks.\n"
11594
"inventory Show inventory of the current working copy or a "
11595
"revision.\n"
11596
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11597
"lookup-revision Lookup the revision-id from a revision-number\n"
11598
"merge-directive Generate a merge directive for auto-merge tools.\n"
11599
"modified List files modified in working tree.\n"
11600
"re-sign Create a digital signature for an existing revision.\n"
11601
"reference list, view and set branch locations for nested trees.\n"
11602
"relpath Show path of a file relative to root\n"
11603
"repair-workingtree Reset the working tree state file.\n"
11604
"revision-history Display the list of revision ids on a branch.\n"
11605
"revision-info Show revision number and revision id for a given "
11606
"revision\n"
11607
" identifier.\n"
11608
"rocks Statement of optimism.\n"
11609
"selftest Run internal test suite.\n"
11610
"shell-complete Show appropriate completions for context.\n"
11611
"test-script Run a shell-like test from a file.\n"
11612
"touching-revisions Return revision-ids which affected a particular file.\n"
11613
"unknowns List unknown files.\n"
11614
"wait-until-signalled Test helper for\n"
11615
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11616
msgstr ""
11617
11618
#: en/help_topics/hooks.txt:1
11619
msgid ""
11620
"\n"
11621
"Hooks\n"
11622
"====="
11623
msgstr ""
11624
11625
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11626
msgid ""
11627
"Introduction\n"
11628
"------------"
11629
msgstr ""
11630
11631
#: en/help_topics/hooks.txt:8
11632
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11633
msgstr ""
11634
11635
#: en/help_topics/hooks.txt:10
11636
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11637
msgstr ""
11638
11639
#: en/help_topics/hooks.txt:12
11640
msgid ""
11641
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11642
msgstr ""
11643
11644
#: en/help_topics/hooks.txt:14
11645
msgid ""
11646
"The class that contains each hook is given before the hooks it supplies. "
11647
"For\n"
11648
"instance, BranchHooks as the class is the hooks class for\n"
11649
"`bzrlib.branch.Branch.hooks`."
11650
msgstr ""
11651
11652
#: en/help_topics/hooks.txt:18
11653
msgid ""
11654
"Each description also indicates whether the hook runs on the client (the\n"
11655
"machine where bzr was invoked) or the server (the machine addressed by\n"
11656
"the branch URL). These may be, but are not necessarily, the same machine."
11657
msgstr ""
11658
11659
#: en/help_topics/hooks.txt:22
11660
msgid ""
11661
"Plugins (including hooks) are run on the server if all of these is true:"
11662
msgstr ""
11663
11664
#: en/help_topics/hooks.txt:24
11665
msgid ""
11666
" * The connection is via a smart server (accessed with a URL starting with\n"
11667
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11668
"\"http://\"\n"
11669
" URL when a smart server is available via HTTP)."
11670
msgstr ""
11671
11672
#: en/help_topics/hooks.txt:28
11673
msgid ""
11674
" * The hook is either server specific or part of general infrastructure "
11675
"rather\n"
11676
" than client specific code (such as commit)."
11677
msgstr ""
11678
11679
#: en/help_topics/hooks.txt:31
11680
msgid ""
11681
"\n"
11682
"BranchHooks\n"
11683
"-----------"
11684
msgstr ""
11685
11686
#: en/help_topics/hooks.txt:35
11687
msgid ""
11688
"automatic_tag_name\n"
11689
"~~~~~~~~~~~~~~~~~~"
11690
msgstr ""
11691
11692
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11693
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11694
msgid "Introduced in: 2.2"
11695
msgstr ""
11696
11697
#: en/help_topics/hooks.txt:40
11698
msgid ""
11699
"Called to determine an automatic tag name for a revision.\n"
11700
"automatic_tag_name is called with (branch, revision_id) and should\n"
11701
"return a tag name or None if no tag name could be determined. The\n"
11702
"first non-None tag name returned will be used."
11703
msgstr ""
11704
11705
#: en/help_topics/hooks.txt:45
11706
msgid ""
11707
"open\n"
11708
"~~~~"
11709
msgstr ""
11710
11711
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11712
#: en/help_topics/hooks.txt:304
11713
msgid "Introduced in: 1.8"
11714
msgstr ""
11715
11716
#: en/help_topics/hooks.txt:50
11717
msgid ""
11718
"Called with the Branch object that has been opened after a branch is\n"
11719
"opened."
11720
msgstr ""
11721
11722
#: en/help_topics/hooks.txt:53
11723
msgid ""
11724
"post_branch_init\n"
11725
"~~~~~~~~~~~~~~~~"
11726
msgstr ""
11727
11728
#: en/help_topics/hooks.txt:58
11729
msgid ""
11730
"Called after new branch initialization completes. post_branch_init is\n"
11731
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11732
"branch and checkout (both heavyweight and lightweight) will all\n"
11733
"trigger this hook."
11734
msgstr ""
11735
11736
#: en/help_topics/hooks.txt:63
11737
msgid ""
11738
"post_change_branch_tip\n"
11739
"~~~~~~~~~~~~~~~~~~~~~~"
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11743
msgid "Introduced in: 1.4"
11744
msgstr ""
11745
11746
#: en/help_topics/hooks.txt:68
11747
msgid ""
11748
"Called in bzr client and server after a change to the tip of a branch\n"
11749
"is made. post_change_branch_tip is called with a\n"
11750
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11751
"uncommit will all trigger this hook."
11752
msgstr ""
11753
11754
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11755
msgid ""
11756
"post_commit\n"
11757
"~~~~~~~~~~~"
11758
msgstr ""
11759
11760
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11761
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11762
#: en/help_topics/hooks.txt:145
11763
msgid "Introduced in: 0.15"
11764
msgstr ""
11765
11766
#: en/help_topics/hooks.txt:78
11767
msgid ""
11768
"Called in the bzr client after a commit has completed. post_commit is\n"
11769
"called with (local, master, old_revno, old_revid, new_revno,\n"
11770
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11771
"branch."
11772
msgstr ""
11773
11774
#: en/help_topics/hooks.txt:83
11775
msgid ""
11776
"post_pull\n"
11777
"~~~~~~~~~"
11778
msgstr ""
11779
11780
#: en/help_topics/hooks.txt:88
11781
msgid ""
11782
"Called after a pull operation completes. post_pull is called with a\n"
11783
"bzrlib.branch.PullResult object and only runs in the bzr client."
11784
msgstr ""
11785
11786
#: en/help_topics/hooks.txt:91
11787
msgid ""
11788
"post_push\n"
11789
"~~~~~~~~~"
11790
msgstr ""
11791
11792
#: en/help_topics/hooks.txt:96
11793
msgid ""
11794
"Called after a push operation completes. post_push is called with a\n"
11795
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:99
11799
msgid ""
11800
"post_switch\n"
11801
"~~~~~~~~~~~"
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:104
11805
msgid ""
11806
"Called after a checkout switches branch. post_switch is called with a\n"
11807
"bzrlib.branch.SwitchHookParams."
11808
msgstr ""
11809
11810
#: en/help_topics/hooks.txt:107
11811
msgid ""
11812
"post_uncommit\n"
11813
"~~~~~~~~~~~~~"
11814
msgstr ""
11815
11816
#: en/help_topics/hooks.txt:112
11817
msgid ""
11818
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11819
"called with (local, master, old_revno, old_revid, new_revno,\n"
11820
"new_revid) where local is the local branch or None, master is the\n"
11821
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11822
"of None."
11823
msgstr ""
11824
11825
#: en/help_topics/hooks.txt:118
11826
msgid ""
11827
"pre_change_branch_tip\n"
11828
"~~~~~~~~~~~~~~~~~~~~~"
11829
msgstr ""
11830
11831
#: en/help_topics/hooks.txt:121
11832
msgid "Introduced in: 1.6"
11833
msgstr ""
11834
11835
#: en/help_topics/hooks.txt:123
11836
msgid ""
11837
"Called in bzr client and server before a change to the tip of a branch\n"
11838
"is made. pre_change_branch_tip is called with a\n"
11839
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11840
"uncommit will all trigger this hook."
11841
msgstr ""
11842
11843
#: en/help_topics/hooks.txt:128
11844
msgid ""
11845
"pre_commit\n"
11846
"~~~~~~~~~~"
11847
msgstr ""
11848
11849
#: en/help_topics/hooks.txt:131
11850
msgid "Introduced in: 0.91"
11851
msgstr ""
11852
11853
#: en/help_topics/hooks.txt:133
11854
msgid ""
11855
"Called after a commit is calculated but before it is completed.\n"
11856
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11857
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11858
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11859
"TreeDelta object describing changes from the basis revision. hooks\n"
11860
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11861
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11862
"tree."
11863
msgstr ""
11864
11865
#: en/help_topics/hooks.txt:142
11866
msgid ""
11867
"set_rh\n"
11868
"~~~~~~"
11869
msgstr ""
11870
11871
#: en/help_topics/hooks.txt:147
11872
msgid ""
11873
"Invoked whenever the revision history has been set via\n"
11874
"set_revision_history. The api signature is (branch, revision_history),\n"
11875
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11876
"for bzr to trigger, a better hook to use is\n"
11877
"Branch.post_change_branch_tip."
11878
msgstr ""
11879
11880
#: en/help_topics/hooks.txt:153
11881
msgid ""
11882
"transform_fallback_location\n"
11883
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:156
11887
msgid "Introduced in: 1.9"
11888
msgstr ""
11889
11890
#: en/help_topics/hooks.txt:158
11891
msgid ""
11892
"Called when a stacked branch is activating its fallback locations.\n"
11893
"transform_fallback_location is called with (branch, url), and should\n"
11894
"return a new url. Returning the same url allows it to be used as-is,\n"
11895
"returning a different one can be used to cause the branch to stack on\n"
11896
"a closer copy of that fallback_location. Note that the branch cannot\n"
11897
"have history accessing methods called on it during this hook because\n"
11898
"the fallback locations have not been activated. When there are\n"
11899
"multiple hooks installed for transform_fallback_location, all are\n"
11900
"called with the url returned from the previous hook.The order is\n"
11901
"however undefined."
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:169
11905
msgid ""
11906
"CommandHooks\n"
11907
"------------"
11908
msgstr ""
11909
11910
#: en/help_topics/hooks.txt:172
11911
msgid ""
11912
"extend_command\n"
11913
"~~~~~~~~~~~~~~"
11914
msgstr ""
11915
11916
#: en/help_topics/hooks.txt:175
11917
msgid "Introduced in: 1.13"
11918
msgstr ""
11919
11920
#: en/help_topics/hooks.txt:177
11921
msgid ""
11922
"Called after creating a command object to allow modifications such as\n"
11923
"adding or removing options, docs etc. Called with the new\n"
11924
"bzrlib.commands.Command object."
11925
msgstr ""
11926
11927
#: en/help_topics/hooks.txt:181
11928
msgid ""
11929
"get_command\n"
11930
"~~~~~~~~~~~"
11931
msgstr ""
11932
11933
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11934
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11935
msgid "Introduced in: 1.17"
11936
msgstr ""
11937
11938
#: en/help_topics/hooks.txt:186
11939
msgid ""
11940
"Called when creating a single command. Called with (cmd_or_None,\n"
11941
"command_name). get_command should either return the cmd_or_None\n"
11942
"parameter, or a replacement Command object that should be used for the\n"
11943
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11944
"Many users will prefer to use bzrlib.commands.register_command or\n"
11945
"plugin_cmds.register_lazy."
11946
msgstr ""
11947
11948
#: en/help_topics/hooks.txt:193
11949
msgid ""
11950
"get_missing_command\n"
11951
"~~~~~~~~~~~~~~~~~~~"
11952
msgstr ""
11953
11954
#: en/help_topics/hooks.txt:198
11955
msgid ""
11956
"Called when creating a single command if no command could be found.\n"
11957
"Called with (command_name). get_missing_command should either return\n"
11958
"None, or a Command object to be used for the command."
11959
msgstr ""
11960
11961
#: en/help_topics/hooks.txt:202
11962
msgid ""
11963
"list_commands\n"
11964
"~~~~~~~~~~~~~"
11965
msgstr ""
11966
11967
#: en/help_topics/hooks.txt:207
11968
msgid ""
11969
"Called when enumerating commands. Called with a set of cmd_name\n"
11970
"strings for all the commands found so far. This set is safe to mutate\n"
11971
"- e.g. to remove a command. list_commands should return the updated\n"
11972
"set of command names."
11973
msgstr ""
11974
11975
#: en/help_topics/hooks.txt:212
11976
msgid ""
11977
"_ConfigHooks\n"
11978
"------------"
11979
msgstr ""
11980
11981
#: en/help_topics/hooks.txt:215
11982
msgid ""
11983
"get\n"
11984
"~~~"
11985
msgstr ""
11986
11987
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11988
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11989
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11990
#: en/help_topics/hooks.txt:443
11991
msgid "Introduced in: 2.4"
11992
msgstr ""
11993
11994
#: en/help_topics/hooks.txt:220
11995
msgid ""
11996
"Invoked when a config option is read. The signature is (stack, name,\n"
11997
"value)."
11998
msgstr ""
11999
12000
#: en/help_topics/hooks.txt:223
12001
msgid ""
12002
"load\n"
12003
"~~~~"
12004
msgstr ""
12005
12006
#: en/help_topics/hooks.txt:228
12007
msgid "Invoked when a config store is loaded. The signature is (store)."
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:230
12011
msgid ""
12012
"remove\n"
12013
"~~~~~~"
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:235
12017
msgid ""
12018
"Invoked when a config option is removed. The signature is (stack,\n"
12019
"name)."
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:238
12023
msgid ""
12024
"save\n"
12025
"~~~~"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:243
12029
msgid "Invoked when a config store is saved. The signature is (store)."
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:245
12033
msgid ""
12034
"set\n"
12035
"~~~"
12036
msgstr ""
12037
12038
#: en/help_topics/hooks.txt:250
12039
msgid ""
12040
"Invoked when a config option is set. The signature is (stack, name,\n"
12041
"value)."
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:253
12045
msgid ""
12046
"ControlDirHooks\n"
12047
"---------------"
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:256
12051
msgid ""
12052
"post_repo_init\n"
12053
"~~~~~~~~~~~~~~"
12054
msgstr ""
12055
12056
#: en/help_topics/hooks.txt:261
12057
msgid ""
12058
"Invoked after a repository has been initialized. post_repo_init is\n"
12059
"called with a bzrlib.controldir.RepoInitHookParams."
12060
msgstr ""
12061
12062
#: en/help_topics/hooks.txt:264
12063
msgid ""
12064
"pre_open\n"
12065
"~~~~~~~~"
12066
msgstr ""
12067
12068
#: en/help_topics/hooks.txt:267
12069
msgid "Introduced in: 1.14"
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:269
12073
msgid ""
12074
"Invoked before attempting to open a ControlDir with the transport that\n"
12075
"the open will use."
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:272
12079
msgid ""
12080
"InfoHooks\n"
12081
"---------"
12082
msgstr ""
12083
12084
#: en/help_topics/hooks.txt:275
12085
msgid ""
12086
"repository\n"
12087
"~~~~~~~~~~"
12088
msgstr ""
12089
12090
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12091
#: en/help_topics/hooks.txt:521
12092
msgid "Introduced in: 1.15"
12093
msgstr ""
12094
12095
#: en/help_topics/hooks.txt:280
12096
msgid ""
12097
"Invoked when displaying the statistics for a repository. repository is\n"
12098
"called with a statistics dictionary as returned by the repository and\n"
12099
"a file-like object to write to."
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:284
12103
msgid ""
12104
"LockHooks\n"
12105
"---------"
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:287
12109
msgid ""
12110
"lock_acquired\n"
12111
"~~~~~~~~~~~~~"
12112
msgstr ""
12113
12114
#: en/help_topics/hooks.txt:292
12115
msgid ""
12116
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12117
msgstr ""
12118
12119
#: en/help_topics/hooks.txt:294
12120
msgid ""
12121
"lock_broken\n"
12122
"~~~~~~~~~~~"
12123
msgstr ""
12124
12125
#: en/help_topics/hooks.txt:299
12126
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12127
msgstr ""
12128
12129
#: en/help_topics/hooks.txt:301
12130
msgid ""
12131
"lock_released\n"
12132
"~~~~~~~~~~~~~"
12133
msgstr ""
12134
12135
#: en/help_topics/hooks.txt:306
12136
msgid ""
12137
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:308
12141
msgid ""
12142
"MergeHooks\n"
12143
"----------"
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:311
12147
msgid ""
12148
"merge_file_content\n"
12149
"~~~~~~~~~~~~~~~~~~"
12150
msgstr ""
12151
12152
#: en/help_topics/hooks.txt:314
12153
msgid "Introduced in: 2.1"
12154
msgstr ""
12155
12156
#: en/help_topics/hooks.txt:316
12157
msgid ""
12158
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12159
"object when starting a merge. Should return either None or a subclass\n"
12160
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12161
"called per file that needs to be merged (including when one side has\n"
12162
"deleted the file and the other has changed it). See the\n"
12163
"AbstractPerFileMerger API docs for details on how it is used by merge."
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:323
12167
msgid ""
12168
"post_merge\n"
12169
"~~~~~~~~~~"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12173
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12174
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12175
msgid "Introduced in: 2.5"
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:328
12179
msgid ""
12180
"Called after a merge. Receives a Merger object as the single argument.\n"
12181
"The return value is ignored."
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:331
12185
msgid ""
12186
"pre_merge\n"
12187
"~~~~~~~~~"
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:336
12191
msgid ""
12192
"Called before a merge. Receives a Merger object as the single\n"
12193
"argument."
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:339
12197
msgid ""
12198
"MergeDirectiveHooks\n"
12199
"-------------------"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:342
12203
msgid ""
12204
"merge_request_body\n"
12205
"~~~~~~~~~~~~~~~~~~"
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:345
12209
msgid "Introduced in: 1.15.0"
12210
msgstr ""
12211
12212
#: en/help_topics/hooks.txt:347
12213
msgid ""
12214
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12215
"request. Callbacks must return a body. If more than one callback is\n"
12216
"registered, the output of one callback is provided to the next."
12217
msgstr ""
12218
12219
#: en/help_topics/hooks.txt:351
12220
msgid ""
12221
"MessageEditorHooks\n"
12222
"------------------"
12223
msgstr ""
12224
12225
#: en/help_topics/hooks.txt:354
12226
msgid ""
12227
"commit_message_template\n"
12228
"~~~~~~~~~~~~~~~~~~~~~~~"
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:357
12232
msgid "Introduced in: 1.10"
12233
msgstr ""
12234
12235
#: en/help_topics/hooks.txt:359
12236
msgid ""
12237
"Called when a commit message is being generated.\n"
12238
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12239
"and the message that is known so far. commit_message_template must\n"
12240
"return a new message to use (which could be the same as it was given).\n"
12241
"When there are multiple hooks registered for commit_message_template,\n"
12242
"they are chained with the result from the first passed into the\n"
12243
"second, and so on."
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:367
12247
msgid ""
12248
"set_commit_message\n"
12249
"~~~~~~~~~~~~~~~~~~"
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:372
12253
msgid ""
12254
"Set a fixed commit message. set_commit_message is called with the\n"
12255
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12256
"properties by editing commit.builder._revprops) and the message so\n"
12257
"far. set_commit_message must return the message to use or None if it\n"
12258
"should use the message editor as normal."
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:378
12262
msgid ""
12263
"MutableTreeHooks\n"
12264
"----------------"
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:381
12268
msgid ""
12269
"post_build_tree\n"
12270
"~~~~~~~~~~~~~~~"
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:386
12274
msgid ""
12275
"Called after a completely new tree is built. The hook is called with\n"
12276
"the tree as its only argument."
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:392
12280
msgid "Introduced in: 2.0"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:394
12284
msgid ""
12285
"Called after a commit is performed on a tree. The hook is called with\n"
12286
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12287
"commit was performed on is available via the mutable_tree attribute of\n"
12288
"that object."
12289
msgstr ""
12290
12291
#: en/help_topics/hooks.txt:399
12292
msgid ""
12293
"post_transform\n"
12294
"~~~~~~~~~~~~~~"
12295
msgstr ""
12296
12297
#: en/help_topics/hooks.txt:404
12298
msgid ""
12299
"Called after a tree transform has been performed on a tree. The hook\n"
12300
"is called with the tree that is being transformed and the transform."
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:407
12304
msgid ""
12305
"pre_transform\n"
12306
"~~~~~~~~~~~~~"
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:412
12310
msgid ""
12311
"Called before a tree transform on this tree. The hook is called with\n"
12312
"the tree that is being transformed and the transform."
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:415
12316
msgid ""
12317
"start_commit\n"
12318
"~~~~~~~~~~~~"
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:420
12322
msgid ""
12323
"Called before a commit is performed on a tree. The start commit hook\n"
12324
"is able to change the tree before the commit takes place. start_commit\n"
12325
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12326
"being performed on."
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:425
12330
msgid ""
12331
"SmartClientHooks\n"
12332
"----------------"
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:428
12336
msgid ""
12337
"call\n"
12338
"~~~~"
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:431
12342
msgid "Introduced in: unknown"
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:433
12346
msgid ""
12347
"Called when the smart client is submitting a request to the smart\n"
12348
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12349
"Streaming request bodies, and responses, are not accessible."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:437
12353
msgid ""
12354
"SmartServerHooks\n"
12355
"----------------"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:440
12359
msgid ""
12360
"server_exception\n"
12361
"~~~~~~~~~~~~~~~~"
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:445
12365
msgid ""
12366
"Called by the bzr server when an exception occurs. server_exception is\n"
12367
"called with the sys.exc_info() tuple return true for the hook if the\n"
12368
"exception has been handled, in which case the server will exit\n"
12369
"normally."
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:450
12373
msgid ""
12374
"server_started\n"
12375
"~~~~~~~~~~~~~~"
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12379
msgid "Introduced in: 0.16"
12380
msgstr ""
12381
12382
#: en/help_topics/hooks.txt:455
12383
msgid ""
12384
"Called by the bzr server when it starts serving a directory.\n"
12385
"server_started is called with (backing urls, public url), where\n"
12386
"backing_url is a list of URLs giving the server-specific directory\n"
12387
"locations, and public_url is the public URL for the directory being\n"
12388
"served."
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:461
12392
msgid ""
12393
"server_started_ex\n"
12394
"~~~~~~~~~~~~~~~~~"
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:466
12398
msgid ""
12399
"Called by the bzr server when it starts serving a directory.\n"
12400
"server_started is called with (backing_urls, server_obj)."
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:469
12404
msgid ""
12405
"server_stopped\n"
12406
"~~~~~~~~~~~~~~"
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:474
12410
msgid ""
12411
"Called by the bzr server when it stops serving a directory.\n"
12412
"server_stopped is called with the same parameters as the\n"
12413
"server_started hook: (backing_urls, public_url)."
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:478
12417
msgid ""
12418
"StatusHooks\n"
12419
"-----------"
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:481
12423
msgid ""
12424
"post_status\n"
12425
"~~~~~~~~~~~"
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12429
msgid "Introduced in: 2.3"
12430
msgstr ""
12431
12432
#: en/help_topics/hooks.txt:486
12433
msgid ""
12434
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12435
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12436
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12437
"correspond to the command line options specified by the user for the\n"
12438
"status command. to_file is the output stream for writing."
12439
msgstr ""
12440
12441
#: en/help_topics/hooks.txt:492
12442
msgid ""
12443
"pre_status\n"
12444
"~~~~~~~~~~"
12445
msgstr ""
12446
12447
#: en/help_topics/hooks.txt:497
12448
msgid ""
12449
"Called with argument StatusHookParams before Bazaar displays the\n"
12450
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12451
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12452
"correspond to the command line options specified by the user for the\n"
12453
"status command. to_file is the output stream for writing."
12454
msgstr ""
12455
12456
#: en/help_topics/hooks.txt:503
12457
msgid ""
12458
"TransportHooks\n"
12459
"--------------"
12460
msgstr ""
12461
12462
#: en/help_topics/hooks.txt:506
12463
msgid ""
12464
"post_connect\n"
12465
"~~~~~~~~~~~~"
12466
msgstr ""
12467
12468
#: en/help_topics/hooks.txt:511
12469
msgid ""
12470
"Called after a new connection is established or a reconnect occurs.\n"
12471
"The sole argument passed is either the connected transport or smart\n"
12472
"medium instance."
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:515
12476
msgid ""
12477
"RioVersionInfoBuilderHooks\n"
12478
"--------------------------"
12479
msgstr ""
12480
12481
#: en/help_topics/hooks.txt:518
12482
msgid ""
12483
"revision\n"
12484
"~~~~~~~~"
12485
msgstr ""
12486
12487
#: en/help_topics/hooks.txt:523
12488
msgid ""
12489
"Invoked when adding information about a revision to the RIO stanza\n"
12490
"that is printed. revision is called with a revision object and a RIO\n"
12491
"stanza.\n"
12492
msgstr ""
12493
12494
#: en/help_topics/location-alias.txt:1
12495
msgid ""
12496
"Location aliases\n"
12497
"================"
12498
msgstr ""
12499
12500
#: en/help_topics/location-alias.txt:4
12501
msgid ""
12502
"Bazaar defines several aliases for locations associated with a branch. "
12503
"These\n"
12504
"can be used with most commands that expect a location, such as `bzr push`."
12505
msgstr ""
12506
12507
#: en/help_topics/location-alias.txt:7
12508
msgid "The aliases are::"
12509
msgstr ""
12510
12511
#: en/help_topics/location-alias.txt:9
12512
msgid ""
12513
" :bound The branch this branch is bound to, for bound branches.\n"
12514
" :parent The parent of this branch.\n"
12515
" :public The public location of this branch.\n"
12516
" :push The saved location used for `bzr push` with no arguments.\n"
12517
" :submit The submit branch for this branch.\n"
12518
" :this This branch."
12519
msgstr ""
12520
12521
#: en/help_topics/location-alias.txt:16
12522
msgid "For example, to push to the parent location::"
12523
msgstr ""
12524
12525
#: en/help_topics/location-alias.txt:18
12526
msgid " bzr push :parent\n"
12527
msgstr ""
12528
12529
#: en/help_topics/log-formats.txt:1
12530
msgid ""
12531
"Log Formats\n"
12532
"==========="
12533
msgstr ""
12534
12535
#: en/help_topics/log-formats.txt:4
12536
msgid ""
12537
"A log format controls how information about each revision is displayed.\n"
12538
"The standard log formats are compared below::"
12539
msgstr ""
12540
12541
#: en/help_topics/log-formats.txt:7
12542
msgid ""
12543
" Feature long short line\n"
12544
" ---------------------- ------------- ------------ -------------------\n"
12545
" design goal detailed view concise view 1 revision per line\n"
12546
" committer name+email name only name only\n"
12547
" author name+email - -\n"
12548
" date-time format full date only date only\n"
12549
" commit message full full top line\n"
12550
" tags yes yes yes\n"
12551
" merges indicator - yes -\n"
12552
" status/delta optional optional -\n"
12553
" diff/patch optional optional -\n"
12554
" revision-id optional optional -\n"
12555
" branch nick yes - -\n"
12556
" foreign vcs properties yes yes -\n"
12557
" preferred levels all 1 1\n"
12558
" digital signature optional - -"
12559
msgstr ""
12560
12561
#: en/help_topics/log-formats.txt:24
12562
msgid ""
12563
"The default format is ``long``. To change this, define the ``log_format``\n"
12564
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12565
msgstr ""
12566
12567
#: en/help_topics/log-formats.txt:27
12568
msgid ""
12569
" [DEFAULT]\n"
12570
" log_format = short"
12571
msgstr ""
12572
12573
#: en/help_topics/log-formats.txt:30
12574
msgid ""
12575
"Alternatively, to change the log format used for a given query, use the\n"
12576
"--long, --short or --line options."
12577
msgstr ""
12578
12579
#: en/help_topics/log-formats.txt:33
12580
msgid ""
12581
"If one of the standard log formats does not meet your needs, additional\n"
12582
"formats can be provided by plugins.\n"
12583
msgstr ""
12584
12585
#: en/help_topics/other-formats.txt:1
12586
msgid "Other Storage Formats"
12587
msgstr ""
12588
12589
#: en/help_topics/other-formats.txt:3
12590
msgid "Experimental formats are shown below."
12591
msgstr ""
12592
12593
#: en/help_topics/other-formats.txt:5
12594
msgid ""
12595
":development-colo:\n"
12596
" (native) The 2a format with experimental support for colocated\n"
12597
" branches."
12598
msgstr ""
12599
12600
#: en/help_topics/other-formats.txt:9
12601
msgid ""
12602
"\n"
12603
"Deprecated formats are shown below."
12604
msgstr ""
12605
12606
#: en/help_topics/other-formats.txt:12
12607
msgid ""
12608
":pack-0.92:\n"
12609
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12610
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12611
" by bzr < 0.92."
12612
msgstr ""
12613
12614
#: en/help_topics/patterns.txt:1
12615
msgid ""
12616
"Patterns\n"
12617
"========"
12618
msgstr ""
12619
12620
#: en/help_topics/patterns.txt:4
12621
msgid ""
12622
"Bazaar uses patterns to match files at various times. For example,\n"
12623
"the ``add`` command skips over files that match ignore patterns\n"
12624
"and preferences can be associated with files using rule patterns.\n"
12625
"The pattern syntax is described below."
12626
msgstr ""
12627
12628
#: en/help_topics/patterns.txt:9
12629
msgid ""
12630
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12631
"slash or is a regular expression, it is compared to the whole path\n"
12632
"from the branch root. Otherwise, it is compared to only the last\n"
12633
"component of the path. To match a file only in the root directory,\n"
12634
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12635
msgstr ""
12636
12637
#: en/help_topics/patterns.txt:15
12638
msgid "Patterns may include globbing wildcards such as::"
12639
msgstr ""
12640
12641
#: en/help_topics/patterns.txt:17
12642
msgid ""
12643
" ? - Matches any single character except '/'\n"
12644
" * - Matches 0 or more characters except '/'\n"
12645
" /**/ - Matches 0 or more directories in a path\n"
12646
" [a-z] - Matches a single character from within a group of characters"
12647
msgstr ""
12648
12649
#: en/help_topics/patterns.txt:22
12650
msgid ""
12651
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12652
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12653
"expression. Regular expression patterns may not include named or\n"
12654
"numbered groups."
12655
msgstr ""
12656
12657
#: en/help_topics/patterns.txt:27
12658
msgid ""
12659
"Case insensitive ignore patterns can be specified with regular expressions\n"
12660
"by using the ``i`` (for ignore case) flag in the pattern."
12661
msgstr ""
12662
12663
#: en/help_topics/patterns.txt:30
12664
msgid ""
12665
"For example, a case insensitive match for ``foo`` may be specified as::"
12666
msgstr ""
12667
12668
#: en/help_topics/patterns.txt:32
12669
msgid " RE:(?i)foo"
12670
msgstr ""
12671
12672
#: en/help_topics/patterns.txt:34
12673
msgid ""
12674
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12675
"matched by that pattern will not be ignored."
12676
msgstr ""
12677
12678
#: en/help_topics/patterns.txt:37
12679
msgid ""
12680
".. _Python regular expressions: http://docs.python.org/library/re.html"
12681
msgstr ""
12682
12683
#: en/help_topics/revisionspec.txt:1
12684
msgid "Revision Identifiers"
12685
msgstr ""
12686
12687
#: en/help_topics/revisionspec.txt:3
12688
msgid ""
12689
"A revision identifier refers to a specific state of a branch's history. It\n"
12690
"can be expressed in several ways. It can begin with a keyword to\n"
12691
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12692
"'before:yesterday' and 'submit:'."
12693
msgstr ""
12694
12695
#: en/help_topics/revisionspec.txt:8
12696
msgid ""
12697
"Alternately, it can be given without a keyword, in which case it will be\n"
12698
"checked as a revision number, a tag, a revision id, a date specification, or "
12699
"a\n"
12700
"branch specification, in that order. For example, 'date:today' could be\n"
12701
"written as simply 'today', though if you have a tag called 'today' that "
12702
"will\n"
12703
"be found first."
12704
msgstr ""
12705
12706
#: en/help_topics/revisionspec.txt:14
12707
msgid ""
12708
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12709
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12710
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12711
"or\n"
12712
"spaces around the '..')."
12713
msgstr ""
12714
12715
#: en/help_topics/revisionspec.txt:19
12716
msgid ""
12717
"Ranges are interpreted differently by different commands. To the \"log\" "
12718
"command,\n"
12719
"a range is a sequence of log messages, but to the \"diff\" command, the "
12720
"range\n"
12721
"denotes a change between revisions (and not a sequence of changes). In\n"
12722
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12723
"consider it\n"
12724
"to be open-ended, that is, they include one end but not the other. For "
12725
"example:\n"
12726
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12727
"3649,\n"
12728
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12729
"and\n"
12730
"3649, but not 3647."
12731
msgstr ""
12732
12733
#: en/help_topics/revisionspec.txt:28
12734
msgid "The keywords used as revision selection methods are the following:"
12735
msgstr ""
12736
12737
#: en/help_topics/revisionspec.txt:30
12738
msgid ""
12739
":revid:\n"
12740
"\tSelects a revision using the revision id.\n"
12741
":submit:\n"
12742
"\tSelects a common ancestor with the submit branch.\n"
12743
":ancestor:\n"
12744
"\tSelects a common ancestor with a second branch.\n"
12745
":date:\n"
12746
"\tSelects a revision on the basis of a datestamp.\n"
12747
":branch:\n"
12748
"\tSelects the last revision of a specified branch.\n"
12749
":tag:\n"
12750
"\tSelects a revision identified by a tag name.\n"
12751
":revno:\n"
12752
"\tSelects a revision using a number.\n"
12753
":before:\n"
12754
"\tSelects the parent of the revision specified.\n"
12755
":annotate:\n"
12756
"\tSelect the revision that last modified the specified line.\n"
12757
":mainline:\n"
12758
"\tSelect mainline revision that merged the specified revision.\n"
12759
":last:\n"
12760
"\tSelects the nth revision from the end."
12761
msgstr ""
12762
12763
#: en/help_topics/revisionspec.txt:53
12764
msgid "In addition, plugins can provide other keywords."
12765
msgstr ""
12766
12767
#: en/help_topics/revisionspec.txt:55
12768
msgid "A detailed description of each keyword is given below."
12769
msgstr ""
12770
12771
#: en/help_topics/revisionspec.txt:57
12772
msgid ":revid:"
12773
msgstr ""
12774
12775
#: en/help_topics/revisionspec.txt:59
12776
msgid ""
12777
" Supply a specific revision id, that can be used to specify any\n"
12778
" revision id in the ancestry of the branch.\n"
12779
" Including merges, and pending merges.\n"
12780
" Examples::"
12781
msgstr ""
12782
12783
#: en/help_topics/revisionspec.txt:64
12784
msgid ""
12785
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12786
msgstr ""
12787
12788
#: en/help_topics/revisionspec.txt:66
12789
msgid ":submit:"
12790
msgstr ""
12791
12792
#: en/help_topics/revisionspec.txt:68
12793
msgid ""
12794
" Diffing against this shows all the changes that were made in this "
12795
"branch,\n"
12796
" and is a good predictor of what merge will do. The submit branch is\n"
12797
" used by the bundle and merge directive commands. If no submit branch\n"
12798
" is specified, the parent branch is used instead."
12799
msgstr ""
12800
12801
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12802
msgid ""
12803
" The common ancestor is the last revision that existed in both\n"
12804
" branches. Usually this is the branch point, but it could also be\n"
12805
" a revision that was merged."
12806
msgstr ""
12807
12808
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12809
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12810
#: en/help_topics/revisionspec.txt:153
12811
msgid " Examples::"
12812
msgstr ""
12813
12814
#: en/help_topics/revisionspec.txt:79
12815
msgid " $ bzr diff -r submit:"
12816
msgstr ""
12817
12818
#: en/help_topics/revisionspec.txt:81
12819
msgid ":ancestor:"
12820
msgstr ""
12821
12822
#: en/help_topics/revisionspec.txt:83
12823
msgid " Supply the path to a branch to select the common ancestor."
12824
msgstr ""
12825
12826
#: en/help_topics/revisionspec.txt:89
12827
msgid ""
12828
" This is frequently used with 'diff' to return all of the changes\n"
12829
" that your branch introduces, while excluding the changes that you\n"
12830
" have not merged from the remote branch."
12831
msgstr ""
12832
12833
#: en/help_topics/revisionspec.txt:95
12834
msgid ""
12835
" ancestor:/path/to/branch\n"
12836
" $ bzr diff -r ancestor:../../mainline/branch"
12837
msgstr ""
12838
12839
#: en/help_topics/revisionspec.txt:98
12840
msgid ":date:"
12841
msgstr ""
12842
12843
#: en/help_topics/revisionspec.txt:100
12844
msgid ""
12845
" Supply a datestamp to select the first revision that matches the date.\n"
12846
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12847
" Matches the first entry after a given date (either at midnight or\n"
12848
" at a specified time)."
12849
msgstr ""
12850
12851
#: en/help_topics/revisionspec.txt:105
12852
msgid " One way to display all the changes since yesterday would be::"
12853
msgstr ""
12854
12855
#: en/help_topics/revisionspec.txt:107
12856
msgid " bzr log -r date:yesterday.."
12857
msgstr ""
12858
12859
#: en/help_topics/revisionspec.txt:111
12860
msgid ""
12861
" date:yesterday -> select the first revision since "
12862
"yesterday\n"
12863
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12864
" August 14th, 2006 at 5:10pm."
12865
msgstr ""
12866
12867
#: en/help_topics/revisionspec.txt:115
12868
msgid ":branch:"
12869
msgstr ""
12870
12871
#: en/help_topics/revisionspec.txt:117
12872
msgid " Supply the path to a branch to select its last revision."
12873
msgstr ""
12874
12875
#: en/help_topics/revisionspec.txt:121
12876
msgid " branch:/path/to/branch"
12877
msgstr ""
12878
12879
#: en/help_topics/revisionspec.txt:123
12880
msgid ":tag:"
12881
msgstr ""
12882
12883
#: en/help_topics/revisionspec.txt:125
12884
msgid " Tags are stored in the branch and created by the 'tag' command."
12885
msgstr ""
12886
12887
#: en/help_topics/revisionspec.txt:127
12888
msgid ":revno:"
12889
msgstr ""
12890
12891
#: en/help_topics/revisionspec.txt:129
12892
msgid ""
12893
" Use an integer to specify a revision in the history of the branch.\n"
12894
" Optionally a branch can be specified. A negative number will count\n"
12895
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12896
" one). If the negative number is larger than the branch's history, the\n"
12897
" first revision is returned.\n"
12898
" Examples::"
12899
msgstr ""
12900
12901
#: en/help_topics/revisionspec.txt:136
12902
msgid ""
12903
" revno:1 -> return the first revision of this branch\n"
12904
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12905
" the branch '/path/to/branch'\n"
12906
" revno:-1 -> The last revision in a branch.\n"
12907
" -2:http://other/branch -> The second to last revision in the\n"
12908
" remote branch.\n"
12909
" -1000000 -> Most likely the first revision, unless\n"
12910
" your history is very long."
12911
msgstr ""
12912
12913
#: en/help_topics/revisionspec.txt:145
12914
msgid ":before:"
12915
msgstr ""
12916
12917
#: en/help_topics/revisionspec.txt:147
12918
msgid ""
12919
" Supply any revision spec to return the parent of that revision. This "
12920
"is\n"
12921
" mostly useful when inspecting revisions that are not in the revision "
12922
"history\n"
12923
" of a branch."
12924
msgstr ""
12925
12926
#: en/help_topics/revisionspec.txt:151
12927
msgid ""
12928
" It is an error to request the parent of the null revision (before:0)."
12929
msgstr ""
12930
12931
#: en/help_topics/revisionspec.txt:155
12932
msgid ""
12933
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12934
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12935
" aaaa@bbbb-1234567890\n"
12936
" bzr diff -r before:1913..1913\n"
12937
" -> Find the changes between revision 1913 and its parent "
12938
"(1912).\n"
12939
" (What changes did revision 1913 introduce).\n"
12940
" This is equivalent to: bzr diff -c 1913"
12941
msgstr ""
12942
12943
#: en/help_topics/revisionspec.txt:163
12944
msgid ":annotate:"
12945
msgstr ""
12946
12947
#: en/help_topics/revisionspec.txt:165
12948
msgid ""
12949
" Select the revision that last modified the specified line. Line is\n"
12950
" specified as path:number. Path is a relative path to the file. "
12951
"Numbers\n"
12952
" start at 1, and are relative to the current version, not the last-\n"
12953
" committed version of the file."
12954
msgstr ""
12955
12956
#: en/help_topics/revisionspec.txt:170
12957
msgid ":mainline:"
12958
msgstr ""
12959
12960
#: en/help_topics/revisionspec.txt:172
12961
msgid ""
12962
" Select the revision that merged the specified revision into mainline."
12963
msgstr ""
12964
12965
#: en/help_topics/revisionspec.txt:174
12966
msgid ":last:"
12967
msgstr ""
12968
12969
#: en/help_topics/revisionspec.txt:176
12970
msgid ""
12971
" Supply a positive number to get the nth revision from the end.\n"
12972
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12973
" Examples::"
12974
msgstr ""
12975
12976
#: en/help_topics/revisionspec.txt:180
12977
msgid ""
12978
" last:1 -> return the last revision\n"
12979
" last:3 -> return the revision 2 before the end.\n"
12980
msgstr ""
12981
12982
#: en/help_topics/rules.txt:1
12983
msgid ""
12984
"Rules\n"
12985
"====="
12986
msgstr ""
12987
12988
#: en/help_topics/rules.txt:7
12989
msgid ""
12990
"Rules are defined in ini file format where the sections are file glob\n"
12991
"patterns and the contents of each section are the preferences for files\n"
12992
"matching that pattern(s). For example::"
12993
msgstr ""
12994
12995
#: en/help_topics/rules.txt:11
12996
msgid ""
12997
" [name *.bat]\n"
12998
" eol = native"
12999
msgstr ""
13000
13001
#: en/help_topics/rules.txt:14
13002
msgid ""
13003
" [name *.html *.xml]\n"
13004
" keywords = xml_escape"
13005
msgstr ""
13006
13007
#: en/help_topics/rules.txt:17
13008
msgid ""
13009
"Preferences like these are useful for commands and plugins wishing to\n"
13010
"provide custom behaviour for selected files. For more information on \n"
13011
"end of line conversion see :doc:`eol-help`.\n"
13012
"Keyword support is provided by the `keywords plugin\n"
13013
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13014
msgstr ""
13015
13016
#: en/help_topics/rules.txt:23
13017
msgid ""
13018
"Files\n"
13019
"-----"
13020
msgstr ""
13021
13022
#: en/help_topics/rules.txt:26
13023
msgid ""
13024
"Default rules for all branches are defined in the optional file\n"
13025
"``BZR_HOME/rules``. "
13026
msgstr ""
13027
13028
#: en/help_topics/rules.txt:29
13029
msgid ""
13030
"Rule Patterns\n"
13031
"-------------"
13032
msgstr ""
13033
13034
#: en/help_topics/rules.txt:32
13035
msgid ""
13036
"Patterns are ordered and searching stops as soon as one matches.\n"
13037
"As a consequence, more explicit patterns should be placed towards\n"
13038
"the top of the file. Rule patterns use exactly the same conventions\n"
13039
"as ignore patterns. See :doc:`patterns-help` for details."
13040
msgstr ""
13041
13042
#: en/help_topics/rules.txt:37
13043
msgid ".. note::"
13044
msgstr ""
13045
13046
#: en/help_topics/rules.txt:39
13047
msgid ""
13048
" Patterns containing square brackets or spaces should be\n"
13049
" surrounded in quotes to ensure they are correctly parsed.\n"
13050
msgstr ""
13051
13052
#: en/help_topics/topics.txt:1
13053
msgid ""
13054
"authentication Information on configuring authentication\n"
13055
"basic Basic commands\n"
13056
"branches Information on what a branch is\n"
13057
"bugs Bug tracker settings\n"
13058
"checkouts Information on what a checkout is\n"
13059
"commands Basic help for all commands\n"
13060
"configuration Details on the configuration settings available\n"
13061
"conflict-types Types of conflicts and what to do about them\n"
13062
"content-filters Conversion of content into/from working trees\n"
13063
"criss-cross Information on criss-cross merging\n"
13064
"current-formats Current storage formats\n"
13065
"debug-flags Options to show or record debug information\n"
13066
"diverged-branches How to fix diverged branches\n"
13067
"env-variables Environment variable names and values\n"
13068
"eol Information on end-of-line handling\n"
13069
"files Information on configuration and log files\n"
13070
"formats Information on choosing a storage format\n"
13071
"global-options Options that control how Bazaar runs\n"
13072
"hidden-commands All hidden commands\n"
13073
"hooks Points at which custom processing can be added\n"
13074
"launchpad Using Bazaar with Launchpad.net\n"
13075
"location-alias Aliases for remembered locations\n"
13076
"log-formats Details on the logging formats available\n"
13077
"other-formats Experimental and deprecated storage formats\n"
13078
"patterns Information on the pattern syntax\n"
13079
"repositories Basic information on shared repositories.\n"
13080
"revisionspec Explain how to use --revision\n"
13081
"rules Information on defining rule-based preferences\n"
13082
"standalone-trees Information on what a standalone tree is\n"
13083
"standard-options Options that can be used with any command\n"
13084
"status-flags Help on status flags\n"
13085
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13086
"topics Topics list\n"
13087
"url-special-chars Special character handling in URLs\n"
13088
"urlspec Supported transport protocols\n"
13089
"working-trees Information on working trees\n"
13090
msgstr ""
13091
13092
#: en/help_topics/url-special-chars.txt:1
13093
msgid ""
13094
"Special character handling in URLs\n"
13095
"=================================="
13096
msgstr ""
13097
13098
#: en/help_topics/url-special-chars.txt:4
13099
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13100
msgstr ""
13101
13102
#: en/help_topics/url-special-chars.txt:6
13103
msgid " * Fully qualified URLs"
13104
msgstr ""
13105
13106
#: en/help_topics/url-special-chars.txt:8
13107
msgid " * File system paths, relative or absolute"
13108
msgstr ""
13109
13110
#: en/help_topics/url-special-chars.txt:10
13111
msgid ""
13112
"Internally bzr treats all locations as URLs. For any file system paths\n"
13113
"that are specified it will automatically determine the appropriate URL\n"
13114
"representation, and escape special characters where necessary."
13115
msgstr ""
13116
13117
#: en/help_topics/url-special-chars.txt:14
13118
msgid ""
13119
"There are a few characters which have special meaning in URLs and need "
13120
"careful\n"
13121
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13122
"value in URLs. Any non-ASCII characters in a file path will automatically "
13123
"be\n"
13124
"urlencoded when the path is converted to a URL."
13125
msgstr ""
13126
13127
#: en/help_topics/url-special-chars.txt:19
13128
msgid ""
13129
"URLs represent non-ASCII characters in an encoding defined by the server, "
13130
"but\n"
13131
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13132
"be\n"
13133
"generous in what it accepts as a URL and to print them in a way that\n"
13134
"will be readable."
13135
msgstr ""
13136
13137
#: en/help_topics/url-special-chars.txt:24
13138
msgid ""
13139
"For example, if you have a directory named '/tmp/%2False' these are all "
13140
"valid\n"
13141
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13142
"slash)::"
13143
msgstr ""
13144
13145
#: en/help_topics/url-special-chars.txt:27
13146
msgid ""
13147
" cd /tmp\n"
13148
" bzr log /tmp/%2False\n"
13149
" bzr log %2False\n"
13150
" bzr log file:///tmp/%252False\n"
13151
" bzr log file://localhost/tmp/%252False\n"
13152
" bzr log file:%252False"
13153
msgstr ""
13154
13155
#: en/help_topics/url-special-chars.txt:34
13156
msgid "These are valid but do not refer to the same file::"
13157
msgstr ""
13158
13159
#: en/help_topics/url-special-chars.txt:36
13160
msgid ""
13161
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13162
" bzr log %252False (refers to a file called /tmp/%252False)"
13163
msgstr ""
13164
13165
#: en/help_topics/url-special-chars.txt:39
13166
msgid ""
13167
"Comma also has special meaning in URLs, because it denotes `segment "
13168
"parameters`_"
13169
msgstr ""
13170
13171
#: en/help_topics/url-special-chars.txt:41
13172
msgid ""
13173
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13174
msgstr ""
13175
13176
#: en/help_topics/url-special-chars.txt:43
13177
msgid ""
13178
"Comma is also special in any file system paths that are specified. To use a "
13179
"literal\n"
13180
"comma in a file system path, specify a URL and URL encode the comma::"
13181
msgstr ""
13182
13183
#: en/help_topics/url-special-chars.txt:46
13184
msgid ""
13185
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13186
"\"branch\" set to \"bla\"\n"
13187
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13188
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13189
"\"branch\" set to \"bla\"\n"
13190
msgstr ""
13191
13192
#: en/help_topics/urlspec.txt:1
13193
msgid "URL Identifiers"
13194
msgstr ""
13195
13196
#: en/help_topics/urlspec.txt:3
13197
msgid "Supported URL prefixes::"
13198
msgstr ""
13199
13200
#: en/help_topics/urlspec.txt:5
13201
msgid ""
13202
" aftp:// Access using active FTP.\n"
13203
" bzr:// Fast access using the Bazaar smart server.\n"
13204
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13205
" file:// Access using the standard filesystem (default)\n"
13206
" ftp:// Access using passive FTP.\n"
13207
" http:// Read-only access of branches exported on the web.\n"
13208
" https:// Read-only access of branches exported on the web using "
13209
"SSL.\n"
13210
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13211
msgstr ""
13212
13213
#: en/help_topics/urlspec.txt:14
13214
msgid "Supported modifiers::"
13215
msgstr ""
13216
13217
#: en/help_topics/urlspec.txt:16
13218
msgid " gio+ Access using any GIO supported protocols."
13219
msgstr ""
13220
13221
#: en/help_topics/urlspec.txt:18
13222
msgid "Bazaar supports all of the standard parts within the URL::"
13223
msgstr ""
13224
13225
#: en/help_topics/urlspec.txt:20
13226
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13227
msgstr ""
13228
13229
#: en/help_topics/urlspec.txt:22
13230
msgid "allowing URLs such as::"
13231
msgstr ""
13232
13233
#: en/help_topics/urlspec.txt:24
13234
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13235
msgstr ""
13236
13237
#: en/help_topics/urlspec.txt:26
13238
msgid ""
13239
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13240
"with '~' as meaning that the rest of the path should be interpreted\n"
13241
"relative to the remote user's home directory. For example if the user\n"
13242
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13243
"shell.example.com, then::"
13244
msgstr ""
13245
13246
#: en/help_topics/urlspec.txt:32
13247
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13248
msgstr ""
13249
13250
#: en/help_topics/urlspec.txt:34
13251
msgid "would refer to ``/home/remote/myproject/trunk``."
13252
msgstr ""
13253
13254
#: en/help_topics/urlspec.txt:36
13255
msgid ""
13256
"Many commands that accept URLs also accept location aliases too.\n"
13257
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13258
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1