« back to all changes in this revision
Viewing changes to po/fr.po
- browse files at revision 6613.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6613.2.1
- Committer: Richard Wilbur
- Date: 2016-02-04 19:07:28 UTC
- mto: This revision was merged to the branch mainline in revision 6618.
- Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt (Only differences were in whitespace.) Thanks to Petr Stodulka for pointing out the discrepancy.
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- po
- files removed:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- .bzrignore
added
removed
po/fr.po
1
# French translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2011-11-19 06:51+0000\n"
12
"Last-Translator: Nicolas Delvaux <Unknown>\n"
13
"Language-Team: French <fr@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n > 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:31+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr "Dépilement"
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Publication jusqu'à la révision %d."
33
34
#: bzrlib/branch.py:2957
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d étiquette mise à jour."
39
msgstr[1] "%d étiquettes mises à jour."
40
41
#: bzrlib/branch.py:2960
42
msgid "No new revisions or tags to push."
43
msgstr "Pas de nouvelles révisions ou étiquettes à publier."
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr "Aucune nouvelle révision à envoyer."
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr "erreur trouvée : %s"
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Ceci informe sur les fichiers versionnés et inconnus, regroupés\n"
78
"selon leur état. Les différents états sont :"
79
80
#: bzrlib/builtins.py:320
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"ajouté\n"
86
" Versionné dans la copie de travail mais pas dans la révision précédente."
87
88
#: bzrlib/builtins.py:323
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"retiré\n"
95
" Versionné dans la révision précédente mais enlevé ou supprimé\n"
96
" de la copie de travail."
97
98
#: bzrlib/builtins.py:327
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renommé\n"
106
" l'emplacement de ce fichier a changé depuis la révision précédente ;\n"
107
" le texte peut également avoir été modifié. Ceci inclut les fichiers "
108
"dont\n"
109
" le répertoire parent a été renommé."
110
111
#: bzrlib/builtins.py:332
112
msgid ""
113
"modified\n"
114
" Text has changed since the previous revision."
115
msgstr ""
116
"modifié\n"
117
" Le texte a été modifié depuis la révision précédente."
118
119
#: bzrlib/builtins.py:335
120
msgid ""
121
"kind changed\n"
122
" File kind has been changed (e.g. from file to directory)."
123
msgstr ""
124
"type modifié\n"
125
" le type du fichier a été modifiée (ex. de fichier à répertoire)."
126
127
#: bzrlib/builtins.py:338
128
msgid ""
129
"unknown\n"
130
" Not versioned and not matching an ignore pattern."
131
msgstr ""
132
"inconnu\n"
133
" Non versionné et ne correspond pas à une règle d'exclusion."
134
135
#: bzrlib/builtins.py:341
136
msgid ""
137
"Additionally for directories, symlinks and files with a changed\n"
138
"executable bit, Bazaar indicates their type using a trailing\n"
139
"character: '/', '@' or '*' respectively. These decorations can be\n"
140
"disabled using the '--no-classify' option."
141
msgstr ""
142
143
#: bzrlib/builtins.py:346
144
msgid ""
145
"To see ignored files use 'bzr ignored'. For details on the\n"
146
"changes to file texts, use 'bzr diff'."
147
msgstr ""
148
"Pour voir la liste des fichiers ignorés, utilisez « bzr ignored ».\n"
149
"Pour le détail des modifications sur les fichiers textes,\n"
150
"utilisez « bzr diff »."
151
152
#: bzrlib/builtins.py:349
153
msgid ""
154
"Note that --short or -S gives status flags for each item, similar\n"
155
"to Subversion's status command. To get output similar to svn -q,\n"
156
"use bzr status -SV."
157
msgstr ""
158
159
#: bzrlib/builtins.py:353
160
msgid ""
161
"If no arguments are specified, the status of the entire working\n"
162
"directory is shown. Otherwise, only the status of the specified\n"
163
"files or directories is reported. If a directory is given, status\n"
164
"is reported for everything inside that directory."
165
msgstr ""
166
167
#: bzrlib/builtins.py:358
168
msgid ""
169
"Before merges are committed, the pending merge tip revisions are\n"
170
"shown. To see all pending merge revisions, use the -v option.\n"
171
"To skip the display of pending merge information altogether, use\n"
172
"the no-pending option or specify a file/directory."
173
msgstr ""
174
175
#: bzrlib/builtins.py:363
176
msgid ""
177
"To compare the working directory to a specific revision, pass a\n"
178
"single revision to the revision argument."
179
msgstr ""
180
181
#: bzrlib/builtins.py:366
182
msgid ""
183
"To see which files have changed in a specific revision, or between\n"
184
"two revisions, pass a revision range to the revision argument.\n"
185
"This will produce the same results as calling 'bzr diff --summarize'."
186
msgstr ""
187
188
#: bzrlib/builtins.py:375
189
msgid "Use short status indicators."
190
msgstr ""
191
192
#: bzrlib/builtins.py:377
193
msgid "Only show versioned files."
194
msgstr ""
195
196
#: bzrlib/builtins.py:379
197
msgid "Don't show pending merges."
198
msgstr ""
199
200
#: bzrlib/builtins.py:382
201
msgid "Do not mark object type using indicator."
202
msgstr ""
203
204
#: bzrlib/builtins.py:397
205
msgid "bzr status --revision takes exactly one or two revision specifiers"
206
msgstr ""
207
"bzr status --revision prend exactement un ou deux numéros de révision"
208
209
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
210
msgid "You can only supply one of revision_id or --revision"
211
msgstr ""
212
213
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
214
msgid "You must supply either --revision or a revision_id"
215
msgstr ""
216
217
#: bzrlib/builtins.py:451
218
#, python-format
219
msgid "Repository %r does not support access to raw revision texts"
220
msgstr ""
221
222
#: bzrlib/builtins.py:462
223
msgid "The repository {0} contains no revision {1}."
224
msgstr "Le répertoire {0} ne contient aucune révision {1}."
225
226
#: bzrlib/builtins.py:469
227
msgid "You cannot specify a NULL revision."
228
msgstr ""
229
230
#: bzrlib/builtins.py:561
231
msgid "Remove the working tree from a given branch/checkout."
232
msgstr ""
233
234
#: bzrlib/builtins.py:563
235
msgid ""
236
"Since a lightweight checkout is little more than a working tree\n"
237
"this will refuse to run against one."
238
msgstr ""
239
240
#: bzrlib/builtins.py:566
241
msgid "To re-create the working tree, use \"bzr checkout\"."
242
msgstr ""
243
244
#: bzrlib/builtins.py:572
245
msgid ""
246
"Remove the working tree even if it has uncommitted or shelved changes."
247
msgstr ""
248
249
#: bzrlib/builtins.py:586
250
msgid "No working tree to remove"
251
msgstr ""
252
253
#: bzrlib/builtins.py:588
254
msgid "You cannot remove the working tree of a remote path"
255
msgstr ""
256
257
#: bzrlib/builtins.py:597
258
msgid "You cannot remove the working tree from a lightweight checkout"
259
msgstr ""
260
261
#: bzrlib/builtins.py:637
262
msgid ""
263
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
264
"instead. Use \"--force\" if you are sure you want to reset the working tree."
265
msgstr ""
266
267
#: bzrlib/builtins.py:648
268
msgid ""
269
", the header appears corrupt, try passing -r -1 to set the state to the last "
270
"commit"
271
msgstr ""
272
273
#: bzrlib/builtins.py:652
274
msgid "failed to reset the tree state{0}"
275
msgstr ""
276
277
#: bzrlib/builtins.py:656
278
msgid "Show current revision number."
279
msgstr "Afficher le numéro de la révision actuelle."
280
281
#: bzrlib/builtins.py:658
282
msgid "This is equal to the number of revisions on this branch."
283
msgstr ""
284
285
#: bzrlib/builtins.py:671
286
msgid "--tree and --revision can not be used together"
287
msgstr ""
288
289
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
290
msgid "Tags can only be placed on a single revision, not on a range"
291
msgstr ""
292
293
#: bzrlib/builtins.py:712
294
msgid "Show revno of working tree."
295
msgstr ""
296
297
#: bzrlib/builtins.py:760
298
msgid "Add specified files or directories."
299
msgstr ""
300
301
#: bzrlib/builtins.py:762
302
msgid ""
303
"In non-recursive mode, all the named items are added, regardless\n"
304
"of whether they were previously ignored. A warning is given if\n"
305
"any of the named files are already versioned."
306
msgstr ""
307
308
#: bzrlib/builtins.py:766
309
msgid ""
310
"In recursive mode (the default), files are treated the same way\n"
311
"but the behaviour for directories is different. Directories that\n"
312
"are already versioned do not give a warning. All directories,\n"
313
"whether already versioned or not, are searched for files or\n"
314
"subdirectories that are neither versioned or ignored, and these\n"
315
"are added. This search proceeds recursively into versioned\n"
316
"directories. If no names are given '.' is assumed."
317
msgstr ""
318
319
#: bzrlib/builtins.py:774
320
msgid ""
321
"A warning will be printed when nested trees are encountered,\n"
322
"unless they are explicitly ignored."
323
msgstr ""
324
325
#: bzrlib/builtins.py:777
326
msgid ""
327
"Therefore simply saying 'bzr add' will version all files that\n"
328
"are currently unknown."
329
msgstr ""
330
331
#: bzrlib/builtins.py:780
332
msgid ""
333
"Adding a file whose parent directory is not versioned will\n"
334
"implicitly add the parent, and so on up to the root. This means\n"
335
"you should never need to explicitly add a directory, they'll just\n"
336
"get added when you add a file in the directory."
337
msgstr ""
338
339
#: bzrlib/builtins.py:785
340
msgid ""
341
"--dry-run will show which files would be added, but not actually\n"
342
"add them."
343
msgstr ""
344
345
#: bzrlib/builtins.py:788
346
msgid ""
347
"--file-ids-from will try to use the file ids from the supplied path.\n"
348
"It looks up ids trying to find a matching parent directory with the\n"
349
"same filename, and then by pure path. This option is rarely needed\n"
350
"but can be useful when adding the same logical file into two\n"
351
"branches that will be merged later (without showing the two different\n"
352
"adds as a conflict). It is also useful when merging another project\n"
353
"into a subdirectory of this one."
354
msgstr ""
355
356
#: bzrlib/builtins.py:796
357
msgid ""
358
"Any files matching patterns in the ignore list will not be added\n"
359
"unless they are explicitly mentioned."
360
msgstr ""
361
362
#: bzrlib/builtins.py:799
363
msgid ""
364
"In recursive mode, files larger than the configuration option \n"
365
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
366
"to file size."
367
msgstr ""
368
369
#: bzrlib/builtins.py:806
370
msgid "Don't recursively add the contents of directories."
371
msgstr ""
372
373
#: bzrlib/builtins.py:813
374
msgid "Lookup file ids from this tree."
375
msgstr ""
376
377
#: bzrlib/builtins.py:849
378
msgid "ignored {0} matching \"{1}\"\n"
379
msgstr ""
380
381
#: bzrlib/builtins.py:854
382
msgid "Create a new versioned directory."
383
msgstr ""
384
385
#: bzrlib/builtins.py:856
386
msgid "This is equivalent to creating the directory and then adding it."
387
msgstr ""
388
389
#: bzrlib/builtins.py:863
390
msgid "No error if existing, make parent directories as needed."
391
msgstr ""
392
393
#: bzrlib/builtins.py:897
394
#, python-format
395
msgid "added %s\n"
396
msgstr "ajouté %s\n"
397
398
#: bzrlib/builtins.py:939
399
#, python-format
400
msgid "invalid kind %r specified"
401
msgstr ""
402
403
#: bzrlib/builtins.py:976
404
msgid "Move or rename a file."
405
msgstr "Déplacer ou renommer un fichier."
406
407
#: bzrlib/builtins.py:978
408
msgid " bzr mv SOURCE... DESTINATION"
409
msgstr ""
410
411
#: bzrlib/builtins.py:980
412
msgid ""
413
"If the last argument is a versioned directory, all the other names\n"
414
"are moved into it. Otherwise, there must be exactly two arguments\n"
415
"and the file is changed to a new name."
416
msgstr ""
417
418
#: bzrlib/builtins.py:984
419
msgid ""
420
"If OLDNAME does not exist on the filesystem but is versioned and\n"
421
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
422
"assumes that the file has been manually moved and only updates\n"
423
"its internal inventory to reflect that change.\n"
424
"The same is valid when moving many SOURCE files to a DESTINATION."
425
msgstr ""
426
427
#: bzrlib/builtins.py:990
428
msgid "Files cannot be moved between branches."
429
msgstr ""
430
431
#: bzrlib/builtins.py:997
432
msgid ""
433
"Move only the bzr identifier of the file, because the file has already been "
434
"moved."
435
msgstr ""
436
437
#: bzrlib/builtins.py:999
438
msgid "Automatically guess renames."
439
msgstr ""
440
441
#: bzrlib/builtins.py:1000
442
msgid "Avoid making changes when guessing renames."
443
msgstr ""
444
445
#: bzrlib/builtins.py:1009
446
msgid "--dry-run requires --auto."
447
msgstr ""
448
449
#: bzrlib/builtins.py:1013
450
msgid "missing file argument"
451
msgstr ""
452
453
#: bzrlib/builtins.py:1017
454
msgid "can not move root of branch"
455
msgstr ""
456
457
#: bzrlib/builtins.py:1023
458
msgid "Only one path may be specified to --auto."
459
msgstr ""
460
461
#: bzrlib/builtins.py:1026
462
msgid "--after cannot be specified with --auto."
463
msgstr ""
464
465
#: bzrlib/builtins.py:1062
466
msgid "to mv multiple files the destination must be a versioned directory"
467
msgstr ""
468
469
#: bzrlib/builtins.py:1114
470
msgid "Turn this branch into a mirror of another branch."
471
msgstr ""
472
473
#: bzrlib/builtins.py:1116
474
msgid ""
475
"By default, this command only works on branches that have not diverged.\n"
476
"Branches are considered diverged if the destination branch's most recent \n"
477
"commit is one that has not been merged (directly or indirectly) into the \n"
478
"parent."
479
msgstr ""
480
481
#: bzrlib/builtins.py:1121
482
msgid ""
483
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
484
"from one into the other. Once one branch has merged, the other should\n"
485
"be able to pull it again."
486
msgstr ""
487
488
#: bzrlib/builtins.py:1125
489
msgid ""
490
"If you want to replace your local changes and just want your branch to\n"
491
"match the remote one, use pull --overwrite. This will work even if the two\n"
492
"branches have diverged."
493
msgstr ""
494
495
#: bzrlib/builtins.py:1129
496
msgid ""
497
"If there is no default location set, the first pull will set it (use\n"
498
"--no-remember to avoid setting it). After that, you can omit the\n"
499
"location to use the default. To change the default, use --remember. The\n"
500
"value will only be saved if the remote location can be accessed."
501
msgstr ""
502
503
#: bzrlib/builtins.py:1134
504
msgid ""
505
"The --verbose option will display the revisions pulled using the log_format\n"
506
"configuration option. You can use a different format by overriding it with\n"
507
"-Olog_format=<other_format>."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1138
511
msgid ""
512
"Note: The location can be specified either in the form of a branch,\n"
513
"or in the form of a path to a file containing a merge directive generated\n"
514
"with bzr send."
515
msgstr ""
516
517
#: bzrlib/builtins.py:1146
518
msgid "Show logs of pulled revisions."
519
msgstr ""
520
521
#: bzrlib/builtins.py:1148
522
msgid ""
523
"Branch to pull into, rather than the one containing the working directory."
524
msgstr ""
525
526
#: bzrlib/builtins.py:1151
527
msgid ""
528
"Perform a local pull in a bound branch. Local pulls are not applied to the "
529
"master branch."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1189
533
msgid "Need working tree for --show-base."
534
msgstr ""
535
536
#: bzrlib/builtins.py:1205
537
msgid "No pull location known or specified."
538
msgstr ""
539
540
#: bzrlib/builtins.py:1211
541
#, python-format
542
msgid "Using saved parent location: %s\n"
543
msgstr ""
544
545
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
546
msgid "Cannot use -r with merge directives or bundles"
547
msgstr ""
548
549
#: bzrlib/builtins.py:1261
550
msgid "Update a mirror of this branch."
551
msgstr ""
552
553
#: bzrlib/builtins.py:1263
554
msgid ""
555
"The target branch will not have its working tree populated because this\n"
556
"is both expensive, and is not supported on remote file systems."
557
msgstr ""
558
559
#: bzrlib/builtins.py:1266
560
msgid ""
561
"Some smart servers or protocols *may* put the working tree in place in\n"
562
"the future."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1269
566
msgid ""
567
"This command only works on branches that have not diverged. Branches are\n"
568
"considered diverged if the destination branch's most recent commit is one\n"
569
"that has not been merged (directly or indirectly) by the source branch."
570
msgstr ""
571
572
#: bzrlib/builtins.py:1273
573
msgid ""
574
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
575
"the other branch completely, discarding its unmerged changes."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1276
579
msgid ""
580
"If you want to ensure you have the different changes in the other branch,\n"
581
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
582
"After that you will be able to do a push without '--overwrite'."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1280
586
msgid ""
587
"If there is no default push location set, the first push will set it (use\n"
588
"--no-remember to avoid setting it). After that, you can omit the\n"
589
"location to use the default. To change the default, use --remember. The\n"
590
"value will only be saved if the remote location can be accessed."
591
msgstr ""
592
593
#: bzrlib/builtins.py:1285
594
msgid ""
595
"The --verbose option will display the revisions pushed using the log_format\n"
596
"configuration option. You can use a different format by overriding it with\n"
597
"-Olog_format=<other_format>."
598
msgstr ""
599
600
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
601
msgid ""
602
"Branch to push from, rather than the one containing the working directory."
603
msgstr ""
604
605
#: bzrlib/builtins.py:1299
606
msgid ""
607
"By default push will fail if the target directory exists, but does not "
608
"already have a control directory. This flag will allow push to proceed."
609
msgstr ""
610
611
#: bzrlib/builtins.py:1304
612
msgid ""
613
"Create a stacked branch that references the public location of the parent "
614
"branch."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1307
618
msgid ""
619
"Create a stacked branch that refers to another branch for the commit "
620
"history. Only the work not present in the referenced branch is included in "
621
"the branch created."
622
msgstr ""
623
624
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
625
msgid ""
626
"Refuse to push if there are uncommitted changes in the working tree, --no-"
627
"strict disables the check."
628
msgstr ""
629
630
#: bzrlib/builtins.py:1315
631
msgid "Don't populate the working tree, even for protocols that support it."
632
msgstr ""
633
634
#: bzrlib/builtins.py:1318
635
msgid "Overwrite tags only."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1369
639
msgid "Could not determine branch to refer to."
640
msgstr ""
641
642
#: bzrlib/builtins.py:1378
643
#, python-format
644
msgid ""
645
"No push location known or specified. To push to the parent branch (at %s), "
646
"use 'bzr push :parent'."
647
msgstr ""
648
649
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
650
msgid "No push location known or specified."
651
msgstr ""
652
653
#: bzrlib/builtins.py:1388
654
#, python-format
655
msgid "Using saved push location: %s"
656
msgstr ""
657
658
#: bzrlib/builtins.py:1398
659
msgid "Create a new branch that is a copy of an existing branch."
660
msgstr ""
661
662
#: bzrlib/builtins.py:1400
663
msgid ""
664
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
665
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
666
"./bar.\n"
667
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
668
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
669
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
670
"create ./foo-bar."
671
msgstr ""
672
673
#: bzrlib/builtins.py:1407
674
msgid ""
675
"To retrieve the branch as of a particular revision, supply the --revision\n"
676
"parameter, as in \"branch foo/bar -r 5\"."
677
msgstr ""
678
679
#: bzrlib/builtins.py:1410
680
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
681
msgstr ""
682
683
#: bzrlib/builtins.py:1420
684
msgid "Create a branch without a working-tree."
685
msgstr ""
686
687
#: bzrlib/builtins.py:1422
688
msgid "Switch the checkout in the current directory to the new branch."
689
msgstr ""
690
691
#: bzrlib/builtins.py:1425
692
msgid ""
693
"Create a stacked branch referring to the source branch. The new branch will "
694
"depend on the availability of the source branch for all operations."
695
msgstr ""
696
697
#: bzrlib/builtins.py:1429
698
msgid "Do not use a shared repository, even if available."
699
msgstr ""
700
701
#: bzrlib/builtins.py:1431
702
msgid ""
703
"By default branch will fail if the target directory exists, but does not "
704
"already have a control directory. This flag will allow branch to proceed."
705
msgstr ""
706
707
#: bzrlib/builtins.py:1436
708
msgid "Bind new branch to from location."
709
msgstr ""
710
711
#: bzrlib/builtins.py:1483
712
#, python-format
713
msgid "Target directory \"%s\" already exists."
714
msgstr ""
715
716
#: bzrlib/builtins.py:1495
717
#, python-format
718
msgid "Parent of \"%s\" does not exist."
719
msgstr ""
720
721
#: bzrlib/builtins.py:1514
722
msgid "The branch {0} has no revision {1}."
723
msgstr ""
724
725
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
726
#, python-format
727
msgid "Created new stacked branch referring to %s."
728
msgstr ""
729
730
#: bzrlib/builtins.py:1533
731
#, python-format
732
msgid "Branched %d revision."
733
msgid_plural "Branched %d revisions."
734
msgstr[0] ""
735
msgstr[1] ""
736
737
#: bzrlib/builtins.py:1538
738
#, python-format
739
msgid "New branch bound to %s"
740
msgstr ""
741
742
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
743
#, python-format
744
msgid "Switched to branch: %s"
745
msgstr ""
746
747
#: bzrlib/builtins.py:1548
748
msgid "List the branches available at the current location."
749
msgstr ""
750
751
#: bzrlib/builtins.py:1550
752
msgid ""
753
"This command will print the names of all the branches at the current\n"
754
"location."
755
msgstr ""
756
757
#: bzrlib/builtins.py:1557
758
msgid ""
759
"Recursively scan for branches rather than just looking in the specified "
760
"location."
761
msgstr ""
762
763
#: bzrlib/builtins.py:1586
764
msgid "(default)"
765
msgstr ""
766
767
#: bzrlib/builtins.py:1598
768
msgid "Create a new checkout of an existing branch."
769
msgstr ""
770
771
#: bzrlib/builtins.py:1600
772
msgid ""
773
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
774
"for\n"
775
"the branch found in '.'. This is useful if you have removed the working "
776
"tree\n"
777
"or if it was never created - i.e. if you pushed the branch to its current\n"
778
"location using SFTP."
779
msgstr ""
780
781
#: bzrlib/builtins.py:1605
782
msgid ""
783
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
784
"will\n"
785
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
786
"./bar.\n"
787
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
788
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
789
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
790
"create ./foo-bar."
791
msgstr ""
792
793
#: bzrlib/builtins.py:1612
794
msgid ""
795
"To retrieve the branch as of a particular revision, supply the --revision\n"
796
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
797
"immediately\n"
798
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
799
"old\n"
800
"code.)"
801
msgstr ""
802
803
#: bzrlib/builtins.py:1622
804
msgid ""
805
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
806
"the branch for every operation. Normal checkouts can perform common "
807
"operations like diff and status without such access, and also support local "
808
"commits."
809
msgstr ""
810
811
#: bzrlib/builtins.py:1629
812
msgid "Get file contents from this tree."
813
msgstr ""
814
815
#: bzrlib/builtins.py:1631
816
msgid "Hard-link working tree files where possible."
817
msgstr ""
818
819
#: bzrlib/builtins.py:1672
820
msgid ""
821
"Show list of renamed files.\n"
822
" "
823
msgstr ""
824
825
#: bzrlib/builtins.py:1700
826
msgid "Update a working tree to a new revision."
827
msgstr ""
828
829
#: bzrlib/builtins.py:1702
830
msgid ""
831
"This will perform a merge of the destination revision (the tip of the\n"
832
"branch, or the specified revision) into the working tree, and then make\n"
833
"that revision the basis revision for the working tree. "
834
msgstr ""
835
836
#: bzrlib/builtins.py:1706
837
msgid ""
838
"You can use this to visit an older revision, or to update a working tree\n"
839
"that is out of date from its branch."
840
msgstr ""
841
842
#: bzrlib/builtins.py:1709
843
msgid ""
844
"If there are any uncommitted changes in the tree, they will be carried\n"
845
"across and remain as uncommitted changes after the update. To discard\n"
846
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
847
"with the changes brought in by the change in basis revision."
848
msgstr ""
849
850
#: bzrlib/builtins.py:1714
851
msgid ""
852
"If the tree's branch is bound to a master branch, bzr will also update\n"
853
"the branch from the master."
854
msgstr ""
855
856
#: bzrlib/builtins.py:1717
857
msgid ""
858
"You cannot update just a single file or directory, because each Bazaar\n"
859
"working tree has just a single basis revision. If you want to restore a\n"
860
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
861
"update'. If you want to restore a file to its state in a previous\n"
862
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
863
"out the old content of that file to a new location."
864
msgstr ""
865
866
#: bzrlib/builtins.py:1724
867
msgid ""
868
"The 'dir' argument, if given, must be the location of the root of a\n"
869
"working tree to update. By default, the working tree that contains the \n"
870
"current working directory is used."
871
msgstr ""
872
873
#: bzrlib/builtins.py:1740
874
msgid "bzr update --revision takes exactly one revision"
875
msgstr ""
876
877
#: bzrlib/builtins.py:1748
878
msgid "bzr update can only update a whole tree, not a file or subdirectory"
879
msgstr ""
880
881
#: bzrlib/builtins.py:1779
882
msgid "Tree is up to date at revision {0} of branch {1}"
883
msgstr ""
884
885
#: bzrlib/builtins.py:1795
886
#, python-format
887
msgid ""
888
"branch has no revision %s\n"
889
"bzr update --revision only works for a revision in the branch history"
890
msgstr ""
891
892
#: bzrlib/builtins.py:1801
893
msgid "Updated to revision {0} of branch {1}"
894
msgstr ""
895
896
#: bzrlib/builtins.py:1805
897
msgid ""
898
"Your local commits will now show as pending merges with 'bzr status', and "
899
"can be committed with 'bzr commit'."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1814
903
msgid "Show information about a working tree, branch or repository."
904
msgstr ""
905
906
#: bzrlib/builtins.py:1816
907
msgid ""
908
"This command will show all known locations and formats associated to the\n"
909
"tree, branch or repository."
910
msgstr ""
911
912
#: bzrlib/builtins.py:1819
913
msgid ""
914
"In verbose mode, statistical information is included with each report.\n"
915
"To see extended statistic information, use a verbosity level of 2 or\n"
916
"higher by specifying the verbose option multiple times, e.g. -vv."
917
msgstr ""
918
919
#: bzrlib/builtins.py:1823
920
msgid "Branches and working trees will also report any missing revisions."
921
msgstr ""
922
923
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
924
#: bzrlib/builtins.py:6466
925
msgid ":Examples:"
926
msgstr ""
927
928
#: bzrlib/builtins.py:1827
929
msgid " Display information on the format and related locations:"
930
msgstr ""
931
932
#: bzrlib/builtins.py:1829
933
msgid " bzr info"
934
msgstr ""
935
936
#: bzrlib/builtins.py:1831
937
msgid ""
938
" Display the above together with extended format information and\n"
939
" basic statistics (like the number of files in the working tree and\n"
940
" number of revisions in the branch and repository):"
941
msgstr ""
942
943
#: bzrlib/builtins.py:1835
944
msgid " bzr info -v"
945
msgstr ""
946
947
#: bzrlib/builtins.py:1837
948
msgid " Display the above together with number of committers to the branch:"
949
msgstr ""
950
951
#: bzrlib/builtins.py:1839
952
msgid " bzr info -vv"
953
msgstr ""
954
955
#: bzrlib/builtins.py:1858
956
msgid "Remove files or directories."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1860
960
msgid ""
961
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
962
"delete them if they can easily be recovered using revert otherwise they\n"
963
"will be backed up (adding an extension of the form .~#~). If no options or\n"
964
"parameters are given Bazaar will scan for files that are being tracked by\n"
965
"Bazaar but missing in your tree and stop tracking them for you."
966
msgstr ""
967
968
#: bzrlib/builtins.py:1868
969
msgid "Only remove files that have never been committed."
970
msgstr ""
971
972
#: bzrlib/builtins.py:1870
973
msgid "The file deletion mode to be used."
974
msgstr ""
975
976
#: bzrlib/builtins.py:1871
977
msgid "Deletion Strategy"
978
msgstr ""
979
980
#: bzrlib/builtins.py:1872
981
msgid "Backup changed files (default)."
982
msgstr ""
983
984
#: bzrlib/builtins.py:1873
985
msgid "Delete from bzr but leave the working copy."
986
msgstr ""
987
988
#: bzrlib/builtins.py:1874
989
msgid "Don't backup changed files."
990
msgstr ""
991
992
#: bzrlib/builtins.py:1875
993
msgid ""
994
"Delete all the specified files, even if they can not be recovered and even "
995
"if they are non-empty directories. (deprecated, use no-backup)"
996
msgstr ""
997
998
#: bzrlib/builtins.py:1884
999
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1000
msgstr ""
1001
1002
#: bzrlib/builtins.py:1901
1003
msgid "No matching files."
1004
msgstr ""
1005
1006
#: bzrlib/builtins.py:1962
1007
msgid "Reconcile bzr metadata in a branch."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1964
1011
msgid ""
1012
"This can correct data mismatches that may have been caused by\n"
1013
"previous ghost operations or bzr upgrades. You should only\n"
1014
"need to run this command if 'bzr check' or a bzr developer\n"
1015
"advises you to run it."
1016
msgstr ""
1017
1018
#: bzrlib/builtins.py:1969
1019
msgid ""
1020
"If a second branch is provided, cross-branch reconciliation is\n"
1021
"also attempted, which will check that data like the tree root\n"
1022
"id which was not present in very early bzr versions is represented\n"
1023
"correctly in both branches."
1024
msgstr ""
1025
1026
#: bzrlib/builtins.py:1974
1027
msgid ""
1028
"At the same time it is run it may recompress data resulting in\n"
1029
"a potential saving in disk space or performance gain."
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:1977
1033
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1037
msgid ""
1038
"Format for the bzr 2.0 series.\n"
1039
"Uses group-compress storage.\n"
1040
"Provides rich roots which are a one-way transition.\n"
1041
msgstr ""
1042
1043
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1044
msgid ""
1045
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1046
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1047
msgstr ""
1048
1049
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1050
msgid "The 2a format with experimental support for colocated branches.\n"
1051
msgstr ""
1052
1053
#: bzrlib/builtins.py:2045
1054
msgid "Make a directory into a versioned branch."
1055
msgstr ""
1056
1057
#: bzrlib/builtins.py:2047
1058
msgid ""
1059
"Use this to create an empty branch, or before importing an\n"
1060
"existing project."
1061
msgstr ""
1062
1063
#: bzrlib/builtins.py:2050
1064
msgid ""
1065
"If there is a repository in a parent directory of the location, then\n"
1066
"the history of the branch will be stored in the repository. Otherwise\n"
1067
"init creates a standalone branch which carries its own history\n"
1068
"in the .bzr directory."
1069
msgstr ""
1070
1071
#: bzrlib/builtins.py:2055
1072
msgid ""
1073
"If there is already a branch at the location but it has no working tree,\n"
1074
"the tree can be populated with 'bzr checkout'."
1075
msgstr ""
1076
1077
#: bzrlib/builtins.py:2058
1078
msgid "Recipe for importing a tree of files::"
1079
msgstr ""
1080
1081
#: bzrlib/builtins.py:2060
1082
msgid ""
1083
" cd ~/project\n"
1084
" bzr init\n"
1085
" bzr add .\n"
1086
" bzr status\n"
1087
" bzr commit -m \"imported project\""
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2071
1091
msgid ""
1092
"Create the path leading up to the branch if it does not already exist."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:2074
1096
msgid "Specify a format for this branch. See \"help formats\"."
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:2082
1100
msgid ""
1101
"Never change revnos or the existing log. Append revisions to it only."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2085
1105
msgid "Create a branch without a working tree."
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1109
#, python-format
1110
msgid ""
1111
"Parent directory of %s does not exist.\n"
1112
"You may supply --create-prefix to create all leading parent directories."
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:2139
1116
msgid ""
1117
"This branch format cannot be set to append-revisions-only. Try --default."
1118
msgstr ""
1119
1120
#: bzrlib/builtins.py:2150
1121
msgid "Created a {0} (format: {1})\n"
1122
msgstr ""
1123
1124
#: bzrlib/builtins.py:2159
1125
#, python-format
1126
msgid "Using shared repository: %s\n"
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:2163
1130
msgid "Create a shared repository for branches to share storage space."
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:2165
1134
msgid ""
1135
"New branches created under the repository directory will store their\n"
1136
"revisions in the repository, not in the branch directory. For branches\n"
1137
"with shared history, this reduces the amount of storage needed and \n"
1138
"speeds up the creation of new branches."
1139
msgstr ""
1140
1141
#: bzrlib/builtins.py:2170
1142
msgid ""
1143
"If the --no-trees option is given then the branches in the repository\n"
1144
"will not have working trees by default. They will still exist as \n"
1145
"directories on disk, but they will not have separate copies of the \n"
1146
"files at a certain revision. This can be useful for repositories that\n"
1147
"store branches which are interacted with through checkouts or remote\n"
1148
"branches, such as on a server."
1149
msgstr ""
1150
1151
#: bzrlib/builtins.py:2177
1152
msgid ""
1153
":Examples:\n"
1154
" Create a shared repository holding just branches::"
1155
msgstr ""
1156
1157
#: bzrlib/builtins.py:2180
1158
msgid ""
1159
" bzr init-repo --no-trees repo\n"
1160
" bzr init repo/trunk"
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2183
1164
msgid " Make a lightweight checkout elsewhere::"
1165
msgstr ""
1166
1167
#: bzrlib/builtins.py:2185
1168
msgid ""
1169
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1170
" cd trunk-checkout\n"
1171
" (add files here)"
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2193
1175
msgid ""
1176
"Specify a format for this repository. See \"bzr help formats\" for details."
1177
msgstr ""
1178
1179
#: bzrlib/builtins.py:2197
1180
msgid "Repository format"
1181
msgstr ""
1182
1183
#: bzrlib/builtins.py:2199
1184
msgid "Branches in the repository will default to not having a working tree."
1185
msgstr ""
1186
1187
#: bzrlib/builtins.py:2225
1188
msgid "Show differences in the working tree, between revisions or branches."
1189
msgstr ""
1190
1191
#: bzrlib/builtins.py:2227
1192
msgid ""
1193
"If no arguments are given, all changes for the current tree are listed.\n"
1194
"If files are given, only the changes in those files are listed.\n"
1195
"Remote and multiple branches can be compared by using the --old and\n"
1196
"--new options. If not provided, the default for both is derived from\n"
1197
"the first argument, if any, or the current tree if no arguments are\n"
1198
"given."
1199
msgstr ""
1200
1201
#: bzrlib/builtins.py:2234
1202
msgid ""
1203
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1204
"produces patches suitable for \"patch -p1\"."
1205
msgstr ""
1206
1207
#: bzrlib/builtins.py:2237
1208
msgid ""
1209
"Note that when using the -r argument with a range of revisions, the\n"
1210
"differences are computed between the two specified revisions. That\n"
1211
"is, the command does not show the changes introduced by the first \n"
1212
"revision in the range. This differs from the interpretation of \n"
1213
"revision ranges used by \"bzr log\" which includes the first revision\n"
1214
"in the range."
1215
msgstr ""
1216
1217
#: bzrlib/builtins.py:2244
1218
msgid ""
1219
":Exit values:\n"
1220
" 1 - changed\n"
1221
" 2 - unrepresentable changes\n"
1222
" 3 - error\n"
1223
" 0 - no change"
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2250
1227
msgid ""
1228
":Examples:\n"
1229
" Shows the difference in the working tree versus the last commit::"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2253
1233
msgid " bzr diff"
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2255
1237
msgid " Difference between the working tree and revision 1::"
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2257
1241
msgid " bzr diff -r1"
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2259
1245
msgid " Difference between revision 3 and revision 1::"
1246
msgstr ""
1247
1248
#: bzrlib/builtins.py:2261
1249
msgid " bzr diff -r1..3"
1250
msgstr ""
1251
1252
#: bzrlib/builtins.py:2263
1253
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1254
msgstr ""
1255
1256
#: bzrlib/builtins.py:2265
1257
msgid " bzr diff -r1..3 xxx"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2267
1261
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2269
1265
msgid " bzr diff -c2"
1266
msgstr ""
1267
1268
#: bzrlib/builtins.py:2271
1269
msgid ""
1270
" To see the changes introduced by revision X::\n"
1271
" \n"
1272
" bzr diff -cX"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2275
1276
msgid ""
1277
" Note that in the case of a merge, the -c option shows the changes\n"
1278
" compared to the left hand parent. To see the changes against\n"
1279
" another parent, use::"
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2279
1283
msgid " bzr diff -r<chosen_parent>..X"
1284
msgstr ""
1285
1286
#: bzrlib/builtins.py:2281
1287
msgid ""
1288
" The changes between the current revision and the previous revision\n"
1289
" (equivalent to -c-1 and -r-2..-1)"
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2284
1293
msgid " bzr diff -r-2.."
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2286
1297
msgid " Show just the differences for file NEWS::"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2288
1301
msgid " bzr diff NEWS"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2290
1305
msgid " Show the differences in working tree xxx for file NEWS::"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2292
1309
msgid " bzr diff xxx/NEWS"
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2294
1313
msgid " Show the differences from branch xxx to this working tree:"
1314
msgstr ""
1315
1316
#: bzrlib/builtins.py:2296
1317
msgid " bzr diff --old xxx"
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2298
1321
msgid " Show the differences between two branches for file NEWS::"
1322
msgstr ""
1323
1324
#: bzrlib/builtins.py:2300
1325
msgid " bzr diff --old xxx --new yyy NEWS"
1326
msgstr ""
1327
1328
#: bzrlib/builtins.py:2302
1329
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1330
msgstr ""
1331
1332
#: bzrlib/builtins.py:2304
1333
msgid ""
1334
" bzr diff --prefix old/:new/\n"
1335
" \n"
1336
" Show the differences using a custom diff program with options::\n"
1337
" \n"
1338
" bzr diff --using /usr/bin/diff --diff-options -wu"
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2314
1342
msgid "Pass these options to the external diff program."
1343
msgstr ""
1344
1345
#: bzrlib/builtins.py:2317
1346
msgid ""
1347
"Set prefixes added to old and new filenames, as two values separated by a "
1348
"colon. (eg \"old/:new/\")."
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2320
1352
msgid "Branch/tree to compare from."
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2324
1356
msgid "Branch/tree to compare to."
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2330
1360
msgid "Use this command to compare files."
1361
msgstr ""
1362
1363
#: bzrlib/builtins.py:2335
1364
msgid "Diff format to use."
1365
msgstr ""
1366
1367
#: bzrlib/builtins.py:2337
1368
msgid "Diff format"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2359
1372
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2363
1376
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1380
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1381
msgid "{0} and {1} are mutually exclusive"
1382
msgstr ""
1383
1384
#: bzrlib/builtins.py:2388
1385
msgid ""
1386
"List files deleted in the working tree.\n"
1387
" "
1388
msgstr ""
1389
1390
#: bzrlib/builtins.py:2465
1391
msgid "Show the tree root directory."
1392
msgstr ""
1393
1394
#: bzrlib/builtins.py:2467
1395
msgid ""
1396
"The root is the nearest enclosing directory with a .bzr control\n"
1397
"directory."
1398
msgstr ""
1399
1400
#: bzrlib/builtins.py:2482
1401
msgid "The limit argument must be an integer."
1402
msgstr ""
1403
1404
#: bzrlib/builtins.py:2490
1405
msgid "The levels argument must be an integer."
1406
msgstr ""
1407
1408
#: bzrlib/builtins.py:2495
1409
msgid "Show historical log for a branch or subset of a branch."
1410
msgstr ""
1411
1412
#: bzrlib/builtins.py:2497
1413
msgid ""
1414
"log is bzr's default tool for exploring the history of a branch.\n"
1415
"The branch to use is taken from the first parameter. If no parameters\n"
1416
"are given, the branch containing the working directory is logged.\n"
1417
"Here are some simple examples::"
1418
msgstr ""
1419
1420
#: bzrlib/builtins.py:2502
1421
msgid ""
1422
" bzr log log the current branch\n"
1423
" bzr log foo.py log a file in its branch\n"
1424
" bzr log http://server/branch log a branch on a server"
1425
msgstr ""
1426
1427
#: bzrlib/builtins.py:2506
1428
msgid ""
1429
"The filtering, ordering and information shown for each revision can\n"
1430
"be controlled as explained below. By default, all revisions are\n"
1431
"shown sorted (topologically) so that newer revisions appear before\n"
1432
"older ones and descendants always appear before ancestors. If displayed,\n"
1433
"merged revisions are shown indented under the revision in which they\n"
1434
"were merged."
1435
msgstr ""
1436
1437
#: bzrlib/builtins.py:2513
1438
msgid ":Output control:"
1439
msgstr ""
1440
1441
#: bzrlib/builtins.py:2515
1442
msgid ""
1443
" The log format controls how information about each revision is\n"
1444
" displayed. The standard log formats are called ``long``, ``short``\n"
1445
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1446
" for more details on log formats."
1447
msgstr ""
1448
1449
#: bzrlib/builtins.py:2520
1450
msgid ""
1451
" The following options can be used to control what information is\n"
1452
" displayed::"
1453
msgstr ""
1454
1455
#: bzrlib/builtins.py:2523
1456
msgid ""
1457
" -l N display a maximum of N revisions\n"
1458
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1459
" -v display a status summary (delta) for each revision\n"
1460
" -p display a diff (patch) for each revision\n"
1461
" --show-ids display revision-ids (and file-ids), not just revnos"
1462
msgstr ""
1463
1464
#: bzrlib/builtins.py:2529
1465
msgid ""
1466
" Note that the default number of levels to display is a function of the\n"
1467
" log format. If the -n option is not used, the standard log formats show\n"
1468
" just the top level (mainline)."
1469
msgstr ""
1470
1471
#: bzrlib/builtins.py:2533
1472
msgid ""
1473
" Status summaries are shown using status flags like A, M, etc. To see\n"
1474
" the changes explained using words like ``added`` and ``modified``\n"
1475
" instead, use the -vv option."
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2537
1479
msgid ":Ordering control:"
1480
msgstr ""
1481
1482
#: bzrlib/builtins.py:2539
1483
msgid ""
1484
" To display revisions from oldest to newest, use the --forward option.\n"
1485
" In most cases, using this option will have little impact on the total\n"
1486
" time taken to produce a log, though --forward does not incrementally\n"
1487
" display revisions like --reverse does when it can."
1488
msgstr ""
1489
1490
#: bzrlib/builtins.py:2544
1491
msgid ":Revision filtering:"
1492
msgstr ""
1493
1494
#: bzrlib/builtins.py:2546
1495
msgid ""
1496
" The -r option can be used to specify what revision or range of revisions\n"
1497
" to filter against. The various forms are shown below::"
1498
msgstr ""
1499
1500
#: bzrlib/builtins.py:2549
1501
msgid ""
1502
" -rX display revision X\n"
1503
" -rX.. display revision X and later\n"
1504
" -r..Y display up to and including revision Y\n"
1505
" -rX..Y display from X to Y inclusive"
1506
msgstr ""
1507
1508
#: bzrlib/builtins.py:2554
1509
msgid ""
1510
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1511
" Some common examples are given below::"
1512
msgstr ""
1513
1514
#: bzrlib/builtins.py:2557
1515
msgid ""
1516
" -r-1 show just the tip\n"
1517
" -r-10.. show the last 10 mainline revisions\n"
1518
" -rsubmit:.. show what's new on this branch\n"
1519
" -rancestor:path.. show changes since the common ancestor of this\n"
1520
" branch and the one at location path\n"
1521
" -rdate:yesterday.. show changes since yesterday"
1522
msgstr ""
1523
1524
#: bzrlib/builtins.py:2564
1525
msgid ""
1526
" When logging a range of revisions using -rX..Y, log starts at\n"
1527
" revision Y and searches back in history through the primary\n"
1528
" (\"left-hand\") parents until it finds X. When logging just the\n"
1529
" top level (using -n1), an error is reported if X is not found\n"
1530
" along the way. If multi-level logging is used (-n0), X may be\n"
1531
" a nested merge revision and the log will be truncated accordingly."
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2571
1535
msgid ":Path filtering:"
1536
msgstr ""
1537
1538
#: bzrlib/builtins.py:2573
1539
msgid ""
1540
" If parameters are given and the first one is not a branch, the log\n"
1541
" will be filtered to show only those revisions that changed the\n"
1542
" nominated files or directories."
1543
msgstr ""
1544
1545
#: bzrlib/builtins.py:2577
1546
msgid ""
1547
" Filenames are interpreted within their historical context. To log a\n"
1548
" deleted file, specify a revision range so that the file existed at\n"
1549
" the end or start of the range."
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2581
1553
msgid ""
1554
" Historical context is also important when interpreting pathnames of\n"
1555
" renamed files/directories. Consider the following example:"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2584
1559
msgid ""
1560
" * revision 1: add tutorial.txt\n"
1561
" * revision 2: modify tutorial.txt\n"
1562
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2588
1566
msgid " In this case:"
1567
msgstr ""
1568
1569
#: bzrlib/builtins.py:2590
1570
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2592
1574
msgid ""
1575
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1576
msgstr ""
1577
1578
#: bzrlib/builtins.py:2594
1579
msgid ""
1580
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1581
" the original file in revision 2."
1582
msgstr ""
1583
1584
#: bzrlib/builtins.py:2597
1585
msgid ""
1586
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1587
" was no file called guide.txt in revision 2."
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2600
1591
msgid ""
1592
" Renames are always followed by log. By design, there is no need to\n"
1593
" explicitly ask for this (and no way to stop logging a file back\n"
1594
" until it was last renamed)."
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2604
1598
msgid ":Other filtering:"
1599
msgstr ""
1600
1601
#: bzrlib/builtins.py:2606
1602
msgid ""
1603
" The --match option can be used for finding revisions that match a\n"
1604
" regular expression in a commit message, committer, author or bug.\n"
1605
" Specifying the option several times will match any of the supplied\n"
1606
" expressions. --match-author, --match-bugs, --match-committer and\n"
1607
" --match-message can be used to only match a specific field."
1608
msgstr ""
1609
1610
#: bzrlib/builtins.py:2612
1611
msgid ":Tips & tricks:"
1612
msgstr ""
1613
1614
#: bzrlib/builtins.py:2614
1615
msgid ""
1616
" GUI tools and IDEs are often better at exploring history than command\n"
1617
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1618
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1619
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1620
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2620
1624
msgid ""
1625
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:2622
1629
msgid ""
1630
" [ALIASES]\n"
1631
" tip = log -r-1\n"
1632
" top = log -l10 --line\n"
1633
" show = log -v -p"
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2627
1637
msgid ""
1638
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1639
" will show the last 10 mainline revisions. To see the details of a\n"
1640
" particular revision X, ``bzr show -rX``."
1641
msgstr ""
1642
1643
#: bzrlib/builtins.py:2631
1644
msgid ""
1645
" If you are interested in looking deeper into a particular merge X,\n"
1646
" use ``bzr log -n0 -rX``."
1647
msgstr ""
1648
1649
#: bzrlib/builtins.py:2634
1650
msgid ""
1651
" ``bzr log -v`` on a branch with lots of history is currently\n"
1652
" very slow. A fix for this issue is currently under development.\n"
1653
" With or without that fix, it is recommended that a revision range\n"
1654
" be given when using the -v option."
1655
msgstr ""
1656
1657
#: bzrlib/builtins.py:2639
1658
msgid ""
1659
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1660
" used to find revisions matching user names, commit messages, etc.\n"
1661
" Among other features, this plugin can find all revisions containing\n"
1662
" a list of words but not others."
1663
msgstr ""
1664
1665
#: bzrlib/builtins.py:2644
1666
msgid ""
1667
" When exploring non-mainline history on large projects with deep\n"
1668
" history, the performance of log can be greatly improved by installing\n"
1669
" the historycache plugin. This plugin buffers historical information\n"
1670
" trading disk space for faster speed."
1671
msgstr ""
1672
1673
#: bzrlib/builtins.py:2653
1674
msgid "Show from oldest to newest."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2656
1678
msgid "Show files changed in each revision."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2662
1682
msgid "Show just the specified revision. See also \"help revisionspec\"."
1683
msgstr ""
1684
1685
#: bzrlib/builtins.py:2666
1686
msgid "What names to list as authors - first, all or committer."
1687
msgstr ""
1688
1689
#: bzrlib/builtins.py:2667
1690
msgid "Authors"
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2672
1694
msgid "Number of levels to display - 0 for all, 1 for flat."
1695
msgstr ""
1696
1697
#: bzrlib/builtins.py:2682
1698
msgid "Limit the output to the first N revisions."
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2687
1702
msgid "Show changes made in each revision as a patch."
1703
msgstr ""
1704
1705
#: bzrlib/builtins.py:2689
1706
msgid "Show merged revisions like --levels 0 does."
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2693
1710
msgid "Do not report commits with more than one parent."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2695
1714
msgid ""
1715
"Display only the revisions that are not part of both ancestries (require -"
1716
"rX..Y)."
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2699
1720
msgid "Show digital signature validity."
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2702
1724
msgid "Show revisions whose properties match this expression."
1725
msgstr ""
1726
1727
#: bzrlib/builtins.py:2706
1728
msgid "Show revisions whose message matches this expression."
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2710
1732
msgid "Show revisions whose committer matches this expression."
1733
msgstr ""
1734
1735
#: bzrlib/builtins.py:2714
1736
msgid "Show revisions whose authors match this expression."
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2718
1740
msgid "Show revisions whose bugs match this expression."
1741
msgstr ""
1742
1743
#: bzrlib/builtins.py:2772
1744
msgid "--exclude-common-ancestry requires -r with two revisions"
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2800
1748
#, python-format
1749
msgid "Path unknown at end or start of revision range: %s"
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2917
1753
#, python-format
1754
msgid "bzr %s doesn't accept two revisions in different branches."
1755
msgstr ""
1756
1757
#: bzrlib/builtins.py:2933
1758
#, python-format
1759
msgid "bzr %s --revision takes one or two values."
1760
msgstr ""
1761
1762
#: bzrlib/builtins.py:2978
1763
msgid ""
1764
"List files in a tree.\n"
1765
" "
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2987
1769
msgid "Recurse into subdirectories."
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2989
1773
msgid "Print paths relative to the root of the branch."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2991
1777
msgid "Print unknown files."
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2992
1781
msgid "Print versioned files."
1782
msgstr ""
1783
1784
#: bzrlib/builtins.py:2995
1785
msgid "Print ignored files."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:2997
1789
msgid "List entries of a particular kind: file, directory, symlink."
1790
msgstr ""
1791
1792
#: bzrlib/builtins.py:3010
1793
msgid "invalid kind specified"
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:3013
1797
msgid "Cannot set both --verbose and --null"
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:3022
1801
msgid "cannot specify both --from-root and PATH"
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:3109
1805
msgid "Ignore specified files or patterns."
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:3111
1809
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:3113
1813
msgid ""
1814
"If a .bzrignore file does not exist, the ignore command\n"
1815
"will create one and add the specified files or patterns to the newly\n"
1816
"created file. The ignore command will also automatically add the \n"
1817
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1818
"the use of the ignore command will require an explicit add command."
1819
msgstr ""
1820
1821
#: bzrlib/builtins.py:3119
1822
msgid ""
1823
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1824
"After adding, editing or deleting that file either indirectly by\n"
1825
"using this command or directly by using an editor, be sure to commit\n"
1826
"it."
1827
msgstr ""
1828
1829
#: bzrlib/builtins.py:3124
1830
msgid ""
1831
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1832
"the global ignore file can be found in the application data directory as\n"
1833
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1834
"Global ignores are not touched by this command. The global ignore file\n"
1835
"can be edited directly using an editor."
1836
msgstr ""
1837
1838
#: bzrlib/builtins.py:3130
1839
msgid ""
1840
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1841
"precedence over regular ignores. Such exceptions are used to specify\n"
1842
"files that should be versioned which would otherwise be ignored."
1843
msgstr ""
1844
1845
#: bzrlib/builtins.py:3134
1846
msgid ""
1847
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1848
"precedence over the '!' exception patterns."
1849
msgstr ""
1850
1851
#: bzrlib/builtins.py:3137
1852
msgid ""
1853
":Notes: \n"
1854
" \n"
1855
"* Ignore patterns containing shell wildcards must be quoted from\n"
1856
" the shell on Unix."
1857
msgstr ""
1858
1859
#: bzrlib/builtins.py:3142
1860
msgid ""
1861
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1862
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:3145
1866
msgid ""
1867
":Examples:\n"
1868
" Ignore the top level Makefile::"
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:3148
1872
msgid " bzr ignore ./Makefile"
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3150
1876
msgid " Ignore .class files in all directories...::"
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3152
1880
msgid " bzr ignore \"*.class\""
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3154
1884
msgid " ...but do not ignore \"special.class\"::"
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:3156
1888
msgid " bzr ignore \"!special.class\""
1889
msgstr ""
1890
1891
#: bzrlib/builtins.py:3158
1892
msgid " Ignore files whose name begins with the \"#\" character::"
1893
msgstr ""
1894
1895
#: bzrlib/builtins.py:3160
1896
msgid " bzr ignore \"RE:^#\""
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1900
msgid " Ignore .o files under the lib directory::"
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:3164
1904
msgid " bzr ignore \"lib/**/*.o\""
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3168
1908
msgid " bzr ignore \"RE:lib/.*\\.o\""
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3170
1912
msgid " Ignore everything but the \"debian\" toplevel directory::"
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:3172
1916
msgid ""
1917
" bzr ignore \"RE:(?!debian/).*\"\n"
1918
" \n"
1919
" Ignore everything except the \"local\" toplevel directory,\n"
1920
" but always ignore autosave files ending in ~, even under local/::\n"
1921
" \n"
1922
" bzr ignore \"*\"\n"
1923
" bzr ignore \"!./local\"\n"
1924
" bzr ignore \"!!*~\""
1925
msgstr ""
1926
1927
#: bzrlib/builtins.py:3186
1928
msgid "Display the default ignore rules that bzr uses."
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3198
1932
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3209
1936
#, python-format
1937
msgid "Invalid ignore pattern found. %s"
1938
msgid_plural "Invalid ignore patterns found. %s"
1939
msgstr[0] ""
1940
msgstr[1] ""
1941
1942
#: bzrlib/builtins.py:3218
1943
msgid "NAME_PATTERN should not be an absolute path"
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:3231
1947
#, python-format
1948
msgid ""
1949
"Warning: the following files are version controlled and match your ignore "
1950
"pattern:\n"
1951
"%s\n"
1952
"These files will continue to be version controlled unless you 'bzr remove' "
1953
"them.\n"
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:3238
1957
msgid "List ignored files and the patterns that matched them."
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3240
1961
msgid ""
1962
"List all the ignored files and the ignore pattern that caused the file to\n"
1963
"be ignored."
1964
msgstr ""
1965
1966
#: bzrlib/builtins.py:3243
1967
msgid "Alternatively, to list just the files::"
1968
msgstr ""
1969
1970
#: bzrlib/builtins.py:3245
1971
msgid " bzr ls --ignored"
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3279
1975
#, python-format
1976
msgid "not a valid revision-number: %r"
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:3286
1980
msgid ""
1981
"Export current or past revision to a destination directory or archive."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3288
1985
msgid "If no revision is specified this exports the last committed revision."
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3290
1989
msgid ""
1990
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1991
"given, try to find the format with the extension. If no extension\n"
1992
"is found exports to a directory (equivalent to --format=dir)."
1993
msgstr ""
1994
1995
#: bzrlib/builtins.py:3294
1996
msgid ""
1997
"If root is supplied, it will be used as the root directory inside\n"
1998
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1999
"to the exported filename. The root option has no effect for 'dir' format."
2000
msgstr ""
2001
2002
#: bzrlib/builtins.py:3298
2003
msgid ""
2004
"If branch is omitted then the branch containing the current working\n"
2005
"directory will be used."
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3301
2009
msgid ""
2010
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2011
msgstr ""
2012
2013
#: bzrlib/builtins.py:3303
2014
msgid ""
2015
" ================= =========================\n"
2016
" Supported formats Autodetected by extension\n"
2017
" ================= =========================\n"
2018
" dir (none)\n"
2019
" tar .tar\n"
2020
" tbz2 .tar.bz2, .tbz2\n"
2021
" tgz .tar.gz, .tgz\n"
2022
" zip .zip\n"
2023
" ================= ========================="
2024
msgstr ""
2025
2026
#: bzrlib/builtins.py:3317
2027
msgid "Type of file to export to."
2028
msgstr ""
2029
2030
#: bzrlib/builtins.py:3320
2031
msgid "Apply content filters to export the convenient form."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3324
2035
msgid "Name of the root directory inside the exported file."
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3326
2039
msgid ""
2040
"Set modification time of files to that of the last revision in which it was "
2041
"changed."
2042
msgstr ""
2043
2044
#: bzrlib/builtins.py:3329
2045
msgid ""
2046
"Export the working tree contents rather than that of the last revision."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3348
2050
msgid "--uncommitted requires a working tree"
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3357
2054
#, python-format
2055
msgid "Unsupported export format: %s"
2056
msgstr ""
2057
2058
#: bzrlib/builtins.py:3361
2059
msgid ""
2060
"Write the contents of a file as of a given revision to standard output."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3363
2064
msgid "If no revision is nominated, the last revision is used."
2065
msgstr ""
2066
2067
#: bzrlib/builtins.py:3365
2068
msgid ""
2069
"Note: Take care to redirect standard output when using this command on a\n"
2070
"binary file."
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3371
2074
msgid "The path name in the old tree."
2075
msgstr ""
2076
2077
#: bzrlib/builtins.py:3372
2078
msgid "Apply content filters to display the convenience form."
2079
msgstr ""
2080
2081
#: bzrlib/builtins.py:3383
2082
msgid "bzr cat --revision takes exactly one revision specifier"
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2086
msgid "{0!r} is not present in revision {1}"
2087
msgstr ""
2088
2089
#: bzrlib/builtins.py:3443
2090
msgid "Commit changes into a new revision."
2091
msgstr ""
2092
2093
#: bzrlib/builtins.py:3445
2094
msgid ""
2095
"An explanatory message needs to be given for each commit. This is\n"
2096
"often done by using the --message option (getting the message from the\n"
2097
"command line) or by using the --file option (getting the message from\n"
2098
"a file). If neither of these options is given, an editor is opened for\n"
2099
"the user to enter the message. To see the changed files in the\n"
2100
"boilerplate text loaded into the editor, use the --show-diff option."
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3452
2104
msgid ""
2105
"By default, the entire tree is committed and the person doing the\n"
2106
"commit is assumed to be the author. These defaults can be overridden\n"
2107
"as explained below."
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3456
2111
msgid ":Selective commits:"
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3458
2115
msgid ""
2116
" If selected files are specified, only changes to those files are\n"
2117
" committed. If a directory is specified then the directory and\n"
2118
" everything within it is committed."
2119
msgstr ""
2120
2121
#: bzrlib/builtins.py:3462
2122
msgid ""
2123
" When excludes are given, they take precedence over selected files.\n"
2124
" For example, to commit only changes within foo, but not changes\n"
2125
" within foo/bar::"
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3466
2129
msgid " bzr commit foo -x foo/bar"
2130
msgstr ""
2131
2132
#: bzrlib/builtins.py:3468
2133
msgid " A selective commit after a merge is not yet supported."
2134
msgstr ""
2135
2136
#: bzrlib/builtins.py:3470
2137
msgid ":Custom authors:"
2138
msgstr ""
2139
2140
#: bzrlib/builtins.py:3472
2141
msgid ""
2142
" If the author of the change is not the same person as the committer,\n"
2143
" you can specify the author's name using the --author option. The\n"
2144
" name should be in the same format as a committer-id, e.g.\n"
2145
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2146
" the change you can specify the option multiple times, once for each\n"
2147
" author."
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3479
2151
msgid ":Checks:"
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3481
2155
msgid ""
2156
" A common mistake is to forget to add a new file or directory before\n"
2157
" running the commit command. The --strict option checks for unknown\n"
2158
" files and aborts the commit if any are found. More advanced pre-commit\n"
2159
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2160
" for details."
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3487
2164
msgid ":Things to note:"
2165
msgstr ""
2166
2167
#: bzrlib/builtins.py:3489
2168
msgid ""
2169
" If you accidentially commit the wrong changes or make a spelling\n"
2170
" mistake in the commit message say, you can use the uncommit command\n"
2171
" to undo it. See ``bzr help uncommit`` for details."
2172
msgstr ""
2173
2174
#: bzrlib/builtins.py:3493
2175
msgid ""
2176
" Hooks can also be configured to run after a commit. This allows you\n"
2177
" to trigger updates to external systems like bug trackers. The --fixes\n"
2178
" option can be used to record the association between a revision and\n"
2179
" one or more bugs. See ``bzr help bugs`` for details."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3503
2183
msgid "Do not consider changes made to a given path."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3506
2187
msgid "Description of the new revision."
2188
msgstr ""
2189
2190
#: bzrlib/builtins.py:3509
2191
msgid "Commit even if nothing has changed."
2192
msgstr ""
2193
2194
#: bzrlib/builtins.py:3513
2195
msgid "Take commit message from this file."
2196
msgstr ""
2197
2198
#: bzrlib/builtins.py:3515
2199
msgid "Refuse to commit if there are unknown files in the working tree."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3518
2203
msgid ""
2204
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2205
"08:00:00 +0100'."
2206
msgstr ""
2207
2208
#: bzrlib/builtins.py:3521
2209
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3524
2213
msgid "Set the author's name, if it's different from the committer."
2214
msgstr ""
2215
2216
#: bzrlib/builtins.py:3527
2217
msgid ""
2218
"Perform a local commit in a bound branch. Local commits are not pushed to "
2219
"the master branch until a normal commit is performed."
2220
msgstr ""
2221
2222
#: bzrlib/builtins.py:3533
2223
msgid ""
2224
"When no message is supplied, show the diff along with the status summary in "
2225
"the message editor."
2226
msgstr ""
2227
2228
#: bzrlib/builtins.py:3536
2229
msgid ""
2230
"When committing to a foreign version control system do not push data that "
2231
"can not be natively represented."
2232
msgstr ""
2233
2234
#: bzrlib/builtins.py:3554
2235
#, python-format
2236
msgid ""
2237
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2238
"default bug tracker using the `bugtracker` option.\n"
2239
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2240
msgstr ""
2241
2242
#: bzrlib/builtins.py:3563
2243
#, python-format
2244
msgid ""
2245
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2246
"for more information on this feature.\n"
2247
"Commit refused."
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3572
2251
#, python-format
2252
msgid "Unrecognized bug %s. Commit refused."
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3575
2256
#, python-format
2257
msgid ""
2258
"%s\n"
2259
"Commit refused."
2260
msgstr ""
2261
2262
#: bzrlib/builtins.py:3599
2263
msgid "Could not parse --commit-time: "
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3639
2267
msgid "please specify either --message or --file"
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3668
2271
msgid "please specify a commit message with either --message or --file"
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3671
2275
msgid ""
2276
"Empty commit message specified. Please specify a commit message with either -"
2277
"-message or --file or leave a blank message with --message \"\"."
2278
msgstr ""
2279
2280
#: bzrlib/builtins.py:3691
2281
msgid ""
2282
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2283
"-unchanged to force an empty commit."
2284
msgstr ""
2285
2286
#: bzrlib/builtins.py:3695
2287
msgid ""
2288
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2289
"resolve FILE\" to resolve."
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3699
2293
msgid "Commit refused because there are unknown files in the working tree."
2294
msgstr ""
2295
2296
#: bzrlib/builtins.py:3702
2297
msgid ""
2298
"\n"
2299
"To commit to master branch, run update and then commit.\n"
2300
"You can also pass --local to commit to continue working disconnected."
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3710
2304
msgid ""
2305
"Validate working tree structure, branch consistency and repository history."
2306
msgstr ""
2307
2308
#: bzrlib/builtins.py:3712
2309
msgid ""
2310
"This command checks various invariants about branch and repository storage\n"
2311
"to detect data corruption or bzr bugs."
2312
msgstr ""
2313
2314
#: bzrlib/builtins.py:3715
2315
msgid ""
2316
"The working tree and branch checks will only give output if a problem is\n"
2317
"detected. The output fields of the repository check are:"
2318
msgstr ""
2319
2320
#: bzrlib/builtins.py:3718
2321
msgid ""
2322
"revisions\n"
2323
" This is just the number of revisions checked. It doesn't\n"
2324
" indicate a problem."
2325
msgstr ""
2326
2327
#: bzrlib/builtins.py:3722
2328
msgid ""
2329
"versionedfiles\n"
2330
" This is just the number of versionedfiles checked. It\n"
2331
" doesn't indicate a problem."
2332
msgstr ""
2333
2334
#: bzrlib/builtins.py:3726
2335
msgid ""
2336
"unreferenced ancestors\n"
2337
" Texts that are ancestors of other texts, but\n"
2338
" are not properly referenced by the revision ancestry. This is a\n"
2339
" subtle problem that Bazaar can work around."
2340
msgstr ""
2341
2342
#: bzrlib/builtins.py:3731
2343
msgid ""
2344
"unique file texts\n"
2345
" This is the total number of unique file contents\n"
2346
" seen in the checked revisions. It does not indicate a problem."
2347
msgstr ""
2348
2349
#: bzrlib/builtins.py:3735
2350
msgid ""
2351
"repeated file texts\n"
2352
" This is the total number of repeated texts seen\n"
2353
" in the checked revisions. Texts can be repeated when their file\n"
2354
" entries are modified, but the file contents are not. It does not\n"
2355
" indicate a problem."
2356
msgstr ""
2357
2358
#: bzrlib/builtins.py:3741
2359
msgid ""
2360
"If no restrictions are specified, all Bazaar data that is found at the "
2361
"given\n"
2362
"location will be checked."
2363
msgstr ""
2364
2365
#: bzrlib/builtins.py:3746
2366
msgid " Check the tree and branch at 'foo'::"
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3748
2370
msgid " bzr check --tree --branch foo"
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3750
2374
msgid " Check only the repository at 'bar'::"
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3752
2378
msgid " bzr check --repo bar"
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3754
2382
msgid " Check everything at 'baz'::"
2383
msgstr ""
2384
2385
#: bzrlib/builtins.py:3756
2386
msgid " bzr check baz"
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3762
2390
msgid "Check the branch related to the current directory."
2391
msgstr ""
2392
2393
#: bzrlib/builtins.py:3764
2394
msgid "Check the repository related to the current directory."
2395
msgstr ""
2396
2397
#: bzrlib/builtins.py:3766
2398
msgid "Check the working tree related to the current directory."
2399
msgstr ""
2400
2401
#: bzrlib/builtins.py:3780
2402
msgid "Upgrade a repository, branch or working tree to a newer format."
2403
msgstr ""
2404
2405
#: bzrlib/builtins.py:3782
2406
msgid ""
2407
"When the default format has changed after a major new release of\n"
2408
"Bazaar, you may be informed during certain operations that you\n"
2409
"should upgrade. Upgrading to a newer format may improve performance\n"
2410
"or make new features available. It may however limit interoperability\n"
2411
"with older repositories or with older versions of Bazaar."
2412
msgstr ""
2413
2414
#: bzrlib/builtins.py:3788
2415
msgid ""
2416
"If you wish to upgrade to a particular format rather than the\n"
2417
"current default, that can be specified using the --format option.\n"
2418
"As a consequence, you can use the upgrade command this way to\n"
2419
"\"downgrade\" to an earlier format, though some conversions are\n"
2420
"a one way process (e.g. changing from the 1.x default to the\n"
2421
"2.x default) so downgrading is not always possible."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3795
2425
msgid ""
2426
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2427
"process (where # is a number). By default, this is left there on\n"
2428
"completion. If the conversion fails, delete the new .bzr directory\n"
2429
"and rename this one back in its place. Use the --clean option to ask\n"
2430
"for the backup.bzr directory to be removed on successful conversion.\n"
2431
"Alternatively, you can delete it by hand if everything looks good\n"
2432
"afterwards."
2433
msgstr ""
2434
2435
#: bzrlib/builtins.py:3803
2436
msgid ""
2437
"If the location given is a shared repository, dependent branches\n"
2438
"are also converted provided the repository converts successfully.\n"
2439
"If the conversion of a branch fails, remaining branches are still\n"
2440
"tried."
2441
msgstr ""
2442
2443
#: bzrlib/builtins.py:3808
2444
msgid ""
2445
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2446
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3816
2450
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3820
2454
msgid "Branch format"
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3822
2458
msgid "Remove the backup.bzr directory if successful."
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3824
2462
msgid "Show what would be done, but don't actually do anything."
2463
msgstr ""
2464
2465
#: bzrlib/builtins.py:3839
2466
msgid "Show or set bzr user id."
2467
msgstr ""
2468
2469
#: bzrlib/builtins.py:3841
2470
msgid ""
2471
":Examples:\n"
2472
" Show the email of the current user::"
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3844
2476
msgid " bzr whoami --email"
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3846
2480
msgid " Set the current user::"
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:3848
2484
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2485
msgstr ""
2486
2487
#: bzrlib/builtins.py:3852
2488
msgid "Display email address only."
2489
msgstr ""
2490
2491
#: bzrlib/builtins.py:3854
2492
msgid "Set identity for the current branch instead of globally."
2493
msgstr ""
2494
2495
#: bzrlib/builtins.py:3880
2496
msgid "--email can only be used to display existing identity"
2497
msgstr ""
2498
2499
#: bzrlib/builtins.py:3904
2500
msgid "Print or set the branch nickname."
2501
msgstr ""
2502
2503
#: bzrlib/builtins.py:3906
2504
msgid ""
2505
"If unset, the colocated branch name is used for colocated branches, and\n"
2506
"the branch directory name is used for other branches. To print the\n"
2507
"current nickname, execute with no argument."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3910
2511
msgid ""
2512
"Bound branches use the nickname of its master branch unless it is set\n"
2513
"locally."
2514
msgstr ""
2515
2516
#: bzrlib/builtins.py:3930
2517
msgid "Set/unset and display aliases."
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3932
2521
msgid ""
2522
":Examples:\n"
2523
" Show the current aliases::"
2524
msgstr ""
2525
2526
#: bzrlib/builtins.py:3935
2527
msgid " bzr alias"
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3937
2531
msgid " Show the alias specified for 'll'::"
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:3939
2535
msgid " bzr alias ll"
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3941
2539
msgid " Set an alias for 'll'::"
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:3943
2543
msgid " bzr alias ll=\"log --line -r-10..-1\""
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3945
2547
msgid " To remove an alias for 'll'::"
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3947
2551
msgid " bzr alias --remove ll"
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3952
2555
msgid "Remove the alias."
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:3970
2559
msgid "bzr alias --remove expects an alias to remove."
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:4151
2563
msgid ""
2564
"subunit not available. subunit needs to be installed to use --subunit."
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:4168
2568
msgid ""
2569
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2570
msgstr ""
2571
2572
#: bzrlib/builtins.py:4215
2573
msgid "Show version of bzr."
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:4219
2577
msgid "Print just the version number."
2578
msgstr ""
2579
2580
#: bzrlib/builtins.py:4238
2581
msgid "It sure does!\n"
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:4262
2585
#, python-format
2586
msgid "merge base is revision %s\n"
2587
msgstr ""
2588
2589
#: bzrlib/builtins.py:4266
2590
msgid "Perform a three-way merge."
2591
msgstr ""
2592
2593
#: bzrlib/builtins.py:4268
2594
msgid ""
2595
"The source of the merge can be specified either in the form of a branch,\n"
2596
"or in the form of a path to a file containing a merge directive generated\n"
2597
"with bzr send. If neither is specified, the default is the upstream branch\n"
2598
"or the branch most recently merged using --remember. The source of the\n"
2599
"merge may also be specified in the form of a path to a file in another\n"
2600
"branch: in this case, only the modifications to that file are merged into\n"
2601
"the current working tree."
2602
msgstr ""
2603
2604
#: bzrlib/builtins.py:4276
2605
msgid ""
2606
"When merging from a branch, by default bzr will try to merge in all new\n"
2607
"work from the other branch, automatically determining an appropriate base\n"
2608
"revision. If this fails, you may need to give an explicit base."
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:4280
2612
msgid ""
2613
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2614
"try to merge in all new work up to and including revision OTHER."
2615
msgstr ""
2616
2617
#: bzrlib/builtins.py:4283
2618
msgid ""
2619
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2620
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2621
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2622
"not already contain revision BASE, such a merge is commonly referred to as\n"
2623
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2624
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2625
"changes from the other branch is not stored in the commit."
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:4291
2629
msgid "Revision numbers are always relative to the source branch."
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2633
msgid ""
2634
"Merge will do its best to combine the changes in two branches, but there\n"
2635
"are some kinds of problems only a human can fix. When it encounters those,\n"
2636
"it will mark a conflict. A conflict means that you need to fix something,\n"
2637
"before you can commit."
2638
msgstr ""
2639
2640
#: bzrlib/builtins.py:4298
2641
msgid ""
2642
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:4300
2646
msgid ""
2647
"If there is no default branch set, the first merge will set it (use\n"
2648
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2649
"to use the default. To change the default, use --remember. The value will\n"
2650
"only be saved if the remote location can be accessed."
2651
msgstr ""
2652
2653
#: bzrlib/builtins.py:4305
2654
msgid ""
2655
"The results of the merge are placed into the destination working\n"
2656
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2657
"committed to record the result of the merge."
2658
msgstr ""
2659
2660
#: bzrlib/builtins.py:4309
2661
msgid ""
2662
"merge refuses to run if there are any uncommitted changes, unless\n"
2663
"--force is given. If --force is given, then the changes from the source \n"
2664
"will be merged with the current working tree, including any uncommitted\n"
2665
"changes in the tree. The --force option can also be used to create a\n"
2666
"merge revision which has more than two parents."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:4315
2670
msgid ""
2671
"If one would like to merge changes from the working tree of the other\n"
2672
"branch without merging any committed revisions, the --uncommitted option\n"
2673
"can be given."
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4319
2677
msgid ""
2678
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2679
"you to apply each diff hunk and file change, similar to \"shelve\"."
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4322
2683
msgid ""
2684
":Examples:\n"
2685
" To merge all new revisions from bzr.dev::"
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4325
2689
msgid " bzr merge ../bzr.dev"
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4327
2693
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4329
2697
msgid " bzr merge -r 82 ../bzr.dev"
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4331
2701
msgid " To merge the changes introduced by 82, without previous changes::"
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4333
2705
msgid " bzr merge -r 81..82 ../bzr.dev"
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:4335
2709
msgid " To apply a merge directive contained in /tmp/merge::"
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4337
2713
msgid " bzr merge /tmp/merge"
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4339
2717
msgid ""
2718
" To create a merge revision with three parents from two branches\n"
2719
" feature1a and feature1b:"
2720
msgstr ""
2721
2722
#: bzrlib/builtins.py:4342
2723
msgid ""
2724
" bzr merge ../feature1a\n"
2725
" bzr merge ../feature1b --force\n"
2726
" bzr commit -m 'revision with three parents'"
2727
msgstr ""
2728
2729
#: bzrlib/builtins.py:4354
2730
msgid "Merge even if the destination tree has uncommitted changes."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4360
2734
msgid ""
2735
"Apply uncommitted changes from a working copy, instead of branch changes."
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4362
2739
msgid ""
2740
"If the destination is already completely merged into the source, pull from "
2741
"the source rather than merging. When this happens, you do not need to "
2742
"commit the result."
2743
msgstr ""
2744
2745
#: bzrlib/builtins.py:4367
2746
msgid ""
2747
"Branch to merge into, rather than the one containing the working directory."
2748
msgstr ""
2749
2750
#: bzrlib/builtins.py:4369
2751
msgid "Instead of merging, show a diff of the merge."
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:4371
2755
msgid "Select changes interactively."
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4393
2759
msgid ""
2760
"Merging into empty branches not currently supported, "
2761
"https://bugs.launchpad.net/bzr/+bug/308562"
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4420
2765
msgid "Cannot use --uncommitted with bundles or merge directives."
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4431
2769
msgid "Cannot use --uncommitted and --revision at the same time."
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:4451
2773
msgid "merger: "
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2777
msgid "Nothing to do."
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:4457
2781
msgid "Cannot pull individual files"
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4465
2785
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4523
2789
#, python-format
2790
msgid "Show-base is not supported for this merge type. %s"
2791
msgstr ""
2792
2793
#: bzrlib/builtins.py:4532
2794
#, python-format
2795
msgid "Conflict reduction is not supported for merge type %s."
2796
msgstr ""
2797
2798
#: bzrlib/builtins.py:4536
2799
msgid "Cannot do conflict reduction and show base."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4647
2803
msgid "No location specified or remembered"
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4649
2807
msgid "{0} remembered {1} location {2}"
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4655
2811
msgid "Redo a merge."
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4657
2815
msgid ""
2816
"Use this if you want to try a different merge technique while resolving\n"
2817
"conflicts. Some merge techniques are better than others, and remerge\n"
2818
"lets you try different ones on different files."
2819
msgstr ""
2820
2821
#: bzrlib/builtins.py:4661
2822
msgid ""
2823
"The options for remerge have the same meaning and defaults as the ones for\n"
2824
"merge. The difference is that remerge can (only) be run when there is a\n"
2825
"pending merge, and it lets you specify particular files."
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:4665
2829
msgid ""
2830
":Examples:\n"
2831
" Re-do the merge of all conflicted files, and show the base text in\n"
2832
" conflict regions, in addition to the usual THIS and OTHER texts::"
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4669
2836
msgid " bzr remerge --show-base"
2837
msgstr ""
2838
2839
#: bzrlib/builtins.py:4671
2840
msgid ""
2841
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2842
" additional processing to reduce the size of conflict regions::"
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4674
2846
msgid " bzr remerge --merge-type weave --reprocess foobar"
2847
msgstr ""
2848
2849
#: bzrlib/builtins.py:4681
2850
msgid "Show base revision text in conflicts."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4693
2854
msgid ""
2855
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2856
"merges."
2857
msgstr ""
2858
2859
#: bzrlib/builtins.py:4751
2860
msgid ""
2861
"Set files in the working tree back to the contents of a previous revision."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4753
2865
msgid ""
2866
"Giving a list of files will revert only those files. Otherwise, all files\n"
2867
"will be reverted. If the revision is not specified with '--revision', the\n"
2868
"working tree basis revision is used. A revert operation affects only the\n"
2869
"working tree, not any revision history like the branch and repository or\n"
2870
"the working tree basis revision."
2871
msgstr ""
2872
2873
#: bzrlib/builtins.py:4759
2874
msgid ""
2875
"To remove only some changes, without reverting to a prior version, use\n"
2876
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2877
"will remove the changes introduced by the second last commit (-2), without\n"
2878
"affecting the changes introduced by the last commit (-1). To remove\n"
2879
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2880
"To update the branch to a specific revision or the latest revision and\n"
2881
"update the working tree accordingly while preserving local changes, see the\n"
2882
"update command."
2883
msgstr ""
2884
2885
#: bzrlib/builtins.py:4768
2886
msgid ""
2887
"Uncommitted changes to files that are reverted will be discarded.\n"
2888
"Howver, by default, any files that have been manually changed will be\n"
2889
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2890
"files have '.~#~' appended to their name, where # is a number."
2891
msgstr ""
2892
2893
#: bzrlib/builtins.py:4773
2894
msgid ""
2895
"When you provide files, you can use their current pathname or the pathname\n"
2896
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2897
"name. If you name a directory, all the contents of that directory will be\n"
2898
"reverted."
2899
msgstr ""
2900
2901
#: bzrlib/builtins.py:4778
2902
msgid ""
2903
"If you have newly added files since the target revision, they will be\n"
2904
"removed. If the files to be removed have been changed, backups will be\n"
2905
"created as above. Directories containing unknown files will not be\n"
2906
"deleted."
2907
msgstr ""
2908
2909
#: bzrlib/builtins.py:4783
2910
msgid ""
2911
"The working tree contains a list of revisions that have been merged but\n"
2912
"not yet committed. These revisions will be included as additional parents\n"
2913
"of the next commit. Normally, using revert clears that list as well as\n"
2914
"reverting the files. If any files are specified, revert leaves the list\n"
2915
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2916
".`` in the tree root to revert all files but keep the recorded merges,\n"
2917
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2918
"reverting any files."
2919
msgstr ""
2920
2921
#: bzrlib/builtins.py:4792
2922
msgid ""
2923
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2924
"changes from a branch in a single revision. To do this, perform the merge\n"
2925
"as desired. Then doing revert with the \"--forget-merges\" option will "
2926
"keep\n"
2927
"the content of the tree as it was, but it will clear the list of pending\n"
2928
"merges. The next commit will then contain all of the changes that are\n"
2929
"present in the other branch, but without any other parent revisions.\n"
2930
"Because this technique forgets where these changes originated, it may\n"
2931
"cause additional conflicts on later merges involving the same source and\n"
2932
"target branches."
2933
msgstr ""
2934
2935
#: bzrlib/builtins.py:4806
2936
msgid "Do not save backups of reverted files."
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4808
2940
msgid "Remove pending merge marker, without changing any files."
2941
msgstr ""
2942
2943
#: bzrlib/builtins.py:4839
2944
msgid ""
2945
"Show help on a command or other topic.\n"
2946
" "
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4844
2950
msgid "Show help on all commands."
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4873
2954
msgid "Show unmerged/unpulled revisions between two branches."
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4875
2958
msgid "OTHER_BRANCH may be local or remote."
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4877
2962
msgid ""
2963
"To filter on a range of revisions, you can use the command -r begin..end\n"
2964
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2965
"also valid.\n"
2966
" \n"
2967
":Exit values:\n"
2968
" 1 - some missing revisions\n"
2969
" 0 - no missing revisions"
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4887
2973
msgid ""
2974
" Determine the missing revisions between this and the branch at the\n"
2975
" remembered pull location::"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:4890
2979
msgid " bzr missing"
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4892
2983
msgid " Determine the missing revisions between this and another branch::"
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:4894
2987
msgid " bzr missing http://server/branch"
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4896
2991
msgid ""
2992
" Determine the missing revisions up to a specific revision on the other\n"
2993
" branch::"
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4899
2997
msgid " bzr missing -r ..-10"
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:4901
3001
msgid ""
3002
" Determine the missing revisions up to a specific revision on this\n"
3003
" branch::"
3004
msgstr ""
3005
3006
#: bzrlib/builtins.py:4904
3007
msgid " bzr missing --my-revision ..-10"
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4911
3011
msgid "Reverse the order of revisions."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4913
3015
msgid "Display changes in the local branch only."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4914
3019
msgid "Same as --mine-only."
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4916
3023
msgid "Display changes in the remote branch only."
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4917
3027
msgid "Same as --theirs-only."
3028
msgstr ""
3029
3030
#: bzrlib/builtins.py:4922
3031
msgid ""
3032
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3033
"details."
3034
msgstr ""
3035
3036
#: bzrlib/builtins.py:4926
3037
msgid ""
3038
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3039
"details."
3040
msgstr ""
3041
3042
#: bzrlib/builtins.py:4929
3043
msgid "Show all revisions in addition to the mainline ones."
3044
msgstr ""
3045
3046
#: bzrlib/builtins.py:4983
3047
msgid "No peer location known or specified."
3048
msgstr ""
3049
3050
#: bzrlib/builtins.py:4987
3051
msgid "Using saved parent location: {0}\n"
3052
msgstr ""
3053
3054
#: bzrlib/builtins.py:5020
3055
#, python-format
3056
msgid "You have %d extra revision:\n"
3057
msgid_plural "You have %d extra revisions:\n"
3058
msgstr[0] ""
3059
msgstr[1] ""
3060
3061
#: bzrlib/builtins.py:5040
3062
#, python-format
3063
msgid "You are missing %d revision:\n"
3064
msgid_plural "You are missing %d revisions:\n"
3065
msgstr[0] ""
3066
msgstr[1] ""
3067
3068
#: bzrlib/builtins.py:5055
3069
msgid "This branch has no new revisions.\n"
3070
msgstr ""
3071
3072
#: bzrlib/builtins.py:5058
3073
msgid "Other branch has no new revisions.\n"
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:5063
3077
msgid "Branches are up to date.\n"
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:5074
3081
msgid "Compress the data within a repository."
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:5076
3085
msgid ""
3086
"This operation compresses the data within a bazaar repository. As\n"
3087
"bazaar supports automatic packing of repository, this operation is\n"
3088
"normally not required to be done manually."
3089
msgstr ""
3090
3091
#: bzrlib/builtins.py:5080
3092
msgid ""
3093
"During the pack operation, bazaar takes a backup of existing repository\n"
3094
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3095
"automatically when it is safe to do so. To save disk space by removing\n"
3096
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3097
"used."
3098
msgstr ""
3099
3100
#: bzrlib/builtins.py:5086
3101
msgid ""
3102
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3103
"during or immediately after repacking, you may be left with a state\n"
3104
"where the deletion has been written to disk but the new packs have not\n"
3105
"been. In this case the repository may be unusable."
3106
msgstr ""
3107
3108
#: bzrlib/builtins.py:5095
3109
msgid "Delete obsolete packs to save disk space."
3110
msgstr ""
3111
3112
#: bzrlib/builtins.py:5109
3113
msgid "List the installed plugins."
3114
msgstr ""
3115
3116
#: bzrlib/builtins.py:5111
3117
msgid ""
3118
"This command displays the list of installed plugins including\n"
3119
"version of plugin and a short description of each."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5114
3123
msgid "--verbose shows the path where each plugin is located."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5116
3127
msgid ""
3128
"A plugin is an external component for Bazaar that extends the\n"
3129
"revision control system, by adding or replacing code in Bazaar.\n"
3130
"Plugins can do a variety of things, including overriding commands,\n"
3131
"adding new commands, providing additional network transports and\n"
3132
"customizing log output."
3133
msgstr ""
3134
3135
#: bzrlib/builtins.py:5122
3136
msgid ""
3137
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3138
"for further information on plugins including where to find them and how to\n"
3139
"install them. Instructions are also provided there on how to write new\n"
3140
"plugins using the Python programming language."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:5138
3144
msgid "Show testament (signing-form) of a revision."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:5141
3148
msgid "Produce long-format testament."
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:5143
3152
msgid "Produce a strict-format testament."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:5169
3156
msgid "Show the origin of each line in a file."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:5171
3160
msgid ""
3161
"This prints out the given file with an annotation on the left side\n"
3162
"indicating which revision, author and date introduced the change."
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:5174
3166
msgid ""
3167
"If the origin is the same for a run of consecutive lines, it is\n"
3168
"shown only at the top, unless the --all option is given."
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:5182
3172
msgid "Show annotations on all lines."
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:5183
3176
msgid "Show commit date in annotations."
3177
msgstr ""
3178
3179
#: bzrlib/builtins.py:5270
3180
msgid "Cannot sign a range of non-revision-history revisions"
3181
msgstr ""
3182
3183
#: bzrlib/builtins.py:5282
3184
msgid "Please supply either one revision, or a range."
3185
msgstr ""
3186
3187
#: bzrlib/builtins.py:5286
3188
msgid ""
3189
"Convert the current branch into a checkout of the supplied branch.\n"
3190
"If no branch is supplied, rebind to the last bound location."
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5289
3194
msgid ""
3195
"Once converted into a checkout, commits must succeed on the master branch\n"
3196
"before they will be applied to the local branch."
3197
msgstr ""
3198
3199
#: bzrlib/builtins.py:5292
3200
msgid ""
3201
"Bound branches use the nickname of its master branch unless it is set\n"
3202
"locally, in which case binding will update the local nickname to be\n"
3203
"that of the master."
3204
msgstr ""
3205
3206
#: bzrlib/builtins.py:5307
3207
msgid "No location supplied. This format does not remember old locations."
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:5313
3211
msgid "Branch is already bound"
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5316
3215
msgid "No location supplied and no previous location known"
3216
msgstr ""
3217
3218
#: bzrlib/builtins.py:5322
3219
msgid "These branches have diverged. Try merging, and then bind again."
3220
msgstr ""
3221
3222
#: bzrlib/builtins.py:5329
3223
msgid "Convert the current checkout into a regular branch."
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:5331
3227
msgid ""
3228
"After unbinding, the local branch is considered independent and subsequent\n"
3229
"commits will be local only."
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:5342
3233
msgid "Local branch is not bound"
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5346
3237
msgid "Remove the last committed revision."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5348
3241
msgid ""
3242
"--verbose will print out what is being removed.\n"
3243
"--dry-run will go through all the motions, but not actually\n"
3244
"remove anything."
3245
msgstr ""
3246
3247
#: bzrlib/builtins.py:5352
3248
msgid ""
3249
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3250
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3251
"branch at revision 15."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5356
3255
msgid ""
3256
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3257
"it may make is to restore any pending merges that were present before\n"
3258
"the commit."
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:5367
3262
msgid "Don't actually make changes."
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5368
3266
msgid "Say yes to all questions."
3267
msgstr ""
3268
3269
#: bzrlib/builtins.py:5370
3270
msgid "Keep tags that point to removed revisions."
3271
msgstr ""
3272
3273
#: bzrlib/builtins.py:5372
3274
msgid "Only remove the commits from the local branch when in a checkout."
3275
msgstr ""
3276
3277
#: bzrlib/builtins.py:5421
3278
msgid "No revisions to uncommit.\n"
3279
msgstr ""
3280
3281
#: bzrlib/builtins.py:5436
3282
msgid "Dry-run, pretending to remove the above revisions.\n"
3283
msgstr ""
3284
3285
#: bzrlib/builtins.py:5439
3286
msgid "The above revision(s) will be removed.\n"
3287
msgstr ""
3288
3289
#: bzrlib/builtins.py:5443
3290
msgid "Uncommit these revisions"
3291
msgstr ""
3292
3293
#: bzrlib/builtins.py:5446
3294
msgid "Canceled\n"
3295
msgstr ""
3296
3297
#: bzrlib/builtins.py:5453
3298
#, python-format
3299
msgid ""
3300
"You can restore the old tip by running:\n"
3301
" bzr pull . -r revid:%s\n"
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:5458
3305
msgid "Break a dead lock."
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:5460
3309
msgid ""
3310
"This command breaks a lock on a repository, branch, working directory or\n"
3311
"config file."
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5463
3315
msgid ""
3316
"CAUTION: Locks should only be broken when you are sure that the process\n"
3317
"holding the lock has been stopped."
3318
msgstr ""
3319
3320
#: bzrlib/builtins.py:5466
3321
msgid ""
3322
"You can get information on what locks are open via the 'bzr info\n"
3323
"[location]' command."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5469
3327
msgid ""
3328
":Examples:\n"
3329
" bzr break-lock\n"
3330
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3331
" bzr break-lock --conf ~/.bazaar"
3332
msgstr ""
3333
3334
#: bzrlib/builtins.py:5478
3335
msgid "LOCATION is the directory where the config lock is."
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:5480
3339
msgid "Do not ask for confirmation before breaking the lock."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5515
3343
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:5516
3347
msgid "Run the bzr server."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5522
3351
msgid "Serve on stdin/out for use from inetd or sshd."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5523
3355
msgid "protocol"
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5524
3359
msgid "Protocol to serve."
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5528
3363
msgid "Listen for connections on nominated address."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:5530
3367
msgid ""
3368
"Listen for connections on nominated port. Passing 0 as the port number will "
3369
"result in a dynamically allocated port. The default port depends on the "
3370
"protocol."
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:5535
3374
msgid "Serve contents of this directory."
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:5537
3378
msgid ""
3379
"By default the server is a readonly server. Supplying --allow-writes "
3380
"enables write access to the contents of the served directory and below. "
3381
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3382
"of external authentication is arranged supplying this option leads to global "
3383
"uncontrolled write access to your file system."
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5546
3387
msgid "Override the default idle client timeout (5min)."
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5564
3391
msgid "Combine a tree into its containing tree."
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5566
3395
msgid "This command requires the target tree to be in a rich-root format."
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5568
3399
msgid ""
3400
"The TREE argument should be an independent tree, inside another tree, but\n"
3401
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3402
"running \"bzr branch\" with the target inside a tree.)"
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5572
3406
msgid ""
3407
"The result is a combined tree, with the subtree no longer an independent\n"
3408
"part. This is marked as a merge of the subtree into the containing tree,\n"
3409
"and all history is preserved."
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5590
3413
#, python-format
3414
msgid ""
3415
"Can't join trees because %s doesn't support rich root data.\n"
3416
"You can use bzr upgrade on the repository."
3417
msgstr ""
3418
3419
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3420
msgid "Cannot join {0}. {1}"
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:5610
3424
msgid "Split a subdirectory of a tree into a separate tree."
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5612
3428
msgid ""
3429
"This command will produce a target tree in a format that supports\n"
3430
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3431
"converted into earlier formats like 'dirstate-tags'."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5616
3435
msgid ""
3436
"The TREE argument should be a subdirectory of a working tree. That\n"
3437
"subdirectory will be converted into an independent tree, with its own\n"
3438
"branch. Commits in the top-level tree will not apply to the new subtree."
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:5696
3442
msgid "No submit branch specified or known"
3443
msgstr ""
3444
3445
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3446
msgid "No public branch specified or known"
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5710
3450
msgid "bzr merge-directive takes at most two one revision identifiers"
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5719
3454
msgid "No revisions to bundle."
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5738
3458
msgid "Mail or create a merge-directive for submitting changes."
3459
msgstr ""
3460
3461
#: bzrlib/builtins.py:5740
3462
msgid "A merge directive provides many things needed for requesting merges:"
3463
msgstr ""
3464
3465
#: bzrlib/builtins.py:5742
3466
msgid "* A machine-readable description of the merge to perform"
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:5744
3470
msgid "* An optional patch that is a preview of the changes requested"
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5746
3474
msgid ""
3475
"* An optional bundle of revision data, so that the changes can be applied\n"
3476
" directly from the merge directive, without retrieving data from a\n"
3477
" branch."
3478
msgstr ""
3479
3480
#: bzrlib/builtins.py:5750
3481
msgid ""
3482
"`bzr send` creates a compact data set that, when applied using bzr\n"
3483
"merge, has the same effect as merging from the source branch. "
3484
msgstr ""
3485
3486
#: bzrlib/builtins.py:5753
3487
msgid ""
3488
"By default the merge directive is self-contained and can be applied to any\n"
3489
"branch containing submit_branch in its ancestory without needing access to\n"
3490
"the source branch."
3491
msgstr ""
3492
3493
#: bzrlib/builtins.py:5757
3494
msgid ""
3495
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3496
"revisions, but only a structured request to merge from the\n"
3497
"public_location. In that case the public_branch is needed and it must be\n"
3498
"up-to-date and accessible to the recipient. The public_branch is always\n"
3499
"included if known, so that people can check it later."
3500
msgstr ""
3501
3502
#: bzrlib/builtins.py:5763
3503
msgid ""
3504
"The submit branch defaults to the parent of the source branch, but can be\n"
3505
"overridden. Both submit branch and public branch will be remembered in\n"
3506
"branch.conf the first time they are used for a particular branch. The\n"
3507
"source branch defaults to that containing the working directory, but can\n"
3508
"be changed using --from."
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5769
3512
msgid ""
3513
"Both the submit branch and the public branch follow the usual behavior with\n"
3514
"respect to --remember: If there is no default location set, the first send\n"
3515
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3516
"omit the location to use the default. To change the default, use\n"
3517
"--remember. The value will only be saved if the location can be accessed."
3518
msgstr ""
3519
3520
#: bzrlib/builtins.py:5775
3521
msgid ""
3522
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3523
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3524
"If a public location is known for the submit_branch, that location is used\n"
3525
"in the merge directive."
3526
msgstr ""
3527
3528
#: bzrlib/builtins.py:5780
3529
msgid ""
3530
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3531
"given, in which case it is sent to a file."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5783
3535
msgid ""
3536
"Mail is sent using your preferred mail program. This should be transparent\n"
3537
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3538
"If the preferred client can't be found (or used), your editor will be used."
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:5787
3542
msgid ""
3543
"To use a specific mail program, set the mail_client configuration option.\n"
3544
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3545
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3546
"(MacOS X's\n"
3547
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3548
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3549
"add\n"
3550
"supported clients."
3551
msgstr ""
3552
3553
#: bzrlib/builtins.py:5794
3554
msgid ""
3555
"If mail is being sent, a to address is required. This can be supplied\n"
3556
"either on the commandline, by setting the submit_to configuration\n"
3557
"option in the branch itself or the child_submit_to configuration option\n"
3558
"in the submit branch."
3559
msgstr ""
3560
3561
#: bzrlib/builtins.py:5799
3562
msgid ""
3563
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3564
"and\n"
3565
"merge directive format 2. It is significantly faster and smaller than\n"
3566
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3567
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3568
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5805
3572
msgid ""
3573
"The merge directives created by bzr send may be applied using bzr merge or\n"
3574
"bzr pull by specifying a file containing a merge directive as the location."
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5808
3578
msgid ""
3579
"bzr send makes extensive use of public locations to map local locations "
3580
"into\n"
3581
"URLs that can be used by other people. See `bzr help configuration` to\n"
3582
"set them, and use `bzr info` to display them."
3583
msgstr ""
3584
3585
#: bzrlib/builtins.py:5832
3586
msgid "Write merge directive to this file or directory; use - for stdout."
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5836
3590
msgid ""
3591
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3592
"strict disables the check."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5838
3596
msgid "Mail the request to this address."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5842
3600
msgid "Body for the email."
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5895
3604
msgid "Do not include a bundle in the merge directive."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5896
3608
msgid "Do not include a preview patch in the merge directive."
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5899
3612
msgid "Remember submit and public branch."
3613
msgstr ""
3614
3615
#: bzrlib/builtins.py:5901
3616
msgid ""
3617
"Branch to generate the submission from, rather than the one containing the "
3618
"working directory."
3619
msgstr ""
3620
3621
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3622
msgid "format"
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5912
3626
msgid "Use the specified output format."
3627
msgstr ""
3628
3629
#: bzrlib/builtins.py:5934
3630
msgid "Create, remove or modify a tag naming a revision."
3631
msgstr ""
3632
3633
#: bzrlib/builtins.py:5936
3634
msgid ""
3635
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3636
"(--revision) option can be given -rtag:X, where X is any previously\n"
3637
"created tag."
3638
msgstr ""
3639
3640
#: bzrlib/builtins.py:5940
3641
msgid ""
3642
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3643
"along when you branch, push, pull or merge."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5943
3647
msgid ""
3648
"It is an error to give a tag name that already exists unless you pass\n"
3649
"--force, in which case the tag is moved to point to the new revision."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5946
3653
msgid ""
3654
"To rename a tag (change the name but keep it on the same revsion), run "
3655
"``bzr\n"
3656
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5949
3660
msgid ""
3661
"If no tag name is specified it will be determined through the \n"
3662
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3663
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3664
"details."
3665
msgstr ""
3666
3667
#: bzrlib/builtins.py:5959
3668
msgid "Delete this tag rather than placing it."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:5962
3672
msgid "Branch in which to place the tag."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5964
3676
msgid "Replace existing tags."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5979
3680
msgid "No tag specified to delete."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:5981
3684
#, python-format
3685
msgid "Deleted tag %s."
3686
msgstr ""
3687
3688
#: bzrlib/builtins.py:5995
3689
msgid "Please specify a tag name."
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:6003
3693
#, python-format
3694
msgid "Tag %s already exists for that revision."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:6007
3698
#, python-format
3699
msgid "Created tag %s."
3700
msgstr ""
3701
3702
#: bzrlib/builtins.py:6009
3703
#, python-format
3704
msgid "Updated tag %s."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:6013
3708
msgid "List tags."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:6015
3712
msgid ""
3713
"This command shows a table of tag names and the revisions they reference."
3714
msgstr ""
3715
3716
#: bzrlib/builtins.py:6021
3717
msgid "Branch whose tags should be displayed."
3718
msgstr ""
3719
3720
#: bzrlib/builtins.py:6023
3721
msgid "Sort tags by different criteria."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:6023
3725
msgid "Sorting"
3726
msgstr ""
3727
3728
#: bzrlib/builtins.py:6092
3729
msgid "Reconfigure the type of a bzr directory."
3730
msgstr ""
3731
3732
#: bzrlib/builtins.py:6094
3733
msgid "A target configuration must be specified."
3734
msgstr ""
3735
3736
#: bzrlib/builtins.py:6096
3737
msgid ""
3738
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3739
"The order of preference is\n"
3740
"1. For a lightweight checkout, the current bound location.\n"
3741
"2. For branches that used to be checkouts, the previously-bound location.\n"
3742
"3. The push location.\n"
3743
"4. The parent location.\n"
3744
"If none of these is available, --bind-to must be specified."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:6110
3748
msgid "Tree type"
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6111
3752
msgid "The relation between branch and tree."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6113
3756
msgid "Reconfigure to be an unbound branch with no working tree."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6114
3760
msgid "Reconfigure to be an unbound branch with a working tree."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6115
3764
msgid "Reconfigure to be a bound branch with a working tree."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:6116
3768
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3769
msgstr ""
3770
3771
#: bzrlib/builtins.py:6121
3772
msgid "Repository type"
3773
msgstr ""
3774
3775
#: bzrlib/builtins.py:6122
3776
msgid "Location fo the repository."
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:6124
3780
msgid ""
3781
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3782
msgstr ""
3783
3784
#: bzrlib/builtins.py:6126
3785
msgid "Reconfigure to use a shared repository."
3786
msgstr ""
3787
3788
#: bzrlib/builtins.py:6130
3789
msgid "Trees in Repository"
3790
msgstr ""
3791
3792
#: bzrlib/builtins.py:6131
3793
msgid "Whether new branches in the repository have trees."
3794
msgstr ""
3795
3796
#: bzrlib/builtins.py:6133
3797
msgid ""
3798
"Reconfigure repository to create working trees on branches by default."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:6135
3802
msgid ""
3803
"Reconfigure repository to not create working trees on branches by default."
3804
msgstr ""
3805
3806
#: bzrlib/builtins.py:6138
3807
msgid "Branch to bind checkout to."
3808
msgstr ""
3809
3810
#: bzrlib/builtins.py:6140
3811
msgid "Perform reconfiguration even if local changes will be lost."
3812
msgstr ""
3813
3814
#: bzrlib/builtins.py:6143
3815
msgid "Reconfigure a branch to be stacked on another branch."
3816
msgstr ""
3817
3818
#: bzrlib/builtins.py:6147
3819
msgid ""
3820
"Reconfigure a branch to be unstacked. This may require copying substantial "
3821
"data into it."
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:6157
3825
msgid "Can't use both --stacked-on and --unstacked"
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:6171
3829
msgid "No target configuration specified"
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:6206
3833
msgid "Set the branch of a checkout and update."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:6208
3837
msgid ""
3838
"For lightweight checkouts, this changes the branch being referenced.\n"
3839
"For heavyweight checkouts, this checks that there are no local commits\n"
3840
"versus the current bound branch, then it makes the local branch a mirror\n"
3841
"of the new location and binds to it."
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:6213
3845
msgid ""
3846
"In both cases, the working tree is updated and uncommitted changes\n"
3847
"are merged. The user can commit or revert these as they desire."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:6216
3851
msgid "Pending merges need to be committed or reverted before using switch."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:6218
3855
msgid ""
3856
"The path to the branch to switch to can be specified relative to the parent\n"
3857
"directory of the current branch. For example, if you are currently in a\n"
3858
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3859
"/path/to/newbranch."
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:6223
3863
msgid ""
3864
"Bound branches use the nickname of its master branch unless it is set\n"
3865
"locally, in which case switching will update the local nickname to be\n"
3866
"that of the master."
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:6231
3870
msgid "Switch even if local commits will be lost."
3871
msgstr ""
3872
3873
#: bzrlib/builtins.py:6234
3874
msgid "Create the target branch from this one before switching to it."
3875
msgstr ""
3876
3877
#: bzrlib/builtins.py:6248
3878
msgid "You must supply either a revision or a location"
3879
msgstr ""
3880
3881
#: bzrlib/builtins.py:6261
3882
msgid "cannot create branch without source branch"
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6286
3886
msgid "Manage filtered views."
3887
msgstr ""
3888
3889
#: bzrlib/builtins.py:6288
3890
msgid ""
3891
"Views provide a mask over the tree so that users can focus on\n"
3892
"a subset of a tree when doing their work. After creating a view,\n"
3893
"commands that support a list of files - status, diff, commit, etc -\n"
3894
"effectively have that list of files implicitly given each time.\n"
3895
"An explicit list of files can still be given but those files\n"
3896
"must be within the current view."
3897
msgstr ""
3898
3899
#: bzrlib/builtins.py:6295
3900
msgid ""
3901
"In most cases, a view has a short life-span: it is created to make\n"
3902
"a selected change and is deleted once that change is committed.\n"
3903
"At other times, you may wish to create one or more named views\n"
3904
"and switch between them."
3905
msgstr ""
3906
3907
#: bzrlib/builtins.py:6300
3908
msgid ""
3909
"To disable the current view without deleting it, you can switch to\n"
3910
"the pseudo view called ``off``. This can be useful when you need\n"
3911
"to see the whole tree for an operation or two (e.g. merge) but\n"
3912
"want to switch back to your view after that."
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:6305
3916
msgid ""
3917
":Examples:\n"
3918
" To define the current view::"
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6308
3922
msgid " bzr view file1 dir1 ..."
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6310
3926
msgid " To list the current view::"
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6312
3930
msgid " bzr view"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6314
3934
msgid " To delete the current view::"
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6316
3938
msgid " bzr view --delete"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6318
3942
msgid " To disable the current view without deleting it::"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6320
3946
msgid " bzr view --switch off"
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6322
3950
msgid " To define a named view and switch to it::"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6324
3954
msgid " bzr view --name view-name file1 dir1 ..."
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6326
3958
msgid " To list a named view::"
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6328
3962
msgid " bzr view --name view-name"
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6330
3966
msgid " To delete a named view::"
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6332
3970
msgid " bzr view --name view-name --delete"
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6334
3974
msgid " To switch to a named view::"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6336
3978
msgid " bzr view --switch view-name"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6338
3982
msgid " To list all views defined::"
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6340
3986
msgid " bzr view --all"
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6342
3990
msgid " To delete all views::"
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6344
3994
msgid " bzr view --delete --all"
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6351
3998
msgid "Apply list or delete action to all views."
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6354
4002
msgid "Delete the view."
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6357
4006
msgid "Name of the view to define, list or delete."
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6361
4010
msgid "Name of the view to switch to."
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6380
4014
msgid "Both --delete and a file list specified"
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6383
4018
msgid "Both --delete and --switch specified"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:6386
4022
msgid "Deleted all views.\n"
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:6388
4026
msgid "No current view to delete"
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6391
4030
#, python-format
4031
msgid "Deleted '%s' view.\n"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6395
4035
msgid "Both --switch and a file list specified"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6398
4039
msgid "Both --switch and --all specified"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6401
4043
msgid "No current view to disable"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6403
4047
#, python-format
4048
msgid "Disabled '%s' view.\n"
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4052
msgid "Using '{0}' view: {1}\n"
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6410
4056
msgid "Views defined:\n"
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6419
4060
msgid "No views defined.\n"
4061
msgstr ""
4062
4063
#: bzrlib/builtins.py:6426
4064
msgid "Cannot change the 'off' pseudo view"
4065
msgstr ""
4066
4067
#: bzrlib/builtins.py:6434
4068
msgid "No current view.\n"
4069
msgstr ""
4070
4071
#: bzrlib/builtins.py:6437
4072
msgid "'{0}' view is: {1}\n"
4073
msgstr ""
4074
4075
#: bzrlib/builtins.py:6457
4076
msgid " <no hooks installed>\n"
4077
msgstr ""
4078
4079
#: bzrlib/builtins.py:6461
4080
msgid "Remove a branch."
4081
msgstr ""
4082
4083
#: bzrlib/builtins.py:6463
4084
msgid ""
4085
"This will remove the branch from the specified location but \n"
4086
"will keep any working tree or repository in place."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6468
4090
msgid " Remove the branch at repo/trunk::"
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6470
4094
msgid " bzr remove-branch repo/trunk"
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:6477
4098
msgid "Remove branch even if it is the active branch."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6491
4102
msgid "Branch is active. Use --force to remove it."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6495
4106
msgid "Plaintext diff output."
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6496
4110
msgid "Temporarily set aside some changes from the current tree."
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:6498
4114
msgid ""
4115
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4116
"ie. out of the way, until a later time when you can bring them back from\n"
4117
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4118
"your working tree, and so they aren't propagated along with your branch nor\n"
4119
"will they survive its deletion."
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:6504
4123
msgid "If shelve --list is specified, previously-shelved changes are listed."
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6506
4127
msgid ""
4128
"Shelve is intended to help separate several sets of changes that have\n"
4129
"been inappropriately mingled. If you just want to get rid of all changes\n"
4130
"and you don't need to restore them later, use revert. If you want to\n"
4131
"shelve all text changes at once, use shelve --all."
4132
msgstr ""
4133
4134
#: bzrlib/builtins.py:6511
4135
msgid ""
4136
"If filenames are specified, only the changes to those files will be\n"
4137
"shelved. Other files will be left untouched."
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6514
4141
msgid ""
4142
"If a revision is specified, changes since that revision will be shelved."
4143
msgstr ""
4144
4145
#: bzrlib/builtins.py:6516
4146
msgid ""
4147
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4148
"restore the most recently shelved changes."
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6519
4152
msgid ""
4153
"For complicated changes, it is possible to edit the changes in a separate\n"
4154
"editor program to decide what the file remaining in the working copy\n"
4155
"should look like. To do this, add the configuration option"
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6523
4159
msgid " change_editor = PROGRAM @new_path @old_path"
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6525
4163
msgid ""
4164
"where @new_path is replaced with the path of the new version of the \n"
4165
"file and @old_path is replaced with the path of the old version of \n"
4166
"the file. The PROGRAM should save the new file with the desired \n"
4167
"contents of the file in the working tree.\n"
4168
" "
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:6537
4172
msgid "Shelve all changes."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6539
4176
msgid "Method to use for writing diffs."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:6539
4180
msgid "writer"
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:6543
4184
msgid "List shelved changes."
4185
msgstr ""
4186
4187
#: bzrlib/builtins.py:6545
4188
msgid "Destroy removed changes instead of shelving them."
4189
msgstr ""
4190
4191
#: bzrlib/builtins.py:6574
4192
msgid "No shelved changes."
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:6585
4196
msgid "Restore shelved changes."
4197
msgstr ""
4198
4199
#: bzrlib/builtins.py:6587
4200
msgid ""
4201
"By default, the most recently shelved changes are restored. However if you\n"
4202
"specify a shelf by id those changes will be restored instead. This works\n"
4203
"best when the changes don't depend on each other."
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6596
4207
msgid "The action to perform."
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4211
msgid "action"
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6598
4215
msgid "Apply changes and remove from the shelf."
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6599
4219
msgid "Show changes, but do not apply or remove them."
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6600
4223
msgid ""
4224
"Instead of unshelving the changes, show the diff that would result from "
4225
"unshelving."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6602
4229
msgid "Delete changes without applying them."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6603
4233
msgid "Apply changes but don't delete them."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6618
4237
msgid "Remove unwanted files from working tree."
4238
msgstr ""
4239
4240
#: bzrlib/builtins.py:6620
4241
msgid ""
4242
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4243
"files are never deleted."
4244
msgstr ""
4245
4246
#: bzrlib/builtins.py:6623
4247
msgid ""
4248
"Another class is 'detritus', which includes files emitted by bzr during\n"
4249
"normal operations and selftests. (The value of these files decreases with\n"
4250
"time.)"
4251
msgstr ""
4252
4253
#: bzrlib/builtins.py:6627
4254
msgid ""
4255
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4256
"flags are respected, and may be combined."
4257
msgstr ""
4258
4259
#: bzrlib/builtins.py:6630
4260
msgid "To check what clean-tree will do, use --dry-run."
4261
msgstr ""
4262
4263
#: bzrlib/builtins.py:6633
4264
msgid "Delete all ignored files."
4265
msgstr ""
4266
4267
#: bzrlib/builtins.py:6634
4268
msgid ""
4269
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4270
msgstr ""
4271
4272
#: bzrlib/builtins.py:6637
4273
msgid "Delete files unknown to bzr (default)."
4274
msgstr ""
4275
4276
#: bzrlib/builtins.py:6638
4277
msgid "Show files to delete instead of deleting them."
4278
msgstr ""
4279
4280
#: bzrlib/builtins.py:6640
4281
msgid "Do not prompt before deleting."
4282
msgstr ""
4283
4284
#: bzrlib/bundle/__init__.py:59
4285
msgid "A directory cannot be a bundle"
4286
msgstr ""
4287
4288
#: bzrlib/bundle/apply_bundle.py:40
4289
msgid "Install revisions"
4290
msgstr ""
4291
4292
#: bzrlib/bundle/commands.py:64
4293
msgid "--verbose requires a merge directive"
4294
msgstr ""
4295
4296
#: bzrlib/bundle/commands.py:67
4297
msgid "Bundle format not supported"
4298
msgstr ""
4299
4300
#: bzrlib/bundle/commands.py:77
4301
msgid "Records\n"
4302
msgstr ""
4303
4304
#: bzrlib/bundle/commands.py:81
4305
msgid "{0}: {1} ({2} multiparent)\n"
4306
msgstr ""
4307
4308
#: bzrlib/bundle/commands.py:83
4309
#, python-format
4310
msgid "unique files: %d\n"
4311
msgstr ""
4312
4313
#: bzrlib/bundle/commands.py:92
4314
msgid "Revisions\n"
4315
msgstr ""
4316
4317
#: bzrlib/bundle/commands.py:93
4318
#, python-format
4319
msgid "nicks: %s\n"
4320
msgstr ""
4321
4322
#: bzrlib/bundle/commands.py:95
4323
#, python-format
4324
msgid ""
4325
"committers: \n"
4326
"%s\n"
4327
msgstr ""
4328
4329
#: bzrlib/bundle/commands.py:103
4330
msgid "Decoded contents\n"
4331
msgstr ""
4332
4333
#: bzrlib/bundle/serializer/v4.py:327
4334
#, python-format
4335
msgid "Bundling %d revision."
4336
msgid_plural "Bundling %d revisions."
4337
msgstr[0] ""
4338
msgstr[1] ""
4339
4340
#: bzrlib/bzrdir.py:487
4341
msgid ""
4342
"making backup of {0}\n"
4343
" to {1}"
4344
msgstr ""
4345
4346
#: bzrlib/bzrdir.py:510
4347
msgid "renamed {0} to {1}"
4348
msgstr ""
4349
4350
#: bzrlib/bzrdir.py:1639
4351
#, python-format
4352
msgid ""
4353
"Source repository format does not support stacking, using format:\n"
4354
" %s"
4355
msgstr ""
4356
4357
#: bzrlib/bzrdir.py:1659
4358
#, python-format
4359
msgid ""
4360
"Source branch format does not support stacking, using format:\n"
4361
" %s"
4362
msgstr ""
4363
4364
#: bzrlib/bzrdir.py:1805
4365
msgid "starting repository conversion"
4366
msgstr ""
4367
4368
#: bzrlib/bzrdir.py:2026
4369
msgid "Using default stacking branch {0} at {1}"
4370
msgstr ""
4371
4372
#: bzrlib/check.py:108
4373
msgid "check"
4374
msgstr ""
4375
4376
#: bzrlib/check.py:110
4377
msgid "checking revisions"
4378
msgstr ""
4379
4380
#: bzrlib/check.py:112
4381
msgid "checking commit contents"
4382
msgstr ""
4383
4384
#: bzrlib/check.py:114
4385
msgid "checking file graphs"
4386
msgstr ""
4387
4388
#: bzrlib/check.py:118
4389
msgid "checking branches and trees"
4390
msgstr ""
4391
4392
#: bzrlib/check.py:205
4393
msgid "checked repository {0} format {1}"
4394
msgstr ""
4395
4396
#: bzrlib/check.py:208
4397
#, python-format
4398
msgid "%6d revisions"
4399
msgstr ""
4400
4401
#: bzrlib/check.py:209
4402
#, python-format
4403
msgid "%6d file-ids"
4404
msgstr ""
4405
4406
#: bzrlib/check.py:211
4407
#, python-format
4408
msgid "%6d unreferenced text versions"
4409
msgstr ""
4410
4411
#: bzrlib/check.py:215
4412
msgid "unreferenced version: {{{0}}} in {1}"
4413
msgstr ""
4414
4415
#: bzrlib/check.py:218
4416
#, python-format
4417
msgid "%6d revisions are missing inventory_sha1"
4418
msgstr ""
4419
4420
#: bzrlib/check.py:221
4421
#, python-format
4422
msgid "%6d revisions are mentioned but not present"
4423
msgstr ""
4424
4425
#: bzrlib/check.py:224
4426
#, python-format
4427
msgid "%6d ghost revisions"
4428
msgstr ""
4429
4430
#: bzrlib/check.py:229
4431
#, python-format
4432
msgid "%6d revisions missing parents in ancestry"
4433
msgstr ""
4434
4435
#: bzrlib/check.py:233
4436
#, python-format
4437
msgid " %s should be in the ancestry for:"
4438
msgstr ""
4439
4440
#: bzrlib/check.py:237
4441
#, python-format
4442
msgid "%6d inconsistent parents"
4443
msgstr ""
4444
4445
#: bzrlib/check.py:241
4446
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4447
msgstr ""
4448
4449
#: bzrlib/check.py:247
4450
#, python-format
4451
msgid "%6d revisions have incorrect parents in the revision index"
4452
msgstr ""
4453
4454
#: bzrlib/check.py:253
4455
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4456
msgstr ""
4457
4458
#: bzrlib/check.py:267
4459
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4460
msgstr ""
4461
4462
#: bzrlib/check.py:296
4463
msgid ""
4464
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4465
"{{{4}}}"
4466
msgstr ""
4467
4468
#: bzrlib/check.py:354
4469
#, python-format
4470
msgid "Checking branch at '%s'."
4471
msgstr ""
4472
4473
#: bzrlib/check.py:374
4474
#, python-format
4475
msgid "Checking working tree at '%s'."
4476
msgstr ""
4477
4478
#: bzrlib/check.py:427 bzrlib/check.py:441
4479
msgid "No branch found at specified location."
4480
msgstr ""
4481
4482
#: bzrlib/check.py:429 bzrlib/check.py:439
4483
msgid "No working tree found at specified location."
4484
msgstr ""
4485
4486
#: bzrlib/check.py:432
4487
#, python-format
4488
msgid "Checking repository at '%s'."
4489
msgstr ""
4490
4491
#: bzrlib/check.py:443
4492
msgid "No repository found at specified location."
4493
msgstr ""
4494
4495
#: bzrlib/clean_tree.py:63
4496
msgid "Nothing to delete."
4497
msgstr ""
4498
4499
#: bzrlib/clean_tree.py:68
4500
msgid "Are you sure you wish to delete these"
4501
msgstr ""
4502
4503
#: bzrlib/clean_tree.py:70
4504
msgid "Canceled"
4505
msgstr ""
4506
4507
#: bzrlib/clean_tree.py:107
4508
#, python-format
4509
msgid "unable to remove %s"
4510
msgstr ""
4511
4512
#: bzrlib/clean_tree.py:111
4513
msgid "deleting paths:"
4514
msgstr ""
4515
4516
#: bzrlib/clean_tree.py:125
4517
msgid "unable to remove \"{0}\": {1}."
4518
msgstr ""
4519
4520
#: bzrlib/clean_tree.py:130
4521
msgid "No files deleted."
4522
msgstr ""
4523
4524
#: bzrlib/cmd_version_info.py:47
4525
msgid "No known version info format {0}. Supported types are: {1}"
4526
msgstr ""
4527
4528
#: bzrlib/cmd_version_info.py:52
4529
msgid "Version info in Custom template-based format."
4530
msgstr ""
4531
4532
#: bzrlib/cmd_version_info.py:52
4533
msgid "Version info in Python format."
4534
msgstr ""
4535
4536
#: bzrlib/cmd_version_info.py:52
4537
msgid "Version info in RIO (simple text) format (default)."
4538
msgstr ""
4539
4540
#: bzrlib/cmd_version_info.py:53
4541
msgid "Show version information about this tree."
4542
msgstr ""
4543
4544
#: bzrlib/cmd_version_info.py:55
4545
msgid ""
4546
"You can use this command to add information about version into\n"
4547
"source code of an application. The output can be in one of the\n"
4548
"supported formats or in a custom format based on a template."
4549
msgstr ""
4550
4551
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4552
#: en/help_topics/configuration.txt:722
4553
msgid "For example::"
4554
msgstr ""
4555
4556
#: bzrlib/cmd_version_info.py:61
4557
msgid ""
4558
" bzr version-info --custom \\\n"
4559
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4560
msgstr ""
4561
4562
#: bzrlib/cmd_version_info.py:64
4563
msgid ""
4564
"will produce a C header file with formatted string containing the\n"
4565
"current revision number. Other supported variables in templates are:"
4566
msgstr ""
4567
4568
#: bzrlib/cmd_version_info.py:67
4569
msgid ""
4570
" * {date} - date of the last revision\n"
4571
" * {build_date} - current date\n"
4572
" * {revno} - revision number\n"
4573
" * {revision_id} - revision id\n"
4574
" * {branch_nick} - branch nickname\n"
4575
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4576
" otherwise 1"
4577
msgstr ""
4578
4579
#: bzrlib/cmd_version_info.py:77
4580
msgid "Select the output format."
4581
msgstr ""
4582
4583
#: bzrlib/cmd_version_info.py:81
4584
msgid "Include all possible information."
4585
msgstr ""
4586
4587
#: bzrlib/cmd_version_info.py:82
4588
msgid "Check if tree is clean."
4589
msgstr ""
4590
4591
#: bzrlib/cmd_version_info.py:84
4592
msgid "Include the revision-history."
4593
msgstr ""
4594
4595
#: bzrlib/cmd_version_info.py:86
4596
msgid "Include the last revision for each file."
4597
msgstr ""
4598
4599
#: bzrlib/cmd_version_info.py:87
4600
msgid "Template for the output."
4601
msgstr ""
4602
4603
#: bzrlib/cmd_version_info.py:101
4604
msgid "bzr version-info --revision takes exactly one revision specifier"
4605
msgstr ""
4606
4607
#: bzrlib/commands.py:229
4608
#, python-format
4609
msgid "unknown command \"%s\""
4610
msgstr ""
4611
4612
#: bzrlib/commands.py:476
4613
msgid "No help for this command."
4614
msgstr ""
4615
4616
#: bzrlib/commands.py:489
4617
#, python-format
4618
msgid ":Purpose: %s\n"
4619
msgstr ""
4620
4621
#: bzrlib/commands.py:491
4622
#, python-format
4623
msgid ""
4624
":Usage:\n"
4625
"%s\n"
4626
msgstr ""
4627
4628
#: bzrlib/commands.py:493
4629
#, python-format
4630
msgid ":Usage: %s\n"
4631
msgstr ""
4632
4633
#: bzrlib/commands.py:512
4634
#, python-format
4635
msgid ":Options:%s"
4636
msgstr ""
4637
4638
#: bzrlib/commands.py:523
4639
#, python-format
4640
msgid ""
4641
":Description:\n"
4642
" %s\n"
4643
"\n"
4644
msgstr ""
4645
4646
#: bzrlib/commands.py:533
4647
#, python-format
4648
msgid ""
4649
"See bzr help %s for more details and examples.\n"
4650
"\n"
4651
msgstr ""
4652
4653
#: bzrlib/commands.py:538
4654
msgid ":Aliases: "
4655
msgstr ""
4656
4657
#: bzrlib/commands.py:542
4658
#, python-format
4659
msgid ":From: plugin \"%s\"\n"
4660
msgstr ""
4661
4662
#: bzrlib/commands.py:554
4663
msgid ":doc:`{0} <{1}-help>`"
4664
msgstr ""
4665
4666
#: bzrlib/commands.py:558
4667
#, python-format
4668
msgid ":See also: %s"
4669
msgstr ""
4670
4671
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4672
msgid "Only ASCII permitted in option names"
4673
msgstr ""
4674
4675
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4676
msgid "command {0!r} needs one or more {1}"
4677
msgstr ""
4678
4679
#: bzrlib/commands.py:868
4680
msgid "command {0!r} requires argument {1}"
4681
msgstr ""
4682
4683
#: bzrlib/commands.py:875
4684
msgid "extra argument to command {0}: {1}"
4685
msgstr ""
4686
4687
#: bzrlib/commands.py:972
4688
#, python-format
4689
msgid "Profile data written to \"%s\"."
4690
msgstr ""
4691
4692
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4693
msgid "added"
4694
msgstr ""
4695
4696
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4697
msgid "modified"
4698
msgstr ""
4699
4700
#: bzrlib/commit.py:131
4701
#, python-format
4702
msgid "Committing%s"
4703
msgstr ""
4704
4705
#: bzrlib/commit.py:134
4706
#, python-format
4707
msgid "Committed revision %d."
4708
msgstr ""
4709
4710
#: bzrlib/commit.py:143
4711
#, python-format
4712
msgid "deleted %s"
4713
msgstr ""
4714
4715
#: bzrlib/commit.py:146
4716
#, python-format
4717
msgid "missing %s"
4718
msgstr ""
4719
4720
#: bzrlib/commit.py:511
4721
msgid ""
4722
"Conflicting tags in bound branch:\n"
4723
"{0}"
4724
msgstr ""
4725
4726
#: bzrlib/commit.py:742
4727
msgid "renamed"
4728
msgstr ""
4729
4730
#: bzrlib/commit.py:976
4731
msgid "unchanged"
4732
msgstr ""
4733
4734
#: bzrlib/commit.py:998
4735
msgid "{0} [{1}] - Stage"
4736
msgstr ""
4737
4738
#: bzrlib/commit.py:1001
4739
#, python-format
4740
msgid "%s - Stage"
4741
msgstr ""
4742
4743
#: bzrlib/commit_signature_commands.py:34
4744
msgid "Sign all commits by a given committer."
4745
msgstr ""
4746
4747
#: bzrlib/commit_signature_commands.py:36
4748
msgid ""
4749
"If location is not specified the local tree is used.\n"
4750
"If committer is not specified the default committer is used."
4751
msgstr ""
4752
4753
#: bzrlib/commit_signature_commands.py:39
4754
msgid "This does not sign commits that already have signatures."
4755
msgstr ""
4756
4757
#: bzrlib/commit_signature_commands.py:47
4758
msgid ""
4759
"Don't actually sign anything, just print the revisions that would be signed."
4760
msgstr ""
4761
4762
#: bzrlib/commit_signature_commands.py:98
4763
#, python-format
4764
msgid "Signed %d revision.\n"
4765
msgid_plural "Signed %d revisions.\n"
4766
msgstr[0] ""
4767
msgstr[1] ""
4768
4769
#: bzrlib/commit_signature_commands.py:103
4770
msgid "Verify all commit signatures."
4771
msgstr ""
4772
4773
#: bzrlib/commit_signature_commands.py:105
4774
msgid ""
4775
"Verifies that all commits in the branch are signed by known GnuPG keys."
4776
msgstr ""
4777
4778
#: bzrlib/commit_signature_commands.py:110
4779
msgid ""
4780
"Comma separated list of GPG key patterns which are acceptable for "
4781
"verification."
4782
msgstr ""
4783
4784
#: bzrlib/commit_signature_commands.py:148
4785
msgid "Cannot verify a range of non-revision-history revisions"
4786
msgstr ""
4787
4788
#: bzrlib/commit_signature_commands.py:166
4789
msgid "All commits signed with verifiable keys"
4790
msgstr ""
4791
4792
#: bzrlib/config.py:436
4793
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4794
msgstr ""
4795
4796
#: bzrlib/config.py:2452
4797
msgid "{0} is not an SI unit."
4798
msgstr ""
4799
4800
#: bzrlib/config.py:2971
4801
msgid ""
4802
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4803
"will be saved."
4804
msgstr ""
4805
4806
#: bzrlib/config.py:3116
4807
#, python-format
4808
msgid "Invalid '%s', should be of the form 'name=value'"
4809
msgstr ""
4810
4811
#: bzrlib/config.py:4018
4812
msgid "Display, set or remove a configuration option."
4813
msgstr ""
4814
4815
#: bzrlib/config.py:4020
4816
msgid "Display the active value for a given option."
4817
msgstr ""
4818
4819
#: bzrlib/config.py:4022
4820
msgid ""
4821
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4822
"matching options are displayed mentioning their scope. The active value\n"
4823
"that bzr will take into account is the first one displayed for each option."
4824
msgstr ""
4825
4826
#: bzrlib/config.py:4026
4827
msgid "If no NAME is given, --all .* is implied."
4828
msgstr ""
4829
4830
#: bzrlib/config.py:4028
4831
msgid ""
4832
"Setting a value is achieved by using name=value without spaces. The value\n"
4833
"is set in the most relevant scope and can be checked by displaying the\n"
4834
"option again."
4835
msgstr ""
4836
4837
#: bzrlib/config.py:4040
4838
msgid "Reduce the scope to the specified configuration file."
4839
msgstr ""
4840
4841
#: bzrlib/config.py:4044
4842
msgid "Display all the defined values for the matching options."
4843
msgstr ""
4844
4845
#: bzrlib/config.py:4046
4846
msgid "Remove the option from the configuration file."
4847
msgstr ""
4848
4849
#: bzrlib/conflicts.py:50
4850
msgid "List files with conflicts."
4851
msgstr ""
4852
4853
#: bzrlib/conflicts.py:57
4854
msgid ""
4855
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4856
"is supplied, the pathnames of files with text conflicts are listed,\n"
4857
"instead. (This is useful for editing all files with text conflicts.)"
4858
msgstr ""
4859
4860
#: bzrlib/conflicts.py:61
4861
msgid "Use bzr resolve when you have fixed a problem."
4862
msgstr ""
4863
4864
#: bzrlib/conflicts.py:66
4865
msgid "List paths of files with text conflicts."
4866
msgstr ""
4867
4868
#: bzrlib/conflicts.py:85
4869
msgid "Marks the conflict as resolved."
4870
msgstr ""
4871
4872
#: bzrlib/conflicts.py:88
4873
msgid "Resolve the conflict preserving the version in the working tree."
4874
msgstr ""
4875
4876
#: bzrlib/conflicts.py:91
4877
msgid "Resolve the conflict taking the merged version into account."
4878
msgstr ""
4879
4880
#: bzrlib/conflicts.py:98
4881
msgid "How to resolve the conflict."
4882
msgstr ""
4883
4884
#: bzrlib/conflicts.py:104
4885
msgid "Mark a conflict as resolved."
4886
msgstr ""
4887
4888
#: bzrlib/conflicts.py:111
4889
msgid ""
4890
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4891
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4892
"as\n"
4893
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4894
msgstr ""
4895
4896
#: bzrlib/conflicts.py:119
4897
msgid "Resolve all conflicts in this tree."
4898
msgstr ""
4899
4900
#: bzrlib/conflicts.py:126
4901
msgid "If --all is specified, no FILE may be provided"
4902
msgstr ""
4903
4904
#: bzrlib/conflicts.py:151
4905
#, python-format
4906
msgid "%d conflict auto-resolved."
4907
msgid_plural "%d conflicts auto-resolved."
4908
msgstr[0] ""
4909
msgstr[1] ""
4910
4911
#: bzrlib/conflicts.py:154
4912
msgid "Remaining conflicts:"
4913
msgstr ""
4914
4915
#: bzrlib/conflicts.py:159
4916
msgid "All conflicts resolved."
4917
msgstr ""
4918
4919
#: bzrlib/conflicts.py:168
4920
msgid "{0} conflict resolved, {1} remaining"
4921
msgid_plural "{0} conflicts resolved, {1} remaining"
4922
msgstr[0] ""
4923
msgstr[1] ""
4924
4925
#: bzrlib/controldir.py:712
4926
msgid "{0} is{1} redirected to {2}"
4927
msgstr ""
4928
4929
#: bzrlib/diff.py:399
4930
#, python-format
4931
msgid "*** Ignoring files outside view. View is %s"
4932
msgstr ""
4933
4934
#: bzrlib/errors.py:157
4935
msgid "The tree builder is already building a tree."
4936
msgstr ""
4937
4938
#: bzrlib/errors.py:178
4939
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4940
msgstr ""
4941
4942
#: bzrlib/errors.py:197
4943
msgid ""
4944
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4945
"versions \"%(minimum)s\" to \"%(current)s\"."
4946
msgstr ""
4947
4948
#: bzrlib/errors.py:209
4949
msgid "The transport '%(transport)s' is only accessible within this process."
4950
msgstr ""
4951
4952
#: bzrlib/errors.py:227
4953
msgid "Invalid revision number %(revno)s"
4954
msgstr ""
4955
4956
#: bzrlib/errors.py:236
4957
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4958
msgstr ""
4959
4960
#: bzrlib/errors.py:247
4961
msgid "Reserved revision-id {%(revision_id)s}"
4962
msgstr ""
4963
4964
#: bzrlib/errors.py:261
4965
msgid "There is no public branch set for \"%(branch_url)s\"."
4966
msgstr ""
4967
4968
#: bzrlib/errors.py:271
4969
msgid ""
4970
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4971
"obtain a list of topics."
4972
msgstr ""
4973
4974
#: bzrlib/errors.py:280
4975
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:290
4979
msgid ""
4980
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:299
4984
msgid "The branch '%(branch)s' is not stacked."
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:313
4988
msgid "No WorkingTree exists for \"%(base)s\"."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:322
4992
msgid "Not currently building a tree."
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:327
4996
msgid "%(url)s is not a local path."
4997
msgstr ""
4998
4999
#: bzrlib/errors.py:355
5000
msgid "%(not_locked)r is not write locked but needs to be."
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:363
5004
msgid "Error in command line options"
5005
msgstr ""
5006
5007
#: bzrlib/errors.py:368
5008
msgid "%(value)s is not an index of type %(_type)s."
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:378
5012
msgid "Error in data for index %(value)s."
5013
msgstr ""
5014
5015
#: bzrlib/errors.py:387
5016
msgid "The key '%(key)s' is already in index '%(index)s'."
5017
msgstr ""
5018
5019
#: bzrlib/errors.py:397
5020
msgid "The key '%(key)s' is not a valid key."
5021
msgstr ""
5022
5023
#: bzrlib/errors.py:406
5024
msgid "Could not parse options for index %(value)s."
5025
msgstr ""
5026
5027
#: bzrlib/errors.py:415
5028
msgid "The value '%(value)s' is not a valid value."
5029
msgstr ""
5030
5031
#: bzrlib/errors.py:424
5032
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5033
msgstr ""
5034
5035
#: bzrlib/errors.py:443
5036
msgid "Generic path error: %(path)r%(extra)s)"
5037
msgstr ""
5038
5039
#: bzrlib/errors.py:456
5040
msgid "No such file: %(path)r%(extra)s"
5041
msgstr ""
5042
5043
#: bzrlib/errors.py:461
5044
msgid "File exists: %(path)r%(extra)s"
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:467
5048
msgid ""
5049
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5050
"after to tell bzr about a rename that has already happened)%(extra)s"
5051
msgstr ""
5052
5053
#: bzrlib/errors.py:483
5054
msgid "\"%(path)s\" is not a directory %(extra)s"
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:488
5058
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:493
5062
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:498
5066
msgid "Hard-linking \"%(path)s\" is not supported"
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:513
5070
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:518
5074
msgid "Permission denied: \"%(path)s\"%(extra)s"
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:523
5078
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:528
5082
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:539
5086
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:561
5090
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:571
5094
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:579
5098
msgid ""
5099
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5100
"upgrade the branch to permit branch stacking."
5101
msgstr ""
5102
5103
#: bzrlib/errors.py:590
5104
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:600
5108
msgid ""
5109
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5110
"need to upgrade the repository to permit branch stacking."
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:611
5114
msgid "Error reading from %(path)r."
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:630
5118
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:646
5122
msgid "Path \"%(path)s\" is not unicode normalized"
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:654
5126
msgid "Not a branch: \"%(path)s\"%(detail)s."
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:696
5130
msgid "No submit branch available for branch \"%(path)s\""
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:705
5134
msgid "A control directory already exists: \"%(path)s\"."
5135
msgstr ""
5136
5137
#: bzrlib/errors.py:710
5138
msgid "Already a branch: \"%(path)s\"."
5139
msgstr ""
5140
5141
#: bzrlib/errors.py:715
5142
msgid "Invalid branch name: %(name)s"
5143
msgstr ""
5144
5145
#: bzrlib/errors.py:724
5146
msgid "Parent branch already exists: \"%(path)s\"."
5147
msgstr ""
5148
5149
#: bzrlib/errors.py:730
5150
msgid ""
5151
"Directory contains a branch, but no working tree (use bzr checkout if you "
5152
"wish to build a working tree): \"%(path)s\""
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:735
5156
msgid ""
5157
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5158
msgstr ""
5159
5160
#: bzrlib/errors.py:745
5161
msgid ""
5162
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:755
5166
msgid "No repository present: \"%(path)s\""
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:762
5170
msgid ""
5171
"Unsupported branch format: %(format)s\n"
5172
"Please run 'bzr upgrade'"
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:768
5176
msgid "Unknown %(kind)s format: %(format)r"
5177
msgstr ""
5178
5179
#: bzrlib/errors.py:777
5180
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:787
5184
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:802
5188
msgid ""
5189
"%(target)s\n"
5190
"is not compatible with\n"
5191
"%(source)s\n"
5192
"%(details)s"
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:818
5196
msgid "Revision is not compatible with %(repo_format)s"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:828
5200
msgid "%(context_info)s%(path)s is already versioned."
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:849
5204
msgid "%(context_info)s%(path)s is not versioned."
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:870
5208
msgid "Path(s) are not versioned: %(paths_as_string)s"
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:881
5212
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:900
5216
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:908
5220
msgid ""
5221
"Filename %(filename)r is not valid in your current filesystem encoding "
5222
"%(fs_encoding)s"
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:919
5226
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:937
5230
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:976
5234
msgid "Cannot lock %(lock)s: %(why)s"
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:986
5238
msgid ""
5239
"A transaction related operation was attempted after the transaction finished."
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:1013
5243
msgid "Cannot lock: transport is read only: %(transport)s"
5244
msgstr ""
5245
5246
#: bzrlib/errors.py:1021
5247
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5248
msgstr ""
5249
5250
#: bzrlib/errors.py:1032
5251
msgid ""
5252
"Lock was broken while still open: %(lock)s - check storage consistency!"
5253
msgstr ""
5254
5255
#: bzrlib/errors.py:1043
5256
msgid ""
5257
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5258
"%(holder)r, wanted to break %(target)r"
5259
msgstr ""
5260
5261
#: bzrlib/errors.py:1055
5262
msgid ""
5263
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5264
"Use 'bzr break-lock' to clear it"
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:1068
5268
msgid "Lock not held: %(lock)s"
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:1097
5272
msgid "No changes to commit"
5273
msgstr ""
5274
5275
#: bzrlib/errors.py:1102
5276
msgid ""
5277
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:1112
5281
msgid ""
5282
"Excluding paths during commit is not supported by repository at "
5283
"%(repository)r."
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:1121
5287
msgid ""
5288
"The specified commit message contains characters unsupported by the current "
5289
"encoding."
5290
msgstr ""
5291
5292
#: bzrlib/errors.py:1127
5293
msgid "Upgrade URL cannot work with readonly URLs."
5294
msgstr ""
5295
5296
#: bzrlib/errors.py:1132
5297
msgid "The branch format %(format)s is already at the most recent format."
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:1155
5301
msgid "Option --change does not accept revision ranges"
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:1160
5305
msgid "No namespace registered for string: %(spec)r"
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:1179
5309
msgid ""
5310
"Requested revision: '%(spec)s' does not exist in branch: "
5311
"%(branch_url)s%(extra)s"
5312
msgstr ""
5313
5314
#: bzrlib/errors.py:1193
5315
msgid ""
5316
"Operation denied because it would change the main history, which is not "
5317
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1204
5321
msgid ""
5322
"These branches have diverged. Use the missing command to see how.\n"
5323
"Use the merge command to reconcile them."
5324
msgstr ""
5325
5326
#: bzrlib/errors.py:1224
5327
msgid ""
5328
"Branches have no common ancestor, and no merge base revision was specified."
5329
msgstr ""
5330
5331
#: bzrlib/errors.py:1230
5332
msgid ""
5333
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1236
5337
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1245
5341
msgid ""
5342
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:1254
5346
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1263
5350
msgid "Branch %(branch)s has no commits."
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1281
5354
msgid ""
5355
"Bound branch %(branch)s is out of date with master branch "
5356
"%(master)s.%(extra_help)s"
5357
msgstr ""
5358
5359
#: bzrlib/errors.py:1293
5360
msgid ""
5361
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5362
"bound to %(remote)s."
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:1305
5366
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1314
5370
msgid ""
5371
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5372
"%(error)s"
5373
msgstr ""
5374
5375
#: bzrlib/errors.py:1326
5376
msgid "Error in processing weave: %(msg)s"
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:1335
5380
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:1346
5384
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5385
msgstr ""
5386
5387
#: bzrlib/errors.py:1356
5388
msgid "Weave invariant violated: %(what)s"
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:1365
5392
msgid "Parents are mismatched between two revisions. %(msg)s"
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:1387
5396
msgid ""
5397
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5398
"%(weave_b)s"
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:1399
5402
msgid "Versioned file error"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1404
5406
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1414
5410
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1424
5414
msgid "Text did not match its checksum: %(msg)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1550
5418
msgid "Export format %(format)r not supported"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1559
5422
msgid "Transport error: %(msg)s %(orig_error)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1585
5426
msgid "Generic bzr smart protocol error: %(details)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1593
5430
msgid "Received bad protocol version marker: %(marker)r"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1625
5434
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1630
5438
msgid "Connection error: %(msg)s %(orig_error)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1635
5442
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1656
5446
msgid "Connection closed: %(msg)s %(orig_error)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1661
5450
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1666
5454
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1676
5458
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1691
5462
msgid "Certificate error: %(error)s"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1699
5466
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1713
5470
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1721
5474
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1730
5478
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1744
5482
msgid "Too many redirections"
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:1749
5486
msgid "Working tree has conflicts."
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1753
5490
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1762
5494
msgid ""
5495
"Error(s) parsing config file %(filename)s:\n"
5496
"%(errors)s"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1772
5500
msgid ""
5501
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5502
"See ``bzr help %(name)s``"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1782
5506
msgid "%(username)r does not seem to contain a reasonable email address"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1791
5510
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1799
5514
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:1807
5518
msgid "Unable to import library \"%(library)s\": %(error)s"
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:1815
5522
msgid "python-gpgme is not installed, it is needed to verify signatures"
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:1823
5526
msgid ""
5527
"The working tree for %(basedir)s has changed since the last commit, but "
5528
"weave merge requires that it be unchanged"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1833
5532
msgid ""
5533
"Can't reprocess and show base, because reprocessing obscures the "
5534
"relationship of conflicting lines to the base"
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:1839
5538
msgid "Cycle in graph %(graph)r"
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:1867
5542
msgid "File %(filename)s is not conflicted."
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:1889
5546
msgid "No bundle was found in \"%(filename)s\"."
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:1898
5550
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:1908
5554
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:1921
5558
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:1931
5562
msgid "Key %(key)s is already present in map"
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:1936
5566
msgid "The prefix %(prefix)s is in the help search path twice."
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:1946
5570
msgid ""
5571
"No final name for trans_id %(trans_id)r\n"
5572
"file-id: %(file_id)r\n"
5573
"root trans-id: %(root_trans_id)r\n"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:1978
5577
msgid "Attempt to reuse a transform that has already been applied."
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:1983
5581
msgid "Moving the root directory is not supported at this time"
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:1988
5585
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:1999
5589
msgid ""
5590
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5591
msgstr ""
5592
5593
#: bzrlib/errors.py:2035
5594
msgid ""
5595
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:2065
5599
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:2073
5603
msgid "Nothing to merge."
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:2078
5607
msgid "Format %(format)s cannot be initialised by this version of bzr."
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:2087
5611
msgid ""
5612
"Cannot convert from format %(from_format)s to format %(format)s. "
5613
"%(problem)s"
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:2099
5617
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:2107
5621
msgid "%(exe_name)s could not be found on this machine"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:2115
5625
msgid "Diff is not installed on this machine: %(msg)s"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:2123
5629
msgid "Diff3 is not installed on this machine."
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:2129
5633
msgid "The content being inserted is already present."
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:2134
5637
msgid ""
5638
"This tree contains left-over files from a failed operation.\n"
5639
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5640
"to\n"
5641
" keep, and delete it when you are done."
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:2145
5645
msgid ""
5646
"This tree contains left-over files from a failed operation.\n"
5647
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5648
" wish to keep, and delete it when you are done."
5649
msgstr ""
5650
5651
#: bzrlib/errors.py:2155
5652
msgid ""
5653
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5654
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5655
"to\n"
5656
" keep, and delete it when you are done."
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2166
5660
msgid ""
5661
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5662
"examine %(pending_deletion)s to see if it contains any files you wish to "
5663
"keep, and delete it when you are done."
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:2176
5667
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:2190
5671
msgid ""
5672
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:2203
5676
msgid "Error in merge modified format"
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2208
5680
msgid "Format error in conflict listings"
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:2212
5684
msgid ""
5685
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5686
"Error: %(description)s"
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:2223
5690
msgid ""
5691
"An error has been detected in the repository %(repo_path)s.\n"
5692
"Please run bzr reconcile on this repository."
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:2234
5696
msgid ""
5697
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5698
"reason: %(reason)s"
5699
msgstr ""
5700
5701
#: bzrlib/errors.py:2247
5702
msgid ""
5703
"An inconsistent delta was supplied: %(delta)r\n"
5704
"reason: %(reason)s"
5705
msgstr ""
5706
5707
#: bzrlib/errors.py:2259
5708
msgid "To use this feature you must upgrade your branch at %(path)s."
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:2268
5712
msgid "To use this feature you must upgrade your repository at %(path)s."
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:2273
5716
msgid ""
5717
"To use this feature you must upgrade your branch at %(path)s to a format "
5718
"which supports rich roots."
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:2279
5722
msgid "Cannot perform local-only commits on unbound branches."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2284
5726
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:2305
5730
msgid "Ghost tags not supported by format %(format)r."
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2313
5734
msgid "File is binary but should be text."
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:2318
5738
msgid "The path %(path)s is not permitted on this platform"
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:2327
5742
msgid ""
5743
"Testament did not match expected value.\n"
5744
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5745
" {%(measured)s}"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:2339
5749
msgid "Not a bzr revision-bundle: %(text)r"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2348
5753
msgid "Bad bzr revision-bundle: %(text)r"
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:2357
5757
msgid "Malformed bzr revision-bundle header: %(text)r"
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:2362
5761
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:2367
5765
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:2372
5769
msgid "End of line marker was not \\n in bzr revision-bundle"
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:2382
5773
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:2392
5777
msgid "Root class for inventory serialization errors"
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:2396
5781
msgid ""
5782
"The inventory was not in the expected format:\n"
5783
" %(msg)s"
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:2405
5787
msgid "This operation requires rich root data storage"
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2418
5791
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2427
5795
msgid ""
5796
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5797
"variable."
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:2434
5801
msgid ""
5802
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5803
"ghost at {%(ghost_revision_id)s}"
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:2444
5807
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2495
5811
msgid ""
5812
"A merge directive must provide either a bundle or a public branch location."
5813
msgstr ""
5814
5815
#: bzrlib/errors.py:2502
5816
msgid "Bad merge directive payload %(start)r"
5817
msgstr ""
5818
5819
#: bzrlib/errors.py:2512
5820
msgid "Preview patch does not match requested changes."
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:2518
5824
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2528
5828
msgid ""
5829
"Your branch does not have all of the revisions required in order to merge "
5830
"this merge directive and the target location specified in the merge "
5831
"directive is not a branch: %(location)s."
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2540
5835
msgid "Unsupported entry kind %(kind)s"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2548
5839
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2558
5843
msgid "Subsume target %(other_tree)s needs to be upgraded."
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2577
5847
msgid "No such tag: %(tag_name)s"
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2585
5851
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2594
5855
msgid "Tag %(tag_name)s already exists."
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2602
5859
msgid ""
5860
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5861
"bugs\" for more information on this feature."
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2612
5865
msgid ""
5866
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2622
5870
msgid ""
5871
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2632
5875
msgid "Invalid line in bugs property: '%(line)s'"
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2640
5879
msgid "Invalid bug status: '%(status)s'"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2648
5883
msgid "Could not understand response from smart server: %(response_tuple)r"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2687
5887
msgid "Server sent an unexpected error: %(error_tuple)r"
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2706
5891
msgid "Unrecognised container format: %(container_format)r"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2714
5895
msgid "Unexpected end of container stream"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2719
5899
msgid "Unknown record type: %(record_type)r"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2727
5903
msgid "Invalid record: %(reason)s"
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2735
5907
msgid "Container has data after end marker: %(excess)r"
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2743
5911
msgid "Container has multiple records with the same name: %(name)s"
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2756
5915
msgid "Corrupt or incompatible data stream: %(reason)s"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2764
5919
msgid "SMTP error: %(error)s"
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2772
5923
msgid "No message supplied."
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2777
5927
msgid "No mail-to address (--mail-to) or output (-o) specified."
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2782
5931
msgid ""
5932
"Unable to find mail client with the following names: "
5933
"%(mail_command_list_string)s"
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:2792
5937
msgid "SMTP connection to %(host)s refused"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2801
5941
msgid "Please specify smtp_server. No server at default %(host)s."
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2815
5945
msgid ""
5946
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5947
"reconfigure."
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2827
5951
msgid "'%(display_url)s' is already a branch."
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2832
5955
msgid "'%(display_url)s' is already a tree."
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2837
5959
msgid "'%(display_url)s' is already a checkout."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2842
5963
msgid "'%(display_url)s' is already a lightweight checkout."
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2847
5967
msgid "'%(display_url)s' is already using a shared repository."
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2852
5971
msgid "'%(display_url)s' is already standalone."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2857
5975
msgid "Shared repository '%(display_url)s' already creates working trees."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2863
5979
msgid ""
5980
"Shared repository '%(display_url)s' already doesn't create working trees."
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:2869
5984
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:2874
5988
msgid "No location could be found to bind to at %(display_url)s."
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:2879
5992
msgid ""
5993
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5994
"status).%(more)s"
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:2898
5998
msgid ""
5999
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6000
"list).%(more)s"
6001
msgstr ""
6002
6003
#: bzrlib/errors.py:2904
6004
msgid "Variable {%(name)s} is not available."
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:2912
6008
msgid "No template specified."
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:2917
6012
msgid "Unable to create symlink %(path_str)son this platform"
6013
msgstr ""
6014
6015
#: bzrlib/errors.py:2932
6016
msgid ""
6017
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6018
"\"original\", \"local\"."
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:2966
6022
msgid ""
6023
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2978
6027
msgid "The \"%(config_id)s\" configuration does not exist."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:2986
6031
msgid "The \"%(option_name)s\" configuration option does not exist."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:2994
6035
msgid "The alias \"%(alias_name)s\" does not exist."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:3008
6039
msgid "\"%(alias_name)s\" is not a valid location alias."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:3016
6043
msgid "No %(alias_name)s location assigned."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3024
6047
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3034
6051
msgid "Unknown rules detected: %(unknowns_str)s."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3045
6055
msgid "Tip change rejected: %(msg)s"
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3053
6059
msgid "Shelf corrupt."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3058
6063
msgid "Corruption while decompressing repository file%(orig_error)s"
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3070
6067
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6068
msgstr ""
6069
6070
#: bzrlib/errors.py:3078
6071
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6072
msgstr ""
6073
6074
#: bzrlib/errors.py:3086
6075
msgid ""
6076
"An attempt to access a url outside the server jail was made: '%(url)s'."
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:3094
6080
msgid "The user aborted the operation."
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:3099
6084
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:3109
6088
msgid "No such view: %(view_name)s."
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:3119
6092
msgid ""
6093
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6094
"to a later format."
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:3128
6098
msgid ""
6099
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:3195
6103
msgid "%(bzrdir)r does not support co-located branches."
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:3201
6107
msgid ""
6108
"Unable to determine your name.\n"
6109
"Please, set your name with the 'whoami' command.\n"
6110
"E.g. bzr whoami \"Your Name <name@example.com>\""
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:3210
6114
msgid "Invalid pattern(s) found. %(msg)s"
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:3218
6118
msgid ""
6119
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6120
"unbind` to fix."
6121
msgstr ""
6122
6123
#: bzrlib/errors.py:3229
6124
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6125
msgstr ""
6126
6127
#: bzrlib/errors.py:3238
6128
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6129
msgstr ""
6130
6131
#: bzrlib/errors.py:3247
6132
msgid ""
6133
"No compatible object available for operations from %(source)r to %(target)r."
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:3257
6137
msgid ""
6138
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6139
"%(arguments)s."
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:3267
6143
msgid ""
6144
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6145
"format %(format)r"
6146
msgstr ""
6147
6148
#: bzrlib/errors.py:3279
6149
msgid ""
6150
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6151
"plugin."
6152
msgstr ""
6153
6154
#: bzrlib/errors.py:3292
6155
msgid "Binary files section encountered."
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:3300
6159
msgid ""
6160
"Malformed patch header. %(desc)s\n"
6161
"%(line)r"
6162
msgstr ""
6163
6164
#: bzrlib/errors.py:3309
6165
msgid ""
6166
"Malformed hunk header. %(desc)s\n"
6167
"%(line)r"
6168
msgstr ""
6169
6170
#: bzrlib/errors.py:3318
6171
msgid ""
6172
"Malformed line. %(desc)s\n"
6173
"%(line)r"
6174
msgstr ""
6175
6176
#: bzrlib/errors.py:3328
6177
msgid ""
6178
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6179
"but patch says it should be \"%(patch_line)s\""
6180
msgstr ""
6181
6182
#: bzrlib/errors.py:3339
6183
msgid "The feature %(feature)s has already been registered."
6184
msgstr ""
6185
6186
#: bzrlib/export_pot.py:252
6187
#, python-format
6188
msgid "Exporting messages from builtin command: %s"
6189
msgstr ""
6190
6191
#: bzrlib/export_pot.py:271
6192
msgid "Exporting messages from plugin command: {0} in {1}"
6193
msgstr ""
6194
6195
#: bzrlib/export_pot.py:292
6196
#, python-format
6197
msgid "Exporting message from error: %s"
6198
msgstr ""
6199
6200
#: bzrlib/fetch.py:98
6201
msgid "Finding revisions"
6202
msgstr ""
6203
6204
#: bzrlib/fetch.py:103
6205
msgid "Fetching revisions"
6206
msgstr ""
6207
6208
#: bzrlib/foreign.py:262
6209
msgid "Push into a different VCS without any custom bzr metadata."
6210
msgstr ""
6211
6212
#: bzrlib/foreign.py:264
6213
msgid ""
6214
"This will afterwards rebase the local branch on the remote\n"
6215
"branch unless the --no-rebase option is used, in which case \n"
6216
"the two branches will be out of sync after the push. "
6217
msgstr ""
6218
6219
#: bzrlib/foreign.py:277
6220
msgid "Do not rebase after push."
6221
msgstr ""
6222
6223
#: bzrlib/foreign.py:311
6224
#, python-format
6225
msgid "Using saved location: %s\n"
6226
msgstr ""
6227
6228
#: bzrlib/foreign.py:321
6229
msgid ""
6230
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6231
"regular push."
6232
msgstr ""
6233
6234
#: bzrlib/gpg.py:366
6235
msgid "No GnuPG key results for pattern: {0}"
6236
msgstr ""
6237
6238
#: bzrlib/gpg.py:439
6239
msgid "{0} commits with valid signatures"
6240
msgstr ""
6241
6242
#: bzrlib/gpg.py:445
6243
msgid "{0} commit with unknown key"
6244
msgid_plural "{0} commits with unknown keys"
6245
msgstr[0] ""
6246
msgstr[1] ""
6247
6248
#: bzrlib/gpg.py:453
6249
msgid "{0} commit not valid"
6250
msgid_plural "{0} commits not valid"
6251
msgstr[0] ""
6252
msgstr[1] ""
6253
6254
#: bzrlib/gpg.py:461
6255
msgid "{0} commit not signed"
6256
msgid_plural "{0} commits not signed"
6257
msgstr[0] ""
6258
msgstr[1] ""
6259
6260
#: bzrlib/gpg.py:469
6261
msgid "{0} commit with key now expired"
6262
msgid_plural "{0} commits with key now expired"
6263
msgstr[0] ""
6264
msgstr[1] ""
6265
6266
#: bzrlib/gpg.py:489
6267
msgid "{0} commit by author {1} with key {2} now expired"
6268
msgid_plural "{0} commits by author {1} with key {2} now expired"
6269
msgstr[0] ""
6270
msgstr[1] ""
6271
6272
#: bzrlib/gpg.py:505
6273
msgid "{0} signed {1} commit"
6274
msgid_plural "{0} signed {1} commits"
6275
msgstr[0] ""
6276
msgstr[1] ""
6277
6278
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6279
msgid "{0} commit by author {1}"
6280
msgid_plural "{0} commits by author {1}"
6281
msgstr[0] ""
6282
msgstr[1] ""
6283
6284
#: bzrlib/gpg.py:554
6285
msgid "Unknown key {0} signed {1} commit"
6286
msgid_plural "Unknown key {0} signed {1} commits"
6287
msgstr[0] ""
6288
msgstr[1] ""
6289
6290
#: bzrlib/groupcompress.py:1739
6291
#, python-format
6292
msgid "Insert claimed random_id=True, but then inserted %r two times"
6293
msgstr ""
6294
6295
#: bzrlib/hooks.py:313
6296
#, python-format
6297
msgid "Introduced in: %s"
6298
msgstr ""
6299
6300
#: bzrlib/hooks.py:316
6301
#, python-format
6302
msgid "Deprecated in: %s"
6303
msgstr ""
6304
6305
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6306
msgid "Walking content"
6307
msgstr ""
6308
6309
#: bzrlib/knit.py:3330
6310
msgid "annotating"
6311
msgstr ""
6312
6313
#: bzrlib/lock.py:548
6314
msgid "{0!r} was {1} locked again"
6315
msgstr ""
6316
6317
#: bzrlib/lockdir.py:321
6318
#, python-format
6319
msgid "error removing pending lock: %s"
6320
msgstr ""
6321
6322
#: bzrlib/lockdir.py:616
6323
msgid "Unable to obtain"
6324
msgstr ""
6325
6326
#: bzrlib/lockdir.py:618
6327
msgid "Lock owner changed for"
6328
msgstr ""
6329
6330
#: bzrlib/lockdir.py:620
6331
msgid "{0} lock {1} {2}."
6332
msgstr ""
6333
6334
#: bzrlib/lockdir.py:627
6335
#, python-format
6336
msgid "Will continue to try until %s, unless you press Ctrl-C."
6337
msgstr ""
6338
6339
#: bzrlib/lockdir.py:629
6340
msgid "See \"bzr help break-lock\" for more."
6341
msgstr ""
6342
6343
#: bzrlib/lockdir.py:739
6344
#, python-format
6345
msgid ""
6346
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6347
msgstr ""
6348
6349
#: bzrlib/log.py:563
6350
msgid "--exclude-common-ancestry requires two different revisions"
6351
msgstr ""
6352
6353
#: bzrlib/log.py:565
6354
#, python-format
6355
msgid "invalid direction %r"
6356
msgstr ""
6357
6358
#: bzrlib/log.py:653
6359
msgid "Start revision not found in history of end revision."
6360
msgstr ""
6361
6362
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6363
msgid "Logging revision 0 is invalid."
6364
msgstr ""
6365
6366
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6367
msgid "Start revision must be older than the end revision."
6368
msgstr ""
6369
6370
#: bzrlib/log.py:1818
6371
#, python-format
6372
msgid "unknown log formatter: %r"
6373
msgstr ""
6374
6375
#: bzrlib/log.py:2114
6376
msgid "fixes bug"
6377
msgid_plural "fixes bugs"
6378
msgstr[0] ""
6379
msgstr[1] ""
6380
6381
#: bzrlib/merge.py:689
6382
msgid "All changes applied successfully."
6383
msgstr ""
6384
6385
#: bzrlib/merge.py:691
6386
#, python-format
6387
msgid "%d conflicts encountered."
6388
msgstr ""
6389
6390
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6391
msgid "Preparing file merge"
6392
msgstr ""
6393
6394
#: bzrlib/multiparent.py:426
6395
msgid "Importing revisions"
6396
msgstr ""
6397
6398
#: bzrlib/option.py:526
6399
msgid "Show help message."
6400
msgstr ""
6401
6402
#: bzrlib/option.py:528
6403
msgid "Only display errors and warnings."
6404
msgstr ""
6405
6406
#: bzrlib/option.py:531
6407
msgid "Show usage message and options."
6408
msgstr ""
6409
6410
#: bzrlib/option.py:533
6411
msgid "Display more information."
6412
msgstr ""
6413
6414
#: bzrlib/option.py:541
6415
msgid ""
6416
"Select changes introduced by the specified revision. See also \"help "
6417
"revisionspec\"."
6418
msgstr ""
6419
6420
#: bzrlib/option.py:543
6421
msgid "Branch to operate on, instead of working directory."
6422
msgstr ""
6423
6424
#: bzrlib/option.py:545
6425
msgid "Detailed log format."
6426
msgstr ""
6427
6428
#: bzrlib/option.py:545
6429
msgid "Format used by GNU ChangeLog files."
6430
msgstr ""
6431
6432
#: bzrlib/option.py:545
6433
msgid "Log format with one line per revision."
6434
msgstr ""
6435
6436
#: bzrlib/option.py:545
6437
msgid "Moderately short log format."
6438
msgstr ""
6439
6440
#: bzrlib/option.py:545
6441
msgid "Use specified log format."
6442
msgstr ""
6443
6444
#: bzrlib/option.py:547
6445
msgid "Log format"
6446
msgstr ""
6447
6448
#: bzrlib/option.py:549
6449
msgid "LCA-newness merge."
6450
msgstr ""
6451
6452
#: bzrlib/option.py:549
6453
msgid "Merge using external diff3."
6454
msgstr ""
6455
6456
#: bzrlib/option.py:549
6457
msgid "Native diff3-style merge."
6458
msgstr ""
6459
6460
#: bzrlib/option.py:549
6461
msgid "Select a particular merge algorithm."
6462
msgstr ""
6463
6464
#: bzrlib/option.py:549
6465
msgid "Weave-based merge."
6466
msgstr ""
6467
6468
#: bzrlib/option.py:551
6469
msgid "Merge algorithm"
6470
msgstr ""
6471
6472
#: bzrlib/option.py:554
6473
msgid "Message string."
6474
msgstr ""
6475
6476
#: bzrlib/option.py:556
6477
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6478
msgstr ""
6479
6480
#: bzrlib/option.py:558
6481
msgid "Ignore differences between branches and overwrite unconditionally."
6482
msgstr ""
6483
6484
#: bzrlib/option.py:560
6485
msgid "Remember the specified location as a default."
6486
msgstr ""
6487
6488
#: bzrlib/option.py:562
6489
msgid "Reprocess to reduce spurious conflicts."
6490
msgstr ""
6491
6492
#: bzrlib/option.py:566
6493
msgid "See \"help revisionspec\" for details."
6494
msgstr ""
6495
6496
#: bzrlib/option.py:568
6497
msgid "Show internal object ids."
6498
msgstr ""
6499
6500
#: bzrlib/option.py:571
6501
msgid "Display timezone as local, original, or utc."
6502
msgstr ""
6503
6504
#: bzrlib/osutils.py:100
6505
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6506
msgstr ""
6507
6508
#: bzrlib/osutils.py:220
6509
msgid "lstat/stat of ({0!r}): {1!r}"
6510
msgstr ""
6511
6512
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6513
#, python-format
6514
msgid "sorry, %r not allowed in path"
6515
msgstr ""
6516
6517
#: bzrlib/osutils.py:1259
6518
#, python-format
6519
msgid "%r is too short to calculate a relative path"
6520
msgstr ""
6521
6522
#: bzrlib/plugin.py:143
6523
#, python-format
6524
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6525
msgstr ""
6526
6527
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6528
msgid "Enable completions for the selected plugin (default: all plugins)"
6529
msgstr ""
6530
6531
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6532
msgid "Generate a shell function for bash command line completion."
6533
msgstr ""
6534
6535
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6536
msgid ""
6537
"This command generates a shell function which can be used by bash to\n"
6538
"automatically complete the currently typed command when the user presses\n"
6539
"the completion key (usually tab)."
6540
msgstr ""
6541
6542
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6543
msgid ""
6544
"Commonly used like this:\n"
6545
" eval \"`bzr bash-completion`\""
6546
msgstr ""
6547
6548
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6549
msgid "Name of the generated function (default: _bzr)"
6550
msgstr ""
6551
6552
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6553
msgid "Generate only the shell function, don't enable it"
6554
msgstr ""
6555
6556
#: bzrlib/plugins/launchpad/account.py:66
6557
msgid "Setting ssh/sftp usernames for launchpad.net."
6558
msgstr ""
6559
6560
#: bzrlib/plugins/launchpad/cmds.py:44
6561
msgid "Register a branch with launchpad.net."
6562
msgstr ""
6563
6564
#: bzrlib/plugins/launchpad/cmds.py:46
6565
msgid ""
6566
"This command lists a bzr branch in the directory of branches on\n"
6567
"launchpad.net. Registration allows the branch to be associated with\n"
6568
"bugs or specifications."
6569
msgstr ""
6570
6571
#: bzrlib/plugins/launchpad/cmds.py:50
6572
msgid ""
6573
"Before using this command you must register the project to which the\n"
6574
"branch belongs, and create an account for yourself on launchpad.net."
6575
msgstr ""
6576
6577
#: bzrlib/plugins/launchpad/cmds.py:53
6578
msgid ""
6579
"arguments:\n"
6580
" public_url: The publicly visible url for the branch to register.\n"
6581
" This must be an http or https url (which Launchpad can read\n"
6582
" from to access the branch). Local file urls, SFTP urls, and\n"
6583
" bzr+ssh urls will not work.\n"
6584
" If no public_url is provided, bzr will use the configured\n"
6585
" public_url if there is one for the current branch, and\n"
6586
" otherwise error."
6587
msgstr ""
6588
6589
#: bzrlib/plugins/launchpad/cmds.py:62
6590
msgid ""
6591
"example:\n"
6592
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6593
" --project fooproject"
6594
msgstr ""
6595
6596
#: bzrlib/plugins/launchpad/cmds.py:69
6597
msgid "Launchpad project short name to associate with the branch."
6598
msgstr ""
6599
6600
#: bzrlib/plugins/launchpad/cmds.py:76
6601
msgid ""
6602
"Short name for the branch; by default taken from the last component of the "
6603
"url."
6604
msgstr ""
6605
6606
#: bzrlib/plugins/launchpad/cmds.py:80
6607
msgid "One-sentence description of the branch."
6608
msgstr ""
6609
6610
#: bzrlib/plugins/launchpad/cmds.py:83
6611
msgid "Longer description of the purpose or contents of the branch."
6612
msgstr ""
6613
6614
#: bzrlib/plugins/launchpad/cmds.py:86
6615
msgid "Branch author's email address, if not yourself."
6616
msgstr ""
6617
6618
#: bzrlib/plugins/launchpad/cmds.py:89
6619
msgid "The bug this branch fixes."
6620
msgstr ""
6621
6622
#: bzrlib/plugins/launchpad/cmds.py:92
6623
msgid "Prepare the request but don't actually send it."
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/cmds.py:114
6627
msgid ""
6628
"register-branch requires a public branch url - see bzr help register-branch."
6629
msgstr ""
6630
6631
#: bzrlib/plugins/launchpad/cmds.py:122
6632
msgid "--product is deprecated; please use --project."
6633
msgstr ""
6634
6635
#: bzrlib/plugins/launchpad/cmds.py:152
6636
msgid "Open a Launchpad branch page in your web browser."
6637
msgstr ""
6638
6639
#: bzrlib/plugins/launchpad/cmds.py:157
6640
msgid "Do not actually open the browser. Just say the URL we would use."
6641
msgstr ""
6642
6643
#: bzrlib/plugins/launchpad/cmds.py:192
6644
#, python-format
6645
msgid "Opening %s in web browser"
6646
msgstr ""
6647
6648
#: bzrlib/plugins/launchpad/cmds.py:200
6649
msgid "Show or set the Launchpad user ID."
6650
msgstr ""
6651
6652
#: bzrlib/plugins/launchpad/cmds.py:202
6653
msgid ""
6654
"When communicating with Launchpad, some commands need to know your\n"
6655
"Launchpad user ID. This command can be used to set or show the\n"
6656
"user ID that Bazaar will use for such communication."
6657
msgstr ""
6658
6659
#: bzrlib/plugins/launchpad/cmds.py:206
6660
msgid ""
6661
":Examples:\n"
6662
" Show the Launchpad ID of the current user::"
6663
msgstr ""
6664
6665
#: bzrlib/plugins/launchpad/cmds.py:209
6666
msgid " bzr launchpad-login"
6667
msgstr ""
6668
6669
#: bzrlib/plugins/launchpad/cmds.py:211
6670
msgid " Set the Launchpad ID of the current user to 'bob'::"
6671
msgstr ""
6672
6673
#: bzrlib/plugins/launchpad/cmds.py:213
6674
msgid " bzr launchpad-login bob"
6675
msgstr ""
6676
6677
#: bzrlib/plugins/launchpad/cmds.py:220
6678
msgid "Don't check that the user name is valid."
6679
msgstr ""
6680
6681
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6682
msgid "Launchpad user ID exists and has SSH keys.\n"
6683
msgstr ""
6684
6685
#: bzrlib/plugins/launchpad/cmds.py:238
6686
msgid "No Launchpad user ID configured.\n"
6687
msgstr ""
6688
6689
#: bzrlib/plugins/launchpad/cmds.py:249
6690
#, python-format
6691
msgid "Launchpad user ID set to '%s'.\n"
6692
msgstr ""
6693
6694
#: bzrlib/plugins/launchpad/cmds.py:255
6695
msgid "Ask Launchpad to mirror a branch now."
6696
msgstr ""
6697
6698
#: bzrlib/plugins/launchpad/cmds.py:272
6699
msgid "Propose merging a branch on Launchpad."
6700
msgstr ""
6701
6702
#: bzrlib/plugins/launchpad/cmds.py:274
6703
msgid ""
6704
"This will open your usual editor to provide the initial comment. When it\n"
6705
"has created the proposal, it will open it in your default web browser."
6706
msgstr ""
6707
6708
#: bzrlib/plugins/launchpad/cmds.py:277
6709
msgid ""
6710
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6711
"is not supplied, the remembered submit branch will be used. If no submit\n"
6712
"branch is remembered, the development focus will be used."
6713
msgstr ""
6714
6715
#: bzrlib/plugins/launchpad/cmds.py:281
6716
msgid ""
6717
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6718
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6719
"The parameter the launchpad account name of the desired reviewer. This\n"
6720
"may optionally be followed by '=' and the review type. For example:"
6721
msgstr ""
6722
6723
#: bzrlib/plugins/launchpad/cmds.py:286
6724
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6725
msgstr ""
6726
6727
#: bzrlib/plugins/launchpad/cmds.py:288
6728
msgid ""
6729
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6730
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/cmds.py:293
6734
msgid "Propose the merge on staging."
6735
msgstr ""
6736
6737
#: bzrlib/plugins/launchpad/cmds.py:295
6738
msgid "Commit message."
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/cmds.py:297
6742
msgid "Mark the proposal as approved immediately."
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/cmds.py:298
6746
msgid "The bug this proposal fixes."
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/cmds.py:300
6750
msgid "Requested reviewer and optional type."
6751
msgstr ""
6752
6753
#: bzrlib/plugins/launchpad/cmds.py:335
6754
msgid "Find the proposal to merge this revision."
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/cmds.py:337
6758
msgid ""
6759
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6760
"This works only if the selected branch was the merge proposal target, and\n"
6761
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6762
"are opened in a web browser."
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/cmds.py:342
6766
msgid ""
6767
"Any revision involved in the merge may be specified-- the revision in\n"
6768
"which the merge was performed, or one of the revisions that was merged."
6769
msgstr ""
6770
6771
#: bzrlib/plugins/launchpad/cmds.py:345
6772
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6773
msgstr ""
6774
6775
#: bzrlib/plugins/launchpad/cmds.py:347
6776
msgid " bzr lp-find-proposal -r annotate:README:1"
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/cmds.py:363
6780
msgid "No review found."
6781
msgstr ""
6782
6783
#: bzrlib/plugins/launchpad/cmds.py:364
6784
#, python-format
6785
msgid "%d proposals(s) found."
6786
msgstr ""
6787
6788
#: bzrlib/plugins/launchpad/cmds.py:374
6789
msgid "Finding revision-id"
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/cmds.py:381
6793
msgid "Finding merge"
6794
msgstr ""
6795
6796
#: bzrlib/plugins/launchpad/cmds.py:386
6797
msgid "Finding revno"
6798
msgstr ""
6799
6800
#: bzrlib/plugins/launchpad/cmds.py:392
6801
msgid "Finding Launchpad branch"
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/cmds.py:395
6805
msgid "Finding proposals"
6806
msgstr ""
6807
6808
#: bzrlib/plugins/launchpad/lp_api.py:241
6809
#: bzrlib/plugins/launchpad/lp_api.py:246
6810
#, python-format
6811
msgid "%s is not registered on Launchpad"
6812
msgstr ""
6813
6814
#: bzrlib/plugins/launchpad/lp_api.py:256
6815
#, python-format
6816
msgid "%s has no development focus."
6817
msgstr ""
6818
6819
#: bzrlib/plugins/launchpad/lp_api.py:261
6820
#, python-format
6821
msgid "development focus %s has no branch."
6822
msgstr ""
6823
6824
#: bzrlib/plugins/launchpad/lp_api.py:266
6825
#, python-format
6826
msgid "source package %s has no branch."
6827
msgstr ""
6828
6829
#: bzrlib/plugins/launchpad/lp_api.py:270
6830
#, python-format
6831
msgid "%s has no associated product or source package."
6832
msgstr ""
6833
6834
#: bzrlib/plugins/launchpad/lp_api.py:282
6835
#, python-format
6836
msgid "%s is already up-to-date."
6837
msgstr ""
6838
6839
#: bzrlib/plugins/launchpad/lp_api.py:289
6840
#, python-format
6841
msgid "Pushing to %s"
6842
msgstr ""
6843
6844
#: bzrlib/plugins/launchpad/lp_directory.py:170
6845
msgid ""
6846
"resolution for {0}\n"
6847
" local: {1}\n"
6848
" remote: {2}"
6849
msgstr ""
6850
6851
#: bzrlib/plugins/launchpad/lp_propose.py:150
6852
#, python-format
6853
msgid "There is already a branch merge proposal: %s"
6854
msgstr ""
6855
6856
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6857
msgid "pb parameter to convert() is deprecated"
6858
msgstr ""
6859
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6861
msgid "starting upgrade from format 4 to 5"
6862
msgstr ""
6863
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6865
msgid "note: upgrade may be faster if all store files are ungzipped first"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6869
msgid "converting revision"
6870
msgstr ""
6871
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6873
msgid "upgraded to weaves:"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6877
#, python-format
6878
msgid "%6d revisions and inventories"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6882
#, python-format
6883
msgid "%6d revisions not present"
6884
msgstr ""
6885
6886
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6887
#, python-format
6888
msgid "%6d texts"
6889
msgstr ""
6890
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6892
msgid "writing weave"
6893
msgstr ""
6894
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6897
msgid "inventory"
6898
msgstr ""
6899
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6901
msgid "write revision"
6902
msgstr ""
6903
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6905
msgid "loading revision"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6909
#, python-format
6910
msgid "revision {%s} not present in branch; will be converted as a ghost"
6911
msgstr ""
6912
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6914
msgid "starting upgrade from format 5 to 6"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6918
#, python-format
6919
msgid "adding prefixes to %s"
6920
msgstr ""
6921
6922
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6923
msgid "starting upgrade from format 6 to metadir"
6924
msgstr ""
6925
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6927
msgid "Removing ancestry.weave"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6931
msgid "Finding branch files"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6935
msgid "Upgrading repository"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6939
msgid "Upgrading branch"
6940
msgstr ""
6941
6942
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6943
msgid "No working tree."
6944
msgstr ""
6945
6946
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6947
msgid "Upgrading working tree"
6948
msgstr ""
6949
6950
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6951
#, python-format
6952
msgid "Make %s lock"
6953
msgstr ""
6954
6955
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6956
#, python-format
6957
msgid "Moving %s"
6958
msgstr ""
6959
6960
#: bzrlib/push.py:56
6961
msgid "Created new branch."
6962
msgstr ""
6963
6964
#: bzrlib/push.py:97
6965
#, python-format
6966
msgid ""
6967
"Target directory %s already contains a .bzr directory, but it is not valid."
6968
msgstr ""
6969
6970
#: bzrlib/push.py:101
6971
#, python-format
6972
msgid ""
6973
"Target directory %s already exists, but does not have a .bzr directory. "
6974
"Supply --use-existing-dir to push there anyway."
6975
msgstr ""
6976
6977
#: bzrlib/push.py:122
6978
#, python-format
6979
msgid "Too many redirections trying to make %s."
6980
msgstr ""
6981
6982
#: bzrlib/push.py:148
6983
msgid ""
6984
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6985
"information."
6986
msgstr ""
6987
6988
#: bzrlib/push.py:152
6989
#, python-format
6990
msgid ""
6991
"It is not possible to losslessly push to %s. You may want to use dpush "
6992
"instead."
6993
msgstr ""
6994
6995
#: bzrlib/push.py:158
6996
#, python-format
6997
msgid ""
6998
"At %s you have a valid .bzr control directory, but not a branch or "
6999
"repository. This is an unsupported configuration. Please move the target "
7000
"directory out of the way and try again."
7001
msgstr ""
7002
7003
#: bzrlib/reconcile.py:97
7004
#, python-format
7005
msgid "Reconciling branch %s"
7006
msgstr ""
7007
7008
#: bzrlib/reconcile.py:103
7009
#, python-format
7010
msgid "Reconciling repository %s"
7011
msgstr ""
7012
7013
#: bzrlib/reconcile.py:105
7014
msgid "Reconciling repository"
7015
msgstr ""
7016
7017
#: bzrlib/reconcile.py:111
7018
#, python-format
7019
msgid "%s cannot canonicalize CHKs."
7020
msgstr ""
7021
7022
#: bzrlib/reconcile.py:119
7023
msgid "Reconcile aborted: revision index has inconsistent parents."
7024
msgstr ""
7025
7026
#: bzrlib/reconcile.py:121
7027
msgid "Run \"bzr check\" for more details."
7028
msgstr ""
7029
7030
#: bzrlib/reconcile.py:123
7031
msgid "Reconciliation complete."
7032
msgstr ""
7033
7034
#: bzrlib/reconcile.py:166
7035
msgid "Fixing last revision info {0} => {1}"
7036
msgstr ""
7037
7038
#: bzrlib/reconcile.py:173
7039
msgid "revision_history ok."
7040
msgstr ""
7041
7042
#: bzrlib/reconcile.py:234
7043
msgid "Reading inventory data"
7044
msgstr ""
7045
7046
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7047
msgid "Inventory ok."
7048
msgstr ""
7049
7050
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7051
msgid "Backing up inventory"
7052
msgstr ""
7053
7054
#: bzrlib/reconcile.py:258
7055
msgid "Backup inventory created."
7056
msgstr ""
7057
7058
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7059
msgid "Writing weave"
7060
msgstr ""
7061
7062
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7063
msgid "Inventory regenerated."
7064
msgstr ""
7065
7066
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7067
msgid "Reading indexes"
7068
msgstr ""
7069
7070
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7071
msgid "Checking unused inventories"
7072
msgstr ""
7073
7074
#: bzrlib/reconcile.py:388
7075
msgid "Backup Inventory created"
7076
msgstr ""
7077
7078
#: bzrlib/reconcile.py:446
7079
msgid "Fixing text parents"
7080
msgstr ""
7081
7082
#: bzrlib/reconfigure.py:54
7083
msgid "{0} is now stacked on {1}\n"
7084
msgstr ""
7085
7086
#: bzrlib/reconfigure.py:69
7087
#, python-format
7088
msgid "%s is now not stacked\n"
7089
msgstr ""
7090
7091
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7092
#, python-format
7093
msgid "bzr: ERROR (ignored): %s"
7094
msgstr ""
7095
7096
#: bzrlib/remote.py:2534
7097
msgid "Copying repository content as tarball..."
7098
msgstr ""
7099
7100
#: bzrlib/rename_map.py:69
7101
msgid "Calculating hashes"
7102
msgstr ""
7103
7104
#: bzrlib/rename_map.py:107
7105
msgid "Determining hash hits"
7106
msgstr ""
7107
7108
#: bzrlib/rename_map.py:242
7109
msgid "{0} => {1}"
7110
msgstr ""
7111
7112
#: bzrlib/repository.py:1738
7113
msgid "Moving repository to repository.backup"
7114
msgstr ""
7115
7116
#: bzrlib/repository.py:1745
7117
msgid "Creating new repository"
7118
msgstr ""
7119
7120
#: bzrlib/repository.py:1750
7121
msgid "Copying content"
7122
msgstr ""
7123
7124
#: bzrlib/repository.py:1754
7125
msgid "Deleting old repository content"
7126
msgstr ""
7127
7128
#: bzrlib/repository.py:1756
7129
msgid "repository converted"
7130
msgstr ""
7131
7132
#: bzrlib/revisionspec.py:903
7133
msgid "Using {0} {1}"
7134
msgstr ""
7135
7136
#: bzrlib/send.py:59
7137
#, python-format
7138
msgid "Mail client \"%s\" does not support specifying body"
7139
msgstr ""
7140
7141
#: bzrlib/send.py:63
7142
msgid "--remember requires a branch to be specified."
7143
msgstr ""
7144
7145
#: bzrlib/send.py:78
7146
msgid "No submit branch known or specified"
7147
msgstr ""
7148
7149
#: bzrlib/send.py:81
7150
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7151
msgstr ""
7152
7153
#: bzrlib/send.py:99
7154
#, python-format
7155
msgid "No such send format '%s'."
7156
msgstr ""
7157
7158
#: bzrlib/send.py:115
7159
msgid "bzr send takes at most two one revision identifiers"
7160
msgstr ""
7161
7162
#: bzrlib/send.py:128
7163
msgid "No revisions to submit."
7164
msgstr ""
7165
7166
#: bzrlib/send.py:140
7167
msgid ""
7168
"- not supported for merge directives that use more than one output file."
7169
msgstr ""
7170
7171
#: bzrlib/send.py:186
7172
msgid "Format 0.9 does not permit bundle with no patch"
7173
msgstr ""
7174
7175
#: bzrlib/shelf_ui.py:46
7176
#, python-format
7177
msgid "Shelve adding file \"%(path)s\"?"
7178
msgstr ""
7179
7180
#: bzrlib/shelf_ui.py:47
7181
msgid "Shelve binary changes?"
7182
msgstr ""
7183
7184
#: bzrlib/shelf_ui.py:48
7185
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7186
msgstr ""
7187
7188
#: bzrlib/shelf_ui.py:50
7189
#, python-format
7190
msgid "Shelve removing file \"%(path)s\"?"
7191
msgstr ""
7192
7193
#: bzrlib/shelf_ui.py:51
7194
#, python-format
7195
msgid "Shelve %d change(s)?"
7196
msgstr ""
7197
7198
#: bzrlib/shelf_ui.py:52
7199
msgid "Shelve?"
7200
msgstr ""
7201
7202
#: bzrlib/shelf_ui.py:53
7203
#, python-format
7204
msgid ""
7205
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7206
msgstr ""
7207
7208
#: bzrlib/shelf_ui.py:55
7209
#, python-format
7210
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7211
msgstr ""
7212
7213
#: bzrlib/shelf_ui.py:70
7214
#, python-format
7215
msgid "Changes shelved with id \"%d\"."
7216
msgstr ""
7217
7218
#: bzrlib/shelf_ui.py:74
7219
msgid "Selected changes destroyed."
7220
msgstr ""
7221
7222
#: bzrlib/shelf_ui.py:78
7223
msgid "Selected changes:"
7224
msgstr ""
7225
7226
#: bzrlib/shelf_ui.py:98
7227
#, python-format
7228
msgid "Delete file \"%(path)s\"?"
7229
msgstr ""
7230
7231
#: bzrlib/shelf_ui.py:99
7232
msgid "Apply binary changes?"
7233
msgstr ""
7234
7235
#: bzrlib/shelf_ui.py:100
7236
#, python-format
7237
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7238
msgstr ""
7239
7240
#: bzrlib/shelf_ui.py:102
7241
#, python-format
7242
msgid "Add file \"%(path)s\"?"
7243
msgstr ""
7244
7245
#: bzrlib/shelf_ui.py:103
7246
#, python-format
7247
msgid "Apply %d change(s)?"
7248
msgstr ""
7249
7250
#: bzrlib/shelf_ui.py:104
7251
msgid "Apply change?"
7252
msgstr ""
7253
7254
#: bzrlib/shelf_ui.py:105
7255
#, python-format
7256
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7257
msgstr ""
7258
7259
#: bzrlib/shelf_ui.py:107
7260
#, python-format
7261
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7262
msgstr ""
7263
7264
#: bzrlib/shelf_ui.py:402
7265
msgid "No changes are shelved."
7266
msgstr ""
7267
7268
#: bzrlib/shelf_ui.py:460
7269
#, python-format
7270
msgid "Using changes with id \"%d\"."
7271
msgstr ""
7272
7273
#: bzrlib/shelf_ui.py:464
7274
#, python-format
7275
msgid "Message: %s"
7276
msgstr ""
7277
7278
#: bzrlib/shelf_ui.py:476
7279
#, python-format
7280
msgid "Deleted changes with id \"%d\"."
7281
msgstr ""
7282
7283
#: bzrlib/smart/medium.py:714
7284
msgid "HPSS calls: {0} ({1} vfs) {2}"
7285
msgstr ""
7286
7287
#: bzrlib/smart/server.py:169
7288
msgid "Requested to stop gracefully"
7289
msgstr ""
7290
7291
#: bzrlib/smart/server.py:179
7292
#, python-format
7293
msgid "Waiting for %d client(s) to finish"
7294
msgstr ""
7295
7296
#: bzrlib/smart/server.py:185
7297
#, python-format
7298
msgid "Still waiting for %d client(s) to finish"
7299
msgstr ""
7300
7301
#: bzrlib/smart/server.py:219
7302
#, python-format
7303
msgid "listening socket error: %s"
7304
msgstr ""
7305
7306
#: bzrlib/smart/server.py:452
7307
#, python-format
7308
msgid "listening on port: %s"
7309
msgstr ""
7310
7311
#: bzrlib/switch.py:73
7312
msgid "Pending merges must be committed or reverted before using switch."
7313
msgstr ""
7314
7315
#: bzrlib/switch.py:100
7316
msgid ""
7317
"Cannot switch as local commits found in the checkout. Commit these to the "
7318
"bound branch or use --force to throw them away."
7319
msgstr ""
7320
7321
#: bzrlib/switch.py:105
7322
#, python-format
7323
msgid ""
7324
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7325
"anyway, use --force."
7326
msgstr ""
7327
7328
#: bzrlib/switch.py:129
7329
msgid "Cannot switch a branch, only a checkout."
7330
msgstr ""
7331
7332
#: bzrlib/switch.py:167
7333
#, python-format
7334
msgid "Tree is up to date at revision %d."
7335
msgstr ""
7336
7337
#: bzrlib/switch.py:173
7338
#, python-format
7339
msgid "Updated to revision %d."
7340
msgstr ""
7341
7342
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7343
msgid "Apply phase"
7344
msgstr ""
7345
7346
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7347
msgid "removing file"
7348
msgstr ""
7349
7350
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7351
msgid "adding file"
7352
msgstr ""
7353
7354
#: bzrlib/transform.py:2598
7355
msgid "Building tree"
7356
msgstr ""
7357
7358
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7359
msgid "Adding file contents"
7360
msgstr ""
7361
7362
#: bzrlib/transform.py:3017
7363
msgid "Resolution pass"
7364
msgstr ""
7365
7366
#: bzrlib/transport/ftp/_gssapi.py:88
7367
#, python-format
7368
msgid "Authenticated as %s"
7369
msgstr ""
7370
7371
#: bzrlib/tree.py:647
7372
msgid "*** {0} content-filter: {1} => {2!r}"
7373
msgstr ""
7374
7375
#: bzrlib/upgrade.py:77
7376
#, python-format
7377
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7378
msgstr ""
7379
7380
#: bzrlib/upgrade.py:100
7381
#, python-format
7382
msgid "cannot upgrade from bzrdir format %s"
7383
msgstr ""
7384
7385
#: bzrlib/upgrade.py:103
7386
#, python-format
7387
msgid "starting upgrade of %s"
7388
msgstr ""
7389
7390
#: bzrlib/upgrade.py:110
7391
msgid "finished"
7392
msgstr ""
7393
7394
#: bzrlib/upgrade.py:120
7395
msgid "Deleting backup.bzr"
7396
msgstr ""
7397
7398
#: bzrlib/upgrade.py:151
7399
msgid ""
7400
"\n"
7401
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7402
msgstr ""
7403
7404
#: bzrlib/upgrade.py:208
7405
#, python-format
7406
msgid "Found %d dependent branches - upgrading ..."
7407
msgstr ""
7408
7409
#: bzrlib/upgrade.py:276
7410
msgid "Upgrading bzrdirs"
7411
msgstr ""
7412
7413
#: bzrlib/upgrade.py:282
7414
#, python-format
7415
msgid "Upgrading %s"
7416
msgstr ""
7417
7418
#: bzrlib/upgrade.py:283
7419
msgid "Upgrading {0} {1} ..."
7420
msgstr ""
7421
7422
#: bzrlib/upgrade.py:301
7423
msgid "Removing backup ..."
7424
msgstr ""
7425
7426
#: bzrlib/upgrade.py:305
7427
msgid "failed to clean-up {0}: {1}"
7428
msgstr ""
7429
7430
#: bzrlib/vf_repository.py:1091
7431
msgid "inventories"
7432
msgstr ""
7433
7434
#: bzrlib/vf_repository.py:1117
7435
msgid "texts"
7436
msgstr ""
7437
7438
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7439
msgid "Calculating text parents"
7440
msgstr ""
7441
7442
#: bzrlib/vf_repository.py:1707
7443
msgid "Fetch texts"
7444
msgstr ""
7445
7446
#: bzrlib/vf_repository.py:2536
7447
msgid "loading text store"
7448
msgstr ""
7449
7450
#: bzrlib/vf_repository.py:2542
7451
msgid "checking text graph"
7452
msgstr ""
7453
7454
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7455
#: bzrlib/vf_repository.py:3127
7456
msgid "Transferring revisions"
7457
msgstr ""
7458
7459
#: bzrlib/win32utils.py:146
7460
msgid "Failed to GetProcessMemoryInfo()"
7461
msgstr ""
7462
7463
#: bzrlib/win32utils.py:167
7464
msgid "Cannot debug memory on win32 without ctypes or win32process"
7465
msgstr ""
7466
7467
#: bzrlib/win32utils.py:172
7468
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7469
msgstr ""
7470
7471
#: bzrlib/win32utils.py:180
7472
#, python-format
7473
msgid "WorkingSize %8d KiB"
7474
msgstr ""
7475
7476
#: bzrlib/win32utils.py:181
7477
#, python-format
7478
msgid "PeakWorking %8d KiB"
7479
msgstr ""
7480
7481
#: bzrlib/win32utils.py:182
7482
#, python-format
7483
msgid "PagefileUsage %8d KiB"
7484
msgstr ""
7485
7486
#: bzrlib/win32utils.py:183
7487
#, python-format
7488
msgid "PeakPagefileUsage %8d KiB"
7489
msgstr ""
7490
7491
#: bzrlib/win32utils.py:185
7492
#, python-format
7493
msgid "PrivateUsage %8d KiB"
7494
msgstr ""
7495
7496
#: bzrlib/win32utils.py:186
7497
#, python-format
7498
msgid "PageFaultCount %8d"
7499
msgstr ""
7500
7501
#: bzrlib/workingtree.py:1482
7502
msgid "Rerun update after fixing the conflicts."
7503
msgstr ""
7504
7505
#: dummy/help_topics/authentication/summary.txt:1
7506
msgid "Information on configuring authentication"
7507
msgstr ""
7508
7509
#: dummy/help_topics/basic/detail.txt:1
7510
msgid ""
7511
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7512
"http://bazaar.canonical.com/"
7513
msgstr ""
7514
7515
#: dummy/help_topics/basic/detail.txt:4
7516
msgid ""
7517
"Basic commands:\n"
7518
" bzr init makes this directory a versioned branch\n"
7519
" bzr branch make a copy of another branch"
7520
msgstr ""
7521
7522
#: dummy/help_topics/basic/detail.txt:8
7523
msgid ""
7524
" bzr add make files or directories versioned\n"
7525
" bzr ignore ignore a file or pattern\n"
7526
" bzr mv move or rename a versioned file"
7527
msgstr ""
7528
7529
#: dummy/help_topics/basic/detail.txt:12
7530
msgid ""
7531
" bzr status summarize changes in working copy\n"
7532
" bzr diff show detailed diffs"
7533
msgstr ""
7534
7535
#: dummy/help_topics/basic/detail.txt:15
7536
msgid ""
7537
" bzr merge pull in changes from another branch\n"
7538
" bzr commit save some or all changes\n"
7539
" bzr send send changes via email"
7540
msgstr ""
7541
7542
#: dummy/help_topics/basic/detail.txt:19
7543
msgid ""
7544
" bzr log show history of changes\n"
7545
" bzr check validate storage"
7546
msgstr ""
7547
7548
#: dummy/help_topics/basic/detail.txt:22
7549
msgid ""
7550
" bzr help init more help on e.g. init command\n"
7551
" bzr help commands list all commands\n"
7552
" bzr help topics list all help topics\n"
7553
msgstr ""
7554
7555
#: dummy/help_topics/basic/summary.txt:1
7556
msgid "Basic commands"
7557
msgstr ""
7558
7559
#: dummy/help_topics/branches/detail.txt:1
7560
msgid "Branches"
7561
msgstr ""
7562
7563
#: dummy/help_topics/branches/detail.txt:3
7564
msgid ""
7565
"A branch consists of the state of a project, including all of its\n"
7566
"history. All branches have a repository associated (which is where the\n"
7567
"branch history is stored), but multiple branches may share the same\n"
7568
"repository (a shared repository). Branches can be copied and merged."
7569
msgstr ""
7570
7571
#: dummy/help_topics/branches/detail.txt:8
7572
msgid ""
7573
"In addition, one branch may be bound to another one. Binding to another\n"
7574
"branch indicates that commits which happen in this branch must also \n"
7575
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7576
"commits when the two branches are out of date. In order for a commit \n"
7577
"to succeed, it may be necessary to update the current branch using \n"
7578
"``bzr update``."
7579
msgstr ""
7580
7581
#: dummy/help_topics/branches/detail.txt:15
7582
#: dummy/help_topics/checkouts/detail.txt:66
7583
#: dummy/help_topics/repositories/detail.txt:36
7584
msgid "Related commands::"
7585
msgstr ""
7586
7587
#: dummy/help_topics/branches/detail.txt:17
7588
msgid ""
7589
" init Change a directory into a versioned branch.\n"
7590
" branch Create a new branch that is a copy of an existing branch.\n"
7591
" merge Perform a three-way merge.\n"
7592
" bind Bind a branch to another one.\n"
7593
msgstr ""
7594
7595
#: dummy/help_topics/branches/summary.txt:1
7596
msgid "Information on what a branch is"
7597
msgstr ""
7598
7599
#: dummy/help_topics/bugs/summary.txt:1
7600
msgid "Bug tracker settings"
7601
msgstr ""
7602
7603
#: dummy/help_topics/checkouts/detail.txt:1
7604
msgid "Checkouts"
7605
msgstr ""
7606
7607
#: dummy/help_topics/checkouts/detail.txt:3
7608
msgid ""
7609
"Checkouts are source trees that are connected to a branch, so that when\n"
7610
"you commit in the source tree, the commit goes into that branch. They\n"
7611
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7612
"Bazaar's decentralized features until you want them. Using checkouts\n"
7613
"with shared repositories is very similar to working with SVN or CVS, but\n"
7614
"doesn't have the same restrictions. And using checkouts still allows\n"
7615
"others working on the project to use whatever workflow they like."
7616
msgstr ""
7617
7618
#: dummy/help_topics/checkouts/detail.txt:11
7619
msgid ""
7620
"A checkout is created with the bzr checkout command (see \"help "
7621
"checkout\").\n"
7622
"You pass it a reference to another branch, and it will create a local copy\n"
7623
"for you that still contains a reference to the branch you created the\n"
7624
"checkout from (the master branch). Then if you make any commits they will "
7625
"be\n"
7626
"made on the other branch first. This creates an instant mirror of your work, "
7627
"or\n"
7628
"facilitates lockstep development, where each developer is working together,\n"
7629
"continuously integrating the changes of others."
7630
msgstr ""
7631
7632
#: dummy/help_topics/checkouts/detail.txt:19
7633
msgid ""
7634
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7635
"you have the full history locally. As you have a first class branch you "
7636
"can\n"
7637
"also commit locally if you want, for instance due to the temporary loss af "
7638
"a\n"
7639
"network connection. Use the --local option to commit to do this. All the "
7640
"local\n"
7641
"commits will then be made on the master branch the next time you do a non-"
7642
"local\n"
7643
"commit."
7644
msgstr ""
7645
7646
#: dummy/help_topics/checkouts/detail.txt:26
7647
msgid ""
7648
"If you are using a checkout from a shared branch you will periodically want "
7649
"to\n"
7650
"pull in all the changes made by others. This is done using the \"update\"\n"
7651
"command. The changes need to be applied before any non-local commit, but\n"
7652
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7653
"command when needed."
7654
msgstr ""
7655
7656
#: dummy/help_topics/checkouts/detail.txt:32
7657
msgid ""
7658
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7659
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7660
"SVN checkout in that it is not a first class branch, it mainly consists of "
7661
"the\n"
7662
"working tree. This means that any history operations must query the master\n"
7663
"branch, which could be slow if a network connection is involved. Also, as "
7664
"you\n"
7665
"don't have a local branch, then you cannot commit locally."
7666
msgstr ""
7667
7668
#: dummy/help_topics/checkouts/detail.txt:39
7669
msgid ""
7670
"Lightweight checkouts work best when you have fast reliable access to the\n"
7671
"master branch. This means that if the master branch is on the same disk or "
7672
"LAN\n"
7673
"a lightweight checkout will be faster than a heavyweight one for any "
7674
"commands\n"
7675
"that modify the revision history (as only one copy of the branch needs to\n"
7676
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7677
"that uses the history but does not change it, but if the master branch is "
7678
"on\n"
7679
"the same disk then there won't be a noticeable difference."
7680
msgstr ""
7681
7682
#: dummy/help_topics/checkouts/detail.txt:47
7683
msgid ""
7684
"Another possible use for a checkout is to use it with a treeless repository\n"
7685
"containing your branches, where you maintain only one working tree by\n"
7686
"switching the master branch that the checkout points to when you want to\n"
7687
"work on a different branch."
7688
msgstr ""
7689
7690
#: dummy/help_topics/checkouts/detail.txt:52
7691
msgid ""
7692
"Obviously to commit on a checkout you need to be able to write to the "
7693
"master\n"
7694
"branch. This means that the master branch must be accessible over a "
7695
"writeable\n"
7696
"protocol , such as sftp://, and that you have write permissions at the "
7697
"other\n"
7698
"end. Checkouts also work on the local file system, so that all that matters "
7699
"is\n"
7700
"file permissions."
7701
msgstr ""
7702
7703
#: dummy/help_topics/checkouts/detail.txt:58
7704
msgid ""
7705
"You can change the master of a checkout by using the \"switch\" command "
7706
"(see\n"
7707
"\"help switch\"). This will change the location that the commits are sent "
7708
"to.\n"
7709
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7710
"checkout. If you would like to convert your heavy checkout into a normal\n"
7711
"branch so that every commit is local, you can use the \"unbind\" command. To "
7712
"see\n"
7713
"whether or not a branch is bound or not you can use the \"info\" command. If "
7714
"the\n"
7715
"branch is bound it will tell you the location of the bound branch."
7716
msgstr ""
7717
7718
#: dummy/help_topics/checkouts/detail.txt:68
7719
msgid ""
7720
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7721
" checkout\n"
7722
" update Pull any changes in the master branch in to your checkout\n"
7723
" commit Make a commit that is sent to the master branch. If you have\n"
7724
" a heavy checkout then the --local option will commit to the\n"
7725
" checkout without sending the commit to the master\n"
7726
" switch Change the master branch that the commits in the checkout "
7727
"will\n"
7728
" be sent to\n"
7729
" bind Turn a standalone branch into a heavy checkout so that any\n"
7730
" commits will be sent to the master branch\n"
7731
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7732
" commits are only made locally\n"
7733
" info Displays whether a branch is bound or unbound. If the branch "
7734
"is\n"
7735
" bound, then it will also display the location of the bound "
7736
"branch\n"
7737
msgstr ""
7738
7739
#: dummy/help_topics/checkouts/summary.txt:1
7740
msgid "Information on what a checkout is"
7741
msgstr ""
7742
7743
#: dummy/help_topics/commands/summary.txt:1
7744
msgid "Basic help for all commands"
7745
msgstr ""
7746
7747
#: dummy/help_topics/configuration/summary.txt:1
7748
msgid "Details on the configuration settings available"
7749
msgstr ""
7750
7751
#: dummy/help_topics/conflict-types/summary.txt:1
7752
msgid "Types of conflicts and what to do about them"
7753
msgstr ""
7754
7755
#: dummy/help_topics/content-filters/summary.txt:1
7756
msgid "Conversion of content into/from working trees"
7757
msgstr ""
7758
7759
#: dummy/help_topics/criss-cross/detail.txt:1
7760
msgid "Criss-Cross"
7761
msgstr ""
7762
7763
#: dummy/help_topics/criss-cross/detail.txt:3
7764
msgid ""
7765
"A criss-cross in the branch history can cause the default merge technique\n"
7766
"to emit more conflicts than would normally be expected."
7767
msgstr ""
7768
7769
#: dummy/help_topics/criss-cross/detail.txt:6
7770
msgid ""
7771
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7772
"give\n"
7773
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7774
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7775
msgstr ""
7776
7777
#: dummy/help_topics/criss-cross/detail.txt:10
7778
msgid ""
7779
"Criss-crosses occur in a branch's history if two branches merge the same "
7780
"thing\n"
7781
"and then merge one another, or if two branches merge one another at the "
7782
"same\n"
7783
"time. They can be avoided by having each branch only merge from or into a\n"
7784
"designated central branch (a \"star topology\")."
7785
msgstr ""
7786
7787
#: dummy/help_topics/criss-cross/detail.txt:15
7788
msgid ""
7789
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7790
"default\n"
7791
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7792
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7793
"differences between THIS and OTHER are due to one side adding lines, or\n"
7794
"from another side removing lines."
7795
msgstr ""
7796
7797
#: dummy/help_topics/criss-cross/detail.txt:21
7798
msgid ""
7799
"Criss-crosses mean there is no good choice for a base. Selecting the "
7800
"recent\n"
7801
"merge points could cause one side's changes to be silently discarded.\n"
7802
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7803
"are emitted."
7804
msgstr ""
7805
7806
#: dummy/help_topics/criss-cross/detail.txt:26
7807
msgid ""
7808
"The ``weave`` merge type is not affected by this problem because it uses\n"
7809
"line-origin detection instead of a basis revision to determine the cause of\n"
7810
"differences.\n"
7811
msgstr ""
7812
7813
#: dummy/help_topics/criss-cross/summary.txt:1
7814
msgid "Information on criss-cross merging"
7815
msgstr ""
7816
7817
#: dummy/help_topics/current-formats/summary.txt:1
7818
msgid "Current storage formats"
7819
msgstr ""
7820
7821
#: dummy/help_topics/debug-flags/summary.txt:1
7822
msgid "Options to show or record debug information"
7823
msgstr ""
7824
7825
#: dummy/help_topics/diverged-branches/summary.txt:1
7826
msgid "How to fix diverged branches"
7827
msgstr ""
7828
7829
#: dummy/help_topics/env-variables/summary.txt:1
7830
msgid "Environment variable names and values"
7831
msgstr ""
7832
7833
#: dummy/help_topics/eol/summary.txt:1
7834
msgid "Information on end-of-line handling"
7835
msgstr ""
7836
7837
#: dummy/help_topics/files/detail.txt:1
7838
msgid "Files"
7839
msgstr ""
7840
7841
#: dummy/help_topics/files/detail.txt:3
7842
msgid ""
7843
":On Unix: ~/.bazaar/bazaar.conf\n"
7844
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7845
"bazaar\\\\2.0\\\\bazaar.conf"
7846
msgstr ""
7847
7848
#: dummy/help_topics/files/detail.txt:6
7849
msgid ""
7850
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7851
"used to define general configuration that will be applied everywhere.\n"
7852
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7853
"commonly used options."
7854
msgstr ""
7855
7856
#: dummy/help_topics/files/detail.txt:11
7857
msgid "A typical config file might look something like::"
7858
msgstr ""
7859
7860
#: dummy/help_topics/files/detail.txt:13
7861
msgid ""
7862
" [DEFAULT]\n"
7863
" email=John Doe <jdoe@isp.com>"
7864
msgstr ""
7865
7866
#: dummy/help_topics/files/detail.txt:16
7867
msgid ""
7868
" [ALIASES]\n"
7869
" commit = commit --strict\n"
7870
" log10 = log --short -r -10..-1\n"
7871
msgstr ""
7872
7873
#: dummy/help_topics/files/summary.txt:1
7874
msgid "Information on configuration and log files"
7875
msgstr ""
7876
7877
#: dummy/help_topics/formats/detail.txt:1
7878
msgid "Storage Formats"
7879
msgstr ""
7880
7881
#: dummy/help_topics/formats/detail.txt:3
7882
msgid ""
7883
"To ensure that older clients do not access data incorrectly,\n"
7884
"Bazaar's policy is to introduce a new storage format whenever\n"
7885
"new features requiring new metadata are added. New storage\n"
7886
"formats may also be introduced to improve performance and\n"
7887
"scalability."
7888
msgstr ""
7889
7890
#: dummy/help_topics/formats/detail.txt:9
7891
msgid ""
7892
"The newest format, 2a, is highly recommended. If your\n"
7893
"project is not using 2a, then you should suggest to the\n"
7894
"project owner to upgrade."
7895
msgstr ""
7896
7897
#: dummy/help_topics/formats/detail.txt:13
7898
msgid ""
7899
"\n"
7900
".. note::"
7901
msgstr ""
7902
7903
#: dummy/help_topics/formats/detail.txt:16
7904
msgid ""
7905
" Some of the older formats have two variants:\n"
7906
" a plain one and a rich-root one. The latter include an additional\n"
7907
" field about the root of the tree. There is no performance cost\n"
7908
" for using a rich-root format but you cannot easily merge changes\n"
7909
" from a rich-root format into a plain format. As a consequence,\n"
7910
" moving a project to a rich-root format takes some co-ordination\n"
7911
" in that all contributors need to upgrade their repositories\n"
7912
" around the same time. 2a and all future formats will be\n"
7913
" implicitly rich-root."
7914
msgstr ""
7915
7916
#: dummy/help_topics/formats/detail.txt:26
7917
msgid ""
7918
"See :doc:`current-formats-help` for the complete list of\n"
7919
"currently supported formats. See :doc:`other-formats-help` for\n"
7920
"descriptions of any available experimental and deprecated formats.\n"
7921
msgstr ""
7922
7923
#: dummy/help_topics/formats/summary.txt:1
7924
msgid "Information on choosing a storage format"
7925
msgstr ""
7926
7927
#: dummy/help_topics/global-options/detail.txt:1
7928
msgid "Global Options"
7929
msgstr ""
7930
7931
#: dummy/help_topics/global-options/detail.txt:3
7932
msgid ""
7933
"These options may be used with any command, and may appear in front of any\n"
7934
"command. (e.g. ``bzr --profile help``)."
7935
msgstr ""
7936
7937
#: dummy/help_topics/global-options/detail.txt:6
7938
msgid ""
7939
"--version Print the version number. Must be supplied before the "
7940
"command.\n"
7941
"--no-aliases Do not process command aliases when running this command.\n"
7942
"--builtin Use the built-in version of a command, not the plugin "
7943
"version.\n"
7944
" This does not suppress other plugin effects.\n"
7945
"--no-plugins Do not process any plugins.\n"
7946
"--no-l10n Do not translate messages.\n"
7947
"--concurrency Number of processes that can be run concurrently (selftest)."
7948
msgstr ""
7949
7950
#: dummy/help_topics/global-options/detail.txt:14
7951
msgid ""
7952
"--profile Profile execution using the hotshot profiler.\n"
7953
"--lsprof Profile execution using the lsprof profiler.\n"
7954
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7955
" results to a specified file. If the filename ends with "
7956
"\".txt\",\n"
7957
" text format will be used. If the filename either starts "
7958
"with\n"
7959
" \"callgrind.out\" or end with \".callgrind\", the output will "
7960
"be\n"
7961
" formatted for use with KCacheGrind. Otherwise, the output\n"
7962
" will be a pickle.\n"
7963
"--coverage Generate line coverage report in the specified directory."
7964
msgstr ""
7965
7966
#: dummy/help_topics/global-options/detail.txt:24
7967
msgid ""
7968
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7969
"for\n"
7970
" the duration of the command. This can be used multiple times "
7971
"if\n"
7972
" several options need to be overridden."
7973
msgstr ""
7974
7975
#: dummy/help_topics/global-options/detail.txt:28
7976
msgid ""
7977
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7978
"information on profiling."
7979
msgstr ""
7980
7981
#: dummy/help_topics/global-options/detail.txt:31
7982
msgid ""
7983
"A number of debug flags are also available to assist troubleshooting and\n"
7984
"development. See :doc:`debug-flags-help`.\n"
7985
msgstr ""
7986
7987
#: dummy/help_topics/global-options/summary.txt:1
7988
msgid "Options that control how Bazaar runs"
7989
msgstr ""
7990
7991
#: dummy/help_topics/hidden-commands/summary.txt:1
7992
msgid "All hidden commands"
7993
msgstr ""
7994
7995
#: dummy/help_topics/hooks/summary.txt:1
7996
msgid "Points at which custom processing can be added"
7997
msgstr ""
7998
7999
#: dummy/help_topics/launchpad/detail.txt:1
8000
msgid "Integration with Launchpad.net"
8001
msgstr ""
8002
8003
#: dummy/help_topics/launchpad/detail.txt:3
8004
msgid ""
8005
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8006
"specification tracking."
8007
msgstr ""
8008
8009
#: dummy/help_topics/launchpad/detail.txt:6
8010
msgid ""
8011
"The bzr client (through the plugin called 'launchpad') has special\n"
8012
"features to communicate with Launchpad:"
8013
msgstr ""
8014
8015
#: dummy/help_topics/launchpad/detail.txt:9
8016
msgid ""
8017
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8018
"This\n"
8019
" is then used by the 'lp:' transport to download your branches using\n"
8020
" bzr+ssh://."
8021
msgstr ""
8022
8023
#: dummy/help_topics/launchpad/detail.txt:13
8024
msgid ""
8025
" * The 'lp:' transport uses Launchpad as a directory service: for "
8026
"example\n"
8027
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8028
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8029
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8030
msgstr ""
8031
8032
#: dummy/help_topics/launchpad/detail.txt:18
8033
msgid ""
8034
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8035
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8036
"lp:12345'\n"
8037
" will record a revision property that marks that revision as fixing\n"
8038
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8039
" automatically be linked to the bug report."
8040
msgstr ""
8041
8042
#: dummy/help_topics/launchpad/detail.txt:24
8043
msgid ""
8044
" * The register-branch command tells Launchpad about the url of a\n"
8045
" public branch. Launchpad will then mirror the branch, display\n"
8046
" its contents and allow it to be attached to bugs and other\n"
8047
" objects."
8048
msgstr ""
8049
8050
#: dummy/help_topics/launchpad/detail.txt:29
8051
msgid "For more information see http://help.launchpad.net/\n"
8052
msgstr ""
8053
8054
#: dummy/help_topics/launchpad/summary.txt:1
8055
msgid "Using Bazaar with Launchpad.net"
8056
msgstr ""
8057
8058
#: dummy/help_topics/location-alias/summary.txt:1
8059
msgid "Aliases for remembered locations"
8060
msgstr ""
8061
8062
#: dummy/help_topics/log-formats/summary.txt:1
8063
msgid "Details on the logging formats available"
8064
msgstr ""
8065
8066
#: dummy/help_topics/other-formats/summary.txt:1
8067
msgid "Experimental and deprecated storage formats"
8068
msgstr ""
8069
8070
#: dummy/help_topics/patterns/summary.txt:1
8071
msgid "Information on the pattern syntax"
8072
msgstr ""
8073
8074
#: dummy/help_topics/repositories/detail.txt:1
8075
msgid "Repositories"
8076
msgstr ""
8077
8078
#: dummy/help_topics/repositories/detail.txt:3
8079
msgid ""
8080
"Repositories in Bazaar are where committed information is stored. There is\n"
8081
"a repository associated with every branch."
8082
msgstr ""
8083
8084
#: dummy/help_topics/repositories/detail.txt:6
8085
msgid ""
8086
"Repositories are a form of database. Bzr will usually maintain this for\n"
8087
"good performance automatically, but in some situations (e.g. when doing\n"
8088
"very many commits in a short time period) you may want to ask bzr to\n"
8089
"optimise the database indices. This can be done by the 'bzr pack' command."
8090
msgstr ""
8091
8092
#: dummy/help_topics/repositories/detail.txt:11
8093
msgid ""
8094
"By default just running 'bzr init' will create a repository within the new\n"
8095
"branch but it is possible to create a shared repository which allows "
8096
"multiple\n"
8097
"branches to share their information in the same location. When a new branch "
8098
"is\n"
8099
"created it will first look to see if there is a containing shared repository "
8100
"it\n"
8101
"can use."
8102
msgstr ""
8103
8104
#: dummy/help_topics/repositories/detail.txt:17
8105
msgid ""
8106
"When two branches of the same project share a repository, there is\n"
8107
"generally a large space saving. For some operations (e.g. branching\n"
8108
"within the repository) this translates in to a large time saving."
8109
msgstr ""
8110
8111
#: dummy/help_topics/repositories/detail.txt:21
8112
msgid ""
8113
"To create a shared repository use the init-repository command (or the alias\n"
8114
"init-repo). This command takes the location of the repository to create. "
8115
"This\n"
8116
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8117
"which contains a shared repository. Any new branches that are created in "
8118
"this\n"
8119
"directory will then use it for storage."
8120
msgstr ""
8121
8122
#: dummy/help_topics/repositories/detail.txt:27
8123
msgid ""
8124
"It is a good idea to create a repository whenever you might create more\n"
8125
"than one branch of a project. This is true for both working areas where you\n"
8126
"are doing the development, and any server areas that you use for hosting\n"
8127
"projects. In the latter case, it is common to want branches without working\n"
8128
"trees. Since the files in the branch will not be edited directly there is "
8129
"no\n"
8130
"need to use up disk space for a working tree. To create a repository in "
8131
"which\n"
8132
"the branches will not have working trees pass the '--no-trees' option to\n"
8133
"'init-repository'."
8134
msgstr ""
8135
8136
#: dummy/help_topics/repositories/detail.txt:38
8137
msgid ""
8138
" init-repository Create a shared repository. Use --no-trees to create "
8139
"one\n"
8140
" in which new branches won't get a working tree.\n"
8141
msgstr ""
8142
8143
#: dummy/help_topics/repositories/summary.txt:1
8144
msgid "Basic information on shared repositories."
8145
msgstr ""
8146
8147
#: dummy/help_topics/revisionspec/summary.txt:1
8148
msgid "Explain how to use --revision"
8149
msgstr ""
8150
8151
#: dummy/help_topics/rules/summary.txt:1
8152
msgid "Information on defining rule-based preferences"
8153
msgstr ""
8154
8155
#: dummy/help_topics/standalone-trees/detail.txt:1
8156
msgid "Standalone Trees"
8157
msgstr ""
8158
8159
#: dummy/help_topics/standalone-trees/detail.txt:3
8160
msgid ""
8161
"A standalone tree is a working tree with an associated repository. It\n"
8162
"is an independently usable branch, with no dependencies on any other.\n"
8163
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8164
"an existing project under version control."
8165
msgstr ""
8166
8167
#: dummy/help_topics/standalone-trees/detail.txt:8
8168
msgid "Related Commands::"
8169
msgstr ""
8170
8171
#: dummy/help_topics/standalone-trees/detail.txt:10
8172
msgid " init Make a directory into a versioned branch.\n"
8173
msgstr ""
8174
8175
#: dummy/help_topics/standalone-trees/summary.txt:1
8176
msgid "Information on what a standalone tree is"
8177
msgstr ""
8178
8179
#: dummy/help_topics/standard-options/detail.txt:1
8180
msgid "Standard Options"
8181
msgstr ""
8182
8183
#: dummy/help_topics/standard-options/detail.txt:3
8184
msgid "Standard options are legal for all commands."
8185
msgstr ""
8186
8187
#: dummy/help_topics/standard-options/detail.txt:5
8188
msgid ""
8189
"--help, -h Show help message.\n"
8190
"--verbose, -v Display more information.\n"
8191
"--quiet, -q Only display errors and warnings."
8192
msgstr ""
8193
8194
#: dummy/help_topics/standard-options/detail.txt:9
8195
msgid "Unlike global options, standard options can be used in aliases.\n"
8196
msgstr ""
8197
8198
#: dummy/help_topics/standard-options/summary.txt:1
8199
msgid "Options that can be used with any command"
8200
msgstr ""
8201
8202
#: dummy/help_topics/status-flags/detail.txt:1
8203
msgid "Status Flags"
8204
msgstr ""
8205
8206
#: dummy/help_topics/status-flags/detail.txt:3
8207
msgid ""
8208
"Status flags are used to summarise changes to the working tree in a concise\n"
8209
"manner. They are in the form::"
8210
msgstr ""
8211
8212
#: dummy/help_topics/status-flags/detail.txt:6
8213
msgid " xxx <filename>"
8214
msgstr ""
8215
8216
#: dummy/help_topics/status-flags/detail.txt:8
8217
msgid "where the columns' meanings are as follows."
8218
msgstr ""
8219
8220
#: dummy/help_topics/status-flags/detail.txt:10
8221
msgid "Column 1 - versioning/renames::"
8222
msgstr ""
8223
8224
#: dummy/help_topics/status-flags/detail.txt:12
8225
msgid ""
8226
" + File versioned\n"
8227
" - File unversioned\n"
8228
" R File renamed\n"
8229
" ? File unknown\n"
8230
" X File nonexistent (and unknown to bzr)\n"
8231
" C File has conflicts\n"
8232
" P Entry for a pending merge (not a file)"
8233
msgstr ""
8234
8235
#: dummy/help_topics/status-flags/detail.txt:20
8236
msgid "Column 2 - contents::"
8237
msgstr ""
8238
8239
#: dummy/help_topics/status-flags/detail.txt:22
8240
msgid ""
8241
" N File created\n"
8242
" D File deleted\n"
8243
" K File kind changed\n"
8244
" M File modified"
8245
msgstr ""
8246
8247
#: dummy/help_topics/status-flags/detail.txt:27
8248
msgid "Column 3 - execute::"
8249
msgstr ""
8250
8251
#: dummy/help_topics/status-flags/detail.txt:29
8252
msgid " * The execute bit was changed\n"
8253
msgstr ""
8254
8255
#: dummy/help_topics/status-flags/summary.txt:1
8256
msgid "Help on status flags"
8257
msgstr ""
8258
8259
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8260
msgid "Branches Out of Sync"
8261
msgstr ""
8262
8263
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8264
msgid ""
8265
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8266
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8267
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8268
"have the same last revision as the new reference branch for the lightweight\n"
8269
"checkout, data could be lost, so Bazaar refuses."
8270
msgstr ""
8271
8272
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8273
msgid "How you deal with this depends on *why* the branches are out of sync."
8274
msgstr ""
8275
8276
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8277
msgid ""
8278
"If you have a checkout and have done local commits, you can get back in "
8279
"sync\n"
8280
"by running \"bzr update\" (and possibly \"bzr commit\")."
8281
msgstr ""
8282
8283
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8284
msgid ""
8285
"If you have a branch and the remote branch is out-of-date, you can push\n"
8286
"the local changes using \"bzr push\". If the local branch is out of date, "
8287
"you\n"
8288
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8289
"commit\n"
8290
"and then push your changes. If you decide that some of the changes aren't\n"
8291
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8292
msgstr ""
8293
8294
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8295
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8296
msgstr ""
8297
8298
#: dummy/help_topics/topics/summary.txt:1
8299
msgid "Topics list"
8300
msgstr ""
8301
8302
#: dummy/help_topics/url-special-chars/summary.txt:1
8303
msgid "Special character handling in URLs"
8304
msgstr ""
8305
8306
#: dummy/help_topics/urlspec/summary.txt:1
8307
msgid "Supported transport protocols"
8308
msgstr ""
8309
8310
#: dummy/help_topics/working-trees/detail.txt:1
8311
msgid "Working Trees"
8312
msgstr ""
8313
8314
#: dummy/help_topics/working-trees/detail.txt:3
8315
msgid ""
8316
"A working tree is the contents of a branch placed on disk so that you can\n"
8317
"see the files and edit them. The working tree is where you make changes to "
8318
"a\n"
8319
"branch, and when you commit the current state of the working tree is the\n"
8320
"snapshot that is recorded in the commit."
8321
msgstr ""
8322
8323
#: dummy/help_topics/working-trees/detail.txt:8
8324
msgid ""
8325
"When you push a branch to a remote system, a working tree will not be\n"
8326
"created. If one is already present the files will not be updated. The\n"
8327
"branch information will be updated and the working tree will be marked\n"
8328
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8329
"may be uncommitted changes or the update may cause content conflicts that "
8330
"are\n"
8331
"difficult to deal with remotely."
8332
msgstr ""
8333
8334
#: dummy/help_topics/working-trees/detail.txt:15
8335
msgid ""
8336
"If you have a branch with no working tree you can use the 'checkout' "
8337
"command\n"
8338
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8339
"will\n"
8340
"create the working tree. If the branch is updated remotely, you can update "
8341
"the\n"
8342
"working tree by running 'bzr update' in that directory."
8343
msgstr ""
8344
8345
#: dummy/help_topics/working-trees/detail.txt:20
8346
msgid ""
8347
"If you have a branch with a working tree that you do not want the 'remove-"
8348
"tree'\n"
8349
"command will remove the tree if it is safe. This can be done to avoid the\n"
8350
"warning about the remote working tree not being updated when pushing to the\n"
8351
"branch. It can also be useful when working with a '--no-trees' repository\n"
8352
"(see 'bzr help repositories')."
8353
msgstr ""
8354
8355
#: dummy/help_topics/working-trees/detail.txt:26
8356
msgid ""
8357
"If you want to have a working tree on a remote machine that you push to you\n"
8358
"can either run 'bzr update' in the remote branch after each push, or use "
8359
"some\n"
8360
"other method to update the tree during the push. There is an 'rspush' "
8361
"plugin\n"
8362
"that will update the working tree using rsync as well as doing a push. "
8363
"There\n"
8364
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8365
"SSH\n"
8366
"after each push."
8367
msgstr ""
8368
8369
#: dummy/help_topics/working-trees/detail.txt:33
8370
msgid "Useful commands::"
8371
msgstr ""
8372
8373
#: dummy/help_topics/working-trees/detail.txt:35
8374
msgid ""
8375
" checkout Create a working tree when a branch does not have one.\n"
8376
" remove-tree Removes the working tree from a branch when it is safe to do "
8377
"so.\n"
8378
" update When a working tree is out of sync with its associated "
8379
"branch\n"
8380
" this will update the tree to match the branch.\n"
8381
msgstr ""
8382
8383
#: dummy/help_topics/working-trees/summary.txt:1
8384
msgid "Information on working trees"
8385
msgstr ""
8386
8387
#: en/help_topics/authentication.txt:1
8388
msgid ""
8389
"Authentication Settings\n"
8390
"======================="
8391
msgstr ""
8392
8393
#: en/help_topics/authentication.txt:4
8394
msgid ""
8395
"\n"
8396
"Intent\n"
8397
"------"
8398
msgstr ""
8399
8400
#: en/help_topics/authentication.txt:8
8401
msgid ""
8402
"Many different authentication policies can be described in the\n"
8403
"``authentication.conf`` file but a particular user should need only a few\n"
8404
"definitions to cover his needs without having to specify a user and a "
8405
"password\n"
8406
"for every branch he uses."
8407
msgstr ""
8408
8409
#: en/help_topics/authentication.txt:13
8410
msgid ""
8411
"The definitions found in this file are used to find the credentials to use "
8412
"for\n"
8413
"a given url. The same credentials can generally be used for as many branches "
8414
"as\n"
8415
"possible by grouping their declaration around the remote servers that need\n"
8416
"them. It's even possible to declare credentials that will be used by "
8417
"different\n"
8418
"servers."
8419
msgstr ""
8420
8421
#: en/help_topics/authentication.txt:19
8422
msgid ""
8423
"The intent is to make this file as small as possible to minimize maintenance."
8424
msgstr ""
8425
8426
#: en/help_topics/authentication.txt:21
8427
msgid ""
8428
"Once the relevant credentials are declared in this file you may use branch "
8429
"urls\n"
8430
"without embedding passwords (security hazard) or even users (enabling "
8431
"sharing\n"
8432
"of your urls with others)."
8433
msgstr ""
8434
8435
#: en/help_topics/authentication.txt:25
8436
msgid "Instead of using::"
8437
msgstr ""
8438
8439
#: en/help_topics/authentication.txt:27
8440
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8441
msgstr ""
8442
8443
#: en/help_topics/authentication.txt:29
8444
msgid "you simply use::"
8445
msgstr ""
8446
8447
#: en/help_topics/authentication.txt:31
8448
msgid " bzr branch ftp://host.com/path/to/my/branch"
8449
msgstr ""
8450
8451
#: en/help_topics/authentication.txt:33
8452
msgid ""
8453
"provided you have created the following ``authentication.conf`` file::"
8454
msgstr ""
8455
8456
#: en/help_topics/authentication.txt:35
8457
msgid ""
8458
" [myprojects]\n"
8459
" scheme=ftp\n"
8460
" host=host.com\n"
8461
" user=joe\n"
8462
" password=secret\n"
8463
" "
8464
msgstr ""
8465
8466
#: en/help_topics/authentication.txt:42
8467
msgid ""
8468
"Authentication definitions\n"
8469
"--------------------------"
8470
msgstr ""
8471
8472
#: en/help_topics/authentication.txt:45
8473
msgid ""
8474
"There are two kinds of authentication used by the various schemes supported "
8475
"by\n"
8476
"bzr:"
8477
msgstr ""
8478
8479
#: en/help_topics/authentication.txt:48
8480
msgid "1. user and password"
8481
msgstr ""
8482
8483
#: en/help_topics/authentication.txt:50
8484
msgid ""
8485
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8486
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8487
"ssh agents are a better, more secure solution. So we have chosen to not "
8488
"provide\n"
8489
"our own less secure method."
8490
msgstr ""
8491
8492
#: en/help_topics/authentication.txt:55
8493
msgid "2. user, realm and password"
8494
msgstr ""
8495
8496
#: en/help_topics/authentication.txt:57
8497
msgid ""
8498
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8499
"against a host. But, by using ``.htaccess`` files, for example, it is "
8500
"possible\n"
8501
"to define several (``user, realm, password``) for a given ``host``. So what "
8502
"is\n"
8503
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8504
"is\n"
8505
"not taken into account in the definitions, but will displayed if bzr "
8506
"prompts\n"
8507
"you for a password."
8508
msgstr ""
8509
8510
#: en/help_topics/authentication.txt:64
8511
msgid ""
8512
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8513
"specifying the appropriate port."
8514
msgstr ""
8515
8516
#: en/help_topics/authentication.txt:67
8517
msgid ""
8518
"To take all schemes into account, the password will be deduced from a set "
8519
"of\n"
8520
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8521
"``user``,\n"
8522
"``password``)."
8523
msgstr ""
8524
8525
#: en/help_topics/authentication.txt:71
8526
msgid ""
8527
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8528
"used\n"
8529
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8530
"``ssh``\n"
8531
" should be used instead since this is the real scheme regarding\n"
8532
" authentication,"
8533
msgstr ""
8534
8535
#: en/help_topics/authentication.txt:76
8536
msgid " * ``host``: can be empty (to act as a default for any host),"
8537
msgstr ""
8538
8539
#: en/help_topics/authentication.txt:78
8540
msgid ""
8541
" * ``port`` can be empty (useful when an host provides several servers for "
8542
"the\n"
8543
" same scheme), only numerical values are allowed, this should be used "
8544
"only\n"
8545
" when the server uses a port different than the scheme standard port,"
8546
msgstr ""
8547
8548
#: en/help_topics/authentication.txt:82
8549
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8550
msgstr ""
8551
8552
#: en/help_topics/authentication.txt:84
8553
msgid ""
8554
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8555
" ``getpass.get_user()``),"
8556
msgstr ""
8557
8558
#: en/help_topics/authentication.txt:87
8559
msgid ""
8560
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8561
" password."
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:90
8565
msgid ""
8566
"Multiple definitions can be provided and, for a given URL, bzr will select "
8567
"a\n"
8568
"(``user`` [, ``password``]) based on the following rules :"
8569
msgstr ""
8570
8571
#: en/help_topics/authentication.txt:93
8572
msgid " 1. the first match wins,"
8573
msgstr ""
8574
8575
#: en/help_topics/authentication.txt:95
8576
msgid " 2. empty fields match everything,"
8577
msgstr ""
8578
8579
#: en/help_topics/authentication.txt:97
8580
msgid ""
8581
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8582
msgstr ""
8583
8584
#: en/help_topics/authentication.txt:99
8585
msgid ""
8586
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8587
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8588
"``projectbzr.sf.net``\n"
8589
" will not match ``bzr.sf.net``)."
8590
msgstr ""
8591
8592
#: en/help_topics/authentication.txt:103
8593
msgid ""
8594
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8595
msgstr ""
8596
8597
#: en/help_topics/authentication.txt:105
8598
msgid ""
8599
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8600
"above,\n"
8601
" empty paths will match any provided path)."
8602
msgstr ""
8603
8604
#: en/help_topics/authentication.txt:110
8605
msgid ""
8606
"File format\n"
8607
"-----------"
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:113
8611
msgid ""
8612
"The general rules for :doc:`configuration files <configuration-help>`\n"
8613
"apply except for the variable policies."
8614
msgstr ""
8615
8616
#: en/help_topics/authentication.txt:116
8617
msgid "Each section describes an authentication definition."
8618
msgstr ""
8619
8620
#: en/help_topics/authentication.txt:118
8621
msgid ""
8622
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8623
"reserved\n"
8624
"and should appear as the *last* section."
8625
msgstr ""
8626
8627
#: en/help_topics/authentication.txt:121
8628
msgid "Each section should define:"
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:123
8632
msgid "* ``user``: the login to be used,"
8633
msgstr ""
8634
8635
#: en/help_topics/authentication.txt:125
8636
msgid "Each section could define:"
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:127
8640
msgid "* ``host``: the remote server,"
8641
msgstr ""
8642
8643
#: en/help_topics/authentication.txt:129
8644
msgid "* ``port``: the port the server is listening,"
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:131
8648
msgid "* ``path``: the branch location,"
8649
msgstr ""
8650
8651
#: en/help_topics/authentication.txt:133
8652
msgid "* ``password``: the password."
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:135
8656
msgid ""
8657
"\n"
8658
"Examples\n"
8659
"--------"
8660
msgstr ""
8661
8662
#: en/help_topics/authentication.txt:139
8663
msgid ""
8664
"\n"
8665
"Personal projects hosted outside\n"
8666
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8667
msgstr ""
8668
8669
#: en/help_topics/authentication.txt:143
8670
msgid ""
8671
"All connections are done with the same ``user`` (the remote one for which "
8672
"the\n"
8673
"default bzr one is not appropriate) and the password is always prompted "
8674
"with\n"
8675
"some exceptions::"
8676
msgstr ""
8677
8678
#: en/help_topics/authentication.txt:147
8679
msgid ""
8680
" # Pet projects on hobby.net\n"
8681
" [hobby]\n"
8682
" host=r.hobby.net\n"
8683
" user=jim\n"
8684
" password=obvious1234\n"
8685
" \n"
8686
" # Home server\n"
8687
" [home]\n"
8688
" scheme=https\n"
8689
" host=home.net\n"
8690
" user=joe\n"
8691
" password=1essobV10us\n"
8692
" \n"
8693
" [DEFAULT]\n"
8694
" # Our local user is barbaz, on all remote sites we're known as "
8695
"foobar\n"
8696
" user=foobar"
8697
msgstr ""
8698
8699
#: en/help_topics/authentication.txt:164
8700
msgid ""
8701
"\n"
8702
"Source hosting provider\n"
8703
"~~~~~~~~~~~~~~~~~~~~~~~"
8704
msgstr ""
8705
8706
#: en/help_topics/authentication.txt:168
8707
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8708
msgstr ""
8709
8710
#: en/help_topics/authentication.txt:170
8711
msgid ""
8712
" [shpnet domain]\n"
8713
" # we use sftp, but ssh is the scheme used for authentication\n"
8714
" scheme=ssh\n"
8715
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8716
" host=.shp.net\n"
8717
" user=joe\n"
8718
" # bzr don't support supplying a password for sftp,\n"
8719
" # consider using an ssh agent if you don't want to supply\n"
8720
" # a password interactively. (pageant, ssh-agent, etc)"
8721
msgstr ""
8722
8723
#: en/help_topics/authentication.txt:180
8724
msgid ""
8725
"HTTPS, SFTP servers and their proxy\n"
8726
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8727
msgstr ""
8728
8729
#: en/help_topics/authentication.txt:183
8730
msgid ""
8731
"At company.com, the server hosting release and integration branches is "
8732
"behind a\n"
8733
"proxy, and the two branches use different authentication policies::"
8734
msgstr ""
8735
8736
#: en/help_topics/authentication.txt:186
8737
msgid ""
8738
" [reference code]\n"
8739
" scheme=https\n"
8740
" host=dev.company.com\n"
8741
" path=/dev\n"
8742
" user=user1\n"
8743
" password=pass1"
8744
msgstr ""
8745
8746
#: en/help_topics/authentication.txt:193
8747
msgid ""
8748
" # development branches on dev server\n"
8749
" [dev]\n"
8750
" scheme=ssh # bzr+ssh and sftp are available here\n"
8751
" host=dev.company.com\n"
8752
" path=/dev/integration\n"
8753
" user=user2\n"
8754
" \n"
8755
" # proxy\n"
8756
" [proxy]\n"
8757
" scheme=http\n"
8758
" host=proxy.company.com\n"
8759
" port=3128\n"
8760
" user=proxyuser1\n"
8761
" password=proxypass1"
8762
msgstr ""
8763
8764
#: en/help_topics/authentication.txt:208
8765
msgid ""
8766
"\n"
8767
"Planned enhancements\n"
8768
"--------------------"
8769
msgstr ""
8770
8771
#: en/help_topics/authentication.txt:212
8772
msgid ""
8773
"The following are not yet implemented but planned as parts of a work in\n"
8774
"progress:"
8775
msgstr ""
8776
8777
#: en/help_topics/authentication.txt:215
8778
msgid "* add a ``password_encoding`` field allowing:"
8779
msgstr ""
8780
8781
#: en/help_topics/authentication.txt:217
8782
msgid ""
8783
" - storing the passwords in various obfuscating encodings (base64 for one),"
8784
msgstr ""
8785
8786
#: en/help_topics/authentication.txt:219
8787
msgid " - delegate password storage to plugins (.netrc for example)."
8788
msgstr ""
8789
8790
#: en/help_topics/authentication.txt:221
8791
msgid ""
8792
"* update the credentials when the user is prompted for user or password,"
8793
msgstr ""
8794
8795
#: en/help_topics/authentication.txt:223
8796
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8797
msgstr ""
8798
8799
#: en/help_topics/authentication.txt:225
8800
msgid ""
8801
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8802
"but\n"
8803
"ignored in the actual implementation.\n"
8804
msgstr ""
8805
8806
#: en/help_topics/bugs.txt:1
8807
msgid "Bug Tracker Settings"
8808
msgstr ""
8809
8810
#: en/help_topics/bugs.txt:3
8811
msgid ""
8812
"When making a commit, metadata about bugs fixed by that change can be\n"
8813
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8814
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8815
"(The only ``status`` value currently supported is ``fixed.``)"
8816
msgstr ""
8817
8818
#: en/help_topics/bugs.txt:8
8819
msgid ""
8820
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8821
"identifier\n"
8822
"rather than a full URL. This looks like::"
8823
msgstr ""
8824
8825
#: en/help_topics/bugs.txt:11
8826
msgid " bzr commit --fixes <tracker>:<id>"
8827
msgstr ""
8828
8829
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8830
msgid "or::"
8831
msgstr ""
8832
8833
#: en/help_topics/bugs.txt:15
8834
msgid " bzr commit --fixes <id>"
8835
msgstr ""
8836
8837
#: en/help_topics/bugs.txt:17
8838
msgid ""
8839
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8840
"the\n"
8841
"identifier for that bug within the bugtracker, usually the bug number.\n"
8842
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8843
"or global configuration is used."
8844
msgstr ""
8845
8846
#: en/help_topics/bugs.txt:22
8847
msgid ""
8848
"Bazaar knows about a few bug trackers that have many users. If\n"
8849
"you use one of these bug trackers then there is no setup required to\n"
8850
"use this feature, you just need to know the tracker identifier to use.\n"
8851
"These are the bugtrackers that are built in:"
8852
msgstr ""
8853
8854
#: en/help_topics/bugs.txt:27
8855
msgid ""
8856
" ============================ ============ ============\n"
8857
" URL Abbreviation Example\n"
8858
" ============================ ============ ============\n"
8859
" https://bugs.launchpad.net/ lp lp:12345\n"
8860
" http://bugs.debian.org/ deb deb:12345\n"
8861
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8862
" ============================ ============ ============"
8863
msgstr ""
8864
8865
#: en/help_topics/bugs.txt:35
8866
msgid ""
8867
"For the bug trackers not listed above configuration is required.\n"
8868
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8869
"is built in, along with a template mechanism for other bugtrackers with\n"
8870
"simple URL schemes. If your bug tracker can't be described by one\n"
8871
"of the schemes described below then you can write a plugin to support\n"
8872
"it."
8873
msgstr ""
8874
8875
#: en/help_topics/bugs.txt:42
8876
msgid ""
8877
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8878
"variable which contains the base URL of the bug tracker. These options\n"
8879
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8880
"configuration section in ``locations.conf``. You can set up these values\n"
8881
"for each of the projects you work on."
8882
msgstr ""
8883
8884
#: en/help_topics/bugs.txt:48
8885
msgid ""
8886
"Note: As you provide a short name for each tracker, you can specify one or\n"
8887
"more bugs in one or more trackers at commit time if you wish."
8888
msgstr ""
8889
8890
#: en/help_topics/bugs.txt:51
8891
msgid ""
8892
"Launchpad\n"
8893
"---------"
8894
msgstr ""
8895
8896
#: en/help_topics/bugs.txt:54
8897
msgid ""
8898
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8899
msgstr ""
8900
8901
#: en/help_topics/bugs.txt:56
8902
msgid ""
8903
"bugzilla_<tracker>_url\n"
8904
"----------------------"
8905
msgstr ""
8906
8907
#: en/help_topics/bugs.txt:59
8908
msgid ""
8909
"If present, the location of the Bugzilla bug tracker referred to by\n"
8910
"<tracker>. This option can then be used together with ``bzr commit\n"
8911
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8912
"example::"
8913
msgstr ""
8914
8915
#: en/help_topics/bugs.txt:64
8916
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8917
msgstr ""
8918
8919
#: en/help_topics/bugs.txt:66
8920
msgid ""
8921
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8922
"fixed."
8923
msgstr ""
8924
8925
#: en/help_topics/bugs.txt:69
8926
msgid ""
8927
"trac_<tracker>_url\n"
8928
"------------------"
8929
msgstr ""
8930
8931
#: en/help_topics/bugs.txt:72
8932
msgid ""
8933
"If present, the location of the Trac instance referred to by\n"
8934
"<tracker>. This option can then be used together with ``bzr commit\n"
8935
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8936
"example::"
8937
msgstr ""
8938
8939
#: en/help_topics/bugs.txt:77
8940
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:79
8944
msgid ""
8945
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8946
"as\n"
8947
"fixed."
8948
msgstr ""
8949
8950
#: en/help_topics/bugs.txt:82
8951
msgid ""
8952
"bugtracker_<tracker>_url\n"
8953
"------------------------"
8954
msgstr ""
8955
8956
#: en/help_topics/bugs.txt:85
8957
msgid ""
8958
"If present, the location of a generic bug tracker instance referred to by\n"
8959
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8960
"which will be replaced by a specific bug ID. This option can then be used\n"
8961
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8962
"fixed by that commit. For example::"
8963
msgstr ""
8964
8965
#: en/help_topics/bugs.txt:91
8966
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8967
msgstr ""
8968
8969
#: en/help_topics/bugs.txt:93
8970
msgid ""
8971
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8972
"Roundup bug tracker as fixed, or::"
8973
msgstr ""
8974
8975
#: en/help_topics/bugs.txt:96
8976
msgid ""
8977
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8978
msgstr ""
8979
8980
#: en/help_topics/bugs.txt:98
8981
msgid ""
8982
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8983
"RT bug tracker as fixed, or::"
8984
msgstr ""
8985
8986
#: en/help_topics/bugs.txt:101
8987
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8988
msgstr ""
8989
8990
#: en/help_topics/bugs.txt:103
8991
msgid ""
8992
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8993
"1234\n"
8994
"in Hudson's JIRA bug tracker as fixed.\n"
8995
msgstr ""
8996
8997
#: en/help_topics/commands.txt:1
8998
msgid ""
8999
"add Add specified files or directories.\n"
9000
"alias Set/unset and display aliases.\n"
9001
"annotate Show the origin of each line in a file.\n"
9002
"bash-completion Generate a shell function for bash command line "
9003
"completion.\n"
9004
" [bash_completion]\n"
9005
"bind Convert the current branch into a checkout of the "
9006
"supplied\n"
9007
" branch.\n"
9008
"branch Create a new branch that is a copy of an existing branch.\n"
9009
"branches List the branches available at the current location.\n"
9010
"break-lock Break a dead lock.\n"
9011
"cat Write the contents of a file as of a given revision to\n"
9012
" standard output.\n"
9013
"check Validate working tree structure, branch consistency and\n"
9014
" repository history.\n"
9015
"checkout Create a new checkout of an existing branch.\n"
9016
"clean-tree Remove unwanted files from working tree.\n"
9017
"commit Commit changes into a new revision.\n"
9018
"config Display, set or remove a configuration option.\n"
9019
"conflicts List files with conflicts.\n"
9020
"deleted List files deleted in the working tree.\n"
9021
"diff Show differences in the working tree, between revisions "
9022
"or\n"
9023
" branches.\n"
9024
"dpush Push into a different VCS without any custom bzr "
9025
"metadata.\n"
9026
"export Export current or past revision to a destination directory "
9027
"or\n"
9028
" archive.\n"
9029
"help Show help on a command or other topic.\n"
9030
"ignore Ignore specified files or patterns.\n"
9031
"ignored List ignored files and the patterns that matched them.\n"
9032
"info Show information about a working tree, branch or "
9033
"repository.\n"
9034
"init Make a directory into a versioned branch.\n"
9035
"init-repository Create a shared repository for branches to share storage\n"
9036
" space.\n"
9037
"join Combine a tree into its containing tree.\n"
9038
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9039
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9040
"launchpad-open Open a Launchpad branch page in your web browser. "
9041
"[launchpad]\n"
9042
"log Show historical log for a branch or subset of a branch.\n"
9043
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9044
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9045
"ls List files in a tree.\n"
9046
"merge Perform a three-way merge.\n"
9047
"missing Show unmerged/unpulled revisions between two branches.\n"
9048
"mkdir Create a new versioned directory.\n"
9049
"mv Move or rename a file.\n"
9050
"nick Print or set the branch nickname.\n"
9051
"pack Compress the data within a repository.\n"
9052
"plugins List the installed plugins.\n"
9053
"pull Turn this branch into a mirror of another branch.\n"
9054
"push Update a mirror of this branch.\n"
9055
"reconcile Reconcile bzr metadata in a branch.\n"
9056
"reconfigure Reconfigure the type of a bzr directory.\n"
9057
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9058
"remerge Redo a merge.\n"
9059
"remove Remove files or directories.\n"
9060
"remove-branch Remove a branch.\n"
9061
"remove-tree Remove the working tree from a given branch/checkout.\n"
9062
"renames Show list of renamed files.\n"
9063
"resolve Mark a conflict as resolved.\n"
9064
"revert Set files in the working tree back to the contents of a\n"
9065
" previous revision.\n"
9066
"revno Show current revision number.\n"
9067
"root Show the tree root directory.\n"
9068
"send Mail or create a merge-directive for submitting changes.\n"
9069
"serve Run the bzr server.\n"
9070
"shelve Temporarily set aside some changes from the current tree.\n"
9071
"sign-my-commits Sign all commits by a given committer.\n"
9072
"split Split a subdirectory of a tree into a separate tree.\n"
9073
"status Display status summary.\n"
9074
"switch Set the branch of a checkout and update.\n"
9075
"tag Create, remove or modify a tag naming a revision.\n"
9076
"tags List tags.\n"
9077
"testament Show testament (signing-form) of a revision.\n"
9078
"unbind Convert the current checkout into a regular branch.\n"
9079
"uncommit Remove the last committed revision.\n"
9080
"unshelve Restore shelved changes.\n"
9081
"update Update a working tree to a new revision.\n"
9082
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9083
" format.\n"
9084
"verify-signatures Verify all commit signatures.\n"
9085
"version Show version of bzr.\n"
9086
"version-info Show version information about this tree.\n"
9087
"view Manage filtered views.\n"
9088
"whoami Show or set bzr user id.\n"
9089
msgstr ""
9090
9091
#: en/help_topics/configuration.txt:1
9092
msgid ""
9093
"Configuration Settings\n"
9094
"======================="
9095
msgstr ""
9096
9097
#: en/help_topics/configuration.txt:4
9098
msgid ""
9099
"Environment settings\n"
9100
"---------------------"
9101
msgstr ""
9102
9103
#: en/help_topics/configuration.txt:7
9104
msgid ""
9105
"While most configuration is handled by configuration files, some options\n"
9106
"which may be semi-permanent can also be controlled through the environment."
9107
msgstr ""
9108
9109
#: en/help_topics/configuration.txt:10
9110
msgid ""
9111
"BZR_EMAIL\n"
9112
"~~~~~~~~~"
9113
msgstr ""
9114
9115
#: en/help_topics/configuration.txt:13
9116
msgid "Override the email id used by Bazaar. Typical format::"
9117
msgstr ""
9118
9119
#: en/help_topics/configuration.txt:15
9120
msgid " \"John Doe <jdoe@example.com>\""
9121
msgstr ""
9122
9123
#: en/help_topics/configuration.txt:17
9124
msgid "See also the ``email`` configuration option."
9125
msgstr ""
9126
9127
#: en/help_topics/configuration.txt:19
9128
msgid ""
9129
"BZR_PROGRESS_BAR\n"
9130
"~~~~~~~~~~~~~~~~"
9131
msgstr ""
9132
9133
#: en/help_topics/configuration.txt:22
9134
msgid ""
9135
"Override the progress display. Possible values are \"none\" or \"text\". "
9136
"If\n"
9137
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9138
"draws\n"
9139
"the ordinary command line progress bar."
9140
msgstr ""
9141
9142
#: en/help_topics/configuration.txt:26
9143
msgid ""
9144
"BZR_SIGQUIT_PDB\n"
9145
"~~~~~~~~~~~~~~~"
9146
msgstr ""
9147
9148
#: en/help_topics/configuration.txt:29
9149
msgid ""
9150
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9151
msgstr ""
9152
9153
#: en/help_topics/configuration.txt:31
9154
msgid ""
9155
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9156
"* 1 = Invoke breakin debugger (default)"
9157
msgstr ""
9158
9159
#: en/help_topics/configuration.txt:34
9160
msgid ""
9161
"BZR_HOME\n"
9162
"~~~~~~~~"
9163
msgstr ""
9164
9165
#: en/help_topics/configuration.txt:37
9166
msgid "Override the home directory used by Bazaar."
9167
msgstr ""
9168
9169
#: en/help_topics/configuration.txt:39
9170
msgid ""
9171
"BZR_SSH\n"
9172
"~~~~~~~"
9173
msgstr ""
9174
9175
#: en/help_topics/configuration.txt:42
9176
msgid "Select a different SSH implementation."
9177
msgstr ""
9178
9179
#: en/help_topics/configuration.txt:44
9180
msgid ""
9181
"BZR_PDB\n"
9182
"~~~~~~~"
9183
msgstr ""
9184
9185
#: en/help_topics/configuration.txt:47
9186
msgid "Control whether to launch a debugger on error."
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:49
9190
msgid ""
9191
"* 0 = Standard behavior\n"
9192
"* 1 = Launch debugger"
9193
msgstr ""
9194
9195
#: en/help_topics/configuration.txt:52
9196
msgid ""
9197
"BZR_REMOTE_PATH\n"
9198
"~~~~~~~~~~~~~~~"
9199
msgstr ""
9200
9201
#: en/help_topics/configuration.txt:55
9202
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9203
msgstr ""
9204
9205
#: en/help_topics/configuration.txt:57
9206
msgid "See also the ``bzr_remote_path`` configuration option."
9207
msgstr ""
9208
9209
#: en/help_topics/configuration.txt:59
9210
msgid ""
9211
"BZR_EDITOR\n"
9212
"~~~~~~~~~~"
9213
msgstr ""
9214
9215
#: en/help_topics/configuration.txt:62
9216
msgid "Path to the editor Bazaar should use for commit messages, etc."
9217
msgstr ""
9218
9219
#: en/help_topics/configuration.txt:64
9220
msgid ""
9221
"BZR_LOG\n"
9222
"~~~~~~~"
9223
msgstr ""
9224
9225
#: en/help_topics/configuration.txt:67
9226
msgid ""
9227
"Location of the Bazaar log file. You can check the current location by\n"
9228
"running ``bzr version``."
9229
msgstr ""
9230
9231
#: en/help_topics/configuration.txt:70
9232
msgid ""
9233
"The log file contains debug information that is useful for diagnosing or\n"
9234
"reporting problems with Bazaar."
9235
msgstr ""
9236
9237
#: en/help_topics/configuration.txt:73
9238
msgid ""
9239
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9240
"will disable logging."
9241
msgstr ""
9242
9243
#: en/help_topics/configuration.txt:76
9244
msgid ""
9245
"\n"
9246
"BZR_PLUGIN_PATH\n"
9247
"~~~~~~~~~~~~~~~"
9248
msgstr ""
9249
9250
#: en/help_topics/configuration.txt:80
9251
msgid ""
9252
"The path to the plugins directory that Bazaar should use.\n"
9253
"If not set, Bazaar will search for plugins in:"
9254
msgstr ""
9255
9256
#: en/help_topics/configuration.txt:83
9257
msgid ""
9258
"* the user specific plugin directory (containing the ``user`` plugins),"
9259
msgstr ""
9260
9261
#: en/help_topics/configuration.txt:85
9262
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9263
msgstr ""
9264
9265
#: en/help_topics/configuration.txt:87
9266
msgid ""
9267
"* the site specific plugin directory if applicable (containing\n"
9268
" the ``site`` plugins)."
9269
msgstr ""
9270
9271
#: en/help_topics/configuration.txt:90
9272
msgid ""
9273
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9274
"the way the plugin are searched. "
9275
msgstr ""
9276
9277
#: en/help_topics/configuration.txt:93
9278
msgid ""
9279
"As for the ``PATH`` variables, if multiple directories are\n"
9280
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9281
"platform specific appropriate character (':' on Unix,\n"
9282
"';' on windows)"
9283
msgstr ""
9284
9285
#: en/help_topics/configuration.txt:98
9286
msgid ""
9287
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9288
"in ``user``. However it will continue to search in ``core`` and\n"
9289
"``site`` unless they are explicitly removed."
9290
msgstr ""
9291
9292
#: en/help_topics/configuration.txt:102
9293
msgid ""
9294
"If you need to change the order or remove one of these\n"
9295
"directories, you should use special values:"
9296
msgstr ""
9297
9298
#: en/help_topics/configuration.txt:105
9299
msgid ""
9300
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9301
" path from the default values,"
9302
msgstr ""
9303
9304
#: en/help_topics/configuration.txt:108
9305
msgid ""
9306
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9307
" before the remaining default values (and also remove it from\n"
9308
" the default values)."
9309
msgstr ""
9310
9311
#: en/help_topics/configuration.txt:112
9312
msgid ""
9313
"Note that the special values 'user', 'core' and 'site' should be\n"
9314
"used literally, they will be substituted by the corresponding,\n"
9315
"platform specific, values."
9316
msgstr ""
9317
9318
#: en/help_topics/configuration.txt:116
9319
msgid ""
9320
"The examples below use ':' as the separator, windows users\n"
9321
"should use ';'."
9322
msgstr ""
9323
9324
#: en/help_topics/configuration.txt:119
9325
msgid "Overriding the default user plugin directory::"
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:121
9329
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9330
msgstr ""
9331
9332
#: en/help_topics/configuration.txt:123
9333
msgid "Disabling the site directory while retaining the user directory::"
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:125
9337
msgid " BZR_PLUGIN_PATH='-site:+user'"
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:127
9341
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9342
msgstr ""
9343
9344
#: en/help_topics/configuration.txt:129
9345
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:131
9349
msgid "Overriding the default site plugin directory::"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:133
9353
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9354
msgstr ""
9355
9356
#: en/help_topics/configuration.txt:135
9357
msgid ""
9358
"BZR_DISABLE_PLUGINS\n"
9359
"~~~~~~~~~~~~~~~~~~~"
9360
msgstr ""
9361
9362
#: en/help_topics/configuration.txt:138
9363
msgid ""
9364
"Under special circumstances (mostly when trying to diagnose a\n"
9365
"bug), it's better to disable a plugin (or several) rather than\n"
9366
"uninstalling them completely. Such plugins can be specified in\n"
9367
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9368
msgstr ""
9369
9370
#: en/help_topics/configuration.txt:143
9371
msgid ""
9372
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9373
"will raise an import error if they are explicitly imported (by\n"
9374
"another plugin that depends on them for example)."
9375
msgstr ""
9376
9377
#: en/help_topics/configuration.txt:147
9378
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:149
9382
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:151
9386
msgid ""
9387
"BZR_PLUGINS_AT\n"
9388
"~~~~~~~~~~~~~~"
9389
msgstr ""
9390
9391
#: en/help_topics/configuration.txt:154
9392
msgid ""
9393
"When adding a new feature or working on a bug in a plugin,\n"
9394
"developers often need to use a specific version of a given\n"
9395
"plugin. Since python requires that the directory containing the\n"
9396
"code is named like the plugin itself this make it impossible to\n"
9397
"use arbitrary directory names (using a two-level directory scheme\n"
9398
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9399
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:162
9403
msgid ""
9404
"Plugins specified in this environment variable takes precedence\n"
9405
"over the ones in ``BZR_PLUGIN_PATH``."
9406
msgstr ""
9407
9408
#: en/help_topics/configuration.txt:165
9409
msgid ""
9410
"The variable specified a list of ``plugin_name@plugin path``,\n"
9411
"``plugin_name`` being the name of the plugin as it appears in\n"
9412
"python module paths, ``plugin_path`` being the path to the\n"
9413
"directory containing the plugin code itself\n"
9414
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9415
"separator, use ';' on windows."
9416
msgstr ""
9417
9418
#: en/help_topics/configuration.txt:172
9419
msgid ""
9420
"Example:\n"
9421
"~~~~~~~~"
9422
msgstr ""
9423
9424
#: en/help_topics/configuration.txt:175
9425
msgid ""
9426
"Using a specific version of ``myplugin``:\n"
9427
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:178
9431
msgid ""
9432
"BZRPATH\n"
9433
"~~~~~~~"
9434
msgstr ""
9435
9436
#: en/help_topics/configuration.txt:181
9437
msgid "The path where Bazaar should look for shell plugin external commands."
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:183
9441
msgid ""
9442
"\n"
9443
"http_proxy, https_proxy\n"
9444
"~~~~~~~~~~~~~~~~~~~~~~~"
9445
msgstr ""
9446
9447
#: en/help_topics/configuration.txt:187
9448
msgid "Specifies the network proxy for outgoing connections, for example::"
9449
msgstr ""
9450
9451
#: en/help_topics/configuration.txt:189
9452
msgid ""
9453
" http_proxy=http://proxy.example.com:3128/ \n"
9454
" https_proxy=http://proxy.example.com:3128/"
9455
msgstr ""
9456
9457
#: en/help_topics/configuration.txt:192
9458
msgid ""
9459
"\n"
9460
"Configuration files\n"
9461
"-------------------"
9462
msgstr ""
9463
9464
#: en/help_topics/configuration.txt:196
9465
msgid ""
9466
"Location\n"
9467
"~~~~~~~~"
9468
msgstr ""
9469
9470
#: en/help_topics/configuration.txt:199
9471
msgid ""
9472
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9473
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9474
"on\n"
9475
"Windows. (You can check the location for your system by using\n"
9476
"``bzr version``.)"
9477
msgstr ""
9478
9479
#: en/help_topics/configuration.txt:204
9480
msgid "There are three primary configuration files in this location:"
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:206
9484
msgid "* ``bazaar.conf`` describes default configuration options,"
9485
msgstr ""
9486
9487
#: en/help_topics/configuration.txt:208
9488
msgid ""
9489
"* ``locations.conf`` describes configuration information for\n"
9490
" specific branch locations,"
9491
msgstr ""
9492
9493
#: en/help_topics/configuration.txt:211
9494
msgid ""
9495
"* ``authentication.conf`` describes credential information for\n"
9496
" remote servers."
9497
msgstr ""
9498
9499
#: en/help_topics/configuration.txt:214
9500
msgid ""
9501
"Each branch can also contain a configuration file that sets values specific\n"
9502
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9503
"the\n"
9504
"branch. This file is visible to all users of a branch, if you wish to "
9505
"override\n"
9506
"one of the values for a branch with a setting that is specific to you then "
9507
"you\n"
9508
"can do so in ``locations.conf``."
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:220
9512
msgid ""
9513
"General format\n"
9514
"~~~~~~~~~~~~~~"
9515
msgstr ""
9516
9517
#: en/help_topics/configuration.txt:223
9518
msgid ""
9519
"An ini file has three types of contructs: section headers, section\n"
9520
"options and comments."
9521
msgstr ""
9522
9523
#: en/help_topics/configuration.txt:226
9524
msgid ""
9525
"Comments\n"
9526
"^^^^^^^^"
9527
msgstr ""
9528
9529
#: en/help_topics/configuration.txt:229
9530
msgid ""
9531
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9532
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9533
"Bazaar when parsing ini files."
9534
msgstr ""
9535
9536
#: en/help_topics/configuration.txt:233
9537
msgid ""
9538
"Section headers\n"
9539
"^^^^^^^^^^^^^^^"
9540
msgstr ""
9541
9542
#: en/help_topics/configuration.txt:236
9543
msgid ""
9544
"A section header is a word enclosed in brackets that starts at the begining\n"
9545
"of a line. A typical section header looks like this::"
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:239
9549
msgid " [DEFAULT]"
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:241
9553
msgid ""
9554
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9555
"[ALIASES]. Section headers are case sensitive. The default section provides "
9556
"for\n"
9557
"setting options which can be overridden with the branch config file."
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:245
9561
msgid ""
9562
"For ``locations.conf``, the options from the section with the\n"
9563
"longest matching section header are used to the exclusion of other\n"
9564
"potentially valid section headers. A section header uses the path for\n"
9565
"the branch as the section header. Some examples include::"
9566
msgstr ""
9567
9568
#: en/help_topics/configuration.txt:250
9569
msgid ""
9570
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9571
" [/home/jdoe/branches/]"
9572
msgstr ""
9573
9574
#: en/help_topics/configuration.txt:253
9575
msgid ""
9576
"\n"
9577
"Section options\n"
9578
"^^^^^^^^^^^^^^^"
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:257
9582
msgid ""
9583
"A section option resides within a section. A section option contains an\n"
9584
"option name, an equals sign and a value. For example::"
9585
msgstr ""
9586
9587
#: en/help_topics/configuration.txt:260
9588
msgid ""
9589
" email = John Doe <jdoe@isp.com>\n"
9590
" gpg_signing_key = Amy Pond <amy@example.com>"
9591
msgstr ""
9592
9593
#: en/help_topics/configuration.txt:263
9594
msgid ""
9595
"A option can reference other options by enclosing them in curly brackets::"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:265
9599
msgid ""
9600
" my_branch_name = feature_x\n"
9601
" my_server = bzr+ssh://example.com\n"
9602
" push_location = {my_server}/project/{my_branch_name}"
9603
msgstr ""
9604
9605
#: en/help_topics/configuration.txt:269
9606
msgid ""
9607
"Option policies\n"
9608
"^^^^^^^^^^^^^^^"
9609
msgstr ""
9610
9611
#: en/help_topics/configuration.txt:272
9612
msgid ""
9613
"Options defined in a section affect the named directory or URL plus\n"
9614
"any locations they contain. Policies can be used to change how an\n"
9615
"option value is interpreted for contained locations. Currently\n"
9616
"there are three policies available:"
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:277
9620
msgid ""
9621
" none:\n"
9622
" the value is interpreted the same for contained locations. This is\n"
9623
" the default behaviour.\n"
9624
" norecurse:\n"
9625
" the value is only used for the exact location specified by the\n"
9626
" section name.\n"
9627
" appendpath:\n"
9628
" for contained locations, any additional path components are\n"
9629
" appended to the value."
9630
msgstr ""
9631
9632
#: en/help_topics/configuration.txt:287
9633
msgid ""
9634
"Policies are specified by keys with names of the form "
9635
"\"<option_name>:policy\".\n"
9636
"For example, to define the push location for a tree of branches, the\n"
9637
"following could be used::"
9638
msgstr ""
9639
9640
#: en/help_topics/configuration.txt:291
9641
msgid ""
9642
" [/top/location]\n"
9643
" push_location = sftp://example.com/location\n"
9644
" push_location:policy = appendpath"
9645
msgstr ""
9646
9647
#: en/help_topics/configuration.txt:295
9648
msgid ""
9649
"With this configuration, the push location for ``/top/location/branch1``\n"
9650
"would be ``sftp://example.com/location/branch1``."
9651
msgstr ""
9652
9653
#: en/help_topics/configuration.txt:298
9654
msgid ""
9655
"Section local options\n"
9656
"^^^^^^^^^^^^^^^^^^^^^"
9657
msgstr ""
9658
9659
#: en/help_topics/configuration.txt:301
9660
msgid ""
9661
"Some options are defined automatically inside a given section and can be\n"
9662
"refered to in this section only. "
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:304
9666
msgid "For example, the ``appendpath`` policy can be used like this::"
9667
msgstr ""
9668
9669
#: en/help_topics/configuration.txt:306
9670
msgid ""
9671
" [/home/vila/src/bzr/bugs]\n"
9672
" mypush = lp:~vila/bzr\n"
9673
" mypush:policy=appendpath"
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:310
9677
msgid "Using ``relpath`` to achieve the same result is done like this::"
9678
msgstr ""
9679
9680
#: en/help_topics/configuration.txt:312
9681
msgid ""
9682
" [/home/vila/src/bzr/bugs]\n"
9683
" mypush = lp:~vila/bzr/{relpath}"
9684
msgstr ""
9685
9686
#: en/help_topics/configuration.txt:315
9687
msgid ""
9688
"In both cases, when used in a directory like\n"
9689
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9690
msgstr ""
9691
9692
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9693
msgid ""
9694
" $ bzr config mypush\n"
9695
" lp:~vila/bzr/832013-expand-in-stack"
9696
msgstr ""
9697
9698
#: en/help_topics/configuration.txt:321
9699
msgid "Another such option is ``basename`` which can be used like this::"
9700
msgstr ""
9701
9702
#: en/help_topics/configuration.txt:323
9703
msgid ""
9704
" [/home/vila/src/bzr]\n"
9705
" mypush = lp:~vila/bzr/{basename}"
9706
msgstr ""
9707
9708
#: en/help_topics/configuration.txt:326
9709
msgid ""
9710
"When used in a directory like\n"
9711
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9712
msgstr ""
9713
9714
#: en/help_topics/configuration.txt:332
9715
msgid ""
9716
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9717
"itself is defined as the relative path between the section name and the\n"
9718
"location it matches."
9719
msgstr ""
9720
9721
#: en/help_topics/configuration.txt:336
9722
msgid ""
9723
"Another such option is ``branchname``, which refers to the name of a "
9724
"colocated\n"
9725
"branch. For non-colocated branches, it behaves like basename. It can be "
9726
"used\n"
9727
"like this::"
9728
msgstr ""
9729
9730
#: en/help_topics/configuration.txt:340
9731
msgid ""
9732
" [/home/vila/src/bzr/bugs]\n"
9733
" mypush = lp:~vila/bzr/{branchname}"
9734
msgstr ""
9735
9736
#: en/help_topics/configuration.txt:343
9737
msgid ""
9738
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9739
"get::"
9740
msgstr ""
9741
9742
#: en/help_topics/configuration.txt:345
9743
msgid ""
9744
" bzr config mypush\n"
9745
" lp:~vila/bzr/832013-expand-in-stack"
9746
msgstr ""
9747
9748
#: en/help_topics/configuration.txt:348
9749
msgid ""
9750
"When an option is local to a Section, it cannot be referred to from option\n"
9751
"values in any other section from the same ``Store`` nor from any other\n"
9752
"``Store``."
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:352
9756
msgid ""
9757
"\n"
9758
"The main configuration file, bazaar.conf\n"
9759
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9760
msgstr ""
9761
9762
#: en/help_topics/configuration.txt:356
9763
msgid ""
9764
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9765
"The default section contains the default\n"
9766
"configuration options for all branches. The default section can be\n"
9767
"overriden by providing a branch-specific section in ``locations.conf``."
9768
msgstr ""
9769
9770
#: en/help_topics/configuration.txt:361
9771
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:363
9775
msgid ""
9776
" [DEFAULT]\n"
9777
" email = John Doe <jdoe@isp.com>\n"
9778
" editor = /usr/bin/vim\n"
9779
" create_signatures = when-required"
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:368
9783
msgid ""
9784
"\n"
9785
"The branch location configuration file, locations.conf\n"
9786
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:372
9790
msgid ""
9791
"``locations.conf`` allows one to specify overriding settings for\n"
9792
"a specific branch. The format is almost identical to the default section in\n"
9793
"bazaar.conf with one significant change: The section header, instead of "
9794
"saying\n"
9795
"default, will be the path to a branch that you wish to override a value\n"
9796
"for. The '?' and '*' wildcards are supported::"
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:378
9800
msgid ""
9801
" [/home/jdoe/branches/nethack]\n"
9802
" email = Nethack Admin <nethack@nethack.com>"
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:381
9806
msgid ""
9807
" [http://hypothetical.site.com/branches/devel-branch]\n"
9808
" create_signatures = always"
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:384
9812
msgid ""
9813
"The authentication configuration file, authentication.conf\n"
9814
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9815
msgstr ""
9816
9817
#: en/help_topics/configuration.txt:387
9818
msgid ""
9819
"``authentication.conf`` allows one to specify credentials for\n"
9820
"remote servers. This can be used for all the supported transports and any "
9821
"part\n"
9822
"of bzr that requires authentication (smtp for example)."
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:391
9826
msgid ""
9827
"The syntax of the file obeys the same rules as the others except for the\n"
9828
"option policies which don't apply."
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:394
9832
msgid ""
9833
"For more information on the possible uses of the authentication "
9834
"configuration\n"
9835
"file see :doc:`authentication-help`."
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:397
9839
msgid ""
9840
"\n"
9841
"Common options\n"
9842
"--------------"
9843
msgstr ""
9844
9845
#: en/help_topics/configuration.txt:401
9846
msgid ""
9847
"debug_flags\n"
9848
"~~~~~~~~~~~"
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:404
9852
msgid ""
9853
"A comma-separated list of debugging options to turn on. The same values\n"
9854
"can be used as with the -D command-line option (see `help global-options`).\n"
9855
"For example::"
9856
msgstr ""
9857
9858
#: en/help_topics/configuration.txt:408
9859
msgid " debug_flags = hpss"
9860
msgstr ""
9861
9862
#: en/help_topics/configuration.txt:412
9863
msgid " debug_flags = hpss,evil"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:414
9867
msgid ""
9868
"email\n"
9869
"~~~~~"
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:417
9873
msgid ""
9874
"The email address to use when committing a branch. Typically takes the form\n"
9875
"of::"
9876
msgstr ""
9877
9878
#: en/help_topics/configuration.txt:420
9879
msgid " email = Full Name <account@hostname.tld>"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:422
9883
msgid ""
9884
"editor\n"
9885
"~~~~~~"
9886
msgstr ""
9887
9888
#: en/help_topics/configuration.txt:425
9889
msgid ""
9890
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9891
"a commit message. This setting is trumped by the environment variable\n"
9892
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9893
"variables."
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:430
9897
msgid ""
9898
"log_format\n"
9899
"~~~~~~~~~~"
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:433
9903
msgid ""
9904
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9905
"and ``line``. Additional formats may be provided by plugins. The default\n"
9906
"value is ``long``."
9907
msgstr ""
9908
9909
#: en/help_topics/configuration.txt:437
9910
msgid ""
9911
"check_signatures\n"
9912
"~~~~~~~~~~~~~~~~"
9913
msgstr ""
9914
9915
#: en/help_topics/configuration.txt:440
9916
msgid ""
9917
"Reserved for future use. These options will allow a policy for branches to\n"
9918
"require signatures."
9919
msgstr ""
9920
9921
#: en/help_topics/configuration.txt:443
9922
msgid ""
9923
"require\n"
9924
" The gnupg signature for revisions must be present and must be valid."
9925
msgstr ""
9926
9927
#: en/help_topics/configuration.txt:446
9928
msgid ""
9929
"ignore\n"
9930
" Do not check gnupg signatures of revisions."
9931
msgstr ""
9932
9933
#: en/help_topics/configuration.txt:449
9934
msgid ""
9935
"check-available\n"
9936
" (default) If gnupg signatures for revisions are present, check them.\n"
9937
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9938
" no signature is present."
9939
msgstr ""
9940
9941
#: en/help_topics/configuration.txt:454
9942
msgid ""
9943
"create_signatures\n"
9944
"~~~~~~~~~~~~~~~~~"
9945
msgstr ""
9946
9947
#: en/help_topics/configuration.txt:457
9948
msgid ""
9949
"Defines the behaviour of signing revisions on commits. By default bzr will "
9950
"not\n"
9951
"sign new commits."
9952
msgstr ""
9953
9954
#: en/help_topics/configuration.txt:460
9955
msgid ""
9956
"always\n"
9957
" Sign every new revision that is committed. If the signing fails then "
9958
"the\n"
9959
" commit will not be made."
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:464
9963
msgid ""
9964
"when-required\n"
9965
" Reserved for future use."
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:467
9969
msgid ""
9970
"never\n"
9971
" Reserved for future use."
9972
msgstr ""
9973
9974
#: en/help_topics/configuration.txt:470
9975
msgid ""
9976
"In future it is planned that ``when-required`` will sign newly\n"
9977
"committed revisions only when the branch requires them. ``never`` will "
9978
"refuse\n"
9979
"to sign newly committed revisions, even if the branch requires signatures."
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:474
9983
msgid ""
9984
"dirstate.fdatasync\n"
9985
"~~~~~~~~~~~~~~~~~~"
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:477
9989
msgid ""
9990
"If true (default), working tree metadata changes are flushed through the\n"
9991
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9992
"should not be lost if the machine crashes. See also repository.fdatasync."
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:481
9996
msgid ""
9997
"gpg_signing_key\n"
9998
"~~~~~~~~~~~~~~~"
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:484
10002
msgid ""
10003
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10004
"address, key fingerprint or full key ID. When unset or when set to\n"
10005
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:488
10009
msgid ""
10010
"recurse\n"
10011
"~~~~~~~"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:491
10015
msgid ""
10016
"Only useful in ``locations.conf``. Defines whether or not the\n"
10017
"configuration for this section applies to subdirectories:"
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:494
10021
msgid ""
10022
"true\n"
10023
" (default) This section applies to subdirectories as well."
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:497
10027
msgid ""
10028
"false\n"
10029
" This section only applies to the branch at this directory and not\n"
10030
" branches below it."
10031
msgstr ""
10032
10033
#: en/help_topics/configuration.txt:501
10034
msgid ""
10035
"gpg_signing_command\n"
10036
"~~~~~~~~~~~~~~~~~~~"
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:504
10040
msgid ""
10041
"(Default: \"gpg\"). Which program should be used to sign and check "
10042
"revisions.\n"
10043
"For example::"
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:507
10047
msgid " gpg_signing_command = /usr/bin/gnpg"
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:509
10051
msgid ""
10052
"The specified command must accept the options \"--clearsign\" and \"-u "
10053
"<email>\"."
10054
msgstr ""
10055
10056
#: en/help_topics/configuration.txt:511
10057
msgid ""
10058
"bzr_remote_path\n"
10059
"~~~~~~~~~~~~~~~"
10060
msgstr ""
10061
10062
#: en/help_topics/configuration.txt:514
10063
msgid ""
10064
"(Default: \"bzr\"). The path to the command that should be used to run the "
10065
"smart\n"
10066
"server for bzr. This value may only be specified in locations.conf, because:"
10067
msgstr ""
10068
10069
#: en/help_topics/configuration.txt:517
10070
msgid ""
10071
"- it's needed before branch.conf is accessible\n"
10072
"- allowing remote branch.conf files to specify commands would be a security\n"
10073
" risk"
10074
msgstr ""
10075
10076
#: en/help_topics/configuration.txt:521
10077
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10078
msgstr ""
10079
10080
#: en/help_topics/configuration.txt:523
10081
msgid ""
10082
"smtp_server\n"
10083
"~~~~~~~~~~~"
10084
msgstr ""
10085
10086
#: en/help_topics/configuration.txt:526
10087
msgid ""
10088
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10089
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:529
10093
msgid ""
10094
"smtp_username, smtp_password\n"
10095
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:532
10099
msgid ""
10100
"User and password to authenticate to the SMTP server. If smtp_username\n"
10101
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10102
"These settings are only needed if the SMTP server requires authentication\n"
10103
"to send mail."
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:537
10107
msgid ""
10108
"locks.steal_dead\n"
10109
"~~~~~~~~~~~~~~~~"
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:540
10113
msgid ""
10114
"If set to true, bzr will automatically break locks held by processes from\n"
10115
"the same machine and user that are no longer alive. Otherwise, it will\n"
10116
"print a message and you can break the lock manually, if you are satisfied\n"
10117
"the object is no longer in use."
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:545
10121
msgid ""
10122
"mail_client\n"
10123
"~~~~~~~~~~~"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:548
10127
msgid ""
10128
"A mail client to use for sending merge requests.\n"
10129
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10130
"it\n"
10131
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10132
"``editor``."
10133
msgstr ""
10134
10135
#: en/help_topics/configuration.txt:553
10136
msgid "Supported values for specific clients:"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:555
10140
msgid ""
10141
":claws: Use Claws. This skips a dialog for attaching files.\n"
10142
":evolution: Use Evolution.\n"
10143
":kmail: Use KMail.\n"
10144
":mutt: Use Mutt.\n"
10145
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10146
"1.5,\n"
10147
" this works around some bugs that xdg-email doesn't handle."
10148
msgstr ""
10149
10150
#: en/help_topics/configuration.txt:562
10151
msgid "Supported generic values are:"
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:564
10155
msgid ""
10156
":default: See above.\n"
10157
":editor: Use your editor to compose the merge request. This also uses\n"
10158
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10159
" smtp_username and smtp_password.\n"
10160
":mapi: Use your preferred e-mail client on Windows.\n"
10161
":xdg-email: Use xdg-email to run your preferred mail program"
10162
msgstr ""
10163
10164
#: en/help_topics/configuration.txt:571
10165
msgid ""
10166
"repository.fdatasync\n"
10167
"~~~~~~~~~~~~~~~~~~~~"
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:574
10171
msgid ""
10172
"If true (default), repository changes are flushed through the OS buffers\n"
10173
"to physical disk. This is somewhat slower, but means data should not be\n"
10174
"lost if the machine crashes. See also dirstate.fdatasync."
10175
msgstr ""
10176
10177
#: en/help_topics/configuration.txt:578
10178
msgid ""
10179
"submit_branch\n"
10180
"~~~~~~~~~~~~~"
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:581
10184
msgid ""
10185
"The branch you intend to submit your current work to. This is "
10186
"automatically\n"
10187
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10188
"This\n"
10189
"should usually be set on a per-branch or per-location basis."
10190
msgstr ""
10191
10192
#: en/help_topics/configuration.txt:585
10193
msgid ""
10194
"public_branch\n"
10195
"~~~~~~~~~~~~~"
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:588
10199
msgid ""
10200
"A publically-accessible version of this branch (implying that this version "
10201
"is\n"
10202
"not publically-accessible). Used (and set) by ``bzr send``."
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:591
10206
msgid ""
10207
"suppress_warnings\n"
10208
"~~~~~~~~~~~~~~~~~"
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:594
10212
msgid ""
10213
"A list of strings, each string represent a warning that can be emitted by\n"
10214
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:597
10218
msgid "Valid values:"
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:599
10222
msgid ""
10223
"* ``format_deprecation``:\n"
10224
" whether the format deprecation warning is shown on repositories that "
10225
"are\n"
10226
" using deprecated formats."
10227
msgstr ""
10228
10229
#: en/help_topics/configuration.txt:603
10230
msgid ""
10231
"default_format\n"
10232
"~~~~~~~~~~~~~~"
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:606
10236
msgid ""
10237
"A format name for the default format used when creating branches. See "
10238
"``bzr\n"
10239
"help formats`` for possible values."
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:609
10243
msgid ""
10244
"\n"
10245
"Unicode options\n"
10246
"---------------"
10247
msgstr ""
10248
10249
#: en/help_topics/configuration.txt:613
10250
msgid ""
10251
"output_encoding\n"
10252
"~~~~~~~~~~~~~~~"
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:616
10256
msgid ""
10257
"A Python unicode encoding name for text output from bzr, such as log\n"
10258
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10259
"is the terminal encoding prefered by the operating system."
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:620
10263
msgid ""
10264
"\n"
10265
"Branch type specific options\n"
10266
"----------------------------"
10267
msgstr ""
10268
10269
#: en/help_topics/configuration.txt:624
10270
msgid ""
10271
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10272
"later format. They\n"
10273
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10274
"manually set in ``locations.conf`` or ``bazaar.conf``."
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:629
10278
msgid ""
10279
"append_revisions_only\n"
10280
"~~~~~~~~~~~~~~~~~~~~~"
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:632
10284
msgid ""
10285
"If set to \"True\" then revisions can only be appended to the log, not\n"
10286
"removed. A branch with this setting enabled can only pull from another\n"
10287
"branch if the other branch's log is a longer version of its own. This is\n"
10288
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10289
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10290
"compatibility with previous bzr versions (older than 2.2)."
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:639
10294
msgid ""
10295
"parent_location\n"
10296
"~~~~~~~~~~~~~~~"
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:642
10300
msgid ""
10301
"If present, the location of the default branch for pull or merge. This "
10302
"option\n"
10303
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10304
"--remember``."
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:646
10308
msgid ""
10309
"push_location\n"
10310
"~~~~~~~~~~~~~"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:649
10314
msgid ""
10315
"If present, the location of the default branch for push. This option\n"
10316
"is normally set by the first ``push`` or ``push --remember``."
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:652
10320
msgid ""
10321
"push_strict\n"
10322
"~~~~~~~~~~~"
10323
msgstr ""
10324
10325
#: en/help_topics/configuration.txt:655
10326
msgid ""
10327
"If present, defines the ``--strict`` option default value for checking\n"
10328
"uncommitted changes before pushing."
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:658
10332
msgid ""
10333
"dpush_strict\n"
10334
"~~~~~~~~~~~~"
10335
msgstr ""
10336
10337
#: en/help_topics/configuration.txt:661
10338
msgid ""
10339
"If present, defines the ``--strict`` option default value for checking\n"
10340
"uncommitted changes before pushing into a different VCS without any\n"
10341
"custom bzr metadata."
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:665
10345
msgid ""
10346
"bound_location\n"
10347
"~~~~~~~~~~~~~~"
10348
msgstr ""
10349
10350
#: en/help_topics/configuration.txt:668
10351
msgid ""
10352
"The location that commits should go to when acting as a checkout.\n"
10353
"This option is normally set by ``bind``."
10354
msgstr ""
10355
10356
#: en/help_topics/configuration.txt:671
10357
msgid ""
10358
"bound\n"
10359
"~~~~~"
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:674
10363
msgid ""
10364
"If set to \"True\", the branch should act as a checkout, and push each "
10365
"commit to\n"
10366
"the bound_location. This option is normally set by ``bind``/``unbind``."
10367
msgstr ""
10368
10369
#: en/help_topics/configuration.txt:677
10370
msgid ""
10371
"send_strict\n"
10372
"~~~~~~~~~~~"
10373
msgstr ""
10374
10375
#: en/help_topics/configuration.txt:680
10376
msgid ""
10377
"If present, defines the ``--strict`` option default value for checking\n"
10378
"uncommitted changes before sending a merge directive."
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:683
10382
msgid ""
10383
"add.maximum_file_size\n"
10384
"~~~~~~~~~~~~~~~~~~~~~"
10385
msgstr ""
10386
10387
#: en/help_topics/configuration.txt:686
10388
msgid ""
10389
"Defines the maximum file size the command line \"add\" operation will allow\n"
10390
"in recursive mode, with files larger than this value being skipped. You may "
10391
"\n"
10392
"specify this value as an integer (in which case it is interpreted as bytes), "
10393
"\n"
10394
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10395
"0 \n"
10396
"will disable skipping."
10397
msgstr ""
10398
10399
#: en/help_topics/configuration.txt:692
10400
msgid ""
10401
"External Merge Tools\n"
10402
"--------------------"
10403
msgstr ""
10404
10405
#: en/help_topics/configuration.txt:695
10406
msgid ""
10407
"bzr.mergetool.<name>\n"
10408
"~~~~~~~~~~~~~~~~~~~~"
10409
msgstr ""
10410
10411
#: en/help_topics/configuration.txt:698
10412
msgid ""
10413
"Defines an external merge tool called <name> with the given command-line.\n"
10414
"Arguments containing spaces should be quoted using single or double quotes. "
10415
"The\n"
10416
"executable may omit its path if it can be found on the PATH."
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:702
10420
msgid ""
10421
"The following markers can be used in the command-line to substitute "
10422
"filenames\n"
10423
"involved in the merge conflict::"
10424
msgstr ""
10425
10426
#: en/help_topics/configuration.txt:705
10427
msgid ""
10428
" {base} file.BASE\n"
10429
" {this} file.THIS\n"
10430
" {other} file.OTHER\n"
10431
" {result} output file\n"
10432
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10433
"merge\n"
10434
" succeeds."
10435
msgstr ""
10436
10437
#: en/help_topics/configuration.txt:714
10438
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10439
msgstr ""
10440
10441
#: en/help_topics/configuration.txt:716
10442
msgid ""
10443
"bzr.default_mergetool\n"
10444
"~~~~~~~~~~~~~~~~~~~~~"
10445
msgstr ""
10446
10447
#: en/help_topics/configuration.txt:719
10448
msgid ""
10449
"Specifies which external merge tool (as defined above) should be selected "
10450
"by\n"
10451
"default in tools such as ``bzr qconflicts``."
10452
msgstr ""
10453
10454
#: en/help_topics/configuration.txt:724
10455
msgid " bzr.default_mergetool = kdiff3\n"
10456
msgstr ""
10457
10458
#: en/help_topics/conflict-types.txt:1
10459
msgid ""
10460
"Conflict Types\n"
10461
"=============="
10462
msgstr ""
10463
10464
#: en/help_topics/conflict-types.txt:4
10465
msgid ""
10466
"Some operations, like merge, revert and pull, modify the contents of your\n"
10467
"working tree. These modifications are programmatically generated, and so "
10468
"they\n"
10469
"may conflict with the current state of your working tree. "
10470
msgstr ""
10471
10472
#: en/help_topics/conflict-types.txt:8
10473
msgid ""
10474
"When conflicts are present in your working tree (as shown by ``bzr\n"
10475
"conflicts``), you should resolve them and then inform bzr that the "
10476
"conflicts\n"
10477
"have been resolved."
10478
msgstr ""
10479
10480
#: en/help_topics/conflict-types.txt:12
10481
msgid ""
10482
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10483
"should resolve them is not the one responsible for their occurrence, as is "
10484
"the\n"
10485
"case when merging other people's work or because some conflicts are "
10486
"presented\n"
10487
"in a way that is not easy to understand."
10488
msgstr ""
10489
10490
#: en/help_topics/conflict-types.txt:17
10491
msgid ""
10492
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10493
"conflict if and only if there's an actual conceptual conflict in the source\n"
10494
"tree. Because Bazaar doesn't understand the real meaning of the files "
10495
"being\n"
10496
"versioned, it can, when faced with ambiguities, fall short in either "
10497
"direction\n"
10498
"trying to resolve the conflict itself. Many kinds of changes can be "
10499
"combined\n"
10500
"programmatically, but sometimes only a human can determine the right thing "
10501
"to\n"
10502
"do."
10503
msgstr ""
10504
10505
#: en/help_topics/conflict-types.txt:25
10506
msgid ""
10507
"When Bazaar generates a conflict, it adds information into the working tree "
10508
"to\n"
10509
"present the conflicting versions, and it's up to you to find the correct\n"
10510
"resolution."
10511
msgstr ""
10512
10513
#: en/help_topics/conflict-types.txt:29
10514
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10515
msgstr ""
10516
10517
#: en/help_topics/conflict-types.txt:31
10518
msgid ""
10519
"1. Modify the working tree content so that the conflicted item is now in "
10520
"the\n"
10521
" state you want to keep, then"
10522
msgstr ""
10523
10524
#: en/help_topics/conflict-types.txt:34
10525
msgid ""
10526
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10527
" remaining generated information (``bzr resolve <item>``)."
10528
msgstr ""
10529
10530
#: en/help_topics/conflict-types.txt:37
10531
msgid ""
10532
"For most conflict types, there are some obvious ways to modify the working\n"
10533
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10534
"itself already made a choice, when possible."
10535
msgstr ""
10536
10537
#: en/help_topics/conflict-types.txt:41
10538
msgid ""
10539
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10540
"different ways to resolve the conflict."
10541
msgstr ""
10542
10543
#: en/help_topics/conflict-types.txt:44
10544
msgid ""
10545
"Each type of conflict is explained below, and the action which must be done "
10546
"to\n"
10547
"resolve the conflict is outlined."
10548
msgstr ""
10549
10550
#: en/help_topics/conflict-types.txt:47
10551
msgid ""
10552
"Various actions are available depending on the kind of conflict, for some "
10553
"of\n"
10554
"these actions, Bazaar can provide some help. In the end you should at least\n"
10555
"inform Bazaar that you're done with the conflict with::"
10556
msgstr ""
10557
10558
#: en/help_topics/conflict-types.txt:51
10559
msgid " ``bzr resolve FILE --action=done'"
10560
msgstr ""
10561
10562
#: en/help_topics/conflict-types.txt:53
10563
msgid ""
10564
"Note that this is the default action when a single file is involved so you "
10565
"can\n"
10566
"simply use::"
10567
msgstr ""
10568
10569
#: en/help_topics/conflict-types.txt:56
10570
msgid " ``bzr resolve FILE``"
10571
msgstr ""
10572
10573
#: en/help_topics/conflict-types.txt:58
10574
msgid "See ``bzr help resolve`` for more details."
10575
msgstr ""
10576
10577
#: en/help_topics/conflict-types.txt:60
10578
msgid ""
10579
"Text conflicts\n"
10580
"--------------"
10581
msgstr ""
10582
10583
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10584
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10585
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10586
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10587
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10588
msgid "Typical message::"
10589
msgstr ""
10590
10591
#: en/help_topics/conflict-types.txt:65
10592
msgid " Text conflict in FILE"
10593
msgstr ""
10594
10595
#: en/help_topics/conflict-types.txt:67
10596
msgid ""
10597
"These are produced when a text merge cannot completely reconcile two sets "
10598
"of\n"
10599
"text changes. Bazaar will emit files for each version with the extensions\n"
10600
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10601
"tree,\n"
10602
"i.e. the tree that you are merging changes into. OTHER is the version that "
10603
"you\n"
10604
"are merging into the target. BASE is an older version that is used as a "
10605
"basis\n"
10606
"for comparison."
10607
msgstr ""
10608
10609
#: en/help_topics/conflict-types.txt:74
10610
msgid ""
10611
"In the main copy of the file, Bazaar will include all the changes that it\n"
10612
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10613
"\"herringbone\" markers like ``<<<<<<<``."
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:78
10617
msgid ""
10618
"Say the initial text is \"The project leader released it.\", and THIS "
10619
"modifies it\n"
10620
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10621
"leader\n"
10622
"released Bazaar.\" A conflict would look like this::"
10623
msgstr ""
10624
10625
#: en/help_topics/conflict-types.txt:82
10626
msgid ""
10627
" <<<<<<< TREE\n"
10628
" Martin Pool released it.\n"
10629
" =======\n"
10630
" The project leader released Bazaar.\n"
10631
" >>>>>>> MERGE-SOURCE"
10632
msgstr ""
10633
10634
#: en/help_topics/conflict-types.txt:88
10635
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10636
msgstr ""
10637
10638
#: en/help_topics/conflict-types.txt:90
10639
msgid ""
10640
"You can handle text conflicts either by editing the main copy of the file,\n"
10641
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10642
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10643
"set of changes over the other (but see below when you encounter these\n"
10644
"cases). More often, the two sets of changes must be intelligently combined."
10645
msgstr ""
10646
10647
#: en/help_topics/conflict-types.txt:96
10648
msgid ""
10649
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10650
"you are done editing, the file should look like it never had a conflict, and "
10651
"be\n"
10652
"ready to commit."
10653
msgstr ""
10654
10655
#: en/help_topics/conflict-types.txt:100
10656
msgid ""
10657
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10658
"Bazaar will auto-detect which conflicts you have resolved."
10659
msgstr ""
10660
10661
#: en/help_topics/conflict-types.txt:103
10662
msgid ""
10663
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10664
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10665
"working tree."
10666
msgstr ""
10667
10668
#: en/help_topics/conflict-types.txt:107
10669
msgid ""
10670
"\n"
10671
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10672
"resolve`` with one of the following actions:"
10673
msgstr ""
10674
10675
#: en/help_topics/conflict-types.txt:111
10676
msgid ""
10677
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10678
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10679
msgstr ""
10680
10681
#: en/help_topics/conflict-types.txt:114
10682
msgid ""
10683
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10684
"modifications will be taken into account."
10685
msgstr ""
10686
10687
#: en/help_topics/conflict-types.txt:117
10688
msgid ""
10689
"Content conflicts\n"
10690
"-----------------"
10691
msgstr ""
10692
10693
#: en/help_topics/conflict-types.txt:122
10694
msgid " Contents conflict in FILE"
10695
msgstr ""
10696
10697
#: en/help_topics/conflict-types.txt:124
10698
msgid ""
10699
"This conflict happens when there are conflicting changes in the working "
10700
"tree\n"
10701
"and the merge source, but the conflicted items are not text files. They "
10702
"may\n"
10703
"be binary files, or symlinks, or directories. It can even happen with "
10704
"files\n"
10705
"that are deleted on one side, and modified on the other."
10706
msgstr ""
10707
10708
#: en/help_topics/conflict-types.txt:129
10709
msgid ""
10710
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10711
"be\n"
10712
"regular files, symlinks or directories). But it will not include a \"main "
10713
"copy\"\n"
10714
"of the file with herringbone conflict markers. It will appear that the "
10715
"\"main\n"
10716
"copy\" has been renamed to THIS or OTHER."
10717
msgstr ""
10718
10719
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10720
msgid ""
10721
"To resolve that kind of conflict, you should rebuild FILE from either "
10722
"version\n"
10723
"or a combination of both."
10724
msgstr ""
10725
10726
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10727
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10728
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10729
#: en/help_topics/conflict-types.txt:361
10730
msgid "``bzr resolve`` recognizes the following actions:"
10731
msgstr ""
10732
10733
#: en/help_topics/conflict-types.txt:139
10734
msgid ""
10735
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10736
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10737
"* ``--action=done`` will just mark the conflict as resolved."
10738
msgstr ""
10739
10740
#: en/help_topics/conflict-types.txt:143
10741
msgid ""
10742
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10743
"and\n"
10744
"``.OTHER`` files if they are still present in the working tree."
10745
msgstr ""
10746
10747
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10748
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10749
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10750
#: en/help_topics/conflict-types.txt:369
10751
msgid ""
10752
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10753
msgstr ""
10754
10755
#: en/help_topics/conflict-types.txt:148
10756
msgid ""
10757
"Tag conflicts\n"
10758
"-------------"
10759
msgstr ""
10760
10761
#: en/help_topics/conflict-types.txt:153
10762
msgid ""
10763
" Conflicting tags:\n"
10764
" version-0.1"
10765
msgstr ""
10766
10767
#: en/help_topics/conflict-types.txt:156
10768
msgid ""
10769
"When pulling from or pushing to another branch, Bazaar informs you about "
10770
"tags\n"
10771
"that conflict between the two branches; that is the same tag points to two\n"
10772
"different revisions. You need not resolve these conflicts, but subsequent\n"
10773
"uses of pull or push will result in the same message."
10774
msgstr ""
10775
10776
#: en/help_topics/conflict-types.txt:161
10777
msgid ""
10778
"To resolve the conflict, you must apply the correct tags to either the "
10779
"target\n"
10780
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10781
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10782
"target branch's tags match the source branch, then in the target branch do\n"
10783
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10784
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10785
"source\n"
10786
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10787
"favor of the target branch, you need to similarly use ``tag --force`` in "
10788
"the\n"
10789
"source branch. (Note that pulling or pushing using --overwrite will "
10790
"overwrite\n"
10791
"all tags as well.)"
10792
msgstr ""
10793
10794
#: en/help_topics/conflict-types.txt:172
10795
msgid ""
10796
"Duplicate paths\n"
10797
"---------------"
10798
msgstr ""
10799
10800
#: en/help_topics/conflict-types.txt:177
10801
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10802
msgstr ""
10803
10804
#: en/help_topics/conflict-types.txt:179
10805
msgid ""
10806
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10807
"already been used. The existing file will be renamed to \"FILE.moved\". "
10808
msgstr ""
10809
10810
#: en/help_topics/conflict-types.txt:187
10811
msgid ""
10812
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10813
"FILE``,\n"
10814
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10815
"* ``--action=done`` will just mark the conflict as resolved."
10816
msgstr ""
10817
10818
#: en/help_topics/conflict-types.txt:191
10819
msgid ""
10820
"Note that you must get rid of FILE.moved before using ``--action=done``."
10821
msgstr ""
10822
10823
#: en/help_topics/conflict-types.txt:195
10824
msgid ""
10825
"Unversioned parent\n"
10826
"------------------"
10827
msgstr ""
10828
10829
#: en/help_topics/conflict-types.txt:200
10830
msgid ""
10831
" Conflict because FILE is not versioned, but has versioned children."
10832
msgstr ""
10833
10834
#: en/help_topics/conflict-types.txt:202
10835
msgid ""
10836
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10837
"not\n"
10838
"versioned. This happens when the directory has been deleted in the target,\n"
10839
"but has a new child in the source, or vice versa. In this situation, "
10840
"Bazaar\n"
10841
"will version the parent directory as well. Resolving this issue depends\n"
10842
"very much on the particular scenario. You may wish to rename or delete "
10843
"either\n"
10844
"the file or the directory. When you are satisfied, you can run \"bzr "
10845
"resolve\n"
10846
"FILE\" to mark the conflict as resolved."
10847
msgstr ""
10848
10849
#: en/help_topics/conflict-types.txt:210
10850
msgid ""
10851
"Missing parent\n"
10852
"--------------"
10853
msgstr ""
10854
10855
#: en/help_topics/conflict-types.txt:215
10856
msgid " Conflict adding files to FILE. Created directory."
10857
msgstr ""
10858
10859
#: en/help_topics/conflict-types.txt:217
10860
msgid ""
10861
"This happens when a directory has been deleted in the target, but has new\n"
10862
"children in the source. This is similar to the \"unversioned parent\" "
10863
"conflict,\n"
10864
"except that the parent directory does not *exist*, instead of just being\n"
10865
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10866
"Resolving this issue depends very much on the particular scenario."
10867
msgstr ""
10868
10869
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10870
msgid ""
10871
"To resolve that kind of conflict, you should either remove or rename the\n"
10872
"children or the directory or a combination of both."
10873
msgstr ""
10874
10875
#: en/help_topics/conflict-types.txt:228
10876
msgid ""
10877
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10878
" children,\n"
10879
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10880
"children\n"
10881
" and restoring the directory,\n"
10882
"* ``--action=done`` will just mark the conflict as resolved."
10883
msgstr ""
10884
10885
#: en/help_topics/conflict-types.txt:236
10886
msgid ""
10887
"Deleting parent\n"
10888
"---------------"
10889
msgstr ""
10890
10891
#: en/help_topics/conflict-types.txt:241
10892
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10893
msgstr ""
10894
10895
#: en/help_topics/conflict-types.txt:243
10896
msgid ""
10897
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10898
"source, but has new children in the target (either because a directory\n"
10899
"deletion is merged or because the merge introduce new children). Bazaar\n"
10900
"will retain the directory. Resolving this issue depends very much on the\n"
10901
"particular scenario."
10902
msgstr ""
10903
10904
#: en/help_topics/conflict-types.txt:254
10905
msgid ""
10906
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10907
"directory,"
10908
msgstr ""
10909
10910
#: en/help_topics/conflict-types.txt:256
10911
msgid ""
10912
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10913
" children,"
10914
msgstr ""
10915
10916
#: en/help_topics/conflict-types.txt:259
10917
msgid "* ``--action=done`` will just mark the conflict as resolved."
10918
msgstr ""
10919
10920
#: en/help_topics/conflict-types.txt:261
10921
msgid ""
10922
"Note that when merging a directory deletion, if unversioned files are\n"
10923
"present, they become potential orphans has they don't have a directory\n"
10924
"parent anymore."
10925
msgstr ""
10926
10927
#: en/help_topics/conflict-types.txt:265
10928
msgid ""
10929
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10930
"setting the ``bzr.transform.orphan_policy`` configuration option."
10931
msgstr ""
10932
10933
#: en/help_topics/conflict-types.txt:268
10934
msgid "There are two possible values for this option:"
10935
msgstr ""
10936
10937
#: en/help_topics/conflict-types.txt:270
10938
msgid ""
10939
"* ``conflict`` (the default): will leave the orphans in place and\n"
10940
" generate a conflicts,"
10941
msgstr ""
10942
10943
#: en/help_topics/conflict-types.txt:273
10944
msgid ""
10945
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10946
"root\n"
10947
" of the working tree with names like ``<file>.~#~``."
10948
msgstr ""
10949
10950
#: en/help_topics/conflict-types.txt:278
10951
msgid ""
10952
"Path conflict\n"
10953
"-------------"
10954
msgstr ""
10955
10956
#: en/help_topics/conflict-types.txt:283
10957
msgid " Path conflict: PATH1 / PATH2"
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:285
10961
msgid ""
10962
"This happens when the source and target have each modified the name or "
10963
"parent\n"
10964
"directory of a file. Bazaar will use the path elements from the source."
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:288
10968
msgid ""
10969
"To resolve that kind of conflict, you just have to decide what name should "
10970
"be\n"
10971
"retained for the file involved."
10972
msgstr ""
10973
10974
#: en/help_topics/conflict-types.txt:293
10975
msgid ""
10976
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10977
" issuing ``bzr mv PATH2 PATH1``,\n"
10978
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10979
"``PATH2``,\n"
10980
"* ``--action=done`` will just mark the conflict as resolved."
10981
msgstr ""
10982
10983
#: en/help_topics/conflict-types.txt:300
10984
msgid ""
10985
"Parent loop\n"
10986
"-----------"
10987
msgstr ""
10988
10989
#: en/help_topics/conflict-types.txt:305
10990
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:307
10994
msgid ""
10995
"This happens when the source and the target have each moved directories, so\n"
10996
"that, if the change could be applied, a directory would be contained by "
10997
"itself.\n"
10998
"For example::"
10999
msgstr ""
11000
11001
#: en/help_topics/conflict-types.txt:311
11002
msgid ""
11003
" $ bzr init\n"
11004
" $ bzr mkdir white\n"
11005
" $ bzr mkdir black\n"
11006
" $ bzr commit -m \"BASE\"\n"
11007
" $ bzr branch . ../other\n"
11008
" $ bzr mv white black\n"
11009
" $ bzr commit -m \"THIS\"\n"
11010
" $ bzr mv ../other/black ../other/white\n"
11011
" $ bzr commit ../other -m \"OTHER\"\n"
11012
" $ bzr merge ../other"
11013
msgstr ""
11014
11015
#: en/help_topics/conflict-types.txt:322
11016
msgid ""
11017
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11018
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11019
"name should be retained for the directories involved."
11020
msgstr ""
11021
11022
#: en/help_topics/conflict-types.txt:328
11023
msgid ""
11024
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11025
"\n"
11026
" in ``black``,\n"
11027
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11028
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11029
"* ``--action=done`` will just mark the conflict as resolved."
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:336
11033
msgid ""
11034
"Non-directory parent\n"
11035
"--------------------"
11036
msgstr ""
11037
11038
#: en/help_topics/conflict-types.txt:341
11039
msgid ""
11040
" Conflict: foo.new is not a directory, but has files in it.\n"
11041
" Created directory."
11042
msgstr ""
11043
11044
#: en/help_topics/conflict-types.txt:344
11045
msgid ""
11046
"This happens when one side has added files to a directory, and the other "
11047
"side\n"
11048
"has changed the directory into a file or symlink. For example::"
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:347
11052
msgid ""
11053
" $ bzr init\n"
11054
" $ bzr mkdir foo\n"
11055
" $ bzr commit -m \"BASE\"\n"
11056
" $ bzr branch . ../other\n"
11057
" $ rmdir foo\n"
11058
" $ touch foo\n"
11059
" $ bzr commit -m \"THIS\"\n"
11060
" $ bzr mkdir ../other/foo/bar\n"
11061
" $ bzr commit ../other -m \"OTHER\"\n"
11062
" $ bzr merge ../other"
11063
msgstr ""
11064
11065
#: en/help_topics/conflict-types.txt:358
11066
msgid ""
11067
"To resolve that kind of conflict, you have to decide what name should be\n"
11068
"retained for the file, directory or symlink involved."
11069
msgstr ""
11070
11071
#: en/help_topics/conflict-types.txt:363
11072
msgid ""
11073
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11074
" ``bzr add foo``,\n"
11075
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11076
" ``bzr mv foo.new foo``,\n"
11077
"* ``--action=done`` will just mark the conflict as resolved."
11078
msgstr ""
11079
11080
#: en/help_topics/conflict-types.txt:371
11081
msgid ""
11082
"MalformedTransform\n"
11083
"------------------"
11084
msgstr ""
11085
11086
#: en/help_topics/conflict-types.txt:374
11087
msgid ""
11088
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11089
"exception. This means that Bazaar encountered a filesystem conflict that it "
11090
"was\n"
11091
"unable to resolve. This usually indicates a bug. Please let us know if "
11092
"you\n"
11093
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11094
msgstr ""
11095
11096
#: en/help_topics/content-filters.txt:1
11097
msgid ""
11098
"Content Filters\n"
11099
"==============="
11100
msgstr ""
11101
11102
#: en/help_topics/content-filters.txt:4
11103
msgid ""
11104
"Content formats\n"
11105
"---------------"
11106
msgstr ""
11107
11108
#: en/help_topics/content-filters.txt:7
11109
msgid ""
11110
"Bazaar's content filtering allows you to store files in a different\n"
11111
"format from the copy in your working tree. This lets you, or your\n"
11112
"co-developers, use Windows development tools that expect CRLF files\n"
11113
"on projects that use other line-ending conventions. Among other things,\n"
11114
"content filters also let Unix developers more easily work on projects\n"
11115
"using Windows line-ending conventions, keyword expansion/compression,\n"
11116
"and trailing spaces on lines in text files to be implicitly stripped\n"
11117
"when committed."
11118
msgstr ""
11119
11120
#: en/help_topics/content-filters.txt:16
11121
msgid "To generalize, there are two content formats supported by Bazaar:"
11122
msgstr ""
11123
11124
#: en/help_topics/content-filters.txt:18
11125
msgid ""
11126
"* a canonical format - how files are stored internally\n"
11127
"* a convenience format - how files are created in a working tree."
11128
msgstr ""
11129
11130
#: en/help_topics/content-filters.txt:21
11131
msgid ""
11132
"\n"
11133
"Format conversion\n"
11134
"-----------------"
11135
msgstr ""
11136
11137
#: en/help_topics/content-filters.txt:25
11138
msgid ""
11139
"The conversion between these formats is done by content filters.\n"
11140
"A content filter has two parts:"
11141
msgstr ""
11142
11143
#: en/help_topics/content-filters.txt:28
11144
msgid ""
11145
"* a read converter - converts from convenience to canonical format\n"
11146
"* a write converter - converts from canonical to convenience format."
11147
msgstr ""
11148
11149
#: en/help_topics/content-filters.txt:31
11150
msgid ""
11151
"Many of these converters will provide *round-trip* conversion,\n"
11152
"i.e. applying the read converter followed by the write converter\n"
11153
"gives back the original content. However, others may provide an\n"
11154
"asymmetric conversion. For example, a read converter might strip\n"
11155
"trailing whitespace off lines in source code while the matching\n"
11156
"write converter might pass content through unchanged."
11157
msgstr ""
11158
11159
#: en/help_topics/content-filters.txt:38
11160
msgid ""
11161
"\n"
11162
"Enabling content filters\n"
11163
"------------------------"
11164
msgstr ""
11165
11166
#: en/help_topics/content-filters.txt:42
11167
msgid ""
11168
"Content filters are typically provided by plugins, so the first step\n"
11169
"in using them is to install the relevant plugins and read their\n"
11170
"documentation. Some plugins may be very specific about which files\n"
11171
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11172
"In other cases, the plugin may leave it in the user's hands to\n"
11173
"define which files are to be filtered. This is typically done\n"
11174
"using rule-based preferences. See ``bzr help rules`` for general\n"
11175
"information about defining these."
11176
msgstr ""
11177
11178
#: en/help_topics/content-filters.txt:51
11179
msgid ""
11180
"\n"
11181
"Impact on commands\n"
11182
"------------------"
11183
msgstr ""
11184
11185
#: en/help_topics/content-filters.txt:55
11186
msgid ""
11187
"Read converters are only applied to commands that read content from\n"
11188
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11189
"will apply read converters to files in the working tree, then compare\n"
11190
"the results to the content last committed."
11191
msgstr ""
11192
11193
#: en/help_topics/content-filters.txt:60
11194
msgid ""
11195
"Write converters are only applied by commands that **create files in a\n"
11196
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11197
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11198
"respectively."
11199
msgstr ""
11200
11201
#: en/help_topics/content-filters.txt:65
11202
msgid ""
11203
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11204
"comitting files. If this makes sense for a given plugin providing\n"
11205
"a content filter, the plugin can usually achieve this effect by using a\n"
11206
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11207
"for more information on hooks."
11208
msgstr ""
11209
11210
#: en/help_topics/content-filters.txt:71
11211
msgid ""
11212
"\n"
11213
"Refreshing your working tree\n"
11214
"----------------------------"
11215
msgstr ""
11216
11217
#: en/help_topics/content-filters.txt:75
11218
msgid ""
11219
"For performance reasons, Bazaar caches the timestamps of files in\n"
11220
"a working tree, and assumes files are unchanged if their timestamps\n"
11221
"match the cached values. As a consequence, there are times when\n"
11222
"you may need to explicitly ask for content filtering to be reapplied\n"
11223
"in one or both directions, e.g. after installing or reconfiguring\n"
11224
"plugins providing it."
11225
msgstr ""
11226
11227
#: en/help_topics/content-filters.txt:82
11228
msgid "Here are some general guidelines for doing this:"
11229
msgstr ""
11230
11231
#: en/help_topics/content-filters.txt:84
11232
msgid ""
11233
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11234
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11235
" relevant read converters and compare the end result with the\n"
11236
" canonical format."
11237
msgstr ""
11238
11239
#: en/help_topics/content-filters.txt:89
11240
msgid ""
11241
" * To reapply write converters, ensure there are no local changes,\n"
11242
" delete the relevant files and run ``bzr revert`` on those files."
11243
msgstr ""
11244
11245
#: en/help_topics/content-filters.txt:92
11246
msgid ""
11247
"Note: In the future, it is likely that additional options will be added\n"
11248
"to commands to make this refreshing process faster and safer.\n"
11249
msgstr ""
11250
11251
#: en/help_topics/current-formats.txt:1
11252
msgid "Current Storage Formats"
11253
msgstr ""
11254
11255
#: en/help_topics/current-formats.txt:3
11256
msgid ""
11257
":2a:\n"
11258
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11259
" compress storage. Provides rich roots which are a one-way\n"
11260
" transition."
11261
msgstr ""
11262
11263
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11264
msgid ""
11265
"\n"
11266
"See :doc:`formats-help` for more about storage formats."
11267
msgstr ""
11268
11269
#: en/help_topics/debug-flags.txt:1
11270
msgid ""
11271
"Debug Flags\n"
11272
"==========="
11273
msgstr ""
11274
11275
#: en/help_topics/debug-flags.txt:4
11276
msgid ""
11277
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11278
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11279
msgstr ""
11280
11281
#: en/help_topics/debug-flags.txt:7
11282
msgid ""
11283
"-Dauth Trace authentication sections used.\n"
11284
"-Dbytes Print out how many bytes were transferred\n"
11285
"-Ddirstate Trace dirstate activity (verbose!)\n"
11286
"-Derror Instead of normal error handling, always print a "
11287
"traceback\n"
11288
" on error.\n"
11289
"-Devil Capture call sites that do expensive or badly-scaling\n"
11290
" operations.\n"
11291
"-Dfetch Trace history copying between repositories.\n"
11292
"-Dfilters Emit information for debugging content filtering.\n"
11293
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11294
"fetch.\n"
11295
"-Dgraph Trace graph traversal.\n"
11296
"-Dhashcache Log every time a working file is read to determine its "
11297
"hash.\n"
11298
"-Dhooks Trace hook execution.\n"
11299
"-Dhpss Trace smart protocol requests and responses.\n"
11300
"-Dhpssdetail More hpss details.\n"
11301
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11302
"-Dhttp Trace http connections, requests and responses.\n"
11303
"-Dindex Trace major index operations.\n"
11304
"-Dknit Trace knit operations.\n"
11305
"-Dlock Trace when lockdir locks are taken or released.\n"
11306
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11307
" retrying the request.\n"
11308
"-Dprogress Trace progress bar operations.\n"
11309
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11310
"-Dmerge Emit information for debugging merges.\n"
11311
"-Dno_apport Don't use apport to report crashes.\n"
11312
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11313
"-Dpack Emit information about pack operations.\n"
11314
"-Drelock Emit a message every time a branch or repository object "
11315
"is\n"
11316
" unlocked then relocked the same way.\n"
11317
"-Dsftp Trace SFTP internals.\n"
11318
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11319
"expected\n"
11320
"-Dstream Trace fetch streams.\n"
11321
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11322
"portable\n"
11323
" manner.\n"
11324
"-Dunlock Some errors during unlock are treated as warnings.\n"
11325
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11326
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11327
"appropriate\n"
11328
" for the format, even for non-local fetches.\n"
11329
msgstr ""
11330
11331
#: en/help_topics/diverged-branches.txt:1
11332
msgid ""
11333
"Diverged Branches\n"
11334
"================="
11335
msgstr ""
11336
11337
#: en/help_topics/diverged-branches.txt:4
11338
msgid ""
11339
"When Bazaar tries to push one branch onto another, it requires that the\n"
11340
"destination branch must be ready to receive the source branch. If this "
11341
"isn't\n"
11342
"the case, then we say that the branches have ``diverged``. Branches are\n"
11343
"considered diverged if the destination branch's most recent commit is one "
11344
"that\n"
11345
"has not been merged (directly or indirectly) by the source branch. To "
11346
"recover\n"
11347
"from diverged branches, one must merge the missing revisions into the "
11348
"source\n"
11349
"branch."
11350
msgstr ""
11351
11352
#: en/help_topics/diverged-branches.txt:12
11353
msgid ""
11354
"This situation commonly arises when using a centralized workflow with local\n"
11355
"commits. If someone else has committed new work to the mainline since your\n"
11356
"last pull and you have local commits that have not yet been pushed to the\n"
11357
"mainline, then your local branch and the mainline have diverged."
11358
msgstr ""
11359
11360
#: en/help_topics/diverged-branches.txt:17
11361
msgid ""
11362
"Discovering What Has Diverged\n"
11363
"-----------------------------"
11364
msgstr ""
11365
11366
#: en/help_topics/diverged-branches.txt:20
11367
msgid ""
11368
"The ``bzr missing`` command is used to find out what revisions are in "
11369
"another\n"
11370
"branch that are not present in the current branch, and vice-versa. It shows "
11371
"a\n"
11372
"summary of which extra revisions exist in each branch. If you want to see "
11373
"the\n"
11374
"precise effects of those revisions, you can use ``bzr diff --"
11375
"old=other_branch``\n"
11376
"to show the differences between other_branch and your current branch."
11377
msgstr ""
11378
11379
#: en/help_topics/diverged-branches.txt:26
11380
msgid ""
11381
"A Solution\n"
11382
"----------"
11383
msgstr ""
11384
11385
#: en/help_topics/diverged-branches.txt:29
11386
msgid ""
11387
"The solution is to merge the revisions from the mainline into your local\n"
11388
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11389
"mainline. This merge may result in conflicts if the other developer's "
11390
"changes\n"
11391
"overlap with your changes. These conflicts should be resolved before\n"
11392
"continuing. After any conflicts have been resolved, or even if there were "
11393
"no\n"
11394
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11395
"to your local branch. This requirement gives you an opportunity to test "
11396
"the\n"
11397
"resulting working tree for correctness, since the merged revisions could "
11398
"have\n"
11399
"made arbitrary changes. After testing, you should commit the merge using\n"
11400
"``bzr commit``. This clears up the diverged branches situation. Your "
11401
"local\n"
11402
"branch can now be pushed to the mainline.\n"
11403
msgstr ""
11404
11405
#: en/help_topics/env-variables.txt:1
11406
msgid "Environment Variables"
11407
msgstr ""
11408
11409
#: en/help_topics/env-variables.txt:3
11410
msgid ""
11411
"=================== "
11412
"===========================================================\n"
11413
"BZRPATH Path where bzr is to look for shell plugin external\n"
11414
" commands.\n"
11415
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11416
"EMAIL E-Mail address of the user.\n"
11417
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11418
"EDITOR Editor for editing commit messages.\n"
11419
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11420
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11421
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11422
"BZR_PLUGIN_PATH.\n"
11423
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11424
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11425
"and\n"
11426
" HOME.\n"
11427
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11428
"URLs).\n"
11429
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11430
"sshcorp,\n"
11431
" plink or lsh.\n"
11432
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11433
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11434
"BZR_COLUMNS Override implicit terminal width.\n"
11435
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11436
"(selftest)\n"
11437
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11438
"'text'.\n"
11439
"BZR_PDB Control whether to launch a debugger on error.\n"
11440
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11441
" breakin debugger.\n"
11442
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11443
"(instead\n"
11444
" of char-based).\n"
11445
"=================== "
11446
"===========================================================\n"
11447
msgstr ""
11448
11449
#: en/help_topics/eol.txt:1
11450
msgid ""
11451
"End of Line Conversion\n"
11452
"======================"
11453
msgstr ""
11454
11455
#: en/help_topics/eol.txt:4
11456
msgid ""
11457
"EOL conversion is provided as a content filter where Bazaar internally\n"
11458
"stores a canonical format but outputs a convenience format. See\n"
11459
"``bzr help content-filters`` for general information about using these."
11460
msgstr ""
11461
11462
#: en/help_topics/eol.txt:8
11463
msgid ""
11464
"Note: Content filtering is only supported in recently added formats,\n"
11465
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11466
"in a recent format. (Just setting the format on the repository\n"
11467
"is not enough.) If content filtering does not appear to be working, use\n"
11468
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11469
"or later."
11470
msgstr ""
11471
11472
#: en/help_topics/eol.txt:15
11473
msgid ""
11474
"EOL conversion needs to be enabled for selected file patterns using\n"
11475
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11476
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11477
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11478
"supported in a future verison of Bazaar."
11479
msgstr ""
11480
11481
#: en/help_topics/eol.txt:21
11482
msgid ""
11483
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11484
"(If a value is not set, ``exact`` is the default.)"
11485
msgstr ""
11486
11487
#: en/help_topics/eol.txt:24
11488
msgid ""
11489
" ========== ===================================== ======================\n"
11490
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11491
" ========== ===================================== ======================\n"
11492
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11493
" ---------- ------------------------------------- ----------------------\n"
11494
" ``lf`` ``lf`` ``lf``\n"
11495
" ---------- ------------------------------------- ----------------------\n"
11496
" ``crlf`` ``crlf`` ``lf``\n"
11497
" ---------- ------------------------------------- ----------------------\n"
11498
" ``exact`` No conversion Exactly as in file\n"
11499
" ========== ===================================== ======================"
11500
msgstr ""
11501
11502
#: en/help_topics/eol.txt:36
11503
msgid ""
11504
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11505
"byte is detected in the file."
11506
msgstr ""
11507
11508
#: en/help_topics/eol.txt:39
11509
msgid ""
11510
"For users working on a cross-platform project, here is a suggested rule\n"
11511
"to use as a starting point::"
11512
msgstr ""
11513
11514
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11515
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11516
msgid ""
11517
" [name *]\n"
11518
" eol = native"
11519
msgstr ""
11520
11521
#: en/help_topics/eol.txt:45
11522
msgid ""
11523
"If you have binary files that do not contain a null byte though, be\n"
11524
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11525
"by giving more explicit patterns earlier in the rules file. For example::"
11526
msgstr ""
11527
11528
#: en/help_topics/eol.txt:49
11529
msgid ""
11530
" [name *.png]\n"
11531
" eol = exact"
11532
msgstr ""
11533
11534
#: en/help_topics/eol.txt:55
11535
msgid ""
11536
"If your working tree is on a network drive shared by users on different\n"
11537
"operating systems, you typically want to force certain conventions for\n"
11538
"certain files. In that way, if a file is created with the wrong line\n"
11539
"endings or line endings get mixed during editing, it gets committed\n"
11540
"correctly and gets checked out correctly. For example::"
11541
msgstr ""
11542
11543
#: en/help_topics/eol.txt:61
11544
msgid ""
11545
" [name *.bat]\n"
11546
" eol = crlf"
11547
msgstr ""
11548
11549
#: en/help_topics/eol.txt:64
11550
msgid ""
11551
" [name *.sh]\n"
11552
" eol = lf"
11553
msgstr ""
11554
11555
#: en/help_topics/eol.txt:70
11556
msgid ""
11557
"If you take the care to create files with their required endings, you can\n"
11558
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11559
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11560
"introducing mixed line endings will be corrected during commit for files\n"
11561
"with those settings."
11562
msgstr ""
11563
11564
#: en/help_topics/eol.txt:76
11565
msgid ""
11566
"If you have sample test data that deliberately has text files with mixed\n"
11567
"newline conventions, you can ask for those to be left alone like this::"
11568
msgstr ""
11569
11570
#: en/help_topics/eol.txt:79
11571
msgid ""
11572
" [name test_data/]\n"
11573
" eol = exact"
11574
msgstr ""
11575
11576
#: en/help_topics/eol.txt:85
11577
msgid ""
11578
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11579
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11580
"of content analysis to detect binary files for commands like ``diff``.\n"
11581
"In the future, a ``binary = true`` rule may be added but it is not\n"
11582
"supported yet.)"
11583
msgstr ""
11584
11585
#: en/help_topics/eol.txt:91
11586
msgid ""
11587
"If you have an existing repository with text files already stored using\n"
11588
"Windows newline conventions (``crlf``), then you may want to keep using "
11589
"that\n"
11590
"convention in the repository. Forcing certain files to this convention\n"
11591
"may also help users who do not have rules configured. To do this, set\n"
11592
"``eol`` to one of the values below."
11593
msgstr ""
11594
11595
#: en/help_topics/eol.txt:97
11596
msgid ""
11597
" ============================ ======================== "
11598
"======================\n"
11599
" Value Checkout end-of-lines as Commit end-of-lines "
11600
"as\n"
11601
" ============================ ======================== "
11602
"======================\n"
11603
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11604
" ``lf`` otherwise\n"
11605
" ---------------------------- ------------------------ ----------------------"
11606
"\n"
11607
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11608
" ---------------------------- ------------------------ ----------------------"
11609
"\n"
11610
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11611
" ============================ ======================== ======================"
11612
msgstr ""
11613
11614
#: en/help_topics/eol.txt:108
11615
msgid ""
11616
"For users working on an existing project that uses Windows newline\n"
11617
"conventions in their Bazaar repository, this rule is suggested as a\n"
11618
"starting point::"
11619
msgstr ""
11620
11621
#: en/help_topics/eol.txt:112
11622
msgid ""
11623
" [name *]\n"
11624
" eol = native-with-crlf-in-repo"
11625
msgstr ""
11626
11627
#: en/help_topics/eol.txt:115
11628
msgid ""
11629
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11630
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11631
"``crlf`` and ``exact``."
11632
msgstr ""
11633
11634
#: en/help_topics/eol.txt:119
11635
msgid ""
11636
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11637
"never reject files because a given line ending or mixed line endings\n"
11638
"are found. A precommit hook should be used if you wish to validate\n"
11639
"(and not just convert) content before committing.\n"
11640
msgstr ""
11641
11642
#: en/help_topics/hidden-commands.txt:1
11643
msgid ""
11644
"added List files added in working tree.\n"
11645
"ancestry List all revisions merged into this branch.\n"
11646
"assert-fail Test reporting of assertion failures\n"
11647
"bundle-info Output interesting stats about a bundle\n"
11648
"bundle-revisions Create a merge-directive for submitting changes.\n"
11649
"cat-revision Write out metadata for a revision.\n"
11650
"dump-btree Dump the contents of a btree index file to stdout.\n"
11651
"export-pot Export command helps and error messages in po format.\n"
11652
"file-id Print file_id of a particular file or directory.\n"
11653
"file-path Print path of file_ids to a file or directory.\n"
11654
"find-merge-base Find and print a base revision for merging two "
11655
"branches.\n"
11656
"hooks Show hooks.\n"
11657
"inventory Show inventory of the current working copy or a "
11658
"revision.\n"
11659
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11660
"lookup-revision Lookup the revision-id from a revision-number\n"
11661
"merge-directive Generate a merge directive for auto-merge tools.\n"
11662
"modified List files modified in working tree.\n"
11663
"re-sign Create a digital signature for an existing revision.\n"
11664
"reference list, view and set branch locations for nested trees.\n"
11665
"relpath Show path of a file relative to root\n"
11666
"repair-workingtree Reset the working tree state file.\n"
11667
"revision-history Display the list of revision ids on a branch.\n"
11668
"revision-info Show revision number and revision id for a given "
11669
"revision\n"
11670
" identifier.\n"
11671
"rocks Statement of optimism.\n"
11672
"selftest Run internal test suite.\n"
11673
"shell-complete Show appropriate completions for context.\n"
11674
"test-script Run a shell-like test from a file.\n"
11675
"touching-revisions Return revision-ids which affected a particular file.\n"
11676
"unknowns List unknown files.\n"
11677
"wait-until-signalled Test helper for\n"
11678
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11679
msgstr ""
11680
11681
#: en/help_topics/hooks.txt:1
11682
msgid ""
11683
"\n"
11684
"Hooks\n"
11685
"====="
11686
msgstr ""
11687
11688
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11689
msgid ""
11690
"Introduction\n"
11691
"------------"
11692
msgstr ""
11693
11694
#: en/help_topics/hooks.txt:8
11695
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11696
msgstr ""
11697
11698
#: en/help_topics/hooks.txt:10
11699
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11700
msgstr ""
11701
11702
#: en/help_topics/hooks.txt:12
11703
msgid ""
11704
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11705
msgstr ""
11706
11707
#: en/help_topics/hooks.txt:14
11708
msgid ""
11709
"The class that contains each hook is given before the hooks it supplies. "
11710
"For\n"
11711
"instance, BranchHooks as the class is the hooks class for\n"
11712
"`bzrlib.branch.Branch.hooks`."
11713
msgstr ""
11714
11715
#: en/help_topics/hooks.txt:18
11716
msgid ""
11717
"Each description also indicates whether the hook runs on the client (the\n"
11718
"machine where bzr was invoked) or the server (the machine addressed by\n"
11719
"the branch URL). These may be, but are not necessarily, the same machine."
11720
msgstr ""
11721
11722
#: en/help_topics/hooks.txt:22
11723
msgid ""
11724
"Plugins (including hooks) are run on the server if all of these is true:"
11725
msgstr ""
11726
11727
#: en/help_topics/hooks.txt:24
11728
msgid ""
11729
" * The connection is via a smart server (accessed with a URL starting with\n"
11730
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11731
"\"http://\"\n"
11732
" URL when a smart server is available via HTTP)."
11733
msgstr ""
11734
11735
#: en/help_topics/hooks.txt:28
11736
msgid ""
11737
" * The hook is either server specific or part of general infrastructure "
11738
"rather\n"
11739
" than client specific code (such as commit)."
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:31
11743
msgid ""
11744
"\n"
11745
"BranchHooks\n"
11746
"-----------"
11747
msgstr ""
11748
11749
#: en/help_topics/hooks.txt:35
11750
msgid ""
11751
"automatic_tag_name\n"
11752
"~~~~~~~~~~~~~~~~~~"
11753
msgstr ""
11754
11755
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11756
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11757
msgid "Introduced in: 2.2"
11758
msgstr ""
11759
11760
#: en/help_topics/hooks.txt:40
11761
msgid ""
11762
"Called to determine an automatic tag name for a revision.\n"
11763
"automatic_tag_name is called with (branch, revision_id) and should\n"
11764
"return a tag name or None if no tag name could be determined. The\n"
11765
"first non-None tag name returned will be used."
11766
msgstr ""
11767
11768
#: en/help_topics/hooks.txt:45
11769
msgid ""
11770
"open\n"
11771
"~~~~"
11772
msgstr ""
11773
11774
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11775
#: en/help_topics/hooks.txt:307
11776
msgid "Introduced in: 1.8"
11777
msgstr ""
11778
11779
#: en/help_topics/hooks.txt:50
11780
msgid ""
11781
"Called with the Branch object that has been opened after a branch is\n"
11782
"opened."
11783
msgstr ""
11784
11785
#: en/help_topics/hooks.txt:53
11786
msgid ""
11787
"post_branch_init\n"
11788
"~~~~~~~~~~~~~~~~"
11789
msgstr ""
11790
11791
#: en/help_topics/hooks.txt:58
11792
msgid ""
11793
"Called after new branch initialization completes. post_branch_init is\n"
11794
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11795
"branch and checkout (both heavyweight and lightweight) will all\n"
11796
"trigger this hook."
11797
msgstr ""
11798
11799
#: en/help_topics/hooks.txt:63
11800
msgid ""
11801
"post_change_branch_tip\n"
11802
"~~~~~~~~~~~~~~~~~~~~~~"
11803
msgstr ""
11804
11805
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11806
msgid "Introduced in: 1.4"
11807
msgstr ""
11808
11809
#: en/help_topics/hooks.txt:68
11810
msgid ""
11811
"Called in bzr client and server after a change to the tip of a branch\n"
11812
"is made. post_change_branch_tip is called with a\n"
11813
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11814
"uncommit will all trigger this hook."
11815
msgstr ""
11816
11817
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11818
msgid ""
11819
"post_commit\n"
11820
"~~~~~~~~~~~"
11821
msgstr ""
11822
11823
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11824
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11825
msgid "Introduced in: 0.15"
11826
msgstr ""
11827
11828
#: en/help_topics/hooks.txt:78
11829
msgid ""
11830
"Called in the bzr client after a commit has completed. post_commit is\n"
11831
"called with (local, master, old_revno, old_revid, new_revno,\n"
11832
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11833
"branch."
11834
msgstr ""
11835
11836
#: en/help_topics/hooks.txt:83
11837
msgid ""
11838
"post_pull\n"
11839
"~~~~~~~~~"
11840
msgstr ""
11841
11842
#: en/help_topics/hooks.txt:88
11843
msgid ""
11844
"Called after a pull operation completes. post_pull is called with a\n"
11845
"bzrlib.branch.PullResult object and only runs in the bzr client."
11846
msgstr ""
11847
11848
#: en/help_topics/hooks.txt:91
11849
msgid ""
11850
"post_push\n"
11851
"~~~~~~~~~"
11852
msgstr ""
11853
11854
#: en/help_topics/hooks.txt:96
11855
msgid ""
11856
"Called after a push operation completes. post_push is called with a\n"
11857
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11858
msgstr ""
11859
11860
#: en/help_topics/hooks.txt:99
11861
msgid ""
11862
"post_switch\n"
11863
"~~~~~~~~~~~"
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:104
11867
msgid ""
11868
"Called after a checkout switches branch. post_switch is called with a\n"
11869
"bzrlib.branch.SwitchHookParams."
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:107
11873
msgid ""
11874
"post_uncommit\n"
11875
"~~~~~~~~~~~~~"
11876
msgstr ""
11877
11878
#: en/help_topics/hooks.txt:112
11879
msgid ""
11880
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11881
"called with (local, master, old_revno, old_revid, new_revno,\n"
11882
"new_revid) where local is the local branch or None, master is the\n"
11883
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11884
"of None."
11885
msgstr ""
11886
11887
#: en/help_topics/hooks.txt:118
11888
msgid ""
11889
"pre_change_branch_tip\n"
11890
"~~~~~~~~~~~~~~~~~~~~~"
11891
msgstr ""
11892
11893
#: en/help_topics/hooks.txt:121
11894
msgid "Introduced in: 1.6"
11895
msgstr ""
11896
11897
#: en/help_topics/hooks.txt:123
11898
msgid ""
11899
"Called in bzr client and server before a change to the tip of a branch\n"
11900
"is made. pre_change_branch_tip is called with a\n"
11901
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11902
"uncommit will all trigger this hook."
11903
msgstr ""
11904
11905
#: en/help_topics/hooks.txt:128
11906
msgid ""
11907
"pre_commit\n"
11908
"~~~~~~~~~~"
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:131
11912
msgid "Introduced in: 0.91"
11913
msgstr ""
11914
11915
#: en/help_topics/hooks.txt:133
11916
msgid ""
11917
"Called after a commit is calculated but before it is completed.\n"
11918
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11919
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11920
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11921
"TreeDelta object describing changes from the basis revision. hooks\n"
11922
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11923
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11924
"tree."
11925
msgstr ""
11926
11927
#: en/help_topics/hooks.txt:142
11928
msgid ""
11929
"transform_fallback_location\n"
11930
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11931
msgstr ""
11932
11933
#: en/help_topics/hooks.txt:145
11934
msgid "Introduced in: 1.9"
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:147
11938
msgid ""
11939
"Called when a stacked branch is activating its fallback locations.\n"
11940
"transform_fallback_location is called with (branch, url), and should\n"
11941
"return a new url. Returning the same url allows it to be used as-is,\n"
11942
"returning a different one can be used to cause the branch to stack on\n"
11943
"a closer copy of that fallback_location. Note that the branch cannot\n"
11944
"have history accessing methods called on it during this hook because\n"
11945
"the fallback locations have not been activated. When there are\n"
11946
"multiple hooks installed for transform_fallback_location, all are\n"
11947
"called with the url returned from the previous hook.The order is\n"
11948
"however undefined."
11949
msgstr ""
11950
11951
#: en/help_topics/hooks.txt:158
11952
msgid ""
11953
"CommandHooks\n"
11954
"------------"
11955
msgstr ""
11956
11957
#: en/help_topics/hooks.txt:161
11958
msgid ""
11959
"extend_command\n"
11960
"~~~~~~~~~~~~~~"
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:164
11964
msgid "Introduced in: 1.13"
11965
msgstr ""
11966
11967
#: en/help_topics/hooks.txt:166
11968
msgid ""
11969
"Called after creating a command object to allow modifications such as\n"
11970
"adding or removing options, docs etc. Called with the new\n"
11971
"bzrlib.commands.Command object."
11972
msgstr ""
11973
11974
#: en/help_topics/hooks.txt:170
11975
msgid ""
11976
"get_command\n"
11977
"~~~~~~~~~~~"
11978
msgstr ""
11979
11980
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11981
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11982
msgid "Introduced in: 1.17"
11983
msgstr ""
11984
11985
#: en/help_topics/hooks.txt:175
11986
msgid ""
11987
"Called when creating a single command. Called with (cmd_or_None,\n"
11988
"command_name). get_command should either return the cmd_or_None\n"
11989
"parameter, or a replacement Command object that should be used for the\n"
11990
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11991
"Many users will prefer to use bzrlib.commands.register_command or\n"
11992
"plugin_cmds.register_lazy."
11993
msgstr ""
11994
11995
#: en/help_topics/hooks.txt:182
11996
msgid ""
11997
"get_missing_command\n"
11998
"~~~~~~~~~~~~~~~~~~~"
11999
msgstr ""
12000
12001
#: en/help_topics/hooks.txt:187
12002
msgid ""
12003
"Called when creating a single command if no command could be found.\n"
12004
"Called with (command_name). get_missing_command should either return\n"
12005
"None, or a Command object to be used for the command."
12006
msgstr ""
12007
12008
#: en/help_topics/hooks.txt:191
12009
msgid ""
12010
"list_commands\n"
12011
"~~~~~~~~~~~~~"
12012
msgstr ""
12013
12014
#: en/help_topics/hooks.txt:196
12015
msgid ""
12016
"Called when enumerating commands. Called with a set of cmd_name\n"
12017
"strings for all the commands found so far. This set is safe to mutate\n"
12018
"- e.g. to remove a command. list_commands should return the updated\n"
12019
"set of command names."
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:201
12023
msgid ""
12024
"post_command\n"
12025
"~~~~~~~~~~~~"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12029
msgid "Introduced in: 2.6"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:206
12033
msgid "Called after executing a command. Called with the command object."
12034
msgstr ""
12035
12036
#: en/help_topics/hooks.txt:208
12037
msgid ""
12038
"pre_command\n"
12039
"~~~~~~~~~~~"
12040
msgstr ""
12041
12042
#: en/help_topics/hooks.txt:213
12043
msgid "Called prior to executing a command. Called with the command object."
12044
msgstr ""
12045
12046
#: en/help_topics/hooks.txt:215
12047
msgid ""
12048
"_ConfigHooks\n"
12049
"------------"
12050
msgstr ""
12051
12052
#: en/help_topics/hooks.txt:218
12053
msgid ""
12054
"get\n"
12055
"~~~"
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12059
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12060
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12061
#: en/help_topics/hooks.txt:446
12062
msgid "Introduced in: 2.4"
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:223
12066
msgid ""
12067
"Invoked when a config option is read. The signature is (stack, name,\n"
12068
"value)."
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:226
12072
msgid ""
12073
"load\n"
12074
"~~~~"
12075
msgstr ""
12076
12077
#: en/help_topics/hooks.txt:231
12078
msgid "Invoked when a config store is loaded. The signature is (store)."
12079
msgstr ""
12080
12081
#: en/help_topics/hooks.txt:233
12082
msgid ""
12083
"remove\n"
12084
"~~~~~~"
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:238
12088
msgid ""
12089
"Invoked when a config option is removed. The signature is (stack,\n"
12090
"name)."
12091
msgstr ""
12092
12093
#: en/help_topics/hooks.txt:241
12094
msgid ""
12095
"save\n"
12096
"~~~~"
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:246
12100
msgid "Invoked when a config store is saved. The signature is (store)."
12101
msgstr ""
12102
12103
#: en/help_topics/hooks.txt:248
12104
msgid ""
12105
"set\n"
12106
"~~~"
12107
msgstr ""
12108
12109
#: en/help_topics/hooks.txt:253
12110
msgid ""
12111
"Invoked when a config option is set. The signature is (stack, name,\n"
12112
"value)."
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:256
12116
msgid ""
12117
"ControlDirHooks\n"
12118
"---------------"
12119
msgstr ""
12120
12121
#: en/help_topics/hooks.txt:259
12122
msgid ""
12123
"post_repo_init\n"
12124
"~~~~~~~~~~~~~~"
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:264
12128
msgid ""
12129
"Invoked after a repository has been initialized. post_repo_init is\n"
12130
"called with a bzrlib.controldir.RepoInitHookParams."
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:267
12134
msgid ""
12135
"pre_open\n"
12136
"~~~~~~~~"
12137
msgstr ""
12138
12139
#: en/help_topics/hooks.txt:270
12140
msgid "Introduced in: 1.14"
12141
msgstr ""
12142
12143
#: en/help_topics/hooks.txt:272
12144
msgid ""
12145
"Invoked before attempting to open a ControlDir with the transport that\n"
12146
"the open will use."
12147
msgstr ""
12148
12149
#: en/help_topics/hooks.txt:275
12150
msgid ""
12151
"InfoHooks\n"
12152
"---------"
12153
msgstr ""
12154
12155
#: en/help_topics/hooks.txt:278
12156
msgid ""
12157
"repository\n"
12158
"~~~~~~~~~~"
12159
msgstr ""
12160
12161
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12162
#: en/help_topics/hooks.txt:524
12163
msgid "Introduced in: 1.15"
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:283
12167
msgid ""
12168
"Invoked when displaying the statistics for a repository. repository is\n"
12169
"called with a statistics dictionary as returned by the repository and\n"
12170
"a file-like object to write to."
12171
msgstr ""
12172
12173
#: en/help_topics/hooks.txt:287
12174
msgid ""
12175
"LockHooks\n"
12176
"---------"
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:290
12180
msgid ""
12181
"lock_acquired\n"
12182
"~~~~~~~~~~~~~"
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:295
12186
msgid ""
12187
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:297
12191
msgid ""
12192
"lock_broken\n"
12193
"~~~~~~~~~~~"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:302
12197
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12198
msgstr ""
12199
12200
#: en/help_topics/hooks.txt:304
12201
msgid ""
12202
"lock_released\n"
12203
"~~~~~~~~~~~~~"
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:309
12207
msgid ""
12208
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12209
msgstr ""
12210
12211
#: en/help_topics/hooks.txt:311
12212
msgid ""
12213
"MergeHooks\n"
12214
"----------"
12215
msgstr ""
12216
12217
#: en/help_topics/hooks.txt:314
12218
msgid ""
12219
"merge_file_content\n"
12220
"~~~~~~~~~~~~~~~~~~"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:317
12224
msgid "Introduced in: 2.1"
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:319
12228
msgid ""
12229
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12230
"object when starting a merge. Should return either None or a subclass\n"
12231
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12232
"called per file that needs to be merged (including when one side has\n"
12233
"deleted the file and the other has changed it). See the\n"
12234
"AbstractPerFileMerger API docs for details on how it is used by merge."
12235
msgstr ""
12236
12237
#: en/help_topics/hooks.txt:326
12238
msgid ""
12239
"post_merge\n"
12240
"~~~~~~~~~~"
12241
msgstr ""
12242
12243
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12244
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12245
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12246
msgid "Introduced in: 2.5"
12247
msgstr ""
12248
12249
#: en/help_topics/hooks.txt:331
12250
msgid ""
12251
"Called after a merge. Receives a Merger object as the single argument.\n"
12252
"The return value is ignored."
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:334
12256
msgid ""
12257
"pre_merge\n"
12258
"~~~~~~~~~"
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:339
12262
msgid ""
12263
"Called before a merge. Receives a Merger object as the single\n"
12264
"argument."
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:342
12268
msgid ""
12269
"MergeDirectiveHooks\n"
12270
"-------------------"
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:345
12274
msgid ""
12275
"merge_request_body\n"
12276
"~~~~~~~~~~~~~~~~~~"
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:348
12280
msgid "Introduced in: 1.15.0"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:350
12284
msgid ""
12285
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12286
"request. Callbacks must return a body. If more than one callback is\n"
12287
"registered, the output of one callback is provided to the next."
12288
msgstr ""
12289
12290
#: en/help_topics/hooks.txt:354
12291
msgid ""
12292
"MessageEditorHooks\n"
12293
"------------------"
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:357
12297
msgid ""
12298
"commit_message_template\n"
12299
"~~~~~~~~~~~~~~~~~~~~~~~"
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:360
12303
msgid "Introduced in: 1.10"
12304
msgstr ""
12305
12306
#: en/help_topics/hooks.txt:362
12307
msgid ""
12308
"Called when a commit message is being generated.\n"
12309
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12310
"and the message that is known so far. commit_message_template must\n"
12311
"return a new message to use (which could be the same as it was given).\n"
12312
"When there are multiple hooks registered for commit_message_template,\n"
12313
"they are chained with the result from the first passed into the\n"
12314
"second, and so on."
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:370
12318
msgid ""
12319
"set_commit_message\n"
12320
"~~~~~~~~~~~~~~~~~~"
12321
msgstr ""
12322
12323
#: en/help_topics/hooks.txt:375
12324
msgid ""
12325
"Set a fixed commit message. set_commit_message is called with the\n"
12326
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12327
"properties by editing commit.builder._revprops) and the message so\n"
12328
"far. set_commit_message must return the message to use or None if it\n"
12329
"should use the message editor as normal."
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:381
12333
msgid ""
12334
"MutableTreeHooks\n"
12335
"----------------"
12336
msgstr ""
12337
12338
#: en/help_topics/hooks.txt:384
12339
msgid ""
12340
"post_build_tree\n"
12341
"~~~~~~~~~~~~~~~"
12342
msgstr ""
12343
12344
#: en/help_topics/hooks.txt:389
12345
msgid ""
12346
"Called after a completely new tree is built. The hook is called with\n"
12347
"the tree as its only argument."
12348
msgstr ""
12349
12350
#: en/help_topics/hooks.txt:395
12351
msgid "Introduced in: 2.0"
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:397
12355
msgid ""
12356
"Called after a commit is performed on a tree. The hook is called with\n"
12357
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12358
"commit was performed on is available via the mutable_tree attribute of\n"
12359
"that object."
12360
msgstr ""
12361
12362
#: en/help_topics/hooks.txt:402
12363
msgid ""
12364
"post_transform\n"
12365
"~~~~~~~~~~~~~~"
12366
msgstr ""
12367
12368
#: en/help_topics/hooks.txt:407
12369
msgid ""
12370
"Called after a tree transform has been performed on a tree. The hook\n"
12371
"is called with the tree that is being transformed and the transform."
12372
msgstr ""
12373
12374
#: en/help_topics/hooks.txt:410
12375
msgid ""
12376
"pre_transform\n"
12377
"~~~~~~~~~~~~~"
12378
msgstr ""
12379
12380
#: en/help_topics/hooks.txt:415
12381
msgid ""
12382
"Called before a tree transform on this tree. The hook is called with\n"
12383
"the tree that is being transformed and the transform."
12384
msgstr ""
12385
12386
#: en/help_topics/hooks.txt:418
12387
msgid ""
12388
"start_commit\n"
12389
"~~~~~~~~~~~~"
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:423
12393
msgid ""
12394
"Called before a commit is performed on a tree. The start commit hook\n"
12395
"is able to change the tree before the commit takes place. start_commit\n"
12396
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12397
"being performed on."
12398
msgstr ""
12399
12400
#: en/help_topics/hooks.txt:428
12401
msgid ""
12402
"SmartClientHooks\n"
12403
"----------------"
12404
msgstr ""
12405
12406
#: en/help_topics/hooks.txt:431
12407
msgid ""
12408
"call\n"
12409
"~~~~"
12410
msgstr ""
12411
12412
#: en/help_topics/hooks.txt:434
12413
msgid "Introduced in: unknown"
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:436
12417
msgid ""
12418
"Called when the smart client is submitting a request to the smart\n"
12419
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12420
"Streaming request bodies, and responses, are not accessible."
12421
msgstr ""
12422
12423
#: en/help_topics/hooks.txt:440
12424
msgid ""
12425
"SmartServerHooks\n"
12426
"----------------"
12427
msgstr ""
12428
12429
#: en/help_topics/hooks.txt:443
12430
msgid ""
12431
"server_exception\n"
12432
"~~~~~~~~~~~~~~~~"
12433
msgstr ""
12434
12435
#: en/help_topics/hooks.txt:448
12436
msgid ""
12437
"Called by the bzr server when an exception occurs. server_exception is\n"
12438
"called with the sys.exc_info() tuple return true for the hook if the\n"
12439
"exception has been handled, in which case the server will exit\n"
12440
"normally."
12441
msgstr ""
12442
12443
#: en/help_topics/hooks.txt:453
12444
msgid ""
12445
"server_started\n"
12446
"~~~~~~~~~~~~~~"
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12450
msgid "Introduced in: 0.16"
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:458
12454
msgid ""
12455
"Called by the bzr server when it starts serving a directory.\n"
12456
"server_started is called with (backing urls, public url), where\n"
12457
"backing_url is a list of URLs giving the server-specific directory\n"
12458
"locations, and public_url is the public URL for the directory being\n"
12459
"served."
12460
msgstr ""
12461
12462
#: en/help_topics/hooks.txt:464
12463
msgid ""
12464
"server_started_ex\n"
12465
"~~~~~~~~~~~~~~~~~"
12466
msgstr ""
12467
12468
#: en/help_topics/hooks.txt:469
12469
msgid ""
12470
"Called by the bzr server when it starts serving a directory.\n"
12471
"server_started is called with (backing_urls, server_obj)."
12472
msgstr ""
12473
12474
#: en/help_topics/hooks.txt:472
12475
msgid ""
12476
"server_stopped\n"
12477
"~~~~~~~~~~~~~~"
12478
msgstr ""
12479
12480
#: en/help_topics/hooks.txt:477
12481
msgid ""
12482
"Called by the bzr server when it stops serving a directory.\n"
12483
"server_stopped is called with the same parameters as the\n"
12484
"server_started hook: (backing_urls, public_url)."
12485
msgstr ""
12486
12487
#: en/help_topics/hooks.txt:481
12488
msgid ""
12489
"StatusHooks\n"
12490
"-----------"
12491
msgstr ""
12492
12493
#: en/help_topics/hooks.txt:484
12494
msgid ""
12495
"post_status\n"
12496
"~~~~~~~~~~~"
12497
msgstr ""
12498
12499
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12500
msgid "Introduced in: 2.3"
12501
msgstr ""
12502
12503
#: en/help_topics/hooks.txt:489
12504
msgid ""
12505
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12506
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12507
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12508
"correspond to the command line options specified by the user for the\n"
12509
"status command. to_file is the output stream for writing."
12510
msgstr ""
12511
12512
#: en/help_topics/hooks.txt:495
12513
msgid ""
12514
"pre_status\n"
12515
"~~~~~~~~~~"
12516
msgstr ""
12517
12518
#: en/help_topics/hooks.txt:500
12519
msgid ""
12520
"Called with argument StatusHookParams before Bazaar displays the\n"
12521
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12522
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12523
"correspond to the command line options specified by the user for the\n"
12524
"status command. to_file is the output stream for writing."
12525
msgstr ""
12526
12527
#: en/help_topics/hooks.txt:506
12528
msgid ""
12529
"TransportHooks\n"
12530
"--------------"
12531
msgstr ""
12532
12533
#: en/help_topics/hooks.txt:509
12534
msgid ""
12535
"post_connect\n"
12536
"~~~~~~~~~~~~"
12537
msgstr ""
12538
12539
#: en/help_topics/hooks.txt:514
12540
msgid ""
12541
"Called after a new connection is established or a reconnect occurs.\n"
12542
"The sole argument passed is either the connected transport or smart\n"
12543
"medium instance."
12544
msgstr ""
12545
12546
#: en/help_topics/hooks.txt:518
12547
msgid ""
12548
"RioVersionInfoBuilderHooks\n"
12549
"--------------------------"
12550
msgstr ""
12551
12552
#: en/help_topics/hooks.txt:521
12553
msgid ""
12554
"revision\n"
12555
"~~~~~~~~"
12556
msgstr ""
12557
12558
#: en/help_topics/hooks.txt:526
12559
msgid ""
12560
"Invoked when adding information about a revision to the RIO stanza\n"
12561
"that is printed. revision is called with a revision object and a RIO\n"
12562
"stanza.\n"
12563
msgstr ""
12564
12565
#: en/help_topics/location-alias.txt:1
12566
msgid ""
12567
"Location aliases\n"
12568
"================"
12569
msgstr ""
12570
12571
#: en/help_topics/location-alias.txt:4
12572
msgid ""
12573
"Bazaar defines several aliases for locations associated with a branch. "
12574
"These\n"
12575
"can be used with most commands that expect a location, such as `bzr push`."
12576
msgstr ""
12577
12578
#: en/help_topics/location-alias.txt:7
12579
msgid "The aliases are::"
12580
msgstr ""
12581
12582
#: en/help_topics/location-alias.txt:9
12583
msgid ""
12584
" :bound The branch this branch is bound to, for bound branches.\n"
12585
" :parent The parent of this branch.\n"
12586
" :public The public location of this branch.\n"
12587
" :push The saved location used for `bzr push` with no arguments.\n"
12588
" :submit The submit branch for this branch.\n"
12589
" :this This branch."
12590
msgstr ""
12591
12592
#: en/help_topics/location-alias.txt:16
12593
msgid "For example, to push to the parent location::"
12594
msgstr ""
12595
12596
#: en/help_topics/location-alias.txt:18
12597
msgid " bzr push :parent\n"
12598
msgstr ""
12599
12600
#: en/help_topics/log-formats.txt:1
12601
msgid ""
12602
"Log Formats\n"
12603
"==========="
12604
msgstr ""
12605
12606
#: en/help_topics/log-formats.txt:4
12607
msgid ""
12608
"A log format controls how information about each revision is displayed.\n"
12609
"The standard log formats are compared below::"
12610
msgstr ""
12611
12612
#: en/help_topics/log-formats.txt:7
12613
msgid ""
12614
" Feature long short line\n"
12615
" ---------------------- ------------- ------------ -------------------\n"
12616
" design goal detailed view concise view 1 revision per line\n"
12617
" committer name+email name only name only\n"
12618
" author name+email - -\n"
12619
" date-time format full date only date only\n"
12620
" commit message full full top line\n"
12621
" tags yes yes yes\n"
12622
" merges indicator - yes -\n"
12623
" status/delta optional optional -\n"
12624
" diff/patch optional optional -\n"
12625
" revision-id optional optional -\n"
12626
" branch nick yes - -\n"
12627
" foreign vcs properties yes yes -\n"
12628
" preferred levels all 1 1\n"
12629
" digital signature optional - -"
12630
msgstr ""
12631
12632
#: en/help_topics/log-formats.txt:24
12633
msgid ""
12634
"The default format is ``long``. To change this, define the ``log_format``\n"
12635
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12636
msgstr ""
12637
12638
#: en/help_topics/log-formats.txt:27
12639
msgid ""
12640
" [DEFAULT]\n"
12641
" log_format = short"
12642
msgstr ""
12643
12644
#: en/help_topics/log-formats.txt:30
12645
msgid ""
12646
"Alternatively, to change the log format used for a given query, use the\n"
12647
"--long, --short or --line options."
12648
msgstr ""
12649
12650
#: en/help_topics/log-formats.txt:33
12651
msgid ""
12652
"If one of the standard log formats does not meet your needs, additional\n"
12653
"formats can be provided by plugins.\n"
12654
msgstr ""
12655
12656
#: en/help_topics/other-formats.txt:1
12657
msgid "Other Storage Formats"
12658
msgstr ""
12659
12660
#: en/help_topics/other-formats.txt:3
12661
msgid "Experimental formats are shown below."
12662
msgstr ""
12663
12664
#: en/help_topics/other-formats.txt:5
12665
msgid ""
12666
":development-colo:\n"
12667
" (native) The 2a format with experimental support for colocated\n"
12668
" branches."
12669
msgstr ""
12670
12671
#: en/help_topics/other-formats.txt:9
12672
msgid ""
12673
"\n"
12674
"Deprecated formats are shown below."
12675
msgstr ""
12676
12677
#: en/help_topics/other-formats.txt:12
12678
msgid ""
12679
":pack-0.92:\n"
12680
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12681
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12682
" by bzr < 0.92."
12683
msgstr ""
12684
12685
#: en/help_topics/patterns.txt:1
12686
msgid ""
12687
"Patterns\n"
12688
"========"
12689
msgstr ""
12690
12691
#: en/help_topics/patterns.txt:4
12692
msgid ""
12693
"Bazaar uses patterns to match files at various times. For example,\n"
12694
"the ``add`` command skips over files that match ignore patterns\n"
12695
"and preferences can be associated with files using rule patterns.\n"
12696
"The pattern syntax is described below."
12697
msgstr ""
12698
12699
#: en/help_topics/patterns.txt:9
12700
msgid ""
12701
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12702
"slash or is a regular expression, it is compared to the whole path\n"
12703
"from the branch root. Otherwise, it is compared to only the last\n"
12704
"component of the path. To match a file only in the root directory,\n"
12705
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12706
msgstr ""
12707
12708
#: en/help_topics/patterns.txt:15
12709
msgid "Patterns may include globbing wildcards such as::"
12710
msgstr ""
12711
12712
#: en/help_topics/patterns.txt:17
12713
msgid ""
12714
" ? - Matches any single character except '/'\n"
12715
" * - Matches 0 or more characters except '/'\n"
12716
" /**/ - Matches 0 or more directories in a path\n"
12717
" [a-z] - Matches a single character from within a group of characters"
12718
msgstr ""
12719
12720
#: en/help_topics/patterns.txt:22
12721
msgid ""
12722
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12723
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12724
"expression. Regular expression patterns may not include named or\n"
12725
"numbered groups."
12726
msgstr ""
12727
12728
#: en/help_topics/patterns.txt:27
12729
msgid ""
12730
"Case insensitive ignore patterns can be specified with regular expressions\n"
12731
"by using the ``i`` (for ignore case) flag in the pattern."
12732
msgstr ""
12733
12734
#: en/help_topics/patterns.txt:30
12735
msgid ""
12736
"For example, a case insensitive match for ``foo`` may be specified as::"
12737
msgstr ""
12738
12739
#: en/help_topics/patterns.txt:32
12740
msgid " RE:(?i)foo"
12741
msgstr ""
12742
12743
#: en/help_topics/patterns.txt:34
12744
msgid ""
12745
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12746
"matched by that pattern will not be ignored."
12747
msgstr ""
12748
12749
#: en/help_topics/patterns.txt:37
12750
msgid ""
12751
".. _Python regular expressions: http://docs.python.org/library/re.html"
12752
msgstr ""
12753
12754
#: en/help_topics/revisionspec.txt:1
12755
msgid "Revision Identifiers"
12756
msgstr ""
12757
12758
#: en/help_topics/revisionspec.txt:3
12759
msgid ""
12760
"A revision identifier refers to a specific state of a branch's history. It\n"
12761
"can be expressed in several ways. It can begin with a keyword to\n"
12762
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12763
"'before:yesterday' and 'submit:'."
12764
msgstr ""
12765
12766
#: en/help_topics/revisionspec.txt:8
12767
msgid ""
12768
"Alternately, it can be given without a keyword, in which case it will be\n"
12769
"checked as a revision number, a tag, a revision id, a date specification, or "
12770
"a\n"
12771
"branch specification, in that order. For example, 'date:today' could be\n"
12772
"written as simply 'today', though if you have a tag called 'today' that "
12773
"will\n"
12774
"be found first."
12775
msgstr ""
12776
12777
#: en/help_topics/revisionspec.txt:14
12778
msgid ""
12779
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12780
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12781
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12782
"or\n"
12783
"spaces around the '..')."
12784
msgstr ""
12785
12786
#: en/help_topics/revisionspec.txt:19
12787
msgid ""
12788
"Ranges are interpreted differently by different commands. To the \"log\" "
12789
"command,\n"
12790
"a range is a sequence of log messages, but to the \"diff\" command, the "
12791
"range\n"
12792
"denotes a change between revisions (and not a sequence of changes). In\n"
12793
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12794
"consider it\n"
12795
"to be open-ended, that is, they include one end but not the other. For "
12796
"example:\n"
12797
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12798
"3649,\n"
12799
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12800
"and\n"
12801
"3649, but not 3647."
12802
msgstr ""
12803
12804
#: en/help_topics/revisionspec.txt:28
12805
msgid "The keywords used as revision selection methods are the following:"
12806
msgstr ""
12807
12808
#: en/help_topics/revisionspec.txt:30
12809
msgid ""
12810
":revid:\n"
12811
"\tSelects a revision using the revision id.\n"
12812
":submit:\n"
12813
"\tSelects a common ancestor with the submit branch.\n"
12814
":ancestor:\n"
12815
"\tSelects a common ancestor with a second branch.\n"
12816
":date:\n"
12817
"\tSelects a revision on the basis of a datestamp.\n"
12818
":branch:\n"
12819
"\tSelects the last revision of a specified branch.\n"
12820
":tag:\n"
12821
"\tSelects a revision identified by a tag name.\n"
12822
":revno:\n"
12823
"\tSelects a revision using a number.\n"
12824
":before:\n"
12825
"\tSelects the parent of the revision specified.\n"
12826
":annotate:\n"
12827
"\tSelect the revision that last modified the specified line.\n"
12828
":mainline:\n"
12829
"\tSelect mainline revision that merged the specified revision.\n"
12830
":last:\n"
12831
"\tSelects the nth revision from the end."
12832
msgstr ""
12833
12834
#: en/help_topics/revisionspec.txt:53
12835
msgid "In addition, plugins can provide other keywords."
12836
msgstr ""
12837
12838
#: en/help_topics/revisionspec.txt:55
12839
msgid "A detailed description of each keyword is given below."
12840
msgstr ""
12841
12842
#: en/help_topics/revisionspec.txt:57
12843
msgid ":revid:"
12844
msgstr ""
12845
12846
#: en/help_topics/revisionspec.txt:59
12847
msgid ""
12848
" Supply a specific revision id, that can be used to specify any\n"
12849
" revision id in the ancestry of the branch.\n"
12850
" Including merges, and pending merges.\n"
12851
" Examples::"
12852
msgstr ""
12853
12854
#: en/help_topics/revisionspec.txt:64
12855
msgid ""
12856
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12857
msgstr ""
12858
12859
#: en/help_topics/revisionspec.txt:66
12860
msgid ":submit:"
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:68
12864
msgid ""
12865
" Diffing against this shows all the changes that were made in this "
12866
"branch,\n"
12867
" and is a good predictor of what merge will do. The submit branch is\n"
12868
" used by the bundle and merge directive commands. If no submit branch\n"
12869
" is specified, the parent branch is used instead."
12870
msgstr ""
12871
12872
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12873
msgid ""
12874
" The common ancestor is the last revision that existed in both\n"
12875
" branches. Usually this is the branch point, but it could also be\n"
12876
" a revision that was merged."
12877
msgstr ""
12878
12879
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12880
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12881
#: en/help_topics/revisionspec.txt:153
12882
msgid " Examples::"
12883
msgstr ""
12884
12885
#: en/help_topics/revisionspec.txt:79
12886
msgid " $ bzr diff -r submit:"
12887
msgstr ""
12888
12889
#: en/help_topics/revisionspec.txt:81
12890
msgid ":ancestor:"
12891
msgstr ""
12892
12893
#: en/help_topics/revisionspec.txt:83
12894
msgid " Supply the path to a branch to select the common ancestor."
12895
msgstr ""
12896
12897
#: en/help_topics/revisionspec.txt:89
12898
msgid ""
12899
" This is frequently used with 'diff' to return all of the changes\n"
12900
" that your branch introduces, while excluding the changes that you\n"
12901
" have not merged from the remote branch."
12902
msgstr ""
12903
12904
#: en/help_topics/revisionspec.txt:95
12905
msgid ""
12906
" ancestor:/path/to/branch\n"
12907
" $ bzr diff -r ancestor:../../mainline/branch"
12908
msgstr ""
12909
12910
#: en/help_topics/revisionspec.txt:98
12911
msgid ":date:"
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:100
12915
msgid ""
12916
" Supply a datestamp to select the first revision that matches the date.\n"
12917
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12918
" Matches the first entry after a given date (either at midnight or\n"
12919
" at a specified time)."
12920
msgstr ""
12921
12922
#: en/help_topics/revisionspec.txt:105
12923
msgid " One way to display all the changes since yesterday would be::"
12924
msgstr ""
12925
12926
#: en/help_topics/revisionspec.txt:107
12927
msgid " bzr log -r date:yesterday.."
12928
msgstr ""
12929
12930
#: en/help_topics/revisionspec.txt:111
12931
msgid ""
12932
" date:yesterday -> select the first revision since "
12933
"yesterday\n"
12934
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12935
" August 14th, 2006 at 5:10pm."
12936
msgstr ""
12937
12938
#: en/help_topics/revisionspec.txt:115
12939
msgid ":branch:"
12940
msgstr ""
12941
12942
#: en/help_topics/revisionspec.txt:117
12943
msgid " Supply the path to a branch to select its last revision."
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:121
12947
msgid " branch:/path/to/branch"
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:123
12951
msgid ":tag:"
12952
msgstr ""
12953
12954
#: en/help_topics/revisionspec.txt:125
12955
msgid " Tags are stored in the branch and created by the 'tag' command."
12956
msgstr ""
12957
12958
#: en/help_topics/revisionspec.txt:127
12959
msgid ":revno:"
12960
msgstr ""
12961
12962
#: en/help_topics/revisionspec.txt:129
12963
msgid ""
12964
" Use an integer to specify a revision in the history of the branch.\n"
12965
" Optionally a branch can be specified. A negative number will count\n"
12966
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12967
" one). If the negative number is larger than the branch's history, the\n"
12968
" first revision is returned.\n"
12969
" Examples::"
12970
msgstr ""
12971
12972
#: en/help_topics/revisionspec.txt:136
12973
msgid ""
12974
" revno:1 -> return the first revision of this branch\n"
12975
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12976
" the branch '/path/to/branch'\n"
12977
" revno:-1 -> The last revision in a branch.\n"
12978
" -2:http://other/branch -> The second to last revision in the\n"
12979
" remote branch.\n"
12980
" -1000000 -> Most likely the first revision, unless\n"
12981
" your history is very long."
12982
msgstr ""
12983
12984
#: en/help_topics/revisionspec.txt:145
12985
msgid ":before:"
12986
msgstr ""
12987
12988
#: en/help_topics/revisionspec.txt:147
12989
msgid ""
12990
" Supply any revision spec to return the parent of that revision. This "
12991
"is\n"
12992
" mostly useful when inspecting revisions that are not in the revision "
12993
"history\n"
12994
" of a branch."
12995
msgstr ""
12996
12997
#: en/help_topics/revisionspec.txt:151
12998
msgid ""
12999
" It is an error to request the parent of the null revision (before:0)."
13000
msgstr ""
13001
13002
#: en/help_topics/revisionspec.txt:155
13003
msgid ""
13004
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13005
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13006
" aaaa@bbbb-1234567890\n"
13007
" bzr diff -r before:1913..1913\n"
13008
" -> Find the changes between revision 1913 and its parent "
13009
"(1912).\n"
13010
" (What changes did revision 1913 introduce).\n"
13011
" This is equivalent to: bzr diff -c 1913"
13012
msgstr ""
13013
13014
#: en/help_topics/revisionspec.txt:163
13015
msgid ":annotate:"
13016
msgstr ""
13017
13018
#: en/help_topics/revisionspec.txt:165
13019
msgid ""
13020
" Select the revision that last modified the specified line. Line is\n"
13021
" specified as path:number. Path is a relative path to the file. "
13022
"Numbers\n"
13023
" start at 1, and are relative to the current version, not the last-\n"
13024
" committed version of the file."
13025
msgstr ""
13026
13027
#: en/help_topics/revisionspec.txt:170
13028
msgid ":mainline:"
13029
msgstr ""
13030
13031
#: en/help_topics/revisionspec.txt:172
13032
msgid ""
13033
" Select the revision that merged the specified revision into mainline."
13034
msgstr ""
13035
13036
#: en/help_topics/revisionspec.txt:174
13037
msgid ":last:"
13038
msgstr ""
13039
13040
#: en/help_topics/revisionspec.txt:176
13041
msgid ""
13042
" Supply a positive number to get the nth revision from the end.\n"
13043
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13044
" Examples::"
13045
msgstr ""
13046
13047
#: en/help_topics/revisionspec.txt:180
13048
msgid ""
13049
" last:1 -> return the last revision\n"
13050
" last:3 -> return the revision 2 before the end.\n"
13051
msgstr ""
13052
13053
#: en/help_topics/rules.txt:1
13054
msgid ""
13055
"Rules\n"
13056
"====="
13057
msgstr ""
13058
13059
#: en/help_topics/rules.txt:7
13060
msgid ""
13061
"Rules are defined in ini file format where the sections are file glob\n"
13062
"patterns and the contents of each section are the preferences for files\n"
13063
"matching that pattern(s). For example::"
13064
msgstr ""
13065
13066
#: en/help_topics/rules.txt:11
13067
msgid ""
13068
" [name *.bat]\n"
13069
" eol = native"
13070
msgstr ""
13071
13072
#: en/help_topics/rules.txt:14
13073
msgid ""
13074
" [name *.html *.xml]\n"
13075
" keywords = xml_escape"
13076
msgstr ""
13077
13078
#: en/help_topics/rules.txt:17
13079
msgid ""
13080
"Preferences like these are useful for commands and plugins wishing to\n"
13081
"provide custom behaviour for selected files. For more information on \n"
13082
"end of line conversion see :doc:`eol-help`.\n"
13083
"Keyword support is provided by the `keywords plugin\n"
13084
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13085
msgstr ""
13086
13087
#: en/help_topics/rules.txt:23
13088
msgid ""
13089
"Files\n"
13090
"-----"
13091
msgstr ""
13092
13093
#: en/help_topics/rules.txt:26
13094
msgid ""
13095
"Default rules for all branches are defined in the optional file\n"
13096
"``BZR_HOME/rules``. "
13097
msgstr ""
13098
13099
#: en/help_topics/rules.txt:29
13100
msgid ""
13101
"Rule Patterns\n"
13102
"-------------"
13103
msgstr ""
13104
13105
#: en/help_topics/rules.txt:32
13106
msgid ""
13107
"Patterns are ordered and searching stops as soon as one matches.\n"
13108
"As a consequence, more explicit patterns should be placed towards\n"
13109
"the top of the file. Rule patterns use exactly the same conventions\n"
13110
"as ignore patterns. See :doc:`patterns-help` for details."
13111
msgstr ""
13112
13113
#: en/help_topics/rules.txt:37
13114
msgid ".. note::"
13115
msgstr ""
13116
13117
#: en/help_topics/rules.txt:39
13118
msgid ""
13119
" Patterns containing square brackets or spaces should be\n"
13120
" surrounded in quotes to ensure they are correctly parsed.\n"
13121
msgstr ""
13122
13123
#: en/help_topics/topics.txt:1
13124
msgid ""
13125
"authentication Information on configuring authentication\n"
13126
"basic Basic commands\n"
13127
"branches Information on what a branch is\n"
13128
"bugs Bug tracker settings\n"
13129
"checkouts Information on what a checkout is\n"
13130
"commands Basic help for all commands\n"
13131
"configuration Details on the configuration settings available\n"
13132
"conflict-types Types of conflicts and what to do about them\n"
13133
"content-filters Conversion of content into/from working trees\n"
13134
"criss-cross Information on criss-cross merging\n"
13135
"current-formats Current storage formats\n"
13136
"debug-flags Options to show or record debug information\n"
13137
"diverged-branches How to fix diverged branches\n"
13138
"env-variables Environment variable names and values\n"
13139
"eol Information on end-of-line handling\n"
13140
"files Information on configuration and log files\n"
13141
"formats Information on choosing a storage format\n"
13142
"global-options Options that control how Bazaar runs\n"
13143
"hidden-commands All hidden commands\n"
13144
"hooks Points at which custom processing can be added\n"
13145
"launchpad Using Bazaar with Launchpad.net\n"
13146
"location-alias Aliases for remembered locations\n"
13147
"log-formats Details on the logging formats available\n"
13148
"other-formats Experimental and deprecated storage formats\n"
13149
"patterns Information on the pattern syntax\n"
13150
"repositories Basic information on shared repositories.\n"
13151
"revisionspec Explain how to use --revision\n"
13152
"rules Information on defining rule-based preferences\n"
13153
"standalone-trees Information on what a standalone tree is\n"
13154
"standard-options Options that can be used with any command\n"
13155
"status-flags Help on status flags\n"
13156
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13157
"topics Topics list\n"
13158
"url-special-chars Special character handling in URLs\n"
13159
"urlspec Supported transport protocols\n"
13160
"working-trees Information on working trees\n"
13161
msgstr ""
13162
13163
#: en/help_topics/url-special-chars.txt:1
13164
msgid ""
13165
"Special character handling in URLs\n"
13166
"=================================="
13167
msgstr ""
13168
13169
#: en/help_topics/url-special-chars.txt:4
13170
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13171
msgstr ""
13172
13173
#: en/help_topics/url-special-chars.txt:6
13174
msgid " * Fully qualified URLs"
13175
msgstr ""
13176
13177
#: en/help_topics/url-special-chars.txt:8
13178
msgid " * File system paths, relative or absolute"
13179
msgstr ""
13180
13181
#: en/help_topics/url-special-chars.txt:10
13182
msgid ""
13183
"Internally bzr treats all locations as URLs. For any file system paths\n"
13184
"that are specified it will automatically determine the appropriate URL\n"
13185
"representation, and escape special characters where necessary."
13186
msgstr ""
13187
13188
#: en/help_topics/url-special-chars.txt:14
13189
msgid ""
13190
"There are a few characters which have special meaning in URLs and need "
13191
"careful\n"
13192
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13193
"value in URLs. Any non-ASCII characters in a file path will automatically "
13194
"be\n"
13195
"urlencoded when the path is converted to a URL."
13196
msgstr ""
13197
13198
#: en/help_topics/url-special-chars.txt:19
13199
msgid ""
13200
"URLs represent non-ASCII characters in an encoding defined by the server, "
13201
"but\n"
13202
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13203
"be\n"
13204
"generous in what it accepts as a URL and to print them in a way that\n"
13205
"will be readable."
13206
msgstr ""
13207
13208
#: en/help_topics/url-special-chars.txt:24
13209
msgid ""
13210
"For example, if you have a directory named '/tmp/%2False' these are all "
13211
"valid\n"
13212
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13213
"slash)::"
13214
msgstr ""
13215
13216
#: en/help_topics/url-special-chars.txt:27
13217
msgid ""
13218
" cd /tmp\n"
13219
" bzr log /tmp/%2False\n"
13220
" bzr log %2False\n"
13221
" bzr log file:///tmp/%252False\n"
13222
" bzr log file://localhost/tmp/%252False\n"
13223
" bzr log file:%252False"
13224
msgstr ""
13225
13226
#: en/help_topics/url-special-chars.txt:34
13227
msgid "These are valid but do not refer to the same file::"
13228
msgstr ""
13229
13230
#: en/help_topics/url-special-chars.txt:36
13231
msgid ""
13232
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13233
" bzr log %252False (refers to a file called /tmp/%252False)"
13234
msgstr ""
13235
13236
#: en/help_topics/url-special-chars.txt:39
13237
msgid ""
13238
"Comma also has special meaning in URLs, because it denotes `segment "
13239
"parameters`_"
13240
msgstr ""
13241
13242
#: en/help_topics/url-special-chars.txt:41
13243
msgid ""
13244
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13245
msgstr ""
13246
13247
#: en/help_topics/url-special-chars.txt:43
13248
msgid ""
13249
"Comma is also special in any file system paths that are specified. To use a "
13250
"literal\n"
13251
"comma in a file system path, specify a URL and URL encode the comma::"
13252
msgstr ""
13253
13254
#: en/help_topics/url-special-chars.txt:46
13255
msgid ""
13256
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13257
"\"branch\" set to \"bla\"\n"
13258
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13259
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13260
"\"branch\" set to \"bla\"\n"
13261
msgstr ""
13262
13263
#: en/help_topics/urlspec.txt:1
13264
msgid "URL Identifiers"
13265
msgstr ""
13266
13267
#: en/help_topics/urlspec.txt:3
13268
msgid "Supported URL prefixes::"
13269
msgstr ""
13270
13271
#: en/help_topics/urlspec.txt:5
13272
msgid ""
13273
" aftp:// Access using active FTP.\n"
13274
" bzr:// Fast access using the Bazaar smart server.\n"
13275
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13276
" file:// Access using the standard filesystem (default)\n"
13277
" ftp:// Access using passive FTP.\n"
13278
" http:// Read-only access of branches exported on the web.\n"
13279
" https:// Read-only access of branches exported on the web using "
13280
"SSL.\n"
13281
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13282
msgstr ""
13283
13284
#: en/help_topics/urlspec.txt:14
13285
msgid "Supported modifiers::"
13286
msgstr ""
13287
13288
#: en/help_topics/urlspec.txt:16
13289
msgid " gio+ Access using any GIO supported protocols."
13290
msgstr ""
13291
13292
#: en/help_topics/urlspec.txt:18
13293
msgid "Bazaar supports all of the standard parts within the URL::"
13294
msgstr ""
13295
13296
#: en/help_topics/urlspec.txt:20
13297
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13298
msgstr ""
13299
13300
#: en/help_topics/urlspec.txt:22
13301
msgid "allowing URLs such as::"
13302
msgstr ""
13303
13304
#: en/help_topics/urlspec.txt:24
13305
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13306
msgstr ""
13307
13308
#: en/help_topics/urlspec.txt:26
13309
msgid ""
13310
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13311
"with '~' as meaning that the rest of the path should be interpreted\n"
13312
"relative to the remote user's home directory. For example if the user\n"
13313
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13314
"shell.example.com, then::"
13315
msgstr ""
13316
13317
#: en/help_topics/urlspec.txt:32
13318
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13319
msgstr ""
13320
13321
#: en/help_topics/urlspec.txt:34
13322
msgid "would refer to ``/home/remote/myproject/trunk``."
13323
msgstr ""
13324
13325
#: en/help_topics/urlspec.txt:36
13326
msgid ""
13327
"Many commands that accept URLs also accept location aliases too.\n"
13328
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13329
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1