« back to all changes in this revision
Viewing changes to po/en_AU.po
- browse files at revision 5462.5.1
- compare with another revision
- download diff
- download tarball
- view history from revision 5462.5.1
- Committer: Andrew Bennetts
- Date: 2010-10-08 08:15:14 UTC
- mto: This revision was merged to the branch mainline in revision 5498.
- Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt
- files added:
- 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 removed:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files renamed:
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- doc/en/release-notes/release-template.txt => doc/en/release-notes/NEWS-template.txt
- files modified:
- .bzrignore
added
removed
po/en_AU.po
1
# English (Australia) 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: 2012-07-20 14:35+0000\n"
12
"Last-Translator: Rafael Neri <Unknown>\n"
13
"Language-Team: English (Australia) <en_AU@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-21 04:30+0000\n"
19
"X-Generator: Launchpad (build 15654)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr "Unstacking"
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Pushed up to revision %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 tag updated."
39
msgstr[1] "%d tags updated."
40
41
#: bzrlib/branch.py:2960
42
msgid "No new revisions or tags to push."
43
msgstr "No new revisions or tags to push."
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr "No new revisions to push."
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr "checked branch {0} format {1}"
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr "found error:%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 "Ignoring files outside view. View is %s"
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr "Display status summary."
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
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
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
"added\n"
86
" Versioned in the working copy but not in the previous revision."
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
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
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
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
109
110
#: bzrlib/builtins.py:332
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
118
#: bzrlib/builtins.py:335
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"kind changed\n"
124
" File kind has been changed (e.g. from file to directory)."
125
126
#: bzrlib/builtins.py:338
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
134
#: bzrlib/builtins.py:341
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
145
146
#: bzrlib/builtins.py:346
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:349
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
163
164
#: bzrlib/builtins.py:353
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
175
176
#: bzrlib/builtins.py:358
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
187
188
#: bzrlib/builtins.py:363
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:366
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
205
206
#: bzrlib/builtins.py:375
207
msgid "Use short status indicators."
208
msgstr "Use short status indicators."
209
210
#: bzrlib/builtins.py:377
211
msgid "Only show versioned files."
212
msgstr "Only show versioned files."
213
214
#: bzrlib/builtins.py:379
215
msgid "Don't show pending merges."
216
msgstr "Don't show pending merges."
217
218
#: bzrlib/builtins.py:382
219
msgid "Do not mark object type using indicator."
220
msgstr "Do not mark object type using indicator."
221
222
#: bzrlib/builtins.py:397
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
225
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
227
msgid "You can only supply one of revision_id or --revision"
228
msgstr "You can only supply one of revision_id or --revision"
229
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
231
msgid "You must supply either --revision or a revision_id"
232
msgstr "You must supply either --revision or a revision_id"
233
234
#: bzrlib/builtins.py:451
235
#, python-format
236
msgid "Repository %r does not support access to raw revision texts"
237
msgstr "Repository %r does not support access to raw revision texts"
238
239
#: bzrlib/builtins.py:462
240
msgid "The repository {0} contains no revision {1}."
241
msgstr "The repository {0} contains no revision {1}."
242
243
#: bzrlib/builtins.py:469
244
msgid "You cannot specify a NULL revision."
245
msgstr "You cannot specify a NULL revision."
246
247
#: bzrlib/builtins.py:561
248
msgid "Remove the working tree from a given branch/checkout."
249
msgstr "Remove the working tree from a given branch/checkout."
250
251
#: bzrlib/builtins.py:563
252
msgid ""
253
"Since a lightweight checkout is little more than a working tree\n"
254
"this will refuse to run against one."
255
msgstr ""
256
"Since a lightweight checkout is little more than a working tree\n"
257
"this will refuse to run against one."
258
259
#: bzrlib/builtins.py:566
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
262
263
#: bzrlib/builtins.py:572
264
msgid ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
msgstr ""
267
"Remove the working tree even if it has uncommitted or shelved changes."
268
269
#: bzrlib/builtins.py:586
270
msgid "No working tree to remove"
271
msgstr "No working tree to remove"
272
273
#: bzrlib/builtins.py:588
274
msgid "You cannot remove the working tree of a remote path"
275
msgstr "You cannot remove the working tree of a remote path"
276
277
#: bzrlib/builtins.py:597
278
msgid "You cannot remove the working tree from a lightweight checkout"
279
msgstr "You cannot remove the working tree from a lightweight checkout"
280
281
#: bzrlib/builtins.py:637
282
msgid ""
283
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
284
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
msgstr ""
286
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
287
"instead. Use \"--force\" if you are sure you want to reset the working tree."
288
289
#: bzrlib/builtins.py:648
290
msgid ""
291
", the header appears corrupt, try passing -r -1 to set the state to the last "
292
"commit"
293
msgstr ""
294
", the header appears corrupt, try passing -r -1 to set the state to the last "
295
"commit"
296
297
#: bzrlib/builtins.py:652
298
msgid "failed to reset the tree state{0}"
299
msgstr "failed to reset the tree state{0}"
300
301
#: bzrlib/builtins.py:656
302
msgid "Show current revision number."
303
msgstr "Show current revision number."
304
305
#: bzrlib/builtins.py:658
306
msgid "This is equal to the number of revisions on this branch."
307
msgstr "This is equal to the number of revisions on this branch."
308
309
#: bzrlib/builtins.py:671
310
msgid "--tree and --revision can not be used together"
311
msgstr "--tree and --revision can not be used together"
312
313
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
314
msgid "Tags can only be placed on a single revision, not on a range"
315
msgstr "Tags can only be placed on a single revision, not on a range"
316
317
#: bzrlib/builtins.py:712
318
msgid "Show revno of working tree."
319
msgstr "Show revno of working tree."
320
321
#: bzrlib/builtins.py:760
322
msgid "Add specified files or directories."
323
msgstr "Add specified files or directories."
324
325
#: bzrlib/builtins.py:762
326
msgid ""
327
"In non-recursive mode, all the named items are added, regardless\n"
328
"of whether they were previously ignored. A warning is given if\n"
329
"any of the named files are already versioned."
330
msgstr ""
331
"In non-recursive mode, all the named items are added, regardless\n"
332
"of whether they were previously ignored. A warning is given if\n"
333
"any of the named files are already versioned."
334
335
#: bzrlib/builtins.py:766
336
msgid ""
337
"In recursive mode (the default), files are treated the same way\n"
338
"but the behaviour for directories is different. Directories that\n"
339
"are already versioned do not give a warning. All directories,\n"
340
"whether already versioned or not, are searched for files or\n"
341
"subdirectories that are neither versioned or ignored, and these\n"
342
"are added. This search proceeds recursively into versioned\n"
343
"directories. If no names are given '.' is assumed."
344
msgstr ""
345
"In recursive mode (the default), files are treated the same way\n"
346
"but the behaviour for directories is different. Directories that\n"
347
"are already versioned do not give a warning. All directories,\n"
348
"whether already versioned or not, are searched for files or\n"
349
"subdirectories that are neither versioned or ignored, and these\n"
350
"are added. This search proceeds recursively into versioned\n"
351
"directories. If no names are given '.' is assumed."
352
353
#: bzrlib/builtins.py:774
354
msgid ""
355
"A warning will be printed when nested trees are encountered,\n"
356
"unless they are explicitly ignored."
357
msgstr ""
358
"A warning will be printed when nested trees are encountered,\n"
359
"unless they are explicitly ignored."
360
361
#: bzrlib/builtins.py:777
362
msgid ""
363
"Therefore simply saying 'bzr add' will version all files that\n"
364
"are currently unknown."
365
msgstr ""
366
"Therefore simply saying 'bzr add' will version all files that\n"
367
"are currently unknown."
368
369
#: bzrlib/builtins.py:780
370
msgid ""
371
"Adding a file whose parent directory is not versioned will\n"
372
"implicitly add the parent, and so on up to the root. This means\n"
373
"you should never need to explicitly add a directory, they'll just\n"
374
"get added when you add a file in the directory."
375
msgstr ""
376
"Adding a file whose parent directory is not versioned will\n"
377
"implicitly add the parent, and so on up to the root. This means\n"
378
"you should never need to explicitly add a directory, they'll just\n"
379
"get added when you add a file in the directory."
380
381
#: bzrlib/builtins.py:785
382
msgid ""
383
"--dry-run will show which files would be added, but not actually\n"
384
"add them."
385
msgstr ""
386
"--dry-run will show which files would be added, but not actually\n"
387
"add them."
388
389
#: bzrlib/builtins.py:788
390
msgid ""
391
"--file-ids-from will try to use the file ids from the supplied path.\n"
392
"It looks up ids trying to find a matching parent directory with the\n"
393
"same filename, and then by pure path. This option is rarely needed\n"
394
"but can be useful when adding the same logical file into two\n"
395
"branches that will be merged later (without showing the two different\n"
396
"adds as a conflict). It is also useful when merging another project\n"
397
"into a subdirectory of this one."
398
msgstr ""
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
"It looks up ids trying to find a matching parent directory with the\n"
401
"same filename, and then by pure path. This option is rarely needed\n"
402
"but can be useful when adding the same logical file into two\n"
403
"branches that will be merged later (without showing the two different\n"
404
"adds as a conflict). It is also useful when merging another project\n"
405
"into a subdirectory of this one."
406
407
#: bzrlib/builtins.py:796
408
msgid ""
409
"Any files matching patterns in the ignore list will not be added\n"
410
"unless they are explicitly mentioned."
411
msgstr ""
412
"Any files matching patterns in the ignore list will not be added\n"
413
"unless they are explicitly mentioned."
414
415
#: bzrlib/builtins.py:799
416
msgid ""
417
"In recursive mode, files larger than the configuration option \n"
418
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
419
"to file size."
420
msgstr ""
421
"In recursive mode, files larger than the configuration option \n"
422
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
423
"to file size."
424
425
#: bzrlib/builtins.py:806
426
msgid "Don't recursively add the contents of directories."
427
msgstr "Don't recursively add the contents of directories."
428
429
#: bzrlib/builtins.py:813
430
msgid "Lookup file ids from this tree."
431
msgstr "Lookup file ids from this tree."
432
433
#: bzrlib/builtins.py:849
434
msgid "ignored {0} matching \"{1}\"\n"
435
msgstr "ignored {0} matching \"{1}\"\n"
436
437
#: bzrlib/builtins.py:854
438
msgid "Create a new versioned directory."
439
msgstr "Create a new versioned directory."
440
441
#: bzrlib/builtins.py:856
442
msgid "This is equivalent to creating the directory and then adding it."
443
msgstr "This is equivalent to creating the directory and then adding it."
444
445
#: bzrlib/builtins.py:863
446
msgid "No error if existing, make parent directories as needed."
447
msgstr "No error if existing, make parent directories as needed."
448
449
#: bzrlib/builtins.py:897
450
#, python-format
451
msgid "added %s\n"
452
msgstr "added %s\n"
453
454
#: bzrlib/builtins.py:939
455
#, python-format
456
msgid "invalid kind %r specified"
457
msgstr "invalid kind %r specified"
458
459
#: bzrlib/builtins.py:976
460
msgid "Move or rename a file."
461
msgstr "Move or rename a file."
462
463
#: bzrlib/builtins.py:978
464
msgid " bzr mv SOURCE... DESTINATION"
465
msgstr " bzr mv SOURCE... DESTINATION"
466
467
#: bzrlib/builtins.py:980
468
msgid ""
469
"If the last argument is a versioned directory, all the other names\n"
470
"are moved into it. Otherwise, there must be exactly two arguments\n"
471
"and the file is changed to a new name."
472
msgstr ""
473
"If the last argument is a versioned directory, all the other names\n"
474
"are moved into it. Otherwise, there must be exactly two arguments\n"
475
"and the file is changed to a new name."
476
477
#: bzrlib/builtins.py:984
478
msgid ""
479
"If OLDNAME does not exist on the filesystem but is versioned and\n"
480
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
481
"assumes that the file has been manually moved and only updates\n"
482
"its internal inventory to reflect that change.\n"
483
"The same is valid when moving many SOURCE files to a DESTINATION."
484
msgstr ""
485
"If OLDNAME does not exist on the filesystem but is versioned and\n"
486
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
487
"assumes that the file has been manually moved and only updates\n"
488
"its internal inventory to reflect that change.\n"
489
"The same is valid when moving many SOURCE files to a DESTINATION."
490
491
#: bzrlib/builtins.py:990
492
msgid "Files cannot be moved between branches."
493
msgstr "Files cannot be moved between branches."
494
495
#: bzrlib/builtins.py:997
496
msgid ""
497
"Move only the bzr identifier of the file, because the file has already been "
498
"moved."
499
msgstr ""
500
"Move only the bzr identifier of the file, because the file has already been "
501
"moved."
502
503
#: bzrlib/builtins.py:999
504
msgid "Automatically guess renames."
505
msgstr "Automatically guess renames."
506
507
#: bzrlib/builtins.py:1000
508
msgid "Avoid making changes when guessing renames."
509
msgstr "Avoid making changes when guessing renames."
510
511
#: bzrlib/builtins.py:1009
512
msgid "--dry-run requires --auto."
513
msgstr "--dry-run requires --auto."
514
515
#: bzrlib/builtins.py:1013
516
msgid "missing file argument"
517
msgstr "missing file argument"
518
519
#: bzrlib/builtins.py:1017
520
msgid "can not move root of branch"
521
msgstr "can not move root of branch"
522
523
#: bzrlib/builtins.py:1023
524
msgid "Only one path may be specified to --auto."
525
msgstr "Only one path may be specified to --auto."
526
527
#: bzrlib/builtins.py:1026
528
msgid "--after cannot be specified with --auto."
529
msgstr "--after cannot be specified with --auto."
530
531
#: bzrlib/builtins.py:1062
532
msgid "to mv multiple files the destination must be a versioned directory"
533
msgstr "to mv multiple files the destination must be a versioned directory"
534
535
#: bzrlib/builtins.py:1114
536
msgid "Turn this branch into a mirror of another branch."
537
msgstr "Turn this branch into a mirror of another branch."
538
539
#: bzrlib/builtins.py:1116
540
msgid ""
541
"By default, this command only works on branches that have not diverged.\n"
542
"Branches are considered diverged if the destination branch's most recent \n"
543
"commit is one that has not been merged (directly or indirectly) into the \n"
544
"parent."
545
msgstr ""
546
"By default, this command only works on branches that have not diverged.\n"
547
"Branches are considered diverged if the destination branch's most recent \n"
548
"commit is one that has not been merged (directly or indirectly) into the \n"
549
"parent."
550
551
#: bzrlib/builtins.py:1121
552
msgid ""
553
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
554
"from one into the other. Once one branch has merged, the other should\n"
555
"be able to pull it again."
556
msgstr ""
557
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
558
"from one into the other. Once one branch has merged, the other should\n"
559
"be able to pull it again."
560
561
#: bzrlib/builtins.py:1125
562
msgid ""
563
"If you want to replace your local changes and just want your branch to\n"
564
"match the remote one, use pull --overwrite. This will work even if the two\n"
565
"branches have diverged."
566
msgstr ""
567
"If you want to replace your local changes and just want your branch to\n"
568
"match the remote one, use pull --overwrite. This will work even if the two\n"
569
"branches have diverged."
570
571
#: bzrlib/builtins.py:1129
572
msgid ""
573
"If there is no default location set, the first pull will set it (use\n"
574
"--no-remember to avoid setting it). After that, you can omit the\n"
575
"location to use the default. To change the default, use --remember. The\n"
576
"value will only be saved if the remote location can be accessed."
577
msgstr ""
578
"If there is no default location set, the first pull will set it (use\n"
579
"--no-remember to avoid setting it). After that, you can omit the\n"
580
"location to use the default. To change the default, use --remember. The\n"
581
"value will only be saved if the remote location can be accessed."
582
583
#: bzrlib/builtins.py:1134
584
msgid ""
585
"The --verbose option will display the revisions pulled using the log_format\n"
586
"configuration option. You can use a different format by overriding it with\n"
587
"-Olog_format=<other_format>."
588
msgstr ""
589
"The --verbose option will display the revisions pulled using the log_format\n"
590
"configuration option. You can use a different format by overriding it with\n"
591
"-Olog_format=<other_format>."
592
593
#: bzrlib/builtins.py:1138
594
msgid ""
595
"Note: The location can be specified either in the form of a branch,\n"
596
"or in the form of a path to a file containing a merge directive generated\n"
597
"with bzr send."
598
msgstr ""
599
"Note: The location can be specified either in the form of a branch,\n"
600
"or in the form of a path to a file containing a merge directive generated\n"
601
"with bzr send."
602
603
#: bzrlib/builtins.py:1146
604
msgid "Show logs of pulled revisions."
605
msgstr "Show logs of pulled revisions."
606
607
#: bzrlib/builtins.py:1148
608
msgid ""
609
"Branch to pull into, rather than the one containing the working directory."
610
msgstr ""
611
"Branch to pull into, rather than the one containing the working directory."
612
613
#: bzrlib/builtins.py:1151
614
msgid ""
615
"Perform a local pull in a bound branch. Local pulls are not applied to the "
616
"master branch."
617
msgstr ""
618
"Perform a local pull in a bound branch. Local pulls are not applied to the "
619
"master branch."
620
621
#: bzrlib/builtins.py:1189
622
msgid "Need working tree for --show-base."
623
msgstr "Need working tree for --show-base."
624
625
#: bzrlib/builtins.py:1205
626
msgid "No pull location known or specified."
627
msgstr "No pull location known or specified."
628
629
#: bzrlib/builtins.py:1211
630
#, python-format
631
msgid "Using saved parent location: %s\n"
632
msgstr "Using saved parent location: %s\n"
633
634
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
635
msgid "Cannot use -r with merge directives or bundles"
636
msgstr "Cannot use -r with merge directives or bundles"
637
638
#: bzrlib/builtins.py:1261
639
msgid "Update a mirror of this branch."
640
msgstr "Update a mirror of this branch."
641
642
#: bzrlib/builtins.py:1263
643
msgid ""
644
"The target branch will not have its working tree populated because this\n"
645
"is both expensive, and is not supported on remote file systems."
646
msgstr ""
647
"The target branch will not have its working tree populated because this\n"
648
"is both expensive and is not supported on remote file systems."
649
650
#: bzrlib/builtins.py:1266
651
msgid ""
652
"Some smart servers or protocols *may* put the working tree in place in\n"
653
"the future."
654
msgstr ""
655
"Some smart servers or protocols *may* put the working tree in place in\n"
656
"the future."
657
658
#: bzrlib/builtins.py:1269
659
msgid ""
660
"This command only works on branches that have not diverged. Branches are\n"
661
"considered diverged if the destination branch's most recent commit is one\n"
662
"that has not been merged (directly or indirectly) by the source branch."
663
msgstr ""
664
"This command only works on branches that have not diverged. Branches are\n"
665
"considered diverged if the destination branch's most recent commit is one\n"
666
"that has not been merged (directly or indirectly) by the source branch."
667
668
#: bzrlib/builtins.py:1273
669
msgid ""
670
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
671
"the other branch completely, discarding its unmerged changes."
672
msgstr ""
673
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
674
"the other branch completely, discarding its unmerged changes."
675
676
#: bzrlib/builtins.py:1276
677
msgid ""
678
"If you want to ensure you have the different changes in the other branch,\n"
679
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
680
"After that you will be able to do a push without '--overwrite'."
681
msgstr ""
682
"If you want to ensure you have the different changes in the other branch,\n"
683
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
684
"After that you will be able to do a push without '--overwrite'."
685
686
#: bzrlib/builtins.py:1280
687
msgid ""
688
"If there is no default push location set, the first push will set it (use\n"
689
"--no-remember to avoid setting it). After that, you can omit the\n"
690
"location to use the default. To change the default, use --remember. The\n"
691
"value will only be saved if the remote location can be accessed."
692
msgstr ""
693
"If there is no default push location set, the first push will set it (use\n"
694
"--no-remember to avoid setting it). After that, you can omit the\n"
695
"location to use the default. To change the default, use --remember. The\n"
696
"value will only be saved if the remote location can be accessed."
697
698
#: bzrlib/builtins.py:1285
699
msgid ""
700
"The --verbose option will display the revisions pushed using the log_format\n"
701
"configuration option. You can use a different format by overriding it with\n"
702
"-Olog_format=<other_format>."
703
msgstr ""
704
"The --verbose option will display the revisions pushed using the log_format\n"
705
"configuration option. You can use a different format by overriding it with\n"
706
"-Olog_format=<other_format>."
707
708
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
709
msgid ""
710
"Branch to push from, rather than the one containing the working directory."
711
msgstr ""
712
"Branch to push from, rather than the one containing the working directory."
713
714
#: bzrlib/builtins.py:1299
715
msgid ""
716
"By default push will fail if the target directory exists, but does not "
717
"already have a control directory. This flag will allow push to proceed."
718
msgstr ""
719
"By default push will fail if the target directory exists, but does not "
720
"already have a control directory. This flag will allow push to proceed."
721
722
#: bzrlib/builtins.py:1304
723
msgid ""
724
"Create a stacked branch that references the public location of the parent "
725
"branch."
726
msgstr ""
727
"Create a stacked branch that references the public location of the parent "
728
"branch."
729
730
#: bzrlib/builtins.py:1307
731
msgid ""
732
"Create a stacked branch that refers to another branch for the commit "
733
"history. Only the work not present in the referenced branch is included in "
734
"the branch created."
735
msgstr ""
736
"Create a stacked branch that refers to another branch for the commit "
737
"history. Only the work not present in the referenced branch is included in "
738
"the branch created."
739
740
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
741
msgid ""
742
"Refuse to push if there are uncommitted changes in the working tree, --no-"
743
"strict disables the check."
744
msgstr ""
745
"Refuse to push if there are uncommitted changes in the working tree, --no-"
746
"strict disables the check."
747
748
#: bzrlib/builtins.py:1315
749
msgid "Don't populate the working tree, even for protocols that support it."
750
msgstr "Don't populate the working tree, even for protocols that support it."
751
752
#: bzrlib/builtins.py:1318
753
msgid "Overwrite tags only."
754
msgstr "Overwrite tags only."
755
756
#: bzrlib/builtins.py:1369
757
msgid "Could not determine branch to refer to."
758
msgstr "Could not determine branch to refer to."
759
760
#: bzrlib/builtins.py:1378
761
#, python-format
762
msgid ""
763
"No push location known or specified. To push to the parent branch (at %s), "
764
"use 'bzr push :parent'."
765
msgstr ""
766
"No push location known or specified. To push to the parent branch (at %s), "
767
"use 'bzr push :parent'."
768
769
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
770
msgid "No push location known or specified."
771
msgstr "No push location known or specified."
772
773
#: bzrlib/builtins.py:1388
774
#, python-format
775
msgid "Using saved push location: %s"
776
msgstr "Using saved push location: %s"
777
778
#: bzrlib/builtins.py:1398
779
msgid "Create a new branch that is a copy of an existing branch."
780
msgstr "Create a new branch that is a copy of an existing branch."
781
782
#: bzrlib/builtins.py:1400
783
msgid ""
784
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
785
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
786
"./bar.\n"
787
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
788
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
789
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
790
"create ./foo-bar."
791
msgstr ""
792
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
793
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
794
"./bar.\n"
795
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
796
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
797
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
798
"create ./foo-bar."
799
800
#: bzrlib/builtins.py:1407
801
msgid ""
802
"To retrieve the branch as of a particular revision, supply the --revision\n"
803
"parameter, as in \"branch foo/bar -r 5\"."
804
msgstr ""
805
"To retrieve the branch as of a particular revision, supply the --revision\n"
806
"parameter, as in \"branch foo/bar -r 5\"."
807
808
#: bzrlib/builtins.py:1410
809
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
810
msgstr "The synonyms 'clone' and 'get' for this command are deprecated."
811
812
#: bzrlib/builtins.py:1420
813
msgid "Create a branch without a working-tree."
814
msgstr "Create a branch without a working-tree."
815
816
#: bzrlib/builtins.py:1422
817
msgid "Switch the checkout in the current directory to the new branch."
818
msgstr "Switch the checkout in the current directory to the new branch."
819
820
#: bzrlib/builtins.py:1425
821
msgid ""
822
"Create a stacked branch referring to the source branch. The new branch will "
823
"depend on the availability of the source branch for all operations."
824
msgstr ""
825
"Create a stacked branch referring to the source branch. The new branch will "
826
"depend on the availability of the source branch for all operations."
827
828
#: bzrlib/builtins.py:1429
829
msgid "Do not use a shared repository, even if available."
830
msgstr "Do not use a shared repository, even if available."
831
832
#: bzrlib/builtins.py:1431
833
msgid ""
834
"By default branch will fail if the target directory exists, but does not "
835
"already have a control directory. This flag will allow branch to proceed."
836
msgstr ""
837
"By default branch will fail if the target directory exists, but does not "
838
"already have a control directory. This flag will allow branch to proceed."
839
840
#: bzrlib/builtins.py:1436
841
msgid "Bind new branch to from location."
842
msgstr "Bind new branch to from location."
843
844
#: bzrlib/builtins.py:1483
845
#, python-format
846
msgid "Target directory \"%s\" already exists."
847
msgstr "Target directory \"%s\" already exists."
848
849
#: bzrlib/builtins.py:1495
850
#, python-format
851
msgid "Parent of \"%s\" does not exist."
852
msgstr "Parent of \"%s\" does not exist."
853
854
#: bzrlib/builtins.py:1514
855
msgid "The branch {0} has no revision {1}."
856
msgstr "The branch {0} has no revision {1}."
857
858
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
859
#, python-format
860
msgid "Created new stacked branch referring to %s."
861
msgstr "Created new stacked branch referring to %s."
862
863
#: bzrlib/builtins.py:1533
864
#, python-format
865
msgid "Branched %d revision."
866
msgid_plural "Branched %d revisions."
867
msgstr[0] "Branched %d revision."
868
msgstr[1] "Branched %d revisions."
869
870
#: bzrlib/builtins.py:1538
871
#, python-format
872
msgid "New branch bound to %s"
873
msgstr "New branch bound to %s"
874
875
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
876
#, python-format
877
msgid "Switched to branch: %s"
878
msgstr "Switched to branch: %s"
879
880
#: bzrlib/builtins.py:1548
881
msgid "List the branches available at the current location."
882
msgstr "List the branches available at the current location."
883
884
#: bzrlib/builtins.py:1550
885
msgid ""
886
"This command will print the names of all the branches at the current\n"
887
"location."
888
msgstr ""
889
"This command will print the names of all the branches at the current\n"
890
"location."
891
892
#: bzrlib/builtins.py:1557
893
msgid ""
894
"Recursively scan for branches rather than just looking in the specified "
895
"location."
896
msgstr ""
897
"Recursively scan for branches rather than just looking in the specified "
898
"location."
899
900
#: bzrlib/builtins.py:1586
901
msgid "(default)"
902
msgstr "(default)"
903
904
#: bzrlib/builtins.py:1598
905
msgid "Create a new checkout of an existing branch."
906
msgstr "Create a new checkout of an existing branch."
907
908
#: bzrlib/builtins.py:1600
909
msgid ""
910
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
911
"for\n"
912
"the branch found in '.'. This is useful if you have removed the working "
913
"tree\n"
914
"or if it was never created - i.e. if you pushed the branch to its current\n"
915
"location using SFTP."
916
msgstr ""
917
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
918
"for\n"
919
"the branch found in '.'. This is useful if you have removed the working "
920
"tree\n"
921
"or if it was never created - i.e. if you pushed the branch to its current\n"
922
"location using SFTP."
923
924
#: bzrlib/builtins.py:1605
925
msgid ""
926
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
927
"will\n"
928
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
929
"./bar.\n"
930
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
931
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
932
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
933
"create ./foo-bar."
934
msgstr ""
935
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
936
"will\n"
937
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
938
"./bar.\n"
939
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
940
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
941
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
942
"create ./foo-bar."
943
944
#: bzrlib/builtins.py:1612
945
msgid ""
946
"To retrieve the branch as of a particular revision, supply the --revision\n"
947
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
948
"immediately\n"
949
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
950
"old\n"
951
"code.)"
952
msgstr ""
953
"To retrieve the branch as of a particular revision, supply the --revision\n"
954
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
955
"immediately\n"
956
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
957
"old\n"
958
"code.)"
959
960
#: bzrlib/builtins.py:1622
961
msgid ""
962
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
963
"the branch for every operation. Normal checkouts can perform common "
964
"operations like diff and status without such access, and also support local "
965
"commits."
966
msgstr ""
967
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
968
"the branch for every operation. Normal checkouts can perform common "
969
"operations like diff and status without such access, and also support local "
970
"commits."
971
972
#: bzrlib/builtins.py:1629
973
msgid "Get file contents from this tree."
974
msgstr "Get file contents from this tree."
975
976
#: bzrlib/builtins.py:1631
977
msgid "Hard-link working tree files where possible."
978
msgstr "Hard-link working tree files where possible."
979
980
#: bzrlib/builtins.py:1672
981
msgid ""
982
"Show list of renamed files.\n"
983
" "
984
msgstr ""
985
"Show list of renamed files.\n"
986
" "
987
988
#: bzrlib/builtins.py:1700
989
msgid "Update a working tree to a new revision."
990
msgstr "Update a working tree to a new revision."
991
992
#: bzrlib/builtins.py:1702
993
msgid ""
994
"This will perform a merge of the destination revision (the tip of the\n"
995
"branch, or the specified revision) into the working tree, and then make\n"
996
"that revision the basis revision for the working tree. "
997
msgstr ""
998
"This will perform a merge of the destination revision (the tip of the\n"
999
"branch, or the specified revision) into the working tree, and then make\n"
1000
"that revision the basis revision for the working tree. "
1001
1002
#: bzrlib/builtins.py:1706
1003
msgid ""
1004
"You can use this to visit an older revision, or to update a working tree\n"
1005
"that is out of date from its branch."
1006
msgstr ""
1007
"You can use this to visit an older revision, or to update a working tree\n"
1008
"that is out of date from its branch."
1009
1010
#: bzrlib/builtins.py:1709
1011
msgid ""
1012
"If there are any uncommitted changes in the tree, they will be carried\n"
1013
"across and remain as uncommitted changes after the update. To discard\n"
1014
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1015
"with the changes brought in by the change in basis revision."
1016
msgstr ""
1017
"If there are any uncommitted changes in the tree, they will be carried\n"
1018
"across and remain as uncommitted changes after the update. To discard\n"
1019
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1020
"with the changes brought in by the change in basis revision."
1021
1022
#: bzrlib/builtins.py:1714
1023
msgid ""
1024
"If the tree's branch is bound to a master branch, bzr will also update\n"
1025
"the branch from the master."
1026
msgstr ""
1027
"If the tree's branch is bound to a master branch, bzr will also update\n"
1028
"the branch from the master."
1029
1030
#: bzrlib/builtins.py:1717
1031
msgid ""
1032
"You cannot update just a single file or directory, because each Bazaar\n"
1033
"working tree has just a single basis revision. If you want to restore a\n"
1034
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1035
"update'. If you want to restore a file to its state in a previous\n"
1036
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1037
"out the old content of that file to a new location."
1038
msgstr ""
1039
"You cannot update just a single file or directory, because each Bazaar\n"
1040
"working tree has just a single basis revision. If you want to restore a\n"
1041
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1042
"update'. If you want to restore a file to its state in a previous\n"
1043
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1044
"out the old content of that file to a new location."
1045
1046
#: bzrlib/builtins.py:1724
1047
msgid ""
1048
"The 'dir' argument, if given, must be the location of the root of a\n"
1049
"working tree to update. By default, the working tree that contains the \n"
1050
"current working directory is used."
1051
msgstr ""
1052
"The 'dir' argument, if given, must be the location of the root of a\n"
1053
"working tree to update. By default, the working tree that contains the \n"
1054
"current working directory is used."
1055
1056
#: bzrlib/builtins.py:1740
1057
msgid "bzr update --revision takes exactly one revision"
1058
msgstr "bzr update --revision takes exactly one revision"
1059
1060
#: bzrlib/builtins.py:1748
1061
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1062
msgstr "bzr update can only update a whole tree, not a file or subdirectory"
1063
1064
#: bzrlib/builtins.py:1779
1065
msgid "Tree is up to date at revision {0} of branch {1}"
1066
msgstr "Tree is up to date at revision {0} of branch {1}"
1067
1068
#: bzrlib/builtins.py:1795
1069
#, python-format
1070
msgid ""
1071
"branch has no revision %s\n"
1072
"bzr update --revision only works for a revision in the branch history"
1073
msgstr ""
1074
"branch has no revision %s\n"
1075
"bzr update --revision only works for a revision in the branch history"
1076
1077
#: bzrlib/builtins.py:1801
1078
msgid "Updated to revision {0} of branch {1}"
1079
msgstr "Updated to revision {0} of branch {1}"
1080
1081
#: bzrlib/builtins.py:1805
1082
msgid ""
1083
"Your local commits will now show as pending merges with 'bzr status', and "
1084
"can be committed with 'bzr commit'."
1085
msgstr ""
1086
"Your local commits will now show as pending merges with 'bzr status', and "
1087
"can be committed with 'bzr commit'."
1088
1089
#: bzrlib/builtins.py:1814
1090
msgid "Show information about a working tree, branch or repository."
1091
msgstr "Show information about a working tree, branch or repository."
1092
1093
#: bzrlib/builtins.py:1816
1094
msgid ""
1095
"This command will show all known locations and formats associated to the\n"
1096
"tree, branch or repository."
1097
msgstr ""
1098
"This command will show all known locations and formats associated to the\n"
1099
"tree, branch or repository."
1100
1101
#: bzrlib/builtins.py:1819
1102
msgid ""
1103
"In verbose mode, statistical information is included with each report.\n"
1104
"To see extended statistic information, use a verbosity level of 2 or\n"
1105
"higher by specifying the verbose option multiple times, e.g. -vv."
1106
msgstr ""
1107
"In verbose mode, statistical information is included with each report.\n"
1108
"To see extended statistic information, use a verbosity level of 2 or\n"
1109
"higher by specifying the verbose option multiple times, e.g. -vv."
1110
1111
#: bzrlib/builtins.py:1823
1112
msgid "Branches and working trees will also report any missing revisions."
1113
msgstr "Branches and working trees will also report any missing revisions."
1114
1115
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1116
#: bzrlib/builtins.py:6466
1117
msgid ":Examples:"
1118
msgstr ":Examples:"
1119
1120
#: bzrlib/builtins.py:1827
1121
msgid " Display information on the format and related locations:"
1122
msgstr " Display information on the format and related locations:"
1123
1124
#: bzrlib/builtins.py:1829
1125
msgid " bzr info"
1126
msgstr " bzr info"
1127
1128
#: bzrlib/builtins.py:1831
1129
msgid ""
1130
" Display the above together with extended format information and\n"
1131
" basic statistics (like the number of files in the working tree and\n"
1132
" number of revisions in the branch and repository):"
1133
msgstr ""
1134
" Display the above together with extended format information and\n"
1135
" basic statistics (like the number of files in the working tree and\n"
1136
" number of revisions in the branch and repository):"
1137
1138
#: bzrlib/builtins.py:1835
1139
msgid " bzr info -v"
1140
msgstr " bzr info -v"
1141
1142
#: bzrlib/builtins.py:1837
1143
msgid " Display the above together with number of committers to the branch:"
1144
msgstr ""
1145
" Display the above together with number of committers to the branch:"
1146
1147
#: bzrlib/builtins.py:1839
1148
msgid " bzr info -vv"
1149
msgstr " bzr info -vv"
1150
1151
#: bzrlib/builtins.py:1858
1152
msgid "Remove files or directories."
1153
msgstr "Remove files or directories."
1154
1155
#: bzrlib/builtins.py:1860
1156
msgid ""
1157
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1158
"delete them if they can easily be recovered using revert otherwise they\n"
1159
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1160
"parameters are given Bazaar will scan for files that are being tracked by\n"
1161
"Bazaar but missing in your tree and stop tracking them for you."
1162
msgstr ""
1163
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1164
"delete them if they can easily be recovered using revert otherwise they\n"
1165
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1166
"parameters are given Bazaar will scan for files that are being tracked by\n"
1167
"Bazaar but missing in your tree and stop tracking them for you."
1168
1169
#: bzrlib/builtins.py:1868
1170
msgid "Only remove files that have never been committed."
1171
msgstr "Only remove files that have never been committed."
1172
1173
#: bzrlib/builtins.py:1870
1174
msgid "The file deletion mode to be used."
1175
msgstr "The file deletion mode to be used."
1176
1177
#: bzrlib/builtins.py:1871
1178
msgid "Deletion Strategy"
1179
msgstr "Deletion Strategy"
1180
1181
#: bzrlib/builtins.py:1872
1182
msgid "Backup changed files (default)."
1183
msgstr "Backup changed files (default)."
1184
1185
#: bzrlib/builtins.py:1873
1186
msgid "Delete from bzr but leave the working copy."
1187
msgstr "Delete from bzr but leave the working copy."
1188
1189
#: bzrlib/builtins.py:1874
1190
msgid "Don't backup changed files."
1191
msgstr "Don't backup changed files."
1192
1193
#: bzrlib/builtins.py:1875
1194
msgid ""
1195
"Delete all the specified files, even if they can not be recovered and even "
1196
"if they are non-empty directories. (deprecated, use no-backup)"
1197
msgstr ""
1198
"Delete all the specified files, even if they can not be recovered and even "
1199
"if they are non-empty directories. (deprecated, use no-backup)"
1200
1201
#: bzrlib/builtins.py:1884
1202
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1203
msgstr ""
1204
"(The --force option is deprecated, rather use --no-backup in future.)"
1205
1206
#: bzrlib/builtins.py:1901
1207
msgid "No matching files."
1208
msgstr "No matching files."
1209
1210
#: bzrlib/builtins.py:1962
1211
msgid "Reconcile bzr metadata in a branch."
1212
msgstr "Reconcile bzr metadata in a branch."
1213
1214
#: bzrlib/builtins.py:1964
1215
msgid ""
1216
"This can correct data mismatches that may have been caused by\n"
1217
"previous ghost operations or bzr upgrades. You should only\n"
1218
"need to run this command if 'bzr check' or a bzr developer\n"
1219
"advises you to run it."
1220
msgstr ""
1221
"This can correct data mismatches that may have been caused by\n"
1222
"previous ghost operations or bzr upgrades. You should only\n"
1223
"need to run this command if 'bzr check' or a bzr developer\n"
1224
"advises you to run it."
1225
1226
#: bzrlib/builtins.py:1969
1227
msgid ""
1228
"If a second branch is provided, cross-branch reconciliation is\n"
1229
"also attempted, which will check that data like the tree root\n"
1230
"id which was not present in very early bzr versions is represented\n"
1231
"correctly in both branches."
1232
msgstr ""
1233
"If a second branch is provided, cross-branch reconciliation is\n"
1234
"also attempted, which will check that data like the tree root\n"
1235
"id which was not present in very early bzr versions is represented\n"
1236
"correctly in both branches."
1237
1238
#: bzrlib/builtins.py:1974
1239
msgid ""
1240
"At the same time it is run it may recompress data resulting in\n"
1241
"a potential saving in disk space or performance gain."
1242
msgstr ""
1243
"At the same time it is run it may recompress data resulting in\n"
1244
"a potential saving in disk space or performance gain."
1245
1246
#: bzrlib/builtins.py:1977
1247
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1248
msgstr ""
1249
"The branch *MUST* be on a listable system such as local disk or sftp."
1250
1251
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1252
msgid ""
1253
"Format for the bzr 2.0 series.\n"
1254
"Uses group-compress storage.\n"
1255
"Provides rich roots which are a one-way transition.\n"
1256
msgstr ""
1257
"Format for the bzr 2.0 series.\n"
1258
"Uses group-compress storage.\n"
1259
"Provides rich roots which are a one-way transition.\n"
1260
1261
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1262
msgid ""
1263
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1264
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1265
msgstr ""
1266
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1267
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1268
1269
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1270
msgid "The 2a format with experimental support for colocated branches.\n"
1271
msgstr "The 2a format with experimental support for collocated branches.\n"
1272
1273
#: bzrlib/builtins.py:2045
1274
msgid "Make a directory into a versioned branch."
1275
msgstr "Make a directory into a versioned branch."
1276
1277
#: bzrlib/builtins.py:2047
1278
msgid ""
1279
"Use this to create an empty branch, or before importing an\n"
1280
"existing project."
1281
msgstr ""
1282
"Use this to create an empty branch, or before importing an\n"
1283
"existing project."
1284
1285
#: bzrlib/builtins.py:2050
1286
msgid ""
1287
"If there is a repository in a parent directory of the location, then\n"
1288
"the history of the branch will be stored in the repository. Otherwise\n"
1289
"init creates a standalone branch which carries its own history\n"
1290
"in the .bzr directory."
1291
msgstr ""
1292
"If there is a repository in a parent directory of the location, then\n"
1293
"the history of the branch will be stored in the repository. Otherwise\n"
1294
"init creates a standalone branch which carries its own history\n"
1295
"in the .bzr directory."
1296
1297
#: bzrlib/builtins.py:2055
1298
msgid ""
1299
"If there is already a branch at the location but it has no working tree,\n"
1300
"the tree can be populated with 'bzr checkout'."
1301
msgstr ""
1302
"If there is already a branch at the location but it has no working tree,\n"
1303
"the tree can be populated with 'bzr checkout'."
1304
1305
#: bzrlib/builtins.py:2058
1306
msgid "Recipe for importing a tree of files::"
1307
msgstr "Recipe for importing a tree of files::"
1308
1309
#: bzrlib/builtins.py:2060
1310
msgid ""
1311
" cd ~/project\n"
1312
" bzr init\n"
1313
" bzr add .\n"
1314
" bzr status\n"
1315
" bzr commit -m \"imported project\""
1316
msgstr ""
1317
" cd ~/project\n"
1318
" bzr init\n"
1319
" bzr add .\n"
1320
" bzr status\n"
1321
" bzr commit -m \"imported project\""
1322
1323
#: bzrlib/builtins.py:2071
1324
msgid ""
1325
"Create the path leading up to the branch if it does not already exist."
1326
msgstr ""
1327
"Create the path leading up to the branch if it does not already exist."
1328
1329
#: bzrlib/builtins.py:2074
1330
msgid "Specify a format for this branch. See \"help formats\"."
1331
msgstr "Specify a format for this branch. See \"help formats\"."
1332
1333
#: bzrlib/builtins.py:2082
1334
msgid ""
1335
"Never change revnos or the existing log. Append revisions to it only."
1336
msgstr ""
1337
"Never change revnos or the existing log. Append revisions to it only."
1338
1339
#: bzrlib/builtins.py:2085
1340
msgid "Create a branch without a working tree."
1341
msgstr "Create a branch without a working tree."
1342
1343
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1344
#, python-format
1345
msgid ""
1346
"Parent directory of %s does not exist.\n"
1347
"You may supply --create-prefix to create all leading parent directories."
1348
msgstr ""
1349
"Parent directory of %s does not exist.\n"
1350
"You may supply --create-prefix to create all leading parent directories."
1351
1352
#: bzrlib/builtins.py:2139
1353
msgid ""
1354
"This branch format cannot be set to append-revisions-only. Try --default."
1355
msgstr ""
1356
"This branch format cannot be set to append-revisions-only. Try --default."
1357
1358
#: bzrlib/builtins.py:2150
1359
msgid "Created a {0} (format: {1})\n"
1360
msgstr "Created a {0} (format: {1})\n"
1361
1362
#: bzrlib/builtins.py:2159
1363
#, python-format
1364
msgid "Using shared repository: %s\n"
1365
msgstr "Using shared repository: %s\n"
1366
1367
#: bzrlib/builtins.py:2163
1368
msgid "Create a shared repository for branches to share storage space."
1369
msgstr "Create a shared repository for branches to share storage space."
1370
1371
#: bzrlib/builtins.py:2165
1372
msgid ""
1373
"New branches created under the repository directory will store their\n"
1374
"revisions in the repository, not in the branch directory. For branches\n"
1375
"with shared history, this reduces the amount of storage needed and \n"
1376
"speeds up the creation of new branches."
1377
msgstr ""
1378
"New branches created under the repository directory will store their\n"
1379
"revisions in the repository, not in the branch directory. For branches\n"
1380
"with shared history, this reduces the amount of storage needed and \n"
1381
"speeds up the creation of new branches."
1382
1383
#: bzrlib/builtins.py:2170
1384
msgid ""
1385
"If the --no-trees option is given then the branches in the repository\n"
1386
"will not have working trees by default. They will still exist as \n"
1387
"directories on disk, but they will not have separate copies of the \n"
1388
"files at a certain revision. This can be useful for repositories that\n"
1389
"store branches which are interacted with through checkouts or remote\n"
1390
"branches, such as on a server."
1391
msgstr ""
1392
"If the --no-trees option is given then the branches in the repository\n"
1393
"will not have working trees by default. They will still exist as \n"
1394
"directories on disk, but they will not have separate copies of the \n"
1395
"files at a certain revision. This can be useful for repositories that\n"
1396
"store branches which are interacted with through checkouts or remote\n"
1397
"branches, such as on a server."
1398
1399
#: bzrlib/builtins.py:2177
1400
msgid ""
1401
":Examples:\n"
1402
" Create a shared repository holding just branches::"
1403
msgstr ""
1404
":Examples:\n"
1405
" Create a shared repository holding just branches::"
1406
1407
#: bzrlib/builtins.py:2180
1408
msgid ""
1409
" bzr init-repo --no-trees repo\n"
1410
" bzr init repo/trunk"
1411
msgstr ""
1412
" bzr init-repo --no-trees repo\n"
1413
" bzr init repo/trunk"
1414
1415
#: bzrlib/builtins.py:2183
1416
msgid " Make a lightweight checkout elsewhere::"
1417
msgstr " Make a lightweight checkout elsewhere::"
1418
1419
#: bzrlib/builtins.py:2185
1420
msgid ""
1421
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1422
" cd trunk-checkout\n"
1423
" (add files here)"
1424
msgstr ""
1425
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1426
" cd trunk-checkout\n"
1427
" (add files here)"
1428
1429
#: bzrlib/builtins.py:2193
1430
msgid ""
1431
"Specify a format for this repository. See \"bzr help formats\" for details."
1432
msgstr ""
1433
"Specify a format for this repository. See \"bzr help formats\" for details."
1434
1435
#: bzrlib/builtins.py:2197
1436
msgid "Repository format"
1437
msgstr "Repository format"
1438
1439
#: bzrlib/builtins.py:2199
1440
msgid "Branches in the repository will default to not having a working tree."
1441
msgstr ""
1442
"Branches in the repository will default to not having a working tree."
1443
1444
#: bzrlib/builtins.py:2225
1445
msgid "Show differences in the working tree, between revisions or branches."
1446
msgstr "Show differences in the working tree, between revisions or branches."
1447
1448
#: bzrlib/builtins.py:2227
1449
msgid ""
1450
"If no arguments are given, all changes for the current tree are listed.\n"
1451
"If files are given, only the changes in those files are listed.\n"
1452
"Remote and multiple branches can be compared by using the --old and\n"
1453
"--new options. If not provided, the default for both is derived from\n"
1454
"the first argument, if any, or the current tree if no arguments are\n"
1455
"given."
1456
msgstr ""
1457
"If no arguments are given, all changes for the current tree are listed.\n"
1458
"If files are given, only the changes in those files are listed.\n"
1459
"Remote and multiple branches can be compared by using the --old and\n"
1460
"--new options. If not provided, the default for both is derived from\n"
1461
"the first argument, if any, or the current tree if no arguments are\n"
1462
"given."
1463
1464
#: bzrlib/builtins.py:2234
1465
msgid ""
1466
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1467
"produces patches suitable for \"patch -p1\"."
1468
msgstr ""
1469
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1470
"produces patches suitable for \"patch -p1\"."
1471
1472
#: bzrlib/builtins.py:2237
1473
msgid ""
1474
"Note that when using the -r argument with a range of revisions, the\n"
1475
"differences are computed between the two specified revisions. That\n"
1476
"is, the command does not show the changes introduced by the first \n"
1477
"revision in the range. This differs from the interpretation of \n"
1478
"revision ranges used by \"bzr log\" which includes the first revision\n"
1479
"in the range."
1480
msgstr ""
1481
"Note that when using the -r argument with a range of revisions, the\n"
1482
"differences are computed between the two specified revisions. That\n"
1483
"is, the command does not show the changes introduced by the first \n"
1484
"revision in the range. This differs from the interpretation of \n"
1485
"revision ranges used by \"bzr log\" which includes the first revision\n"
1486
"in the range."
1487
1488
#: bzrlib/builtins.py:2244
1489
msgid ""
1490
":Exit values:\n"
1491
" 1 - changed\n"
1492
" 2 - unrepresentable changes\n"
1493
" 3 - error\n"
1494
" 0 - no change"
1495
msgstr ""
1496
":Exit values:\n"
1497
" 1 - changed\n"
1498
" 2 - unrepresentable changes\n"
1499
" 3 - error\n"
1500
" 0 - no change"
1501
1502
#: bzrlib/builtins.py:2250
1503
msgid ""
1504
":Examples:\n"
1505
" Shows the difference in the working tree versus the last commit::"
1506
msgstr ""
1507
":Examples:\n"
1508
" Shows the difference in the working tree versus the last commit::"
1509
1510
#: bzrlib/builtins.py:2253
1511
msgid " bzr diff"
1512
msgstr " bzr diff"
1513
1514
#: bzrlib/builtins.py:2255
1515
msgid " Difference between the working tree and revision 1::"
1516
msgstr " Difference between the working tree and revision 1::"
1517
1518
#: bzrlib/builtins.py:2257
1519
msgid " bzr diff -r1"
1520
msgstr " bzr diff -r1"
1521
1522
#: bzrlib/builtins.py:2259
1523
msgid " Difference between revision 3 and revision 1::"
1524
msgstr " Difference between revision 3 and revision 1::"
1525
1526
#: bzrlib/builtins.py:2261
1527
msgid " bzr diff -r1..3"
1528
msgstr " bzr diff -r1..3"
1529
1530
#: bzrlib/builtins.py:2263
1531
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1532
msgstr " Difference between revision 3 and revision 1 for branch xxx::"
1533
1534
#: bzrlib/builtins.py:2265
1535
msgid " bzr diff -r1..3 xxx"
1536
msgstr " bzr diff -r1..3 xxx"
1537
1538
#: bzrlib/builtins.py:2267
1539
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1540
msgstr " The changes introduced by revision 2 (equivalent to -r1..2)::"
1541
1542
#: bzrlib/builtins.py:2269
1543
msgid " bzr diff -c2"
1544
msgstr " bzr diff -c2"
1545
1546
#: bzrlib/builtins.py:2271
1547
msgid ""
1548
" To see the changes introduced by revision X::\n"
1549
" \n"
1550
" bzr diff -cX"
1551
msgstr ""
1552
" To see the changes introduced by revision X::\n"
1553
" \n"
1554
" bzr diff -cX"
1555
1556
#: bzrlib/builtins.py:2275
1557
msgid ""
1558
" Note that in the case of a merge, the -c option shows the changes\n"
1559
" compared to the left hand parent. To see the changes against\n"
1560
" another parent, use::"
1561
msgstr ""
1562
" Note that in the case of a merge, the -c option shows the changes\n"
1563
" compared to the left hand parent. To see the changes against\n"
1564
" another parent, use::"
1565
1566
#: bzrlib/builtins.py:2279
1567
msgid " bzr diff -r<chosen_parent>..X"
1568
msgstr " bzr diff -r<chosen_parent>..X"
1569
1570
#: bzrlib/builtins.py:2281
1571
msgid ""
1572
" The changes between the current revision and the previous revision\n"
1573
" (equivalent to -c-1 and -r-2..-1)"
1574
msgstr ""
1575
" The changes between the current revision and the previous revision\n"
1576
" (equivalent to -c-1 and -r-2..-1)"
1577
1578
#: bzrlib/builtins.py:2284
1579
msgid " bzr diff -r-2.."
1580
msgstr " bzr diff -r-2.."
1581
1582
#: bzrlib/builtins.py:2286
1583
msgid " Show just the differences for file NEWS::"
1584
msgstr " Show just the differences for file NEWS::"
1585
1586
#: bzrlib/builtins.py:2288
1587
msgid " bzr diff NEWS"
1588
msgstr " bzr diff NEWS"
1589
1590
#: bzrlib/builtins.py:2290
1591
msgid " Show the differences in working tree xxx for file NEWS::"
1592
msgstr " Show the differences in working tree xxx for file NEWS::"
1593
1594
#: bzrlib/builtins.py:2292
1595
msgid " bzr diff xxx/NEWS"
1596
msgstr " bzr diff xxx/NEWS"
1597
1598
#: bzrlib/builtins.py:2294
1599
msgid " Show the differences from branch xxx to this working tree:"
1600
msgstr " Show the differences from branch xxx to this working tree:"
1601
1602
#: bzrlib/builtins.py:2296
1603
msgid " bzr diff --old xxx"
1604
msgstr " bzr diff --old xxx"
1605
1606
#: bzrlib/builtins.py:2298
1607
msgid " Show the differences between two branches for file NEWS::"
1608
msgstr " Show the differences between two branches for file NEWS::"
1609
1610
#: bzrlib/builtins.py:2300
1611
msgid " bzr diff --old xxx --new yyy NEWS"
1612
msgstr " bzr diff --old xxx --new yyy NEWS"
1613
1614
#: bzrlib/builtins.py:2302
1615
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1616
msgstr " Same as 'bzr diff' but prefix paths with old/ and new/::"
1617
1618
#: bzrlib/builtins.py:2304
1619
msgid ""
1620
" bzr diff --prefix old/:new/\n"
1621
" \n"
1622
" Show the differences using a custom diff program with options::\n"
1623
" \n"
1624
" bzr diff --using /usr/bin/diff --diff-options -wu"
1625
msgstr ""
1626
" bzr diff --prefix old/:new/\n"
1627
" \n"
1628
" Show the differences using a custom diff program with options::\n"
1629
" \n"
1630
" bzr diff --using /usr/bin/diff --diff-options -wu"
1631
1632
#: bzrlib/builtins.py:2314
1633
msgid "Pass these options to the external diff program."
1634
msgstr "Pass these options to the external diff program."
1635
1636
#: bzrlib/builtins.py:2317
1637
msgid ""
1638
"Set prefixes added to old and new filenames, as two values separated by a "
1639
"colon. (eg \"old/:new/\")."
1640
msgstr ""
1641
"Set prefixes added to old and new filenames, as two values separated by a "
1642
"colon. (eg \"old/:new/\")."
1643
1644
#: bzrlib/builtins.py:2320
1645
msgid "Branch/tree to compare from."
1646
msgstr "Branch/tree to compare from."
1647
1648
#: bzrlib/builtins.py:2324
1649
msgid "Branch/tree to compare to."
1650
msgstr "Branch/tree to compare to."
1651
1652
#: bzrlib/builtins.py:2330
1653
msgid "Use this command to compare files."
1654
msgstr "Use this command to compare files."
1655
1656
#: bzrlib/builtins.py:2335
1657
msgid "Diff format to use."
1658
msgstr "Diff format to use."
1659
1660
#: bzrlib/builtins.py:2337
1661
msgid "Diff format"
1662
msgstr "Diff format"
1663
1664
#: bzrlib/builtins.py:2359
1665
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1666
msgstr "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1667
1668
#: bzrlib/builtins.py:2363
1669
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1670
msgstr "bzr diff --revision takes exactly one or two revision specifiers"
1671
1672
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1673
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1674
msgid "{0} and {1} are mutually exclusive"
1675
msgstr "{0} and {1} are mutually exclusive"
1676
1677
#: bzrlib/builtins.py:2388
1678
msgid ""
1679
"List files deleted in the working tree.\n"
1680
" "
1681
msgstr ""
1682
"List files deleted in the working tree.\n"
1683
" "
1684
1685
#: bzrlib/builtins.py:2465
1686
msgid "Show the tree root directory."
1687
msgstr "Show the tree root directory."
1688
1689
#: bzrlib/builtins.py:2467
1690
msgid ""
1691
"The root is the nearest enclosing directory with a .bzr control\n"
1692
"directory."
1693
msgstr ""
1694
"The root is the nearest enclosing directory with a .bzr control\n"
1695
"directory."
1696
1697
#: bzrlib/builtins.py:2482
1698
msgid "The limit argument must be an integer."
1699
msgstr "The limit argument must be an integer."
1700
1701
#: bzrlib/builtins.py:2490
1702
msgid "The levels argument must be an integer."
1703
msgstr "The levels argument must be an integer."
1704
1705
#: bzrlib/builtins.py:2495
1706
msgid "Show historical log for a branch or subset of a branch."
1707
msgstr "Show historical log for a branch or subset of a branch."
1708
1709
#: bzrlib/builtins.py:2497
1710
msgid ""
1711
"log is bzr's default tool for exploring the history of a branch.\n"
1712
"The branch to use is taken from the first parameter. If no parameters\n"
1713
"are given, the branch containing the working directory is logged.\n"
1714
"Here are some simple examples::"
1715
msgstr ""
1716
"log is bzr's default tool for exploring the history of a branch.\n"
1717
"The branch to use is taken from the first parameter. If no parameters\n"
1718
"are given, the branch containing the working directory is logged.\n"
1719
"Here are some simple examples::"
1720
1721
#: bzrlib/builtins.py:2502
1722
msgid ""
1723
" bzr log log the current branch\n"
1724
" bzr log foo.py log a file in its branch\n"
1725
" bzr log http://server/branch log a branch on a server"
1726
msgstr ""
1727
" bzr log log the current branch\n"
1728
" bzr log foo.py log a file in its branch\n"
1729
" bzr log http://server/branch log a branch on a server"
1730
1731
#: bzrlib/builtins.py:2506
1732
msgid ""
1733
"The filtering, ordering and information shown for each revision can\n"
1734
"be controlled as explained below. By default, all revisions are\n"
1735
"shown sorted (topologically) so that newer revisions appear before\n"
1736
"older ones and descendants always appear before ancestors. If displayed,\n"
1737
"merged revisions are shown indented under the revision in which they\n"
1738
"were merged."
1739
msgstr ""
1740
"The filtering, ordering and information shown for each revision can\n"
1741
"be controlled as explained below. By default, all revisions are\n"
1742
"shown sorted (topologically) so that newer revisions appear before\n"
1743
"older ones and descendants always appear before ancestors. If displayed,\n"
1744
"merged revisions are shown indented under the revision in which they\n"
1745
"were merged."
1746
1747
#: bzrlib/builtins.py:2513
1748
msgid ":Output control:"
1749
msgstr ":Output control:"
1750
1751
#: bzrlib/builtins.py:2515
1752
msgid ""
1753
" The log format controls how information about each revision is\n"
1754
" displayed. The standard log formats are called ``long``, ``short``\n"
1755
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1756
" for more details on log formats."
1757
msgstr ""
1758
" The log format controls how information about each revision is\n"
1759
" displayed. The standard log formats are called ``long``, ``short``\n"
1760
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1761
" for more details on log formats."
1762
1763
#: bzrlib/builtins.py:2520
1764
msgid ""
1765
" The following options can be used to control what information is\n"
1766
" displayed::"
1767
msgstr ""
1768
" The following options can be used to control what information is\n"
1769
" displayed::"
1770
1771
#: bzrlib/builtins.py:2523
1772
msgid ""
1773
" -l N display a maximum of N revisions\n"
1774
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1775
" -v display a status summary (delta) for each revision\n"
1776
" -p display a diff (patch) for each revision\n"
1777
" --show-ids display revision-ids (and file-ids), not just revnos"
1778
msgstr ""
1779
" -l N display a maximum of N revisions\n"
1780
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1781
" -v display a status summary (delta) for each revision\n"
1782
" -p display a diff (patch) for each revision\n"
1783
" --show-ids display revision-ids (and file-ids), not just revnos"
1784
1785
#: bzrlib/builtins.py:2529
1786
msgid ""
1787
" Note that the default number of levels to display is a function of the\n"
1788
" log format. If the -n option is not used, the standard log formats show\n"
1789
" just the top level (mainline)."
1790
msgstr ""
1791
" Note that the default number of levels to display is a function of the\n"
1792
" log format. If the -n option is not used, the standard log formats show\n"
1793
" just the top level (mainline)."
1794
1795
#: bzrlib/builtins.py:2533
1796
msgid ""
1797
" Status summaries are shown using status flags like A, M, etc. To see\n"
1798
" the changes explained using words like ``added`` and ``modified``\n"
1799
" instead, use the -vv option."
1800
msgstr ""
1801
" Status summaries are shown using status flags like A, M, etc. To see\n"
1802
" the changes explained using words like ``added`` and ``modified``\n"
1803
" instead, use the -vv option."
1804
1805
#: bzrlib/builtins.py:2537
1806
msgid ":Ordering control:"
1807
msgstr ":Ordering control:"
1808
1809
#: bzrlib/builtins.py:2539
1810
msgid ""
1811
" To display revisions from oldest to newest, use the --forward option.\n"
1812
" In most cases, using this option will have little impact on the total\n"
1813
" time taken to produce a log, though --forward does not incrementally\n"
1814
" display revisions like --reverse does when it can."
1815
msgstr ""
1816
" To display revisions from oldest to newest, use the --forward option.\n"
1817
" In most cases, using this option will have little impact on the total\n"
1818
" time taken to produce a log, though --forward does not incrementally\n"
1819
" display revisions like --reverse does when it can."
1820
1821
#: bzrlib/builtins.py:2544
1822
msgid ":Revision filtering:"
1823
msgstr ":Revision filtering:"
1824
1825
#: bzrlib/builtins.py:2546
1826
msgid ""
1827
" The -r option can be used to specify what revision or range of revisions\n"
1828
" to filter against. The various forms are shown below::"
1829
msgstr ""
1830
" The -r option can be used to specify what revision or range of revisions\n"
1831
" to filter against. The various forms are shown below::"
1832
1833
#: bzrlib/builtins.py:2549
1834
msgid ""
1835
" -rX display revision X\n"
1836
" -rX.. display revision X and later\n"
1837
" -r..Y display up to and including revision Y\n"
1838
" -rX..Y display from X to Y inclusive"
1839
msgstr ""
1840
" -rX display revision X\n"
1841
" -rX.. display revision X and later\n"
1842
" -r..Y display up to and including revision Y\n"
1843
" -rX..Y display from X to Y inclusive"
1844
1845
#: bzrlib/builtins.py:2554
1846
msgid ""
1847
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1848
" Some common examples are given below::"
1849
msgstr ""
1850
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1851
" Some common examples are given below::"
1852
1853
#: bzrlib/builtins.py:2557
1854
msgid ""
1855
" -r-1 show just the tip\n"
1856
" -r-10.. show the last 10 mainline revisions\n"
1857
" -rsubmit:.. show what's new on this branch\n"
1858
" -rancestor:path.. show changes since the common ancestor of this\n"
1859
" branch and the one at location path\n"
1860
" -rdate:yesterday.. show changes since yesterday"
1861
msgstr ""
1862
" -r-1 show just the tip\n"
1863
" -r-10.. show the last 10 mainline revisions\n"
1864
" -rsubmit:.. show what's new on this branch\n"
1865
" -rancestor:path.. show changes since the common ancestor of this\n"
1866
" branch and the one at location path\n"
1867
" -rdate:yesterday.. show changes since yesterday"
1868
1869
#: bzrlib/builtins.py:2564
1870
msgid ""
1871
" When logging a range of revisions using -rX..Y, log starts at\n"
1872
" revision Y and searches back in history through the primary\n"
1873
" (\"left-hand\") parents until it finds X. When logging just the\n"
1874
" top level (using -n1), an error is reported if X is not found\n"
1875
" along the way. If multi-level logging is used (-n0), X may be\n"
1876
" a nested merge revision and the log will be truncated accordingly."
1877
msgstr ""
1878
" When logging a range of revisions using -rX..Y, log starts at\n"
1879
" revision Y and searches back in history through the primary\n"
1880
" (\"left-hand\") parents until it finds X. When logging just the\n"
1881
" top level (using -n1), an error is reported if X is not found\n"
1882
" along the way. If multi-level logging is used (-n0), X may be\n"
1883
" a nested merge revision and the log will be truncated accordingly."
1884
1885
#: bzrlib/builtins.py:2571
1886
msgid ":Path filtering:"
1887
msgstr ":Path filtering:"
1888
1889
#: bzrlib/builtins.py:2573
1890
msgid ""
1891
" If parameters are given and the first one is not a branch, the log\n"
1892
" will be filtered to show only those revisions that changed the\n"
1893
" nominated files or directories."
1894
msgstr ""
1895
" If parameters are given and the first one is not a branch, the log\n"
1896
" will be filtered to show only those revisions that changed the\n"
1897
" nominated files or directories."
1898
1899
#: bzrlib/builtins.py:2577
1900
msgid ""
1901
" Filenames are interpreted within their historical context. To log a\n"
1902
" deleted file, specify a revision range so that the file existed at\n"
1903
" the end or start of the range."
1904
msgstr ""
1905
" Filenames are interpreted within their historical context. To log a\n"
1906
" deleted file, specify a revision range so that the file existed at\n"
1907
" the end or start of the range."
1908
1909
#: bzrlib/builtins.py:2581
1910
msgid ""
1911
" Historical context is also important when interpreting pathnames of\n"
1912
" renamed files/directories. Consider the following example:"
1913
msgstr ""
1914
" Historical context is also important when interpreting pathnames of\n"
1915
" renamed files/directories. Consider the following example:"
1916
1917
#: bzrlib/builtins.py:2584
1918
msgid ""
1919
" * revision 1: add tutorial.txt\n"
1920
" * revision 2: modify tutorial.txt\n"
1921
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1922
msgstr ""
1923
" * revision 1: add tutorial.txt\n"
1924
" * revision 2: modify tutorial.txt\n"
1925
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1926
1927
#: bzrlib/builtins.py:2588
1928
msgid " In this case:"
1929
msgstr " In this case:"
1930
1931
#: bzrlib/builtins.py:2590
1932
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1933
msgstr " * ``bzr log guide.txt`` will log the file added in revision 1"
1934
1935
#: bzrlib/builtins.py:2592
1936
msgid ""
1937
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1938
msgstr ""
1939
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1940
1941
#: bzrlib/builtins.py:2594
1942
msgid ""
1943
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1944
" the original file in revision 2."
1945
msgstr ""
1946
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1947
" the original file in revision 2."
1948
1949
#: bzrlib/builtins.py:2597
1950
msgid ""
1951
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1952
" was no file called guide.txt in revision 2."
1953
msgstr ""
1954
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1955
" was no file called guide.txt in revision 2."
1956
1957
#: bzrlib/builtins.py:2600
1958
msgid ""
1959
" Renames are always followed by log. By design, there is no need to\n"
1960
" explicitly ask for this (and no way to stop logging a file back\n"
1961
" until it was last renamed)."
1962
msgstr ""
1963
" Renames are always followed by log. By design, there is no need to\n"
1964
" explicitly ask for this (and no way to stop logging a file back\n"
1965
" until it was last renamed)."
1966
1967
#: bzrlib/builtins.py:2604
1968
msgid ":Other filtering:"
1969
msgstr ":Other filtering:"
1970
1971
#: bzrlib/builtins.py:2606
1972
msgid ""
1973
" The --match option can be used for finding revisions that match a\n"
1974
" regular expression in a commit message, committer, author or bug.\n"
1975
" Specifying the option several times will match any of the supplied\n"
1976
" expressions. --match-author, --match-bugs, --match-committer and\n"
1977
" --match-message can be used to only match a specific field."
1978
msgstr ""
1979
" The --match option can be used for finding revisions that match a\n"
1980
" regular expression in a commit message, committer, author or bug.\n"
1981
" Specifying the option several times will match any of the supplied\n"
1982
" expressions. --match-author, --match-bugs, --match-committer and\n"
1983
" --match-message can be used to only match a specific field."
1984
1985
#: bzrlib/builtins.py:2612
1986
msgid ":Tips & tricks:"
1987
msgstr ":Tips & tricks:"
1988
1989
#: bzrlib/builtins.py:2614
1990
msgid ""
1991
" GUI tools and IDEs are often better at exploring history than command\n"
1992
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1993
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1994
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1995
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1996
msgstr ""
1997
" GUI tools and IDEs are often better at exploring history than command\n"
1998
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1999
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
2000
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
2001
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
2002
2003
#: bzrlib/builtins.py:2620
2004
msgid ""
2005
" You may find it useful to add the aliases below to ``bazaar.conf``::"
2006
msgstr ""
2007
" You may find it useful to add the aliases below to ``bazaar.conf``::"
2008
2009
#: bzrlib/builtins.py:2622
2010
msgid ""
2011
" [ALIASES]\n"
2012
" tip = log -r-1\n"
2013
" top = log -l10 --line\n"
2014
" show = log -v -p"
2015
msgstr ""
2016
" [ALIASES]\n"
2017
" tip = log -r-1\n"
2018
" top = log -l10 --line\n"
2019
" show = log -v -p"
2020
2021
#: bzrlib/builtins.py:2627
2022
msgid ""
2023
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2024
" will show the last 10 mainline revisions. To see the details of a\n"
2025
" particular revision X, ``bzr show -rX``."
2026
msgstr ""
2027
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2028
" will show the last 10 mainline revisions. To see the details of a\n"
2029
" particular revision X, ``bzr show -rX``."
2030
2031
#: bzrlib/builtins.py:2631
2032
msgid ""
2033
" If you are interested in looking deeper into a particular merge X,\n"
2034
" use ``bzr log -n0 -rX``."
2035
msgstr ""
2036
" If you are interested in looking deeper into a particular merge X,\n"
2037
" use ``bzr log -n0 -rX``."
2038
2039
#: bzrlib/builtins.py:2634
2040
msgid ""
2041
" ``bzr log -v`` on a branch with lots of history is currently\n"
2042
" very slow. A fix for this issue is currently under development.\n"
2043
" With or without that fix, it is recommended that a revision range\n"
2044
" be given when using the -v option."
2045
msgstr ""
2046
" ``bzr log -v`` on a branch with lots of history is currently\n"
2047
" very slow. A fix for this issue is currently under development.\n"
2048
" With or without that fix, it is recommended that a revision range\n"
2049
" be given when using the -v option."
2050
2051
#: bzrlib/builtins.py:2639
2052
msgid ""
2053
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2054
" used to find revisions matching user names, commit messages, etc.\n"
2055
" Among other features, this plugin can find all revisions containing\n"
2056
" a list of words but not others."
2057
msgstr ""
2058
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2059
" used to find revisions matching user names, commit messages, etc.\n"
2060
" Among other features, this plugin can find all revisions containing\n"
2061
" a list of words but not others."
2062
2063
#: bzrlib/builtins.py:2644
2064
msgid ""
2065
" When exploring non-mainline history on large projects with deep\n"
2066
" history, the performance of log can be greatly improved by installing\n"
2067
" the historycache plugin. This plugin buffers historical information\n"
2068
" trading disk space for faster speed."
2069
msgstr ""
2070
" When exploring non-mainline history on large projects with deep\n"
2071
" history, the performance of log can be greatly improved by installing\n"
2072
" the historycache plugin. This plugin buffers historical information\n"
2073
" trading disk space for faster speed."
2074
2075
#: bzrlib/builtins.py:2653
2076
msgid "Show from oldest to newest."
2077
msgstr "Show from oldest to newest."
2078
2079
#: bzrlib/builtins.py:2656
2080
msgid "Show files changed in each revision."
2081
msgstr "Show files changed in each revision."
2082
2083
#: bzrlib/builtins.py:2662
2084
msgid "Show just the specified revision. See also \"help revisionspec\"."
2085
msgstr "Show just the specified revision. See also \"help revisionspec\"."
2086
2087
#: bzrlib/builtins.py:2666
2088
msgid "What names to list as authors - first, all or committer."
2089
msgstr "What names to list as authors - first, all or committer."
2090
2091
#: bzrlib/builtins.py:2667
2092
msgid "Authors"
2093
msgstr "Authors"
2094
2095
#: bzrlib/builtins.py:2672
2096
msgid "Number of levels to display - 0 for all, 1 for flat."
2097
msgstr "Number of levels to display - 0 for all, 1 for flat."
2098
2099
#: bzrlib/builtins.py:2682
2100
msgid "Limit the output to the first N revisions."
2101
msgstr "Limit the output to the first N revisions."
2102
2103
#: bzrlib/builtins.py:2687
2104
msgid "Show changes made in each revision as a patch."
2105
msgstr "Show changes made in each revision as a patch."
2106
2107
#: bzrlib/builtins.py:2689
2108
msgid "Show merged revisions like --levels 0 does."
2109
msgstr "Show merged revisions like --levels 0 does."
2110
2111
#: bzrlib/builtins.py:2693
2112
msgid "Do not report commits with more than one parent."
2113
msgstr "Do not report commits with more than one parent."
2114
2115
#: bzrlib/builtins.py:2695
2116
msgid ""
2117
"Display only the revisions that are not part of both ancestries (require -"
2118
"rX..Y)."
2119
msgstr ""
2120
"Display only the revisions that are not part of both ancestries (require -"
2121
"rX..Y)."
2122
2123
#: bzrlib/builtins.py:2699
2124
msgid "Show digital signature validity."
2125
msgstr "Show digital signature validity."
2126
2127
#: bzrlib/builtins.py:2702
2128
msgid "Show revisions whose properties match this expression."
2129
msgstr "Show revisions whose properties match this expression."
2130
2131
#: bzrlib/builtins.py:2706
2132
msgid "Show revisions whose message matches this expression."
2133
msgstr "Show revisions whose message matches this expression."
2134
2135
#: bzrlib/builtins.py:2710
2136
msgid "Show revisions whose committer matches this expression."
2137
msgstr "Show revisions whose committer matches this expression."
2138
2139
#: bzrlib/builtins.py:2714
2140
msgid "Show revisions whose authors match this expression."
2141
msgstr "Show revisions whose authors match this expression."
2142
2143
#: bzrlib/builtins.py:2718
2144
msgid "Show revisions whose bugs match this expression."
2145
msgstr "Show revisions whose bugs match this expression."
2146
2147
#: bzrlib/builtins.py:2772
2148
msgid "--exclude-common-ancestry requires -r with two revisions"
2149
msgstr "--exclude-common-ancestry requires -r with two revisions"
2150
2151
#: bzrlib/builtins.py:2800
2152
#, python-format
2153
msgid "Path unknown at end or start of revision range: %s"
2154
msgstr "Path unknown at end or start of revision range: %s"
2155
2156
#: bzrlib/builtins.py:2917
2157
#, python-format
2158
msgid "bzr %s doesn't accept two revisions in different branches."
2159
msgstr "bzr %s doesn't accept two revisions in different branches."
2160
2161
#: bzrlib/builtins.py:2933
2162
#, python-format
2163
msgid "bzr %s --revision takes one or two values."
2164
msgstr "bzr %s --revision takes one or two values."
2165
2166
#: bzrlib/builtins.py:2978
2167
msgid ""
2168
"List files in a tree.\n"
2169
" "
2170
msgstr ""
2171
"List files in a tree.\n"
2172
" "
2173
2174
#: bzrlib/builtins.py:2987
2175
msgid "Recurse into subdirectories."
2176
msgstr "Recurse into subdirectories."
2177
2178
#: bzrlib/builtins.py:2989
2179
msgid "Print paths relative to the root of the branch."
2180
msgstr "Print paths relative to the root of the branch."
2181
2182
#: bzrlib/builtins.py:2991
2183
msgid "Print unknown files."
2184
msgstr "Print unknown files."
2185
2186
#: bzrlib/builtins.py:2992
2187
msgid "Print versioned files."
2188
msgstr "Print versioned files."
2189
2190
#: bzrlib/builtins.py:2995
2191
msgid "Print ignored files."
2192
msgstr "Print ignored files."
2193
2194
#: bzrlib/builtins.py:2997
2195
msgid "List entries of a particular kind: file, directory, symlink."
2196
msgstr "List entries of a particular kind: file, directory, symlink."
2197
2198
#: bzrlib/builtins.py:3010
2199
msgid "invalid kind specified"
2200
msgstr "invalid kind specified"
2201
2202
#: bzrlib/builtins.py:3013
2203
msgid "Cannot set both --verbose and --null"
2204
msgstr "Cannot set both --verbose and --null"
2205
2206
#: bzrlib/builtins.py:3022
2207
msgid "cannot specify both --from-root and PATH"
2208
msgstr "cannot specify both --from-root and PATH"
2209
2210
#: bzrlib/builtins.py:3109
2211
msgid "Ignore specified files or patterns."
2212
msgstr "Ignore specified files or patterns."
2213
2214
#: bzrlib/builtins.py:3111
2215
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2216
msgstr "See ``bzr help patterns`` for details on the syntax of patterns."
2217
2218
#: bzrlib/builtins.py:3113
2219
msgid ""
2220
"If a .bzrignore file does not exist, the ignore command\n"
2221
"will create one and add the specified files or patterns to the newly\n"
2222
"created file. The ignore command will also automatically add the \n"
2223
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2224
"the use of the ignore command will require an explicit add command."
2225
msgstr ""
2226
"If a .bzrignore file does not exist, the ignore command\n"
2227
"will create one and add the specified files or patterns to the newly\n"
2228
"created file. The ignore command will also automatically add the \n"
2229
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2230
"the use of the ignore command will require an explicit add command."
2231
2232
#: bzrlib/builtins.py:3119
2233
msgid ""
2234
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2235
"After adding, editing or deleting that file either indirectly by\n"
2236
"using this command or directly by using an editor, be sure to commit\n"
2237
"it."
2238
msgstr ""
2239
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2240
"After adding, editing or deleting that file either indirectly by\n"
2241
"using this command or directly by using an editor, be sure to commit\n"
2242
"it."
2243
2244
#: bzrlib/builtins.py:3124
2245
msgid ""
2246
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2247
"the global ignore file can be found in the application data directory as\n"
2248
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2249
"Global ignores are not touched by this command. The global ignore file\n"
2250
"can be edited directly using an editor."
2251
msgstr ""
2252
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2253
"the global ignore file can be found in the application data directory as\n"
2254
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2255
"Global ignores are not touched by this command. The global ignore file\n"
2256
"can be edited directly using an editor."
2257
2258
#: bzrlib/builtins.py:3130
2259
msgid ""
2260
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2261
"precedence over regular ignores. Such exceptions are used to specify\n"
2262
"files that should be versioned which would otherwise be ignored."
2263
msgstr ""
2264
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2265
"precedence over regular ignores. Such exceptions are used to specify\n"
2266
"files that should be versioned which would otherwise be ignored."
2267
2268
#: bzrlib/builtins.py:3134
2269
msgid ""
2270
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2271
"precedence over the '!' exception patterns."
2272
msgstr ""
2273
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2274
"precedence over the '!' exception patterns."
2275
2276
#: bzrlib/builtins.py:3137
2277
msgid ""
2278
":Notes: \n"
2279
" \n"
2280
"* Ignore patterns containing shell wildcards must be quoted from\n"
2281
" the shell on Unix."
2282
msgstr ""
2283
":Notes: \n"
2284
" \n"
2285
"* Ignore patterns containing shell wildcards must be quoted from\n"
2286
" the shell on Unix."
2287
2288
#: bzrlib/builtins.py:3142
2289
msgid ""
2290
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2291
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2292
msgstr ""
2293
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2294
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2295
2296
#: bzrlib/builtins.py:3145
2297
msgid ""
2298
":Examples:\n"
2299
" Ignore the top level Makefile::"
2300
msgstr ""
2301
":Examples:\n"
2302
" Ignore the top level Makefile::"
2303
2304
#: bzrlib/builtins.py:3148
2305
msgid " bzr ignore ./Makefile"
2306
msgstr " bzr ignore ./Makefile"
2307
2308
#: bzrlib/builtins.py:3150
2309
msgid " Ignore .class files in all directories...::"
2310
msgstr " Ignore .class files in all directories...::"
2311
2312
#: bzrlib/builtins.py:3152
2313
msgid " bzr ignore \"*.class\""
2314
msgstr " bzr ignore \"*.class\""
2315
2316
#: bzrlib/builtins.py:3154
2317
msgid " ...but do not ignore \"special.class\"::"
2318
msgstr " ...but do not ignore \"special.class\"::"
2319
2320
#: bzrlib/builtins.py:3156
2321
msgid " bzr ignore \"!special.class\""
2322
msgstr " bzr ignore \"!special.class\""
2323
2324
#: bzrlib/builtins.py:3158
2325
msgid " Ignore files whose name begins with the \"#\" character::"
2326
msgstr " Ignore files whose name begins with the \"#\" character::"
2327
2328
#: bzrlib/builtins.py:3160
2329
msgid " bzr ignore \"RE:^#\""
2330
msgstr " bzr ignore \"RE:^#\""
2331
2332
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2333
msgid " Ignore .o files under the lib directory::"
2334
msgstr " Ignore .o files under the lib directory::"
2335
2336
#: bzrlib/builtins.py:3164
2337
msgid " bzr ignore \"lib/**/*.o\""
2338
msgstr " bzr ignore \"lib/**/*.o\""
2339
2340
#: bzrlib/builtins.py:3168
2341
msgid " bzr ignore \"RE:lib/.*\\.o\""
2342
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2343
2344
#: bzrlib/builtins.py:3170
2345
msgid " Ignore everything but the \"debian\" toplevel directory::"
2346
msgstr " Ignore everything but the \"debian\" top-level directory::"
2347
2348
#: bzrlib/builtins.py:3172
2349
msgid ""
2350
" bzr ignore \"RE:(?!debian/).*\"\n"
2351
" \n"
2352
" Ignore everything except the \"local\" toplevel directory,\n"
2353
" but always ignore autosave files ending in ~, even under local/::\n"
2354
" \n"
2355
" bzr ignore \"*\"\n"
2356
" bzr ignore \"!./local\"\n"
2357
" bzr ignore \"!!*~\""
2358
msgstr ""
2359
" bzr ignore \"RE:(?!debian/).*\"\n"
2360
" \n"
2361
" Ignore everything except the \"local\" top-level directory,\n"
2362
" but always ignore autosave files ending in ~, even under local/::\n"
2363
" \n"
2364
" bzr ignore \"*\"\n"
2365
" bzr ignore \"!./local\"\n"
2366
" bzr ignore \"!!*~\""
2367
2368
#: bzrlib/builtins.py:3186
2369
msgid "Display the default ignore rules that bzr uses."
2370
msgstr "Display the default ignore rules that bzr uses."
2371
2372
#: bzrlib/builtins.py:3198
2373
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2374
msgstr "ignore requires at least one NAME_PATTERN or --default-rules."
2375
2376
#: bzrlib/builtins.py:3209
2377
#, python-format
2378
msgid "Invalid ignore pattern found. %s"
2379
msgid_plural "Invalid ignore patterns found. %s"
2380
msgstr[0] "Invalid ignore pattern found. %s"
2381
msgstr[1] "Invalid ignore patterns found. %s"
2382
2383
#: bzrlib/builtins.py:3218
2384
msgid "NAME_PATTERN should not be an absolute path"
2385
msgstr "NAME_PATTERN should not be an absolute path"
2386
2387
#: bzrlib/builtins.py:3231
2388
#, python-format
2389
msgid ""
2390
"Warning: the following files are version controlled and match your ignore "
2391
"pattern:\n"
2392
"%s\n"
2393
"These files will continue to be version controlled unless you 'bzr remove' "
2394
"them.\n"
2395
msgstr ""
2396
"Warning: the following files are version controlled and match your ignore "
2397
"pattern:\n"
2398
"%s\n"
2399
"These files will continue to be version controlled unless you 'bzr remove' "
2400
"them.\n"
2401
2402
#: bzrlib/builtins.py:3238
2403
msgid "List ignored files and the patterns that matched them."
2404
msgstr "List ignored files and the patterns that matched them."
2405
2406
#: bzrlib/builtins.py:3240
2407
msgid ""
2408
"List all the ignored files and the ignore pattern that caused the file to\n"
2409
"be ignored."
2410
msgstr ""
2411
"List all the ignored files and the ignore pattern that caused the file to\n"
2412
"be ignored."
2413
2414
#: bzrlib/builtins.py:3243
2415
msgid "Alternatively, to list just the files::"
2416
msgstr "Alternatively, to list just the files::"
2417
2418
#: bzrlib/builtins.py:3245
2419
msgid " bzr ls --ignored"
2420
msgstr " bzr ls --ignored"
2421
2422
#: bzrlib/builtins.py:3279
2423
#, python-format
2424
msgid "not a valid revision-number: %r"
2425
msgstr "not a valid revision-number: %r"
2426
2427
#: bzrlib/builtins.py:3286
2428
msgid ""
2429
"Export current or past revision to a destination directory or archive."
2430
msgstr ""
2431
"Export current or past revision to a destination directory or archive."
2432
2433
#: bzrlib/builtins.py:3288
2434
msgid "If no revision is specified this exports the last committed revision."
2435
msgstr ""
2436
"If no revision is specified this exports the last committed revision."
2437
2438
#: bzrlib/builtins.py:3290
2439
msgid ""
2440
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2441
"given, try to find the format with the extension. If no extension\n"
2442
"is found exports to a directory (equivalent to --format=dir)."
2443
msgstr ""
2444
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2445
"given, try to find the format with the extension. If no extension\n"
2446
"is found exports to a directory (equivalent to --format=dir)."
2447
2448
#: bzrlib/builtins.py:3294
2449
msgid ""
2450
"If root is supplied, it will be used as the root directory inside\n"
2451
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2452
"to the exported filename. The root option has no effect for 'dir' format."
2453
msgstr ""
2454
"If root is supplied, it will be used as the root directory inside\n"
2455
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2456
"to the exported filename. The root option has no effect for 'dir' format."
2457
2458
#: bzrlib/builtins.py:3298
2459
msgid ""
2460
"If branch is omitted then the branch containing the current working\n"
2461
"directory will be used."
2462
msgstr ""
2463
"If branch is omitted then the branch containing the current working\n"
2464
"directory will be used."
2465
2466
#: bzrlib/builtins.py:3301
2467
msgid ""
2468
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2469
msgstr ""
2470
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2471
2472
#: bzrlib/builtins.py:3303
2473
msgid ""
2474
" ================= =========================\n"
2475
" Supported formats Autodetected by extension\n"
2476
" ================= =========================\n"
2477
" dir (none)\n"
2478
" tar .tar\n"
2479
" tbz2 .tar.bz2, .tbz2\n"
2480
" tgz .tar.gz, .tgz\n"
2481
" zip .zip\n"
2482
" ================= ========================="
2483
msgstr ""
2484
" ================= =========================\n"
2485
" Supported formats Autodetected by extension\n"
2486
" ================= =========================\n"
2487
" dir (none)\n"
2488
" tar .tar\n"
2489
" tbz2 .tar.bz2, .tbz2\n"
2490
" tgz .tar.gz, .tgz\n"
2491
" zip .zip\n"
2492
" ================= ========================="
2493
2494
#: bzrlib/builtins.py:3317
2495
msgid "Type of file to export to."
2496
msgstr "Type of file to export to."
2497
2498
#: bzrlib/builtins.py:3320
2499
msgid "Apply content filters to export the convenient form."
2500
msgstr "Apply content filters to export the convenient form."
2501
2502
#: bzrlib/builtins.py:3324
2503
msgid "Name of the root directory inside the exported file."
2504
msgstr "Name of the root directory inside the exported file."
2505
2506
#: bzrlib/builtins.py:3326
2507
msgid ""
2508
"Set modification time of files to that of the last revision in which it was "
2509
"changed."
2510
msgstr ""
2511
"Set modification time of files to that of the last revision in which it was "
2512
"changed."
2513
2514
#: bzrlib/builtins.py:3329
2515
msgid ""
2516
"Export the working tree contents rather than that of the last revision."
2517
msgstr ""
2518
"Export the working tree contents rather than that of the last revision."
2519
2520
#: bzrlib/builtins.py:3348
2521
msgid "--uncommitted requires a working tree"
2522
msgstr "--uncommitted requires a working tree"
2523
2524
#: bzrlib/builtins.py:3357
2525
#, python-format
2526
msgid "Unsupported export format: %s"
2527
msgstr "Unsupported export format: %s"
2528
2529
#: bzrlib/builtins.py:3361
2530
msgid ""
2531
"Write the contents of a file as of a given revision to standard output."
2532
msgstr ""
2533
"Write the contents of a file as of a given revision to standard output."
2534
2535
#: bzrlib/builtins.py:3363
2536
msgid "If no revision is nominated, the last revision is used."
2537
msgstr "If no revision is nominated, the last revision is used."
2538
2539
#: bzrlib/builtins.py:3365
2540
msgid ""
2541
"Note: Take care to redirect standard output when using this command on a\n"
2542
"binary file."
2543
msgstr ""
2544
"Note: Take care to redirect standard output when using this command on a\n"
2545
"binary file."
2546
2547
#: bzrlib/builtins.py:3371
2548
msgid "The path name in the old tree."
2549
msgstr "The path name in the old tree."
2550
2551
#: bzrlib/builtins.py:3372
2552
msgid "Apply content filters to display the convenience form."
2553
msgstr "Apply content filters to display the convenience form."
2554
2555
#: bzrlib/builtins.py:3383
2556
msgid "bzr cat --revision takes exactly one revision specifier"
2557
msgstr "bzr cat --revision takes exactly one revision specifier"
2558
2559
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2560
msgid "{0!r} is not present in revision {1}"
2561
msgstr "{0!r} is not present in revision {1}"
2562
2563
#: bzrlib/builtins.py:3443
2564
msgid "Commit changes into a new revision."
2565
msgstr "Commit changes into a new revision."
2566
2567
#: bzrlib/builtins.py:3445
2568
msgid ""
2569
"An explanatory message needs to be given for each commit. This is\n"
2570
"often done by using the --message option (getting the message from the\n"
2571
"command line) or by using the --file option (getting the message from\n"
2572
"a file). If neither of these options is given, an editor is opened for\n"
2573
"the user to enter the message. To see the changed files in the\n"
2574
"boilerplate text loaded into the editor, use the --show-diff option."
2575
msgstr ""
2576
"An explanatory message needs to be given for each commit. This is\n"
2577
"often done by using the --message option (getting the message from the\n"
2578
"command line) or by using the --file option (getting the message from\n"
2579
"a file). If neither of these options is given, an editor is opened for\n"
2580
"the user to enter the message. To see the changed files in the\n"
2581
"boilerplate text loaded into the editor, use the --show-diff option."
2582
2583
#: bzrlib/builtins.py:3452
2584
msgid ""
2585
"By default, the entire tree is committed and the person doing the\n"
2586
"commit is assumed to be the author. These defaults can be overridden\n"
2587
"as explained below."
2588
msgstr ""
2589
"By default, the entire tree is committed and the person doing the\n"
2590
"commit is assumed to be the author. These defaults can be overridden\n"
2591
"as explained below."
2592
2593
#: bzrlib/builtins.py:3456
2594
msgid ":Selective commits:"
2595
msgstr ":Selective commits:"
2596
2597
#: bzrlib/builtins.py:3458
2598
msgid ""
2599
" If selected files are specified, only changes to those files are\n"
2600
" committed. If a directory is specified then the directory and\n"
2601
" everything within it is committed."
2602
msgstr ""
2603
" If selected files are specified, only changes to those files are\n"
2604
" committed. If a directory is specified then the directory and\n"
2605
" everything within it is committed."
2606
2607
#: bzrlib/builtins.py:3462
2608
msgid ""
2609
" When excludes are given, they take precedence over selected files.\n"
2610
" For example, to commit only changes within foo, but not changes\n"
2611
" within foo/bar::"
2612
msgstr ""
2613
" When excludes are given, they take precedence over selected files.\n"
2614
" For example, to commit only changes within foo, but not changes\n"
2615
" within foo/bar::"
2616
2617
#: bzrlib/builtins.py:3466
2618
msgid " bzr commit foo -x foo/bar"
2619
msgstr " bzr commit foo -x foo/bar"
2620
2621
#: bzrlib/builtins.py:3468
2622
msgid " A selective commit after a merge is not yet supported."
2623
msgstr " A selective commit after a merge is not yet supported."
2624
2625
#: bzrlib/builtins.py:3470
2626
msgid ":Custom authors:"
2627
msgstr ":Custom authors:"
2628
2629
#: bzrlib/builtins.py:3472
2630
msgid ""
2631
" If the author of the change is not the same person as the committer,\n"
2632
" you can specify the author's name using the --author option. The\n"
2633
" name should be in the same format as a committer-id, e.g.\n"
2634
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2635
" the change you can specify the option multiple times, once for each\n"
2636
" author."
2637
msgstr ""
2638
" If the author of the change is not the same person as the committer,\n"
2639
" you can specify the author's name using the --author option. The\n"
2640
" name should be in the same format as a committer-id, e.g.\n"
2641
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2642
" the change you can specify the option multiple times, once for each\n"
2643
" author."
2644
2645
#: bzrlib/builtins.py:3479
2646
msgid ":Checks:"
2647
msgstr ":Checks:"
2648
2649
#: bzrlib/builtins.py:3481
2650
msgid ""
2651
" A common mistake is to forget to add a new file or directory before\n"
2652
" running the commit command. The --strict option checks for unknown\n"
2653
" files and aborts the commit if any are found. More advanced pre-commit\n"
2654
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2655
" for details."
2656
msgstr ""
2657
" A common mistake is to forget to add a new file or directory before\n"
2658
" running the commit command. The --strict option checks for unknown\n"
2659
" files and aborts the commit if any are found. More advanced pre-commit\n"
2660
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2661
" for details."
2662
2663
#: bzrlib/builtins.py:3487
2664
msgid ":Things to note:"
2665
msgstr ":Things to note:"
2666
2667
#: bzrlib/builtins.py:3489
2668
msgid ""
2669
" If you accidentially commit the wrong changes or make a spelling\n"
2670
" mistake in the commit message say, you can use the uncommit command\n"
2671
" to undo it. See ``bzr help uncommit`` for details."
2672
msgstr ""
2673
" If you accidentally commit the wrong changes or make a spelling\n"
2674
" mistake in the commit message say, you can use the uncommit command\n"
2675
" to undo it. See ``bzr help uncommit`` for details."
2676
2677
#: bzrlib/builtins.py:3493
2678
msgid ""
2679
" Hooks can also be configured to run after a commit. This allows you\n"
2680
" to trigger updates to external systems like bug trackers. The --fixes\n"
2681
" option can be used to record the association between a revision and\n"
2682
" one or more bugs. See ``bzr help bugs`` for details."
2683
msgstr ""
2684
" Hooks can also be configured to run after a commit. This allows you\n"
2685
" to trigger updates to external systems like bug trackers. The --fixes\n"
2686
" option can be used to record the association between a revision and\n"
2687
" one or more bugs. See ``bzr help bugs`` for details."
2688
2689
#: bzrlib/builtins.py:3503
2690
msgid "Do not consider changes made to a given path."
2691
msgstr "Do not consider changes made to a given path."
2692
2693
#: bzrlib/builtins.py:3506
2694
msgid "Description of the new revision."
2695
msgstr "Description of the new revision."
2696
2697
#: bzrlib/builtins.py:3509
2698
msgid "Commit even if nothing has changed."
2699
msgstr "Commit even if nothing has changed."
2700
2701
#: bzrlib/builtins.py:3513
2702
msgid "Take commit message from this file."
2703
msgstr "Take commit message from this file."
2704
2705
#: bzrlib/builtins.py:3515
2706
msgid "Refuse to commit if there are unknown files in the working tree."
2707
msgstr "Refuse to commit if there are unknown files in the working tree."
2708
2709
#: bzrlib/builtins.py:3518
2710
msgid ""
2711
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2712
"08:00:00 +0100'."
2713
msgstr ""
2714
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2715
"08:00:00 +0100'."
2716
2717
#: bzrlib/builtins.py:3521
2718
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2719
msgstr "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2720
2721
#: bzrlib/builtins.py:3524
2722
msgid "Set the author's name, if it's different from the committer."
2723
msgstr "Set the author's name, if it's different from the committer."
2724
2725
#: bzrlib/builtins.py:3527
2726
msgid ""
2727
"Perform a local commit in a bound branch. Local commits are not pushed to "
2728
"the master branch until a normal commit is performed."
2729
msgstr ""
2730
"Perform a local commit in a bound branch. Local commits are not pushed to "
2731
"the master branch until a normal commit is performed."
2732
2733
#: bzrlib/builtins.py:3533
2734
msgid ""
2735
"When no message is supplied, show the diff along with the status summary in "
2736
"the message editor."
2737
msgstr ""
2738
"When no message is supplied, show the diff along with the status summary in "
2739
"the message editor."
2740
2741
#: bzrlib/builtins.py:3536
2742
msgid ""
2743
"When committing to a foreign version control system do not push data that "
2744
"can not be natively represented."
2745
msgstr ""
2746
"When committing to a foreign version control system do not push data that "
2747
"can not be natively represented."
2748
2749
#: bzrlib/builtins.py:3554
2750
#, python-format
2751
msgid ""
2752
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2753
"default bug tracker using the `bugtracker` option.\n"
2754
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2755
msgstr ""
2756
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2757
"default bug tracker using the `bugtracker` option.\n"
2758
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2759
2760
#: bzrlib/builtins.py:3563
2761
#, python-format
2762
msgid ""
2763
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2764
"for more information on this feature.\n"
2765
"Commit refused."
2766
msgstr ""
2767
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2768
"for more information on this feature.\n"
2769
"Commit refused."
2770
2771
#: bzrlib/builtins.py:3572
2772
#, python-format
2773
msgid "Unrecognized bug %s. Commit refused."
2774
msgstr "Unrecognised bug %s. Commit refused."
2775
2776
#: bzrlib/builtins.py:3575
2777
#, python-format
2778
msgid ""
2779
"%s\n"
2780
"Commit refused."
2781
msgstr ""
2782
"%s\n"
2783
"Commit refused."
2784
2785
#: bzrlib/builtins.py:3599
2786
msgid "Could not parse --commit-time: "
2787
msgstr "Could not parse --commit-time: "
2788
2789
#: bzrlib/builtins.py:3639
2790
msgid "please specify either --message or --file"
2791
msgstr "please specify either --message or --file"
2792
2793
#: bzrlib/builtins.py:3668
2794
msgid "please specify a commit message with either --message or --file"
2795
msgstr "please specify a commit message with either --message or --file"
2796
2797
#: bzrlib/builtins.py:3671
2798
msgid ""
2799
"Empty commit message specified. Please specify a commit message with either -"
2800
"-message or --file or leave a blank message with --message \"\"."
2801
msgstr ""
2802
"Empty commit message specified. Please specify a commit message with either -"
2803
"-message or --file or leave a blank message with --message \"\"."
2804
2805
#: bzrlib/builtins.py:3691
2806
msgid ""
2807
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2808
"-unchanged to force an empty commit."
2809
msgstr ""
2810
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2811
"-unchanged to force an empty commit."
2812
2813
#: bzrlib/builtins.py:3695
2814
msgid ""
2815
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2816
"resolve FILE\" to resolve."
2817
msgstr ""
2818
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2819
"resolve FILE\" to resolve."
2820
2821
#: bzrlib/builtins.py:3699
2822
msgid "Commit refused because there are unknown files in the working tree."
2823
msgstr "Commit refused because there are unknown files in the working tree."
2824
2825
#: bzrlib/builtins.py:3702
2826
msgid ""
2827
"\n"
2828
"To commit to master branch, run update and then commit.\n"
2829
"You can also pass --local to commit to continue working disconnected."
2830
msgstr ""
2831
"\n"
2832
"To commit to master branch, run update and then commit.\n"
2833
"You can also pass --local to commit to continue working disconnected."
2834
2835
#: bzrlib/builtins.py:3710
2836
msgid ""
2837
"Validate working tree structure, branch consistency and repository history."
2838
msgstr ""
2839
"Validate working tree structure, branch consistency and repository history."
2840
2841
#: bzrlib/builtins.py:3712
2842
msgid ""
2843
"This command checks various invariants about branch and repository storage\n"
2844
"to detect data corruption or bzr bugs."
2845
msgstr ""
2846
"This command checks various invariants about branch and repository storage\n"
2847
"to detect data corruption or bzr bugs."
2848
2849
#: bzrlib/builtins.py:3715
2850
msgid ""
2851
"The working tree and branch checks will only give output if a problem is\n"
2852
"detected. The output fields of the repository check are:"
2853
msgstr ""
2854
"The working tree and branch checks will only give output if a problem is\n"
2855
"detected. The output fields of the repository check are:"
2856
2857
#: bzrlib/builtins.py:3718
2858
msgid ""
2859
"revisions\n"
2860
" This is just the number of revisions checked. It doesn't\n"
2861
" indicate a problem."
2862
msgstr ""
2863
"revisions\n"
2864
" This is just the number of revisions checked. It doesn't\n"
2865
" indicate a problem."
2866
2867
#: bzrlib/builtins.py:3722
2868
msgid ""
2869
"versionedfiles\n"
2870
" This is just the number of versionedfiles checked. It\n"
2871
" doesn't indicate a problem."
2872
msgstr ""
2873
"versionedfiles\n"
2874
" This is just the number of versionedfiles checked. It\n"
2875
" doesn't indicate a problem."
2876
2877
#: bzrlib/builtins.py:3726
2878
msgid ""
2879
"unreferenced ancestors\n"
2880
" Texts that are ancestors of other texts, but\n"
2881
" are not properly referenced by the revision ancestry. This is a\n"
2882
" subtle problem that Bazaar can work around."
2883
msgstr ""
2884
"unreferenced ancestors\n"
2885
" Texts that are ancestors of other texts, but\n"
2886
" are not properly referenced by the revision ancestry. This is a\n"
2887
" subtle problem that Bazaar can work around."
2888
2889
#: bzrlib/builtins.py:3731
2890
msgid ""
2891
"unique file texts\n"
2892
" This is the total number of unique file contents\n"
2893
" seen in the checked revisions. It does not indicate a problem."
2894
msgstr ""
2895
"unique file texts\n"
2896
" This is the total number of unique file contents\n"
2897
" seen in the checked revisions. It does not indicate a problem."
2898
2899
#: bzrlib/builtins.py:3735
2900
msgid ""
2901
"repeated file texts\n"
2902
" This is the total number of repeated texts seen\n"
2903
" in the checked revisions. Texts can be repeated when their file\n"
2904
" entries are modified, but the file contents are not. It does not\n"
2905
" indicate a problem."
2906
msgstr ""
2907
"repeated file texts\n"
2908
" This is the total number of repeated texts seen\n"
2909
" in the checked revisions. Texts can be repeated when their file\n"
2910
" entries are modified, but the file contents are not. It does not\n"
2911
" indicate a problem."
2912
2913
#: bzrlib/builtins.py:3741
2914
msgid ""
2915
"If no restrictions are specified, all Bazaar data that is found at the "
2916
"given\n"
2917
"location will be checked."
2918
msgstr ""
2919
"If no restrictions are specified, all Bazaar data that is found at the "
2920
"given\n"
2921
"location will be checked."
2922
2923
#: bzrlib/builtins.py:3746
2924
msgid " Check the tree and branch at 'foo'::"
2925
msgstr " Check the tree and branch at 'foo'::"
2926
2927
#: bzrlib/builtins.py:3748
2928
msgid " bzr check --tree --branch foo"
2929
msgstr " bzr check --tree --branch foo"
2930
2931
#: bzrlib/builtins.py:3750
2932
msgid " Check only the repository at 'bar'::"
2933
msgstr " Check only the repository at 'bar'::"
2934
2935
#: bzrlib/builtins.py:3752
2936
msgid " bzr check --repo bar"
2937
msgstr " bzr check --repo bar"
2938
2939
#: bzrlib/builtins.py:3754
2940
msgid " Check everything at 'baz'::"
2941
msgstr " Check everything at 'baz'::"
2942
2943
#: bzrlib/builtins.py:3756
2944
msgid " bzr check baz"
2945
msgstr " bzr check baz"
2946
2947
#: bzrlib/builtins.py:3762
2948
msgid "Check the branch related to the current directory."
2949
msgstr "Check the branch related to the current directory."
2950
2951
#: bzrlib/builtins.py:3764
2952
msgid "Check the repository related to the current directory."
2953
msgstr "Check the repository related to the current directory."
2954
2955
#: bzrlib/builtins.py:3766
2956
msgid "Check the working tree related to the current directory."
2957
msgstr "Check the working tree related to the current directory."
2958
2959
#: bzrlib/builtins.py:3780
2960
msgid "Upgrade a repository, branch or working tree to a newer format."
2961
msgstr "Upgrade a repository, branch or working tree to a newer format."
2962
2963
#: bzrlib/builtins.py:3782
2964
msgid ""
2965
"When the default format has changed after a major new release of\n"
2966
"Bazaar, you may be informed during certain operations that you\n"
2967
"should upgrade. Upgrading to a newer format may improve performance\n"
2968
"or make new features available. It may however limit interoperability\n"
2969
"with older repositories or with older versions of Bazaar."
2970
msgstr ""
2971
"When the default format has changed after a major new release of\n"
2972
"Bazaar, you may be informed during certain operations that you\n"
2973
"should upgrade. Upgrading to a newer format may improve performance\n"
2974
"or make new features available. It may however limit interoperability\n"
2975
"with older repositories or with older versions of Bazaar."
2976
2977
#: bzrlib/builtins.py:3788
2978
msgid ""
2979
"If you wish to upgrade to a particular format rather than the\n"
2980
"current default, that can be specified using the --format option.\n"
2981
"As a consequence, you can use the upgrade command this way to\n"
2982
"\"downgrade\" to an earlier format, though some conversions are\n"
2983
"a one way process (e.g. changing from the 1.x default to the\n"
2984
"2.x default) so downgrading is not always possible."
2985
msgstr ""
2986
"If you wish to upgrade to a particular format rather than the\n"
2987
"current default, that can be specified using the --format option.\n"
2988
"As a consequence, you can use the upgrade command this way to\n"
2989
"\"downgrade\" to an earlier format, though some conversions are\n"
2990
"a one way process (e.g. changing from the 1.x default to the\n"
2991
"2.x default) so downgrading is not always possible."
2992
2993
#: bzrlib/builtins.py:3795
2994
msgid ""
2995
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2996
"process (where # is a number). By default, this is left there on\n"
2997
"completion. If the conversion fails, delete the new .bzr directory\n"
2998
"and rename this one back in its place. Use the --clean option to ask\n"
2999
"for the backup.bzr directory to be removed on successful conversion.\n"
3000
"Alternatively, you can delete it by hand if everything looks good\n"
3001
"afterwards."
3002
msgstr ""
3003
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
3004
"process (where # is a number). By default, this is left there on\n"
3005
"completion. If the conversion fails, delete the new .bzr directory\n"
3006
"and rename this one back in its place. Use the --clean option to ask\n"
3007
"for the backup.bzr directory to be removed on successful conversion.\n"
3008
"Alternatively, you can delete it by hand if everything looks good\n"
3009
"afterwards."
3010
3011
#: bzrlib/builtins.py:3803
3012
msgid ""
3013
"If the location given is a shared repository, dependent branches\n"
3014
"are also converted provided the repository converts successfully.\n"
3015
"If the conversion of a branch fails, remaining branches are still\n"
3016
"tried."
3017
msgstr ""
3018
"If the location given is a shared repository, dependent branches\n"
3019
"are also converted provided the repository converts successfully.\n"
3020
"If the conversion of a branch fails, remaining branches are still\n"
3021
"tried."
3022
3023
#: bzrlib/builtins.py:3808
3024
msgid ""
3025
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3026
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
3027
msgstr ""
3028
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3029
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
3030
3031
#: bzrlib/builtins.py:3816
3032
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
3033
msgstr "Upgrade to a specific format. See \"bzr help formats\" for details."
3034
3035
#: bzrlib/builtins.py:3820
3036
msgid "Branch format"
3037
msgstr "Branch format"
3038
3039
#: bzrlib/builtins.py:3822
3040
msgid "Remove the backup.bzr directory if successful."
3041
msgstr "Remove the backup.bzr directory if successful."
3042
3043
#: bzrlib/builtins.py:3824
3044
msgid "Show what would be done, but don't actually do anything."
3045
msgstr "Show what would be done, but don't actually do anything."
3046
3047
#: bzrlib/builtins.py:3839
3048
msgid "Show or set bzr user id."
3049
msgstr "Show or set bzr user id."
3050
3051
#: bzrlib/builtins.py:3841
3052
msgid ""
3053
":Examples:\n"
3054
" Show the email of the current user::"
3055
msgstr ""
3056
":Examples:\n"
3057
" Show the email of the current user::"
3058
3059
#: bzrlib/builtins.py:3844
3060
msgid " bzr whoami --email"
3061
msgstr " bzr whoami --email"
3062
3063
#: bzrlib/builtins.py:3846
3064
msgid " Set the current user::"
3065
msgstr " Set the current user::"
3066
3067
#: bzrlib/builtins.py:3848
3068
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3069
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
3070
3071
#: bzrlib/builtins.py:3852
3072
msgid "Display email address only."
3073
msgstr "Display email address only."
3074
3075
#: bzrlib/builtins.py:3854
3076
msgid "Set identity for the current branch instead of globally."
3077
msgstr "Set identity for the current branch instead of globally."
3078
3079
#: bzrlib/builtins.py:3880
3080
msgid "--email can only be used to display existing identity"
3081
msgstr "--email can only be used to display existing identity"
3082
3083
#: bzrlib/builtins.py:3904
3084
msgid "Print or set the branch nickname."
3085
msgstr "Print or set the branch nickname."
3086
3087
#: bzrlib/builtins.py:3906
3088
msgid ""
3089
"If unset, the colocated branch name is used for colocated branches, and\n"
3090
"the branch directory name is used for other branches. To print the\n"
3091
"current nickname, execute with no argument."
3092
msgstr ""
3093
"If unset, the colocated branch name is used for colocated branches, and\n"
3094
"the branch directory name is used for other branches. To print the\n"
3095
"current nickname, execute with no argument."
3096
3097
#: bzrlib/builtins.py:3910
3098
msgid ""
3099
"Bound branches use the nickname of its master branch unless it is set\n"
3100
"locally."
3101
msgstr ""
3102
"Bound branches use the nickname of its master branch unless it is set\n"
3103
"locally."
3104
3105
#: bzrlib/builtins.py:3930
3106
msgid "Set/unset and display aliases."
3107
msgstr "Set/unset and display aliases."
3108
3109
#: bzrlib/builtins.py:3932
3110
msgid ""
3111
":Examples:\n"
3112
" Show the current aliases::"
3113
msgstr ""
3114
":Examples:\n"
3115
" Show the current aliases::"
3116
3117
#: bzrlib/builtins.py:3935
3118
msgid " bzr alias"
3119
msgstr " bzr alias"
3120
3121
#: bzrlib/builtins.py:3937
3122
msgid " Show the alias specified for 'll'::"
3123
msgstr " Show the alias specified for 'll'::"
3124
3125
#: bzrlib/builtins.py:3939
3126
msgid " bzr alias ll"
3127
msgstr " bzr alias ll"
3128
3129
#: bzrlib/builtins.py:3941
3130
msgid " Set an alias for 'll'::"
3131
msgstr " Set an alias for 'll'::"
3132
3133
#: bzrlib/builtins.py:3943
3134
msgid " bzr alias ll=\"log --line -r-10..-1\""
3135
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3136
3137
#: bzrlib/builtins.py:3945
3138
msgid " To remove an alias for 'll'::"
3139
msgstr " To remove an alias for 'll'::"
3140
3141
#: bzrlib/builtins.py:3947
3142
msgid " bzr alias --remove ll"
3143
msgstr " bzr alias --remove ll"
3144
3145
#: bzrlib/builtins.py:3952
3146
msgid "Remove the alias."
3147
msgstr "Remove the alias."
3148
3149
#: bzrlib/builtins.py:3970
3150
msgid "bzr alias --remove expects an alias to remove."
3151
msgstr "bzr alias --remove expects an alias to remove."
3152
3153
#: bzrlib/builtins.py:4151
3154
msgid ""
3155
"subunit not available. subunit needs to be installed to use --subunit."
3156
msgstr ""
3157
"subunit not available. subunit needs to be installed to use --subunit."
3158
3159
#: bzrlib/builtins.py:4168
3160
msgid ""
3161
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3162
msgstr ""
3163
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3164
3165
#: bzrlib/builtins.py:4215
3166
msgid "Show version of bzr."
3167
msgstr "Show version of bzr."
3168
3169
#: bzrlib/builtins.py:4219
3170
msgid "Print just the version number."
3171
msgstr "Print just the version number."
3172
3173
#: bzrlib/builtins.py:4238
3174
msgid "It sure does!\n"
3175
msgstr "It sure does!\n"
3176
3177
#: bzrlib/builtins.py:4262
3178
#, python-format
3179
msgid "merge base is revision %s\n"
3180
msgstr "merge base is revision %s\n"
3181
3182
#: bzrlib/builtins.py:4266
3183
msgid "Perform a three-way merge."
3184
msgstr "Perform a three-way merge."
3185
3186
#: bzrlib/builtins.py:4268
3187
msgid ""
3188
"The source of the merge can be specified either in the form of a branch,\n"
3189
"or in the form of a path to a file containing a merge directive generated\n"
3190
"with bzr send. If neither is specified, the default is the upstream branch\n"
3191
"or the branch most recently merged using --remember. The source of the\n"
3192
"merge may also be specified in the form of a path to a file in another\n"
3193
"branch: in this case, only the modifications to that file are merged into\n"
3194
"the current working tree."
3195
msgstr ""
3196
"The source of the merge can be specified either in the form of a branch,\n"
3197
"or in the form of a path to a file containing a merge directive generated\n"
3198
"with bzr send. If neither is specified, the default is the upstream branch\n"
3199
"or the branch most recently merged using --remember. The source of the\n"
3200
"merge may also be specified in the form of a path to a file in another\n"
3201
"branch: in this case, only the modifications to that file are merged into\n"
3202
"the current working tree."
3203
3204
#: bzrlib/builtins.py:4276
3205
msgid ""
3206
"When merging from a branch, by default bzr will try to merge in all new\n"
3207
"work from the other branch, automatically determining an appropriate base\n"
3208
"revision. If this fails, you may need to give an explicit base."
3209
msgstr ""
3210
"When merging from a branch, by default bzr will try to merge in all new\n"
3211
"work from the other branch, automatically determining an appropriate base\n"
3212
"revision. If this fails, you may need to give an explicit base."
3213
3214
#: bzrlib/builtins.py:4280
3215
msgid ""
3216
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3217
"try to merge in all new work up to and including revision OTHER."
3218
msgstr ""
3219
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3220
"try to merge in all new work up to and including revision OTHER."
3221
3222
#: bzrlib/builtins.py:4283
3223
msgid ""
3224
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3225
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3226
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3227
"not already contain revision BASE, such a merge is commonly referred to as\n"
3228
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3229
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3230
"changes from the other branch is not stored in the commit."
3231
msgstr ""
3232
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3233
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3234
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3235
"not already contain revision BASE, such a merge is commonly referred to as\n"
3236
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3237
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3238
"changes from the other branch is not stored in the commit."
3239
3240
#: bzrlib/builtins.py:4291
3241
msgid "Revision numbers are always relative to the source branch."
3242
msgstr "Revision numbers are always relative to the source branch."
3243
3244
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3245
msgid ""
3246
"Merge will do its best to combine the changes in two branches, but there\n"
3247
"are some kinds of problems only a human can fix. When it encounters those,\n"
3248
"it will mark a conflict. A conflict means that you need to fix something,\n"
3249
"before you can commit."
3250
msgstr ""
3251
"Merge will do its best to combine the changes in two branches, but there\n"
3252
"are some kinds of problems only a human can fix. When it encounters those,\n"
3253
"it will mark a conflict. A conflict means that you need to fix something,\n"
3254
"before you can commit."
3255
3256
#: bzrlib/builtins.py:4298
3257
msgid ""
3258
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3259
msgstr ""
3260
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3261
3262
#: bzrlib/builtins.py:4300
3263
msgid ""
3264
"If there is no default branch set, the first merge will set it (use\n"
3265
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3266
"to use the default. To change the default, use --remember. The value will\n"
3267
"only be saved if the remote location can be accessed."
3268
msgstr ""
3269
"If there is no default branch set, the first merge will set it (use\n"
3270
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3271
"to use the default. To change the default, use --remember. The value will\n"
3272
"only be saved if the remote location can be accessed."
3273
3274
#: bzrlib/builtins.py:4305
3275
msgid ""
3276
"The results of the merge are placed into the destination working\n"
3277
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3278
"committed to record the result of the merge."
3279
msgstr ""
3280
"The results of the merge are placed into the destination working\n"
3281
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3282
"committed to record the result of the merge."
3283
3284
#: bzrlib/builtins.py:4309
3285
msgid ""
3286
"merge refuses to run if there are any uncommitted changes, unless\n"
3287
"--force is given. If --force is given, then the changes from the source \n"
3288
"will be merged with the current working tree, including any uncommitted\n"
3289
"changes in the tree. The --force option can also be used to create a\n"
3290
"merge revision which has more than two parents."
3291
msgstr ""
3292
"merge refuses to run if there are any uncommitted changes, unless\n"
3293
"--force is given. If --force is given, then the changes from the source \n"
3294
"will be merged with the current working tree, including any uncommitted\n"
3295
"changes in the tree. The --force option can also be used to create a\n"
3296
"merge revision which has more than two parents."
3297
3298
#: bzrlib/builtins.py:4315
3299
msgid ""
3300
"If one would like to merge changes from the working tree of the other\n"
3301
"branch without merging any committed revisions, the --uncommitted option\n"
3302
"can be given."
3303
msgstr ""
3304
"If one would like to merge changes from the working tree of the other\n"
3305
"branch without merging any committed revisions, the --uncommitted option\n"
3306
"can be given."
3307
3308
#: bzrlib/builtins.py:4319
3309
msgid ""
3310
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3311
"you to apply each diff hunk and file change, similar to \"shelve\"."
3312
msgstr ""
3313
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3314
"you to apply each diff hunk and file change, similar to \"shelve\"."
3315
3316
#: bzrlib/builtins.py:4322
3317
msgid ""
3318
":Examples:\n"
3319
" To merge all new revisions from bzr.dev::"
3320
msgstr ""
3321
":Examples:\n"
3322
" To merge all new revisions from bzr.dev::"
3323
3324
#: bzrlib/builtins.py:4325
3325
msgid " bzr merge ../bzr.dev"
3326
msgstr " bzr merge ../bzr.dev"
3327
3328
#: bzrlib/builtins.py:4327
3329
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3330
msgstr " To merge changes up to and including revision 82 from bzr.dev::"
3331
3332
#: bzrlib/builtins.py:4329
3333
msgid " bzr merge -r 82 ../bzr.dev"
3334
msgstr " bzr merge -r 82 ../bzr.dev"
3335
3336
#: bzrlib/builtins.py:4331
3337
msgid " To merge the changes introduced by 82, without previous changes::"
3338
msgstr ""
3339
" To merge the changes introduced by 82, without previous changes::"
3340
3341
#: bzrlib/builtins.py:4333
3342
msgid " bzr merge -r 81..82 ../bzr.dev"
3343
msgstr " bzr merge -r 81..82 ../bzr.dev"
3344
3345
#: bzrlib/builtins.py:4335
3346
msgid " To apply a merge directive contained in /tmp/merge::"
3347
msgstr " To apply a merge directive contained in /tmp/merge::"
3348
3349
#: bzrlib/builtins.py:4337
3350
msgid " bzr merge /tmp/merge"
3351
msgstr " bzr merge /tmp/merge"
3352
3353
#: bzrlib/builtins.py:4339
3354
msgid ""
3355
" To create a merge revision with three parents from two branches\n"
3356
" feature1a and feature1b:"
3357
msgstr ""
3358
" To create a merge revision with three parents from two branches\n"
3359
" feature1a and feature1b:"
3360
3361
#: bzrlib/builtins.py:4342
3362
msgid ""
3363
" bzr merge ../feature1a\n"
3364
" bzr merge ../feature1b --force\n"
3365
" bzr commit -m 'revision with three parents'"
3366
msgstr ""
3367
" bzr merge ../feature1a\n"
3368
" bzr merge ../feature1b --force\n"
3369
" bzr commit -m 'revision with three parents'"
3370
3371
#: bzrlib/builtins.py:4354
3372
msgid "Merge even if the destination tree has uncommitted changes."
3373
msgstr "Merge even if the destination tree has uncommitted changes."
3374
3375
#: bzrlib/builtins.py:4360
3376
msgid ""
3377
"Apply uncommitted changes from a working copy, instead of branch changes."
3378
msgstr ""
3379
"Apply uncommitted changes from a working copy, instead of branch changes."
3380
3381
#: bzrlib/builtins.py:4362
3382
msgid ""
3383
"If the destination is already completely merged into the source, pull from "
3384
"the source rather than merging. When this happens, you do not need to "
3385
"commit the result."
3386
msgstr ""
3387
"If the destination is already completely merged into the source, pull from "
3388
"the source rather than merging. When this happens, you do not need to "
3389
"commit the result."
3390
3391
#: bzrlib/builtins.py:4367
3392
msgid ""
3393
"Branch to merge into, rather than the one containing the working directory."
3394
msgstr ""
3395
"Branch to merge into, rather than the one containing the working directory."
3396
3397
#: bzrlib/builtins.py:4369
3398
msgid "Instead of merging, show a diff of the merge."
3399
msgstr "Instead of merging, show a diff of the merge."
3400
3401
#: bzrlib/builtins.py:4371
3402
msgid "Select changes interactively."
3403
msgstr "Select changes interactively."
3404
3405
#: bzrlib/builtins.py:4393
3406
msgid ""
3407
"Merging into empty branches not currently supported, "
3408
"https://bugs.launchpad.net/bzr/+bug/308562"
3409
msgstr ""
3410
"Merging into empty branches not currently supported, "
3411
"https://bugs.launchpad.net/bzr/+bug/308562"
3412
3413
#: bzrlib/builtins.py:4420
3414
msgid "Cannot use --uncommitted with bundles or merge directives."
3415
msgstr "Cannot use --uncommitted with bundles or merge directives."
3416
3417
#: bzrlib/builtins.py:4431
3418
msgid "Cannot use --uncommitted and --revision at the same time."
3419
msgstr "Cannot use --uncommitted and --revision at the same time."
3420
3421
#: bzrlib/builtins.py:4451
3422
msgid "merger: "
3423
msgstr "merger: "
3424
3425
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3426
msgid "Nothing to do."
3427
msgstr "Nothing to do."
3428
3429
#: bzrlib/builtins.py:4457
3430
msgid "Cannot pull individual files"
3431
msgstr "Cannot pull individual files"
3432
3433
#: bzrlib/builtins.py:4465
3434
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3435
msgstr "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3436
3437
#: bzrlib/builtins.py:4523
3438
#, python-format
3439
msgid "Show-base is not supported for this merge type. %s"
3440
msgstr "Show-base is not supported for this merge type. %s"
3441
3442
#: bzrlib/builtins.py:4532
3443
#, python-format
3444
msgid "Conflict reduction is not supported for merge type %s."
3445
msgstr "Conflict reduction is not supported for merge type %s."
3446
3447
#: bzrlib/builtins.py:4536
3448
msgid "Cannot do conflict reduction and show base."
3449
msgstr "Cannot do conflict reduction and show base."
3450
3451
#: bzrlib/builtins.py:4647
3452
msgid "No location specified or remembered"
3453
msgstr "No location specified or remembered"
3454
3455
#: bzrlib/builtins.py:4649
3456
msgid "{0} remembered {1} location {2}"
3457
msgstr "{0} remembered {1} location {2}"
3458
3459
#: bzrlib/builtins.py:4655
3460
msgid "Redo a merge."
3461
msgstr "Redo a merge."
3462
3463
#: bzrlib/builtins.py:4657
3464
msgid ""
3465
"Use this if you want to try a different merge technique while resolving\n"
3466
"conflicts. Some merge techniques are better than others, and remerge\n"
3467
"lets you try different ones on different files."
3468
msgstr ""
3469
"Use this if you want to try a different merge technique while resolving\n"
3470
"conflicts. Some merge techniques are better than others, and re-merge\n"
3471
"lets you try different ones on different files."
3472
3473
#: bzrlib/builtins.py:4661
3474
msgid ""
3475
"The options for remerge have the same meaning and defaults as the ones for\n"
3476
"merge. The difference is that remerge can (only) be run when there is a\n"
3477
"pending merge, and it lets you specify particular files."
3478
msgstr ""
3479
"The options for re-merge have the same meaning and defaults as the ones for\n"
3480
"merge. The difference is that re-merge can (only) be run when there is a\n"
3481
"pending merge, and it lets you specify particular files."
3482
3483
#: bzrlib/builtins.py:4665
3484
msgid ""
3485
":Examples:\n"
3486
" Re-do the merge of all conflicted files, and show the base text in\n"
3487
" conflict regions, in addition to the usual THIS and OTHER texts::"
3488
msgstr ""
3489
":Examples:\n"
3490
" Re-do the merge of all conflicted files, and show the base text in\n"
3491
" conflict regions, in addition to the usual THIS and OTHER texts::"
3492
3493
#: bzrlib/builtins.py:4669
3494
msgid " bzr remerge --show-base"
3495
msgstr " bzr remerge --show-base"
3496
3497
#: bzrlib/builtins.py:4671
3498
msgid ""
3499
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3500
" additional processing to reduce the size of conflict regions::"
3501
msgstr ""
3502
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3503
" additional processing to reduce the size of conflict regions::"
3504
3505
#: bzrlib/builtins.py:4674
3506
msgid " bzr remerge --merge-type weave --reprocess foobar"
3507
msgstr " bzr remerge --merge-type weave --reprocess foobar"
3508
3509
#: bzrlib/builtins.py:4681
3510
msgid "Show base revision text in conflicts."
3511
msgstr "Show base revision text in conflicts."
3512
3513
#: bzrlib/builtins.py:4693
3514
msgid ""
3515
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3516
"merges."
3517
msgstr ""
3518
"Sorry, re-merge only works after normal merges. Not cherrypicking or multi-"
3519
"merges."
3520
3521
#: bzrlib/builtins.py:4751
3522
msgid ""
3523
"Set files in the working tree back to the contents of a previous revision."
3524
msgstr ""
3525
"Set files in the working tree back to the contents of a previous revision."
3526
3527
#: bzrlib/builtins.py:4753
3528
msgid ""
3529
"Giving a list of files will revert only those files. Otherwise, all files\n"
3530
"will be reverted. If the revision is not specified with '--revision', the\n"
3531
"working tree basis revision is used. A revert operation affects only the\n"
3532
"working tree, not any revision history like the branch and repository or\n"
3533
"the working tree basis revision."
3534
msgstr ""
3535
"Giving a list of files will revert only those files. Otherwise, all files\n"
3536
"will be reverted. If the revision is not specified with '--revision', the\n"
3537
"working tree basis revision is used. A revert operation affects only the\n"
3538
"working tree, not any revision history like the branch and repository or\n"
3539
"the working tree basis revision."
3540
3541
#: bzrlib/builtins.py:4759
3542
msgid ""
3543
"To remove only some changes, without reverting to a prior version, use\n"
3544
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3545
"will remove the changes introduced by the second last commit (-2), without\n"
3546
"affecting the changes introduced by the last commit (-1). To remove\n"
3547
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3548
"To update the branch to a specific revision or the latest revision and\n"
3549
"update the working tree accordingly while preserving local changes, see the\n"
3550
"update command."
3551
msgstr ""
3552
"To remove only some changes, without reverting to a prior version, use\n"
3553
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3554
"will remove the changes introduced by the second last commit (-2), without\n"
3555
"affecting the changes introduced by the last commit (-1). To remove\n"
3556
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3557
"To update the branch to a specific revision or the latest revision and\n"
3558
"update the working tree accordingly while preserving local changes, see the\n"
3559
"update command."
3560
3561
#: bzrlib/builtins.py:4768
3562
msgid ""
3563
"Uncommitted changes to files that are reverted will be discarded.\n"
3564
"Howver, by default, any files that have been manually changed will be\n"
3565
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3566
"files have '.~#~' appended to their name, where # is a number."
3567
msgstr ""
3568
"Uncommitted changes to files that are reverted will be discarded.\n"
3569
"Howver, by default, any files that have been manually changed will be\n"
3570
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3571
"files have '.~#~' appended to their name, where # is a number."
3572
3573
#: bzrlib/builtins.py:4773
3574
msgid ""
3575
"When you provide files, you can use their current pathname or the pathname\n"
3576
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3577
"name. If you name a directory, all the contents of that directory will be\n"
3578
"reverted."
3579
msgstr ""
3580
"When you provide files, you can use their current pathname or the pathname\n"
3581
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3582
"name. If you name a directory, all the contents of that directory will be\n"
3583
"reverted."
3584
3585
#: bzrlib/builtins.py:4778
3586
msgid ""
3587
"If you have newly added files since the target revision, they will be\n"
3588
"removed. If the files to be removed have been changed, backups will be\n"
3589
"created as above. Directories containing unknown files will not be\n"
3590
"deleted."
3591
msgstr ""
3592
"If you have newly added files since the target revision, they will be\n"
3593
"removed. If the files to be removed have been changed, backups will be\n"
3594
"created as above. Directories containing unknown files will not be\n"
3595
"deleted."
3596
3597
#: bzrlib/builtins.py:4783
3598
msgid ""
3599
"The working tree contains a list of revisions that have been merged but\n"
3600
"not yet committed. These revisions will be included as additional parents\n"
3601
"of the next commit. Normally, using revert clears that list as well as\n"
3602
"reverting the files. If any files are specified, revert leaves the list\n"
3603
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3604
".`` in the tree root to revert all files but keep the recorded merges,\n"
3605
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3606
"reverting any files."
3607
msgstr ""
3608
"The working tree contains a list of revisions that have been merged but\n"
3609
"not yet committed. These revisions will be included as additional parents\n"
3610
"of the next commit. Normally, using revert clears that list as well as\n"
3611
"reverting the files. If any files are specified, revert leaves the list\n"
3612
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3613
".`` in the tree root to revert all files but keep the recorded merges,\n"
3614
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3615
"reverting any files."
3616
3617
#: bzrlib/builtins.py:4792
3618
msgid ""
3619
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3620
"changes from a branch in a single revision. To do this, perform the merge\n"
3621
"as desired. Then doing revert with the \"--forget-merges\" option will "
3622
"keep\n"
3623
"the content of the tree as it was, but it will clear the list of pending\n"
3624
"merges. The next commit will then contain all of the changes that are\n"
3625
"present in the other branch, but without any other parent revisions.\n"
3626
"Because this technique forgets where these changes originated, it may\n"
3627
"cause additional conflicts on later merges involving the same source and\n"
3628
"target branches."
3629
msgstr ""
3630
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3631
"changes from a branch in a single revision. To do this, perform the merge\n"
3632
"as desired. Then doing revert with the \"--forget-merges\" option will "
3633
"keep\n"
3634
"the content of the tree as it was, but it will clear the list of pending\n"
3635
"merges. The next commit will then contain all of the changes that are\n"
3636
"present in the other branch, but without any other parent revisions.\n"
3637
"Because this technique forgets where these changes originated, it may\n"
3638
"cause additional conflicts on later merges involving the same source and\n"
3639
"target branches."
3640
3641
#: bzrlib/builtins.py:4806
3642
msgid "Do not save backups of reverted files."
3643
msgstr "Do not save backups of reverted files."
3644
3645
#: bzrlib/builtins.py:4808
3646
msgid "Remove pending merge marker, without changing any files."
3647
msgstr "Remove pending merge marker, without changing any files."
3648
3649
#: bzrlib/builtins.py:4839
3650
msgid ""
3651
"Show help on a command or other topic.\n"
3652
" "
3653
msgstr ""
3654
"Show help on a command or other topic.\n"
3655
" "
3656
3657
#: bzrlib/builtins.py:4844
3658
msgid "Show help on all commands."
3659
msgstr "Show help on all commands."
3660
3661
#: bzrlib/builtins.py:4873
3662
msgid "Show unmerged/unpulled revisions between two branches."
3663
msgstr "Show unmerged/unpulled revisions between two branches."
3664
3665
#: bzrlib/builtins.py:4875
3666
msgid "OTHER_BRANCH may be local or remote."
3667
msgstr "OTHER_BRANCH may be local or remote."
3668
3669
#: bzrlib/builtins.py:4877
3670
msgid ""
3671
"To filter on a range of revisions, you can use the command -r begin..end\n"
3672
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3673
"also valid.\n"
3674
" \n"
3675
":Exit values:\n"
3676
" 1 - some missing revisions\n"
3677
" 0 - no missing revisions"
3678
msgstr ""
3679
"To filter on a range of revisions, you can use the command -r begin..end\n"
3680
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3681
"also valid.\n"
3682
" \n"
3683
":Exit values:\n"
3684
" 1 - some missing revisions\n"
3685
" 0 - no missing revisions"
3686
3687
#: bzrlib/builtins.py:4887
3688
msgid ""
3689
" Determine the missing revisions between this and the branch at the\n"
3690
" remembered pull location::"
3691
msgstr ""
3692
" Determine the missing revisions between this and the branch at the\n"
3693
" remembered pull location::"
3694
3695
#: bzrlib/builtins.py:4890
3696
msgid " bzr missing"
3697
msgstr " bzr missing"
3698
3699
#: bzrlib/builtins.py:4892
3700
msgid " Determine the missing revisions between this and another branch::"
3701
msgstr ""
3702
" Determine the missing revisions between this and another branch::"
3703
3704
#: bzrlib/builtins.py:4894
3705
msgid " bzr missing http://server/branch"
3706
msgstr " bzr missing http://server/branch"
3707
3708
#: bzrlib/builtins.py:4896
3709
msgid ""
3710
" Determine the missing revisions up to a specific revision on the other\n"
3711
" branch::"
3712
msgstr ""
3713
" Determine the missing revisions up to a specific revision on the other\n"
3714
" branch::"
3715
3716
#: bzrlib/builtins.py:4899
3717
msgid " bzr missing -r ..-10"
3718
msgstr " bzr missing -r ..-10"
3719
3720
#: bzrlib/builtins.py:4901
3721
msgid ""
3722
" Determine the missing revisions up to a specific revision on this\n"
3723
" branch::"
3724
msgstr ""
3725
" Determine the missing revisions up to a specific revision on this\n"
3726
" branch::"
3727
3728
#: bzrlib/builtins.py:4904
3729
msgid " bzr missing --my-revision ..-10"
3730
msgstr " bzr missing --my-revision ..-10"
3731
3732
#: bzrlib/builtins.py:4911
3733
msgid "Reverse the order of revisions."
3734
msgstr "Reverse the order of revisions."
3735
3736
#: bzrlib/builtins.py:4913
3737
msgid "Display changes in the local branch only."
3738
msgstr "Display changes in the local branch only."
3739
3740
#: bzrlib/builtins.py:4914
3741
msgid "Same as --mine-only."
3742
msgstr "Same as --mine-only."
3743
3744
#: bzrlib/builtins.py:4916
3745
msgid "Display changes in the remote branch only."
3746
msgstr "Display changes in the remote branch only."
3747
3748
#: bzrlib/builtins.py:4917
3749
msgid "Same as --theirs-only."
3750
msgstr "Same as --theirs-only."
3751
3752
#: bzrlib/builtins.py:4922
3753
msgid ""
3754
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3755
"details."
3756
msgstr ""
3757
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3758
"details."
3759
3760
#: bzrlib/builtins.py:4926
3761
msgid ""
3762
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3763
"details."
3764
msgstr ""
3765
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3766
"details."
3767
3768
#: bzrlib/builtins.py:4929
3769
msgid "Show all revisions in addition to the mainline ones."
3770
msgstr "Show all revisions in addition to the mainline ones."
3771
3772
#: bzrlib/builtins.py:4983
3773
msgid "No peer location known or specified."
3774
msgstr "No peer location known or specified."
3775
3776
#: bzrlib/builtins.py:4987
3777
msgid "Using saved parent location: {0}\n"
3778
msgstr "Using saved parent location: {0}\n"
3779
3780
#: bzrlib/builtins.py:5020
3781
#, python-format
3782
msgid "You have %d extra revision:\n"
3783
msgid_plural "You have %d extra revisions:\n"
3784
msgstr[0] "You have %d extra revision:\n"
3785
msgstr[1] "You have %d extra revisions:\n"
3786
3787
#: bzrlib/builtins.py:5040
3788
#, python-format
3789
msgid "You are missing %d revision:\n"
3790
msgid_plural "You are missing %d revisions:\n"
3791
msgstr[0] "You are missing %d revision:\n"
3792
msgstr[1] "You are missing %d revisions:\n"
3793
3794
#: bzrlib/builtins.py:5055
3795
msgid "This branch has no new revisions.\n"
3796
msgstr "This branch has no new revisions.\n"
3797
3798
#: bzrlib/builtins.py:5058
3799
msgid "Other branch has no new revisions.\n"
3800
msgstr "Other branch has no new revisions.\n"
3801
3802
#: bzrlib/builtins.py:5063
3803
msgid "Branches are up to date.\n"
3804
msgstr "Branches are up to date.\n"
3805
3806
#: bzrlib/builtins.py:5074
3807
msgid "Compress the data within a repository."
3808
msgstr "Compress the data within a repository."
3809
3810
#: bzrlib/builtins.py:5076
3811
msgid ""
3812
"This operation compresses the data within a bazaar repository. As\n"
3813
"bazaar supports automatic packing of repository, this operation is\n"
3814
"normally not required to be done manually."
3815
msgstr ""
3816
"This operation compresses the data within a bazaar repository. As\n"
3817
"bazaar supports automatic packing of repository, this operation is\n"
3818
"normally not required to be done manually."
3819
3820
#: bzrlib/builtins.py:5080
3821
msgid ""
3822
"During the pack operation, bazaar takes a backup of existing repository\n"
3823
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3824
"automatically when it is safe to do so. To save disk space by removing\n"
3825
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3826
"used."
3827
msgstr ""
3828
"During the pack operation, bazaar takes a backup of existing repository\n"
3829
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3830
"automatically when it is safe to do so. To save disk space by removing\n"
3831
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3832
"used."
3833
3834
#: bzrlib/builtins.py:5086
3835
msgid ""
3836
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3837
"during or immediately after repacking, you may be left with a state\n"
3838
"where the deletion has been written to disk but the new packs have not\n"
3839
"been. In this case the repository may be unusable."
3840
msgstr ""
3841
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3842
"during or immediately after repacking, you may be left with a state\n"
3843
"where the deletion has been written to disk but the new packs have not\n"
3844
"been. In this case the repository may be unusable."
3845
3846
#: bzrlib/builtins.py:5095
3847
msgid "Delete obsolete packs to save disk space."
3848
msgstr "Delete obsolete packs to save disk space."
3849
3850
#: bzrlib/builtins.py:5109
3851
msgid "List the installed plugins."
3852
msgstr "List the installed plugins."
3853
3854
#: bzrlib/builtins.py:5111
3855
msgid ""
3856
"This command displays the list of installed plugins including\n"
3857
"version of plugin and a short description of each."
3858
msgstr ""
3859
"This command displays the list of installed plugins including\n"
3860
"version of plugin and a short description of each."
3861
3862
#: bzrlib/builtins.py:5114
3863
msgid "--verbose shows the path where each plugin is located."
3864
msgstr "--verbose shows the path where each plugin is located."
3865
3866
#: bzrlib/builtins.py:5116
3867
msgid ""
3868
"A plugin is an external component for Bazaar that extends the\n"
3869
"revision control system, by adding or replacing code in Bazaar.\n"
3870
"Plugins can do a variety of things, including overriding commands,\n"
3871
"adding new commands, providing additional network transports and\n"
3872
"customizing log output."
3873
msgstr ""
3874
"A plugin is an external component for Bazaar that extends the\n"
3875
"revision control system, by adding or replacing code in Bazaar.\n"
3876
"Plugins can do a variety of things, including overriding commands,\n"
3877
"adding new commands, providing additional network transports and\n"
3878
"customising log output."
3879
3880
#: bzrlib/builtins.py:5122
3881
msgid ""
3882
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3883
"for further information on plugins including where to find them and how to\n"
3884
"install them. Instructions are also provided there on how to write new\n"
3885
"plugins using the Python programming language."
3886
msgstr ""
3887
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3888
"for further information on plugins including where to find them and how to\n"
3889
"install them. Instructions are also provided there on how to write new\n"
3890
"plugins using the Python programming language."
3891
3892
#: bzrlib/builtins.py:5138
3893
msgid "Show testament (signing-form) of a revision."
3894
msgstr "Show testament (signing-form) of a revision."
3895
3896
#: bzrlib/builtins.py:5141
3897
msgid "Produce long-format testament."
3898
msgstr "Produce long-format testament."
3899
3900
#: bzrlib/builtins.py:5143
3901
msgid "Produce a strict-format testament."
3902
msgstr "Produce a strict-format testament."
3903
3904
#: bzrlib/builtins.py:5169
3905
msgid "Show the origin of each line in a file."
3906
msgstr "Show the origin of each line in a file."
3907
3908
#: bzrlib/builtins.py:5171
3909
msgid ""
3910
"This prints out the given file with an annotation on the left side\n"
3911
"indicating which revision, author and date introduced the change."
3912
msgstr ""
3913
"This prints out the given file with an annotation on the left side\n"
3914
"indicating which revision, author and date introduced the change."
3915
3916
#: bzrlib/builtins.py:5174
3917
msgid ""
3918
"If the origin is the same for a run of consecutive lines, it is\n"
3919
"shown only at the top, unless the --all option is given."
3920
msgstr ""
3921
"If the origin is the same for a run of consecutive lines, it is\n"
3922
"shown only at the top, unless the --all option is given."
3923
3924
#: bzrlib/builtins.py:5182
3925
msgid "Show annotations on all lines."
3926
msgstr "Show annotations on all lines."
3927
3928
#: bzrlib/builtins.py:5183
3929
msgid "Show commit date in annotations."
3930
msgstr "Show commit date in annotations."
3931
3932
#: bzrlib/builtins.py:5270
3933
msgid "Cannot sign a range of non-revision-history revisions"
3934
msgstr "Cannot sign a range of non-revision-history revisions"
3935
3936
#: bzrlib/builtins.py:5282
3937
msgid "Please supply either one revision, or a range."
3938
msgstr "Please supply either one revision, or a range."
3939
3940
#: bzrlib/builtins.py:5286
3941
msgid ""
3942
"Convert the current branch into a checkout of the supplied branch.\n"
3943
"If no branch is supplied, rebind to the last bound location."
3944
msgstr ""
3945
"Convert the current branch into a checkout of the supplied branch.\n"
3946
"If no branch is supplied, rebind to the last bound location."
3947
3948
#: bzrlib/builtins.py:5289
3949
msgid ""
3950
"Once converted into a checkout, commits must succeed on the master branch\n"
3951
"before they will be applied to the local branch."
3952
msgstr ""
3953
"Once converted into a checkout, commits must succeed on the master branch\n"
3954
"before they will be applied to the local branch."
3955
3956
#: bzrlib/builtins.py:5292
3957
msgid ""
3958
"Bound branches use the nickname of its master branch unless it is set\n"
3959
"locally, in which case binding will update the local nickname to be\n"
3960
"that of the master."
3961
msgstr ""
3962
"Bound branches use the nickname of its master branch unless it is set\n"
3963
"locally, in which case binding will update the local nickname to be\n"
3964
"that of the master."
3965
3966
#: bzrlib/builtins.py:5307
3967
msgid "No location supplied. This format does not remember old locations."
3968
msgstr "No location supplied. This format does not remember old locations."
3969
3970
#: bzrlib/builtins.py:5313
3971
msgid "Branch is already bound"
3972
msgstr "Branch is already bound"
3973
3974
#: bzrlib/builtins.py:5316
3975
msgid "No location supplied and no previous location known"
3976
msgstr "No location supplied and no previous location known"
3977
3978
#: bzrlib/builtins.py:5322
3979
msgid "These branches have diverged. Try merging, and then bind again."
3980
msgstr "These branches have diverged. Try merging, and then bind again."
3981
3982
#: bzrlib/builtins.py:5329
3983
msgid "Convert the current checkout into a regular branch."
3984
msgstr "Convert the current checkout into a regular branch."
3985
3986
#: bzrlib/builtins.py:5331
3987
msgid ""
3988
"After unbinding, the local branch is considered independent and subsequent\n"
3989
"commits will be local only."
3990
msgstr ""
3991
"After unbinding, the local branch is considered independent and subsequent\n"
3992
"commits will be local only."
3993
3994
#: bzrlib/builtins.py:5342
3995
msgid "Local branch is not bound"
3996
msgstr "Local branch is not bound"
3997
3998
#: bzrlib/builtins.py:5346
3999
msgid "Remove the last committed revision."
4000
msgstr "Remove the last committed revision."
4001
4002
#: bzrlib/builtins.py:5348
4003
msgid ""
4004
"--verbose will print out what is being removed.\n"
4005
"--dry-run will go through all the motions, but not actually\n"
4006
"remove anything."
4007
msgstr ""
4008
"--verbose will print out what is being removed.\n"
4009
"--dry-run will go through all the motions, but not actually\n"
4010
"remove anything."
4011
4012
#: bzrlib/builtins.py:5352
4013
msgid ""
4014
"If --revision is specified, uncommit revisions to leave the branch at the\n"
4015
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
4016
"branch at revision 15."
4017
msgstr ""
4018
"If --revision is specified, uncommit revisions to leave the branch at the\n"
4019
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
4020
"branch at revision 15."
4021
4022
#: bzrlib/builtins.py:5356
4023
msgid ""
4024
"Uncommit leaves the working tree ready for a new commit. The only change\n"
4025
"it may make is to restore any pending merges that were present before\n"
4026
"the commit."
4027
msgstr ""
4028
"Uncommit leaves the working tree ready for a new commit. The only change\n"
4029
"it may make is to restore any pending merges that were present before\n"
4030
"the commit."
4031
4032
#: bzrlib/builtins.py:5367
4033
msgid "Don't actually make changes."
4034
msgstr "Don't actually make changes."
4035
4036
#: bzrlib/builtins.py:5368
4037
msgid "Say yes to all questions."
4038
msgstr "Say yes to all questions."
4039
4040
#: bzrlib/builtins.py:5370
4041
msgid "Keep tags that point to removed revisions."
4042
msgstr "Keep tags that point to removed revisions."
4043
4044
#: bzrlib/builtins.py:5372
4045
msgid "Only remove the commits from the local branch when in a checkout."
4046
msgstr "Only remove the commits from the local branch when in a checkout."
4047
4048
#: bzrlib/builtins.py:5421
4049
msgid "No revisions to uncommit.\n"
4050
msgstr "No revisions to uncommit.\n"
4051
4052
#: bzrlib/builtins.py:5436
4053
msgid "Dry-run, pretending to remove the above revisions.\n"
4054
msgstr "Dry-run, pretending to remove the above revisions.\n"
4055
4056
#: bzrlib/builtins.py:5439
4057
msgid "The above revision(s) will be removed.\n"
4058
msgstr "The above revision(s) will be removed.\n"
4059
4060
#: bzrlib/builtins.py:5443
4061
msgid "Uncommit these revisions"
4062
msgstr "Uncommit these revisions"
4063
4064
#: bzrlib/builtins.py:5446
4065
msgid "Canceled\n"
4066
msgstr "Cancelled\n"
4067
4068
#: bzrlib/builtins.py:5453
4069
#, python-format
4070
msgid ""
4071
"You can restore the old tip by running:\n"
4072
" bzr pull . -r revid:%s\n"
4073
msgstr ""
4074
"You can restore the old tip by running:\n"
4075
" bzr pull . -r revid:%s\n"
4076
4077
#: bzrlib/builtins.py:5458
4078
msgid "Break a dead lock."
4079
msgstr "Break a dead lock."
4080
4081
#: bzrlib/builtins.py:5460
4082
msgid ""
4083
"This command breaks a lock on a repository, branch, working directory or\n"
4084
"config file."
4085
msgstr ""
4086
"This command breaks a lock on a repository, branch, working directory or\n"
4087
"config file."
4088
4089
#: bzrlib/builtins.py:5463
4090
msgid ""
4091
"CAUTION: Locks should only be broken when you are sure that the process\n"
4092
"holding the lock has been stopped."
4093
msgstr ""
4094
"CAUTION: Locks should only be broken when you are sure that the process\n"
4095
"holding the lock has been stopped."
4096
4097
#: bzrlib/builtins.py:5466
4098
msgid ""
4099
"You can get information on what locks are open via the 'bzr info\n"
4100
"[location]' command."
4101
msgstr ""
4102
"You can get information on what locks are open via the 'bzr info\n"
4103
"[location]' command."
4104
4105
#: bzrlib/builtins.py:5469
4106
msgid ""
4107
":Examples:\n"
4108
" bzr break-lock\n"
4109
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
4110
" bzr break-lock --conf ~/.bazaar"
4111
msgstr ""
4112
":Examples:\n"
4113
" bzr break-lock\n"
4114
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
4115
" bzr break-lock --conf ~/.bazaar"
4116
4117
#: bzrlib/builtins.py:5478
4118
msgid "LOCATION is the directory where the config lock is."
4119
msgstr "LOCATION is the directory where the config lock is."
4120
4121
#: bzrlib/builtins.py:5480
4122
msgid "Do not ask for confirmation before breaking the lock."
4123
msgstr "Do not ask for confirmation before breaking the lock."
4124
4125
#: bzrlib/builtins.py:5515
4126
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
4127
msgstr "The Bazaar smart server protocol over TCP. (default port: 4155)"
4128
4129
#: bzrlib/builtins.py:5516
4130
msgid "Run the bzr server."
4131
msgstr "Run the bzr server."
4132
4133
#: bzrlib/builtins.py:5522
4134
msgid "Serve on stdin/out for use from inetd or sshd."
4135
msgstr "Serve on stdin/out for use from inetd or sshd."
4136
4137
#: bzrlib/builtins.py:5523
4138
msgid "protocol"
4139
msgstr "protocol"
4140
4141
#: bzrlib/builtins.py:5524
4142
msgid "Protocol to serve."
4143
msgstr "Protocol to serve."
4144
4145
#: bzrlib/builtins.py:5528
4146
msgid "Listen for connections on nominated address."
4147
msgstr "Listen for connections on nominated address."
4148
4149
#: bzrlib/builtins.py:5530
4150
msgid ""
4151
"Listen for connections on nominated port. Passing 0 as the port number will "
4152
"result in a dynamically allocated port. The default port depends on the "
4153
"protocol."
4154
msgstr ""
4155
"Listen for connections on nominated port. Passing 0 as the port number will "
4156
"result in a dynamically allocated port. The default port depends on the "
4157
"protocol."
4158
4159
#: bzrlib/builtins.py:5535
4160
msgid "Serve contents of this directory."
4161
msgstr "Serve contents of this directory."
4162
4163
#: bzrlib/builtins.py:5537
4164
msgid ""
4165
"By default the server is a readonly server. Supplying --allow-writes "
4166
"enables write access to the contents of the served directory and below. "
4167
"Note that ``bzr serve`` does not perform authentication, so unless some form "
4168
"of external authentication is arranged supplying this option leads to global "
4169
"uncontrolled write access to your file system."
4170
msgstr ""
4171
"By default the server is a read-only server. Supplying --allow-writes "
4172
"enables write access to the contents of the served directory and below. "
4173
"Note that ``bzr serve`` does not perform authentication, so unless some form "
4174
"of external authentication is arranged supplying this option leads to global "
4175
"uncontrolled write access to your file system."
4176
4177
#: bzrlib/builtins.py:5546
4178
msgid "Override the default idle client timeout (5min)."
4179
msgstr "Override the default idle client timeout (5min)."
4180
4181
#: bzrlib/builtins.py:5564
4182
msgid "Combine a tree into its containing tree."
4183
msgstr "Combine a tree into its containing tree."
4184
4185
#: bzrlib/builtins.py:5566
4186
msgid "This command requires the target tree to be in a rich-root format."
4187
msgstr "This command requires the target tree to be in a rich-root format."
4188
4189
#: bzrlib/builtins.py:5568
4190
msgid ""
4191
"The TREE argument should be an independent tree, inside another tree, but\n"
4192
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
4193
"running \"bzr branch\" with the target inside a tree.)"
4194
msgstr ""
4195
"The TREE argument should be an independent tree, inside another tree, but\n"
4196
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
4197
"running \"bzr branch\" with the target inside a tree.)"
4198
4199
#: bzrlib/builtins.py:5572
4200
msgid ""
4201
"The result is a combined tree, with the subtree no longer an independent\n"
4202
"part. This is marked as a merge of the subtree into the containing tree,\n"
4203
"and all history is preserved."
4204
msgstr ""
4205
"The result is a combined tree, with the subtree no longer an independent\n"
4206
"part. This is marked as a merge of the subtree into the containing tree,\n"
4207
"and all history is preserved."
4208
4209
#: bzrlib/builtins.py:5590
4210
#, python-format
4211
msgid ""
4212
"Can't join trees because %s doesn't support rich root data.\n"
4213
"You can use bzr upgrade on the repository."
4214
msgstr ""
4215
"Can't join trees because %s doesn't support rich root data.\n"
4216
"You can use bzr upgrade on the repository."
4217
4218
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
4219
msgid "Cannot join {0}. {1}"
4220
msgstr "Cannot join {0}. {1}"
4221
4222
#: bzrlib/builtins.py:5610
4223
msgid "Split a subdirectory of a tree into a separate tree."
4224
msgstr "Split a subdirectory of a tree into a separate tree."
4225
4226
#: bzrlib/builtins.py:5612
4227
msgid ""
4228
"This command will produce a target tree in a format that supports\n"
4229
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
4230
"converted into earlier formats like 'dirstate-tags'."
4231
msgstr ""
4232
"This command will produce a target tree in a format that supports\n"
4233
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
4234
"converted into earlier formats like 'dirstate-tags'."
4235
4236
#: bzrlib/builtins.py:5616
4237
msgid ""
4238
"The TREE argument should be a subdirectory of a working tree. That\n"
4239
"subdirectory will be converted into an independent tree, with its own\n"
4240
"branch. Commits in the top-level tree will not apply to the new subtree."
4241
msgstr ""
4242
"The TREE argument should be a subdirectory of a working tree. That\n"
4243
"subdirectory will be converted into an independent tree, with its own\n"
4244
"branch. Commits in the top-level tree will not apply to the new subtree."
4245
4246
#: bzrlib/builtins.py:5696
4247
msgid "No submit branch specified or known"
4248
msgstr "No submit branch specified or known"
4249
4250
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
4251
msgid "No public branch specified or known"
4252
msgstr "No public branch specified or known"
4253
4254
#: bzrlib/builtins.py:5710
4255
msgid "bzr merge-directive takes at most two one revision identifiers"
4256
msgstr "bzr merge-directive takes at most two one revision identifiers"
4257
4258
#: bzrlib/builtins.py:5719
4259
msgid "No revisions to bundle."
4260
msgstr "No revisions to bundle."
4261
4262
#: bzrlib/builtins.py:5738
4263
msgid "Mail or create a merge-directive for submitting changes."
4264
msgstr "Mail or create a merge-directive for submitting changes."
4265
4266
#: bzrlib/builtins.py:5740
4267
msgid "A merge directive provides many things needed for requesting merges:"
4268
msgstr "A merge directive provides many things needed for requesting merges:"
4269
4270
#: bzrlib/builtins.py:5742
4271
msgid "* A machine-readable description of the merge to perform"
4272
msgstr "* A machine-readable description of the merge to perform"
4273
4274
#: bzrlib/builtins.py:5744
4275
msgid "* An optional patch that is a preview of the changes requested"
4276
msgstr "* An optional patch that is a preview of the changes requested"
4277
4278
#: bzrlib/builtins.py:5746
4279
msgid ""
4280
"* An optional bundle of revision data, so that the changes can be applied\n"
4281
" directly from the merge directive, without retrieving data from a\n"
4282
" branch."
4283
msgstr ""
4284
"* An optional bundle of revision data, so that the changes can be applied\n"
4285
" directly from the merge directive, without retrieving data from a\n"
4286
" branch."
4287
4288
#: bzrlib/builtins.py:5750
4289
msgid ""
4290
"`bzr send` creates a compact data set that, when applied using bzr\n"
4291
"merge, has the same effect as merging from the source branch. "
4292
msgstr ""
4293
"`bzr send` creates a compact data set that, when applied using bzr\n"
4294
"merge, has the same effect as merging from the source branch. "
4295
4296
#: bzrlib/builtins.py:5753
4297
msgid ""
4298
"By default the merge directive is self-contained and can be applied to any\n"
4299
"branch containing submit_branch in its ancestory without needing access to\n"
4300
"the source branch."
4301
msgstr ""
4302
"By default the merge directive is self-contained and can be applied to any\n"
4303
"branch containing submit_branch in its ancestory without needing access to\n"
4304
"the source branch."
4305
4306
#: bzrlib/builtins.py:5757
4307
msgid ""
4308
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4309
"revisions, but only a structured request to merge from the\n"
4310
"public_location. In that case the public_branch is needed and it must be\n"
4311
"up-to-date and accessible to the recipient. The public_branch is always\n"
4312
"included if known, so that people can check it later."
4313
msgstr ""
4314
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4315
"revisions, but only a structured request to merge from the\n"
4316
"public_location. In that case the public_branch is needed and it must be\n"
4317
"up-to-date and accessible to the recipient. The public_branch is always\n"
4318
"included if known, so that people can check it later."
4319
4320
#: bzrlib/builtins.py:5763
4321
msgid ""
4322
"The submit branch defaults to the parent of the source branch, but can be\n"
4323
"overridden. Both submit branch and public branch will be remembered in\n"
4324
"branch.conf the first time they are used for a particular branch. The\n"
4325
"source branch defaults to that containing the working directory, but can\n"
4326
"be changed using --from."
4327
msgstr ""
4328
"The submit branch defaults to the parent of the source branch, but can be\n"
4329
"overridden. Both submit branch and public branch will be remembered in\n"
4330
"branch.conf the first time they are used for a particular branch. The\n"
4331
"source branch defaults to that containing the working directory, but can\n"
4332
"be changed using --from."
4333
4334
#: bzrlib/builtins.py:5769
4335
msgid ""
4336
"Both the submit branch and the public branch follow the usual behavior with\n"
4337
"respect to --remember: If there is no default location set, the first send\n"
4338
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4339
"omit the location to use the default. To change the default, use\n"
4340
"--remember. The value will only be saved if the location can be accessed."
4341
msgstr ""
4342
"Both the submit branch and the public branch follow the usual behaviour "
4343
"with\n"
4344
"respect to --remember: If there is no default location set, the first send\n"
4345
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4346
"omit the location to use the default. To change the default, use\n"
4347
"--remember. The value will only be saved if the location can be accessed."
4348
4349
#: bzrlib/builtins.py:5775
4350
msgid ""
4351
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4352
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4353
"If a public location is known for the submit_branch, that location is used\n"
4354
"in the merge directive."
4355
msgstr ""
4356
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4357
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4358
"If a public location is known for the submit_branch, that location is used\n"
4359
"in the merge directive."
4360
4361
#: bzrlib/builtins.py:5780
4362
msgid ""
4363
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4364
"given, in which case it is sent to a file."
4365
msgstr ""
4366
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4367
"given, in which case it is sent to a file."
4368
4369
#: bzrlib/builtins.py:5783
4370
msgid ""
4371
"Mail is sent using your preferred mail program. This should be transparent\n"
4372
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4373
"If the preferred client can't be found (or used), your editor will be used."
4374
msgstr ""
4375
"Mail is sent using your preferred mail program. This should be transparent\n"
4376
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4377
"If the preferred client can't be found (or used), your editor will be used."
4378
4379
#: bzrlib/builtins.py:5787
4380
msgid ""
4381
"To use a specific mail program, set the mail_client configuration option.\n"
4382
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4383
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4384
"(MacOS X's\n"
4385
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4386
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4387
"add\n"
4388
"supported clients."
4389
msgstr ""
4390
"To use a specific mail program, set the mail_client configuration option.\n"
4391
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4392
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4393
"(MacOS X's\n"
4394
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4395
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4396
"add\n"
4397
"supported clients."
4398
4399
#: bzrlib/builtins.py:5794
4400
msgid ""
4401
"If mail is being sent, a to address is required. This can be supplied\n"
4402
"either on the commandline, by setting the submit_to configuration\n"
4403
"option in the branch itself or the child_submit_to configuration option\n"
4404
"in the submit branch."
4405
msgstr ""
4406
"If mail is being sent, a to address is required. This can be supplied\n"
4407
"either on the commandline, by setting the submit_to configuration\n"
4408
"option in the branch itself or the child_submit_to configuration option\n"
4409
"in the submit branch."
4410
4411
#: bzrlib/builtins.py:5799
4412
msgid ""
4413
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4414
"and\n"
4415
"merge directive format 2. It is significantly faster and smaller than\n"
4416
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4417
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4418
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4419
msgstr ""
4420
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4421
"and\n"
4422
"merge directive format 2. It is significantly faster and smaller than\n"
4423
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4424
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4425
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4426
4427
#: bzrlib/builtins.py:5805
4428
msgid ""
4429
"The merge directives created by bzr send may be applied using bzr merge or\n"
4430
"bzr pull by specifying a file containing a merge directive as the location."
4431
msgstr ""
4432
"The merge directives created by bzr send may be applied using bzr merge or\n"
4433
"bzr pull by specifying a file containing a merge directive as the location."
4434
4435
#: bzrlib/builtins.py:5808
4436
msgid ""
4437
"bzr send makes extensive use of public locations to map local locations "
4438
"into\n"
4439
"URLs that can be used by other people. See `bzr help configuration` to\n"
4440
"set them, and use `bzr info` to display them."
4441
msgstr ""
4442
"bzr send makes extensive use of public locations to map local locations "
4443
"into\n"
4444
"URLs that can be used by other people. See `bzr help configuration` to\n"
4445
"set them, and use `bzr info` to display them."
4446
4447
#: bzrlib/builtins.py:5832
4448
msgid "Write merge directive to this file or directory; use - for stdout."
4449
msgstr "Write merge directive to this file or directory; use - for stdout."
4450
4451
#: bzrlib/builtins.py:5836
4452
msgid ""
4453
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4454
"strict disables the check."
4455
msgstr ""
4456
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4457
"strict disables the check."
4458
4459
#: bzrlib/builtins.py:5838
4460
msgid "Mail the request to this address."
4461
msgstr "Mail the request to this address."
4462
4463
#: bzrlib/builtins.py:5842
4464
msgid "Body for the email."
4465
msgstr "Body for the email."
4466
4467
#: bzrlib/builtins.py:5895
4468
msgid "Do not include a bundle in the merge directive."
4469
msgstr "Do not include a bundle in the merge directive."
4470
4471
#: bzrlib/builtins.py:5896
4472
msgid "Do not include a preview patch in the merge directive."
4473
msgstr "Do not include a preview patch in the merge directive."
4474
4475
#: bzrlib/builtins.py:5899
4476
msgid "Remember submit and public branch."
4477
msgstr "Remember submit and public branch."
4478
4479
#: bzrlib/builtins.py:5901
4480
msgid ""
4481
"Branch to generate the submission from, rather than the one containing the "
4482
"working directory."
4483
msgstr ""
4484
"Branch to generate the submission from, rather than the one containing the "
4485
"working directory."
4486
4487
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4488
msgid "format"
4489
msgstr "format"
4490
4491
#: bzrlib/builtins.py:5912
4492
msgid "Use the specified output format."
4493
msgstr "Use the specified output format."
4494
4495
#: bzrlib/builtins.py:5934
4496
msgid "Create, remove or modify a tag naming a revision."
4497
msgstr "Create, remove or modify a tag naming a revision."
4498
4499
#: bzrlib/builtins.py:5936
4500
msgid ""
4501
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4502
"(--revision) option can be given -rtag:X, where X is any previously\n"
4503
"created tag."
4504
msgstr ""
4505
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4506
"(--revision) option can be given -rtag:X, where X is any previously\n"
4507
"created tag."
4508
4509
#: bzrlib/builtins.py:5940
4510
msgid ""
4511
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4512
"along when you branch, push, pull or merge."
4513
msgstr ""
4514
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4515
"along when you branch, push, pull or merge."
4516
4517
#: bzrlib/builtins.py:5943
4518
msgid ""
4519
"It is an error to give a tag name that already exists unless you pass\n"
4520
"--force, in which case the tag is moved to point to the new revision."
4521
msgstr ""
4522
"It is an error to give a tag name that already exists unless you pass\n"
4523
"--force, in which case the tag is moved to point to the new revision."
4524
4525
#: bzrlib/builtins.py:5946
4526
msgid ""
4527
"To rename a tag (change the name but keep it on the same revsion), run "
4528
"``bzr\n"
4529
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4530
msgstr ""
4531
"To rename a tag (change the name but keep it on the same revsion), run "
4532
"``bzr\n"
4533
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4534
4535
#: bzrlib/builtins.py:5949
4536
msgid ""
4537
"If no tag name is specified it will be determined through the \n"
4538
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4539
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4540
"details."
4541
msgstr ""
4542
"If no tag name is specified it will be determined through the \n"
4543
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4544
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4545
"details."
4546
4547
#: bzrlib/builtins.py:5959
4548
msgid "Delete this tag rather than placing it."
4549
msgstr "Delete this tag rather than placing it."
4550
4551
#: bzrlib/builtins.py:5962
4552
msgid "Branch in which to place the tag."
4553
msgstr "Branch in which to place the tag."
4554
4555
#: bzrlib/builtins.py:5964
4556
msgid "Replace existing tags."
4557
msgstr "Replace existing tags."
4558
4559
#: bzrlib/builtins.py:5979
4560
msgid "No tag specified to delete."
4561
msgstr "No tag specified to delete."
4562
4563
#: bzrlib/builtins.py:5981
4564
#, python-format
4565
msgid "Deleted tag %s."
4566
msgstr "Deleted tag %s."
4567
4568
#: bzrlib/builtins.py:5995
4569
msgid "Please specify a tag name."
4570
msgstr "Please specify a tag name."
4571
4572
#: bzrlib/builtins.py:6003
4573
#, python-format
4574
msgid "Tag %s already exists for that revision."
4575
msgstr "Tag %s already exists for that revision."
4576
4577
#: bzrlib/builtins.py:6007
4578
#, python-format
4579
msgid "Created tag %s."
4580
msgstr "Created tag %s."
4581
4582
#: bzrlib/builtins.py:6009
4583
#, python-format
4584
msgid "Updated tag %s."
4585
msgstr "Updated tag %s."
4586
4587
#: bzrlib/builtins.py:6013
4588
msgid "List tags."
4589
msgstr "List tags."
4590
4591
#: bzrlib/builtins.py:6015
4592
msgid ""
4593
"This command shows a table of tag names and the revisions they reference."
4594
msgstr ""
4595
"This command shows a table of tag names and the revisions they reference."
4596
4597
#: bzrlib/builtins.py:6021
4598
msgid "Branch whose tags should be displayed."
4599
msgstr "Branch whose tags should be displayed."
4600
4601
#: bzrlib/builtins.py:6023
4602
msgid "Sort tags by different criteria."
4603
msgstr "Sort tags by different criteria."
4604
4605
#: bzrlib/builtins.py:6023
4606
msgid "Sorting"
4607
msgstr "Sorting"
4608
4609
#: bzrlib/builtins.py:6092
4610
msgid "Reconfigure the type of a bzr directory."
4611
msgstr "Reconfigure the type of a bzr directory."
4612
4613
#: bzrlib/builtins.py:6094
4614
msgid "A target configuration must be specified."
4615
msgstr "A target configuration must be specified."
4616
4617
#: bzrlib/builtins.py:6096
4618
msgid ""
4619
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4620
"The order of preference is\n"
4621
"1. For a lightweight checkout, the current bound location.\n"
4622
"2. For branches that used to be checkouts, the previously-bound location.\n"
4623
"3. The push location.\n"
4624
"4. The parent location.\n"
4625
"If none of these is available, --bind-to must be specified."
4626
msgstr ""
4627
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4628
"The order of preference is\n"
4629
"1. For a lightweight checkout, the current bound location.\n"
4630
"2. For branches that used to be checkouts, the previously-bound location.\n"
4631
"3. The push location.\n"
4632
"4. The parent location.\n"
4633
"If none of these is available, --bind-to must be specified."
4634
4635
#: bzrlib/builtins.py:6110
4636
msgid "Tree type"
4637
msgstr "Tree type"
4638
4639
#: bzrlib/builtins.py:6111
4640
msgid "The relation between branch and tree."
4641
msgstr "The relation between branch and tree."
4642
4643
#: bzrlib/builtins.py:6113
4644
msgid "Reconfigure to be an unbound branch with no working tree."
4645
msgstr "Reconfigure to be an unbound branch with no working tree."
4646
4647
#: bzrlib/builtins.py:6114
4648
msgid "Reconfigure to be an unbound branch with a working tree."
4649
msgstr "Reconfigure to be an unbound branch with a working tree."
4650
4651
#: bzrlib/builtins.py:6115
4652
msgid "Reconfigure to be a bound branch with a working tree."
4653
msgstr "Reconfigure to be a bound branch with a working tree."
4654
4655
#: bzrlib/builtins.py:6116
4656
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4657
msgstr "Reconfigure to be a lightweight checkout (with no local history)."
4658
4659
#: bzrlib/builtins.py:6121
4660
msgid "Repository type"
4661
msgstr "Repository type"
4662
4663
#: bzrlib/builtins.py:6122
4664
msgid "Location fo the repository."
4665
msgstr "Location fo the repository."
4666
4667
#: bzrlib/builtins.py:6124
4668
msgid ""
4669
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4670
msgstr ""
4671
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4672
4673
#: bzrlib/builtins.py:6126
4674
msgid "Reconfigure to use a shared repository."
4675
msgstr "Reconfigure to use a shared repository."
4676
4677
#: bzrlib/builtins.py:6130
4678
msgid "Trees in Repository"
4679
msgstr "Trees in Repository"
4680
4681
#: bzrlib/builtins.py:6131
4682
msgid "Whether new branches in the repository have trees."
4683
msgstr "Whether new branches in the repository have trees."
4684
4685
#: bzrlib/builtins.py:6133
4686
msgid ""
4687
"Reconfigure repository to create working trees on branches by default."
4688
msgstr ""
4689
"Reconfigure repository to create working trees on branches by default."
4690
4691
#: bzrlib/builtins.py:6135
4692
msgid ""
4693
"Reconfigure repository to not create working trees on branches by default."
4694
msgstr ""
4695
"Reconfigure repository to not create working trees on branches by default."
4696
4697
#: bzrlib/builtins.py:6138
4698
msgid "Branch to bind checkout to."
4699
msgstr "Branch to bind checkout to."
4700
4701
#: bzrlib/builtins.py:6140
4702
msgid "Perform reconfiguration even if local changes will be lost."
4703
msgstr "Perform reconfiguration even if local changes will be lost."
4704
4705
#: bzrlib/builtins.py:6143
4706
msgid "Reconfigure a branch to be stacked on another branch."
4707
msgstr "Reconfigure a branch to be stacked on another branch."
4708
4709
#: bzrlib/builtins.py:6147
4710
msgid ""
4711
"Reconfigure a branch to be unstacked. This may require copying substantial "
4712
"data into it."
4713
msgstr ""
4714
"Reconfigure a branch to be unstacked. This may require copying substantial "
4715
"data into it."
4716
4717
#: bzrlib/builtins.py:6157
4718
msgid "Can't use both --stacked-on and --unstacked"
4719
msgstr "Can't use both --stacked-on and --unstacked"
4720
4721
#: bzrlib/builtins.py:6171
4722
msgid "No target configuration specified"
4723
msgstr "No target configuration specified"
4724
4725
#: bzrlib/builtins.py:6206
4726
msgid "Set the branch of a checkout and update."
4727
msgstr "Set the branch of a checkout and update."
4728
4729
#: bzrlib/builtins.py:6208
4730
msgid ""
4731
"For lightweight checkouts, this changes the branch being referenced.\n"
4732
"For heavyweight checkouts, this checks that there are no local commits\n"
4733
"versus the current bound branch, then it makes the local branch a mirror\n"
4734
"of the new location and binds to it."
4735
msgstr ""
4736
"For lightweight checkouts, this changes the branch being referenced.\n"
4737
"For heavyweight checkouts, this checks that there are no local commits\n"
4738
"versus the current bound branch, then it makes the local branch a mirror\n"
4739
"of the new location and binds to it."
4740
4741
#: bzrlib/builtins.py:6213
4742
msgid ""
4743
"In both cases, the working tree is updated and uncommitted changes\n"
4744
"are merged. The user can commit or revert these as they desire."
4745
msgstr ""
4746
"In both cases, the working tree is updated and uncommitted changes\n"
4747
"are merged. The user can commit or revert these as they desire."
4748
4749
#: bzrlib/builtins.py:6216
4750
msgid "Pending merges need to be committed or reverted before using switch."
4751
msgstr "Pending merges need to be committed or reverted before using switch."
4752
4753
#: bzrlib/builtins.py:6218
4754
msgid ""
4755
"The path to the branch to switch to can be specified relative to the parent\n"
4756
"directory of the current branch. For example, if you are currently in a\n"
4757
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4758
"/path/to/newbranch."
4759
msgstr ""
4760
"The path to the branch to switch to can be specified relative to the parent\n"
4761
"directory of the current branch. For example, if you are currently in a\n"
4762
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4763
"/path/to/newbranch."
4764
4765
#: bzrlib/builtins.py:6223
4766
msgid ""
4767
"Bound branches use the nickname of its master branch unless it is set\n"
4768
"locally, in which case switching will update the local nickname to be\n"
4769
"that of the master."
4770
msgstr ""
4771
"Bound branches use the nickname of its master branch unless it is set\n"
4772
"locally, in which case switching will update the local nickname to be\n"
4773
"that of the master."
4774
4775
#: bzrlib/builtins.py:6231
4776
msgid "Switch even if local commits will be lost."
4777
msgstr "Switch even if local commits will be lost."
4778
4779
#: bzrlib/builtins.py:6234
4780
msgid "Create the target branch from this one before switching to it."
4781
msgstr "Create the target branch from this one before switching to it."
4782
4783
#: bzrlib/builtins.py:6248
4784
msgid "You must supply either a revision or a location"
4785
msgstr "You must supply either a revision or a location"
4786
4787
#: bzrlib/builtins.py:6261
4788
msgid "cannot create branch without source branch"
4789
msgstr "cannot create branch without source branch"
4790
4791
#: bzrlib/builtins.py:6286
4792
msgid "Manage filtered views."
4793
msgstr "Manage filtered views."
4794
4795
#: bzrlib/builtins.py:6288
4796
msgid ""
4797
"Views provide a mask over the tree so that users can focus on\n"
4798
"a subset of a tree when doing their work. After creating a view,\n"
4799
"commands that support a list of files - status, diff, commit, etc -\n"
4800
"effectively have that list of files implicitly given each time.\n"
4801
"An explicit list of files can still be given but those files\n"
4802
"must be within the current view."
4803
msgstr ""
4804
"Views provide a mask over the tree so that users can focus on\n"
4805
"a subset of a tree when doing their work. After creating a view,\n"
4806
"commands that support a list of files - status, diff, commit, etc -\n"
4807
"effectively have that list of files implicitly given each time.\n"
4808
"An explicit list of files can still be given but those files\n"
4809
"must be within the current view."
4810
4811
#: bzrlib/builtins.py:6295
4812
msgid ""
4813
"In most cases, a view has a short life-span: it is created to make\n"
4814
"a selected change and is deleted once that change is committed.\n"
4815
"At other times, you may wish to create one or more named views\n"
4816
"and switch between them."
4817
msgstr ""
4818
"In most cases, a view has a short life-span: it is created to make\n"
4819
"a selected change and is deleted once that change is committed.\n"
4820
"At other times, you may wish to create one or more named views\n"
4821
"and switch between them."
4822
4823
#: bzrlib/builtins.py:6300
4824
msgid ""
4825
"To disable the current view without deleting it, you can switch to\n"
4826
"the pseudo view called ``off``. This can be useful when you need\n"
4827
"to see the whole tree for an operation or two (e.g. merge) but\n"
4828
"want to switch back to your view after that."
4829
msgstr ""
4830
"To disable the current view without deleting it, you can switch to\n"
4831
"the pseudo view called ``off``. This can be useful when you need\n"
4832
"to see the whole tree for an operation or two (e.g. merge) but\n"
4833
"want to switch back to your view after that."
4834
4835
#: bzrlib/builtins.py:6305
4836
msgid ""
4837
":Examples:\n"
4838
" To define the current view::"
4839
msgstr ""
4840
":Examples:\n"
4841
" To define the current view::"
4842
4843
#: bzrlib/builtins.py:6308
4844
msgid " bzr view file1 dir1 ..."
4845
msgstr " bzr view file1 dir1 ..."
4846
4847
#: bzrlib/builtins.py:6310
4848
msgid " To list the current view::"
4849
msgstr " To list the current view::"
4850
4851
#: bzrlib/builtins.py:6312
4852
msgid " bzr view"
4853
msgstr " bzr view"
4854
4855
#: bzrlib/builtins.py:6314
4856
msgid " To delete the current view::"
4857
msgstr " To delete the current view::"
4858
4859
#: bzrlib/builtins.py:6316
4860
msgid " bzr view --delete"
4861
msgstr " bzr view --delete"
4862
4863
#: bzrlib/builtins.py:6318
4864
msgid " To disable the current view without deleting it::"
4865
msgstr " To disable the current view without deleting it::"
4866
4867
#: bzrlib/builtins.py:6320
4868
msgid " bzr view --switch off"
4869
msgstr " bzr view --switch off"
4870
4871
#: bzrlib/builtins.py:6322
4872
msgid " To define a named view and switch to it::"
4873
msgstr " To define a named view and switch to it::"
4874
4875
#: bzrlib/builtins.py:6324
4876
msgid " bzr view --name view-name file1 dir1 ..."
4877
msgstr " bzr view --name view-name file1 dir1 ..."
4878
4879
#: bzrlib/builtins.py:6326
4880
msgid " To list a named view::"
4881
msgstr " To list a named view::"
4882
4883
#: bzrlib/builtins.py:6328
4884
msgid " bzr view --name view-name"
4885
msgstr " bzr view --name view-name"
4886
4887
#: bzrlib/builtins.py:6330
4888
msgid " To delete a named view::"
4889
msgstr " To delete a named view::"
4890
4891
#: bzrlib/builtins.py:6332
4892
msgid " bzr view --name view-name --delete"
4893
msgstr " bzr view --name view-name --delete"
4894
4895
#: bzrlib/builtins.py:6334
4896
msgid " To switch to a named view::"
4897
msgstr " To switch to a named view::"
4898
4899
#: bzrlib/builtins.py:6336
4900
msgid " bzr view --switch view-name"
4901
msgstr " bzr view --switch view-name"
4902
4903
#: bzrlib/builtins.py:6338
4904
msgid " To list all views defined::"
4905
msgstr " To list all views defined::"
4906
4907
#: bzrlib/builtins.py:6340
4908
msgid " bzr view --all"
4909
msgstr " bzr view --all"
4910
4911
#: bzrlib/builtins.py:6342
4912
msgid " To delete all views::"
4913
msgstr " To delete all views::"
4914
4915
#: bzrlib/builtins.py:6344
4916
msgid " bzr view --delete --all"
4917
msgstr " bzr view --delete --all"
4918
4919
#: bzrlib/builtins.py:6351
4920
msgid "Apply list or delete action to all views."
4921
msgstr "Apply list or delete action to all views."
4922
4923
#: bzrlib/builtins.py:6354
4924
msgid "Delete the view."
4925
msgstr "Delete the view."
4926
4927
#: bzrlib/builtins.py:6357
4928
msgid "Name of the view to define, list or delete."
4929
msgstr "Name of the view to define, list or delete."
4930
4931
#: bzrlib/builtins.py:6361
4932
msgid "Name of the view to switch to."
4933
msgstr "Name of the view to switch to."
4934
4935
#: bzrlib/builtins.py:6380
4936
msgid "Both --delete and a file list specified"
4937
msgstr "Both --delete and a file list specified"
4938
4939
#: bzrlib/builtins.py:6383
4940
msgid "Both --delete and --switch specified"
4941
msgstr "Both --delete and --switch specified"
4942
4943
#: bzrlib/builtins.py:6386
4944
msgid "Deleted all views.\n"
4945
msgstr "Deleted all views.\n"
4946
4947
#: bzrlib/builtins.py:6388
4948
msgid "No current view to delete"
4949
msgstr "No current view to delete"
4950
4951
#: bzrlib/builtins.py:6391
4952
#, python-format
4953
msgid "Deleted '%s' view.\n"
4954
msgstr "Deleted '%s' view.\n"
4955
4956
#: bzrlib/builtins.py:6395
4957
msgid "Both --switch and a file list specified"
4958
msgstr "Both --switch and a file list specified"
4959
4960
#: bzrlib/builtins.py:6398
4961
msgid "Both --switch and --all specified"
4962
msgstr "Both --switch and --all specified"
4963
4964
#: bzrlib/builtins.py:6401
4965
msgid "No current view to disable"
4966
msgstr "No current view to disable"
4967
4968
#: bzrlib/builtins.py:6403
4969
#, python-format
4970
msgid "Disabled '%s' view.\n"
4971
msgstr "Disabled '%s' view.\n"
4972
4973
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4974
msgid "Using '{0}' view: {1}\n"
4975
msgstr "Using '{0}' view: {1}\n"
4976
4977
#: bzrlib/builtins.py:6410
4978
msgid "Views defined:\n"
4979
msgstr "Views defined:\n"
4980
4981
#: bzrlib/builtins.py:6419
4982
msgid "No views defined.\n"
4983
msgstr "No views defined.\n"
4984
4985
#: bzrlib/builtins.py:6426
4986
msgid "Cannot change the 'off' pseudo view"
4987
msgstr "Cannot change the 'off' pseudo view"
4988
4989
#: bzrlib/builtins.py:6434
4990
msgid "No current view.\n"
4991
msgstr "No current view.\n"
4992
4993
#: bzrlib/builtins.py:6437
4994
msgid "'{0}' view is: {1}\n"
4995
msgstr "'{0}' view is: {1}\n"
4996
4997
#: bzrlib/builtins.py:6457
4998
msgid " <no hooks installed>\n"
4999
msgstr " <no hooks installed>\n"
5000
5001
#: bzrlib/builtins.py:6461
5002
msgid "Remove a branch."
5003
msgstr "Remove a branch."
5004
5005
#: bzrlib/builtins.py:6463
5006
msgid ""
5007
"This will remove the branch from the specified location but \n"
5008
"will keep any working tree or repository in place."
5009
msgstr ""
5010
"This will remove the branch from the specified location but \n"
5011
"will keep any working tree or repository in place."
5012
5013
#: bzrlib/builtins.py:6468
5014
msgid " Remove the branch at repo/trunk::"
5015
msgstr " Remove the branch at repo/trunk::"
5016
5017
#: bzrlib/builtins.py:6470
5018
msgid " bzr remove-branch repo/trunk"
5019
msgstr " bzr remove-branch repo/trunk"
5020
5021
#: bzrlib/builtins.py:6477
5022
msgid "Remove branch even if it is the active branch."
5023
msgstr "Remove branch even if it is the active branch."
5024
5025
#: bzrlib/builtins.py:6491
5026
msgid "Branch is active. Use --force to remove it."
5027
msgstr "Branch is active. Use --force to remove it."
5028
5029
#: bzrlib/builtins.py:6495
5030
msgid "Plaintext diff output."
5031
msgstr "Plaintext diff output."
5032
5033
#: bzrlib/builtins.py:6496
5034
msgid "Temporarily set aside some changes from the current tree."
5035
msgstr "Temporarily set aside some changes from the current tree."
5036
5037
#: bzrlib/builtins.py:6498
5038
msgid ""
5039
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
5040
"ie. out of the way, until a later time when you can bring them back from\n"
5041
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
5042
"your working tree, and so they aren't propagated along with your branch nor\n"
5043
"will they survive its deletion."
5044
msgstr ""
5045
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
5046
"ie. out of the way, until a later time when you can bring them back from\n"
5047
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
5048
"your working tree, and so they aren't propagated along with your branch nor\n"
5049
"will they survive its deletion."
5050
5051
#: bzrlib/builtins.py:6504
5052
msgid "If shelve --list is specified, previously-shelved changes are listed."
5053
msgstr ""
5054
"If shelve --list is specified, previously-shelved changes are listed."
5055
5056
#: bzrlib/builtins.py:6506
5057
msgid ""
5058
"Shelve is intended to help separate several sets of changes that have\n"
5059
"been inappropriately mingled. If you just want to get rid of all changes\n"
5060
"and you don't need to restore them later, use revert. If you want to\n"
5061
"shelve all text changes at once, use shelve --all."
5062
msgstr ""
5063
"Shelve is intended to help separate several sets of changes that have\n"
5064
"been inappropriately mingled. If you just want to get rid of all changes\n"
5065
"and you don't need to restore them later, use revert. If you want to\n"
5066
"shelve all text changes at once, use shelve --all."
5067
5068
#: bzrlib/builtins.py:6511
5069
msgid ""
5070
"If filenames are specified, only the changes to those files will be\n"
5071
"shelved. Other files will be left untouched."
5072
msgstr ""
5073
"If filenames are specified, only the changes to those files will be\n"
5074
"shelved. Other files will be left untouched."
5075
5076
#: bzrlib/builtins.py:6514
5077
msgid ""
5078
"If a revision is specified, changes since that revision will be shelved."
5079
msgstr ""
5080
"If a revision is specified, changes since that revision will be shelved."
5081
5082
#: bzrlib/builtins.py:6516
5083
msgid ""
5084
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
5085
"restore the most recently shelved changes."
5086
msgstr ""
5087
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
5088
"restore the most recently shelved changes."
5089
5090
#: bzrlib/builtins.py:6519
5091
msgid ""
5092
"For complicated changes, it is possible to edit the changes in a separate\n"
5093
"editor program to decide what the file remaining in the working copy\n"
5094
"should look like. To do this, add the configuration option"
5095
msgstr ""
5096
"For complicated changes, it is possible to edit the changes in a separate\n"
5097
"editor program to decide what the file remaining in the working copy\n"
5098
"should look like. To do this, add the configuration option"
5099
5100
#: bzrlib/builtins.py:6523
5101
msgid " change_editor = PROGRAM @new_path @old_path"
5102
msgstr " change_editor = PROGRAM @new_path @old_path"
5103
5104
#: bzrlib/builtins.py:6525
5105
msgid ""
5106
"where @new_path is replaced with the path of the new version of the \n"
5107
"file and @old_path is replaced with the path of the old version of \n"
5108
"the file. The PROGRAM should save the new file with the desired \n"
5109
"contents of the file in the working tree.\n"
5110
" "
5111
msgstr ""
5112
"where @new_path is replaced with the path of the new version of the \n"
5113
"file and @old_path is replaced with the path of the old version of \n"
5114
"the file. The PROGRAM should save the new file with the desired \n"
5115
"contents of the file in the working tree.\n"
5116
" "
5117
5118
#: bzrlib/builtins.py:6537
5119
msgid "Shelve all changes."
5120
msgstr "Shelve all changes."
5121
5122
#: bzrlib/builtins.py:6539
5123
msgid "Method to use for writing diffs."
5124
msgstr "Method to use for writing diffs."
5125
5126
#: bzrlib/builtins.py:6539
5127
msgid "writer"
5128
msgstr "writer"
5129
5130
#: bzrlib/builtins.py:6543
5131
msgid "List shelved changes."
5132
msgstr "List shelved changes."
5133
5134
#: bzrlib/builtins.py:6545
5135
msgid "Destroy removed changes instead of shelving them."
5136
msgstr "Destroy removed changes instead of shelving them."
5137
5138
#: bzrlib/builtins.py:6574
5139
msgid "No shelved changes."
5140
msgstr "No shelved changes."
5141
5142
#: bzrlib/builtins.py:6585
5143
msgid "Restore shelved changes."
5144
msgstr "Restore shelved changes."
5145
5146
#: bzrlib/builtins.py:6587
5147
msgid ""
5148
"By default, the most recently shelved changes are restored. However if you\n"
5149
"specify a shelf by id those changes will be restored instead. This works\n"
5150
"best when the changes don't depend on each other."
5151
msgstr ""
5152
"By default, the most recently shelved changes are restored. However if you\n"
5153
"specify a shelf by id those changes will be restored instead. This works\n"
5154
"best when the changes don't depend on each other."
5155
5156
#: bzrlib/builtins.py:6596
5157
msgid "The action to perform."
5158
msgstr "The action to perform."
5159
5160
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
5161
msgid "action"
5162
msgstr "action"
5163
5164
#: bzrlib/builtins.py:6598
5165
msgid "Apply changes and remove from the shelf."
5166
msgstr "Apply changes and remove from the shelf."
5167
5168
#: bzrlib/builtins.py:6599
5169
msgid "Show changes, but do not apply or remove them."
5170
msgstr "Show changes, but do not apply or remove them."
5171
5172
#: bzrlib/builtins.py:6600
5173
msgid ""
5174
"Instead of unshelving the changes, show the diff that would result from "
5175
"unshelving."
5176
msgstr ""
5177
"Instead of unshelving the changes, show the diff that would result from "
5178
"unshelving."
5179
5180
#: bzrlib/builtins.py:6602
5181
msgid "Delete changes without applying them."
5182
msgstr "Delete changes without applying them."
5183
5184
#: bzrlib/builtins.py:6603
5185
msgid "Apply changes but don't delete them."
5186
msgstr "Apply changes but don't delete them."
5187
5188
#: bzrlib/builtins.py:6618
5189
msgid "Remove unwanted files from working tree."
5190
msgstr "Remove unwanted files from working tree."
5191
5192
#: bzrlib/builtins.py:6620
5193
msgid ""
5194
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
5195
"files are never deleted."
5196
msgstr ""
5197
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
5198
"files are never deleted."
5199
5200
#: bzrlib/builtins.py:6623
5201
msgid ""
5202
"Another class is 'detritus', which includes files emitted by bzr during\n"
5203
"normal operations and selftests. (The value of these files decreases with\n"
5204
"time.)"
5205
msgstr ""
5206
"Another class is 'detritus', which includes files emitted by bzr during\n"
5207
"normal operations and selftests. (The value of these files decreases with\n"
5208
"time.)"
5209
5210
#: bzrlib/builtins.py:6627
5211
msgid ""
5212
"If no options are specified, unknown files are deleted. Otherwise, option\n"
5213
"flags are respected, and may be combined."
5214
msgstr ""
5215
"If no options are specified, unknown files are deleted. Otherwise, option\n"
5216
"flags are respected, and may be combined."
5217
5218
#: bzrlib/builtins.py:6630
5219
msgid "To check what clean-tree will do, use --dry-run."
5220
msgstr "To check what clean-tree will do, use --dry-run."
5221
5222
#: bzrlib/builtins.py:6633
5223
msgid "Delete all ignored files."
5224
msgstr "Delete all ignored files."
5225
5226
#: bzrlib/builtins.py:6634
5227
msgid ""
5228
"Delete conflict files, merge and revert backups, and failed selftest dirs."
5229
msgstr ""
5230
"Delete conflict files, merge and revert backups, and failed selftest dirs."
5231
5232
#: bzrlib/builtins.py:6637
5233
msgid "Delete files unknown to bzr (default)."
5234
msgstr "Delete files unknown to bzr (default)."
5235
5236
#: bzrlib/builtins.py:6638
5237
msgid "Show files to delete instead of deleting them."
5238
msgstr "Show files to delete instead of deleting them."
5239
5240
#: bzrlib/builtins.py:6640
5241
msgid "Do not prompt before deleting."
5242
msgstr "Do not prompt before deleting."
5243
5244
#: bzrlib/bundle/__init__.py:59
5245
msgid "A directory cannot be a bundle"
5246
msgstr "A directory cannot be a bundle"
5247
5248
#: bzrlib/bundle/apply_bundle.py:40
5249
msgid "Install revisions"
5250
msgstr "Install revisions"
5251
5252
#: bzrlib/bundle/commands.py:64
5253
msgid "--verbose requires a merge directive"
5254
msgstr "--verbose requires a merge directive"
5255
5256
#: bzrlib/bundle/commands.py:67
5257
msgid "Bundle format not supported"
5258
msgstr "Bundle format not supported"
5259
5260
#: bzrlib/bundle/commands.py:77
5261
msgid "Records\n"
5262
msgstr "Records\n"
5263
5264
#: bzrlib/bundle/commands.py:81
5265
msgid "{0}: {1} ({2} multiparent)\n"
5266
msgstr "{0}: {1} ({2} multiparent)\n"
5267
5268
#: bzrlib/bundle/commands.py:83
5269
#, python-format
5270
msgid "unique files: %d\n"
5271
msgstr "unique files: %d\n"
5272
5273
#: bzrlib/bundle/commands.py:92
5274
msgid "Revisions\n"
5275
msgstr "Revisions\n"
5276
5277
#: bzrlib/bundle/commands.py:93
5278
#, python-format
5279
msgid "nicks: %s\n"
5280
msgstr "nicks: %s\n"
5281
5282
#: bzrlib/bundle/commands.py:95
5283
#, python-format
5284
msgid ""
5285
"committers: \n"
5286
"%s\n"
5287
msgstr ""
5288
"committers: \n"
5289
"%s\n"
5290
5291
#: bzrlib/bundle/commands.py:103
5292
msgid "Decoded contents\n"
5293
msgstr "Decoded contents\n"
5294
5295
#: bzrlib/bundle/serializer/v4.py:327
5296
#, python-format
5297
msgid "Bundling %d revision."
5298
msgid_plural "Bundling %d revisions."
5299
msgstr[0] "Bundling %d revision."
5300
msgstr[1] "Bundling %d revisions."
5301
5302
#: bzrlib/bzrdir.py:487
5303
msgid ""
5304
"making backup of {0}\n"
5305
" to {1}"
5306
msgstr ""
5307
"making backup of {0}\n"
5308
" to {1}"
5309
5310
#: bzrlib/bzrdir.py:510
5311
msgid "renamed {0} to {1}"
5312
msgstr "renamed {0} to {1}"
5313
5314
#: bzrlib/bzrdir.py:1639
5315
#, python-format
5316
msgid ""
5317
"Source repository format does not support stacking, using format:\n"
5318
" %s"
5319
msgstr ""
5320
"Source repository format does not support stacking, using format:\n"
5321
" %s"
5322
5323
#: bzrlib/bzrdir.py:1659
5324
#, python-format
5325
msgid ""
5326
"Source branch format does not support stacking, using format:\n"
5327
" %s"
5328
msgstr ""
5329
"Source branch format does not support stacking, using format:\n"
5330
" %s"
5331
5332
#: bzrlib/bzrdir.py:1805
5333
msgid "starting repository conversion"
5334
msgstr "starting repository conversion"
5335
5336
#: bzrlib/bzrdir.py:2026
5337
msgid "Using default stacking branch {0} at {1}"
5338
msgstr "Using default stacking branch {0} at {1}"
5339
5340
#: bzrlib/check.py:108
5341
msgid "check"
5342
msgstr "check"
5343
5344
#: bzrlib/check.py:110
5345
msgid "checking revisions"
5346
msgstr "checking revisions"
5347
5348
#: bzrlib/check.py:112
5349
msgid "checking commit contents"
5350
msgstr "checking commit contents"
5351
5352
#: bzrlib/check.py:114
5353
msgid "checking file graphs"
5354
msgstr "checking file graphs"
5355
5356
#: bzrlib/check.py:118
5357
msgid "checking branches and trees"
5358
msgstr "checking branches and trees"
5359
5360
#: bzrlib/check.py:205
5361
msgid "checked repository {0} format {1}"
5362
msgstr "checked repository {0} format {1}"
5363
5364
#: bzrlib/check.py:208
5365
#, python-format
5366
msgid "%6d revisions"
5367
msgstr "%6d revisions"
5368
5369
#: bzrlib/check.py:209
5370
#, python-format
5371
msgid "%6d file-ids"
5372
msgstr "%6d file-ids"
5373
5374
#: bzrlib/check.py:211
5375
#, python-format
5376
msgid "%6d unreferenced text versions"
5377
msgstr "%6d unreferenced text versions"
5378
5379
#: bzrlib/check.py:215
5380
msgid "unreferenced version: {{{0}}} in {1}"
5381
msgstr "unreferenced version: {{{0}}} in {1}"
5382
5383
#: bzrlib/check.py:218
5384
#, python-format
5385
msgid "%6d revisions are missing inventory_sha1"
5386
msgstr "%6d revisions are missing inventory_sha1"
5387
5388
#: bzrlib/check.py:221
5389
#, python-format
5390
msgid "%6d revisions are mentioned but not present"
5391
msgstr "%6d revisions are mentioned but not present"
5392
5393
#: bzrlib/check.py:224
5394
#, python-format
5395
msgid "%6d ghost revisions"
5396
msgstr "%6d ghost revisions"
5397
5398
#: bzrlib/check.py:229
5399
#, python-format
5400
msgid "%6d revisions missing parents in ancestry"
5401
msgstr "%6d revisions missing parents in ancestry"
5402
5403
#: bzrlib/check.py:233
5404
#, python-format
5405
msgid " %s should be in the ancestry for:"
5406
msgstr " %s should be in the ancestry for:"
5407
5408
#: bzrlib/check.py:237
5409
#, python-format
5410
msgid "%6d inconsistent parents"
5411
msgstr "%6d inconsistent parents"
5412
5413
#: bzrlib/check.py:241
5414
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
5415
msgstr " * {0} version {1} has parents {2!r} but should have {3!r}"
5416
5417
#: bzrlib/check.py:247
5418
#, python-format
5419
msgid "%6d revisions have incorrect parents in the revision index"
5420
msgstr "%6d revisions have incorrect parents in the revision index"
5421
5422
#: bzrlib/check.py:253
5423
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
5424
msgstr " {0} has wrong parents in index: {1!r} should be {2!r}"
5425
5426
#: bzrlib/check.py:267
5427
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
5428
msgstr "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
5429
5430
#: bzrlib/check.py:296
5431
msgid ""
5432
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5433
"{{{4}}}"
5434
msgstr ""
5435
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5436
"{{{4}}}"
5437
5438
#: bzrlib/check.py:354
5439
#, python-format
5440
msgid "Checking branch at '%s'."
5441
msgstr "Checking branch at '%s'."
5442
5443
#: bzrlib/check.py:374
5444
#, python-format
5445
msgid "Checking working tree at '%s'."
5446
msgstr "Checking working tree at '%s'."
5447
5448
#: bzrlib/check.py:427 bzrlib/check.py:441
5449
msgid "No branch found at specified location."
5450
msgstr "No branch found at specified location."
5451
5452
#: bzrlib/check.py:429 bzrlib/check.py:439
5453
msgid "No working tree found at specified location."
5454
msgstr "No working tree found at specified location."
5455
5456
#: bzrlib/check.py:432
5457
#, python-format
5458
msgid "Checking repository at '%s'."
5459
msgstr "Checking repository at '%s'."
5460
5461
#: bzrlib/check.py:443
5462
msgid "No repository found at specified location."
5463
msgstr "No repository found at specified location."
5464
5465
#: bzrlib/clean_tree.py:63
5466
msgid "Nothing to delete."
5467
msgstr "Nothing to delete."
5468
5469
#: bzrlib/clean_tree.py:68
5470
msgid "Are you sure you wish to delete these"
5471
msgstr "Are you sure you wish to delete these"
5472
5473
#: bzrlib/clean_tree.py:70
5474
msgid "Canceled"
5475
msgstr "Cancelled"
5476
5477
#: bzrlib/clean_tree.py:107
5478
#, python-format
5479
msgid "unable to remove %s"
5480
msgstr "unable to remove %s"
5481
5482
#: bzrlib/clean_tree.py:111
5483
msgid "deleting paths:"
5484
msgstr "deleting paths:"
5485
5486
#: bzrlib/clean_tree.py:125
5487
msgid "unable to remove \"{0}\": {1}."
5488
msgstr "unable to remove \"{0}\": {1}."
5489
5490
#: bzrlib/clean_tree.py:130
5491
msgid "No files deleted."
5492
msgstr "No files deleted."
5493
5494
#: bzrlib/cmd_version_info.py:47
5495
msgid "No known version info format {0}. Supported types are: {1}"
5496
msgstr "No known version info format {0}. Supported types are: {1}"
5497
5498
#: bzrlib/cmd_version_info.py:52
5499
msgid "Version info in Custom template-based format."
5500
msgstr "Version info in Custom template-based format."
5501
5502
#: bzrlib/cmd_version_info.py:52
5503
msgid "Version info in Python format."
5504
msgstr "Version info in Python format."
5505
5506
#: bzrlib/cmd_version_info.py:52
5507
msgid "Version info in RIO (simple text) format (default)."
5508
msgstr "Version info in RIO (simple text) format (default)."
5509
5510
#: bzrlib/cmd_version_info.py:53
5511
msgid "Show version information about this tree."
5512
msgstr "Show version information about this tree."
5513
5514
#: bzrlib/cmd_version_info.py:55
5515
msgid ""
5516
"You can use this command to add information about version into\n"
5517
"source code of an application. The output can be in one of the\n"
5518
"supported formats or in a custom format based on a template."
5519
msgstr ""
5520
"You can use this command to add information about version into\n"
5521
"source code of an application. The output can be in one of the\n"
5522
"supported formats or in a custom format based on a template."
5523
5524
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5525
#: en/help_topics/configuration.txt:722
5526
msgid "For example::"
5527
msgstr "For example::"
5528
5529
#: bzrlib/cmd_version_info.py:61
5530
msgid ""
5531
" bzr version-info --custom \\\n"
5532
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5533
msgstr ""
5534
" bzr version-info --custom \\\n"
5535
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5536
5537
#: bzrlib/cmd_version_info.py:64
5538
msgid ""
5539
"will produce a C header file with formatted string containing the\n"
5540
"current revision number. Other supported variables in templates are:"
5541
msgstr ""
5542
"will produce a C header file with formatted string containing the\n"
5543
"current revision number. Other supported variables in templates are:"
5544
5545
#: bzrlib/cmd_version_info.py:67
5546
msgid ""
5547
" * {date} - date of the last revision\n"
5548
" * {build_date} - current date\n"
5549
" * {revno} - revision number\n"
5550
" * {revision_id} - revision id\n"
5551
" * {branch_nick} - branch nickname\n"
5552
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5553
" otherwise 1"
5554
msgstr ""
5555
" * {date} - date of the last revision\n"
5556
" * {build_date} - current date\n"
5557
" * {revno} - revision number\n"
5558
" * {revision_id} - revision id\n"
5559
" * {branch_nick} - branch nickname\n"
5560
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5561
" otherwise 1"
5562
5563
#: bzrlib/cmd_version_info.py:77
5564
msgid "Select the output format."
5565
msgstr "Select the output format."
5566
5567
#: bzrlib/cmd_version_info.py:81
5568
msgid "Include all possible information."
5569
msgstr "Include all possible information."
5570
5571
#: bzrlib/cmd_version_info.py:82
5572
msgid "Check if tree is clean."
5573
msgstr "Check if tree is clean."
5574
5575
#: bzrlib/cmd_version_info.py:84
5576
msgid "Include the revision-history."
5577
msgstr "Include the revision-history."
5578
5579
#: bzrlib/cmd_version_info.py:86
5580
msgid "Include the last revision for each file."
5581
msgstr "Include the last revision for each file."
5582
5583
#: bzrlib/cmd_version_info.py:87
5584
msgid "Template for the output."
5585
msgstr "Template for the output."
5586
5587
#: bzrlib/cmd_version_info.py:101
5588
msgid "bzr version-info --revision takes exactly one revision specifier"
5589
msgstr "bzr version-info --revision takes exactly one revision specifier"
5590
5591
#: bzrlib/commands.py:229
5592
#, python-format
5593
msgid "unknown command \"%s\""
5594
msgstr "unknown command \"%s\""
5595
5596
#: bzrlib/commands.py:476
5597
msgid "No help for this command."
5598
msgstr "No help for this command."
5599
5600
#: bzrlib/commands.py:489
5601
#, python-format
5602
msgid ":Purpose: %s\n"
5603
msgstr ":Purpose: %s\n"
5604
5605
#: bzrlib/commands.py:491
5606
#, python-format
5607
msgid ""
5608
":Usage:\n"
5609
"%s\n"
5610
msgstr ""
5611
":Usage:\n"
5612
"%s\n"
5613
5614
#: bzrlib/commands.py:493
5615
#, python-format
5616
msgid ":Usage: %s\n"
5617
msgstr ":Usage: %s\n"
5618
5619
#: bzrlib/commands.py:512
5620
#, python-format
5621
msgid ":Options:%s"
5622
msgstr ":Options:%s"
5623
5624
#: bzrlib/commands.py:523
5625
#, python-format
5626
msgid ""
5627
":Description:\n"
5628
" %s\n"
5629
"\n"
5630
msgstr ""
5631
":Description:\n"
5632
" %s\n"
5633
"\n"
5634
5635
#: bzrlib/commands.py:533
5636
#, python-format
5637
msgid ""
5638
"See bzr help %s for more details and examples.\n"
5639
"\n"
5640
msgstr ""
5641
"See bzr help %s for more details and examples.\n"
5642
"\n"
5643
5644
#: bzrlib/commands.py:538
5645
msgid ":Aliases: "
5646
msgstr ":Aliases: "
5647
5648
#: bzrlib/commands.py:542
5649
#, python-format
5650
msgid ":From: plugin \"%s\"\n"
5651
msgstr ":From: plugin \"%s\"\n"
5652
5653
#: bzrlib/commands.py:554
5654
msgid ":doc:`{0} <{1}-help>`"
5655
msgstr ":doc:`{0} <{1}-help>`"
5656
5657
#: bzrlib/commands.py:558
5658
#, python-format
5659
msgid ":See also: %s"
5660
msgstr ":See also: %s"
5661
5662
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5663
msgid "Only ASCII permitted in option names"
5664
msgstr "Only ASCII permitted in option names"
5665
5666
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5667
msgid "command {0!r} needs one or more {1}"
5668
msgstr "command {0!r} needs one or more {1}"
5669
5670
#: bzrlib/commands.py:868
5671
msgid "command {0!r} requires argument {1}"
5672
msgstr "command {0!r} requires argument {1}"
5673
5674
#: bzrlib/commands.py:875
5675
msgid "extra argument to command {0}: {1}"
5676
msgstr "extra argument to command {0}: {1}"
5677
5678
#: bzrlib/commands.py:972
5679
#, python-format
5680
msgid "Profile data written to \"%s\"."
5681
msgstr "Profile data written to \"%s\"."
5682
5683
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5684
msgid "added"
5685
msgstr "added"
5686
5687
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5688
msgid "modified"
5689
msgstr "modified"
5690
5691
#: bzrlib/commit.py:131
5692
#, python-format
5693
msgid "Committing%s"
5694
msgstr "Committing%s"
5695
5696
#: bzrlib/commit.py:134
5697
#, python-format
5698
msgid "Committed revision %d."
5699
msgstr "Committed revision %d."
5700
5701
#: bzrlib/commit.py:143
5702
#, python-format
5703
msgid "deleted %s"
5704
msgstr "deleted %s"
5705
5706
#: bzrlib/commit.py:146
5707
#, python-format
5708
msgid "missing %s"
5709
msgstr "missing %s"
5710
5711
#: bzrlib/commit.py:511
5712
msgid ""
5713
"Conflicting tags in bound branch:\n"
5714
"{0}"
5715
msgstr ""
5716
"Conflicting tags in bound branch:\n"
5717
"{0}"
5718
5719
#: bzrlib/commit.py:742
5720
msgid "renamed"
5721
msgstr "renamed"
5722
5723
#: bzrlib/commit.py:976
5724
msgid "unchanged"
5725
msgstr "unchanged"
5726
5727
#: bzrlib/commit.py:998
5728
msgid "{0} [{1}] - Stage"
5729
msgstr "{0} [{1}] - Stage"
5730
5731
#: bzrlib/commit.py:1001
5732
#, python-format
5733
msgid "%s - Stage"
5734
msgstr "%s - Stage"
5735
5736
#: bzrlib/commit_signature_commands.py:34
5737
msgid "Sign all commits by a given committer."
5738
msgstr "Sign all commits by a given committer."
5739
5740
#: bzrlib/commit_signature_commands.py:36
5741
msgid ""
5742
"If location is not specified the local tree is used.\n"
5743
"If committer is not specified the default committer is used."
5744
msgstr ""
5745
"If location is not specified the local tree is used.\n"
5746
"If committer is not specified the default committer is used."
5747
5748
#: bzrlib/commit_signature_commands.py:39
5749
msgid "This does not sign commits that already have signatures."
5750
msgstr "This does not sign commits that already have signatures."
5751
5752
#: bzrlib/commit_signature_commands.py:47
5753
msgid ""
5754
"Don't actually sign anything, just print the revisions that would be signed."
5755
msgstr ""
5756
"Don't actually sign anything, just print the revisions that would be signed."
5757
5758
#: bzrlib/commit_signature_commands.py:98
5759
#, python-format
5760
msgid "Signed %d revision.\n"
5761
msgid_plural "Signed %d revisions.\n"
5762
msgstr[0] "Signed %d revision.\n"
5763
msgstr[1] "Signed %d revisions.\n"
5764
5765
#: bzrlib/commit_signature_commands.py:103
5766
msgid "Verify all commit signatures."
5767
msgstr "Verify all commit signatures."
5768
5769
#: bzrlib/commit_signature_commands.py:105
5770
msgid ""
5771
"Verifies that all commits in the branch are signed by known GnuPG keys."
5772
msgstr ""
5773
"Verifies that all commits in the branch are signed by known GnuPG keys."
5774
5775
#: bzrlib/commit_signature_commands.py:110
5776
msgid ""
5777
"Comma separated list of GPG key patterns which are acceptable for "
5778
"verification."
5779
msgstr ""
5780
"Comma separated list of GPG key patterns which are acceptable for "
5781
"verification."
5782
5783
#: bzrlib/commit_signature_commands.py:148
5784
msgid "Cannot verify a range of non-revision-history revisions"
5785
msgstr "Cannot verify a range of non-revision-history revisions"
5786
5787
#: bzrlib/commit_signature_commands.py:166
5788
msgid "All commits signed with verifiable keys"
5789
msgstr "All commits signed with verifiable keys"
5790
5791
#: bzrlib/config.py:436
5792
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5793
msgstr "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5794
5795
#: bzrlib/config.py:2452
5796
msgid "{0} is not an SI unit."
5797
msgstr "{0} is not an SI unit."
5798
5799
#: bzrlib/config.py:2971
5800
msgid ""
5801
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5802
"will be saved."
5803
msgstr ""
5804
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5805
"will be saved."
5806
5807
#: bzrlib/config.py:3116
5808
#, python-format
5809
msgid "Invalid '%s', should be of the form 'name=value'"
5810
msgstr "Invalid '%s', should be of the form 'name=value'"
5811
5812
#: bzrlib/config.py:4018
5813
msgid "Display, set or remove a configuration option."
5814
msgstr "Display, set or remove a configuration option."
5815
5816
#: bzrlib/config.py:4020
5817
msgid "Display the active value for a given option."
5818
msgstr "Display the active value for a given option."
5819
5820
#: bzrlib/config.py:4022
5821
msgid ""
5822
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5823
"matching options are displayed mentioning their scope. The active value\n"
5824
"that bzr will take into account is the first one displayed for each option."
5825
msgstr ""
5826
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5827
"matching options are displayed mentioning their scope. The active value\n"
5828
"that bzr will take into account is the first one displayed for each option."
5829
5830
#: bzrlib/config.py:4026
5831
msgid "If no NAME is given, --all .* is implied."
5832
msgstr "If no NAME is given, --all .* is implied."
5833
5834
#: bzrlib/config.py:4028
5835
msgid ""
5836
"Setting a value is achieved by using name=value without spaces. The value\n"
5837
"is set in the most relevant scope and can be checked by displaying the\n"
5838
"option again."
5839
msgstr ""
5840
"Setting a value is achieved by using name=value without spaces. The value\n"
5841
"is set in the most relevant scope and can be checked by displaying the\n"
5842
"option again."
5843
5844
#: bzrlib/config.py:4040
5845
msgid "Reduce the scope to the specified configuration file."
5846
msgstr "Reduce the scope to the specified configuration file."
5847
5848
#: bzrlib/config.py:4044
5849
msgid "Display all the defined values for the matching options."
5850
msgstr "Display all the defined values for the matching options."
5851
5852
#: bzrlib/config.py:4046
5853
msgid "Remove the option from the configuration file."
5854
msgstr "Remove the option from the configuration file."
5855
5856
#: bzrlib/conflicts.py:50
5857
msgid "List files with conflicts."
5858
msgstr "List files with conflicts."
5859
5860
#: bzrlib/conflicts.py:57
5861
msgid ""
5862
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5863
"is supplied, the pathnames of files with text conflicts are listed,\n"
5864
"instead. (This is useful for editing all files with text conflicts.)"
5865
msgstr ""
5866
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5867
"is supplied, the pathnames of files with text conflicts are listed,\n"
5868
"instead. (This is useful for editing all files with text conflicts.)"
5869
5870
#: bzrlib/conflicts.py:61
5871
msgid "Use bzr resolve when you have fixed a problem."
5872
msgstr "Use bzr resolve when you have fixed a problem."
5873
5874
#: bzrlib/conflicts.py:66
5875
msgid "List paths of files with text conflicts."
5876
msgstr "List paths of files with text conflicts."
5877
5878
#: bzrlib/conflicts.py:85
5879
msgid "Marks the conflict as resolved."
5880
msgstr "Marks the conflict as resolved."
5881
5882
#: bzrlib/conflicts.py:88
5883
msgid "Resolve the conflict preserving the version in the working tree."
5884
msgstr "Resolve the conflict preserving the version in the working tree."
5885
5886
#: bzrlib/conflicts.py:91
5887
msgid "Resolve the conflict taking the merged version into account."
5888
msgstr "Resolve the conflict taking the merged version into account."
5889
5890
#: bzrlib/conflicts.py:98
5891
msgid "How to resolve the conflict."
5892
msgstr "How to resolve the conflict."
5893
5894
#: bzrlib/conflicts.py:104
5895
msgid "Mark a conflict as resolved."
5896
msgstr "Mark a conflict as resolved."
5897
5898
#: bzrlib/conflicts.py:111
5899
msgid ""
5900
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5901
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5902
"as\n"
5903
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5904
msgstr ""
5905
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5906
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5907
"as\n"
5908
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5909
5910
#: bzrlib/conflicts.py:119
5911
msgid "Resolve all conflicts in this tree."
5912
msgstr "Resolve all conflicts in this tree."
5913
5914
#: bzrlib/conflicts.py:126
5915
msgid "If --all is specified, no FILE may be provided"
5916
msgstr "If --all is specified, no FILE may be provided"
5917
5918
#: bzrlib/conflicts.py:151
5919
#, python-format
5920
msgid "%d conflict auto-resolved."
5921
msgid_plural "%d conflicts auto-resolved."
5922
msgstr[0] "%d conflict auto-resolved."
5923
msgstr[1] "%d conflicts auto-resolved."
5924
5925
#: bzrlib/conflicts.py:154
5926
msgid "Remaining conflicts:"
5927
msgstr "Remaining conflicts:"
5928
5929
#: bzrlib/conflicts.py:159
5930
msgid "All conflicts resolved."
5931
msgstr "All conflicts resolved."
5932
5933
#: bzrlib/conflicts.py:168
5934
msgid "{0} conflict resolved, {1} remaining"
5935
msgid_plural "{0} conflicts resolved, {1} remaining"
5936
msgstr[0] "{0} conflict resolved, {1} remaining"
5937
msgstr[1] "{0} conflicts resolved, {1} remaining"
5938
5939
#: bzrlib/controldir.py:712
5940
msgid "{0} is{1} redirected to {2}"
5941
msgstr "{0} is{1} redirected to {2}"
5942
5943
#: bzrlib/diff.py:399
5944
#, python-format
5945
msgid "*** Ignoring files outside view. View is %s"
5946
msgstr "*** Ignoring files outside view. View is %s"
5947
5948
#: bzrlib/errors.py:157
5949
msgid "The tree builder is already building a tree."
5950
msgstr "The tree builder is already building a tree."
5951
5952
#: bzrlib/errors.py:178
5953
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5954
msgstr "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5955
5956
#: bzrlib/errors.py:197
5957
msgid ""
5958
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5959
"versions \"%(minimum)s\" to \"%(current)s\"."
5960
msgstr ""
5961
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5962
"versions \"%(minimum)s\" to \"%(current)s\"."
5963
5964
#: bzrlib/errors.py:209
5965
msgid "The transport '%(transport)s' is only accessible within this process."
5966
msgstr ""
5967
"The transport '%(transport)s' is only accessible within this process."
5968
5969
#: bzrlib/errors.py:227
5970
msgid "Invalid revision number %(revno)s"
5971
msgstr "Invalid revision number %(revno)s"
5972
5973
#: bzrlib/errors.py:236
5974
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5975
msgstr "Invalid revision-id {%(revision_id)s} in %(branch)s"
5976
5977
#: bzrlib/errors.py:247
5978
msgid "Reserved revision-id {%(revision_id)s}"
5979
msgstr "Reserved revision-id {%(revision_id)s}"
5980
5981
#: bzrlib/errors.py:261
5982
msgid "There is no public branch set for \"%(branch_url)s\"."
5983
msgstr "There is no public branch set for \"%(branch_url)s\"."
5984
5985
#: bzrlib/errors.py:271
5986
msgid ""
5987
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5988
"obtain a list of topics."
5989
msgstr ""
5990
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5991
"obtain a list of topics."
5992
5993
#: bzrlib/errors.py:280
5994
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5995
msgstr "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5996
5997
#: bzrlib/errors.py:290
5998
msgid ""
5999
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
6000
msgstr ""
6001
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
6002
6003
#: bzrlib/errors.py:299
6004
msgid "The branch '%(branch)s' is not stacked."
6005
msgstr "The branch '%(branch)s' is not stacked."
6006
6007
#: bzrlib/errors.py:313
6008
msgid "No WorkingTree exists for \"%(base)s\"."
6009
msgstr "No WorkingTree exists for \"%(base)s\"."
6010
6011
#: bzrlib/errors.py:322
6012
msgid "Not currently building a tree."
6013
msgstr "Not currently building a tree."
6014
6015
#: bzrlib/errors.py:327
6016
msgid "%(url)s is not a local path."
6017
msgstr "%(url)s is not a local path."
6018
6019
#: bzrlib/errors.py:355
6020
msgid "%(not_locked)r is not write locked but needs to be."
6021
msgstr "%(not_locked)r is not write locked but needs to be."
6022
6023
#: bzrlib/errors.py:363
6024
msgid "Error in command line options"
6025
msgstr "Error in command line options"
6026
6027
#: bzrlib/errors.py:368
6028
msgid "%(value)s is not an index of type %(_type)s."
6029
msgstr "%(value)s is not an index of type %(_type)s."
6030
6031
#: bzrlib/errors.py:378
6032
msgid "Error in data for index %(value)s."
6033
msgstr "Error in data for index %(value)s."
6034
6035
#: bzrlib/errors.py:387
6036
msgid "The key '%(key)s' is already in index '%(index)s'."
6037
msgstr "The key '%(key)s' is already in index '%(index)s'."
6038
6039
#: bzrlib/errors.py:397
6040
msgid "The key '%(key)s' is not a valid key."
6041
msgstr "The key '%(key)s' is not a valid key."
6042
6043
#: bzrlib/errors.py:406
6044
msgid "Could not parse options for index %(value)s."
6045
msgstr "Could not parse options for index %(value)s."
6046
6047
#: bzrlib/errors.py:415
6048
msgid "The value '%(value)s' is not a valid value."
6049
msgstr "The value '%(value)s' is not a valid value."
6050
6051
#: bzrlib/errors.py:424
6052
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
6053
msgstr "Bad value \"%(value)s\" for option \"%(name)s\"."
6054
6055
#: bzrlib/errors.py:443
6056
msgid "Generic path error: %(path)r%(extra)s)"
6057
msgstr "Generic path error: %(path)r%(extra)s)"
6058
6059
#: bzrlib/errors.py:456
6060
msgid "No such file: %(path)r%(extra)s"
6061
msgstr "No such file: %(path)r%(extra)s"
6062
6063
#: bzrlib/errors.py:461
6064
msgid "File exists: %(path)r%(extra)s"
6065
msgstr "File exists: %(path)r%(extra)s"
6066
6067
#: bzrlib/errors.py:467
6068
msgid ""
6069
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
6070
"after to tell bzr about a rename that has already happened)%(extra)s"
6071
msgstr ""
6072
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
6073
"after to tell bzr about a rename that has already happened)%(extra)s"
6074
6075
#: bzrlib/errors.py:483
6076
msgid "\"%(path)s\" is not a directory %(extra)s"
6077
msgstr "\"%(path)s\" is not a directory %(extra)s"
6078
6079
#: bzrlib/errors.py:488
6080
msgid "\"%(path)s\" is not in the working directory %(extra)s"
6081
msgstr "\"%(path)s\" is not in the working directory %(extra)s"
6082
6083
#: bzrlib/errors.py:493
6084
msgid "Directory not empty: \"%(path)s\"%(extra)s"
6085
msgstr "Directory not empty: \"%(path)s\"%(extra)s"
6086
6087
#: bzrlib/errors.py:498
6088
msgid "Hard-linking \"%(path)s\" is not supported"
6089
msgstr "Hard-linking \"%(path)s\" is not supported"
6090
6091
#: bzrlib/errors.py:513
6092
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
6093
msgstr "Device or resource busy: \"%(path)s\"%(extra)s"
6094
6095
#: bzrlib/errors.py:518
6096
msgid "Permission denied: \"%(path)s\"%(extra)s"
6097
msgstr "Permission denied: \"%(path)s\"%(extra)s"
6098
6099
#: bzrlib/errors.py:523
6100
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
6101
msgstr "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
6102
6103
#: bzrlib/errors.py:528
6104
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
6105
msgstr "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
6106
6107
#: bzrlib/errors.py:539
6108
msgid "URLs differ by more than path: %(from_)r and %(to)r"
6109
msgstr "URLs differ by more than path: %(from_)r and %(to)r"
6110
6111
#: bzrlib/errors.py:561
6112
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
6113
msgstr "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
6114
6115
#: bzrlib/errors.py:571
6116
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
6117
msgstr "Unsupported protocol for url \"%(path)s\"%(extra)s"
6118
6119
#: bzrlib/errors.py:579
6120
msgid ""
6121
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
6122
"upgrade the branch to permit branch stacking."
6123
msgstr ""
6124
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
6125
"upgrade the branch to permit branch stacking."
6126
6127
#: bzrlib/errors.py:590
6128
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
6129
msgstr "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
6130
6131
#: bzrlib/errors.py:600
6132
msgid ""
6133
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
6134
"need to upgrade the repository to permit branch stacking."
6135
msgstr ""
6136
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
6137
"need to upgrade the repository to permit branch stacking."
6138
6139
#: bzrlib/errors.py:611
6140
msgid "Error reading from %(path)r."
6141
msgstr "Error reading from %(path)r."
6142
6143
#: bzrlib/errors.py:630
6144
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
6145
msgstr "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
6146
6147
#: bzrlib/errors.py:646
6148
msgid "Path \"%(path)s\" is not unicode normalized"
6149
msgstr "Path \"%(path)s\" is not unicode normalised"
6150
6151
#: bzrlib/errors.py:654
6152
msgid "Not a branch: \"%(path)s\"%(detail)s."
6153
msgstr "Not a branch: \"%(path)s\"%(detail)s."
6154
6155
#: bzrlib/errors.py:696
6156
msgid "No submit branch available for branch \"%(path)s\""
6157
msgstr "No submit branch available for branch \"%(path)s\""
6158
6159
#: bzrlib/errors.py:705
6160
msgid "A control directory already exists: \"%(path)s\"."
6161
msgstr "A control directory already exists: \"%(path)s\"."
6162
6163
#: bzrlib/errors.py:710
6164
msgid "Already a branch: \"%(path)s\"."
6165
msgstr "Already a branch: \"%(path)s\"."
6166
6167
#: bzrlib/errors.py:715
6168
msgid "Invalid branch name: %(name)s"
6169
msgstr "Invalid branch name: %(name)s"
6170
6171
#: bzrlib/errors.py:724
6172
msgid "Parent branch already exists: \"%(path)s\"."
6173
msgstr "Parent branch already exists: \"%(path)s\"."
6174
6175
#: bzrlib/errors.py:730
6176
msgid ""
6177
"Directory contains a branch, but no working tree (use bzr checkout if you "
6178
"wish to build a working tree): \"%(path)s\""
6179
msgstr ""
6180
"Directory contains a branch, but no working tree (use bzr checkout if you "
6181
"wish to build a working tree): \"%(path)s\""
6182
6183
#: bzrlib/errors.py:735
6184
msgid ""
6185
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
6186
msgstr ""
6187
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
6188
6189
#: bzrlib/errors.py:745
6190
msgid ""
6191
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
6192
msgstr ""
6193
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
6194
6195
#: bzrlib/errors.py:755
6196
msgid "No repository present: \"%(path)s\""
6197
msgstr "No repository present: \"%(path)s\""
6198
6199
#: bzrlib/errors.py:762
6200
msgid ""
6201
"Unsupported branch format: %(format)s\n"
6202
"Please run 'bzr upgrade'"
6203
msgstr ""
6204
"Unsupported branch format: %(format)s\n"
6205
"Please run 'bzr upgrade'"
6206
6207
#: bzrlib/errors.py:768
6208
msgid "Unknown %(kind)s format: %(format)r"
6209
msgstr "Unknown %(kind)s format: %(format)r"
6210
6211
#: bzrlib/errors.py:777
6212
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
6213
msgstr "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
6214
6215
#: bzrlib/errors.py:787
6216
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
6217
msgstr "Parse error on line %(lineno)d of %(format)s format: %(line)s"
6218
6219
#: bzrlib/errors.py:802
6220
msgid ""
6221
"%(target)s\n"
6222
"is not compatible with\n"
6223
"%(source)s\n"
6224
"%(details)s"
6225
msgstr ""
6226
"%(target)s\n"
6227
"is not compatible with\n"
6228
"%(source)s\n"
6229
"%(details)s"
6230
6231
#: bzrlib/errors.py:818
6232
msgid "Revision is not compatible with %(repo_format)s"
6233
msgstr "Revision is not compatible with %(repo_format)s"
6234
6235
#: bzrlib/errors.py:828
6236
msgid "%(context_info)s%(path)s is already versioned."
6237
msgstr "%(context_info)s%(path)s is already versioned."
6238
6239
#: bzrlib/errors.py:849
6240
msgid "%(context_info)s%(path)s is not versioned."
6241
msgstr "%(context_info)s%(path)s is not versioned."
6242
6243
#: bzrlib/errors.py:870
6244
msgid "Path(s) are not versioned: %(paths_as_string)s"
6245
msgstr "Path(s) are not versioned: %(paths_as_string)s"
6246
6247
#: bzrlib/errors.py:881
6248
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
6249
msgstr "Path(s) do not exist: %(paths_as_string)s%(extra)s"
6250
6251
#: bzrlib/errors.py:900
6252
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
6253
msgstr "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
6254
6255
#: bzrlib/errors.py:908
6256
msgid ""
6257
"Filename %(filename)r is not valid in your current filesystem encoding "
6258
"%(fs_encoding)s"
6259
msgstr ""
6260
"Filename %(filename)r is not valid in your current filesystem encoding "
6261
"%(fs_encoding)s"
6262
6263
#: bzrlib/errors.py:919
6264
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
6265
msgstr "Cannot operate on \"%(filename)s\" because it is a control file"
6266
6267
#: bzrlib/errors.py:937
6268
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
6269
msgstr "The lock for '%(lock_description)s' is in use and cannot be broken."
6270
6271
#: bzrlib/errors.py:976
6272
msgid "Cannot lock %(lock)s: %(why)s"
6273
msgstr "Cannot lock %(lock)s: %(why)s"
6274
6275
#: bzrlib/errors.py:986
6276
msgid ""
6277
"A transaction related operation was attempted after the transaction finished."
6278
msgstr ""
6279
"A transaction related operation was attempted after the transaction finished."
6280
6281
#: bzrlib/errors.py:1013
6282
msgid "Cannot lock: transport is read only: %(transport)s"
6283
msgstr "Cannot lock: transport is read only: %(transport)s"
6284
6285
#: bzrlib/errors.py:1021
6286
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
6287
msgstr "Could not acquire lock \"%(lock)s\": %(msg)s"
6288
6289
#: bzrlib/errors.py:1032
6290
msgid ""
6291
"Lock was broken while still open: %(lock)s - check storage consistency!"
6292
msgstr ""
6293
"Lock was broken while still open: %(lock)s - check storage consistency!"
6294
6295
#: bzrlib/errors.py:1043
6296
msgid ""
6297
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6298
"%(holder)r, wanted to break %(target)r"
6299
msgstr ""
6300
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6301
"%(holder)r, wanted to break %(target)r"
6302
6303
#: bzrlib/errors.py:1055
6304
msgid ""
6305
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6306
"Use 'bzr break-lock' to clear it"
6307
msgstr ""
6308
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6309
"Use 'bzr break-lock' to clear it"
6310
6311
#: bzrlib/errors.py:1068
6312
msgid "Lock not held: %(lock)s"
6313
msgstr "Lock not held: %(lock)s"
6314
6315
#: bzrlib/errors.py:1097
6316
msgid "No changes to commit"
6317
msgstr "No changes to commit"
6318
6319
#: bzrlib/errors.py:1102
6320
msgid ""
6321
"Selected-file commit of merges is not supported yet: files %(files_str)s"
6322
msgstr ""
6323
"Selected-file commit of merges is not supported yet: files %(files_str)s"
6324
6325
#: bzrlib/errors.py:1112
6326
msgid ""
6327
"Excluding paths during commit is not supported by repository at "
6328
"%(repository)r."
6329
msgstr ""
6330
"Excluding paths during commit is not supported by repository at "
6331
"%(repository)r."
6332
6333
#: bzrlib/errors.py:1121
6334
msgid ""
6335
"The specified commit message contains characters unsupported by the current "
6336
"encoding."
6337
msgstr ""
6338
"The specified commit message contains characters unsupported by the current "
6339
"encoding."
6340
6341
#: bzrlib/errors.py:1127
6342
msgid "Upgrade URL cannot work with readonly URLs."
6343
msgstr "Upgrade URL cannot work with readonly URLs."
6344
6345
#: bzrlib/errors.py:1132
6346
msgid "The branch format %(format)s is already at the most recent format."
6347
msgstr "The branch format %(format)s is already at the most recent format."
6348
6349
#: bzrlib/errors.py:1155
6350
msgid "Option --change does not accept revision ranges"
6351
msgstr "Option --change does not accept revision ranges"
6352
6353
#: bzrlib/errors.py:1160
6354
msgid "No namespace registered for string: %(spec)r"
6355
msgstr "No namespace registered for string: %(spec)r"
6356
6357
#: bzrlib/errors.py:1179
6358
msgid ""
6359
"Requested revision: '%(spec)s' does not exist in branch: "
6360
"%(branch_url)s%(extra)s"
6361
msgstr ""
6362
"Requested revision: '%(spec)s' does not exist in branch: "
6363
"%(branch_url)s%(extra)s"
6364
6365
#: bzrlib/errors.py:1193
6366
msgid ""
6367
"Operation denied because it would change the main history, which is not "
6368
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
6369
msgstr ""
6370
"Operation denied because it would change the main history, which is not "
6371
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
6372
6373
#: bzrlib/errors.py:1204
6374
msgid ""
6375
"These branches have diverged. Use the missing command to see how.\n"
6376
"Use the merge command to reconcile them."
6377
msgstr ""
6378
"These branches have diverged. Use the missing command to see how.\n"
6379
"Use the merge command to reconcile them."
6380
6381
#: bzrlib/errors.py:1224
6382
msgid ""
6383
"Branches have no common ancestor, and no merge base revision was specified."
6384
msgstr ""
6385
"Branches have no common ancestor, and no merge base revision was specified."
6386
6387
#: bzrlib/errors.py:1230
6388
msgid ""
6389
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
6390
msgstr ""
6391
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
6392
6393
#: bzrlib/errors.py:1236
6394
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
6395
msgstr "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
6396
6397
#: bzrlib/errors.py:1245
6398
msgid ""
6399
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
6400
msgstr ""
6401
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
6402
6403
#: bzrlib/errors.py:1254
6404
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
6405
msgstr "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
6406
6407
#: bzrlib/errors.py:1263
6408
msgid "Branch %(branch)s has no commits."
6409
msgstr "Branch %(branch)s has no commits."
6410
6411
#: bzrlib/errors.py:1281
6412
msgid ""
6413
"Bound branch %(branch)s is out of date with master branch "
6414
"%(master)s.%(extra_help)s"
6415
msgstr ""
6416
"Bound branch %(branch)s is out of date with master branch "
6417
"%(master)s.%(extra_help)s"
6418
6419
#: bzrlib/errors.py:1293
6420
msgid ""
6421
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6422
"bound to %(remote)s."
6423
msgstr ""
6424
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6425
"bound to %(remote)s."
6426
6427
#: bzrlib/errors.py:1305
6428
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
6429
msgstr "Cannot pull --overwrite to a branch which is bound %(branch)s"
6430
6431
#: bzrlib/errors.py:1314
6432
msgid ""
6433
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6434
"%(error)s"
6435
msgstr ""
6436
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6437
"%(error)s"
6438
6439
#: bzrlib/errors.py:1326
6440
msgid "Error in processing weave: %(msg)s"
6441
msgstr "Error in processing weave: %(msg)s"
6442
6443
#: bzrlib/errors.py:1335
6444
msgid "Revision {%(revision_id)s} already present in %(weave)s"
6445
msgstr "Revision {%(revision_id)s} already present in %(weave)s"
6446
6447
#: bzrlib/errors.py:1346
6448
msgid "Revision {%(revision_id)s} not present in %(weave)s"
6449
msgstr "Revision {%(revision_id)s} not present in %(weave)s"
6450
6451
#: bzrlib/errors.py:1356
6452
msgid "Weave invariant violated: %(what)s"
6453
msgstr "Weave invariant violated: %(what)s"
6454
6455
#: bzrlib/errors.py:1365
6456
msgid "Parents are mismatched between two revisions. %(msg)s"
6457
msgstr "Parents are mismatched between two revisions. %(msg)s"
6458
6459
#: bzrlib/errors.py:1387
6460
msgid ""
6461
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
6462
"%(weave_b)s"
6463
msgstr ""
6464
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
6465
"%(weave_b)s"
6466
6467
#: bzrlib/errors.py:1399
6468
msgid "Versioned file error"
6469
msgstr "Versioned file error"
6470
6471
#: bzrlib/errors.py:1404
6472
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
6473
msgstr "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
6474
6475
#: bzrlib/errors.py:1414
6476
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
6477
msgstr "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
6478
6479
#: bzrlib/errors.py:1424
6480
msgid "Text did not match its checksum: %(msg)s"
6481
msgstr "Text did not match its checksum: %(msg)s"
6482
6483
#: bzrlib/errors.py:1550
6484
msgid "Export format %(format)r not supported"
6485
msgstr "Export format %(format)r not supported"
6486
6487
#: bzrlib/errors.py:1559
6488
msgid "Transport error: %(msg)s %(orig_error)s"
6489
msgstr "Transport error: %(msg)s %(orig_error)s"
6490
6491
#: bzrlib/errors.py:1585
6492
msgid "Generic bzr smart protocol error: %(details)s"
6493
msgstr "Generic bzr smart protocol error: %(details)s"
6494
6495
#: bzrlib/errors.py:1593
6496
msgid "Received bad protocol version marker: %(marker)r"
6497
msgstr "Received bad protocol version marker: %(marker)r"
6498
6499
#: bzrlib/errors.py:1625
6500
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
6501
msgstr "Transport operation not possible: %(msg)s %(orig_error)s"
6502
6503
#: bzrlib/errors.py:1630
6504
msgid "Connection error: %(msg)s %(orig_error)s"
6505
msgstr "Connection error: %(msg)s %(orig_error)s"
6506
6507
#: bzrlib/errors.py:1635
6508
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
6509
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
6510
6511
#: bzrlib/errors.py:1656
6512
msgid "Connection closed: %(msg)s %(orig_error)s"
6513
msgstr "Connection closed: %(msg)s %(orig_error)s"
6514
6515
#: bzrlib/errors.py:1661
6516
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6517
msgstr "Connection Timeout: %(msg)s%(orig_error)s"
6518
6519
#: bzrlib/errors.py:1666
6520
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6521
msgstr "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6522
6523
#: bzrlib/errors.py:1676
6524
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6525
msgstr "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6526
6527
#: bzrlib/errors.py:1691
6528
msgid "Certificate error: %(error)s"
6529
msgstr "Certificate error: %(error)s"
6530
6531
#: bzrlib/errors.py:1699
6532
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6533
msgstr "Invalid http range %(range)r for %(path)s: %(msg)s"
6534
6535
#: bzrlib/errors.py:1713
6536
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6537
msgstr "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6538
6539
#: bzrlib/errors.py:1721
6540
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6541
msgstr "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6542
6543
#: bzrlib/errors.py:1730
6544
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6545
msgstr "%(source)s is%(permanently)s redirected to %(target)s"
6546
6547
#: bzrlib/errors.py:1744
6548
msgid "Too many redirections"
6549
msgstr "Too many redirections"
6550
6551
#: bzrlib/errors.py:1749
6552
msgid "Working tree has conflicts."
6553
msgstr "Working tree has conflicts."
6554
6555
#: bzrlib/errors.py:1753
6556
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6557
msgstr "Config file %(filename)s is not UTF-8 encoded\n"
6558
6559
#: bzrlib/errors.py:1762
6560
msgid ""
6561
"Error(s) parsing config file %(filename)s:\n"
6562
"%(errors)s"
6563
msgstr ""
6564
"Error(s) parsing config file %(filename)s:\n"
6565
"%(errors)s"
6566
6567
#: bzrlib/errors.py:1772
6568
msgid ""
6569
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6570
"See ``bzr help %(name)s``"
6571
msgstr ""
6572
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6573
"See ``bzr help %(name)s``"
6574
6575
#: bzrlib/errors.py:1782
6576
msgid "%(username)r does not seem to contain a reasonable email address"
6577
msgstr "%(username)r does not seem to contain a reasonable email address"
6578
6579
#: bzrlib/errors.py:1791
6580
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6581
msgstr "Failed to GPG sign data with command \"%(command_line)s\""
6582
6583
#: bzrlib/errors.py:1799
6584
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6585
msgstr "Failed to verify GPG signature data with error \"%(error)s\""
6586
6587
#: bzrlib/errors.py:1807
6588
msgid "Unable to import library \"%(library)s\": %(error)s"
6589
msgstr "Unable to import library \"%(library)s\": %(error)s"
6590
6591
#: bzrlib/errors.py:1815
6592
msgid "python-gpgme is not installed, it is needed to verify signatures"
6593
msgstr "python-gpgme is not installed, it is needed to verify signatures"
6594
6595
#: bzrlib/errors.py:1823
6596
msgid ""
6597
"The working tree for %(basedir)s has changed since the last commit, but "
6598
"weave merge requires that it be unchanged"
6599
msgstr ""
6600
"The working tree for %(basedir)s has changed since the last commit, but "
6601
"weave merge requires that it be unchanged"
6602
6603
#: bzrlib/errors.py:1833
6604
msgid ""
6605
"Can't reprocess and show base, because reprocessing obscures the "
6606
"relationship of conflicting lines to the base"
6607
msgstr ""
6608
"Can't reprocess and show base, because reprocessing obscures the "
6609
"relationship of conflicting lines to the base"
6610
6611
#: bzrlib/errors.py:1839
6612
msgid "Cycle in graph %(graph)r"
6613
msgstr "Cycle in graph %(graph)r"
6614
6615
#: bzrlib/errors.py:1867
6616
msgid "File %(filename)s is not conflicted."
6617
msgstr "File %(filename)s is not conflicted."
6618
6619
#: bzrlib/errors.py:1889
6620
msgid "No bundle was found in \"%(filename)s\"."
6621
msgstr "No bundle was found in \"%(filename)s\"."
6622
6623
#: bzrlib/errors.py:1898
6624
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6625
msgstr "Unable to handle bundle version %(version)s: %(msg)s"
6626
6627
#: bzrlib/errors.py:1908
6628
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6629
msgstr "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6630
6631
#: bzrlib/errors.py:1921
6632
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6633
msgstr "File id {%(file_id)s} already exists in inventory as %(entry)s"
6634
6635
#: bzrlib/errors.py:1931
6636
msgid "Key %(key)s is already present in map"
6637
msgstr "Key %(key)s is already present in map"
6638
6639
#: bzrlib/errors.py:1936
6640
msgid "The prefix %(prefix)s is in the help search path twice."
6641
msgstr "The prefix %(prefix)s is in the help search path twice."
6642
6643
#: bzrlib/errors.py:1946
6644
msgid ""
6645
"No final name for trans_id %(trans_id)r\n"
6646
"file-id: %(file_id)r\n"
6647
"root trans-id: %(root_trans_id)r\n"
6648
msgstr ""
6649
"No final name for trans_id %(trans_id)r\n"
6650
"file-id: %(file_id)r\n"
6651
"root trans-id: %(root_trans_id)r\n"
6652
6653
#: bzrlib/errors.py:1978
6654
msgid "Attempt to reuse a transform that has already been applied."
6655
msgstr "Attempt to reuse a transform that has already been applied."
6656
6657
#: bzrlib/errors.py:1983
6658
msgid "Moving the root directory is not supported at this time"
6659
msgstr "Moving the root directory is not supported at this time"
6660
6661
#: bzrlib/errors.py:1988
6662
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6663
msgstr "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6664
6665
#: bzrlib/errors.py:1999
6666
msgid ""
6667
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6668
msgstr ""
6669
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6670
6671
#: bzrlib/errors.py:2035
6672
msgid ""
6673
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6674
msgstr ""
6675
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6676
6677
#: bzrlib/errors.py:2065
6678
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6679
msgstr "Unable to import paramiko (required for sftp support): %(error)s"
6680
6681
#: bzrlib/errors.py:2073
6682
msgid "Nothing to merge."
6683
msgstr "Nothing to merge."
6684
6685
#: bzrlib/errors.py:2078
6686
msgid "Format %(format)s cannot be initialised by this version of bzr."
6687
msgstr "Format %(format)s cannot be initialised by this version of bzr."
6688
6689
#: bzrlib/errors.py:2087
6690
msgid ""
6691
"Cannot convert from format %(from_format)s to format %(format)s. "
6692
"%(problem)s"
6693
msgstr ""
6694
"Cannot convert from format %(from_format)s to format %(format)s. "
6695
"%(problem)s"
6696
6697
#: bzrlib/errors.py:2099
6698
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6699
msgstr "Could not find an appropriate Differ for file \"%(path)s\""
6700
6701
#: bzrlib/errors.py:2107
6702
msgid "%(exe_name)s could not be found on this machine"
6703
msgstr "%(exe_name)s could not be found on this machine"
6704
6705
#: bzrlib/errors.py:2115
6706
msgid "Diff is not installed on this machine: %(msg)s"
6707
msgstr "Diff is not installed on this machine: %(msg)s"
6708
6709
#: bzrlib/errors.py:2123
6710
msgid "Diff3 is not installed on this machine."
6711
msgstr "Diff3 is not installed on this machine."
6712
6713
#: bzrlib/errors.py:2129
6714
msgid "The content being inserted is already present."
6715
msgstr "The content being inserted is already present."
6716
6717
#: bzrlib/errors.py:2134
6718
msgid ""
6719
"This tree contains left-over files from a failed operation.\n"
6720
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6721
"to\n"
6722
" keep, and delete it when you are done."
6723
msgstr ""
6724
"This tree contains left-over files from a failed operation.\n"
6725
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6726
"to\n"
6727
" keep, and delete it when you are done."
6728
6729
#: bzrlib/errors.py:2145
6730
msgid ""
6731
"This tree contains left-over files from a failed operation.\n"
6732
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6733
" wish to keep, and delete it when you are done."
6734
msgstr ""
6735
"This tree contains left-over files from a failed operation.\n"
6736
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6737
" wish to keep, and delete it when you are done."
6738
6739
#: bzrlib/errors.py:2155
6740
msgid ""
6741
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6742
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6743
"to\n"
6744
" keep, and delete it when you are done."
6745
msgstr ""
6746
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6747
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6748
"to\n"
6749
" keep, and delete it when you are done."
6750
6751
#: bzrlib/errors.py:2166
6752
msgid ""
6753
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6754
"examine %(pending_deletion)s to see if it contains any files you wish to "
6755
"keep, and delete it when you are done."
6756
msgstr ""
6757
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6758
"examine %(pending_deletion)s to see if it contains any files you wish to "
6759
"keep, and delete it when you are done."
6760
6761
#: bzrlib/errors.py:2176
6762
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6763
msgstr "Working tree is out of date, please run 'bzr update'.%(more)s"
6764
6765
#: bzrlib/errors.py:2190
6766
msgid ""
6767
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6768
msgstr ""
6769
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6770
6771
#: bzrlib/errors.py:2203
6772
msgid "Error in merge modified format"
6773
msgstr "Error in merge modified format"
6774
6775
#: bzrlib/errors.py:2208
6776
msgid "Format error in conflict listings"
6777
msgstr "Format error in conflict listings"
6778
6779
#: bzrlib/errors.py:2212
6780
msgid ""
6781
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6782
"Error: %(description)s"
6783
msgstr ""
6784
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6785
"Error: %(description)s"
6786
6787
#: bzrlib/errors.py:2223
6788
msgid ""
6789
"An error has been detected in the repository %(repo_path)s.\n"
6790
"Please run bzr reconcile on this repository."
6791
msgstr ""
6792
"An error has been detected in the repository %(repo_path)s.\n"
6793
"Please run bzr reconcile on this repository."
6794
6795
#: bzrlib/errors.py:2234
6796
msgid ""
6797
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6798
"reason: %(reason)s"
6799
msgstr ""
6800
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6801
"reason: %(reason)s"
6802
6803
#: bzrlib/errors.py:2247
6804
msgid ""
6805
"An inconsistent delta was supplied: %(delta)r\n"
6806
"reason: %(reason)s"
6807
msgstr ""
6808
"An inconsistent delta was supplied: %(delta)r\n"
6809
"reason: %(reason)s"
6810
6811
#: bzrlib/errors.py:2259
6812
msgid "To use this feature you must upgrade your branch at %(path)s."
6813
msgstr "To use this feature you must upgrade your branch at %(path)s."
6814
6815
#: bzrlib/errors.py:2268
6816
msgid "To use this feature you must upgrade your repository at %(path)s."
6817
msgstr "To use this feature you must upgrade your repository at %(path)s."
6818
6819
#: bzrlib/errors.py:2273
6820
msgid ""
6821
"To use this feature you must upgrade your branch at %(path)s to a format "
6822
"which supports rich roots."
6823
msgstr ""
6824
"To use this feature you must upgrade your branch at %(path)s to a format "
6825
"which supports rich roots."
6826
6827
#: bzrlib/errors.py:2279
6828
msgid "Cannot perform local-only commits on unbound branches."
6829
msgstr "Cannot perform local-only commits on unbound branches."
6830
6831
#: bzrlib/errors.py:2284
6832
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6833
msgstr "The method %(mname)s is not supported on objects of type %(tname)s."
6834
6835
#: bzrlib/errors.py:2305
6836
msgid "Ghost tags not supported by format %(format)r."
6837
msgstr "Ghost tags not supported by format %(format)r."
6838
6839
#: bzrlib/errors.py:2313
6840
msgid "File is binary but should be text."
6841
msgstr "File is binary but should be text."
6842
6843
#: bzrlib/errors.py:2318
6844
msgid "The path %(path)s is not permitted on this platform"
6845
msgstr "The path %(path)s is not permitted on this platform"
6846
6847
#: bzrlib/errors.py:2327
6848
msgid ""
6849
"Testament did not match expected value.\n"
6850
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6851
" {%(measured)s}"
6852
msgstr ""
6853
"Testament did not match expected value.\n"
6854
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6855
" {%(measured)s}"
6856
6857
#: bzrlib/errors.py:2339
6858
msgid "Not a bzr revision-bundle: %(text)r"
6859
msgstr "Not a bzr revision-bundle: %(text)r"
6860
6861
#: bzrlib/errors.py:2348
6862
msgid "Bad bzr revision-bundle: %(text)r"
6863
msgstr "Bad bzr revision-bundle: %(text)r"
6864
6865
#: bzrlib/errors.py:2357
6866
msgid "Malformed bzr revision-bundle header: %(text)r"
6867
msgstr "Malformed bzr revision-bundle header: %(text)r"
6868
6869
#: bzrlib/errors.py:2362
6870
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6871
msgstr "Malformed patches in bzr revision-bundle: %(text)r"
6872
6873
#: bzrlib/errors.py:2367
6874
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6875
msgstr "Malformed footer in bzr revision-bundle: %(text)r"
6876
6877
#: bzrlib/errors.py:2372
6878
msgid "End of line marker was not \\n in bzr revision-bundle"
6879
msgstr "End of line marker was not \\n in bzr revision-bundle"
6880
6881
#: bzrlib/errors.py:2382
6882
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6883
msgstr "Bundle format %(bundle_format)s is incompatible with %(other)s"
6884
6885
#: bzrlib/errors.py:2392
6886
msgid "Root class for inventory serialization errors"
6887
msgstr "Root class for inventory serialisation errors"
6888
6889
#: bzrlib/errors.py:2396
6890
msgid ""
6891
"The inventory was not in the expected format:\n"
6892
" %(msg)s"
6893
msgstr ""
6894
"The inventory was not in the expected format:\n"
6895
" %(msg)s"
6896
6897
#: bzrlib/errors.py:2405
6898
msgid "This operation requires rich root data storage"
6899
msgstr "This operation requires rich root data storage"
6900
6901
#: bzrlib/errors.py:2418
6902
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6903
msgstr "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6904
6905
#: bzrlib/errors.py:2427
6906
msgid ""
6907
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6908
"variable."
6909
msgstr ""
6910
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6911
"variable."
6912
6913
#: bzrlib/errors.py:2434
6914
msgid ""
6915
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6916
"ghost at {%(ghost_revision_id)s}"
6917
msgstr ""
6918
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6919
"ghost at {%(ghost_revision_id)s}"
6920
6921
#: bzrlib/errors.py:2444
6922
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6923
msgstr "Ghost revision {%(revision_id)s} cannot be used here."
6924
6925
#: bzrlib/errors.py:2495
6926
msgid ""
6927
"A merge directive must provide either a bundle or a public branch location."
6928
msgstr ""
6929
"A merge directive must provide either a bundle or a public branch location."
6930
6931
#: bzrlib/errors.py:2502
6932
msgid "Bad merge directive payload %(start)r"
6933
msgstr "Bad merge directive payload %(start)r"
6934
6935
#: bzrlib/errors.py:2512
6936
msgid "Preview patch does not match requested changes."
6937
msgstr "Preview patch does not match requested changes."
6938
6939
#: bzrlib/errors.py:2518
6940
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6941
msgstr "Patch_type was %(patch_type)s, but no patch was supplied."
6942
6943
#: bzrlib/errors.py:2528
6944
msgid ""
6945
"Your branch does not have all of the revisions required in order to merge "
6946
"this merge directive and the target location specified in the merge "
6947
"directive is not a branch: %(location)s."
6948
msgstr ""
6949
"Your branch does not have all of the revisions required in order to merge "
6950
"this merge directive and the target location specified in the merge "
6951
"directive is not a branch: %(location)s."
6952
6953
#: bzrlib/errors.py:2540
6954
msgid "Unsupported entry kind %(kind)s"
6955
msgstr "Unsupported entry kind %(kind)s"
6956
6957
#: bzrlib/errors.py:2548
6958
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6959
msgstr "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6960
6961
#: bzrlib/errors.py:2558
6962
msgid "Subsume target %(other_tree)s needs to be upgraded."
6963
msgstr "Subsume target %(other_tree)s needs to be upgraded."
6964
6965
#: bzrlib/errors.py:2577
6966
msgid "No such tag: %(tag_name)s"
6967
msgstr "No such tag: %(tag_name)s"
6968
6969
#: bzrlib/errors.py:2585
6970
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6971
msgstr ""
6972
"Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6973
6974
#: bzrlib/errors.py:2594
6975
msgid "Tag %(tag_name)s already exists."
6976
msgstr "Tag %(tag_name)s already exists."
6977
6978
#: bzrlib/errors.py:2602
6979
msgid ""
6980
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6981
"bugs\" for more information on this feature."
6982
msgstr ""
6983
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6984
"bugs\" for more information on this feature."
6985
6986
#: bzrlib/errors.py:2612
6987
msgid ""
6988
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6989
msgstr ""
6990
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6991
6992
#: bzrlib/errors.py:2622
6993
msgid ""
6994
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6995
msgstr ""
6996
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6997
6998
#: bzrlib/errors.py:2632
6999
msgid "Invalid line in bugs property: '%(line)s'"
7000
msgstr "Invalid line in bugs property: '%(line)s'"
7001
7002
#: bzrlib/errors.py:2640
7003
msgid "Invalid bug status: '%(status)s'"
7004
msgstr "Invalid bug status: '%(status)s'"
7005
7006
#: bzrlib/errors.py:2648
7007
msgid "Could not understand response from smart server: %(response_tuple)r"
7008
msgstr "Could not understand response from smart server: %(response_tuple)r"
7009
7010
#: bzrlib/errors.py:2687
7011
msgid "Server sent an unexpected error: %(error_tuple)r"
7012
msgstr "Server sent an unexpected error: %(error_tuple)r"
7013
7014
#: bzrlib/errors.py:2706
7015
msgid "Unrecognised container format: %(container_format)r"
7016
msgstr "Unrecognised container format: %(container_format)r"
7017
7018
#: bzrlib/errors.py:2714
7019
msgid "Unexpected end of container stream"
7020
msgstr "Unexpected end of container stream"
7021
7022
#: bzrlib/errors.py:2719
7023
msgid "Unknown record type: %(record_type)r"
7024
msgstr "Unknown record type: %(record_type)r"
7025
7026
#: bzrlib/errors.py:2727
7027
msgid "Invalid record: %(reason)s"
7028
msgstr "Invalid record: %(reason)s"
7029
7030
#: bzrlib/errors.py:2735
7031
msgid "Container has data after end marker: %(excess)r"
7032
msgstr "Container has data after end marker: %(excess)r"
7033
7034
#: bzrlib/errors.py:2743
7035
msgid "Container has multiple records with the same name: %(name)s"
7036
msgstr "Container has multiple records with the same name: %(name)s"
7037
7038
#: bzrlib/errors.py:2756
7039
msgid "Corrupt or incompatible data stream: %(reason)s"
7040
msgstr "Corrupt or incompatible data stream: %(reason)s"
7041
7042
#: bzrlib/errors.py:2764
7043
msgid "SMTP error: %(error)s"
7044
msgstr "SMTP error: %(error)s"
7045
7046
#: bzrlib/errors.py:2772
7047
msgid "No message supplied."
7048
msgstr "No message supplied."
7049
7050
#: bzrlib/errors.py:2777
7051
msgid "No mail-to address (--mail-to) or output (-o) specified."
7052
msgstr "No mail-to address (--mail-to) or output (-o) specified."
7053
7054
#: bzrlib/errors.py:2782
7055
msgid ""
7056
"Unable to find mail client with the following names: "
7057
"%(mail_command_list_string)s"
7058
msgstr ""
7059
"Unable to find mail client with the following names: "
7060
"%(mail_command_list_string)s"
7061
7062
#: bzrlib/errors.py:2792
7063
msgid "SMTP connection to %(host)s refused"
7064
msgstr "SMTP connection to %(host)s refused"
7065
7066
#: bzrlib/errors.py:2801
7067
msgid "Please specify smtp_server. No server at default %(host)s."
7068
msgstr "Please specify smtp_server. No server at default %(host)s."
7069
7070
#: bzrlib/errors.py:2815
7071
msgid ""
7072
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
7073
"reconfigure."
7074
msgstr ""
7075
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
7076
"reconfigure."
7077
7078
#: bzrlib/errors.py:2827
7079
msgid "'%(display_url)s' is already a branch."
7080
msgstr "'%(display_url)s' is already a branch."
7081
7082
#: bzrlib/errors.py:2832
7083
msgid "'%(display_url)s' is already a tree."
7084
msgstr "'%(display_url)s' is already a tree."
7085
7086
#: bzrlib/errors.py:2837
7087
msgid "'%(display_url)s' is already a checkout."
7088
msgstr "'%(display_url)s' is already a checkout."
7089
7090
#: bzrlib/errors.py:2842
7091
msgid "'%(display_url)s' is already a lightweight checkout."
7092
msgstr "'%(display_url)s' is already a lightweight checkout."
7093
7094
#: bzrlib/errors.py:2847
7095
msgid "'%(display_url)s' is already using a shared repository."
7096
msgstr "'%(display_url)s' is already using a shared repository."
7097
7098
#: bzrlib/errors.py:2852
7099
msgid "'%(display_url)s' is already standalone."
7100
msgstr "'%(display_url)s' is already standalone."
7101
7102
#: bzrlib/errors.py:2857
7103
msgid "Shared repository '%(display_url)s' already creates working trees."
7104
msgstr "Shared repository '%(display_url)s' already creates working trees."
7105
7106
#: bzrlib/errors.py:2863
7107
msgid ""
7108
"Shared repository '%(display_url)s' already doesn't create working trees."
7109
msgstr ""
7110
"Shared repository '%(display_url)s' already doesn't create working trees."
7111
7112
#: bzrlib/errors.py:2869
7113
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
7114
msgstr "Requested reconfiguration of '%(display_url)s' is not supported."
7115
7116
#: bzrlib/errors.py:2874
7117
msgid "No location could be found to bind to at %(display_url)s."
7118
msgstr "No location could be found to bind to at %(display_url)s."
7119
7120
#: bzrlib/errors.py:2879
7121
msgid ""
7122
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7123
"status).%(more)s"
7124
msgstr ""
7125
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7126
"status).%(more)s"
7127
7128
#: bzrlib/errors.py:2898
7129
msgid ""
7130
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7131
"list).%(more)s"
7132
msgstr ""
7133
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7134
"list).%(more)s"
7135
7136
#: bzrlib/errors.py:2904
7137
msgid "Variable {%(name)s} is not available."
7138
msgstr "Variable {%(name)s} is not available."
7139
7140
#: bzrlib/errors.py:2912
7141
msgid "No template specified."
7142
msgstr "No template specified."
7143
7144
#: bzrlib/errors.py:2917
7145
msgid "Unable to create symlink %(path_str)son this platform"
7146
msgstr "Unable to create symlink %(path_str)son this platform"
7147
7148
#: bzrlib/errors.py:2932
7149
msgid ""
7150
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7151
"\"original\", \"local\"."
7152
msgstr ""
7153
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7154
"\"original\", \"local\"."
7155
7156
#: bzrlib/errors.py:2966
7157
msgid ""
7158
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
7159
msgstr ""
7160
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
7161
7162
#: bzrlib/errors.py:2978
7163
msgid "The \"%(config_id)s\" configuration does not exist."
7164
msgstr "The \"%(config_id)s\" configuration does not exist."
7165
7166
#: bzrlib/errors.py:2986
7167
msgid "The \"%(option_name)s\" configuration option does not exist."
7168
msgstr "The \"%(option_name)s\" configuration option does not exist."
7169
7170
#: bzrlib/errors.py:2994
7171
msgid "The alias \"%(alias_name)s\" does not exist."
7172
msgstr "The alias \"%(alias_name)s\" does not exist."
7173
7174
#: bzrlib/errors.py:3008
7175
msgid "\"%(alias_name)s\" is not a valid location alias."
7176
msgstr "\"%(alias_name)s\" is not a valid location alias."
7177
7178
#: bzrlib/errors.py:3016
7179
msgid "No %(alias_name)s location assigned."
7180
msgstr "No %(alias_name)s location assigned."
7181
7182
#: bzrlib/errors.py:3024
7183
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
7184
msgstr "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
7185
7186
#: bzrlib/errors.py:3034
7187
msgid "Unknown rules detected: %(unknowns_str)s."
7188
msgstr "Unknown rules detected: %(unknowns_str)s."
7189
7190
#: bzrlib/errors.py:3045
7191
msgid "Tip change rejected: %(msg)s"
7192
msgstr "Tip change rejected: %(msg)s"
7193
7194
#: bzrlib/errors.py:3053
7195
msgid "Shelf corrupt."
7196
msgstr "Shelf corrupt."
7197
7198
#: bzrlib/errors.py:3058
7199
msgid "Corruption while decompressing repository file%(orig_error)s"
7200
msgstr "Corruption while decompressing repository file%(orig_error)s"
7201
7202
#: bzrlib/errors.py:3070
7203
msgid "No changes are shelved with id \"%(shelf_id)d\"."
7204
msgstr "No changes are shelved with id \"%(shelf_id)d\"."
7205
7206
#: bzrlib/errors.py:3078
7207
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
7208
msgstr "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
7209
7210
#: bzrlib/errors.py:3086
7211
msgid ""
7212
"An attempt to access a url outside the server jail was made: '%(url)s'."
7213
msgstr ""
7214
"An attempt to access a url outside the server jail was made: '%(url)s'."
7215
7216
#: bzrlib/errors.py:3094
7217
msgid "The user aborted the operation."
7218
msgstr "The user aborted the operation."
7219
7220
#: bzrlib/errors.py:3099
7221
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
7222
msgstr "Branching '%(url)s'(%(format)s) must create a working tree."
7223
7224
#: bzrlib/errors.py:3109
7225
msgid "No such view: %(view_name)s."
7226
msgstr "No such view: %(view_name)s."
7227
7228
#: bzrlib/errors.py:3119
7229
msgid ""
7230
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7231
"to a later format."
7232
msgstr ""
7233
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7234
"to a later format."
7235
7236
#: bzrlib/errors.py:3128
7237
msgid ""
7238
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
7239
msgstr ""
7240
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
7241
7242
#: bzrlib/errors.py:3195
7243
msgid "%(bzrdir)r does not support co-located branches."
7244
msgstr "%(bzrdir)r does not support co-located branches."
7245
7246
#: bzrlib/errors.py:3201
7247
msgid ""
7248
"Unable to determine your name.\n"
7249
"Please, set your name with the 'whoami' command.\n"
7250
"E.g. bzr whoami \"Your Name <name@example.com>\""
7251
msgstr ""
7252
"Unable to determine your name.\n"
7253
"Please, set your name with the 'whoami' command.\n"
7254
"E.g. bzr whoami \"Your Name <name@example.com>\""
7255
7256
#: bzrlib/errors.py:3210
7257
msgid "Invalid pattern(s) found. %(msg)s"
7258
msgstr "Invalid pattern(s) found. %(msg)s"
7259
7260
#: bzrlib/errors.py:3218
7261
msgid ""
7262
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
7263
"unbind` to fix."
7264
msgstr ""
7265
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
7266
"unbind` to fix."
7267
7268
#: bzrlib/errors.py:3229
7269
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
7270
msgstr "Loop involving %(refs)r while expanding \"%(string)s\"."
7271
7272
#: bzrlib/errors.py:3238
7273
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
7274
msgstr "Option %(name)s is not defined while expanding \"%(string)s\"."
7275
7276
#: bzrlib/errors.py:3247
7277
msgid ""
7278
"No compatible object available for operations from %(source)r to %(target)r."
7279
msgstr ""
7280
"No compatible object available for operations from %(source)r to %(target)r."
7281
7282
#: bzrlib/errors.py:3257
7283
msgid ""
7284
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7285
"%(arguments)s."
7286
msgstr ""
7287
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7288
"%(arguments)s."
7289
7290
#: bzrlib/errors.py:3267
7291
msgid ""
7292
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
7293
"format %(format)r"
7294
msgstr ""
7295
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
7296
"format %(format)r"
7297
7298
#: bzrlib/errors.py:3279
7299
msgid ""
7300
"Missing feature %(feature)s not provided by this version of Bazaar or any "
7301
"plugin."
7302
msgstr ""
7303
"Missing feature %(feature)s not provided by this version of Bazaar or any "
7304
"plugin."
7305
7306
#: bzrlib/errors.py:3292
7307
msgid "Binary files section encountered."
7308
msgstr "Binary files section encountered."
7309
7310
#: bzrlib/errors.py:3300
7311
msgid ""
7312
"Malformed patch header. %(desc)s\n"
7313
"%(line)r"
7314
msgstr ""
7315
"Malformed patch header. %(desc)s\n"
7316
"%(line)r"
7317
7318
#: bzrlib/errors.py:3309
7319
msgid ""
7320
"Malformed hunk header. %(desc)s\n"
7321
"%(line)r"
7322
msgstr ""
7323
"Malformed hunk header. %(desc)s\n"
7324
"%(line)r"
7325
7326
#: bzrlib/errors.py:3318
7327
msgid ""
7328
"Malformed line. %(desc)s\n"
7329
"%(line)r"
7330
msgstr ""
7331
"Malformed line. %(desc)s\n"
7332
"%(line)r"
7333
7334
#: bzrlib/errors.py:3328
7335
msgid ""
7336
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
7337
"but patch says it should be \"%(patch_line)s\""
7338
msgstr ""
7339
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
7340
"but patch says it should be \"%(patch_line)s\""
7341
7342
#: bzrlib/errors.py:3339
7343
msgid "The feature %(feature)s has already been registered."
7344
msgstr "The feature %(feature)s has already been registered."
7345
7346
#: bzrlib/export_pot.py:252
7347
#, python-format
7348
msgid "Exporting messages from builtin command: %s"
7349
msgstr "Exporting messages from builtin command: %s"
7350
7351
#: bzrlib/export_pot.py:271
7352
msgid "Exporting messages from plugin command: {0} in {1}"
7353
msgstr "Exporting messages from plugin command: {0} in {1}"
7354
7355
#: bzrlib/export_pot.py:292
7356
#, python-format
7357
msgid "Exporting message from error: %s"
7358
msgstr "Exporting message from error: %s"
7359
7360
#: bzrlib/fetch.py:98
7361
msgid "Finding revisions"
7362
msgstr "Finding revisions"
7363
7364
#: bzrlib/fetch.py:103
7365
msgid "Fetching revisions"
7366
msgstr "Fetching revisions"
7367
7368
#: bzrlib/foreign.py:262
7369
msgid "Push into a different VCS without any custom bzr metadata."
7370
msgstr "Push into a different VCS without any custom bzr metadata."
7371
7372
#: bzrlib/foreign.py:264
7373
msgid ""
7374
"This will afterwards rebase the local branch on the remote\n"
7375
"branch unless the --no-rebase option is used, in which case \n"
7376
"the two branches will be out of sync after the push. "
7377
msgstr ""
7378
"This will afterwards rebase the local branch on the remote\n"
7379
"branch unless the --no-rebase option is used, in which case \n"
7380
"the two branches will be out of sync after the push. "
7381
7382
#: bzrlib/foreign.py:277
7383
msgid "Do not rebase after push."
7384
msgstr "Do not rebase after push."
7385
7386
#: bzrlib/foreign.py:311
7387
#, python-format
7388
msgid "Using saved location: %s\n"
7389
msgstr "Using saved location: %s\n"
7390
7391
#: bzrlib/foreign.py:321
7392
msgid ""
7393
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
7394
"regular push."
7395
msgstr ""
7396
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
7397
"regular push."
7398
7399
#: bzrlib/gpg.py:366
7400
msgid "No GnuPG key results for pattern: {0}"
7401
msgstr "No GnuPG key results for pattern: {0}"
7402
7403
#: bzrlib/gpg.py:439
7404
msgid "{0} commits with valid signatures"
7405
msgstr "{0} commits with valid signatures"
7406
7407
#: bzrlib/gpg.py:445
7408
msgid "{0} commit with unknown key"
7409
msgid_plural "{0} commits with unknown keys"
7410
msgstr[0] "{0} commit with unknown key"
7411
msgstr[1] "{0} commits with unknown keys"
7412
7413
#: bzrlib/gpg.py:453
7414
msgid "{0} commit not valid"
7415
msgid_plural "{0} commits not valid"
7416
msgstr[0] "{0} commit not valid"
7417
msgstr[1] "{0} commits not valid"
7418
7419
#: bzrlib/gpg.py:461
7420
msgid "{0} commit not signed"
7421
msgid_plural "{0} commits not signed"
7422
msgstr[0] "{0} commit not signed"
7423
msgstr[1] "{0} commits not signed"
7424
7425
#: bzrlib/gpg.py:469
7426
msgid "{0} commit with key now expired"
7427
msgid_plural "{0} commits with key now expired"
7428
msgstr[0] "{0} commit with key now expired"
7429
msgstr[1] "{0} commits with key now expired"
7430
7431
#: bzrlib/gpg.py:489
7432
msgid "{0} commit by author {1} with key {2} now expired"
7433
msgid_plural "{0} commits by author {1} with key {2} now expired"
7434
msgstr[0] "{0} commit by author {1} with key {2} now expired"
7435
msgstr[1] "{0} commits by author {1} with key {2} now expired"
7436
7437
#: bzrlib/gpg.py:505
7438
msgid "{0} signed {1} commit"
7439
msgid_plural "{0} signed {1} commits"
7440
msgstr[0] "{0} signed {1} commit"
7441
msgstr[1] "{0} signed {1} commits"
7442
7443
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
7444
msgid "{0} commit by author {1}"
7445
msgid_plural "{0} commits by author {1}"
7446
msgstr[0] "{0} commit by author {1}"
7447
msgstr[1] "{0} commits by author {1}"
7448
7449
#: bzrlib/gpg.py:554
7450
msgid "Unknown key {0} signed {1} commit"
7451
msgid_plural "Unknown key {0} signed {1} commits"
7452
msgstr[0] "Unknown key {0} signed {1} commit"
7453
msgstr[1] "Unknown key {0} signed {1} commits"
7454
7455
#: bzrlib/groupcompress.py:1739
7456
#, python-format
7457
msgid "Insert claimed random_id=True, but then inserted %r two times"
7458
msgstr "Insert claimed random_id=True, but then inserted %r two times"
7459
7460
#: bzrlib/hooks.py:313
7461
#, python-format
7462
msgid "Introduced in: %s"
7463
msgstr "Introduced in: %s"
7464
7465
#: bzrlib/hooks.py:316
7466
#, python-format
7467
msgid "Deprecated in: %s"
7468
msgstr "Deprecated in: %s"
7469
7470
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
7471
msgid "Walking content"
7472
msgstr "Walking content"
7473
7474
#: bzrlib/knit.py:3330
7475
msgid "annotating"
7476
msgstr "annotating"
7477
7478
#: bzrlib/lock.py:548
7479
msgid "{0!r} was {1} locked again"
7480
msgstr "{0!r} was {1} locked again"
7481
7482
#: bzrlib/lockdir.py:321
7483
#, python-format
7484
msgid "error removing pending lock: %s"
7485
msgstr "error removing pending lock: %s"
7486
7487
#: bzrlib/lockdir.py:616
7488
msgid "Unable to obtain"
7489
msgstr "Unable to obtain"
7490
7491
#: bzrlib/lockdir.py:618
7492
msgid "Lock owner changed for"
7493
msgstr "Lock owner changed for"
7494
7495
#: bzrlib/lockdir.py:620
7496
msgid "{0} lock {1} {2}."
7497
msgstr "{0} lock {1} {2}."
7498
7499
#: bzrlib/lockdir.py:627
7500
#, python-format
7501
msgid "Will continue to try until %s, unless you press Ctrl-C."
7502
msgstr "Will continue to try until %s, unless you press Ctrl-C."
7503
7504
#: bzrlib/lockdir.py:629
7505
msgid "See \"bzr help break-lock\" for more."
7506
msgstr "See \"bzr help break-lock\" for more."
7507
7508
#: bzrlib/lockdir.py:739
7509
#, python-format
7510
msgid ""
7511
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
7512
msgstr ""
7513
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
7514
7515
#: bzrlib/log.py:563
7516
msgid "--exclude-common-ancestry requires two different revisions"
7517
msgstr "--exclude-common-ancestry requires two different revisions"
7518
7519
#: bzrlib/log.py:565
7520
#, python-format
7521
msgid "invalid direction %r"
7522
msgstr "invalid direction %r"
7523
7524
#: bzrlib/log.py:653
7525
msgid "Start revision not found in history of end revision."
7526
msgstr "Start revision not found in history of end revision."
7527
7528
#: bzrlib/log.py:1071 bzrlib/log.py:1129
7529
msgid "Logging revision 0 is invalid."
7530
msgstr "Logging revision 0 is invalid."
7531
7532
#: bzrlib/log.py:1073 bzrlib/log.py:1131
7533
msgid "Start revision must be older than the end revision."
7534
msgstr "Start revision must be older than the end revision."
7535
7536
#: bzrlib/log.py:1818
7537
#, python-format
7538
msgid "unknown log formatter: %r"
7539
msgstr "unknown log formatter: %r"
7540
7541
#: bzrlib/log.py:2114
7542
msgid "fixes bug"
7543
msgid_plural "fixes bugs"
7544
msgstr[0] "fixes bug"
7545
msgstr[1] "fixes bugs"
7546
7547
#: bzrlib/merge.py:689
7548
msgid "All changes applied successfully."
7549
msgstr "All changes applied successfully."
7550
7551
#: bzrlib/merge.py:691
7552
#, python-format
7553
msgid "%d conflicts encountered."
7554
msgstr "%d conflicts encountered."
7555
7556
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
7557
msgid "Preparing file merge"
7558
msgstr "Preparing file merge"
7559
7560
#: bzrlib/multiparent.py:426
7561
msgid "Importing revisions"
7562
msgstr "Importing revisions"
7563
7564
#: bzrlib/option.py:526
7565
msgid "Show help message."
7566
msgstr "Show help message."
7567
7568
#: bzrlib/option.py:528
7569
msgid "Only display errors and warnings."
7570
msgstr "Only display errors and warnings."
7571
7572
#: bzrlib/option.py:531
7573
msgid "Show usage message and options."
7574
msgstr "Show usage message and options."
7575
7576
#: bzrlib/option.py:533
7577
msgid "Display more information."
7578
msgstr "Display more information."
7579
7580
#: bzrlib/option.py:541
7581
msgid ""
7582
"Select changes introduced by the specified revision. See also \"help "
7583
"revisionspec\"."
7584
msgstr ""
7585
"Select changes introduced by the specified revision. See also \"help "
7586
"revisionspec\"."
7587
7588
#: bzrlib/option.py:543
7589
msgid "Branch to operate on, instead of working directory."
7590
msgstr "Branch to operate on, instead of working directory."
7591
7592
#: bzrlib/option.py:545
7593
msgid "Detailed log format."
7594
msgstr "Detailed log format."
7595
7596
#: bzrlib/option.py:545
7597
msgid "Format used by GNU ChangeLog files."
7598
msgstr "Format used by GNU ChangeLog files."
7599
7600
#: bzrlib/option.py:545
7601
msgid "Log format with one line per revision."
7602
msgstr "Log format with one line per revision."
7603
7604
#: bzrlib/option.py:545
7605
msgid "Moderately short log format."
7606
msgstr "Moderately short log format."
7607
7608
#: bzrlib/option.py:545
7609
msgid "Use specified log format."
7610
msgstr "Use specified log format."
7611
7612
#: bzrlib/option.py:547
7613
msgid "Log format"
7614
msgstr "Log format"
7615
7616
#: bzrlib/option.py:549
7617
msgid "LCA-newness merge."
7618
msgstr "LCA-newness merge."
7619
7620
#: bzrlib/option.py:549
7621
msgid "Merge using external diff3."
7622
msgstr "Merge using external diff3."
7623
7624
#: bzrlib/option.py:549
7625
msgid "Native diff3-style merge."
7626
msgstr "Native diff3-style merge."
7627
7628
#: bzrlib/option.py:549
7629
msgid "Select a particular merge algorithm."
7630
msgstr "Select a particular merge algorithm."
7631
7632
#: bzrlib/option.py:549
7633
msgid "Weave-based merge."
7634
msgstr "Weave-based merge."
7635
7636
#: bzrlib/option.py:551
7637
msgid "Merge algorithm"
7638
msgstr "Merge algorithm"
7639
7640
#: bzrlib/option.py:554
7641
msgid "Message string."
7642
msgstr "Message string."
7643
7644
#: bzrlib/option.py:556
7645
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
7646
msgstr "Use an ASCII NUL (\\0) separator rather than a newline."
7647
7648
#: bzrlib/option.py:558
7649
msgid "Ignore differences between branches and overwrite unconditionally."
7650
msgstr "Ignore differences between branches and overwrite unconditionally."
7651
7652
#: bzrlib/option.py:560
7653
msgid "Remember the specified location as a default."
7654
msgstr "Remember the specified location as a default."
7655
7656
#: bzrlib/option.py:562
7657
msgid "Reprocess to reduce spurious conflicts."
7658
msgstr "Reprocess to reduce spurious conflicts."
7659
7660
#: bzrlib/option.py:566
7661
msgid "See \"help revisionspec\" for details."
7662
msgstr "See \"help revisionspec\" for details."
7663
7664
#: bzrlib/option.py:568
7665
msgid "Show internal object ids."
7666
msgstr "Show internal object ids."
7667
7668
#: bzrlib/option.py:571
7669
msgid "Display timezone as local, original, or utc."
7670
msgstr "Display timezone as local, original, or utc."
7671
7672
#: bzrlib/osutils.py:100
7673
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
7674
msgstr "Parameter {0!r} encoding is unsupported by {1} application locale."
7675
7676
#: bzrlib/osutils.py:220
7677
msgid "lstat/stat of ({0!r}): {1!r}"
7678
msgstr "lstat/stat of ({0!r}): {1!r}"
7679
7680
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
7681
#, python-format
7682
msgid "sorry, %r not allowed in path"
7683
msgstr "sorry, %r not allowed in path"
7684
7685
#: bzrlib/osutils.py:1259
7686
#, python-format
7687
msgid "%r is too short to calculate a relative path"
7688
msgstr "%r is too short to calculate a relative path"
7689
7690
#: bzrlib/plugin.py:143
7691
#, python-format
7692
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7693
msgstr "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7694
7695
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7696
msgid "Enable completions for the selected plugin (default: all plugins)"
7697
msgstr "Enable completions for the selected plugin (default: all plugins)"
7698
7699
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7700
msgid "Generate a shell function for bash command line completion."
7701
msgstr "Generate a shell function for bash command line completion."
7702
7703
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7704
msgid ""
7705
"This command generates a shell function which can be used by bash to\n"
7706
"automatically complete the currently typed command when the user presses\n"
7707
"the completion key (usually tab)."
7708
msgstr ""
7709
"This command generates a shell function which can be used by bash to\n"
7710
"automatically complete the currently typed command when the user presses\n"
7711
"the completion key (usually tab)."
7712
7713
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7714
msgid ""
7715
"Commonly used like this:\n"
7716
" eval \"`bzr bash-completion`\""
7717
msgstr ""
7718
"Commonly used like this:\n"
7719
" eval \"`bzr bash-completion`\""
7720
7721
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7722
msgid "Name of the generated function (default: _bzr)"
7723
msgstr "Name of the generated function (default: _bzr)"
7724
7725
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7726
msgid "Generate only the shell function, don't enable it"
7727
msgstr "Generate only the shell function, don't enable it"
7728
7729
#: bzrlib/plugins/launchpad/account.py:66
7730
msgid "Setting ssh/sftp usernames for launchpad.net."
7731
msgstr "Setting ssh/sftp usernames for launchpad.net."
7732
7733
#: bzrlib/plugins/launchpad/cmds.py:44
7734
msgid "Register a branch with launchpad.net."
7735
msgstr "Register a branch with launchpad.net."
7736
7737
#: bzrlib/plugins/launchpad/cmds.py:46
7738
msgid ""
7739
"This command lists a bzr branch in the directory of branches on\n"
7740
"launchpad.net. Registration allows the branch to be associated with\n"
7741
"bugs or specifications."
7742
msgstr ""
7743
"This command lists a bzr branch in the directory of branches on\n"
7744
"launchpad.net. Registration allows the branch to be associated with\n"
7745
"bugs or specifications."
7746
7747
#: bzrlib/plugins/launchpad/cmds.py:50
7748
msgid ""
7749
"Before using this command you must register the project to which the\n"
7750
"branch belongs, and create an account for yourself on launchpad.net."
7751
msgstr ""
7752
"Before using this command you must register the project to which the\n"
7753
"branch belongs, and create an account for yourself on launchpad.net."
7754
7755
#: bzrlib/plugins/launchpad/cmds.py:53
7756
msgid ""
7757
"arguments:\n"
7758
" public_url: The publicly visible url for the branch to register.\n"
7759
" This must be an http or https url (which Launchpad can read\n"
7760
" from to access the branch). Local file urls, SFTP urls, and\n"
7761
" bzr+ssh urls will not work.\n"
7762
" If no public_url is provided, bzr will use the configured\n"
7763
" public_url if there is one for the current branch, and\n"
7764
" otherwise error."
7765
msgstr ""
7766
"arguments:\n"
7767
" public_url: The publicly visible url for the branch to register.\n"
7768
" This must be an http or https url (which Launchpad can read\n"
7769
" from to access the branch). Local file urls, SFTP urls, and\n"
7770
" bzr+ssh urls will not work.\n"
7771
" If no public_url is provided, bzr will use the configured\n"
7772
" public_url if there is one for the current branch, and\n"
7773
" otherwise error."
7774
7775
#: bzrlib/plugins/launchpad/cmds.py:62
7776
msgid ""
7777
"example:\n"
7778
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7779
" --project fooproject"
7780
msgstr ""
7781
"example:\n"
7782
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7783
" --project fooproject"
7784
7785
#: bzrlib/plugins/launchpad/cmds.py:69
7786
msgid "Launchpad project short name to associate with the branch."
7787
msgstr "Launchpad project short name to associate with the branch."
7788
7789
#: bzrlib/plugins/launchpad/cmds.py:76
7790
msgid ""
7791
"Short name for the branch; by default taken from the last component of the "
7792
"url."
7793
msgstr ""
7794
"Short name for the branch; by default taken from the last component of the "
7795
"url."
7796
7797
#: bzrlib/plugins/launchpad/cmds.py:80
7798
msgid "One-sentence description of the branch."
7799
msgstr "One-sentence description of the branch."
7800
7801
#: bzrlib/plugins/launchpad/cmds.py:83
7802
msgid "Longer description of the purpose or contents of the branch."
7803
msgstr "Longer description of the purpose or contents of the branch."
7804
7805
#: bzrlib/plugins/launchpad/cmds.py:86
7806
msgid "Branch author's email address, if not yourself."
7807
msgstr "Branch author's email address, if not yourself."
7808
7809
#: bzrlib/plugins/launchpad/cmds.py:89
7810
msgid "The bug this branch fixes."
7811
msgstr "The bug this branch fixes."
7812
7813
#: bzrlib/plugins/launchpad/cmds.py:92
7814
msgid "Prepare the request but don't actually send it."
7815
msgstr "Prepare the request but don't actually send it."
7816
7817
#: bzrlib/plugins/launchpad/cmds.py:114
7818
msgid ""
7819
"register-branch requires a public branch url - see bzr help register-branch."
7820
msgstr ""
7821
"register-branch requires a public branch url - see bzr help register-branch."
7822
7823
#: bzrlib/plugins/launchpad/cmds.py:122
7824
msgid "--product is deprecated; please use --project."
7825
msgstr "--product is deprecated; please use --project."
7826
7827
#: bzrlib/plugins/launchpad/cmds.py:152
7828
msgid "Open a Launchpad branch page in your web browser."
7829
msgstr "Open a Launchpad branch page in your web browser."
7830
7831
#: bzrlib/plugins/launchpad/cmds.py:157
7832
msgid "Do not actually open the browser. Just say the URL we would use."
7833
msgstr "Do not actually open the browser. Just say the URL we would use."
7834
7835
#: bzrlib/plugins/launchpad/cmds.py:192
7836
#, python-format
7837
msgid "Opening %s in web browser"
7838
msgstr "Opening %s in web browser"
7839
7840
#: bzrlib/plugins/launchpad/cmds.py:200
7841
msgid "Show or set the Launchpad user ID."
7842
msgstr "Show or set the Launchpad user ID."
7843
7844
#: bzrlib/plugins/launchpad/cmds.py:202
7845
msgid ""
7846
"When communicating with Launchpad, some commands need to know your\n"
7847
"Launchpad user ID. This command can be used to set or show the\n"
7848
"user ID that Bazaar will use for such communication."
7849
msgstr ""
7850
"When communicating with Launchpad, some commands need to know your\n"
7851
"Launchpad user ID. This command can be used to set or show the\n"
7852
"user ID that Bazaar will use for such communication."
7853
7854
#: bzrlib/plugins/launchpad/cmds.py:206
7855
msgid ""
7856
":Examples:\n"
7857
" Show the Launchpad ID of the current user::"
7858
msgstr ""
7859
":Examples:\n"
7860
" Show the Launchpad ID of the current user::"
7861
7862
#: bzrlib/plugins/launchpad/cmds.py:209
7863
msgid " bzr launchpad-login"
7864
msgstr " bzr launchpad-login"
7865
7866
#: bzrlib/plugins/launchpad/cmds.py:211
7867
msgid " Set the Launchpad ID of the current user to 'bob'::"
7868
msgstr " Set the Launchpad ID of the current user to 'bob'::"
7869
7870
#: bzrlib/plugins/launchpad/cmds.py:213
7871
msgid " bzr launchpad-login bob"
7872
msgstr " bzr launchpad-login bob"
7873
7874
#: bzrlib/plugins/launchpad/cmds.py:220
7875
msgid "Don't check that the user name is valid."
7876
msgstr "Don't check that the user name is valid."
7877
7878
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7879
msgid "Launchpad user ID exists and has SSH keys.\n"
7880
msgstr "Launchpad user ID exists and has SSH keys.\n"
7881
7882
#: bzrlib/plugins/launchpad/cmds.py:238
7883
msgid "No Launchpad user ID configured.\n"
7884
msgstr "No Launchpad user ID configured.\n"
7885
7886
#: bzrlib/plugins/launchpad/cmds.py:249
7887
#, python-format
7888
msgid "Launchpad user ID set to '%s'.\n"
7889
msgstr "Launchpad user ID set to '%s'.\n"
7890
7891
#: bzrlib/plugins/launchpad/cmds.py:255
7892
msgid "Ask Launchpad to mirror a branch now."
7893
msgstr "Ask Launchpad to mirror a branch now."
7894
7895
#: bzrlib/plugins/launchpad/cmds.py:272
7896
msgid "Propose merging a branch on Launchpad."
7897
msgstr "Propose merging a branch on Launchpad."
7898
7899
#: bzrlib/plugins/launchpad/cmds.py:274
7900
msgid ""
7901
"This will open your usual editor to provide the initial comment. When it\n"
7902
"has created the proposal, it will open it in your default web browser."
7903
msgstr ""
7904
"This will open your usual editor to provide the initial comment. When it\n"
7905
"has created the proposal, it will open it in your default web browser."
7906
7907
#: bzrlib/plugins/launchpad/cmds.py:277
7908
msgid ""
7909
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7910
"is not supplied, the remembered submit branch will be used. If no submit\n"
7911
"branch is remembered, the development focus will be used."
7912
msgstr ""
7913
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7914
"is not supplied, the remembered submit branch will be used. If no submit\n"
7915
"branch is remembered, the development focus will be used."
7916
7917
#: bzrlib/plugins/launchpad/cmds.py:281
7918
msgid ""
7919
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7920
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7921
"The parameter the launchpad account name of the desired reviewer. This\n"
7922
"may optionally be followed by '=' and the review type. For example:"
7923
msgstr ""
7924
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7925
"the merge proposal. This can be overridden by specifying --review (-R).\n"
7926
"The parameter the launchpad account name of the desired reviewer. This\n"
7927
"may optionally be followed by '=' and the review type. For example:"
7928
7929
#: bzrlib/plugins/launchpad/cmds.py:286
7930
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7931
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
7932
7933
#: bzrlib/plugins/launchpad/cmds.py:288
7934
msgid ""
7935
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7936
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7937
msgstr ""
7938
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7939
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7940
7941
#: bzrlib/plugins/launchpad/cmds.py:293
7942
msgid "Propose the merge on staging."
7943
msgstr "Propose the merge on staging."
7944
7945
#: bzrlib/plugins/launchpad/cmds.py:295
7946
msgid "Commit message."
7947
msgstr "Commit message."
7948
7949
#: bzrlib/plugins/launchpad/cmds.py:297
7950
msgid "Mark the proposal as approved immediately."
7951
msgstr "Mark the proposal as approved immediately."
7952
7953
#: bzrlib/plugins/launchpad/cmds.py:298
7954
msgid "The bug this proposal fixes."
7955
msgstr "The bug this proposal fixes."
7956
7957
#: bzrlib/plugins/launchpad/cmds.py:300
7958
msgid "Requested reviewer and optional type."
7959
msgstr "Requested reviewer and optional type."
7960
7961
#: bzrlib/plugins/launchpad/cmds.py:335
7962
msgid "Find the proposal to merge this revision."
7963
msgstr "Find the proposal to merge this revision."
7964
7965
#: bzrlib/plugins/launchpad/cmds.py:337
7966
msgid ""
7967
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7968
"This works only if the selected branch was the merge proposal target, and\n"
7969
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7970
"are opened in a web browser."
7971
msgstr ""
7972
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7973
"This works only if the selected branch was the merge proposal target, and\n"
7974
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7975
"are opened in a web browser."
7976
7977
#: bzrlib/plugins/launchpad/cmds.py:342
7978
msgid ""
7979
"Any revision involved in the merge may be specified-- the revision in\n"
7980
"which the merge was performed, or one of the revisions that was merged."
7981
msgstr ""
7982
"Any revision involved in the merge may be specified-- the revision in\n"
7983
"which the merge was performed, or one of the revisions that was merged."
7984
7985
#: bzrlib/plugins/launchpad/cmds.py:345
7986
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7987
msgstr "So, to find the merge proposal that reviewed line 1 of README::"
7988
7989
#: bzrlib/plugins/launchpad/cmds.py:347
7990
msgid " bzr lp-find-proposal -r annotate:README:1"
7991
msgstr " bzr lp-find-proposal -r annotate:README:1"
7992
7993
#: bzrlib/plugins/launchpad/cmds.py:363
7994
msgid "No review found."
7995
msgstr "No review found."
7996
7997
#: bzrlib/plugins/launchpad/cmds.py:364
7998
#, python-format
7999
msgid "%d proposals(s) found."
8000
msgstr "%d proposals(s) found."
8001
8002
#: bzrlib/plugins/launchpad/cmds.py:374
8003
msgid "Finding revision-id"
8004
msgstr "Finding revision-id"
8005
8006
#: bzrlib/plugins/launchpad/cmds.py:381
8007
msgid "Finding merge"
8008
msgstr "Finding merge"
8009
8010
#: bzrlib/plugins/launchpad/cmds.py:386
8011
msgid "Finding revno"
8012
msgstr "Finding revno"
8013
8014
#: bzrlib/plugins/launchpad/cmds.py:392
8015
msgid "Finding Launchpad branch"
8016
msgstr "Finding Launchpad branch"
8017
8018
#: bzrlib/plugins/launchpad/cmds.py:395
8019
msgid "Finding proposals"
8020
msgstr "Finding proposals"
8021
8022
#: bzrlib/plugins/launchpad/lp_api.py:241
8023
#: bzrlib/plugins/launchpad/lp_api.py:246
8024
#, python-format
8025
msgid "%s is not registered on Launchpad"
8026
msgstr "%s is not registered on Launchpad"
8027
8028
#: bzrlib/plugins/launchpad/lp_api.py:256
8029
#, python-format
8030
msgid "%s has no development focus."
8031
msgstr "%s has no development focus."
8032
8033
#: bzrlib/plugins/launchpad/lp_api.py:261
8034
#, python-format
8035
msgid "development focus %s has no branch."
8036
msgstr "development focus %s has no branch."
8037
8038
#: bzrlib/plugins/launchpad/lp_api.py:266
8039
#, python-format
8040
msgid "source package %s has no branch."
8041
msgstr "source package %s has no branch."
8042
8043
#: bzrlib/plugins/launchpad/lp_api.py:270
8044
#, python-format
8045
msgid "%s has no associated product or source package."
8046
msgstr "%s has no associated product or source package."
8047
8048
#: bzrlib/plugins/launchpad/lp_api.py:282
8049
#, python-format
8050
msgid "%s is already up-to-date."
8051
msgstr "%s is already up-to-date."
8052
8053
#: bzrlib/plugins/launchpad/lp_api.py:289
8054
#, python-format
8055
msgid "Pushing to %s"
8056
msgstr "Pushing to %s"
8057
8058
#: bzrlib/plugins/launchpad/lp_directory.py:170
8059
msgid ""
8060
"resolution for {0}\n"
8061
" local: {1}\n"
8062
" remote: {2}"
8063
msgstr ""
8064
"resolution for {0}\n"
8065
" local: {1}\n"
8066
" remote: {2}"
8067
8068
#: bzrlib/plugins/launchpad/lp_propose.py:150
8069
#, python-format
8070
msgid "There is already a branch merge proposal: %s"
8071
msgstr "There is already a branch merge proposal: %s"
8072
8073
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
8074
msgid "pb parameter to convert() is deprecated"
8075
msgstr "pb parameter to convert() is deprecated"
8076
8077
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
8078
msgid "starting upgrade from format 4 to 5"
8079
msgstr "starting upgrade from format 4 to 5"
8080
8081
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
8082
msgid "note: upgrade may be faster if all store files are ungzipped first"
8083
msgstr "note: upgrade may be faster if all store files are ungzipped first"
8084
8085
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
8086
msgid "converting revision"
8087
msgstr "converting revision"
8088
8089
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
8090
msgid "upgraded to weaves:"
8091
msgstr "upgraded to weaves:"
8092
8093
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
8094
#, python-format
8095
msgid "%6d revisions and inventories"
8096
msgstr "%6d revisions and inventories"
8097
8098
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
8099
#, python-format
8100
msgid "%6d revisions not present"
8101
msgstr "%6d revisions not present"
8102
8103
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
8104
#, python-format
8105
msgid "%6d texts"
8106
msgstr "%6d texts"
8107
8108
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
8109
msgid "writing weave"
8110
msgstr "writing weave"
8111
8112
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
8113
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
8114
msgid "inventory"
8115
msgstr "inventory"
8116
8117
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
8118
msgid "write revision"
8119
msgstr "write revision"
8120
8121
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
8122
msgid "loading revision"
8123
msgstr "loading revision"
8124
8125
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
8126
#, python-format
8127
msgid "revision {%s} not present in branch; will be converted as a ghost"
8128
msgstr "revision {%s} not present in branch; will be converted as a ghost"
8129
8130
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
8131
msgid "starting upgrade from format 5 to 6"
8132
msgstr "starting upgrade from format 5 to 6"
8133
8134
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
8135
#, python-format
8136
msgid "adding prefixes to %s"
8137
msgstr "adding prefixes to %s"
8138
8139
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
8140
msgid "starting upgrade from format 6 to metadir"
8141
msgstr "starting upgrade from format 6 to metadir"
8142
8143
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
8144
msgid "Removing ancestry.weave"
8145
msgstr "Removing ancestry.weave"
8146
8147
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
8148
msgid "Finding branch files"
8149
msgstr "Finding branch files"
8150
8151
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
8152
msgid "Upgrading repository"
8153
msgstr "Upgrading repository"
8154
8155
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
8156
msgid "Upgrading branch"
8157
msgstr "Upgrading branch"
8158
8159
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
8160
msgid "No working tree."
8161
msgstr "No working tree."
8162
8163
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
8164
msgid "Upgrading working tree"
8165
msgstr "Upgrading working tree"
8166
8167
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
8168
#, python-format
8169
msgid "Make %s lock"
8170
msgstr "Make %s lock"
8171
8172
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
8173
#, python-format
8174
msgid "Moving %s"
8175
msgstr "Moving %s"
8176
8177
#: bzrlib/push.py:56
8178
msgid "Created new branch."
8179
msgstr "Created new branch."
8180
8181
#: bzrlib/push.py:97
8182
#, python-format
8183
msgid ""
8184
"Target directory %s already contains a .bzr directory, but it is not valid."
8185
msgstr ""
8186
"Target directory %s already contains a .bzr directory, but it is not valid."
8187
8188
#: bzrlib/push.py:101
8189
#, python-format
8190
msgid ""
8191
"Target directory %s already exists, but does not have a .bzr directory. "
8192
"Supply --use-existing-dir to push there anyway."
8193
msgstr ""
8194
"Target directory %s already exists, but does not have a .bzr directory. "
8195
"Supply --use-existing-dir to push there anyway."
8196
8197
#: bzrlib/push.py:122
8198
#, python-format
8199
msgid "Too many redirections trying to make %s."
8200
msgstr "Too many redirections trying to make %s."
8201
8202
#: bzrlib/push.py:148
8203
msgid ""
8204
"These branches have diverged. See \"bzr help diverged-branches\" for more "
8205
"information."
8206
msgstr ""
8207
"These branches have diverged. See \"bzr help diverged-branches\" for more "
8208
"information."
8209
8210
#: bzrlib/push.py:152
8211
#, python-format
8212
msgid ""
8213
"It is not possible to losslessly push to %s. You may want to use dpush "
8214
"instead."
8215
msgstr ""
8216
"It is not possible to losslessly push to %s. You may want to use dpush "
8217
"instead."
8218
8219
#: bzrlib/push.py:158
8220
#, python-format
8221
msgid ""
8222
"At %s you have a valid .bzr control directory, but not a branch or "
8223
"repository. This is an unsupported configuration. Please move the target "
8224
"directory out of the way and try again."
8225
msgstr ""
8226
"At %s you have a valid .bzr control directory, but not a branch or "
8227
"repository. This is an unsupported configuration. Please move the target "
8228
"directory out of the way and try again."
8229
8230
#: bzrlib/reconcile.py:97
8231
#, python-format
8232
msgid "Reconciling branch %s"
8233
msgstr "Reconciling branch %s"
8234
8235
#: bzrlib/reconcile.py:103
8236
#, python-format
8237
msgid "Reconciling repository %s"
8238
msgstr "Reconciling repository %s"
8239
8240
#: bzrlib/reconcile.py:105
8241
msgid "Reconciling repository"
8242
msgstr "Reconciling repository"
8243
8244
#: bzrlib/reconcile.py:111
8245
#, python-format
8246
msgid "%s cannot canonicalize CHKs."
8247
msgstr "%s cannot canonicalise CHKs."
8248
8249
#: bzrlib/reconcile.py:119
8250
msgid "Reconcile aborted: revision index has inconsistent parents."
8251
msgstr "Reconcile aborted: revision index has inconsistent parents."
8252
8253
#: bzrlib/reconcile.py:121
8254
msgid "Run \"bzr check\" for more details."
8255
msgstr "Run \"bzr check\" for more details."
8256
8257
#: bzrlib/reconcile.py:123
8258
msgid "Reconciliation complete."
8259
msgstr "Reconciliation complete."
8260
8261
#: bzrlib/reconcile.py:166
8262
msgid "Fixing last revision info {0} => {1}"
8263
msgstr "Fixing last revision info {0} => {1}"
8264
8265
#: bzrlib/reconcile.py:173
8266
msgid "revision_history ok."
8267
msgstr "revision_history ok."
8268
8269
#: bzrlib/reconcile.py:234
8270
msgid "Reading inventory data"
8271
msgstr "Reading inventory data"
8272
8273
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
8274
msgid "Inventory ok."
8275
msgstr "Inventory ok."
8276
8277
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
8278
msgid "Backing up inventory"
8279
msgstr "Backing up inventory"
8280
8281
#: bzrlib/reconcile.py:258
8282
msgid "Backup inventory created."
8283
msgstr "Backup inventory created."
8284
8285
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
8286
msgid "Writing weave"
8287
msgstr "Writing weave"
8288
8289
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
8290
msgid "Inventory regenerated."
8291
msgstr "Inventory regenerated."
8292
8293
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
8294
msgid "Reading indexes"
8295
msgstr "Reading indexes"
8296
8297
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
8298
msgid "Checking unused inventories"
8299
msgstr "Checking unused inventories"
8300
8301
#: bzrlib/reconcile.py:388
8302
msgid "Backup Inventory created"
8303
msgstr "Backup Inventory created"
8304
8305
#: bzrlib/reconcile.py:446
8306
msgid "Fixing text parents"
8307
msgstr "Fixing text parents"
8308
8309
#: bzrlib/reconfigure.py:54
8310
msgid "{0} is now stacked on {1}\n"
8311
msgstr "{0} is now stacked on {1}\n"
8312
8313
#: bzrlib/reconfigure.py:69
8314
#, python-format
8315
msgid "%s is now not stacked\n"
8316
msgstr "%s is now not stacked\n"
8317
8318
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
8319
#, python-format
8320
msgid "bzr: ERROR (ignored): %s"
8321
msgstr "bzr: ERROR (ignored): %s"
8322
8323
#: bzrlib/remote.py:2534
8324
msgid "Copying repository content as tarball..."
8325
msgstr "Copying repository content as tarball..."
8326
8327
#: bzrlib/rename_map.py:69
8328
msgid "Calculating hashes"
8329
msgstr "Calculating hashes"
8330
8331
#: bzrlib/rename_map.py:107
8332
msgid "Determining hash hits"
8333
msgstr "Determining hash hits"
8334
8335
#: bzrlib/rename_map.py:242
8336
msgid "{0} => {1}"
8337
msgstr "{0} => {1}"
8338
8339
#: bzrlib/repository.py:1738
8340
msgid "Moving repository to repository.backup"
8341
msgstr "Moving repository to repository.backup"
8342
8343
#: bzrlib/repository.py:1745
8344
msgid "Creating new repository"
8345
msgstr "Creating new repository"
8346
8347
#: bzrlib/repository.py:1750
8348
msgid "Copying content"
8349
msgstr "Copying content"
8350
8351
#: bzrlib/repository.py:1754
8352
msgid "Deleting old repository content"
8353
msgstr "Deleting old repository content"
8354
8355
#: bzrlib/repository.py:1756
8356
msgid "repository converted"
8357
msgstr "repository converted"
8358
8359
#: bzrlib/revisionspec.py:903
8360
msgid "Using {0} {1}"
8361
msgstr "Using {0} {1}"
8362
8363
#: bzrlib/send.py:59
8364
#, python-format
8365
msgid "Mail client \"%s\" does not support specifying body"
8366
msgstr "Mail client \"%s\" does not support specifying body"
8367
8368
#: bzrlib/send.py:63
8369
msgid "--remember requires a branch to be specified."
8370
msgstr "--remember requires a branch to be specified."
8371
8372
#: bzrlib/send.py:78
8373
msgid "No submit branch known or specified"
8374
msgstr "No submit branch known or specified"
8375
8376
#: bzrlib/send.py:81
8377
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
8378
msgstr ""
8379
"Using saved {0} location \"{1}\" to determine what changes to submit."
8380
8381
#: bzrlib/send.py:99
8382
#, python-format
8383
msgid "No such send format '%s'."
8384
msgstr "No such send format '%s'."
8385
8386
#: bzrlib/send.py:115
8387
msgid "bzr send takes at most two one revision identifiers"
8388
msgstr "bzr send takes at most two one revision identifiers"
8389
8390
#: bzrlib/send.py:128
8391
msgid "No revisions to submit."
8392
msgstr "No revisions to submit."
8393
8394
#: bzrlib/send.py:140
8395
msgid ""
8396
"- not supported for merge directives that use more than one output file."
8397
msgstr ""
8398
"- not supported for merge directives that use more than one output file."
8399
8400
#: bzrlib/send.py:186
8401
msgid "Format 0.9 does not permit bundle with no patch"
8402
msgstr "Format 0.9 does not permit bundle with no patch"
8403
8404
#: bzrlib/shelf_ui.py:46
8405
#, python-format
8406
msgid "Shelve adding file \"%(path)s\"?"
8407
msgstr "Shelve adding file \"%(path)s\"?"
8408
8409
#: bzrlib/shelf_ui.py:47
8410
msgid "Shelve binary changes?"
8411
msgstr "Shelve binary changes?"
8412
8413
#: bzrlib/shelf_ui.py:48
8414
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
8415
msgstr "Shelve changing \"%s\" from %(other)s to %(this)s?"
8416
8417
#: bzrlib/shelf_ui.py:50
8418
#, python-format
8419
msgid "Shelve removing file \"%(path)s\"?"
8420
msgstr "Shelve removing file \"%(path)s\"?"
8421
8422
#: bzrlib/shelf_ui.py:51
8423
#, python-format
8424
msgid "Shelve %d change(s)?"
8425
msgstr "Shelve %d change(s)?"
8426
8427
#: bzrlib/shelf_ui.py:52
8428
msgid "Shelve?"
8429
msgstr "Shelve?"
8430
8431
#: bzrlib/shelf_ui.py:53
8432
#, python-format
8433
msgid ""
8434
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8435
msgstr ""
8436
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8437
8438
#: bzrlib/shelf_ui.py:55
8439
#, python-format
8440
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
8441
msgstr "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
8442
8443
#: bzrlib/shelf_ui.py:70
8444
#, python-format
8445
msgid "Changes shelved with id \"%d\"."
8446
msgstr "Changes shelved with id \"%d\"."
8447
8448
#: bzrlib/shelf_ui.py:74
8449
msgid "Selected changes destroyed."
8450
msgstr "Selected changes destroyed."
8451
8452
#: bzrlib/shelf_ui.py:78
8453
msgid "Selected changes:"
8454
msgstr "Selected changes:"
8455
8456
#: bzrlib/shelf_ui.py:98
8457
#, python-format
8458
msgid "Delete file \"%(path)s\"?"
8459
msgstr "Delete file \"%(path)s\"?"
8460
8461
#: bzrlib/shelf_ui.py:99
8462
msgid "Apply binary changes?"
8463
msgstr "Apply binary changes?"
8464
8465
#: bzrlib/shelf_ui.py:100
8466
#, python-format
8467
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
8468
msgstr "Change \"%(path)s\" from %(this)s to %(other)s?"
8469
8470
#: bzrlib/shelf_ui.py:102
8471
#, python-format
8472
msgid "Add file \"%(path)s\"?"
8473
msgstr "Add file \"%(path)s\"?"
8474
8475
#: bzrlib/shelf_ui.py:103
8476
#, python-format
8477
msgid "Apply %d change(s)?"
8478
msgstr "Apply %d change(s)?"
8479
8480
#: bzrlib/shelf_ui.py:104
8481
msgid "Apply change?"
8482
msgstr "Apply change?"
8483
8484
#: bzrlib/shelf_ui.py:105
8485
#, python-format
8486
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
8487
msgstr "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
8488
8489
#: bzrlib/shelf_ui.py:107
8490
#, python-format
8491
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
8492
msgstr "Rename \"%(this)s\" => \"%(other)s\"?"
8493
8494
#: bzrlib/shelf_ui.py:402
8495
msgid "No changes are shelved."
8496
msgstr "No changes are shelved."
8497
8498
#: bzrlib/shelf_ui.py:460
8499
#, python-format
8500
msgid "Using changes with id \"%d\"."
8501
msgstr "Using changes with id \"%d\"."
8502
8503
#: bzrlib/shelf_ui.py:464
8504
#, python-format
8505
msgid "Message: %s"
8506
msgstr "Message: %s"
8507
8508
#: bzrlib/shelf_ui.py:476
8509
#, python-format
8510
msgid "Deleted changes with id \"%d\"."
8511
msgstr "Deleted changes with id \"%d\"."
8512
8513
#: bzrlib/smart/medium.py:714
8514
msgid "HPSS calls: {0} ({1} vfs) {2}"
8515
msgstr "HPSS calls: {0} ({1} vfs) {2}"
8516
8517
#: bzrlib/smart/server.py:169
8518
msgid "Requested to stop gracefully"
8519
msgstr "Requested to stop gracefully"
8520
8521
#: bzrlib/smart/server.py:179
8522
#, python-format
8523
msgid "Waiting for %d client(s) to finish"
8524
msgstr "Waiting for %d client(s) to finish"
8525
8526
#: bzrlib/smart/server.py:185
8527
#, python-format
8528
msgid "Still waiting for %d client(s) to finish"
8529
msgstr "Still waiting for %d client(s) to finish"
8530
8531
#: bzrlib/smart/server.py:219
8532
#, python-format
8533
msgid "listening socket error: %s"
8534
msgstr "listening socket error: %s"
8535
8536
#: bzrlib/smart/server.py:452
8537
#, python-format
8538
msgid "listening on port: %s"
8539
msgstr "listening on port: %s"
8540
8541
#: bzrlib/switch.py:73
8542
msgid "Pending merges must be committed or reverted before using switch."
8543
msgstr "Pending merges must be committed or reverted before using switch."
8544
8545
#: bzrlib/switch.py:100
8546
msgid ""
8547
"Cannot switch as local commits found in the checkout. Commit these to the "
8548
"bound branch or use --force to throw them away."
8549
msgstr ""
8550
"Cannot switch as local commits found in the checkout. Commit these to the "
8551
"bound branch or use --force to throw them away."
8552
8553
#: bzrlib/switch.py:105
8554
#, python-format
8555
msgid ""
8556
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8557
"anyway, use --force."
8558
msgstr ""
8559
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8560
"anyway, use --force."
8561
8562
#: bzrlib/switch.py:129
8563
msgid "Cannot switch a branch, only a checkout."
8564
msgstr "Cannot switch a branch, only a checkout."
8565
8566
#: bzrlib/switch.py:167
8567
#, python-format
8568
msgid "Tree is up to date at revision %d."
8569
msgstr "Tree is up to date at revision %d."
8570
8571
#: bzrlib/switch.py:173
8572
#, python-format
8573
msgid "Updated to revision %d."
8574
msgstr "Updated to revision %d."
8575
8576
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
8577
msgid "Apply phase"
8578
msgstr "Apply phase"
8579
8580
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
8581
msgid "removing file"
8582
msgstr "removing file"
8583
8584
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
8585
msgid "adding file"
8586
msgstr "adding file"
8587
8588
#: bzrlib/transform.py:2598
8589
msgid "Building tree"
8590
msgstr "Building tree"
8591
8592
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
8593
msgid "Adding file contents"
8594
msgstr "Adding file contents"
8595
8596
#: bzrlib/transform.py:3017
8597
msgid "Resolution pass"
8598
msgstr "Resolution pass"
8599
8600
#: bzrlib/transport/ftp/_gssapi.py:88
8601
#, python-format
8602
msgid "Authenticated as %s"
8603
msgstr "Authenticated as %s"
8604
8605
#: bzrlib/tree.py:647
8606
msgid "*** {0} content-filter: {1} => {2!r}"
8607
msgstr "*** {0} content-filter: {1} => {2!r}"
8608
8609
#: bzrlib/upgrade.py:77
8610
#, python-format
8611
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
8612
msgstr "This is a checkout. The branch (%s) needs to be upgraded separately."
8613
8614
#: bzrlib/upgrade.py:100
8615
#, python-format
8616
msgid "cannot upgrade from bzrdir format %s"
8617
msgstr "cannot upgrade from bzrdir format %s"
8618
8619
#: bzrlib/upgrade.py:103
8620
#, python-format
8621
msgid "starting upgrade of %s"
8622
msgstr "starting upgrade of %s"
8623
8624
#: bzrlib/upgrade.py:110
8625
msgid "finished"
8626
msgstr "finished"
8627
8628
#: bzrlib/upgrade.py:120
8629
msgid "Deleting backup.bzr"
8630
msgstr "Deleting backup.bzr"
8631
8632
#: bzrlib/upgrade.py:151
8633
msgid ""
8634
"\n"
8635
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
8636
msgstr ""
8637
"\n"
8638
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
8639
8640
#: bzrlib/upgrade.py:208
8641
#, python-format
8642
msgid "Found %d dependent branches - upgrading ..."
8643
msgstr "Found %d dependent branches - upgrading ..."
8644
8645
#: bzrlib/upgrade.py:276
8646
msgid "Upgrading bzrdirs"
8647
msgstr "Upgrading bzrdirs"
8648
8649
#: bzrlib/upgrade.py:282
8650
#, python-format
8651
msgid "Upgrading %s"
8652
msgstr "Upgrading %s"
8653
8654
#: bzrlib/upgrade.py:283
8655
msgid "Upgrading {0} {1} ..."
8656
msgstr "Upgrading {0} {1} ..."
8657
8658
#: bzrlib/upgrade.py:301
8659
msgid "Removing backup ..."
8660
msgstr "Removing backup ..."
8661
8662
#: bzrlib/upgrade.py:305
8663
msgid "failed to clean-up {0}: {1}"
8664
msgstr "failed to clean-up {0}: {1}"
8665
8666
#: bzrlib/vf_repository.py:1091
8667
msgid "inventories"
8668
msgstr "inventories"
8669
8670
#: bzrlib/vf_repository.py:1117
8671
msgid "texts"
8672
msgstr "texts"
8673
8674
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
8675
msgid "Calculating text parents"
8676
msgstr "Calculating text parents"
8677
8678
#: bzrlib/vf_repository.py:1707
8679
msgid "Fetch texts"
8680
msgstr "Fetch texts"
8681
8682
#: bzrlib/vf_repository.py:2536
8683
msgid "loading text store"
8684
msgstr "loading text store"
8685
8686
#: bzrlib/vf_repository.py:2542
8687
msgid "checking text graph"
8688
msgstr "checking text graph"
8689
8690
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8691
#: bzrlib/vf_repository.py:3127
8692
msgid "Transferring revisions"
8693
msgstr "Transferring revisions"
8694
8695
#: bzrlib/win32utils.py:146
8696
msgid "Failed to GetProcessMemoryInfo()"
8697
msgstr "Failed to GetProcessMemoryInfo()"
8698
8699
#: bzrlib/win32utils.py:167
8700
msgid "Cannot debug memory on win32 without ctypes or win32process"
8701
msgstr "Cannot debug memory on win32 without ctypes or win32process"
8702
8703
#: bzrlib/win32utils.py:172
8704
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8705
msgstr "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8706
8707
#: bzrlib/win32utils.py:180
8708
#, python-format
8709
msgid "WorkingSize %8d KiB"
8710
msgstr "WorkingSize %8d KiB"
8711
8712
#: bzrlib/win32utils.py:181
8713
#, python-format
8714
msgid "PeakWorking %8d KiB"
8715
msgstr "PeakWorking %8d KiB"
8716
8717
#: bzrlib/win32utils.py:182
8718
#, python-format
8719
msgid "PagefileUsage %8d KiB"
8720
msgstr "PagefileUsage %8d KiB"
8721
8722
#: bzrlib/win32utils.py:183
8723
#, python-format
8724
msgid "PeakPagefileUsage %8d KiB"
8725
msgstr "PeakPagefileUsage %8d KiB"
8726
8727
#: bzrlib/win32utils.py:185
8728
#, python-format
8729
msgid "PrivateUsage %8d KiB"
8730
msgstr "PrivateUsage %8d KiB"
8731
8732
#: bzrlib/win32utils.py:186
8733
#, python-format
8734
msgid "PageFaultCount %8d"
8735
msgstr "PageFaultCount %8d"
8736
8737
#: bzrlib/workingtree.py:1482
8738
msgid "Rerun update after fixing the conflicts."
8739
msgstr "Rerun update after fixing the conflicts."
8740
8741
#: dummy/help_topics/authentication/summary.txt:1
8742
msgid "Information on configuring authentication"
8743
msgstr "Information on configuring authentication"
8744
8745
#: dummy/help_topics/basic/detail.txt:1
8746
msgid ""
8747
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8748
"http://bazaar.canonical.com/"
8749
msgstr ""
8750
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8751
"http://bazaar.canonical.com/"
8752
8753
#: dummy/help_topics/basic/detail.txt:4
8754
msgid ""
8755
"Basic commands:\n"
8756
" bzr init makes this directory a versioned branch\n"
8757
" bzr branch make a copy of another branch"
8758
msgstr ""
8759
"Basic commands:\n"
8760
" bzr init makes this directory a versioned branch\n"
8761
" bzr branch make a copy of another branch"
8762
8763
#: dummy/help_topics/basic/detail.txt:8
8764
msgid ""
8765
" bzr add make files or directories versioned\n"
8766
" bzr ignore ignore a file or pattern\n"
8767
" bzr mv move or rename a versioned file"
8768
msgstr ""
8769
" bzr add make files or directories versioned\n"
8770
" bzr ignore ignore a file or pattern\n"
8771
" bzr mv move or rename a versioned file"
8772
8773
#: dummy/help_topics/basic/detail.txt:12
8774
msgid ""
8775
" bzr status summarize changes in working copy\n"
8776
" bzr diff show detailed diffs"
8777
msgstr ""
8778
" bzr status summarise changes in working copy\n"
8779
" bzr diff show detailed diffs"
8780
8781
#: dummy/help_topics/basic/detail.txt:15
8782
msgid ""
8783
" bzr merge pull in changes from another branch\n"
8784
" bzr commit save some or all changes\n"
8785
" bzr send send changes via email"
8786
msgstr ""
8787
" bzr merge pull in changes from another branch\n"
8788
" bzr commit save some or all changes\n"
8789
" bzr send send changes via email"
8790
8791
#: dummy/help_topics/basic/detail.txt:19
8792
msgid ""
8793
" bzr log show history of changes\n"
8794
" bzr check validate storage"
8795
msgstr ""
8796
" bzr log show history of changes\n"
8797
" bzr check validate storage"
8798
8799
#: dummy/help_topics/basic/detail.txt:22
8800
msgid ""
8801
" bzr help init more help on e.g. init command\n"
8802
" bzr help commands list all commands\n"
8803
" bzr help topics list all help topics\n"
8804
msgstr ""
8805
" bzr help init more help on e.g. init command\n"
8806
" bzr help commands list all commands\n"
8807
" bzr help topics list all help topics\n"
8808
8809
#: dummy/help_topics/basic/summary.txt:1
8810
msgid "Basic commands"
8811
msgstr "Basic commands"
8812
8813
#: dummy/help_topics/branches/detail.txt:1
8814
msgid "Branches"
8815
msgstr "Branches"
8816
8817
#: dummy/help_topics/branches/detail.txt:3
8818
msgid ""
8819
"A branch consists of the state of a project, including all of its\n"
8820
"history. All branches have a repository associated (which is where the\n"
8821
"branch history is stored), but multiple branches may share the same\n"
8822
"repository (a shared repository). Branches can be copied and merged."
8823
msgstr ""
8824
"A branch consists of the state of a project, including all of its\n"
8825
"history. All branches have a repository associated (which is where the\n"
8826
"branch history is stored), but multiple branches may share the same\n"
8827
"repository (a shared repository). Branches can be copied and merged."
8828
8829
#: dummy/help_topics/branches/detail.txt:8
8830
msgid ""
8831
"In addition, one branch may be bound to another one. Binding to another\n"
8832
"branch indicates that commits which happen in this branch must also \n"
8833
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8834
"commits when the two branches are out of date. In order for a commit \n"
8835
"to succeed, it may be necessary to update the current branch using \n"
8836
"``bzr update``."
8837
msgstr ""
8838
"In addition, one branch may be bound to another one. Binding to another\n"
8839
"branch indicates that commits which happen in this branch must also \n"
8840
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8841
"commits when the two branches are out of date. In order for a commit \n"
8842
"to succeed, it may be necessary to update the current branch using \n"
8843
"``bzr update``."
8844
8845
#: dummy/help_topics/branches/detail.txt:15
8846
#: dummy/help_topics/checkouts/detail.txt:66
8847
#: dummy/help_topics/repositories/detail.txt:36
8848
msgid "Related commands::"
8849
msgstr "Related commands::"
8850
8851
#: dummy/help_topics/branches/detail.txt:17
8852
msgid ""
8853
" init Change a directory into a versioned branch.\n"
8854
" branch Create a new branch that is a copy of an existing branch.\n"
8855
" merge Perform a three-way merge.\n"
8856
" bind Bind a branch to another one.\n"
8857
msgstr ""
8858
" init Change a directory into a versioned branch.\n"
8859
" branch Create a new branch that is a copy of an existing branch.\n"
8860
" merge Perform a three-way merge.\n"
8861
" bind Bind a branch to another one.\n"
8862
8863
#: dummy/help_topics/branches/summary.txt:1
8864
msgid "Information on what a branch is"
8865
msgstr "Information on what a branch is"
8866
8867
#: dummy/help_topics/bugs/summary.txt:1
8868
msgid "Bug tracker settings"
8869
msgstr "Bug tracker settings"
8870
8871
#: dummy/help_topics/checkouts/detail.txt:1
8872
msgid "Checkouts"
8873
msgstr "Checkouts"
8874
8875
#: dummy/help_topics/checkouts/detail.txt:3
8876
msgid ""
8877
"Checkouts are source trees that are connected to a branch, so that when\n"
8878
"you commit in the source tree, the commit goes into that branch. They\n"
8879
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8880
"Bazaar's decentralized features until you want them. Using checkouts\n"
8881
"with shared repositories is very similar to working with SVN or CVS, but\n"
8882
"doesn't have the same restrictions. And using checkouts still allows\n"
8883
"others working on the project to use whatever workflow they like."
8884
msgstr ""
8885
"Checkouts are source trees that are connected to a branch, so that when\n"
8886
"you commit in the source tree, the commit goes into that branch. They\n"
8887
"allow you to use a simpler, more centralised workflow, ignoring some of\n"
8888
"Bazaar's decentralised features until you want them. Using checkouts\n"
8889
"with shared repositories is very similar to working with SVN or CVS, but\n"
8890
"doesn't have the same restrictions. And using checkouts still allows\n"
8891
"others working on the project to use whatever workflow they like."
8892
8893
#: dummy/help_topics/checkouts/detail.txt:11
8894
msgid ""
8895
"A checkout is created with the bzr checkout command (see \"help "
8896
"checkout\").\n"
8897
"You pass it a reference to another branch, and it will create a local copy\n"
8898
"for you that still contains a reference to the branch you created the\n"
8899
"checkout from (the master branch). Then if you make any commits they will "
8900
"be\n"
8901
"made on the other branch first. This creates an instant mirror of your work, "
8902
"or\n"
8903
"facilitates lockstep development, where each developer is working together,\n"
8904
"continuously integrating the changes of others."
8905
msgstr ""
8906
"A checkout is created with the bzr checkout command (see \"help "
8907
"checkout\").\n"
8908
"You pass it a reference to another branch, and it will create a local copy\n"
8909
"for you that still contains a reference to the branch you created the\n"
8910
"checkout from (the master branch). Then if you make any commits they will "
8911
"be\n"
8912
"made on the other branch first. This creates an instant mirror of your work, "
8913
"or\n"
8914
"facilitates lockstep development, where each developer is working together,\n"
8915
"continuously integrating the changes of others."
8916
8917
#: dummy/help_topics/checkouts/detail.txt:19
8918
msgid ""
8919
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8920
"you have the full history locally. As you have a first class branch you "
8921
"can\n"
8922
"also commit locally if you want, for instance due to the temporary loss af "
8923
"a\n"
8924
"network connection. Use the --local option to commit to do this. All the "
8925
"local\n"
8926
"commits will then be made on the master branch the next time you do a non-"
8927
"local\n"
8928
"commit."
8929
msgstr ""
8930
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8931
"you have the full history locally. As you have a first class branch you "
8932
"can\n"
8933
"also commit locally if you want, for instance due to the temporary loss af "
8934
"a\n"
8935
"network connection. Use the --local option to commit to do this. All the "
8936
"local\n"
8937
"commits will then be made on the master branch the next time you do a non-"
8938
"local\n"
8939
"commit."
8940
8941
#: dummy/help_topics/checkouts/detail.txt:26
8942
msgid ""
8943
"If you are using a checkout from a shared branch you will periodically want "
8944
"to\n"
8945
"pull in all the changes made by others. This is done using the \"update\"\n"
8946
"command. The changes need to be applied before any non-local commit, but\n"
8947
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8948
"command when needed."
8949
msgstr ""
8950
"If you are using a checkout from a shared branch you will periodically want "
8951
"to\n"
8952
"pull in all the changes made by others. This is done using the \"update\"\n"
8953
"command. The changes need to be applied before any non-local commit, but\n"
8954
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8955
"command when needed."
8956
8957
#: dummy/help_topics/checkouts/detail.txt:32
8958
msgid ""
8959
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8960
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8961
"SVN checkout in that it is not a first class branch, it mainly consists of "
8962
"the\n"
8963
"working tree. This means that any history operations must query the master\n"
8964
"branch, which could be slow if a network connection is involved. Also, as "
8965
"you\n"
8966
"don't have a local branch, then you cannot commit locally."
8967
msgstr ""
8968
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8969
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8970
"SVN checkout in that it is not a first class branch, it mainly consists of "
8971
"the\n"
8972
"working tree. This means that any history operations must query the master\n"
8973
"branch, which could be slow if a network connection is involved. Also, as "
8974
"you\n"
8975
"don't have a local branch, then you cannot commit locally."
8976
8977
#: dummy/help_topics/checkouts/detail.txt:39
8978
msgid ""
8979
"Lightweight checkouts work best when you have fast reliable access to the\n"
8980
"master branch. This means that if the master branch is on the same disk or "
8981
"LAN\n"
8982
"a lightweight checkout will be faster than a heavyweight one for any "
8983
"commands\n"
8984
"that modify the revision history (as only one copy of the branch needs to\n"
8985
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8986
"that uses the history but does not change it, but if the master branch is "
8987
"on\n"
8988
"the same disk then there won't be a noticeable difference."
8989
msgstr ""
8990
"Lightweight checkouts work best when you have fast reliable access to the\n"
8991
"master branch. This means that if the master branch is on the same disk or "
8992
"LAN\n"
8993
"a lightweight checkout will be faster than a heavyweight one for any "
8994
"commands\n"
8995
"that modify the revision history (as only one copy of the branch needs to\n"
8996
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8997
"that uses the history but does not change it, but if the master branch is "
8998
"on\n"
8999
"the same disk then there won't be a noticeable difference."
9000
9001
#: dummy/help_topics/checkouts/detail.txt:47
9002
msgid ""
9003
"Another possible use for a checkout is to use it with a treeless repository\n"
9004
"containing your branches, where you maintain only one working tree by\n"
9005
"switching the master branch that the checkout points to when you want to\n"
9006
"work on a different branch."
9007
msgstr ""
9008
"Another possible use for a checkout is to use it with a treeless repository\n"
9009
"containing your branches, where you maintain only one working tree by\n"
9010
"switching the master branch that the checkout points to when you want to\n"
9011
"work on a different branch."
9012
9013
#: dummy/help_topics/checkouts/detail.txt:52
9014
msgid ""
9015
"Obviously to commit on a checkout you need to be able to write to the "
9016
"master\n"
9017
"branch. This means that the master branch must be accessible over a "
9018
"writeable\n"
9019
"protocol , such as sftp://, and that you have write permissions at the "
9020
"other\n"
9021
"end. Checkouts also work on the local file system, so that all that matters "
9022
"is\n"
9023
"file permissions."
9024
msgstr ""
9025
"Obviously to commit on a checkout you need to be able to write to the "
9026
"master\n"
9027
"branch. This means that the master branch must be accessible over a "
9028
"writeable\n"
9029
"protocol , such as sftp://, and that you have write permissions at the "
9030
"other\n"
9031
"end. Checkouts also work on the local file system, so that all that matters "
9032
"is\n"
9033
"file permissions."
9034
9035
#: dummy/help_topics/checkouts/detail.txt:58
9036
msgid ""
9037
"You can change the master of a checkout by using the \"switch\" command "
9038
"(see\n"
9039
"\"help switch\"). This will change the location that the commits are sent "
9040
"to.\n"
9041
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
9042
"checkout. If you would like to convert your heavy checkout into a normal\n"
9043
"branch so that every commit is local, you can use the \"unbind\" command. To "
9044
"see\n"
9045
"whether or not a branch is bound or not you can use the \"info\" command. If "
9046
"the\n"
9047
"branch is bound it will tell you the location of the bound branch."
9048
msgstr ""
9049
"You can change the master of a checkout by using the \"switch\" command "
9050
"(see\n"
9051
"\"help switch\"). This will change the location that the commits are sent "
9052
"to.\n"
9053
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
9054
"checkout. If you would like to convert your heavy checkout into a normal\n"
9055
"branch so that every commit is local, you can use the \"unbind\" command. To "
9056
"see\n"
9057
"whether or not a branch is bound or not you can use the \"info\" command. If "
9058
"the\n"
9059
"branch is bound it will tell you the location of the bound branch."
9060
9061
#: dummy/help_topics/checkouts/detail.txt:68
9062
msgid ""
9063
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
9064
" checkout\n"
9065
" update Pull any changes in the master branch in to your checkout\n"
9066
" commit Make a commit that is sent to the master branch. If you have\n"
9067
" a heavy checkout then the --local option will commit to the\n"
9068
" checkout without sending the commit to the master\n"
9069
" switch Change the master branch that the commits in the checkout "
9070
"will\n"
9071
" be sent to\n"
9072
" bind Turn a standalone branch into a heavy checkout so that any\n"
9073
" commits will be sent to the master branch\n"
9074
" unbind Turn a heavy checkout into a standalone branch so that any\n"
9075
" commits are only made locally\n"
9076
" info Displays whether a branch is bound or unbound. If the branch "
9077
"is\n"
9078
" bound, then it will also display the location of the bound "
9079
"branch\n"
9080
msgstr ""
9081
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
9082
" checkout\n"
9083
" update Pull any changes in the master branch in to your checkout\n"
9084
" commit Make a commit that is sent to the master branch. If you have\n"
9085
" a heavy checkout then the --local option will commit to the\n"
9086
" checkout without sending the commit to the master\n"
9087
" switch Change the master branch that the commits in the checkout "
9088
"will\n"
9089
" be sent to\n"
9090
" bind Turn a standalone branch into a heavy checkout so that any\n"
9091
" commits will be sent to the master branch\n"
9092
" unbind Turn a heavy checkout into a standalone branch so that any\n"
9093
" commits are only made locally\n"
9094
" info Displays whether a branch is bound or unbound. If the branch "
9095
"is\n"
9096
" bound, then it will also display the location of the bound "
9097
"branch\n"
9098
9099
#: dummy/help_topics/checkouts/summary.txt:1
9100
msgid "Information on what a checkout is"
9101
msgstr "Information on what a checkout is"
9102
9103
#: dummy/help_topics/commands/summary.txt:1
9104
msgid "Basic help for all commands"
9105
msgstr "Basic help for all commands"
9106
9107
#: dummy/help_topics/configuration/summary.txt:1
9108
msgid "Details on the configuration settings available"
9109
msgstr "Details on the configuration settings available"
9110
9111
#: dummy/help_topics/conflict-types/summary.txt:1
9112
msgid "Types of conflicts and what to do about them"
9113
msgstr "Types of conflicts and what to do about them"
9114
9115
#: dummy/help_topics/content-filters/summary.txt:1
9116
msgid "Conversion of content into/from working trees"
9117
msgstr "Conversion of content into/from working trees"
9118
9119
#: dummy/help_topics/criss-cross/detail.txt:1
9120
msgid "Criss-Cross"
9121
msgstr "Criss-Cross"
9122
9123
#: dummy/help_topics/criss-cross/detail.txt:3
9124
msgid ""
9125
"A criss-cross in the branch history can cause the default merge technique\n"
9126
"to emit more conflicts than would normally be expected."
9127
msgstr ""
9128
"A criss-cross in the branch history can cause the default merge technique\n"
9129
"to emit more conflicts than would normally be expected."
9130
9131
#: dummy/help_topics/criss-cross/detail.txt:6
9132
msgid ""
9133
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
9134
"give\n"
9135
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
9136
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
9137
msgstr ""
9138
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
9139
"give\n"
9140
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
9141
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
9142
9143
#: dummy/help_topics/criss-cross/detail.txt:10
9144
msgid ""
9145
"Criss-crosses occur in a branch's history if two branches merge the same "
9146
"thing\n"
9147
"and then merge one another, or if two branches merge one another at the "
9148
"same\n"
9149
"time. They can be avoided by having each branch only merge from or into a\n"
9150
"designated central branch (a \"star topology\")."
9151
msgstr ""
9152
"Criss-crosses occur in a branch's history if two branches merge the same "
9153
"thing\n"
9154
"and then merge one another, or if two branches merge one another at the "
9155
"same\n"
9156
"time. They can be avoided by having each branch only merge from or into a\n"
9157
"designated central branch (a \"star topology\")."
9158
9159
#: dummy/help_topics/criss-cross/detail.txt:15
9160
msgid ""
9161
"Criss-crosses cause problems because of the way merge works. Bazaar's "
9162
"default\n"
9163
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
9164
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
9165
"differences between THIS and OTHER are due to one side adding lines, or\n"
9166
"from another side removing lines."
9167
msgstr ""
9168
"Criss-crosses cause problems because of the way merge works. Bazaar's "
9169
"default\n"
9170
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
9171
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
9172
"differences between THIS and OTHER are due to one side adding lines, or\n"
9173
"from another side removing lines."
9174
9175
#: dummy/help_topics/criss-cross/detail.txt:21
9176
msgid ""
9177
"Criss-crosses mean there is no good choice for a base. Selecting the "
9178
"recent\n"
9179
"merge points could cause one side's changes to be silently discarded.\n"
9180
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
9181
"are emitted."
9182
msgstr ""
9183
"Criss-crosses mean there is no good choice for a base. Selecting the "
9184
"recent\n"
9185
"merge points could cause one side's changes to be silently discarded.\n"
9186
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
9187
"are emitted."
9188
9189
#: dummy/help_topics/criss-cross/detail.txt:26
9190
msgid ""
9191
"The ``weave`` merge type is not affected by this problem because it uses\n"
9192
"line-origin detection instead of a basis revision to determine the cause of\n"
9193
"differences.\n"
9194
msgstr ""
9195
"The ``weave`` merge type is not affected by this problem because it uses\n"
9196
"line-origin detection instead of a basis revision to determine the cause of\n"
9197
"differences.\n"
9198
9199
#: dummy/help_topics/criss-cross/summary.txt:1
9200
msgid "Information on criss-cross merging"
9201
msgstr "Information on criss-cross merging"
9202
9203
#: dummy/help_topics/current-formats/summary.txt:1
9204
msgid "Current storage formats"
9205
msgstr "Current storage formats"
9206
9207
#: dummy/help_topics/debug-flags/summary.txt:1
9208
msgid "Options to show or record debug information"
9209
msgstr "Options to show or record debug information"
9210
9211
#: dummy/help_topics/diverged-branches/summary.txt:1
9212
msgid "How to fix diverged branches"
9213
msgstr "How to fix diverged branches"
9214
9215
#: dummy/help_topics/env-variables/summary.txt:1
9216
msgid "Environment variable names and values"
9217
msgstr "Environment variable names and values"
9218
9219
#: dummy/help_topics/eol/summary.txt:1
9220
msgid "Information on end-of-line handling"
9221
msgstr "Information on end-of-line handling"
9222
9223
#: dummy/help_topics/files/detail.txt:1
9224
msgid "Files"
9225
msgstr "Files"
9226
9227
#: dummy/help_topics/files/detail.txt:3
9228
msgid ""
9229
":On Unix: ~/.bazaar/bazaar.conf\n"
9230
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
9231
"bazaar\\\\2.0\\\\bazaar.conf"
9232
msgstr ""
9233
":On Unix: ~/.bazaar/bazaar.conf\n"
9234
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
9235
"bazaar\\\\2.0\\\\bazaar.conf"
9236
9237
#: dummy/help_topics/files/detail.txt:6
9238
msgid ""
9239
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
9240
"used to define general configuration that will be applied everywhere.\n"
9241
"The section ``[ALIASES]`` can be used to create command aliases for\n"
9242
"commonly used options."
9243
msgstr ""
9244
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
9245
"used to define general configuration that will be applied everywhere.\n"
9246
"The section ``[ALIASES]`` can be used to create command aliases for\n"
9247
"commonly used options."
9248
9249
#: dummy/help_topics/files/detail.txt:11
9250
msgid "A typical config file might look something like::"
9251
msgstr "A typical config file might look something like::"
9252
9253
#: dummy/help_topics/files/detail.txt:13
9254
msgid ""
9255
" [DEFAULT]\n"
9256
" email=John Doe <jdoe@isp.com>"
9257
msgstr ""
9258
" [DEFAULT]\n"
9259
" email=John Doe <jdoe@isp.com>"
9260
9261
#: dummy/help_topics/files/detail.txt:16
9262
msgid ""
9263
" [ALIASES]\n"
9264
" commit = commit --strict\n"
9265
" log10 = log --short -r -10..-1\n"
9266
msgstr ""
9267
" [ALIASES]\n"
9268
" commit = commit --strict\n"
9269
" log10 = log --short -r -10..-1\n"
9270
9271
#: dummy/help_topics/files/summary.txt:1
9272
msgid "Information on configuration and log files"
9273
msgstr "Information on configuration and log files"
9274
9275
#: dummy/help_topics/formats/detail.txt:1
9276
msgid "Storage Formats"
9277
msgstr "Storage Formats"
9278
9279
#: dummy/help_topics/formats/detail.txt:3
9280
msgid ""
9281
"To ensure that older clients do not access data incorrectly,\n"
9282
"Bazaar's policy is to introduce a new storage format whenever\n"
9283
"new features requiring new metadata are added. New storage\n"
9284
"formats may also be introduced to improve performance and\n"
9285
"scalability."
9286
msgstr ""
9287
"To ensure that older clients do not access data incorrectly,\n"
9288
"Bazaar's policy is to introduce a new storage format whenever\n"
9289
"new features requiring new metadata are added. New storage\n"
9290
"formats may also be introduced to improve performance and\n"
9291
"scalability."
9292
9293
#: dummy/help_topics/formats/detail.txt:9
9294
msgid ""
9295
"The newest format, 2a, is highly recommended. If your\n"
9296
"project is not using 2a, then you should suggest to the\n"
9297
"project owner to upgrade."
9298
msgstr ""
9299
"The newest format, 2a, is highly recommended. If your\n"
9300
"project is not using 2a, then you should suggest to the\n"
9301
"project owner to upgrade."
9302
9303
#: dummy/help_topics/formats/detail.txt:13
9304
msgid ""
9305
"\n"
9306
".. note::"
9307
msgstr ""
9308
"\n"
9309
".. note::"
9310
9311
#: dummy/help_topics/formats/detail.txt:16
9312
msgid ""
9313
" Some of the older formats have two variants:\n"
9314
" a plain one and a rich-root one. The latter include an additional\n"
9315
" field about the root of the tree. There is no performance cost\n"
9316
" for using a rich-root format but you cannot easily merge changes\n"
9317
" from a rich-root format into a plain format. As a consequence,\n"
9318
" moving a project to a rich-root format takes some co-ordination\n"
9319
" in that all contributors need to upgrade their repositories\n"
9320
" around the same time. 2a and all future formats will be\n"
9321
" implicitly rich-root."
9322
msgstr ""
9323
" Some of the older formats have two variants:\n"
9324
" a plain one and a rich-root one. The latter include an additional\n"
9325
" field about the root of the tree. There is no performance cost\n"
9326
" for using a rich-root format but you cannot easily merge changes\n"
9327
" from a rich-root format into a plain format. As a consequence,\n"
9328
" moving a project to a rich-root format takes some co-ordination\n"
9329
" in that all contributors need to upgrade their repositories\n"
9330
" around the same time. 2a and all future formats will be\n"
9331
" implicitly rich-root."
9332
9333
#: dummy/help_topics/formats/detail.txt:26
9334
msgid ""
9335
"See :doc:`current-formats-help` for the complete list of\n"
9336
"currently supported formats. See :doc:`other-formats-help` for\n"
9337
"descriptions of any available experimental and deprecated formats.\n"
9338
msgstr ""
9339
"See :doc:`current-formats-help` for the complete list of\n"
9340
"currently supported formats. See :doc:`other-formats-help` for\n"
9341
"descriptions of any available experimental and deprecated formats.\n"
9342
9343
#: dummy/help_topics/formats/summary.txt:1
9344
msgid "Information on choosing a storage format"
9345
msgstr "Information on choosing a storage format"
9346
9347
#: dummy/help_topics/global-options/detail.txt:1
9348
msgid "Global Options"
9349
msgstr "Global Options"
9350
9351
#: dummy/help_topics/global-options/detail.txt:3
9352
msgid ""
9353
"These options may be used with any command, and may appear in front of any\n"
9354
"command. (e.g. ``bzr --profile help``)."
9355
msgstr ""
9356
"These options may be used with any command, and may appear in front of any\n"
9357
"command. (e.g. ``bzr --profile help``)."
9358
9359
#: dummy/help_topics/global-options/detail.txt:6
9360
msgid ""
9361
"--version Print the version number. Must be supplied before the "
9362
"command.\n"
9363
"--no-aliases Do not process command aliases when running this command.\n"
9364
"--builtin Use the built-in version of a command, not the plugin "
9365
"version.\n"
9366
" This does not suppress other plugin effects.\n"
9367
"--no-plugins Do not process any plugins.\n"
9368
"--no-l10n Do not translate messages.\n"
9369
"--concurrency Number of processes that can be run concurrently (selftest)."
9370
msgstr ""
9371
"--version Print the version number. Must be supplied before the "
9372
"command.\n"
9373
"--no-aliases Do not process command aliases when running this command.\n"
9374
"--builtin Use the built-in version of a command, not the plugin "
9375
"version.\n"
9376
" This does not suppress other plugin effects.\n"
9377
"--no-plugins Do not process any plugins.\n"
9378
"--no-l10n Do not translate messages.\n"
9379
"--concurrency Number of processes that can be run concurrently (selftest)."
9380
9381
#: dummy/help_topics/global-options/detail.txt:14
9382
msgid ""
9383
"--profile Profile execution using the hotshot profiler.\n"
9384
"--lsprof Profile execution using the lsprof profiler.\n"
9385
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
9386
" results to a specified file. If the filename ends with "
9387
"\".txt\",\n"
9388
" text format will be used. If the filename either starts "
9389
"with\n"
9390
" \"callgrind.out\" or end with \".callgrind\", the output will "
9391
"be\n"
9392
" formatted for use with KCacheGrind. Otherwise, the output\n"
9393
" will be a pickle.\n"
9394
"--coverage Generate line coverage report in the specified directory."
9395
msgstr ""
9396
"--profile Profile execution using the hotshot profiler.\n"
9397
"--lsprof Profile execution using the lsprof profiler.\n"
9398
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
9399
" results to a specified file. If the filename ends with "
9400
"\".txt\",\n"
9401
" text format will be used. If the filename either starts "
9402
"with\n"
9403
" \"callgrind.out\" or end with \".callgrind\", the output will "
9404
"be\n"
9405
" formatted for use with KCacheGrind. Otherwise, the output\n"
9406
" will be a pickle.\n"
9407
"--coverage Generate line coverage report in the specified directory."
9408
9409
#: dummy/help_topics/global-options/detail.txt:24
9410
msgid ""
9411
"-Oname=value Override the ``name`` config option setting it to ``value`` "
9412
"for\n"
9413
" the duration of the command. This can be used multiple times "
9414
"if\n"
9415
" several options need to be overridden."
9416
msgstr ""
9417
"-Oname=value Override the ``name`` config option setting it to ``value`` "
9418
"for\n"
9419
" the duration of the command. This can be used multiple times "
9420
"if\n"
9421
" several options need to be overridden."
9422
9423
#: dummy/help_topics/global-options/detail.txt:28
9424
msgid ""
9425
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
9426
"information on profiling."
9427
msgstr ""
9428
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
9429
"information on profiling."
9430
9431
#: dummy/help_topics/global-options/detail.txt:31
9432
msgid ""
9433
"A number of debug flags are also available to assist troubleshooting and\n"
9434
"development. See :doc:`debug-flags-help`.\n"
9435
msgstr ""
9436
"A number of debug flags are also available to assist troubleshooting and\n"
9437
"development. See :doc:`debug-flags-help`.\n"
9438
9439
#: dummy/help_topics/global-options/summary.txt:1
9440
msgid "Options that control how Bazaar runs"
9441
msgstr "Options that control how Bazaar runs"
9442
9443
#: dummy/help_topics/hidden-commands/summary.txt:1
9444
msgid "All hidden commands"
9445
msgstr "All hidden commands"
9446
9447
#: dummy/help_topics/hooks/summary.txt:1
9448
msgid "Points at which custom processing can be added"
9449
msgstr "Points at which custom processing can be added"
9450
9451
#: dummy/help_topics/launchpad/detail.txt:1
9452
msgid "Integration with Launchpad.net"
9453
msgstr "Integration with Launchpad.net"
9454
9455
#: dummy/help_topics/launchpad/detail.txt:3
9456
msgid ""
9457
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9458
"specification tracking."
9459
msgstr ""
9460
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9461
"specification tracking."
9462
9463
#: dummy/help_topics/launchpad/detail.txt:6
9464
msgid ""
9465
"The bzr client (through the plugin called 'launchpad') has special\n"
9466
"features to communicate with Launchpad:"
9467
msgstr ""
9468
"The bzr client (through the plugin called 'launchpad') has special\n"
9469
"features to communicate with Launchpad:"
9470
9471
#: dummy/help_topics/launchpad/detail.txt:9
9472
msgid ""
9473
" * The launchpad-login command tells Bazaar your Launchpad user name. "
9474
"This\n"
9475
" is then used by the 'lp:' transport to download your branches using\n"
9476
" bzr+ssh://."
9477
msgstr ""
9478
" * The launchpad-login command tells Bazaar your Launchpad user name. "
9479
"This\n"
9480
" is then used by the 'lp:' transport to download your branches using\n"
9481
" bzr+ssh://."
9482
9483
#: dummy/help_topics/launchpad/detail.txt:13
9484
msgid ""
9485
" * The 'lp:' transport uses Launchpad as a directory service: for "
9486
"example\n"
9487
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
9488
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
9489
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
9490
msgstr ""
9491
" * The 'lp:' transport uses Launchpad as a directory service: for "
9492
"example\n"
9493
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
9494
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
9495
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
9496
9497
#: dummy/help_topics/launchpad/detail.txt:18
9498
msgid ""
9499
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
9500
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
9501
"lp:12345'\n"
9502
" will record a revision property that marks that revision as fixing\n"
9503
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
9504
" automatically be linked to the bug report."
9505
msgstr ""
9506
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
9507
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
9508
"lp:12345'\n"
9509
" will record a revision property that marks that revision as fixing\n"
9510
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
9511
" automatically be linked to the bug report."
9512
9513
#: dummy/help_topics/launchpad/detail.txt:24
9514
msgid ""
9515
" * The register-branch command tells Launchpad about the url of a\n"
9516
" public branch. Launchpad will then mirror the branch, display\n"
9517
" its contents and allow it to be attached to bugs and other\n"
9518
" objects."
9519
msgstr ""
9520
" * The register-branch command tells Launchpad about the url of a\n"
9521
" public branch. Launchpad will then mirror the branch, display\n"
9522
" its contents and allow it to be attached to bugs and other\n"
9523
" objects."
9524
9525
#: dummy/help_topics/launchpad/detail.txt:29
9526
msgid "For more information see http://help.launchpad.net/\n"
9527
msgstr "For more information see http://help.launchpad.net/\n"
9528
9529
#: dummy/help_topics/launchpad/summary.txt:1
9530
msgid "Using Bazaar with Launchpad.net"
9531
msgstr "Using Bazaar with Launchpad.net"
9532
9533
#: dummy/help_topics/location-alias/summary.txt:1
9534
msgid "Aliases for remembered locations"
9535
msgstr "Aliases for remembered locations"
9536
9537
#: dummy/help_topics/log-formats/summary.txt:1
9538
msgid "Details on the logging formats available"
9539
msgstr "Details on the logging formats available"
9540
9541
#: dummy/help_topics/other-formats/summary.txt:1
9542
msgid "Experimental and deprecated storage formats"
9543
msgstr "Experimental and deprecated storage formats"
9544
9545
#: dummy/help_topics/patterns/summary.txt:1
9546
msgid "Information on the pattern syntax"
9547
msgstr "Information on the pattern syntax"
9548
9549
#: dummy/help_topics/repositories/detail.txt:1
9550
msgid "Repositories"
9551
msgstr "Repositories"
9552
9553
#: dummy/help_topics/repositories/detail.txt:3
9554
msgid ""
9555
"Repositories in Bazaar are where committed information is stored. There is\n"
9556
"a repository associated with every branch."
9557
msgstr ""
9558
"Repositories in Bazaar are where committed information is stored. There is\n"
9559
"a repository associated with every branch."
9560
9561
#: dummy/help_topics/repositories/detail.txt:6
9562
msgid ""
9563
"Repositories are a form of database. Bzr will usually maintain this for\n"
9564
"good performance automatically, but in some situations (e.g. when doing\n"
9565
"very many commits in a short time period) you may want to ask bzr to\n"
9566
"optimise the database indices. This can be done by the 'bzr pack' command."
9567
msgstr ""
9568
"Repositories are a form of database. Bzr will usually maintain this for\n"
9569
"good performance automatically, but in some situations (e.g. when doing\n"
9570
"very many commits in a short time period) you may want to ask bzr to\n"
9571
"optimise the database indices. This can be done by the 'bzr pack' command."
9572
9573
#: dummy/help_topics/repositories/detail.txt:11
9574
msgid ""
9575
"By default just running 'bzr init' will create a repository within the new\n"
9576
"branch but it is possible to create a shared repository which allows "
9577
"multiple\n"
9578
"branches to share their information in the same location. When a new branch "
9579
"is\n"
9580
"created it will first look to see if there is a containing shared repository "
9581
"it\n"
9582
"can use."
9583
msgstr ""
9584
"By default just running 'bzr init' will create a repository within the new\n"
9585
"branch but it is possible to create a shared repository which allows "
9586
"multiple\n"
9587
"branches to share their information in the same location. When a new branch "
9588
"is\n"
9589
"created it will first look to see if there is a containing shared repository "
9590
"it\n"
9591
"can use."
9592
9593
#: dummy/help_topics/repositories/detail.txt:17
9594
msgid ""
9595
"When two branches of the same project share a repository, there is\n"
9596
"generally a large space saving. For some operations (e.g. branching\n"
9597
"within the repository) this translates in to a large time saving."
9598
msgstr ""
9599
"When two branches of the same project share a repository, there is\n"
9600
"generally a large space saving. For some operations (e.g. branching\n"
9601
"within the repository) this translates in to a large time saving."
9602
9603
#: dummy/help_topics/repositories/detail.txt:21
9604
msgid ""
9605
"To create a shared repository use the init-repository command (or the alias\n"
9606
"init-repo). This command takes the location of the repository to create. "
9607
"This\n"
9608
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
9609
"which contains a shared repository. Any new branches that are created in "
9610
"this\n"
9611
"directory will then use it for storage."
9612
msgstr ""
9613
"To create a shared repository use the init-repository command (or the alias\n"
9614
"init-repo). This command takes the location of the repository to create. "
9615
"This\n"
9616
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
9617
"which contains a shared repository. Any new branches that are created in "
9618
"this\n"
9619
"directory will then use it for storage."
9620
9621
#: dummy/help_topics/repositories/detail.txt:27
9622
msgid ""
9623
"It is a good idea to create a repository whenever you might create more\n"
9624
"than one branch of a project. This is true for both working areas where you\n"
9625
"are doing the development, and any server areas that you use for hosting\n"
9626
"projects. In the latter case, it is common to want branches without working\n"
9627
"trees. Since the files in the branch will not be edited directly there is "
9628
"no\n"
9629
"need to use up disk space for a working tree. To create a repository in "
9630
"which\n"
9631
"the branches will not have working trees pass the '--no-trees' option to\n"
9632
"'init-repository'."
9633
msgstr ""
9634
"It is a good idea to create a repository whenever you might create more\n"
9635
"than one branch of a project. This is true for both working areas where you\n"
9636
"are doing the development, and any server areas that you use for hosting\n"
9637
"projects. In the latter case, it is common to want branches without working\n"
9638
"trees. Since the files in the branch will not be edited directly there is "
9639
"no\n"
9640
"need to use up disk space for a working tree. To create a repository in "
9641
"which\n"
9642
"the branches will not have working trees pass the '--no-trees' option to\n"
9643
"'init-repository'."
9644
9645
#: dummy/help_topics/repositories/detail.txt:38
9646
msgid ""
9647
" init-repository Create a shared repository. Use --no-trees to create "
9648
"one\n"
9649
" in which new branches won't get a working tree.\n"
9650
msgstr ""
9651
" init-repository Create a shared repository. Use --no-trees to create "
9652
"one\n"
9653
" in which new branches won't get a working tree.\n"
9654
9655
#: dummy/help_topics/repositories/summary.txt:1
9656
msgid "Basic information on shared repositories."
9657
msgstr "Basic information on shared repositories."
9658
9659
#: dummy/help_topics/revisionspec/summary.txt:1
9660
msgid "Explain how to use --revision"
9661
msgstr "Explain how to use --revision"
9662
9663
#: dummy/help_topics/rules/summary.txt:1
9664
msgid "Information on defining rule-based preferences"
9665
msgstr "Information on defining rule-based preferences"
9666
9667
#: dummy/help_topics/standalone-trees/detail.txt:1
9668
msgid "Standalone Trees"
9669
msgstr "Standalone Trees"
9670
9671
#: dummy/help_topics/standalone-trees/detail.txt:3
9672
msgid ""
9673
"A standalone tree is a working tree with an associated repository. It\n"
9674
"is an independently usable branch, with no dependencies on any other.\n"
9675
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
9676
"an existing project under version control."
9677
msgstr ""
9678
"A standalone tree is a working tree with an associated repository. It\n"
9679
"is an independently usable branch, with no dependencies on any other.\n"
9680
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
9681
"an existing project under version control."
9682
9683
#: dummy/help_topics/standalone-trees/detail.txt:8
9684
msgid "Related Commands::"
9685
msgstr "Related Commands::"
9686
9687
#: dummy/help_topics/standalone-trees/detail.txt:10
9688
msgid " init Make a directory into a versioned branch.\n"
9689
msgstr " init Make a directory into a versioned branch.\n"
9690
9691
#: dummy/help_topics/standalone-trees/summary.txt:1
9692
msgid "Information on what a standalone tree is"
9693
msgstr "Information on what a standalone tree is"
9694
9695
#: dummy/help_topics/standard-options/detail.txt:1
9696
msgid "Standard Options"
9697
msgstr "Standard Options"
9698
9699
#: dummy/help_topics/standard-options/detail.txt:3
9700
msgid "Standard options are legal for all commands."
9701
msgstr "Standard options are legal for all commands."
9702
9703
#: dummy/help_topics/standard-options/detail.txt:5
9704
msgid ""
9705
"--help, -h Show help message.\n"
9706
"--verbose, -v Display more information.\n"
9707
"--quiet, -q Only display errors and warnings."
9708
msgstr ""
9709
"--help, -h Show help message.\n"
9710
"--verbose, -v Display more information.\n"
9711
"--quiet, -q Only display errors and warnings."
9712
9713
#: dummy/help_topics/standard-options/detail.txt:9
9714
msgid "Unlike global options, standard options can be used in aliases.\n"
9715
msgstr "Unlike global options, standard options can be used in aliases.\n"
9716
9717
#: dummy/help_topics/standard-options/summary.txt:1
9718
msgid "Options that can be used with any command"
9719
msgstr "Options that can be used with any command"
9720
9721
#: dummy/help_topics/status-flags/detail.txt:1
9722
msgid "Status Flags"
9723
msgstr "Status Flags"
9724
9725
#: dummy/help_topics/status-flags/detail.txt:3
9726
msgid ""
9727
"Status flags are used to summarise changes to the working tree in a concise\n"
9728
"manner. They are in the form::"
9729
msgstr ""
9730
"Status flags are used to summarise changes to the working tree in a concise\n"
9731
"manner. They are in the form::"
9732
9733
#: dummy/help_topics/status-flags/detail.txt:6
9734
msgid " xxx <filename>"
9735
msgstr " xxx <filename>"
9736
9737
#: dummy/help_topics/status-flags/detail.txt:8
9738
msgid "where the columns' meanings are as follows."
9739
msgstr "where the columns' meanings are as follows."
9740
9741
#: dummy/help_topics/status-flags/detail.txt:10
9742
msgid "Column 1 - versioning/renames::"
9743
msgstr "Column 1 - versioning/renames::"
9744
9745
#: dummy/help_topics/status-flags/detail.txt:12
9746
msgid ""
9747
" + File versioned\n"
9748
" - File unversioned\n"
9749
" R File renamed\n"
9750
" ? File unknown\n"
9751
" X File nonexistent (and unknown to bzr)\n"
9752
" C File has conflicts\n"
9753
" P Entry for a pending merge (not a file)"
9754
msgstr ""
9755
" + File versioned\n"
9756
" - File unversioned\n"
9757
" R File renamed\n"
9758
" ? File unknown\n"
9759
" X File non-existent (and unknown to bzr)\n"
9760
" C File has conflicts\n"
9761
" P Entry for a pending merge (not a file)"
9762
9763
#: dummy/help_topics/status-flags/detail.txt:20
9764
msgid "Column 2 - contents::"
9765
msgstr "Column 2 - contents::"
9766
9767
#: dummy/help_topics/status-flags/detail.txt:22
9768
msgid ""
9769
" N File created\n"
9770
" D File deleted\n"
9771
" K File kind changed\n"
9772
" M File modified"
9773
msgstr ""
9774
" N File created\n"
9775
" D File deleted\n"
9776
" K File kind changed\n"
9777
" M File modified"
9778
9779
#: dummy/help_topics/status-flags/detail.txt:27
9780
msgid "Column 3 - execute::"
9781
msgstr "Column 3 - execute::"
9782
9783
#: dummy/help_topics/status-flags/detail.txt:29
9784
msgid " * The execute bit was changed\n"
9785
msgstr " * The execute bit was changed\n"
9786
9787
#: dummy/help_topics/status-flags/summary.txt:1
9788
msgid "Help on status flags"
9789
msgstr "Help on status flags"
9790
9791
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
9792
msgid "Branches Out of Sync"
9793
msgstr "Branches Out of Sync"
9794
9795
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
9796
msgid ""
9797
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
9798
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
9799
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
9800
"have the same last revision as the new reference branch for the lightweight\n"
9801
"checkout, data could be lost, so Bazaar refuses."
9802
msgstr ""
9803
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
9804
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
9805
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
9806
"have the same last revision as the new reference branch for the lightweight\n"
9807
"checkout, data could be lost, so Bazaar refuses."
9808
9809
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
9810
msgid "How you deal with this depends on *why* the branches are out of sync."
9811
msgstr ""
9812
"How you deal with this depends on *why* the branches are out of sync."
9813
9814
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
9815
msgid ""
9816
"If you have a checkout and have done local commits, you can get back in "
9817
"sync\n"
9818
"by running \"bzr update\" (and possibly \"bzr commit\")."
9819
msgstr ""
9820
"If you have a checkout and have done local commits, you can get back in "
9821
"sync\n"
9822
"by running \"bzr update\" (and possibly \"bzr commit\")."
9823
9824
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
9825
msgid ""
9826
"If you have a branch and the remote branch is out-of-date, you can push\n"
9827
"the local changes using \"bzr push\". If the local branch is out of date, "
9828
"you\n"
9829
"can do \"bzr pull\". If both branches have had changes, you can merge, "
9830
"commit\n"
9831
"and then push your changes. If you decide that some of the changes aren't\n"
9832
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
9833
msgstr ""
9834
"If you have a branch and the remote branch is out-of-date, you can push\n"
9835
"the local changes using \"bzr push\". If the local branch is out of date, "
9836
"you\n"
9837
"can do \"bzr pull\". If both branches have had changes, you can merge, "
9838
"commit\n"
9839
"and then push your changes. If you decide that some of the changes aren't\n"
9840
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
9841
9842
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
9843
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
9844
msgstr "Steps to resolve \"out-of-sync\" when reconfiguring"
9845
9846
#: dummy/help_topics/topics/summary.txt:1
9847
msgid "Topics list"
9848
msgstr "Topics list"
9849
9850
#: dummy/help_topics/url-special-chars/summary.txt:1
9851
msgid "Special character handling in URLs"
9852
msgstr "Special character handling in URLs"
9853
9854
#: dummy/help_topics/urlspec/summary.txt:1
9855
msgid "Supported transport protocols"
9856
msgstr "Supported transport protocols"
9857
9858
#: dummy/help_topics/working-trees/detail.txt:1
9859
msgid "Working Trees"
9860
msgstr "Working Trees"
9861
9862
#: dummy/help_topics/working-trees/detail.txt:3
9863
msgid ""
9864
"A working tree is the contents of a branch placed on disk so that you can\n"
9865
"see the files and edit them. The working tree is where you make changes to "
9866
"a\n"
9867
"branch, and when you commit the current state of the working tree is the\n"
9868
"snapshot that is recorded in the commit."
9869
msgstr ""
9870
"A working tree is the contents of a branch placed on disk so that you can\n"
9871
"see the files and edit them. The working tree is where you make changes to "
9872
"a\n"
9873
"branch, and when you commit the current state of the working tree is the\n"
9874
"snapshot that is recorded in the commit."
9875
9876
#: dummy/help_topics/working-trees/detail.txt:8
9877
msgid ""
9878
"When you push a branch to a remote system, a working tree will not be\n"
9879
"created. If one is already present the files will not be updated. The\n"
9880
"branch information will be updated and the working tree will be marked\n"
9881
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
9882
"may be uncommitted changes or the update may cause content conflicts that "
9883
"are\n"
9884
"difficult to deal with remotely."
9885
msgstr ""
9886
"When you push a branch to a remote system, a working tree will not be\n"
9887
"created. If one is already present the files will not be updated. The\n"
9888
"branch information will be updated and the working tree will be marked\n"
9889
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
9890
"may be uncommitted changes or the update may cause content conflicts that "
9891
"are\n"
9892
"difficult to deal with remotely."
9893
9894
#: dummy/help_topics/working-trees/detail.txt:15
9895
msgid ""
9896
"If you have a branch with no working tree you can use the 'checkout' "
9897
"command\n"
9898
"to create a working tree. If you run 'bzr checkout .' from the branch it "
9899
"will\n"
9900
"create the working tree. If the branch is updated remotely, you can update "
9901
"the\n"
9902
"working tree by running 'bzr update' in that directory."
9903
msgstr ""
9904
"If you have a branch with no working tree you can use the 'checkout' "
9905
"command\n"
9906
"to create a working tree. If you run 'bzr checkout .' from the branch it "
9907
"will\n"
9908
"create the working tree. If the branch is updated remotely, you can update "
9909
"the\n"
9910
"working tree by running 'bzr update' in that directory."
9911
9912
#: dummy/help_topics/working-trees/detail.txt:20
9913
msgid ""
9914
"If you have a branch with a working tree that you do not want the 'remove-"
9915
"tree'\n"
9916
"command will remove the tree if it is safe. This can be done to avoid the\n"
9917
"warning about the remote working tree not being updated when pushing to the\n"
9918
"branch. It can also be useful when working with a '--no-trees' repository\n"
9919
"(see 'bzr help repositories')."
9920
msgstr ""
9921
"If you have a branch with a working tree that you do not want the 'remove-"
9922
"tree'\n"
9923
"command will remove the tree if it is safe. This can be done to avoid the\n"
9924
"warning about the remote working tree not being updated when pushing to the\n"
9925
"branch. It can also be useful when working with a '--no-trees' repository\n"
9926
"(see 'bzr help repositories')."
9927
9928
#: dummy/help_topics/working-trees/detail.txt:26
9929
msgid ""
9930
"If you want to have a working tree on a remote machine that you push to you\n"
9931
"can either run 'bzr update' in the remote branch after each push, or use "
9932
"some\n"
9933
"other method to update the tree during the push. There is an 'rspush' "
9934
"plugin\n"
9935
"that will update the working tree using rsync as well as doing a push. "
9936
"There\n"
9937
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
9938
"SSH\n"
9939
"after each push."
9940
msgstr ""
9941
"If you want to have a working tree on a remote machine that you push to you\n"
9942
"can either run 'bzr update' in the remote branch after each push, or use "
9943
"some\n"
9944
"other method to update the tree during the push. There is an 'rspush' "
9945
"plugin\n"
9946
"that will update the working tree using rsync as well as doing a push. "
9947
"There\n"
9948
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
9949
"SSH\n"
9950
"after each push."
9951
9952
#: dummy/help_topics/working-trees/detail.txt:33
9953
msgid "Useful commands::"
9954
msgstr "Useful commands::"
9955
9956
#: dummy/help_topics/working-trees/detail.txt:35
9957
msgid ""
9958
" checkout Create a working tree when a branch does not have one.\n"
9959
" remove-tree Removes the working tree from a branch when it is safe to do "
9960
"so.\n"
9961
" update When a working tree is out of sync with its associated "
9962
"branch\n"
9963
" this will update the tree to match the branch.\n"
9964
msgstr ""
9965
" checkout Create a working tree when a branch does not have one.\n"
9966
" remove-tree Removes the working tree from a branch when it is safe to do "
9967
"so.\n"
9968
" update When a working tree is out of sync with its associated "
9969
"branch\n"
9970
" this will update the tree to match the branch.\n"
9971
9972
#: dummy/help_topics/working-trees/summary.txt:1
9973
msgid "Information on working trees"
9974
msgstr "Information on working trees"
9975
9976
#: en/help_topics/authentication.txt:1
9977
msgid ""
9978
"Authentication Settings\n"
9979
"======================="
9980
msgstr ""
9981
"Authentication Settings\n"
9982
"======================="
9983
9984
#: en/help_topics/authentication.txt:4
9985
msgid ""
9986
"\n"
9987
"Intent\n"
9988
"------"
9989
msgstr ""
9990
"\n"
9991
"Intent\n"
9992
"------"
9993
9994
#: en/help_topics/authentication.txt:8
9995
msgid ""
9996
"Many different authentication policies can be described in the\n"
9997
"``authentication.conf`` file but a particular user should need only a few\n"
9998
"definitions to cover his needs without having to specify a user and a "
9999
"password\n"
10000
"for every branch he uses."
10001
msgstr ""
10002
"Many different authentication policies can be described in the\n"
10003
"``authentication.conf`` file but a particular user should need only a few\n"
10004
"definitions to cover his needs without having to specify a user and a "
10005
"password\n"
10006
"for every branch he uses."
10007
10008
#: en/help_topics/authentication.txt:13
10009
msgid ""
10010
"The definitions found in this file are used to find the credentials to use "
10011
"for\n"
10012
"a given url. The same credentials can generally be used for as many branches "
10013
"as\n"
10014
"possible by grouping their declaration around the remote servers that need\n"
10015
"them. It's even possible to declare credentials that will be used by "
10016
"different\n"
10017
"servers."
10018
msgstr ""
10019
"The definitions found in this file are used to find the credentials to use "
10020
"for\n"
10021
"a given url. The same credentials can generally be used for as many branches "
10022
"as\n"
10023
"possible by grouping their declaration around the remote servers that need\n"
10024
"them. It's even possible to declare credentials that will be used by "
10025
"different\n"
10026
"servers."
10027
10028
#: en/help_topics/authentication.txt:19
10029
msgid ""
10030
"The intent is to make this file as small as possible to minimize maintenance."
10031
msgstr ""
10032
"The intent is to make this file as small as possible to minimise maintenance."
10033
10034
#: en/help_topics/authentication.txt:21
10035
msgid ""
10036
"Once the relevant credentials are declared in this file you may use branch "
10037
"urls\n"
10038
"without embedding passwords (security hazard) or even users (enabling "
10039
"sharing\n"
10040
"of your urls with others)."
10041
msgstr ""
10042
"Once the relevant credentials are declared in this file you may use branch "
10043
"urls\n"
10044
"without embedding passwords (security hazard) or even users (enabling "
10045
"sharing\n"
10046
"of your urls with others)."
10047
10048
#: en/help_topics/authentication.txt:25
10049
msgid "Instead of using::"
10050
msgstr "Instead of using::"
10051
10052
#: en/help_topics/authentication.txt:27
10053
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
10054
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
10055
10056
#: en/help_topics/authentication.txt:29
10057
msgid "you simply use::"
10058
msgstr "you simply use::"
10059
10060
#: en/help_topics/authentication.txt:31
10061
msgid " bzr branch ftp://host.com/path/to/my/branch"
10062
msgstr " bzr branch ftp://host.com/path/to/my/branch"
10063
10064
#: en/help_topics/authentication.txt:33
10065
msgid ""
10066
"provided you have created the following ``authentication.conf`` file::"
10067
msgstr ""
10068
"provided you have created the following ``authentication.conf`` file::"
10069
10070
#: en/help_topics/authentication.txt:35
10071
msgid ""
10072
" [myprojects]\n"
10073
" scheme=ftp\n"
10074
" host=host.com\n"
10075
" user=joe\n"
10076
" password=secret\n"
10077
" "
10078
msgstr ""
10079
" [myprojects]\n"
10080
" scheme=ftp\n"
10081
" host=host.com\n"
10082
" user=joe\n"
10083
" password=secret\n"
10084
" "
10085
10086
#: en/help_topics/authentication.txt:42
10087
msgid ""
10088
"Authentication definitions\n"
10089
"--------------------------"
10090
msgstr ""
10091
"Authentication definitions\n"
10092
"--------------------------"
10093
10094
#: en/help_topics/authentication.txt:45
10095
msgid ""
10096
"There are two kinds of authentication used by the various schemes supported "
10097
"by\n"
10098
"bzr:"
10099
msgstr ""
10100
"There are two kinds of authentication used by the various schemes supported "
10101
"by\n"
10102
"bzr:"
10103
10104
#: en/help_topics/authentication.txt:48
10105
msgid "1. user and password"
10106
msgstr "1. user and password"
10107
10108
#: en/help_topics/authentication.txt:50
10109
msgid ""
10110
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
10111
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
10112
"ssh agents are a better, more secure solution. So we have chosen to not "
10113
"provide\n"
10114
"our own less secure method."
10115
msgstr ""
10116
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
10117
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
10118
"ssh agents are a better, more secure solution. So we have chosen to not "
10119
"provide\n"
10120
"our own less secure method."
10121
10122
#: en/help_topics/authentication.txt:55
10123
msgid "2. user, realm and password"
10124
msgstr "2. user, realm and password"
10125
10126
#: en/help_topics/authentication.txt:57
10127
msgid ""
10128
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
10129
"against a host. But, by using ``.htaccess`` files, for example, it is "
10130
"possible\n"
10131
"to define several (``user, realm, password``) for a given ``host``. So what "
10132
"is\n"
10133
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
10134
"is\n"
10135
"not taken into account in the definitions, but will displayed if bzr "
10136
"prompts\n"
10137
"you for a password."
10138
msgstr ""
10139
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
10140
"against a host. But, by using ``.htaccess`` files, for example, it is "
10141
"possible\n"
10142
"to define several (``user, realm, password``) for a given ``host``. So what "
10143
"is\n"
10144
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
10145
"is\n"
10146
"not taken into account in the definitions, but will displayed if bzr "
10147
"prompts\n"
10148
"you for a password."
10149
10150
#: en/help_topics/authentication.txt:64
10151
msgid ""
10152
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
10153
"specifying the appropriate port."
10154
msgstr ""
10155
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
10156
"specifying the appropriate port."
10157
10158
#: en/help_topics/authentication.txt:67
10159
msgid ""
10160
"To take all schemes into account, the password will be deduced from a set "
10161
"of\n"
10162
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
10163
"``user``,\n"
10164
"``password``)."
10165
msgstr ""
10166
"To take all schemes into account, the password will be deduced from a set "
10167
"of\n"
10168
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
10169
"``user``,\n"
10170
"``password``)."
10171
10172
#: en/help_topics/authentication.txt:71
10173
msgid ""
10174
" * ``scheme``: can be empty (meaning the rest of the definition can be "
10175
"used\n"
10176
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
10177
"``ssh``\n"
10178
" should be used instead since this is the real scheme regarding\n"
10179
" authentication,"
10180
msgstr ""
10181
" * ``scheme``: can be empty (meaning the rest of the definition can be "
10182
"used\n"
10183
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
10184
"``ssh``\n"
10185
" should be used instead since this is the real scheme regarding\n"
10186
" authentication,"
10187
10188
#: en/help_topics/authentication.txt:76
10189
msgid " * ``host``: can be empty (to act as a default for any host),"
10190
msgstr " * ``host``: can be empty (to act as a default for any host),"
10191
10192
#: en/help_topics/authentication.txt:78
10193
msgid ""
10194
" * ``port`` can be empty (useful when an host provides several servers for "
10195
"the\n"
10196
" same scheme), only numerical values are allowed, this should be used "
10197
"only\n"
10198
" when the server uses a port different than the scheme standard port,"
10199
msgstr ""
10200
" * ``port`` can be empty (useful when an host provides several servers for "
10201
"the\n"
10202
" same scheme), only numerical values are allowed, this should be used "
10203
"only\n"
10204
" when the server uses a port different than the scheme standard port,"
10205
10206
#: en/help_topics/authentication.txt:82
10207
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
10208
msgstr " * ``path``: can be empty (FTP or SFTP will never user it),"
10209
10210
#: en/help_topics/authentication.txt:84
10211
msgid ""
10212
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
10213
" ``getpass.get_user()``),"
10214
msgstr ""
10215
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
10216
" ``getpass.get_user()``),"
10217
10218
#: en/help_topics/authentication.txt:87
10219
msgid ""
10220
" * ``password``: can be empty if you prefer to always be prompted for your\n"
10221
" password."
10222
msgstr ""
10223
" * ``password``: can be empty if you prefer to always be prompted for your\n"
10224
" password."
10225
10226
#: en/help_topics/authentication.txt:90
10227
msgid ""
10228
"Multiple definitions can be provided and, for a given URL, bzr will select "
10229
"a\n"
10230
"(``user`` [, ``password``]) based on the following rules :"
10231
msgstr ""
10232
"Multiple definitions can be provided and, for a given URL, bzr will select "
10233
"a\n"
10234
"(``user`` [, ``password``]) based on the following rules :"
10235
10236
#: en/help_topics/authentication.txt:93
10237
msgid " 1. the first match wins,"
10238
msgstr " 1. the first match wins,"
10239
10240
#: en/help_topics/authentication.txt:95
10241
msgid " 2. empty fields match everything,"
10242
msgstr " 2. empty fields match everything,"
10243
10244
#: en/help_topics/authentication.txt:97
10245
msgid ""
10246
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
10247
msgstr ""
10248
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
10249
10250
#: en/help_topics/authentication.txt:99
10251
msgid ""
10252
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
10253
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
10254
"``projectbzr.sf.net``\n"
10255
" will not match ``bzr.sf.net``)."
10256
msgstr ""
10257
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
10258
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
10259
"``projectbzr.sf.net``\n"
10260
" will not match ``bzr.sf.net``)."
10261
10262
#: en/help_topics/authentication.txt:103
10263
msgid ""
10264
" 5. ``port`` matches if included in the requested URL (exact matches only)"
10265
msgstr ""
10266
" 5. ``port`` matches if included in the requested URL (exact matches only)"
10267
10268
#: en/help_topics/authentication.txt:105
10269
msgid ""
10270
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
10271
"above,\n"
10272
" empty paths will match any provided path)."
10273
msgstr ""
10274
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
10275
"above,\n"
10276
" empty paths will match any provided path)."
10277
10278
#: en/help_topics/authentication.txt:110
10279
msgid ""
10280
"File format\n"
10281
"-----------"
10282
msgstr ""
10283
"File format\n"
10284
"-----------"
10285
10286
#: en/help_topics/authentication.txt:113
10287
msgid ""
10288
"The general rules for :doc:`configuration files <configuration-help>`\n"
10289
"apply except for the variable policies."
10290
msgstr ""
10291
"The general rules for :doc:`configuration files <configuration-help>`\n"
10292
"apply except for the variable policies."
10293
10294
#: en/help_topics/authentication.txt:116
10295
msgid "Each section describes an authentication definition."
10296
msgstr "Each section describes an authentication definition."
10297
10298
#: en/help_topics/authentication.txt:118
10299
msgid ""
10300
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
10301
"reserved\n"
10302
"and should appear as the *last* section."
10303
msgstr ""
10304
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
10305
"reserved\n"
10306
"and should appear as the *last* section."
10307
10308
#: en/help_topics/authentication.txt:121
10309
msgid "Each section should define:"
10310
msgstr "Each section should define:"
10311
10312
#: en/help_topics/authentication.txt:123
10313
msgid "* ``user``: the login to be used,"
10314
msgstr "* ``user``: the login to be used,"
10315
10316
#: en/help_topics/authentication.txt:125
10317
msgid "Each section could define:"
10318
msgstr "Each section could define:"
10319
10320
#: en/help_topics/authentication.txt:127
10321
msgid "* ``host``: the remote server,"
10322
msgstr "* ``host``: the remote server,"
10323
10324
#: en/help_topics/authentication.txt:129
10325
msgid "* ``port``: the port the server is listening,"
10326
msgstr "* ``port``: the port the server is listening,"
10327
10328
#: en/help_topics/authentication.txt:131
10329
msgid "* ``path``: the branch location,"
10330
msgstr "* ``path``: the branch location,"
10331
10332
#: en/help_topics/authentication.txt:133
10333
msgid "* ``password``: the password."
10334
msgstr "* ``password``: the password."
10335
10336
#: en/help_topics/authentication.txt:135
10337
msgid ""
10338
"\n"
10339
"Examples\n"
10340
"--------"
10341
msgstr ""
10342
"\n"
10343
"Examples\n"
10344
"--------"
10345
10346
#: en/help_topics/authentication.txt:139
10347
msgid ""
10348
"\n"
10349
"Personal projects hosted outside\n"
10350
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10351
msgstr ""
10352
"\n"
10353
"Personal projects hosted outside\n"
10354
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10355
10356
#: en/help_topics/authentication.txt:143
10357
msgid ""
10358
"All connections are done with the same ``user`` (the remote one for which "
10359
"the\n"
10360
"default bzr one is not appropriate) and the password is always prompted "
10361
"with\n"
10362
"some exceptions::"
10363
msgstr ""
10364
"All connections are done with the same ``user`` (the remote one for which "
10365
"the\n"
10366
"default bzr one is not appropriate) and the password is always prompted "
10367
"with\n"
10368
"some exceptions::"
10369
10370
#: en/help_topics/authentication.txt:147
10371
msgid ""
10372
" # Pet projects on hobby.net\n"
10373
" [hobby]\n"
10374
" host=r.hobby.net\n"
10375
" user=jim\n"
10376
" password=obvious1234\n"
10377
" \n"
10378
" # Home server\n"
10379
" [home]\n"
10380
" scheme=https\n"
10381
" host=home.net\n"
10382
" user=joe\n"
10383
" password=1essobV10us\n"
10384
" \n"
10385
" [DEFAULT]\n"
10386
" # Our local user is barbaz, on all remote sites we're known as "
10387
"foobar\n"
10388
" user=foobar"
10389
msgstr ""
10390
" # Pet projects on hobby.net\n"
10391
" [hobby]\n"
10392
" host=r.hobby.net\n"
10393
" user=jim\n"
10394
" password=obvious1234\n"
10395
" \n"
10396
" # Home server\n"
10397
" [home]\n"
10398
" scheme=https\n"
10399
" host=home.net\n"
10400
" user=joe\n"
10401
" password=1essobV10us\n"
10402
" \n"
10403
" [DEFAULT]\n"
10404
" # Our local user is barbaz, on all remote sites we're known as "
10405
"foobar\n"
10406
" user=foobar"
10407
10408
#: en/help_topics/authentication.txt:164
10409
msgid ""
10410
"\n"
10411
"Source hosting provider\n"
10412
"~~~~~~~~~~~~~~~~~~~~~~~"
10413
msgstr ""
10414
"\n"
10415
"Source hosting provider\n"
10416
"~~~~~~~~~~~~~~~~~~~~~~~"
10417
10418
#: en/help_topics/authentication.txt:168
10419
msgid "In the shp.net (fictitious) domain, each project has its own site::"
10420
msgstr "In the shp.net (fictitious) domain, each project has its own site::"
10421
10422
#: en/help_topics/authentication.txt:170
10423
msgid ""
10424
" [shpnet domain]\n"
10425
" # we use sftp, but ssh is the scheme used for authentication\n"
10426
" scheme=ssh\n"
10427
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
10428
" host=.shp.net\n"
10429
" user=joe\n"
10430
" # bzr don't support supplying a password for sftp,\n"
10431
" # consider using an ssh agent if you don't want to supply\n"
10432
" # a password interactively. (pageant, ssh-agent, etc)"
10433
msgstr ""
10434
" [shpnet domain]\n"
10435
" # we use sftp, but ssh is the scheme used for authentication\n"
10436
" scheme=ssh\n"
10437
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
10438
" host=.shp.net\n"
10439
" user=joe\n"
10440
" # bzr don't support supplying a password for sftp,\n"
10441
" # consider using an ssh agent if you don't want to supply\n"
10442
" # a password interactively. (pageant, ssh-agent, etc)"
10443
10444
#: en/help_topics/authentication.txt:180
10445
msgid ""
10446
"HTTPS, SFTP servers and their proxy\n"
10447
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10448
msgstr ""
10449
"HTTPS, SFTP servers and their proxy\n"
10450
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10451
10452
#: en/help_topics/authentication.txt:183
10453
msgid ""
10454
"At company.com, the server hosting release and integration branches is "
10455
"behind a\n"
10456
"proxy, and the two branches use different authentication policies::"
10457
msgstr ""
10458
"At company.com, the server hosting release and integration branches is "
10459
"behind a\n"
10460
"proxy, and the two branches use different authentication policies::"
10461
10462
#: en/help_topics/authentication.txt:186
10463
msgid ""
10464
" [reference code]\n"
10465
" scheme=https\n"
10466
" host=dev.company.com\n"
10467
" path=/dev\n"
10468
" user=user1\n"
10469
" password=pass1"
10470
msgstr ""
10471
" [reference code]\n"
10472
" scheme=https\n"
10473
" host=dev.company.com\n"
10474
" path=/dev\n"
10475
" user=user1\n"
10476
" password=pass1"
10477
10478
#: en/help_topics/authentication.txt:193
10479
msgid ""
10480
" # development branches on dev server\n"
10481
" [dev]\n"
10482
" scheme=ssh # bzr+ssh and sftp are available here\n"
10483
" host=dev.company.com\n"
10484
" path=/dev/integration\n"
10485
" user=user2\n"
10486
" \n"
10487
" # proxy\n"
10488
" [proxy]\n"
10489
" scheme=http\n"
10490
" host=proxy.company.com\n"
10491
" port=3128\n"
10492
" user=proxyuser1\n"
10493
" password=proxypass1"
10494
msgstr ""
10495
" # development branches on dev server\n"
10496
" [dev]\n"
10497
" scheme=ssh # bzr+ssh and sftp are available here\n"
10498
" host=dev.company.com\n"
10499
" path=/dev/integration\n"
10500
" user=user2\n"
10501
" \n"
10502
" # proxy\n"
10503
" [proxy]\n"
10504
" scheme=http\n"
10505
" host=proxy.company.com\n"
10506
" port=3128\n"
10507
" user=proxyuser1\n"
10508
" password=proxypass1"
10509
10510
#: en/help_topics/authentication.txt:208
10511
msgid ""
10512
"\n"
10513
"Planned enhancements\n"
10514
"--------------------"
10515
msgstr ""
10516
"\n"
10517
"Planned enhancements\n"
10518
"--------------------"
10519
10520
#: en/help_topics/authentication.txt:212
10521
msgid ""
10522
"The following are not yet implemented but planned as parts of a work in\n"
10523
"progress:"
10524
msgstr ""
10525
"The following are not yet implemented but planned as parts of a work in\n"
10526
"progress:"
10527
10528
#: en/help_topics/authentication.txt:215
10529
msgid "* add a ``password_encoding`` field allowing:"
10530
msgstr "* add a ``password_encoding`` field allowing:"
10531
10532
#: en/help_topics/authentication.txt:217
10533
msgid ""
10534
" - storing the passwords in various obfuscating encodings (base64 for one),"
10535
msgstr ""
10536
" - storing the passwords in various obfuscating encodings (base64 for one),"
10537
10538
#: en/help_topics/authentication.txt:219
10539
msgid " - delegate password storage to plugins (.netrc for example)."
10540
msgstr " - delegate password storage to plugins (.netrc for example)."
10541
10542
#: en/help_topics/authentication.txt:221
10543
msgid ""
10544
"* update the credentials when the user is prompted for user or password,"
10545
msgstr ""
10546
"* update the credentials when the user is prompted for user or password,"
10547
10548
#: en/help_topics/authentication.txt:223
10549
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
10550
msgstr "* add a ``verify_certificates`` field for ``HTTPS``."
10551
10552
#: en/help_topics/authentication.txt:225
10553
msgid ""
10554
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
10555
"but\n"
10556
"ignored in the actual implementation.\n"
10557
msgstr ""
10558
"The ``password_encoding`` and ``verify_certificates`` fields are recognised "
10559
"but\n"
10560
"ignored in the actual implementation.\n"
10561
10562
#: en/help_topics/bugs.txt:1
10563
msgid "Bug Tracker Settings"
10564
msgstr "Bug Tracker Settings"
10565
10566
#: en/help_topics/bugs.txt:3
10567
msgid ""
10568
"When making a commit, metadata about bugs fixed by that change can be\n"
10569
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
10570
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
10571
"(The only ``status`` value currently supported is ``fixed.``)"
10572
msgstr ""
10573
"When making a commit, metadata about bugs fixed by that change can be\n"
10574
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
10575
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
10576
"(The only ``status`` value currently supported is ``fixed.``)"
10577
10578
#: en/help_topics/bugs.txt:8
10579
msgid ""
10580
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
10581
"identifier\n"
10582
"rather than a full URL. This looks like::"
10583
msgstr ""
10584
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
10585
"identifier\n"
10586
"rather than a full URL. This looks like::"
10587
10588
#: en/help_topics/bugs.txt:11
10589
msgid " bzr commit --fixes <tracker>:<id>"
10590
msgstr " bzr commit --fixes <tracker>:<id>"
10591
10592
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
10593
msgid "or::"
10594
msgstr "or::"
10595
10596
#: en/help_topics/bugs.txt:15
10597
msgid " bzr commit --fixes <id>"
10598
msgstr " bzr commit --fixes <id>"
10599
10600
#: en/help_topics/bugs.txt:17
10601
msgid ""
10602
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
10603
"the\n"
10604
"identifier for that bug within the bugtracker, usually the bug number.\n"
10605
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
10606
"or global configuration is used."
10607
msgstr ""
10608
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
10609
"the\n"
10610
"identifier for that bug within the bugtracker, usually the bug number.\n"
10611
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
10612
"or global configuration is used."
10613
10614
#: en/help_topics/bugs.txt:22
10615
msgid ""
10616
"Bazaar knows about a few bug trackers that have many users. If\n"
10617
"you use one of these bug trackers then there is no setup required to\n"
10618
"use this feature, you just need to know the tracker identifier to use.\n"
10619
"These are the bugtrackers that are built in:"
10620
msgstr ""
10621
"Bazaar knows about a few bug trackers that have many users. If\n"
10622
"you use one of these bug trackers then there is no setup required to\n"
10623
"use this feature, you just need to know the tracker identifier to use.\n"
10624
"These are the bugtrackers that are built in:"
10625
10626
#: en/help_topics/bugs.txt:27
10627
msgid ""
10628
" ============================ ============ ============\n"
10629
" URL Abbreviation Example\n"
10630
" ============================ ============ ============\n"
10631
" https://bugs.launchpad.net/ lp lp:12345\n"
10632
" http://bugs.debian.org/ deb deb:12345\n"
10633
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
10634
" ============================ ============ ============"
10635
msgstr ""
10636
" ============================ ============ ============\n"
10637
" URL Abbreviation Example\n"
10638
" ============================ ============ ============\n"
10639
" https://bugs.launchpad.net/ lp lp:12345\n"
10640
" http://bugs.debian.org/ deb deb:12345\n"
10641
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
10642
" ============================ ============ ============"
10643
10644
#: en/help_topics/bugs.txt:35
10645
msgid ""
10646
"For the bug trackers not listed above configuration is required.\n"
10647
"Support for generating the URLs for any project using Bugzilla or Trac\n"
10648
"is built in, along with a template mechanism for other bugtrackers with\n"
10649
"simple URL schemes. If your bug tracker can't be described by one\n"
10650
"of the schemes described below then you can write a plugin to support\n"
10651
"it."
10652
msgstr ""
10653
"For the bug trackers not listed above configuration is required.\n"
10654
"Support for generating the URLs for any project using Bugzilla or Trac\n"
10655
"is built in, along with a template mechanism for other bugtrackers with\n"
10656
"simple URL schemes. If your bug tracker can't be described by one\n"
10657
"of the schemes described below then you can write a plugin to support\n"
10658
"it."
10659
10660
#: en/help_topics/bugs.txt:42
10661
msgid ""
10662
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
10663
"variable which contains the base URL of the bug tracker. These options\n"
10664
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
10665
"configuration section in ``locations.conf``. You can set up these values\n"
10666
"for each of the projects you work on."
10667
msgstr ""
10668
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
10669
"variable which contains the base URL of the bug tracker. These options\n"
10670
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
10671
"configuration section in ``locations.conf``. You can set up these values\n"
10672
"for each of the projects you work on."
10673
10674
#: en/help_topics/bugs.txt:48
10675
msgid ""
10676
"Note: As you provide a short name for each tracker, you can specify one or\n"
10677
"more bugs in one or more trackers at commit time if you wish."
10678
msgstr ""
10679
"Note: As you provide a short name for each tracker, you can specify one or\n"
10680
"more bugs in one or more trackers at commit time if you wish."
10681
10682
#: en/help_topics/bugs.txt:51
10683
msgid ""
10684
"Launchpad\n"
10685
"---------"
10686
msgstr ""
10687
"Launchpad\n"
10688
"---------"
10689
10690
#: en/help_topics/bugs.txt:54
10691
msgid ""
10692
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
10693
msgstr ""
10694
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
10695
10696
#: en/help_topics/bugs.txt:56
10697
msgid ""
10698
"bugzilla_<tracker>_url\n"
10699
"----------------------"
10700
msgstr ""
10701
"bugzilla_<tracker>_url\n"
10702
"----------------------"
10703
10704
#: en/help_topics/bugs.txt:59
10705
msgid ""
10706
"If present, the location of the Bugzilla bug tracker referred to by\n"
10707
"<tracker>. This option can then be used together with ``bzr commit\n"
10708
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10709
"example::"
10710
msgstr ""
10711
"If present, the location of the Bugzilla bug tracker referred to by\n"
10712
"<tracker>. This option can then be used together with ``bzr commit\n"
10713
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10714
"example::"
10715
10716
#: en/help_topics/bugs.txt:64
10717
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
10718
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
10719
10720
#: en/help_topics/bugs.txt:66
10721
msgid ""
10722
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10723
"fixed."
10724
msgstr ""
10725
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10726
"fixed."
10727
10728
#: en/help_topics/bugs.txt:69
10729
msgid ""
10730
"trac_<tracker>_url\n"
10731
"------------------"
10732
msgstr ""
10733
"trac_<tracker>_url\n"
10734
"------------------"
10735
10736
#: en/help_topics/bugs.txt:72
10737
msgid ""
10738
"If present, the location of the Trac instance referred to by\n"
10739
"<tracker>. This option can then be used together with ``bzr commit\n"
10740
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10741
"example::"
10742
msgstr ""
10743
"If present, the location of the Trac instance referred to by\n"
10744
"<tracker>. This option can then be used together with ``bzr commit\n"
10745
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10746
"example::"
10747
10748
#: en/help_topics/bugs.txt:77
10749
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
10750
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
10751
10752
#: en/help_topics/bugs.txt:79
10753
msgid ""
10754
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
10755
"as\n"
10756
"fixed."
10757
msgstr ""
10758
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
10759
"as\n"
10760
"fixed."
10761
10762
#: en/help_topics/bugs.txt:82
10763
msgid ""
10764
"bugtracker_<tracker>_url\n"
10765
"------------------------"
10766
msgstr ""
10767
"bugtracker_<tracker>_url\n"
10768
"------------------------"
10769
10770
#: en/help_topics/bugs.txt:85
10771
msgid ""
10772
"If present, the location of a generic bug tracker instance referred to by\n"
10773
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
10774
"which will be replaced by a specific bug ID. This option can then be used\n"
10775
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
10776
"fixed by that commit. For example::"
10777
msgstr ""
10778
"If present, the location of a generic bug tracker instance referred to by\n"
10779
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
10780
"which will be replaced by a specific bug ID. This option can then be used\n"
10781
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
10782
"fixed by that commit. For example::"
10783
10784
#: en/help_topics/bugs.txt:91
10785
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
10786
msgstr " bugtracker_python_url = http://bugs.python.org/issue{id}"
10787
10788
#: en/help_topics/bugs.txt:93
10789
msgid ""
10790
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10791
"Roundup bug tracker as fixed, or::"
10792
msgstr ""
10793
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10794
"Roundup bug tracker as fixed, or::"
10795
10796
#: en/help_topics/bugs.txt:96
10797
msgid ""
10798
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
10799
msgstr ""
10800
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
10801
10802
#: en/help_topics/bugs.txt:98
10803
msgid ""
10804
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10805
"RT bug tracker as fixed, or::"
10806
msgstr ""
10807
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10808
"RT bug tracker as fixed, or::"
10809
10810
#: en/help_topics/bugs.txt:101
10811
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
10812
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
10813
10814
#: en/help_topics/bugs.txt:103
10815
msgid ""
10816
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
10817
"1234\n"
10818
"in Hudson's JIRA bug tracker as fixed.\n"
10819
msgstr ""
10820
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
10821
"1234\n"
10822
"in Hudson's JIRA bug tracker as fixed.\n"
10823
10824
#: en/help_topics/commands.txt:1
10825
msgid ""
10826
"add Add specified files or directories.\n"
10827
"alias Set/unset and display aliases.\n"
10828
"annotate Show the origin of each line in a file.\n"
10829
"bash-completion Generate a shell function for bash command line "
10830
"completion.\n"
10831
" [bash_completion]\n"
10832
"bind Convert the current branch into a checkout of the "
10833
"supplied\n"
10834
" branch.\n"
10835
"branch Create a new branch that is a copy of an existing branch.\n"
10836
"branches List the branches available at the current location.\n"
10837
"break-lock Break a dead lock.\n"
10838
"cat Write the contents of a file as of a given revision to\n"
10839
" standard output.\n"
10840
"check Validate working tree structure, branch consistency and\n"
10841
" repository history.\n"
10842
"checkout Create a new checkout of an existing branch.\n"
10843
"clean-tree Remove unwanted files from working tree.\n"
10844
"commit Commit changes into a new revision.\n"
10845
"config Display, set or remove a configuration option.\n"
10846
"conflicts List files with conflicts.\n"
10847
"deleted List files deleted in the working tree.\n"
10848
"diff Show differences in the working tree, between revisions "
10849
"or\n"
10850
" branches.\n"
10851
"dpush Push into a different VCS without any custom bzr "
10852
"metadata.\n"
10853
"export Export current or past revision to a destination directory "
10854
"or\n"
10855
" archive.\n"
10856
"help Show help on a command or other topic.\n"
10857
"ignore Ignore specified files or patterns.\n"
10858
"ignored List ignored files and the patterns that matched them.\n"
10859
"info Show information about a working tree, branch or "
10860
"repository.\n"
10861
"init Make a directory into a versioned branch.\n"
10862
"init-repository Create a shared repository for branches to share storage\n"
10863
" space.\n"
10864
"join Combine a tree into its containing tree.\n"
10865
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
10866
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
10867
"launchpad-open Open a Launchpad branch page in your web browser. "
10868
"[launchpad]\n"
10869
"log Show historical log for a branch or subset of a branch.\n"
10870
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
10871
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
10872
"ls List files in a tree.\n"
10873
"merge Perform a three-way merge.\n"
10874
"missing Show unmerged/unpulled revisions between two branches.\n"
10875
"mkdir Create a new versioned directory.\n"
10876
"mv Move or rename a file.\n"
10877
"nick Print or set the branch nickname.\n"
10878
"pack Compress the data within a repository.\n"
10879
"plugins List the installed plugins.\n"
10880
"pull Turn this branch into a mirror of another branch.\n"
10881
"push Update a mirror of this branch.\n"
10882
"reconcile Reconcile bzr metadata in a branch.\n"
10883
"reconfigure Reconfigure the type of a bzr directory.\n"
10884
"register-branch Register a branch with launchpad.net. [launchpad]\n"
10885
"remerge Redo a merge.\n"
10886
"remove Remove files or directories.\n"
10887
"remove-branch Remove a branch.\n"
10888
"remove-tree Remove the working tree from a given branch/checkout.\n"
10889
"renames Show list of renamed files.\n"
10890
"resolve Mark a conflict as resolved.\n"
10891
"revert Set files in the working tree back to the contents of a\n"
10892
" previous revision.\n"
10893
"revno Show current revision number.\n"
10894
"root Show the tree root directory.\n"
10895
"send Mail or create a merge-directive for submitting changes.\n"
10896
"serve Run the bzr server.\n"
10897
"shelve Temporarily set aside some changes from the current tree.\n"
10898
"sign-my-commits Sign all commits by a given committer.\n"
10899
"split Split a subdirectory of a tree into a separate tree.\n"
10900
"status Display status summary.\n"
10901
"switch Set the branch of a checkout and update.\n"
10902
"tag Create, remove or modify a tag naming a revision.\n"
10903
"tags List tags.\n"
10904
"testament Show testament (signing-form) of a revision.\n"
10905
"unbind Convert the current checkout into a regular branch.\n"
10906
"uncommit Remove the last committed revision.\n"
10907
"unshelve Restore shelved changes.\n"
10908
"update Update a working tree to a new revision.\n"
10909
"upgrade Upgrade a repository, branch or working tree to a newer\n"
10910
" format.\n"
10911
"verify-signatures Verify all commit signatures.\n"
10912
"version Show version of bzr.\n"
10913
"version-info Show version information about this tree.\n"
10914
"view Manage filtered views.\n"
10915
"whoami Show or set bzr user id.\n"
10916
msgstr ""
10917
"add Add specified files or directories.\n"
10918
"alias Set/unset and display aliases.\n"
10919
"annotate Show the origin of each line in a file.\n"
10920
"bash-completion Generate a shell function for bash command line "
10921
"completion.\n"
10922
" [bash_completion]\n"
10923
"bind Convert the current branch into a checkout of the "
10924
"supplied\n"
10925
" branch.\n"
10926
"branch Create a new branch that is a copy of an existing branch.\n"
10927
"branches List the branches available at the current location.\n"
10928
"break-lock Break a dead lock.\n"
10929
"cat Write the contents of a file as of a given revision to\n"
10930
" standard output.\n"
10931
"check Validate working tree structure, branch consistency and\n"
10932
" repository history.\n"
10933
"checkout Create a new checkout of an existing branch.\n"
10934
"clean-tree Remove unwanted files from working tree.\n"
10935
"commit Commit changes into a new revision.\n"
10936
"config Display, set or remove a configuration option.\n"
10937
"conflicts List files with conflicts.\n"
10938
"deleted List files deleted in the working tree.\n"
10939
"diff Show differences in the working tree, between revisions "
10940
"or\n"
10941
" branches.\n"
10942
"dpush Push into a different VCS without any custom bzr "
10943
"metadata.\n"
10944
"export Export current or past revision to a destination directory "
10945
"or\n"
10946
" archive.\n"
10947
"help Show help on a command or other topic.\n"
10948
"ignore Ignore specified files or patterns.\n"
10949
"ignored List ignored files and the patterns that matched them.\n"
10950
"info Show information about a working tree, branch or "
10951
"repository.\n"
10952
"init Make a directory into a versioned branch.\n"
10953
"init-repository Create a shared repository for branches to share storage\n"
10954
" space.\n"
10955
"join Combine a tree into its containing tree.\n"
10956
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
10957
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
10958
"launchpad-open Open a Launchpad branch page in your web browser. "
10959
"[launchpad]\n"
10960
"log Show historical log for a branch or subset of a branch.\n"
10961
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
10962
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
10963
"ls List files in a tree.\n"
10964
"merge Perform a three-way merge.\n"
10965
"missing Show unmerged/unpulled revisions between two branches.\n"
10966
"mkdir Create a new versioned directory.\n"
10967
"mv Move or rename a file.\n"
10968
"nick Print or set the branch nickname.\n"
10969
"pack Compress the data within a repository.\n"
10970
"plugins List the installed plugins.\n"
10971
"pull Turn this branch into a mirror of another branch.\n"
10972
"push Update a mirror of this branch.\n"
10973
"reconcile Reconcile bzr metadata in a branch.\n"
10974
"reconfigure Reconfigure the type of a bzr directory.\n"
10975
"register-branch Register a branch with launchpad.net. [launchpad]\n"
10976
"remerge Redo a merge.\n"
10977
"remove Remove files or directories.\n"
10978
"remove-branch Remove a branch.\n"
10979
"remove-tree Remove the working tree from a given branch/checkout.\n"
10980
"renames Show list of renamed files.\n"
10981
"resolve Mark a conflict as resolved.\n"
10982
"revert Set files in the working tree back to the contents of a\n"
10983
" previous revision.\n"
10984
"revno Show current revision number.\n"
10985
"root Show the tree root directory.\n"
10986
"send Mail or create a merge-directive for submitting changes.\n"
10987
"serve Run the bzr server.\n"
10988
"shelve Temporarily set aside some changes from the current tree.\n"
10989
"sign-my-commits Sign all commits by a given committer.\n"
10990
"split Split a subdirectory of a tree into a separate tree.\n"
10991
"status Display status summary.\n"
10992
"switch Set the branch of a checkout and update.\n"
10993
"tag Create, remove or modify a tag naming a revision.\n"
10994
"tags List tags.\n"
10995
"testament Show testament (signing-form) of a revision.\n"
10996
"unbind Convert the current checkout into a regular branch.\n"
10997
"uncommit Remove the last committed revision.\n"
10998
"unshelve Restore shelved changes.\n"
10999
"update Update a working tree to a new revision.\n"
11000
"upgrade Upgrade a repository, branch or working tree to a newer\n"
11001
" format.\n"
11002
"verify-signatures Verify all commit signatures.\n"
11003
"version Show version of bzr.\n"
11004
"version-info Show version information about this tree.\n"
11005
"view Manage filtered views.\n"
11006
"whoami Show or set bzr user id.\n"
11007
11008
#: en/help_topics/configuration.txt:1
11009
msgid ""
11010
"Configuration Settings\n"
11011
"======================="
11012
msgstr ""
11013
"Configuration Settings\n"
11014
"======================="
11015
11016
#: en/help_topics/configuration.txt:4
11017
msgid ""
11018
"Environment settings\n"
11019
"---------------------"
11020
msgstr ""
11021
"Environment settings\n"
11022
"---------------------"
11023
11024
#: en/help_topics/configuration.txt:7
11025
msgid ""
11026
"While most configuration is handled by configuration files, some options\n"
11027
"which may be semi-permanent can also be controlled through the environment."
11028
msgstr ""
11029
"While most configuration is handled by configuration files, some options\n"
11030
"which may be semi-permanent can also be controlled through the environment."
11031
11032
#: en/help_topics/configuration.txt:10
11033
msgid ""
11034
"BZR_EMAIL\n"
11035
"~~~~~~~~~"
11036
msgstr ""
11037
"BZR_EMAIL\n"
11038
"~~~~~~~~~"
11039
11040
#: en/help_topics/configuration.txt:13
11041
msgid "Override the email id used by Bazaar. Typical format::"
11042
msgstr "Override the email id used by Bazaar. Typical format::"
11043
11044
#: en/help_topics/configuration.txt:15
11045
msgid " \"John Doe <jdoe@example.com>\""
11046
msgstr " \"John Doe <jdoe@example.com>\""
11047
11048
#: en/help_topics/configuration.txt:17
11049
msgid "See also the ``email`` configuration option."
11050
msgstr "See also the ``email`` configuration option."
11051
11052
#: en/help_topics/configuration.txt:19
11053
msgid ""
11054
"BZR_PROGRESS_BAR\n"
11055
"~~~~~~~~~~~~~~~~"
11056
msgstr ""
11057
"BZR_PROGRESS_BAR\n"
11058
"~~~~~~~~~~~~~~~~"
11059
11060
#: en/help_topics/configuration.txt:22
11061
msgid ""
11062
"Override the progress display. Possible values are \"none\" or \"text\". "
11063
"If\n"
11064
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
11065
"draws\n"
11066
"the ordinary command line progress bar."
11067
msgstr ""
11068
"Override the progress display. Possible values are \"none\" or \"text\". "
11069
"If\n"
11070
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
11071
"draws\n"
11072
"the ordinary command line progress bar."
11073
11074
#: en/help_topics/configuration.txt:26
11075
msgid ""
11076
"BZR_SIGQUIT_PDB\n"
11077
"~~~~~~~~~~~~~~~"
11078
msgstr ""
11079
"BZR_SIGQUIT_PDB\n"
11080
"~~~~~~~~~~~~~~~"
11081
11082
#: en/help_topics/configuration.txt:29
11083
msgid ""
11084
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
11085
msgstr ""
11086
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
11087
11088
#: en/help_topics/configuration.txt:31
11089
msgid ""
11090
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
11091
"* 1 = Invoke breakin debugger (default)"
11092
msgstr ""
11093
"* 0 = Standard SIGQUIT behaviour (normally, exit with a core dump)\n"
11094
"* 1 = Invoke breakin debugger (default)"
11095
11096
#: en/help_topics/configuration.txt:34
11097
msgid ""
11098
"BZR_HOME\n"
11099
"~~~~~~~~"
11100
msgstr ""
11101
"BZR_HOME\n"
11102
"~~~~~~~~"
11103
11104
#: en/help_topics/configuration.txt:37
11105
msgid "Override the home directory used by Bazaar."
11106
msgstr "Override the home directory used by Bazaar."
11107
11108
#: en/help_topics/configuration.txt:39
11109
msgid ""
11110
"BZR_SSH\n"
11111
"~~~~~~~"
11112
msgstr ""
11113
"BZR_SSH\n"
11114
"~~~~~~~"
11115
11116
#: en/help_topics/configuration.txt:42
11117
msgid "Select a different SSH implementation."
11118
msgstr "Select a different SSH implementation."
11119
11120
#: en/help_topics/configuration.txt:44
11121
msgid ""
11122
"BZR_PDB\n"
11123
"~~~~~~~"
11124
msgstr ""
11125
"BZR_PDB\n"
11126
"~~~~~~~"
11127
11128
#: en/help_topics/configuration.txt:47
11129
msgid "Control whether to launch a debugger on error."
11130
msgstr "Control whether to launch a debugger on error."
11131
11132
#: en/help_topics/configuration.txt:49
11133
msgid ""
11134
"* 0 = Standard behavior\n"
11135
"* 1 = Launch debugger"
11136
msgstr ""
11137
"* 0 = Standard behaviour\n"
11138
"* 1 = Launch debugger"
11139
11140
#: en/help_topics/configuration.txt:52
11141
msgid ""
11142
"BZR_REMOTE_PATH\n"
11143
"~~~~~~~~~~~~~~~"
11144
msgstr ""
11145
"BZR_REMOTE_PATH\n"
11146
"~~~~~~~~~~~~~~~"
11147
11148
#: en/help_topics/configuration.txt:55
11149
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
11150
msgstr ""
11151
"Path to the Bazaar executable to use when using the bzr+ssh protocol."
11152
11153
#: en/help_topics/configuration.txt:57
11154
msgid "See also the ``bzr_remote_path`` configuration option."
11155
msgstr "See also the ``bzr_remote_path`` configuration option."
11156
11157
#: en/help_topics/configuration.txt:59
11158
msgid ""
11159
"BZR_EDITOR\n"
11160
"~~~~~~~~~~"
11161
msgstr ""
11162
"BZR_EDITOR\n"
11163
"~~~~~~~~~~"
11164
11165
#: en/help_topics/configuration.txt:62
11166
msgid "Path to the editor Bazaar should use for commit messages, etc."
11167
msgstr "Path to the editor Bazaar should use for commit messages, etc."
11168
11169
#: en/help_topics/configuration.txt:64
11170
msgid ""
11171
"BZR_LOG\n"
11172
"~~~~~~~"
11173
msgstr ""
11174
"BZR_LOG\n"
11175
"~~~~~~~"
11176
11177
#: en/help_topics/configuration.txt:67
11178
msgid ""
11179
"Location of the Bazaar log file. You can check the current location by\n"
11180
"running ``bzr version``."
11181
msgstr ""
11182
"Location of the Bazaar log file. You can check the current location by\n"
11183
"running ``bzr version``."
11184
11185
#: en/help_topics/configuration.txt:70
11186
msgid ""
11187
"The log file contains debug information that is useful for diagnosing or\n"
11188
"reporting problems with Bazaar."
11189
msgstr ""
11190
"The log file contains debug information that is useful for diagnosing or\n"
11191
"reporting problems with Bazaar."
11192
11193
#: en/help_topics/configuration.txt:73
11194
msgid ""
11195
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
11196
"will disable logging."
11197
msgstr ""
11198
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
11199
"will disable logging."
11200
11201
#: en/help_topics/configuration.txt:76
11202
msgid ""
11203
"\n"
11204
"BZR_PLUGIN_PATH\n"
11205
"~~~~~~~~~~~~~~~"
11206
msgstr ""
11207
"\n"
11208
"BZR_PLUGIN_PATH\n"
11209
"~~~~~~~~~~~~~~~"
11210
11211
#: en/help_topics/configuration.txt:80
11212
msgid ""
11213
"The path to the plugins directory that Bazaar should use.\n"
11214
"If not set, Bazaar will search for plugins in:"
11215
msgstr ""
11216
"The path to the plugins directory that Bazaar should use.\n"
11217
"If not set, Bazaar will search for plugins in:"
11218
11219
#: en/help_topics/configuration.txt:83
11220
msgid ""
11221
"* the user specific plugin directory (containing the ``user`` plugins),"
11222
msgstr ""
11223
"* the user specific plugin directory (containing the ``user`` plugins),"
11224
11225
#: en/help_topics/configuration.txt:85
11226
msgid "* the bzrlib directory (containing the ``core`` plugins),"
11227
msgstr "* the bzrlib directory (containing the ``core`` plugins),"
11228
11229
#: en/help_topics/configuration.txt:87
11230
msgid ""
11231
"* the site specific plugin directory if applicable (containing\n"
11232
" the ``site`` plugins)."
11233
msgstr ""
11234
"* the site specific plugin directory if applicable (containing\n"
11235
" the ``site`` plugins)."
11236
11237
#: en/help_topics/configuration.txt:90
11238
msgid ""
11239
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
11240
"the way the plugin are searched. "
11241
msgstr ""
11242
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
11243
"the way the plugin are searched. "
11244
11245
#: en/help_topics/configuration.txt:93
11246
msgid ""
11247
"As for the ``PATH`` variables, if multiple directories are\n"
11248
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
11249
"platform specific appropriate character (':' on Unix,\n"
11250
"';' on windows)"
11251
msgstr ""
11252
"As for the ``PATH`` variables, if multiple directories are\n"
11253
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
11254
"platform specific appropriate character (':' on Unix,\n"
11255
"';' on windows)"
11256
11257
#: en/help_topics/configuration.txt:98
11258
msgid ""
11259
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
11260
"in ``user``. However it will continue to search in ``core`` and\n"
11261
"``site`` unless they are explicitly removed."
11262
msgstr ""
11263
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
11264
"in ``user``. However it will continue to search in ``core`` and\n"
11265
"``site`` unless they are explicitly removed."
11266
11267
#: en/help_topics/configuration.txt:102
11268
msgid ""
11269
"If you need to change the order or remove one of these\n"
11270
"directories, you should use special values:"
11271
msgstr ""
11272
"If you need to change the order or remove one of these\n"
11273
"directories, you should use special values:"
11274
11275
#: en/help_topics/configuration.txt:105
11276
msgid ""
11277
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
11278
" path from the default values,"
11279
msgstr ""
11280
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
11281
" path from the default values,"
11282
11283
#: en/help_topics/configuration.txt:108
11284
msgid ""
11285
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
11286
" before the remaining default values (and also remove it from\n"
11287
" the default values)."
11288
msgstr ""
11289
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
11290
" before the remaining default values (and also remove it from\n"
11291
" the default values)."
11292
11293
#: en/help_topics/configuration.txt:112
11294
msgid ""
11295
"Note that the special values 'user', 'core' and 'site' should be\n"
11296
"used literally, they will be substituted by the corresponding,\n"
11297
"platform specific, values."
11298
msgstr ""
11299
"Note that the special values 'user', 'core' and 'site' should be\n"
11300
"used literally, they will be substituted by the corresponding,\n"
11301
"platform specific, values."
11302
11303
#: en/help_topics/configuration.txt:116
11304
msgid ""
11305
"The examples below use ':' as the separator, windows users\n"
11306
"should use ';'."
11307
msgstr ""
11308
"The examples below use ':' as the separator, windows users\n"
11309
"should use ';'."
11310
11311
#: en/help_topics/configuration.txt:119
11312
msgid "Overriding the default user plugin directory::"
11313
msgstr "Overriding the default user plugin directory::"
11314
11315
#: en/help_topics/configuration.txt:121
11316
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
11317
msgstr " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
11318
11319
#: en/help_topics/configuration.txt:123
11320
msgid "Disabling the site directory while retaining the user directory::"
11321
msgstr "Disabling the site directory while retaining the user directory::"
11322
11323
#: en/help_topics/configuration.txt:125
11324
msgid " BZR_PLUGIN_PATH='-site:+user'"
11325
msgstr " BZR_PLUGIN_PATH='-site:+user'"
11326
11327
#: en/help_topics/configuration.txt:127
11328
msgid "Disabling all plugins (better achieved with --no-plugins)::"
11329
msgstr "Disabling all plugins (better achieved with --no-plugins)::"
11330
11331
#: en/help_topics/configuration.txt:129
11332
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
11333
msgstr " BZR_PLUGIN_PATH='-user:-core:-site'"
11334
11335
#: en/help_topics/configuration.txt:131
11336
msgid "Overriding the default site plugin directory::"
11337
msgstr "Overriding the default site plugin directory::"
11338
11339
#: en/help_topics/configuration.txt:133
11340
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
11341
msgstr " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
11342
11343
#: en/help_topics/configuration.txt:135
11344
msgid ""
11345
"BZR_DISABLE_PLUGINS\n"
11346
"~~~~~~~~~~~~~~~~~~~"
11347
msgstr ""
11348
"BZR_DISABLE_PLUGINS\n"
11349
"~~~~~~~~~~~~~~~~~~~"
11350
11351
#: en/help_topics/configuration.txt:138
11352
msgid ""
11353
"Under special circumstances (mostly when trying to diagnose a\n"
11354
"bug), it's better to disable a plugin (or several) rather than\n"
11355
"uninstalling them completely. Such plugins can be specified in\n"
11356
"the ``BZR_DISABLE_PLUGINS`` environment variable."
11357
msgstr ""
11358
"Under special circumstances (mostly when trying to diagnose a\n"
11359
"bug), it's better to disable a plugin (or several) rather than\n"
11360
"uninstalling them completely. Such plugins can be specified in\n"
11361
"the ``BZR_DISABLE_PLUGINS`` environment variable."
11362
11363
#: en/help_topics/configuration.txt:143
11364
msgid ""
11365
"In that case, ``bzr`` will stop loading the specified plugins and\n"
11366
"will raise an import error if they are explicitly imported (by\n"
11367
"another plugin that depends on them for example)."
11368
msgstr ""
11369
"In that case, ``bzr`` will stop loading the specified plugins and\n"
11370
"will raise an import error if they are explicitly imported (by\n"
11371
"another plugin that depends on them for example)."
11372
11373
#: en/help_topics/configuration.txt:147
11374
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
11375
msgstr "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
11376
11377
#: en/help_topics/configuration.txt:149
11378
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
11379
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
11380
11381
#: en/help_topics/configuration.txt:151
11382
msgid ""
11383
"BZR_PLUGINS_AT\n"
11384
"~~~~~~~~~~~~~~"
11385
msgstr ""
11386
"BZR_PLUGINS_AT\n"
11387
"~~~~~~~~~~~~~~"
11388
11389
#: en/help_topics/configuration.txt:154
11390
msgid ""
11391
"When adding a new feature or working on a bug in a plugin,\n"
11392
"developers often need to use a specific version of a given\n"
11393
"plugin. Since python requires that the directory containing the\n"
11394
"code is named like the plugin itself this make it impossible to\n"
11395
"use arbitrary directory names (using a two-level directory scheme\n"
11396
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
11397
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
11398
msgstr ""
11399
"When adding a new feature or working on a bug in a plugin,\n"
11400
"developers often need to use a specific version of a given\n"
11401
"plugin. Since python requires that the directory containing the\n"
11402
"code is named like the plugin itself this make it impossible to\n"
11403
"use arbitrary directory names (using a two-level directory scheme\n"
11404
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
11405
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
11406
11407
#: en/help_topics/configuration.txt:162
11408
msgid ""
11409
"Plugins specified in this environment variable takes precedence\n"
11410
"over the ones in ``BZR_PLUGIN_PATH``."
11411
msgstr ""
11412
"Plugins specified in this environment variable takes precedence\n"
11413
"over the ones in ``BZR_PLUGIN_PATH``."
11414
11415
#: en/help_topics/configuration.txt:165
11416
msgid ""
11417
"The variable specified a list of ``plugin_name@plugin path``,\n"
11418
"``plugin_name`` being the name of the plugin as it appears in\n"
11419
"python module paths, ``plugin_path`` being the path to the\n"
11420
"directory containing the plugin code itself\n"
11421
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
11422
"separator, use ';' on windows."
11423
msgstr ""
11424
"The variable specified a list of ``plugin_name@plugin path``,\n"
11425
"``plugin_name`` being the name of the plugin as it appears in\n"
11426
"python module paths, ``plugin_path`` being the path to the\n"
11427
"directory containing the plugin code itself\n"
11428
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
11429
"separator, use ';' on windows."
11430
11431
#: en/help_topics/configuration.txt:172
11432
msgid ""
11433
"Example:\n"
11434
"~~~~~~~~"
11435
msgstr ""
11436
"Example:\n"
11437
"~~~~~~~~"
11438
11439
#: en/help_topics/configuration.txt:175
11440
msgid ""
11441
"Using a specific version of ``myplugin``:\n"
11442
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
11443
msgstr ""
11444
"Using a specific version of ``myplugin``:\n"
11445
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
11446
11447
#: en/help_topics/configuration.txt:178
11448
msgid ""
11449
"BZRPATH\n"
11450
"~~~~~~~"
11451
msgstr ""
11452
"BZRPATH\n"
11453
"~~~~~~~"
11454
11455
#: en/help_topics/configuration.txt:181
11456
msgid "The path where Bazaar should look for shell plugin external commands."
11457
msgstr ""
11458
"The path where Bazaar should look for shell plugin external commands."
11459
11460
#: en/help_topics/configuration.txt:183
11461
msgid ""
11462
"\n"
11463
"http_proxy, https_proxy\n"
11464
"~~~~~~~~~~~~~~~~~~~~~~~"
11465
msgstr ""
11466
"\n"
11467
"http_proxy, https_proxy\n"
11468
"~~~~~~~~~~~~~~~~~~~~~~~"
11469
11470
#: en/help_topics/configuration.txt:187
11471
msgid "Specifies the network proxy for outgoing connections, for example::"
11472
msgstr "Specifies the network proxy for outgoing connections, for example::"
11473
11474
#: en/help_topics/configuration.txt:189
11475
msgid ""
11476
" http_proxy=http://proxy.example.com:3128/ \n"
11477
" https_proxy=http://proxy.example.com:3128/"
11478
msgstr ""
11479
" http_proxy=http://proxy.example.com:3128/ \n"
11480
" https_proxy=http://proxy.example.com:3128/"
11481
11482
#: en/help_topics/configuration.txt:192
11483
msgid ""
11484
"\n"
11485
"Configuration files\n"
11486
"-------------------"
11487
msgstr ""
11488
"\n"
11489
"Configuration files\n"
11490
"-------------------"
11491
11492
#: en/help_topics/configuration.txt:196
11493
msgid ""
11494
"Location\n"
11495
"~~~~~~~~"
11496
msgstr ""
11497
"Location\n"
11498
"~~~~~~~~"
11499
11500
#: en/help_topics/configuration.txt:199
11501
msgid ""
11502
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
11503
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
11504
"on\n"
11505
"Windows. (You can check the location for your system by using\n"
11506
"``bzr version``.)"
11507
msgstr ""
11508
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
11509
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
11510
"on\n"
11511
"Windows. (You can check the location for your system by using\n"
11512
"``bzr version``.)"
11513
11514
#: en/help_topics/configuration.txt:204
11515
msgid "There are three primary configuration files in this location:"
11516
msgstr "There are three primary configuration files in this location:"
11517
11518
#: en/help_topics/configuration.txt:206
11519
msgid "* ``bazaar.conf`` describes default configuration options,"
11520
msgstr "* ``bazaar.conf`` describes default configuration options,"
11521
11522
#: en/help_topics/configuration.txt:208
11523
msgid ""
11524
"* ``locations.conf`` describes configuration information for\n"
11525
" specific branch locations,"
11526
msgstr ""
11527
"* ``locations.conf`` describes configuration information for\n"
11528
" specific branch locations,"
11529
11530
#: en/help_topics/configuration.txt:211
11531
msgid ""
11532
"* ``authentication.conf`` describes credential information for\n"
11533
" remote servers."
11534
msgstr ""
11535
"* ``authentication.conf`` describes credential information for\n"
11536
" remote servers."
11537
11538
#: en/help_topics/configuration.txt:214
11539
msgid ""
11540
"Each branch can also contain a configuration file that sets values specific\n"
11541
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
11542
"the\n"
11543
"branch. This file is visible to all users of a branch, if you wish to "
11544
"override\n"
11545
"one of the values for a branch with a setting that is specific to you then "
11546
"you\n"
11547
"can do so in ``locations.conf``."
11548
msgstr ""
11549
"Each branch can also contain a configuration file that sets values specific\n"
11550
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
11551
"the\n"
11552
"branch. This file is visible to all users of a branch, if you wish to "
11553
"override\n"
11554
"one of the values for a branch with a setting that is specific to you then "
11555
"you\n"
11556
"can do so in ``locations.conf``."
11557
11558
#: en/help_topics/configuration.txt:220
11559
msgid ""
11560
"General format\n"
11561
"~~~~~~~~~~~~~~"
11562
msgstr ""
11563
"General format\n"
11564
"~~~~~~~~~~~~~~"
11565
11566
#: en/help_topics/configuration.txt:223
11567
msgid ""
11568
"An ini file has three types of contructs: section headers, section\n"
11569
"options and comments."
11570
msgstr ""
11571
"An ini file has three types of contructs: section headers, section\n"
11572
"options and comments."
11573
11574
#: en/help_topics/configuration.txt:226
11575
msgid ""
11576
"Comments\n"
11577
"^^^^^^^^"
11578
msgstr ""
11579
"Comments\n"
11580
"^^^^^^^^"
11581
11582
#: en/help_topics/configuration.txt:229
11583
msgid ""
11584
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
11585
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
11586
"Bazaar when parsing ini files."
11587
msgstr ""
11588
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
11589
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
11590
"Bazaar when parsing ini files."
11591
11592
#: en/help_topics/configuration.txt:233
11593
msgid ""
11594
"Section headers\n"
11595
"^^^^^^^^^^^^^^^"
11596
msgstr ""
11597
"Section headers\n"
11598
"^^^^^^^^^^^^^^^"
11599
11600
#: en/help_topics/configuration.txt:236
11601
msgid ""
11602
"A section header is a word enclosed in brackets that starts at the begining\n"
11603
"of a line. A typical section header looks like this::"
11604
msgstr ""
11605
"A section header is a word enclosed in brackets that starts at the "
11606
"beginning\n"
11607
"of a line. A typical section header looks like this::"
11608
11609
#: en/help_topics/configuration.txt:239
11610
msgid " [DEFAULT]"
11611
msgstr " [DEFAULT]"
11612
11613
#: en/help_topics/configuration.txt:241
11614
msgid ""
11615
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
11616
"[ALIASES]. Section headers are case sensitive. The default section provides "
11617
"for\n"
11618
"setting options which can be overridden with the branch config file."
11619
msgstr ""
11620
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
11621
"[ALIASES]. Section headers are case sensitive. The default section provides "
11622
"for\n"
11623
"setting options which can be overridden with the branch config file."
11624
11625
#: en/help_topics/configuration.txt:245
11626
msgid ""
11627
"For ``locations.conf``, the options from the section with the\n"
11628
"longest matching section header are used to the exclusion of other\n"
11629
"potentially valid section headers. A section header uses the path for\n"
11630
"the branch as the section header. Some examples include::"
11631
msgstr ""
11632
"For ``locations.conf``, the options from the section with the\n"
11633
"longest matching section header are used to the exclusion of other\n"
11634
"potentially valid section headers. A section header uses the path for\n"
11635
"the branch as the section header. Some examples include::"
11636
11637
#: en/help_topics/configuration.txt:250
11638
msgid ""
11639
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
11640
" [/home/jdoe/branches/]"
11641
msgstr ""
11642
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
11643
" [/home/jdoe/branches/]"
11644
11645
#: en/help_topics/configuration.txt:253
11646
msgid ""
11647
"\n"
11648
"Section options\n"
11649
"^^^^^^^^^^^^^^^"
11650
msgstr ""
11651
"\n"
11652
"Section options\n"
11653
"^^^^^^^^^^^^^^^"
11654
11655
#: en/help_topics/configuration.txt:257
11656
msgid ""
11657
"A section option resides within a section. A section option contains an\n"
11658
"option name, an equals sign and a value. For example::"
11659
msgstr ""
11660
"A section option resides within a section. A section option contains an\n"
11661
"option name, an equals sign and a value. For example::"
11662
11663
#: en/help_topics/configuration.txt:260
11664
msgid ""
11665
" email = John Doe <jdoe@isp.com>\n"
11666
" gpg_signing_key = Amy Pond <amy@example.com>"
11667
msgstr ""
11668
" email = John Doe <jdoe@isp.com>\n"
11669
" gpg_signing_key = Amy Pond <amy@example.com>"
11670
11671
#: en/help_topics/configuration.txt:263
11672
msgid ""
11673
"A option can reference other options by enclosing them in curly brackets::"
11674
msgstr ""
11675
"A option can reference other options by enclosing them in curly brackets::"
11676
11677
#: en/help_topics/configuration.txt:265
11678
msgid ""
11679
" my_branch_name = feature_x\n"
11680
" my_server = bzr+ssh://example.com\n"
11681
" push_location = {my_server}/project/{my_branch_name}"
11682
msgstr ""
11683
" my_branch_name = feature_x\n"
11684
" my_server = bzr+ssh://example.com\n"
11685
" push_location = {my_server}/project/{my_branch_name}"
11686
11687
#: en/help_topics/configuration.txt:269
11688
msgid ""
11689
"Option policies\n"
11690
"^^^^^^^^^^^^^^^"
11691
msgstr ""
11692
"Option policies\n"
11693
"^^^^^^^^^^^^^^^"
11694
11695
#: en/help_topics/configuration.txt:272
11696
msgid ""
11697
"Options defined in a section affect the named directory or URL plus\n"
11698
"any locations they contain. Policies can be used to change how an\n"
11699
"option value is interpreted for contained locations. Currently\n"
11700
"there are three policies available:"
11701
msgstr ""
11702
"Options defined in a section affect the named directory or URL plus\n"
11703
"any locations they contain. Policies can be used to change how an\n"
11704
"option value is interpreted for contained locations. Currently\n"
11705
"there are three policies available:"
11706
11707
#: en/help_topics/configuration.txt:277
11708
msgid ""
11709
" none:\n"
11710
" the value is interpreted the same for contained locations. This is\n"
11711
" the default behaviour.\n"
11712
" norecurse:\n"
11713
" the value is only used for the exact location specified by the\n"
11714
" section name.\n"
11715
" appendpath:\n"
11716
" for contained locations, any additional path components are\n"
11717
" appended to the value."
11718
msgstr ""
11719
" none:\n"
11720
" the value is interpreted the same for contained locations. This is\n"
11721
" the default behaviour.\n"
11722
" norecurse:\n"
11723
" the value is only used for the exact location specified by the\n"
11724
" section name.\n"
11725
" appendpath:\n"
11726
" for contained locations, any additional path components are\n"
11727
" appended to the value."
11728
11729
#: en/help_topics/configuration.txt:287
11730
msgid ""
11731
"Policies are specified by keys with names of the form "
11732
"\"<option_name>:policy\".\n"
11733
"For example, to define the push location for a tree of branches, the\n"
11734
"following could be used::"
11735
msgstr ""
11736
"Policies are specified by keys with names of the form "
11737
"\"<option_name>:policy\".\n"
11738
"For example, to define the push location for a tree of branches, the\n"
11739
"following could be used::"
11740
11741
#: en/help_topics/configuration.txt:291
11742
msgid ""
11743
" [/top/location]\n"
11744
" push_location = sftp://example.com/location\n"
11745
" push_location:policy = appendpath"
11746
msgstr ""
11747
" [/top/location]\n"
11748
" push_location = sftp://example.com/location\n"
11749
" push_location:policy = appendpath"
11750
11751
#: en/help_topics/configuration.txt:295
11752
msgid ""
11753
"With this configuration, the push location for ``/top/location/branch1``\n"
11754
"would be ``sftp://example.com/location/branch1``."
11755
msgstr ""
11756
"With this configuration, the push location for ``/top/location/branch1``\n"
11757
"would be ``sftp://example.com/location/branch1``."
11758
11759
#: en/help_topics/configuration.txt:298
11760
msgid ""
11761
"Section local options\n"
11762
"^^^^^^^^^^^^^^^^^^^^^"
11763
msgstr ""
11764
"Section local options\n"
11765
"^^^^^^^^^^^^^^^^^^^^^"
11766
11767
#: en/help_topics/configuration.txt:301
11768
msgid ""
11769
"Some options are defined automatically inside a given section and can be\n"
11770
"refered to in this section only. "
11771
msgstr ""
11772
"Some options are defined automatically inside a given section and can be\n"
11773
"referred to in this section only. "
11774
11775
#: en/help_topics/configuration.txt:304
11776
msgid "For example, the ``appendpath`` policy can be used like this::"
11777
msgstr "For example, the ``appendpath`` policy can be used like this::"
11778
11779
#: en/help_topics/configuration.txt:306
11780
msgid ""
11781
" [/home/vila/src/bzr/bugs]\n"
11782
" mypush = lp:~vila/bzr\n"
11783
" mypush:policy=appendpath"
11784
msgstr ""
11785
" [/home/vila/src/bzr/bugs]\n"
11786
" mypush = lp:~vila/bzr\n"
11787
" mypush:policy=appendpath"
11788
11789
#: en/help_topics/configuration.txt:310
11790
msgid "Using ``relpath`` to achieve the same result is done like this::"
11791
msgstr "Using ``relpath`` to achieve the same result is done like this::"
11792
11793
#: en/help_topics/configuration.txt:312
11794
msgid ""
11795
" [/home/vila/src/bzr/bugs]\n"
11796
" mypush = lp:~vila/bzr/{relpath}"
11797
msgstr ""
11798
" [/home/vila/src/bzr/bugs]\n"
11799
" mypush = lp:~vila/bzr/{relpath}"
11800
11801
#: en/help_topics/configuration.txt:315
11802
msgid ""
11803
"In both cases, when used in a directory like\n"
11804
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11805
msgstr ""
11806
"In both cases, when used in a directory like\n"
11807
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11808
11809
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
11810
msgid ""
11811
" $ bzr config mypush\n"
11812
" lp:~vila/bzr/832013-expand-in-stack"
11813
msgstr ""
11814
" $ bzr config mypush\n"
11815
" lp:~vila/bzr/832013-expand-in-stack"
11816
11817
#: en/help_topics/configuration.txt:321
11818
msgid "Another such option is ``basename`` which can be used like this::"
11819
msgstr "Another such option is ``basename`` which can be used like this::"
11820
11821
#: en/help_topics/configuration.txt:323
11822
msgid ""
11823
" [/home/vila/src/bzr]\n"
11824
" mypush = lp:~vila/bzr/{basename}"
11825
msgstr ""
11826
" [/home/vila/src/bzr]\n"
11827
" mypush = lp:~vila/bzr/{basename}"
11828
11829
#: en/help_topics/configuration.txt:326
11830
msgid ""
11831
"When used in a directory like\n"
11832
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11833
msgstr ""
11834
"When used in a directory like\n"
11835
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11836
11837
#: en/help_topics/configuration.txt:332
11838
msgid ""
11839
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
11840
"itself is defined as the relative path between the section name and the\n"
11841
"location it matches."
11842
msgstr ""
11843
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
11844
"itself is defined as the relative path between the section name and the\n"
11845
"location it matches."
11846
11847
#: en/help_topics/configuration.txt:336
11848
msgid ""
11849
"Another such option is ``branchname``, which refers to the name of a "
11850
"colocated\n"
11851
"branch. For non-colocated branches, it behaves like basename. It can be "
11852
"used\n"
11853
"like this::"
11854
msgstr ""
11855
"Another such option is ``branchname``, which refers to the name of a "
11856
"colocated\n"
11857
"branch. For non-colocated branches, it behaves like basename. It can be "
11858
"used\n"
11859
"like this::"
11860
11861
#: en/help_topics/configuration.txt:340
11862
msgid ""
11863
" [/home/vila/src/bzr/bugs]\n"
11864
" mypush = lp:~vila/bzr/{branchname}"
11865
msgstr ""
11866
" [/home/vila/src/bzr/bugs]\n"
11867
" mypush = lp:~vila/bzr/{branchname}"
11868
11869
#: en/help_topics/configuration.txt:343
11870
msgid ""
11871
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
11872
"get::"
11873
msgstr ""
11874
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
11875
"get::"
11876
11877
#: en/help_topics/configuration.txt:345
11878
msgid ""
11879
" bzr config mypush\n"
11880
" lp:~vila/bzr/832013-expand-in-stack"
11881
msgstr ""
11882
" bzr config mypush\n"
11883
" lp:~vila/bzr/832013-expand-in-stack"
11884
11885
#: en/help_topics/configuration.txt:348
11886
msgid ""
11887
"When an option is local to a Section, it cannot be referred to from option\n"
11888
"values in any other section from the same ``Store`` nor from any other\n"
11889
"``Store``."
11890
msgstr ""
11891
"When an option is local to a Section, it cannot be referred to from option\n"
11892
"values in any other section from the same ``Store`` nor from any other\n"
11893
"``Store``."
11894
11895
#: en/help_topics/configuration.txt:352
11896
msgid ""
11897
"\n"
11898
"The main configuration file, bazaar.conf\n"
11899
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11900
msgstr ""
11901
"\n"
11902
"The main configuration file, bazaar.conf\n"
11903
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11904
11905
#: en/help_topics/configuration.txt:356
11906
msgid ""
11907
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
11908
"The default section contains the default\n"
11909
"configuration options for all branches. The default section can be\n"
11910
"overriden by providing a branch-specific section in ``locations.conf``."
11911
msgstr ""
11912
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
11913
"The default section contains the default\n"
11914
"configuration options for all branches. The default section can be\n"
11915
"overridden by providing a branch-specific section in ``locations.conf``."
11916
11917
#: en/help_topics/configuration.txt:361
11918
msgid "A typical ``bazaar.conf`` section often looks like the following::"
11919
msgstr "A typical ``bazaar.conf`` section often looks like the following::"
11920
11921
#: en/help_topics/configuration.txt:363
11922
msgid ""
11923
" [DEFAULT]\n"
11924
" email = John Doe <jdoe@isp.com>\n"
11925
" editor = /usr/bin/vim\n"
11926
" create_signatures = when-required"
11927
msgstr ""
11928
" [DEFAULT]\n"
11929
" email = John Doe <jdoe@isp.com>\n"
11930
" editor = /usr/bin/vim\n"
11931
" create_signatures = when-required"
11932
11933
#: en/help_topics/configuration.txt:368
11934
msgid ""
11935
"\n"
11936
"The branch location configuration file, locations.conf\n"
11937
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11938
msgstr ""
11939
"\n"
11940
"The branch location configuration file, locations.conf\n"
11941
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11942
11943
#: en/help_topics/configuration.txt:372
11944
msgid ""
11945
"``locations.conf`` allows one to specify overriding settings for\n"
11946
"a specific branch. The format is almost identical to the default section in\n"
11947
"bazaar.conf with one significant change: The section header, instead of "
11948
"saying\n"
11949
"default, will be the path to a branch that you wish to override a value\n"
11950
"for. The '?' and '*' wildcards are supported::"
11951
msgstr ""
11952
"``locations.conf`` allows one to specify overriding settings for\n"
11953
"a specific branch. The format is almost identical to the default section in\n"
11954
"bazaar.conf with one significant change: The section header, instead of "
11955
"saying\n"
11956
"default, will be the path to a branch that you wish to override a value\n"
11957
"for. The '?' and '*' wildcards are supported::"
11958
11959
#: en/help_topics/configuration.txt:378
11960
msgid ""
11961
" [/home/jdoe/branches/nethack]\n"
11962
" email = Nethack Admin <nethack@nethack.com>"
11963
msgstr ""
11964
" [/home/jdoe/branches/nethack]\n"
11965
" email = Nethack Admin <nethack@nethack.com>"
11966
11967
#: en/help_topics/configuration.txt:381
11968
msgid ""
11969
" [http://hypothetical.site.com/branches/devel-branch]\n"
11970
" create_signatures = always"
11971
msgstr ""
11972
" [http://hypothetical.site.com/branches/devel-branch]\n"
11973
" create_signatures = always"
11974
11975
#: en/help_topics/configuration.txt:384
11976
msgid ""
11977
"The authentication configuration file, authentication.conf\n"
11978
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11979
msgstr ""
11980
"The authentication configuration file, authentication.conf\n"
11981
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11982
11983
#: en/help_topics/configuration.txt:387
11984
msgid ""
11985
"``authentication.conf`` allows one to specify credentials for\n"
11986
"remote servers. This can be used for all the supported transports and any "
11987
"part\n"
11988
"of bzr that requires authentication (smtp for example)."
11989
msgstr ""
11990
"``authentication.conf`` allows one to specify credentials for\n"
11991
"remote servers. This can be used for all the supported transports and any "
11992
"part\n"
11993
"of bzr that requires authentication (smtp for example)."
11994
11995
#: en/help_topics/configuration.txt:391
11996
msgid ""
11997
"The syntax of the file obeys the same rules as the others except for the\n"
11998
"option policies which don't apply."
11999
msgstr ""
12000
"The syntax of the file obeys the same rules as the others except for the\n"
12001
"option policies which don't apply."
12002
12003
#: en/help_topics/configuration.txt:394
12004
msgid ""
12005
"For more information on the possible uses of the authentication "
12006
"configuration\n"
12007
"file see :doc:`authentication-help`."
12008
msgstr ""
12009
"For more information on the possible uses of the authentication "
12010
"configuration\n"
12011
"file see :doc:`authentication-help`."
12012
12013
#: en/help_topics/configuration.txt:397
12014
msgid ""
12015
"\n"
12016
"Common options\n"
12017
"--------------"
12018
msgstr ""
12019
"\n"
12020
"Common options\n"
12021
"--------------"
12022
12023
#: en/help_topics/configuration.txt:401
12024
msgid ""
12025
"debug_flags\n"
12026
"~~~~~~~~~~~"
12027
msgstr ""
12028
"debug_flags\n"
12029
"~~~~~~~~~~~"
12030
12031
#: en/help_topics/configuration.txt:404
12032
msgid ""
12033
"A comma-separated list of debugging options to turn on. The same values\n"
12034
"can be used as with the -D command-line option (see `help global-options`).\n"
12035
"For example::"
12036
msgstr ""
12037
"A comma-separated list of debugging options to turn on. The same values\n"
12038
"can be used as with the -D command-line option (see `help global-options`).\n"
12039
"For example::"
12040
12041
#: en/help_topics/configuration.txt:408
12042
msgid " debug_flags = hpss"
12043
msgstr " debug_flags = hpss"
12044
12045
#: en/help_topics/configuration.txt:412
12046
msgid " debug_flags = hpss,evil"
12047
msgstr " debug_flags = hpss,evil"
12048
12049
#: en/help_topics/configuration.txt:414
12050
msgid ""
12051
"email\n"
12052
"~~~~~"
12053
msgstr ""
12054
"email\n"
12055
"~~~~~"
12056
12057
#: en/help_topics/configuration.txt:417
12058
msgid ""
12059
"The email address to use when committing a branch. Typically takes the form\n"
12060
"of::"
12061
msgstr ""
12062
"The email address to use when committing a branch. Typically takes the form\n"
12063
"of::"
12064
12065
#: en/help_topics/configuration.txt:420
12066
msgid " email = Full Name <account@hostname.tld>"
12067
msgstr " email = Full Name <account@hostname.tld>"
12068
12069
#: en/help_topics/configuration.txt:422
12070
msgid ""
12071
"editor\n"
12072
"~~~~~~"
12073
msgstr ""
12074
"editor\n"
12075
"~~~~~~"
12076
12077
#: en/help_topics/configuration.txt:425
12078
msgid ""
12079
"The path of the editor that you wish to use if *bzr commit* is run without\n"
12080
"a commit message. This setting is trumped by the environment variable\n"
12081
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
12082
"variables."
12083
msgstr ""
12084
"The path of the editor that you wish to use if *bzr commit* is run without\n"
12085
"a commit message. This setting is trumped by the environment variable\n"
12086
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
12087
"variables."
12088
12089
#: en/help_topics/configuration.txt:430
12090
msgid ""
12091
"log_format\n"
12092
"~~~~~~~~~~"
12093
msgstr ""
12094
"log_format\n"
12095
"~~~~~~~~~~"
12096
12097
#: en/help_topics/configuration.txt:433
12098
msgid ""
12099
"The default log format to use. Standard log formats are ``long``, ``short``\n"
12100
"and ``line``. Additional formats may be provided by plugins. The default\n"
12101
"value is ``long``."
12102
msgstr ""
12103
"The default log format to use. Standard log formats are ``long``, ``short``\n"
12104
"and ``line``. Additional formats may be provided by plugins. The default\n"
12105
"value is ``long``."
12106
12107
#: en/help_topics/configuration.txt:437
12108
msgid ""
12109
"check_signatures\n"
12110
"~~~~~~~~~~~~~~~~"
12111
msgstr ""
12112
"check_signatures\n"
12113
"~~~~~~~~~~~~~~~~"
12114
12115
#: en/help_topics/configuration.txt:440
12116
msgid ""
12117
"Reserved for future use. These options will allow a policy for branches to\n"
12118
"require signatures."
12119
msgstr ""
12120
"Reserved for future use. These options will allow a policy for branches to\n"
12121
"require signatures."
12122
12123
#: en/help_topics/configuration.txt:443
12124
msgid ""
12125
"require\n"
12126
" The gnupg signature for revisions must be present and must be valid."
12127
msgstr ""
12128
"require\n"
12129
" The gnupg signature for revisions must be present and must be valid."
12130
12131
#: en/help_topics/configuration.txt:446
12132
msgid ""
12133
"ignore\n"
12134
" Do not check gnupg signatures of revisions."
12135
msgstr ""
12136
"ignore\n"
12137
" Do not check gnupg signatures of revisions."
12138
12139
#: en/help_topics/configuration.txt:449
12140
msgid ""
12141
"check-available\n"
12142
" (default) If gnupg signatures for revisions are present, check them.\n"
12143
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
12144
" no signature is present."
12145
msgstr ""
12146
"check-available\n"
12147
" (default) If gnupg signatures for revisions are present, check them.\n"
12148
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
12149
" no signature is present."
12150
12151
#: en/help_topics/configuration.txt:454
12152
msgid ""
12153
"create_signatures\n"
12154
"~~~~~~~~~~~~~~~~~"
12155
msgstr ""
12156
"create_signatures\n"
12157
"~~~~~~~~~~~~~~~~~"
12158
12159
#: en/help_topics/configuration.txt:457
12160
msgid ""
12161
"Defines the behaviour of signing revisions on commits. By default bzr will "
12162
"not\n"
12163
"sign new commits."
12164
msgstr ""
12165
"Defines the behaviour of signing revisions on commits. By default bzr will "
12166
"not\n"
12167
"sign new commits."
12168
12169
#: en/help_topics/configuration.txt:460
12170
msgid ""
12171
"always\n"
12172
" Sign every new revision that is committed. If the signing fails then "
12173
"the\n"
12174
" commit will not be made."
12175
msgstr ""
12176
"always\n"
12177
" Sign every new revision that is committed. If the signing fails then "
12178
"the\n"
12179
" commit will not be made."
12180
12181
#: en/help_topics/configuration.txt:464
12182
msgid ""
12183
"when-required\n"
12184
" Reserved for future use."
12185
msgstr ""
12186
"when-required\n"
12187
" Reserved for future use."
12188
12189
#: en/help_topics/configuration.txt:467
12190
msgid ""
12191
"never\n"
12192
" Reserved for future use."
12193
msgstr ""
12194
"never\n"
12195
" Reserved for future use."
12196
12197
#: en/help_topics/configuration.txt:470
12198
msgid ""
12199
"In future it is planned that ``when-required`` will sign newly\n"
12200
"committed revisions only when the branch requires them. ``never`` will "
12201
"refuse\n"
12202
"to sign newly committed revisions, even if the branch requires signatures."
12203
msgstr ""
12204
"In future it is planned that ``when-required`` will sign newly\n"
12205
"committed revisions only when the branch requires them. ``never`` will "
12206
"refuse\n"
12207
"to sign newly committed revisions, even if the branch requires signatures."
12208
12209
#: en/help_topics/configuration.txt:474
12210
msgid ""
12211
"dirstate.fdatasync\n"
12212
"~~~~~~~~~~~~~~~~~~"
12213
msgstr ""
12214
"dirstate.fdatasync\n"
12215
"~~~~~~~~~~~~~~~~~~"
12216
12217
#: en/help_topics/configuration.txt:477
12218
msgid ""
12219
"If true (default), working tree metadata changes are flushed through the\n"
12220
"OS buffers to physical disk. This is somewhat slower, but means data\n"
12221
"should not be lost if the machine crashes. See also repository.fdatasync."
12222
msgstr ""
12223
"If true (default), working tree metadata changes are flushed through the\n"
12224
"OS buffers to physical disk. This is somewhat slower, but means data\n"
12225
"should not be lost if the machine crashes. See also repository.fdatasync."
12226
12227
#: en/help_topics/configuration.txt:481
12228
msgid ""
12229
"gpg_signing_key\n"
12230
"~~~~~~~~~~~~~~~"
12231
msgstr ""
12232
"gpg_signing_key\n"
12233
"~~~~~~~~~~~~~~~"
12234
12235
#: en/help_topics/configuration.txt:484
12236
msgid ""
12237
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
12238
"address, key fingerprint or full key ID. When unset or when set to\n"
12239
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
12240
msgstr ""
12241
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
12242
"address, key fingerprint or full key ID. When unset or when set to\n"
12243
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
12244
12245
#: en/help_topics/configuration.txt:488
12246
msgid ""
12247
"recurse\n"
12248
"~~~~~~~"
12249
msgstr ""
12250
"recurse\n"
12251
"~~~~~~~"
12252
12253
#: en/help_topics/configuration.txt:491
12254
msgid ""
12255
"Only useful in ``locations.conf``. Defines whether or not the\n"
12256
"configuration for this section applies to subdirectories:"
12257
msgstr ""
12258
"Only useful in ``locations.conf``. Defines whether or not the\n"
12259
"configuration for this section applies to subdirectories:"
12260
12261
#: en/help_topics/configuration.txt:494
12262
msgid ""
12263
"true\n"
12264
" (default) This section applies to subdirectories as well."
12265
msgstr ""
12266
"true\n"
12267
" (default) This section applies to subdirectories as well."
12268
12269
#: en/help_topics/configuration.txt:497
12270
msgid ""
12271
"false\n"
12272
" This section only applies to the branch at this directory and not\n"
12273
" branches below it."
12274
msgstr ""
12275
"false\n"
12276
" This section only applies to the branch at this directory and not\n"
12277
" branches below it."
12278
12279
#: en/help_topics/configuration.txt:501
12280
msgid ""
12281
"gpg_signing_command\n"
12282
"~~~~~~~~~~~~~~~~~~~"
12283
msgstr ""
12284
"gpg_signing_command\n"
12285
"~~~~~~~~~~~~~~~~~~~"
12286
12287
#: en/help_topics/configuration.txt:504
12288
msgid ""
12289
"(Default: \"gpg\"). Which program should be used to sign and check "
12290
"revisions.\n"
12291
"For example::"
12292
msgstr ""
12293
"(Default: \"gpg\"). Which program should be used to sign and check "
12294
"revisions.\n"
12295
"For example::"
12296
12297
#: en/help_topics/configuration.txt:507
12298
msgid " gpg_signing_command = /usr/bin/gnpg"
12299
msgstr " gpg_signing_command = /usr/bin/gnpg"
12300
12301
#: en/help_topics/configuration.txt:509
12302
msgid ""
12303
"The specified command must accept the options \"--clearsign\" and \"-u "
12304
"<email>\"."
12305
msgstr ""
12306
"The specified command must accept the options \"--clearsign\" and \"-u "
12307
"<email>\"."
12308
12309
#: en/help_topics/configuration.txt:511
12310
msgid ""
12311
"bzr_remote_path\n"
12312
"~~~~~~~~~~~~~~~"
12313
msgstr ""
12314
"bzr_remote_path\n"
12315
"~~~~~~~~~~~~~~~"
12316
12317
#: en/help_topics/configuration.txt:514
12318
msgid ""
12319
"(Default: \"bzr\"). The path to the command that should be used to run the "
12320
"smart\n"
12321
"server for bzr. This value may only be specified in locations.conf, because:"
12322
msgstr ""
12323
"(Default: \"bzr\"). The path to the command that should be used to run the "
12324
"smart\n"
12325
"server for bzr. This value may only be specified in locations.conf, because:"
12326
12327
#: en/help_topics/configuration.txt:517
12328
msgid ""
12329
"- it's needed before branch.conf is accessible\n"
12330
"- allowing remote branch.conf files to specify commands would be a security\n"
12331
" risk"
12332
msgstr ""
12333
"- it's needed before branch.conf is accessible\n"
12334
"- allowing remote branch.conf files to specify commands would be a security\n"
12335
" risk"
12336
12337
#: en/help_topics/configuration.txt:521
12338
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
12339
msgstr "It is overridden by the BZR_REMOTE_PATH environment variable."
12340
12341
#: en/help_topics/configuration.txt:523
12342
msgid ""
12343
"smtp_server\n"
12344
"~~~~~~~~~~~"
12345
msgstr ""
12346
"smtp_server\n"
12347
"~~~~~~~~~~~"
12348
12349
#: en/help_topics/configuration.txt:526
12350
msgid ""
12351
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
12352
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
12353
msgstr ""
12354
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
12355
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
12356
12357
#: en/help_topics/configuration.txt:529
12358
msgid ""
12359
"smtp_username, smtp_password\n"
12360
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12361
msgstr ""
12362
"smtp_username, smtp_password\n"
12363
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12364
12365
#: en/help_topics/configuration.txt:532
12366
msgid ""
12367
"User and password to authenticate to the SMTP server. If smtp_username\n"
12368
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
12369
"These settings are only needed if the SMTP server requires authentication\n"
12370
"to send mail."
12371
msgstr ""
12372
"User and password to authenticate to the SMTP server. If smtp_username\n"
12373
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
12374
"These settings are only needed if the SMTP server requires authentication\n"
12375
"to send mail."
12376
12377
#: en/help_topics/configuration.txt:537
12378
msgid ""
12379
"locks.steal_dead\n"
12380
"~~~~~~~~~~~~~~~~"
12381
msgstr ""
12382
"locks.steal_dead\n"
12383
"~~~~~~~~~~~~~~~~"
12384
12385
#: en/help_topics/configuration.txt:540
12386
msgid ""
12387
"If set to true, bzr will automatically break locks held by processes from\n"
12388
"the same machine and user that are no longer alive. Otherwise, it will\n"
12389
"print a message and you can break the lock manually, if you are satisfied\n"
12390
"the object is no longer in use."
12391
msgstr ""
12392
"If set to true, bzr will automatically break locks held by processes from\n"
12393
"the same machine and user that are no longer alive. Otherwise, it will\n"
12394
"print a message and you can break the lock manually, if you are satisfied\n"
12395
"the object is no longer in use."
12396
12397
#: en/help_topics/configuration.txt:545
12398
msgid ""
12399
"mail_client\n"
12400
"~~~~~~~~~~~"
12401
msgstr ""
12402
"mail_client\n"
12403
"~~~~~~~~~~~"
12404
12405
#: en/help_topics/configuration.txt:548
12406
msgid ""
12407
"A mail client to use for sending merge requests.\n"
12408
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
12409
"it\n"
12410
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
12411
"``editor``."
12412
msgstr ""
12413
"A mail client to use for sending merge requests.\n"
12414
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
12415
"it\n"
12416
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
12417
"``editor``."
12418
12419
#: en/help_topics/configuration.txt:553
12420
msgid "Supported values for specific clients:"
12421
msgstr "Supported values for specific clients:"
12422
12423
#: en/help_topics/configuration.txt:555
12424
msgid ""
12425
":claws: Use Claws. This skips a dialog for attaching files.\n"
12426
":evolution: Use Evolution.\n"
12427
":kmail: Use KMail.\n"
12428
":mutt: Use Mutt.\n"
12429
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
12430
"1.5,\n"
12431
" this works around some bugs that xdg-email doesn't handle."
12432
msgstr ""
12433
":claws: Use Claws. This skips a dialogue for attaching files.\n"
12434
":evolution: Use Evolution.\n"
12435
":kmail: Use KMail.\n"
12436
":mutt: Use Mutt.\n"
12437
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
12438
"1.5,\n"
12439
" this works around some bugs that xdg-email doesn't handle."
12440
12441
#: en/help_topics/configuration.txt:562
12442
msgid "Supported generic values are:"
12443
msgstr "Supported generic values are:"
12444
12445
#: en/help_topics/configuration.txt:564
12446
msgid ""
12447
":default: See above.\n"
12448
":editor: Use your editor to compose the merge request. This also uses\n"
12449
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
12450
" smtp_username and smtp_password.\n"
12451
":mapi: Use your preferred e-mail client on Windows.\n"
12452
":xdg-email: Use xdg-email to run your preferred mail program"
12453
msgstr ""
12454
":default: See above.\n"
12455
":editor: Use your editor to compose the merge request. This also uses\n"
12456
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
12457
" smtp_username and smtp_password.\n"
12458
":mapi: Use your preferred e-mail client on Windows.\n"
12459
":xdg-email: Use xdg-email to run your preferred mail program"
12460
12461
#: en/help_topics/configuration.txt:571
12462
msgid ""
12463
"repository.fdatasync\n"
12464
"~~~~~~~~~~~~~~~~~~~~"
12465
msgstr ""
12466
"repository.fdatasync\n"
12467
"~~~~~~~~~~~~~~~~~~~~"
12468
12469
#: en/help_topics/configuration.txt:574
12470
msgid ""
12471
"If true (default), repository changes are flushed through the OS buffers\n"
12472
"to physical disk. This is somewhat slower, but means data should not be\n"
12473
"lost if the machine crashes. See also dirstate.fdatasync."
12474
msgstr ""
12475
"If true (default), repository changes are flushed through the OS buffers\n"
12476
"to physical disk. This is somewhat slower, but means data should not be\n"
12477
"lost if the machine crashes. See also dirstate.fdatasync."
12478
12479
#: en/help_topics/configuration.txt:578
12480
msgid ""
12481
"submit_branch\n"
12482
"~~~~~~~~~~~~~"
12483
msgstr ""
12484
"submit_branch\n"
12485
"~~~~~~~~~~~~~"
12486
12487
#: en/help_topics/configuration.txt:581
12488
msgid ""
12489
"The branch you intend to submit your current work to. This is "
12490
"automatically\n"
12491
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
12492
"This\n"
12493
"should usually be set on a per-branch or per-location basis."
12494
msgstr ""
12495
"The branch you intend to submit your current work to. This is "
12496
"automatically\n"
12497
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
12498
"This\n"
12499
"should usually be set on a per-branch or per-location basis."
12500
12501
#: en/help_topics/configuration.txt:585
12502
msgid ""
12503
"public_branch\n"
12504
"~~~~~~~~~~~~~"
12505
msgstr ""
12506
"public_branch\n"
12507
"~~~~~~~~~~~~~"
12508
12509
#: en/help_topics/configuration.txt:588
12510
msgid ""
12511
"A publically-accessible version of this branch (implying that this version "
12512
"is\n"
12513
"not publically-accessible). Used (and set) by ``bzr send``."
12514
msgstr ""
12515
"A publicly-accessible version of this branch (implying that this version is\n"
12516
"not publicly-accessible). Used (and set) by ``bzr send``."
12517
12518
#: en/help_topics/configuration.txt:591
12519
msgid ""
12520
"suppress_warnings\n"
12521
"~~~~~~~~~~~~~~~~~"
12522
msgstr ""
12523
"suppress_warnings\n"
12524
"~~~~~~~~~~~~~~~~~"
12525
12526
#: en/help_topics/configuration.txt:594
12527
msgid ""
12528
"A list of strings, each string represent a warning that can be emitted by\n"
12529
"bzr. Mentioning a warning in this list tells bzr to not emit it."
12530
msgstr ""
12531
"A list of strings, each string represent a warning that can be emitted by\n"
12532
"bzr. Mentioning a warning in this list tells bzr to not emit it."
12533
12534
#: en/help_topics/configuration.txt:597
12535
msgid "Valid values:"
12536
msgstr "Valid values:"
12537
12538
#: en/help_topics/configuration.txt:599
12539
msgid ""
12540
"* ``format_deprecation``:\n"
12541
" whether the format deprecation warning is shown on repositories that "
12542
"are\n"
12543
" using deprecated formats."
12544
msgstr ""
12545
"* ``format_deprecation``:\n"
12546
" whether the format deprecation warning is shown on repositories that "
12547
"are\n"
12548
" using deprecated formats."
12549
12550
#: en/help_topics/configuration.txt:603
12551
msgid ""
12552
"default_format\n"
12553
"~~~~~~~~~~~~~~"
12554
msgstr ""
12555
"default_format\n"
12556
"~~~~~~~~~~~~~~"
12557
12558
#: en/help_topics/configuration.txt:606
12559
msgid ""
12560
"A format name for the default format used when creating branches. See "
12561
"``bzr\n"
12562
"help formats`` for possible values."
12563
msgstr ""
12564
"A format name for the default format used when creating branches. See "
12565
"``bzr\n"
12566
"help formats`` for possible values."
12567
12568
#: en/help_topics/configuration.txt:609
12569
msgid ""
12570
"\n"
12571
"Unicode options\n"
12572
"---------------"
12573
msgstr ""
12574
"\n"
12575
"Unicode options\n"
12576
"---------------"
12577
12578
#: en/help_topics/configuration.txt:613
12579
msgid ""
12580
"output_encoding\n"
12581
"~~~~~~~~~~~~~~~"
12582
msgstr ""
12583
"output_encoding\n"
12584
"~~~~~~~~~~~~~~~"
12585
12586
#: en/help_topics/configuration.txt:616
12587
msgid ""
12588
"A Python unicode encoding name for text output from bzr, such as log\n"
12589
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
12590
"is the terminal encoding prefered by the operating system."
12591
msgstr ""
12592
"A Python unicode encoding name for text output from bzr, such as log\n"
12593
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
12594
"is the terminal encoding preferred by the operating system."
12595
12596
#: en/help_topics/configuration.txt:620
12597
msgid ""
12598
"\n"
12599
"Branch type specific options\n"
12600
"----------------------------"
12601
msgstr ""
12602
"\n"
12603
"Branch type specific options\n"
12604
"----------------------------"
12605
12606
#: en/help_topics/configuration.txt:624
12607
msgid ""
12608
"These options apply only to branches that use the ``dirstate-tags`` or\n"
12609
"later format. They\n"
12610
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
12611
"manually set in ``locations.conf`` or ``bazaar.conf``."
12612
msgstr ""
12613
"These options apply only to branches that use the ``dirstate-tags`` or\n"
12614
"later format. They\n"
12615
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
12616
"manually set in ``locations.conf`` or ``bazaar.conf``."
12617
12618
#: en/help_topics/configuration.txt:629
12619
msgid ""
12620
"append_revisions_only\n"
12621
"~~~~~~~~~~~~~~~~~~~~~"
12622
msgstr ""
12623
"append_revisions_only\n"
12624
"~~~~~~~~~~~~~~~~~~~~~"
12625
12626
#: en/help_topics/configuration.txt:632
12627
msgid ""
12628
"If set to \"True\" then revisions can only be appended to the log, not\n"
12629
"removed. A branch with this setting enabled can only pull from another\n"
12630
"branch if the other branch's log is a longer version of its own. This is\n"
12631
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
12632
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
12633
"compatibility with previous bzr versions (older than 2.2)."
12634
msgstr ""
12635
"If set to \"True\" then revisions can only be appended to the log, not\n"
12636
"removed. A branch with this setting enabled can only pull from another\n"
12637
"branch if the other branch's log is a longer version of its own. This is\n"
12638
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
12639
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
12640
"compatibility with previous bzr versions (older than 2.2)."
12641
12642
#: en/help_topics/configuration.txt:639
12643
msgid ""
12644
"parent_location\n"
12645
"~~~~~~~~~~~~~~~"
12646
msgstr ""
12647
"parent_location\n"
12648
"~~~~~~~~~~~~~~~"
12649
12650
#: en/help_topics/configuration.txt:642
12651
msgid ""
12652
"If present, the location of the default branch for pull or merge. This "
12653
"option\n"
12654
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
12655
"--remember``."
12656
msgstr ""
12657
"If present, the location of the default branch for pull or merge. This "
12658
"option\n"
12659
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
12660
"--remember``."
12661
12662
#: en/help_topics/configuration.txt:646
12663
msgid ""
12664
"push_location\n"
12665
"~~~~~~~~~~~~~"
12666
msgstr ""
12667
"push_location\n"
12668
"~~~~~~~~~~~~~"
12669
12670
#: en/help_topics/configuration.txt:649
12671
msgid ""
12672
"If present, the location of the default branch for push. This option\n"
12673
"is normally set by the first ``push`` or ``push --remember``."
12674
msgstr ""
12675
"If present, the location of the default branch for push. This option\n"
12676
"is normally set by the first ``push`` or ``push --remember``."
12677
12678
#: en/help_topics/configuration.txt:652
12679
msgid ""
12680
"push_strict\n"
12681
"~~~~~~~~~~~"
12682
msgstr ""
12683
"push_strict\n"
12684
"~~~~~~~~~~~"
12685
12686
#: en/help_topics/configuration.txt:655
12687
msgid ""
12688
"If present, defines the ``--strict`` option default value for checking\n"
12689
"uncommitted changes before pushing."
12690
msgstr ""
12691
"If present, defines the ``--strict`` option default value for checking\n"
12692
"uncommitted changes before pushing."
12693
12694
#: en/help_topics/configuration.txt:658
12695
msgid ""
12696
"dpush_strict\n"
12697
"~~~~~~~~~~~~"
12698
msgstr ""
12699
"dpush_strict\n"
12700
"~~~~~~~~~~~~"
12701
12702
#: en/help_topics/configuration.txt:661
12703
msgid ""
12704
"If present, defines the ``--strict`` option default value for checking\n"
12705
"uncommitted changes before pushing into a different VCS without any\n"
12706
"custom bzr metadata."
12707
msgstr ""
12708
"If present, defines the ``--strict`` option default value for checking\n"
12709
"uncommitted changes before pushing into a different VCS without any\n"
12710
"custom bzr metadata."
12711
12712
#: en/help_topics/configuration.txt:665
12713
msgid ""
12714
"bound_location\n"
12715
"~~~~~~~~~~~~~~"
12716
msgstr ""
12717
"bound_location\n"
12718
"~~~~~~~~~~~~~~"
12719
12720
#: en/help_topics/configuration.txt:668
12721
msgid ""
12722
"The location that commits should go to when acting as a checkout.\n"
12723
"This option is normally set by ``bind``."
12724
msgstr ""
12725
"The location that commits should go to when acting as a checkout.\n"
12726
"This option is normally set by ``bind``."
12727
12728
#: en/help_topics/configuration.txt:671
12729
msgid ""
12730
"bound\n"
12731
"~~~~~"
12732
msgstr ""
12733
"bound\n"
12734
"~~~~~"
12735
12736
#: en/help_topics/configuration.txt:674
12737
msgid ""
12738
"If set to \"True\", the branch should act as a checkout, and push each "
12739
"commit to\n"
12740
"the bound_location. This option is normally set by ``bind``/``unbind``."
12741
msgstr ""
12742
"If set to \"True\", the branch should act as a checkout, and push each "
12743
"commit to\n"
12744
"the bound_location. This option is normally set by ``bind``/``unbind``."
12745
12746
#: en/help_topics/configuration.txt:677
12747
msgid ""
12748
"send_strict\n"
12749
"~~~~~~~~~~~"
12750
msgstr ""
12751
"send_strict\n"
12752
"~~~~~~~~~~~"
12753
12754
#: en/help_topics/configuration.txt:680
12755
msgid ""
12756
"If present, defines the ``--strict`` option default value for checking\n"
12757
"uncommitted changes before sending a merge directive."
12758
msgstr ""
12759
"If present, defines the ``--strict`` option default value for checking\n"
12760
"uncommitted changes before sending a merge directive."
12761
12762
#: en/help_topics/configuration.txt:683
12763
msgid ""
12764
"add.maximum_file_size\n"
12765
"~~~~~~~~~~~~~~~~~~~~~"
12766
msgstr ""
12767
"add.maximum_file_size\n"
12768
"~~~~~~~~~~~~~~~~~~~~~"
12769
12770
#: en/help_topics/configuration.txt:686
12771
msgid ""
12772
"Defines the maximum file size the command line \"add\" operation will allow\n"
12773
"in recursive mode, with files larger than this value being skipped. You may "
12774
"\n"
12775
"specify this value as an integer (in which case it is interpreted as bytes), "
12776
"\n"
12777
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
12778
"0 \n"
12779
"will disable skipping."
12780
msgstr ""
12781
"Defines the maximum file size the command line \"add\" operation will allow\n"
12782
"in recursive mode, with files larger than this value being skipped. You may "
12783
"\n"
12784
"specify this value as an integer (in which case it is interpreted as bytes), "
12785
"\n"
12786
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
12787
"0 \n"
12788
"will disable skipping."
12789
12790
#: en/help_topics/configuration.txt:692
12791
msgid ""
12792
"External Merge Tools\n"
12793
"--------------------"
12794
msgstr ""
12795
"External Merge Tools\n"
12796
"--------------------"
12797
12798
#: en/help_topics/configuration.txt:695
12799
msgid ""
12800
"bzr.mergetool.<name>\n"
12801
"~~~~~~~~~~~~~~~~~~~~"
12802
msgstr ""
12803
"bzr.mergetool.<name>\n"
12804
"~~~~~~~~~~~~~~~~~~~~"
12805
12806
#: en/help_topics/configuration.txt:698
12807
msgid ""
12808
"Defines an external merge tool called <name> with the given command-line.\n"
12809
"Arguments containing spaces should be quoted using single or double quotes. "
12810
"The\n"
12811
"executable may omit its path if it can be found on the PATH."
12812
msgstr ""
12813
"Defines an external merge tool called <name> with the given command-line.\n"
12814
"Arguments containing spaces should be quoted using single or double quotes. "
12815
"The\n"
12816
"executable may omit its path if it can be found on the PATH."
12817
12818
#: en/help_topics/configuration.txt:702
12819
msgid ""
12820
"The following markers can be used in the command-line to substitute "
12821
"filenames\n"
12822
"involved in the merge conflict::"
12823
msgstr ""
12824
"The following markers can be used in the command-line to substitute "
12825
"filenames\n"
12826
"involved in the merge conflict::"
12827
12828
#: en/help_topics/configuration.txt:705
12829
msgid ""
12830
" {base} file.BASE\n"
12831
" {this} file.THIS\n"
12832
" {other} file.OTHER\n"
12833
" {result} output file\n"
12834
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
12835
"merge\n"
12836
" succeeds."
12837
msgstr ""
12838
" {base} file.BASE\n"
12839
" {this} file.THIS\n"
12840
" {other} file.OTHER\n"
12841
" {result} output file\n"
12842
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
12843
"merge\n"
12844
" succeeds."
12845
12846
#: en/help_topics/configuration.txt:714
12847
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
12848
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
12849
12850
#: en/help_topics/configuration.txt:716
12851
msgid ""
12852
"bzr.default_mergetool\n"
12853
"~~~~~~~~~~~~~~~~~~~~~"
12854
msgstr ""
12855
"bzr.default_mergetool\n"
12856
"~~~~~~~~~~~~~~~~~~~~~"
12857
12858
#: en/help_topics/configuration.txt:719
12859
msgid ""
12860
"Specifies which external merge tool (as defined above) should be selected "
12861
"by\n"
12862
"default in tools such as ``bzr qconflicts``."
12863
msgstr ""
12864
"Specifies which external merge tool (as defined above) should be selected "
12865
"by\n"
12866
"default in tools such as ``bzr qconflicts``."
12867
12868
#: en/help_topics/configuration.txt:724
12869
msgid " bzr.default_mergetool = kdiff3\n"
12870
msgstr " bzr.default_mergetool = kdiff3\n"
12871
12872
#: en/help_topics/conflict-types.txt:1
12873
msgid ""
12874
"Conflict Types\n"
12875
"=============="
12876
msgstr ""
12877
"Conflict Types\n"
12878
"=============="
12879
12880
#: en/help_topics/conflict-types.txt:4
12881
msgid ""
12882
"Some operations, like merge, revert and pull, modify the contents of your\n"
12883
"working tree. These modifications are programmatically generated, and so "
12884
"they\n"
12885
"may conflict with the current state of your working tree. "
12886
msgstr ""
12887
"Some operations, like merge, revert and pull, modify the contents of your\n"
12888
"working tree. These modifications are programmatically generated, and so "
12889
"they\n"
12890
"may conflict with the current state of your working tree. "
12891
12892
#: en/help_topics/conflict-types.txt:8
12893
msgid ""
12894
"When conflicts are present in your working tree (as shown by ``bzr\n"
12895
"conflicts``), you should resolve them and then inform bzr that the "
12896
"conflicts\n"
12897
"have been resolved."
12898
msgstr ""
12899
"When conflicts are present in your working tree (as shown by ``bzr\n"
12900
"conflicts``), you should resolve them and then inform bzr that the "
12901
"conflicts\n"
12902
"have been resolved."
12903
12904
#: en/help_topics/conflict-types.txt:12
12905
msgid ""
12906
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
12907
"should resolve them is not the one responsible for their occurrence, as is "
12908
"the\n"
12909
"case when merging other people's work or because some conflicts are "
12910
"presented\n"
12911
"in a way that is not easy to understand."
12912
msgstr ""
12913
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
12914
"should resolve them is not the one responsible for their occurrence, as is "
12915
"the\n"
12916
"case when merging other people's work or because some conflicts are "
12917
"presented\n"
12918
"in a way that is not easy to understand."
12919
12920
#: en/help_topics/conflict-types.txt:17
12921
msgid ""
12922
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
12923
"conflict if and only if there's an actual conceptual conflict in the source\n"
12924
"tree. Because Bazaar doesn't understand the real meaning of the files "
12925
"being\n"
12926
"versioned, it can, when faced with ambiguities, fall short in either "
12927
"direction\n"
12928
"trying to resolve the conflict itself. Many kinds of changes can be "
12929
"combined\n"
12930
"programmatically, but sometimes only a human can determine the right thing "
12931
"to\n"
12932
"do."
12933
msgstr ""
12934
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
12935
"conflict if and only if there's an actual conceptual conflict in the source\n"
12936
"tree. Because Bazaar doesn't understand the real meaning of the files "
12937
"being\n"
12938
"versioned, it can, when faced with ambiguities, fall short in either "
12939
"direction\n"
12940
"trying to resolve the conflict itself. Many kinds of changes can be "
12941
"combined\n"
12942
"programmatically, but sometimes only a human can determine the right thing "
12943
"to\n"
12944
"do."
12945
12946
#: en/help_topics/conflict-types.txt:25
12947
msgid ""
12948
"When Bazaar generates a conflict, it adds information into the working tree "
12949
"to\n"
12950
"present the conflicting versions, and it's up to you to find the correct\n"
12951
"resolution."
12952
msgstr ""
12953
"When Bazaar generates a conflict, it adds information into the working tree "
12954
"to\n"
12955
"present the conflicting versions, and it's up to you to find the correct\n"
12956
"resolution."
12957
12958
#: en/help_topics/conflict-types.txt:29
12959
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
12960
msgstr "Whatever the conflict is, resolving it is roughly done in two steps:"
12961
12962
#: en/help_topics/conflict-types.txt:31
12963
msgid ""
12964
"1. Modify the working tree content so that the conflicted item is now in "
12965
"the\n"
12966
" state you want to keep, then"
12967
msgstr ""
12968
"1. Modify the working tree content so that the conflicted item is now in "
12969
"the\n"
12970
" state you want to keep, then"
12971
12972
#: en/help_topics/conflict-types.txt:34
12973
msgid ""
12974
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
12975
" remaining generated information (``bzr resolve <item>``)."
12976
msgstr ""
12977
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
12978
" remaining generated information (``bzr resolve <item>``)."
12979
12980
#: en/help_topics/conflict-types.txt:37
12981
msgid ""
12982
"For most conflict types, there are some obvious ways to modify the working\n"
12983
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
12984
"itself already made a choice, when possible."
12985
msgstr ""
12986
"For most conflict types, there are some obvious ways to modify the working\n"
12987
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
12988
"itself already made a choice, when possible."
12989
12990
#: en/help_topics/conflict-types.txt:41
12991
msgid ""
12992
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12993
"different ways to resolve the conflict."
12994
msgstr ""
12995
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12996
"different ways to resolve the conflict."
12997
12998
#: en/help_topics/conflict-types.txt:44
12999
msgid ""
13000
"Each type of conflict is explained below, and the action which must be done "
13001
"to\n"
13002
"resolve the conflict is outlined."
13003
msgstr ""
13004
"Each type of conflict is explained below, and the action which must be done "
13005
"to\n"
13006
"resolve the conflict is outlined."
13007
13008
#: en/help_topics/conflict-types.txt:47
13009
msgid ""
13010
"Various actions are available depending on the kind of conflict, for some "
13011
"of\n"
13012
"these actions, Bazaar can provide some help. In the end you should at least\n"
13013
"inform Bazaar that you're done with the conflict with::"
13014
msgstr ""
13015
"Various actions are available depending on the kind of conflict, for some "
13016
"of\n"
13017
"these actions, Bazaar can provide some help. In the end you should at least\n"
13018
"inform Bazaar that you're done with the conflict with::"
13019
13020
#: en/help_topics/conflict-types.txt:51
13021
msgid " ``bzr resolve FILE --action=done'"
13022
msgstr " ``bzr resolve FILE --action=done'"
13023
13024
#: en/help_topics/conflict-types.txt:53
13025
msgid ""
13026
"Note that this is the default action when a single file is involved so you "
13027
"can\n"
13028
"simply use::"
13029
msgstr ""
13030
"Note that this is the default action when a single file is involved so you "
13031
"can\n"
13032
"simply use::"
13033
13034
#: en/help_topics/conflict-types.txt:56
13035
msgid " ``bzr resolve FILE``"
13036
msgstr " ``bzr resolve FILE``"
13037
13038
#: en/help_topics/conflict-types.txt:58
13039
msgid "See ``bzr help resolve`` for more details."
13040
msgstr "See ``bzr help resolve`` for more details."
13041
13042
#: en/help_topics/conflict-types.txt:60
13043
msgid ""
13044
"Text conflicts\n"
13045
"--------------"
13046
msgstr ""
13047
"Text conflicts\n"
13048
"--------------"
13049
13050
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
13051
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
13052
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
13053
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
13054
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
13055
msgid "Typical message::"
13056
msgstr "Typical message::"
13057
13058
#: en/help_topics/conflict-types.txt:65
13059
msgid " Text conflict in FILE"
13060
msgstr " Text conflict in FILE"
13061
13062
#: en/help_topics/conflict-types.txt:67
13063
msgid ""
13064
"These are produced when a text merge cannot completely reconcile two sets "
13065
"of\n"
13066
"text changes. Bazaar will emit files for each version with the extensions\n"
13067
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
13068
"tree,\n"
13069
"i.e. the tree that you are merging changes into. OTHER is the version that "
13070
"you\n"
13071
"are merging into the target. BASE is an older version that is used as a "
13072
"basis\n"
13073
"for comparison."
13074
msgstr ""
13075
"These are produced when a text merge cannot completely reconcile two sets "
13076
"of\n"
13077
"text changes. Bazaar will emit files for each version with the extensions\n"
13078
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
13079
"tree,\n"
13080
"i.e. the tree that you are merging changes into. OTHER is the version that "
13081
"you\n"
13082
"are merging into the target. BASE is an older version that is used as a "
13083
"basis\n"
13084
"for comparison."
13085
13086
#: en/help_topics/conflict-types.txt:74
13087
msgid ""
13088
"In the main copy of the file, Bazaar will include all the changes that it\n"
13089
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
13090
"\"herringbone\" markers like ``<<<<<<<``."
13091
msgstr ""
13092
"In the main copy of the file, Bazaar will include all the changes that it\n"
13093
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
13094
"\"herringbone\" markers like ``<<<<<<<``."
13095
13096
#: en/help_topics/conflict-types.txt:78
13097
msgid ""
13098
"Say the initial text is \"The project leader released it.\", and THIS "
13099
"modifies it\n"
13100
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
13101
"leader\n"
13102
"released Bazaar.\" A conflict would look like this::"
13103
msgstr ""
13104
"Say the initial text is \"The project leader released it.\", and THIS "
13105
"modifies it\n"
13106
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
13107
"leader\n"
13108
"released Bazaar.\" A conflict would look like this::"
13109
13110
#: en/help_topics/conflict-types.txt:82
13111
msgid ""
13112
" <<<<<<< TREE\n"
13113
" Martin Pool released it.\n"
13114
" =======\n"
13115
" The project leader released Bazaar.\n"
13116
" >>>>>>> MERGE-SOURCE"
13117
msgstr ""
13118
" <<<<<<< TREE\n"
13119
" Martin Pool released it.\n"
13120
" =======\n"
13121
" The project leader released Bazaar.\n"
13122
" >>>>>>> MERGE-SOURCE"
13123
13124
#: en/help_topics/conflict-types.txt:88
13125
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
13126
msgstr "The correct resolution would be \"Martin Pool released Bazaar.\""
13127
13128
#: en/help_topics/conflict-types.txt:90
13129
msgid ""
13130
"You can handle text conflicts either by editing the main copy of the file,\n"
13131
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
13132
"worth mentioning that resolving text conflicts rarely involves picking one\n"
13133
"set of changes over the other (but see below when you encounter these\n"
13134
"cases). More often, the two sets of changes must be intelligently combined."
13135
msgstr ""
13136
"You can handle text conflicts either by editing the main copy of the file,\n"
13137
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
13138
"worth mentioning that resolving text conflicts rarely involves picking one\n"
13139
"set of changes over the other (but see below when you encounter these\n"
13140
"cases). More often, the two sets of changes must be intelligently combined."
13141
13142
#: en/help_topics/conflict-types.txt:96
13143
msgid ""
13144
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
13145
"you are done editing, the file should look like it never had a conflict, and "
13146
"be\n"
13147
"ready to commit."
13148
msgstr ""
13149
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
13150
"you are done editing, the file should look like it never had a conflict, and "
13151
"be\n"
13152
"ready to commit."
13153
13154
#: en/help_topics/conflict-types.txt:100
13155
msgid ""
13156
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
13157
"Bazaar will auto-detect which conflicts you have resolved."
13158
msgstr ""
13159
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
13160
"Bazaar will auto-detect which conflicts you have resolved."
13161
13162
#: en/help_topics/conflict-types.txt:103
13163
msgid ""
13164
"When the conflict is resolved, Bazaar deletes the previously generated\n"
13165
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
13166
"working tree."
13167
msgstr ""
13168
"When the conflict is resolved, Bazaar deletes the previously generated\n"
13169
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
13170
"working tree."
13171
13172
#: en/help_topics/conflict-types.txt:107
13173
msgid ""
13174
"\n"
13175
"When you want to pick one set of changes over the other, you can use ``bzr\n"
13176
"resolve`` with one of the following actions:"
13177
msgstr ""
13178
"\n"
13179
"When you want to pick one set of changes over the other, you can use ``bzr\n"
13180
"resolve`` with one of the following actions:"
13181
13182
#: en/help_topics/conflict-types.txt:111
13183
msgid ""
13184
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
13185
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
13186
msgstr ""
13187
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
13188
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
13189
13190
#: en/help_topics/conflict-types.txt:114
13191
msgid ""
13192
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
13193
"modifications will be taken into account."
13194
msgstr ""
13195
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
13196
"modifications will be taken into account."
13197
13198
#: en/help_topics/conflict-types.txt:117
13199
msgid ""
13200
"Content conflicts\n"
13201
"-----------------"
13202
msgstr ""
13203
"Content conflicts\n"
13204
"-----------------"
13205
13206
#: en/help_topics/conflict-types.txt:122
13207
msgid " Contents conflict in FILE"
13208
msgstr " Contents conflict in FILE"
13209
13210
#: en/help_topics/conflict-types.txt:124
13211
msgid ""
13212
"This conflict happens when there are conflicting changes in the working "
13213
"tree\n"
13214
"and the merge source, but the conflicted items are not text files. They "
13215
"may\n"
13216
"be binary files, or symlinks, or directories. It can even happen with "
13217
"files\n"
13218
"that are deleted on one side, and modified on the other."
13219
msgstr ""
13220
"This conflict happens when there are conflicting changes in the working "
13221
"tree\n"
13222
"and the merge source, but the conflicted items are not text files. They "
13223
"may\n"
13224
"be binary files, or symlinks, or directories. It can even happen with "
13225
"files\n"
13226
"that are deleted on one side, and modified on the other."
13227
13228
#: en/help_topics/conflict-types.txt:129
13229
msgid ""
13230
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
13231
"be\n"
13232
"regular files, symlinks or directories). But it will not include a \"main "
13233
"copy\"\n"
13234
"of the file with herringbone conflict markers. It will appear that the "
13235
"\"main\n"
13236
"copy\" has been renamed to THIS or OTHER."
13237
msgstr ""
13238
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
13239
"be\n"
13240
"regular files, symlinks or directories). But it will not include a \"main "
13241
"copy\"\n"
13242
"of the file with herringbone conflict markers. It will appear that the "
13243
"\"main\n"
13244
"copy\" has been renamed to THIS or OTHER."
13245
13246
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
13247
msgid ""
13248
"To resolve that kind of conflict, you should rebuild FILE from either "
13249
"version\n"
13250
"or a combination of both."
13251
msgstr ""
13252
"To resolve that kind of conflict, you should rebuild FILE from either "
13253
"version\n"
13254
"or a combination of both."
13255
13256
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
13257
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
13258
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
13259
#: en/help_topics/conflict-types.txt:361
13260
msgid "``bzr resolve`` recognizes the following actions:"
13261
msgstr "``bzr resolve`` recognises the following actions:"
13262
13263
#: en/help_topics/conflict-types.txt:139
13264
msgid ""
13265
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
13266
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
13267
"* ``--action=done`` will just mark the conflict as resolved."
13268
msgstr ""
13269
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
13270
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
13271
"* ``--action=done`` will just mark the conflict as resolved."
13272
13273
#: en/help_topics/conflict-types.txt:143
13274
msgid ""
13275
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
13276
"and\n"
13277
"``.OTHER`` files if they are still present in the working tree."
13278
msgstr ""
13279
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
13280
"and\n"
13281
"``.OTHER`` files if they are still present in the working tree."
13282
13283
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
13284
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
13285
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
13286
#: en/help_topics/conflict-types.txt:369
13287
msgid ""
13288
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
13289
msgstr ""
13290
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
13291
13292
#: en/help_topics/conflict-types.txt:148
13293
msgid ""
13294
"Tag conflicts\n"
13295
"-------------"
13296
msgstr ""
13297
"Tag conflicts\n"
13298
"-------------"
13299
13300
#: en/help_topics/conflict-types.txt:153
13301
msgid ""
13302
" Conflicting tags:\n"
13303
" version-0.1"
13304
msgstr ""
13305
" Conflicting tags:\n"
13306
" version-0.1"
13307
13308
#: en/help_topics/conflict-types.txt:156
13309
msgid ""
13310
"When pulling from or pushing to another branch, Bazaar informs you about "
13311
"tags\n"
13312
"that conflict between the two branches; that is the same tag points to two\n"
13313
"different revisions. You need not resolve these conflicts, but subsequent\n"
13314
"uses of pull or push will result in the same message."
13315
msgstr ""
13316
"When pulling from or pushing to another branch, Bazaar informs you about "
13317
"tags\n"
13318
"that conflict between the two branches; that is the same tag points to two\n"
13319
"different revisions. You need not resolve these conflicts, but subsequent\n"
13320
"uses of pull or push will result in the same message."
13321
13322
#: en/help_topics/conflict-types.txt:161
13323
msgid ""
13324
"To resolve the conflict, you must apply the correct tags to either the "
13325
"target\n"
13326
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
13327
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
13328
"target branch's tags match the source branch, then in the target branch do\n"
13329
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
13330
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
13331
"source\n"
13332
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
13333
"favor of the target branch, you need to similarly use ``tag --force`` in "
13334
"the\n"
13335
"source branch. (Note that pulling or pushing using --overwrite will "
13336
"overwrite\n"
13337
"all tags as well.)"
13338
msgstr ""
13339
"To resolve the conflict, you must apply the correct tags to either the "
13340
"target\n"
13341
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
13342
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
13343
"target branch's tags match the source branch, then in the target branch do\n"
13344
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
13345
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
13346
"source\n"
13347
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
13348
"favor of the target branch, you need to similarly use ``tag --force`` in "
13349
"the\n"
13350
"source branch. (Note that pulling or pushing using --overwrite will "
13351
"overwrite\n"
13352
"all tags as well.)"
13353
13354
#: en/help_topics/conflict-types.txt:172
13355
msgid ""
13356
"Duplicate paths\n"
13357
"---------------"
13358
msgstr ""
13359
"Duplicate paths\n"
13360
"---------------"
13361
13362
#: en/help_topics/conflict-types.txt:177
13363
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
13364
msgstr " Conflict adding file FILE. Moved existing file to FILE.moved."
13365
13366
#: en/help_topics/conflict-types.txt:179
13367
msgid ""
13368
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
13369
"already been used. The existing file will be renamed to \"FILE.moved\". "
13370
msgstr ""
13371
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
13372
"already been used. The existing file will be renamed to \"FILE.moved\". "
13373
13374
#: en/help_topics/conflict-types.txt:187
13375
msgid ""
13376
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
13377
"FILE``,\n"
13378
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
13379
"* ``--action=done`` will just mark the conflict as resolved."
13380
msgstr ""
13381
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
13382
"FILE``,\n"
13383
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
13384
"* ``--action=done`` will just mark the conflict as resolved."
13385
13386
#: en/help_topics/conflict-types.txt:191
13387
msgid ""
13388
"Note that you must get rid of FILE.moved before using ``--action=done``."
13389
msgstr ""
13390
"Note that you must get rid of FILE.moved before using ``--action=done``."
13391
13392
#: en/help_topics/conflict-types.txt:195
13393
msgid ""
13394
"Unversioned parent\n"
13395
"------------------"
13396
msgstr ""
13397
"Unversioned parent\n"
13398
"------------------"
13399
13400
#: en/help_topics/conflict-types.txt:200
13401
msgid ""
13402
" Conflict because FILE is not versioned, but has versioned children."
13403
msgstr ""
13404
" Conflict because FILE is not versioned, but has versioned children."
13405
13406
#: en/help_topics/conflict-types.txt:202
13407
msgid ""
13408
"Sometimes Bazaar will attempt to create a file whose parent directory is "
13409
"not\n"
13410
"versioned. This happens when the directory has been deleted in the target,\n"
13411
"but has a new child in the source, or vice versa. In this situation, "
13412
"Bazaar\n"
13413
"will version the parent directory as well. Resolving this issue depends\n"
13414
"very much on the particular scenario. You may wish to rename or delete "
13415
"either\n"
13416
"the file or the directory. When you are satisfied, you can run \"bzr "
13417
"resolve\n"
13418
"FILE\" to mark the conflict as resolved."
13419
msgstr ""
13420
"Sometimes Bazaar will attempt to create a file whose parent directory is "
13421
"not\n"
13422
"versioned. This happens when the directory has been deleted in the target,\n"
13423
"but has a new child in the source, or vice versa. In this situation, "
13424
"Bazaar\n"
13425
"will version the parent directory as well. Resolving this issue depends\n"
13426
"very much on the particular scenario. You may wish to rename or delete "
13427
"either\n"
13428
"the file or the directory. When you are satisfied, you can run \"bzr "
13429
"resolve\n"
13430
"FILE\" to mark the conflict as resolved."
13431
13432
#: en/help_topics/conflict-types.txt:210
13433
msgid ""
13434
"Missing parent\n"
13435
"--------------"
13436
msgstr ""
13437
"Missing parent\n"
13438
"--------------"
13439
13440
#: en/help_topics/conflict-types.txt:215
13441
msgid " Conflict adding files to FILE. Created directory."
13442
msgstr " Conflict adding files to FILE. Created directory."
13443
13444
#: en/help_topics/conflict-types.txt:217
13445
msgid ""
13446
"This happens when a directory has been deleted in the target, but has new\n"
13447
"children in the source. This is similar to the \"unversioned parent\" "
13448
"conflict,\n"
13449
"except that the parent directory does not *exist*, instead of just being\n"
13450
"unversioned. In this situation, Bazaar will create the missing parent.\n"
13451
"Resolving this issue depends very much on the particular scenario."
13452
msgstr ""
13453
"This happens when a directory has been deleted in the target, but has new\n"
13454
"children in the source. This is similar to the \"unversioned parent\" "
13455
"conflict,\n"
13456
"except that the parent directory does not *exist*, instead of just being\n"
13457
"unversioned. In this situation, Bazaar will create the missing parent.\n"
13458
"Resolving this issue depends very much on the particular scenario."
13459
13460
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
13461
msgid ""
13462
"To resolve that kind of conflict, you should either remove or rename the\n"
13463
"children or the directory or a combination of both."
13464
msgstr ""
13465
"To resolve that kind of conflict, you should either remove or rename the\n"
13466
"children or the directory or a combination of both."
13467
13468
#: en/help_topics/conflict-types.txt:228
13469
msgid ""
13470
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
13471
" children,\n"
13472
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
13473
"children\n"
13474
" and restoring the directory,\n"
13475
"* ``--action=done`` will just mark the conflict as resolved."
13476
msgstr ""
13477
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
13478
" children,\n"
13479
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
13480
"children\n"
13481
" and restoring the directory,\n"
13482
"* ``--action=done`` will just mark the conflict as resolved."
13483
13484
#: en/help_topics/conflict-types.txt:236
13485
msgid ""
13486
"Deleting parent\n"
13487
"---------------"
13488
msgstr ""
13489
"Deleting parent\n"
13490
"---------------"
13491
13492
#: en/help_topics/conflict-types.txt:241
13493
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
13494
msgstr " Conflict: can't delete DIR because it is not empty. Not deleting."
13495
13496
#: en/help_topics/conflict-types.txt:243
13497
msgid ""
13498
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
13499
"source, but has new children in the target (either because a directory\n"
13500
"deletion is merged or because the merge introduce new children). Bazaar\n"
13501
"will retain the directory. Resolving this issue depends very much on the\n"
13502
"particular scenario."
13503
msgstr ""
13504
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
13505
"source, but has new children in the target (either because a directory\n"
13506
"deletion is merged or because the merge introduce new children). Bazaar\n"
13507
"will retain the directory. Resolving this issue depends very much on the\n"
13508
"particular scenario."
13509
13510
#: en/help_topics/conflict-types.txt:254
13511
msgid ""
13512
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
13513
"directory,"
13514
msgstr ""
13515
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
13516
"directory,"
13517
13518
#: en/help_topics/conflict-types.txt:256
13519
msgid ""
13520
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
13521
" children,"
13522
msgstr ""
13523
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
13524
" children,"
13525
13526
#: en/help_topics/conflict-types.txt:259
13527
msgid "* ``--action=done`` will just mark the conflict as resolved."
13528
msgstr "* ``--action=done`` will just mark the conflict as resolved."
13529
13530
#: en/help_topics/conflict-types.txt:261
13531
msgid ""
13532
"Note that when merging a directory deletion, if unversioned files are\n"
13533
"present, they become potential orphans has they don't have a directory\n"
13534
"parent anymore."
13535
msgstr ""
13536
"Note that when merging a directory deletion, if unversioned files are\n"
13537
"present, they become potential orphans has they don't have a directory\n"
13538
"parent any more."
13539
13540
#: en/help_topics/conflict-types.txt:265
13541
msgid ""
13542
"Handling such orphans, *before* the conflict is created, is controlled by\n"
13543
"setting the ``bzr.transform.orphan_policy`` configuration option."
13544
msgstr ""
13545
"Handling such orphans, *before* the conflict is created, is controlled by\n"
13546
"setting the ``bzr.transform.orphan_policy`` configuration option."
13547
13548
#: en/help_topics/conflict-types.txt:268
13549
msgid "There are two possible values for this option:"
13550
msgstr "There are two possible values for this option:"
13551
13552
#: en/help_topics/conflict-types.txt:270
13553
msgid ""
13554
"* ``conflict`` (the default): will leave the orphans in place and\n"
13555
" generate a conflicts,"
13556
msgstr ""
13557
"* ``conflict`` (the default): will leave the orphans in place and\n"
13558
" generate a conflicts,"
13559
13560
#: en/help_topics/conflict-types.txt:273
13561
msgid ""
13562
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
13563
"root\n"
13564
" of the working tree with names like ``<file>.~#~``."
13565
msgstr ""
13566
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
13567
"root\n"
13568
" of the working tree with names like ``<file>.~#~``."
13569
13570
#: en/help_topics/conflict-types.txt:278
13571
msgid ""
13572
"Path conflict\n"
13573
"-------------"
13574
msgstr ""
13575
"Path conflict\n"
13576
"-------------"
13577
13578
#: en/help_topics/conflict-types.txt:283
13579
msgid " Path conflict: PATH1 / PATH2"
13580
msgstr " Path conflict: PATH1 / PATH2"
13581
13582
#: en/help_topics/conflict-types.txt:285
13583
msgid ""
13584
"This happens when the source and target have each modified the name or "
13585
"parent\n"
13586
"directory of a file. Bazaar will use the path elements from the source."
13587
msgstr ""
13588
"This happens when the source and target have each modified the name or "
13589
"parent\n"
13590
"directory of a file. Bazaar will use the path elements from the source."
13591
13592
#: en/help_topics/conflict-types.txt:288
13593
msgid ""
13594
"To resolve that kind of conflict, you just have to decide what name should "
13595
"be\n"
13596
"retained for the file involved."
13597
msgstr ""
13598
"To resolve that kind of conflict, you just have to decide what name should "
13599
"be\n"
13600
"retained for the file involved."
13601
13602
#: en/help_topics/conflict-types.txt:293
13603
msgid ""
13604
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
13605
" issuing ``bzr mv PATH2 PATH1``,\n"
13606
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
13607
"``PATH2``,\n"
13608
"* ``--action=done`` will just mark the conflict as resolved."
13609
msgstr ""
13610
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
13611
" issuing ``bzr mv PATH2 PATH1``,\n"
13612
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
13613
"``PATH2``,\n"
13614
"* ``--action=done`` will just mark the conflict as resolved."
13615
13616
#: en/help_topics/conflict-types.txt:300
13617
msgid ""
13618
"Parent loop\n"
13619
"-----------"
13620
msgstr ""
13621
"Parent loop\n"
13622
"-----------"
13623
13624
#: en/help_topics/conflict-types.txt:305
13625
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
13626
msgstr " Conflict moving FILE into DIRECTORY. Cancelled move."
13627
13628
#: en/help_topics/conflict-types.txt:307
13629
msgid ""
13630
"This happens when the source and the target have each moved directories, so\n"
13631
"that, if the change could be applied, a directory would be contained by "
13632
"itself.\n"
13633
"For example::"
13634
msgstr ""
13635
"This happens when the source and the target have each moved directories, so\n"
13636
"that, if the change could be applied, a directory would be contained by "
13637
"itself.\n"
13638
"For example::"
13639
13640
#: en/help_topics/conflict-types.txt:311
13641
msgid ""
13642
" $ bzr init\n"
13643
" $ bzr mkdir white\n"
13644
" $ bzr mkdir black\n"
13645
" $ bzr commit -m \"BASE\"\n"
13646
" $ bzr branch . ../other\n"
13647
" $ bzr mv white black\n"
13648
" $ bzr commit -m \"THIS\"\n"
13649
" $ bzr mv ../other/black ../other/white\n"
13650
" $ bzr commit ../other -m \"OTHER\"\n"
13651
" $ bzr merge ../other"
13652
msgstr ""
13653
" $ bzr init\n"
13654
" $ bzr mkdir white\n"
13655
" $ bzr mkdir black\n"
13656
" $ bzr commit -m \"BASE\"\n"
13657
" $ bzr branch . ../other\n"
13658
" $ bzr mv white black\n"
13659
" $ bzr commit -m \"THIS\"\n"
13660
" $ bzr mv ../other/black ../other/white\n"
13661
" $ bzr commit ../other -m \"OTHER\"\n"
13662
" $ bzr merge ../other"
13663
13664
#: en/help_topics/conflict-types.txt:322
13665
msgid ""
13666
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
13667
"``black``. To resolve that kind of conflict, you just have to decide what\n"
13668
"name should be retained for the directories involved."
13669
msgstr ""
13670
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
13671
"``black``. To resolve that kind of conflict, you just have to decide what\n"
13672
"name should be retained for the directories involved."
13673
13674
#: en/help_topics/conflict-types.txt:328
13675
msgid ""
13676
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
13677
"\n"
13678
" in ``black``,\n"
13679
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
13680
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
13681
"* ``--action=done`` will just mark the conflict as resolved."
13682
msgstr ""
13683
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
13684
"\n"
13685
" in ``black``,\n"
13686
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
13687
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
13688
"* ``--action=done`` will just mark the conflict as resolved."
13689
13690
#: en/help_topics/conflict-types.txt:336
13691
msgid ""
13692
"Non-directory parent\n"
13693
"--------------------"
13694
msgstr ""
13695
"Non-directory parent\n"
13696
"--------------------"
13697
13698
#: en/help_topics/conflict-types.txt:341
13699
msgid ""
13700
" Conflict: foo.new is not a directory, but has files in it.\n"
13701
" Created directory."
13702
msgstr ""
13703
" Conflict: foo.new is not a directory, but has files in it.\n"
13704
" Created directory."
13705
13706
#: en/help_topics/conflict-types.txt:344
13707
msgid ""
13708
"This happens when one side has added files to a directory, and the other "
13709
"side\n"
13710
"has changed the directory into a file or symlink. For example::"
13711
msgstr ""
13712
"This happens when one side has added files to a directory, and the other "
13713
"side\n"
13714
"has changed the directory into a file or symlink. For example::"
13715
13716
#: en/help_topics/conflict-types.txt:347
13717
msgid ""
13718
" $ bzr init\n"
13719
" $ bzr mkdir foo\n"
13720
" $ bzr commit -m \"BASE\"\n"
13721
" $ bzr branch . ../other\n"
13722
" $ rmdir foo\n"
13723
" $ touch foo\n"
13724
" $ bzr commit -m \"THIS\"\n"
13725
" $ bzr mkdir ../other/foo/bar\n"
13726
" $ bzr commit ../other -m \"OTHER\"\n"
13727
" $ bzr merge ../other"
13728
msgstr ""
13729
" $ bzr init\n"
13730
" $ bzr mkdir foo\n"
13731
" $ bzr commit -m \"BASE\"\n"
13732
" $ bzr branch . ../other\n"
13733
" $ rmdir foo\n"
13734
" $ touch foo\n"
13735
" $ bzr commit -m \"THIS\"\n"
13736
" $ bzr mkdir ../other/foo/bar\n"
13737
" $ bzr commit ../other -m \"OTHER\"\n"
13738
" $ bzr merge ../other"
13739
13740
#: en/help_topics/conflict-types.txt:358
13741
msgid ""
13742
"To resolve that kind of conflict, you have to decide what name should be\n"
13743
"retained for the file, directory or symlink involved."
13744
msgstr ""
13745
"To resolve that kind of conflict, you have to decide what name should be\n"
13746
"retained for the file, directory or symlink involved."
13747
13748
#: en/help_topics/conflict-types.txt:363
13749
msgid ""
13750
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
13751
" ``bzr add foo``,\n"
13752
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
13753
" ``bzr mv foo.new foo``,\n"
13754
"* ``--action=done`` will just mark the conflict as resolved."
13755
msgstr ""
13756
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
13757
" ``bzr add foo``,\n"
13758
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
13759
" ``bzr mv foo.new foo``,\n"
13760
"* ``--action=done`` will just mark the conflict as resolved."
13761
13762
#: en/help_topics/conflict-types.txt:371
13763
msgid ""
13764
"MalformedTransform\n"
13765
"------------------"
13766
msgstr ""
13767
"MalformedTransform\n"
13768
"------------------"
13769
13770
#: en/help_topics/conflict-types.txt:374
13771
msgid ""
13772
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
13773
"exception. This means that Bazaar encountered a filesystem conflict that it "
13774
"was\n"
13775
"unable to resolve. This usually indicates a bug. Please let us know if "
13776
"you\n"
13777
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
13778
msgstr ""
13779
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
13780
"exception. This means that Bazaar encountered a filesystem conflict that it "
13781
"was\n"
13782
"unable to resolve. This usually indicates a bug. Please let us know if "
13783
"you\n"
13784
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
13785
13786
#: en/help_topics/content-filters.txt:1
13787
msgid ""
13788
"Content Filters\n"
13789
"==============="
13790
msgstr ""
13791
"Content Filters\n"
13792
"==============="
13793
13794
#: en/help_topics/content-filters.txt:4
13795
msgid ""
13796
"Content formats\n"
13797
"---------------"
13798
msgstr ""
13799
"Content formats\n"
13800
"---------------"
13801
13802
#: en/help_topics/content-filters.txt:7
13803
msgid ""
13804
"Bazaar's content filtering allows you to store files in a different\n"
13805
"format from the copy in your working tree. This lets you, or your\n"
13806
"co-developers, use Windows development tools that expect CRLF files\n"
13807
"on projects that use other line-ending conventions. Among other things,\n"
13808
"content filters also let Unix developers more easily work on projects\n"
13809
"using Windows line-ending conventions, keyword expansion/compression,\n"
13810
"and trailing spaces on lines in text files to be implicitly stripped\n"
13811
"when committed."
13812
msgstr ""
13813
"Bazaar's content filtering allows you to store files in a different\n"
13814
"format from the copy in your working tree. This lets you, or your\n"
13815
"co-developers, use Windows development tools that expect CRLF files\n"
13816
"on projects that use other line-ending conventions. Among other things,\n"
13817
"content filters also let Unix developers more easily work on projects\n"
13818
"using Windows line-ending conventions, keyword expansion/compression,\n"
13819
"and trailing spaces on lines in text files to be implicitly stripped\n"
13820
"when committed."
13821
13822
#: en/help_topics/content-filters.txt:16
13823
msgid "To generalize, there are two content formats supported by Bazaar:"
13824
msgstr "To generalise, there are two content formats supported by Bazaar:"
13825
13826
#: en/help_topics/content-filters.txt:18
13827
msgid ""
13828
"* a canonical format - how files are stored internally\n"
13829
"* a convenience format - how files are created in a working tree."
13830
msgstr ""
13831
"* a canonical format - how files are stored internally\n"
13832
"* a convenience format - how files are created in a working tree."
13833
13834
#: en/help_topics/content-filters.txt:21
13835
msgid ""
13836
"\n"
13837
"Format conversion\n"
13838
"-----------------"
13839
msgstr ""
13840
"\n"
13841
"Format conversion\n"
13842
"-----------------"
13843
13844
#: en/help_topics/content-filters.txt:25
13845
msgid ""
13846
"The conversion between these formats is done by content filters.\n"
13847
"A content filter has two parts:"
13848
msgstr ""
13849
"The conversion between these formats is done by content filters.\n"
13850
"A content filter has two parts:"
13851
13852
#: en/help_topics/content-filters.txt:28
13853
msgid ""
13854
"* a read converter - converts from convenience to canonical format\n"
13855
"* a write converter - converts from canonical to convenience format."
13856
msgstr ""
13857
"* a read converter - converts from convenience to canonical format\n"
13858
"* a write converter - converts from canonical to convenience format."
13859
13860
#: en/help_topics/content-filters.txt:31
13861
msgid ""
13862
"Many of these converters will provide *round-trip* conversion,\n"
13863
"i.e. applying the read converter followed by the write converter\n"
13864
"gives back the original content. However, others may provide an\n"
13865
"asymmetric conversion. For example, a read converter might strip\n"
13866
"trailing whitespace off lines in source code while the matching\n"
13867
"write converter might pass content through unchanged."
13868
msgstr ""
13869
"Many of these converters will provide *round-trip* conversion,\n"
13870
"i.e. applying the read converter followed by the write converter\n"
13871
"gives back the original content. However, others may provide an\n"
13872
"asymmetric conversion. For example, a read converter might strip\n"
13873
"trailing whitespace off lines in source code while the matching\n"
13874
"write converter might pass content through unchanged."
13875
13876
#: en/help_topics/content-filters.txt:38
13877
msgid ""
13878
"\n"
13879
"Enabling content filters\n"
13880
"------------------------"
13881
msgstr ""
13882
"\n"
13883
"Enabling content filters\n"
13884
"------------------------"
13885
13886
#: en/help_topics/content-filters.txt:42
13887
msgid ""
13888
"Content filters are typically provided by plugins, so the first step\n"
13889
"in using them is to install the relevant plugins and read their\n"
13890
"documentation. Some plugins may be very specific about which files\n"
13891
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
13892
"In other cases, the plugin may leave it in the user's hands to\n"
13893
"define which files are to be filtered. This is typically done\n"
13894
"using rule-based preferences. See ``bzr help rules`` for general\n"
13895
"information about defining these."
13896
msgstr ""
13897
"Content filters are typically provided by plugins, so the first step\n"
13898
"in using them is to install the relevant plugins and read their\n"
13899
"documentation. Some plugins may be very specific about which files\n"
13900
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
13901
"In other cases, the plugin may leave it in the user's hands to\n"
13902
"define which files are to be filtered. This is typically done\n"
13903
"using rule-based preferences. See ``bzr help rules`` for general\n"
13904
"information about defining these."
13905
13906
#: en/help_topics/content-filters.txt:51
13907
msgid ""
13908
"\n"
13909
"Impact on commands\n"
13910
"------------------"
13911
msgstr ""
13912
"\n"
13913
"Impact on commands\n"
13914
"------------------"
13915
13916
#: en/help_topics/content-filters.txt:55
13917
msgid ""
13918
"Read converters are only applied to commands that read content from\n"
13919
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
13920
"will apply read converters to files in the working tree, then compare\n"
13921
"the results to the content last committed."
13922
msgstr ""
13923
"Read converters are only applied to commands that read content from\n"
13924
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
13925
"will apply read converters to files in the working tree, then compare\n"
13926
"the results to the content last committed."
13927
13928
#: en/help_topics/content-filters.txt:60
13929
msgid ""
13930
"Write converters are only applied by commands that **create files in a\n"
13931
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
13932
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
13933
"respectively."
13934
msgstr ""
13935
"Write converters are only applied by commands that **create files in a\n"
13936
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
13937
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
13938
"respectively."
13939
13940
#: en/help_topics/content-filters.txt:65
13941
msgid ""
13942
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
13943
"comitting files. If this makes sense for a given plugin providing\n"
13944
"a content filter, the plugin can usually achieve this effect by using a\n"
13945
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
13946
"for more information on hooks."
13947
msgstr ""
13948
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
13949
"committing files. If this makes sense for a given plugin providing\n"
13950
"a content filter, the plugin can usually achieve this effect by using a\n"
13951
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
13952
"for more information on hooks."
13953
13954
#: en/help_topics/content-filters.txt:71
13955
msgid ""
13956
"\n"
13957
"Refreshing your working tree\n"
13958
"----------------------------"
13959
msgstr ""
13960
"\n"
13961
"Refreshing your working tree\n"
13962
"----------------------------"
13963
13964
#: en/help_topics/content-filters.txt:75
13965
msgid ""
13966
"For performance reasons, Bazaar caches the timestamps of files in\n"
13967
"a working tree, and assumes files are unchanged if their timestamps\n"
13968
"match the cached values. As a consequence, there are times when\n"
13969
"you may need to explicitly ask for content filtering to be reapplied\n"
13970
"in one or both directions, e.g. after installing or reconfiguring\n"
13971
"plugins providing it."
13972
msgstr ""
13973
"For performance reasons, Bazaar caches the timestamps of files in\n"
13974
"a working tree, and assumes files are unchanged if their timestamps\n"
13975
"match the cached values. As a consequence, there are times when\n"
13976
"you may need to explicitly ask for content filtering to be reapplied\n"
13977
"in one or both directions, e.g. after installing or reconfiguring\n"
13978
"plugins providing it."
13979
13980
#: en/help_topics/content-filters.txt:82
13981
msgid "Here are some general guidelines for doing this:"
13982
msgstr "Here are some general guidelines for doing this:"
13983
13984
#: en/help_topics/content-filters.txt:84
13985
msgid ""
13986
" * To reapply read converters, ``touch`` files, i.e. update their\n"
13987
" timestamp. Operations like ``bzr status`` should then reapply the\n"
13988
" relevant read converters and compare the end result with the\n"
13989
" canonical format."
13990
msgstr ""
13991
" * To reapply read converters, ``touch`` files, i.e. update their\n"
13992
" timestamp. Operations like ``bzr status`` should then reapply the\n"
13993
" relevant read converters and compare the end result with the\n"
13994
" canonical format."
13995
13996
#: en/help_topics/content-filters.txt:89
13997
msgid ""
13998
" * To reapply write converters, ensure there are no local changes,\n"
13999
" delete the relevant files and run ``bzr revert`` on those files."
14000
msgstr ""
14001
" * To reapply write converters, ensure there are no local changes,\n"
14002
" delete the relevant files and run ``bzr revert`` on those files."
14003
14004
#: en/help_topics/content-filters.txt:92
14005
msgid ""
14006
"Note: In the future, it is likely that additional options will be added\n"
14007
"to commands to make this refreshing process faster and safer.\n"
14008
msgstr ""
14009
"Note: In the future, it is likely that additional options will be added\n"
14010
"to commands to make this refreshing process faster and safer.\n"
14011
14012
#: en/help_topics/current-formats.txt:1
14013
msgid "Current Storage Formats"
14014
msgstr "Current Storage Formats"
14015
14016
#: en/help_topics/current-formats.txt:3
14017
msgid ""
14018
":2a:\n"
14019
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
14020
" compress storage. Provides rich roots which are a one-way\n"
14021
" transition."
14022
msgstr ""
14023
":2a:\n"
14024
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
14025
" compress storage. Provides rich roots which are a one-way\n"
14026
" transition."
14027
14028
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
14029
msgid ""
14030
"\n"
14031
"See :doc:`formats-help` for more about storage formats."
14032
msgstr ""
14033
"\n"
14034
"See :doc:`formats-help` for more about storage formats."
14035
14036
#: en/help_topics/debug-flags.txt:1
14037
msgid ""
14038
"Debug Flags\n"
14039
"==========="
14040
msgstr ""
14041
"Debug Flags\n"
14042
"==========="
14043
14044
#: en/help_topics/debug-flags.txt:4
14045
msgid ""
14046
"These flags can be passed on the bzr command line or (without the ``-D``\n"
14047
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
14048
msgstr ""
14049
"These flags can be passed on the bzr command line or (without the ``-D``\n"
14050
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
14051
14052
#: en/help_topics/debug-flags.txt:7
14053
msgid ""
14054
"-Dauth Trace authentication sections used.\n"
14055
"-Dbytes Print out how many bytes were transferred\n"
14056
"-Ddirstate Trace dirstate activity (verbose!)\n"
14057
"-Derror Instead of normal error handling, always print a "
14058
"traceback\n"
14059
" on error.\n"
14060
"-Devil Capture call sites that do expensive or badly-scaling\n"
14061
" operations.\n"
14062
"-Dfetch Trace history copying between repositories.\n"
14063
"-Dfilters Emit information for debugging content filtering.\n"
14064
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
14065
"fetch.\n"
14066
"-Dgraph Trace graph traversal.\n"
14067
"-Dhashcache Log every time a working file is read to determine its "
14068
"hash.\n"
14069
"-Dhooks Trace hook execution.\n"
14070
"-Dhpss Trace smart protocol requests and responses.\n"
14071
"-Dhpssdetail More hpss details.\n"
14072
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
14073
"-Dhttp Trace http connections, requests and responses.\n"
14074
"-Dindex Trace major index operations.\n"
14075
"-Dknit Trace knit operations.\n"
14076
"-Dlock Trace when lockdir locks are taken or released.\n"
14077
"-Dnoretry If a connection is reset, fail immediately rather than\n"
14078
" retrying the request.\n"
14079
"-Dprogress Trace progress bar operations.\n"
14080
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
14081
"-Dmerge Emit information for debugging merges.\n"
14082
"-Dno_apport Don't use apport to report crashes.\n"
14083
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
14084
"-Dpack Emit information about pack operations.\n"
14085
"-Drelock Emit a message every time a branch or repository object "
14086
"is\n"
14087
" unlocked then relocked the same way.\n"
14088
"-Dsftp Trace SFTP internals.\n"
14089
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
14090
"expected\n"
14091
"-Dstream Trace fetch streams.\n"
14092
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
14093
"portable\n"
14094
" manner.\n"
14095
"-Dunlock Some errors during unlock are treated as warnings.\n"
14096
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
14097
"-DIDS_always Always use InterDifferingSerializer to fetch if "
14098
"appropriate\n"
14099
" for the format, even for non-local fetches.\n"
14100
msgstr ""
14101
"-Dauth Trace authentication sections used.\n"
14102
"-Dbytes Print out how many bytes were transferred\n"
14103
"-Ddirstate Trace dirstate activity (verbose!)\n"
14104
"-Derror Instead of normal error handling, always print a "
14105
"traceback\n"
14106
" on error.\n"
14107
"-Devil Capture call sites that do expensive or badly-scaling\n"
14108
" operations.\n"
14109
"-Dfetch Trace history copying between repositories.\n"
14110
"-Dfilters Emit information for debugging content filtering.\n"
14111
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
14112
"fetch.\n"
14113
"-Dgraph Trace graph traversal.\n"
14114
"-Dhashcache Log every time a working file is read to determine its "
14115
"hash.\n"
14116
"-Dhooks Trace hook execution.\n"
14117
"-Dhpss Trace smart protocol requests and responses.\n"
14118
"-Dhpssdetail More hpss details.\n"
14119
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
14120
"-Dhttp Trace http connections, requests and responses.\n"
14121
"-Dindex Trace major index operations.\n"
14122
"-Dknit Trace knit operations.\n"
14123
"-Dlock Trace when lockdir locks are taken or released.\n"
14124
"-Dnoretry If a connection is reset, fail immediately rather than\n"
14125
" retrying the request.\n"
14126
"-Dprogress Trace progress bar operations.\n"
14127
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
14128
"-Dmerge Emit information for debugging merges.\n"
14129
"-Dno_apport Don't use apport to report crashes.\n"
14130
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
14131
"-Dpack Emit information about pack operations.\n"
14132
"-Drelock Emit a message every time a branch or repository object "
14133
"is\n"
14134
" unlocked then relocked the same way.\n"
14135
"-Dsftp Trace SFTP internals.\n"
14136
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
14137
"expected\n"
14138
"-Dstream Trace fetch streams.\n"
14139
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
14140
"portable\n"
14141
" manner.\n"
14142
"-Dunlock Some errors during unlock are treated as warnings.\n"
14143
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
14144
"-DIDS_always Always use InterDifferingSerializer to fetch if "
14145
"appropriate\n"
14146
" for the format, even for non-local fetches.\n"
14147
14148
#: en/help_topics/diverged-branches.txt:1
14149
msgid ""
14150
"Diverged Branches\n"
14151
"================="
14152
msgstr ""
14153
"Diverged Branches\n"
14154
"================="
14155
14156
#: en/help_topics/diverged-branches.txt:4
14157
msgid ""
14158
"When Bazaar tries to push one branch onto another, it requires that the\n"
14159
"destination branch must be ready to receive the source branch. If this "
14160
"isn't\n"
14161
"the case, then we say that the branches have ``diverged``. Branches are\n"
14162
"considered diverged if the destination branch's most recent commit is one "
14163
"that\n"
14164
"has not been merged (directly or indirectly) by the source branch. To "
14165
"recover\n"
14166
"from diverged branches, one must merge the missing revisions into the "
14167
"source\n"
14168
"branch."
14169
msgstr ""
14170
"When Bazaar tries to push one branch onto another, it requires that the\n"
14171
"destination branch must be ready to receive the source branch. If this "
14172
"isn't\n"
14173
"the case, then we say that the branches have ``diverged``. Branches are\n"
14174
"considered diverged if the destination branch's most recent commit is one "
14175
"that\n"
14176
"has not been merged (directly or indirectly) by the source branch. To "
14177
"recover\n"
14178
"from diverged branches, one must merge the missing revisions into the "
14179
"source\n"
14180
"branch."
14181
14182
#: en/help_topics/diverged-branches.txt:12
14183
msgid ""
14184
"This situation commonly arises when using a centralized workflow with local\n"
14185
"commits. If someone else has committed new work to the mainline since your\n"
14186
"last pull and you have local commits that have not yet been pushed to the\n"
14187
"mainline, then your local branch and the mainline have diverged."
14188
msgstr ""
14189
"This situation commonly arises when using a centralised workflow with local\n"
14190
"commits. If someone else has committed new work to the mainline since your\n"
14191
"last pull and you have local commits that have not yet been pushed to the\n"
14192
"mainline, then your local branch and the mainline have diverged."
14193
14194
#: en/help_topics/diverged-branches.txt:17
14195
msgid ""
14196
"Discovering What Has Diverged\n"
14197
"-----------------------------"
14198
msgstr ""
14199
"Discovering What Has Diverged\n"
14200
"-----------------------------"
14201
14202
#: en/help_topics/diverged-branches.txt:20
14203
msgid ""
14204
"The ``bzr missing`` command is used to find out what revisions are in "
14205
"another\n"
14206
"branch that are not present in the current branch, and vice-versa. It shows "
14207
"a\n"
14208
"summary of which extra revisions exist in each branch. If you want to see "
14209
"the\n"
14210
"precise effects of those revisions, you can use ``bzr diff --"
14211
"old=other_branch``\n"
14212
"to show the differences between other_branch and your current branch."
14213
msgstr ""
14214
"The ``bzr missing`` command is used to find out what revisions are in "
14215
"another\n"
14216
"branch that are not present in the current branch, and vice-versa. It shows "
14217
"a\n"
14218
"summary of which extra revisions exist in each branch. If you want to see "
14219
"the\n"
14220
"precise effects of those revisions, you can use ``bzr diff --"
14221
"old=other_branch``\n"
14222
"to show the differences between other_branch and your current branch."
14223
14224
#: en/help_topics/diverged-branches.txt:26
14225
msgid ""
14226
"A Solution\n"
14227
"----------"
14228
msgstr ""
14229
"A Solution\n"
14230
"----------"
14231
14232
#: en/help_topics/diverged-branches.txt:29
14233
msgid ""
14234
"The solution is to merge the revisions from the mainline into your local\n"
14235
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
14236
"mainline. This merge may result in conflicts if the other developer's "
14237
"changes\n"
14238
"overlap with your changes. These conflicts should be resolved before\n"
14239
"continuing. After any conflicts have been resolved, or even if there were "
14240
"no\n"
14241
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
14242
"to your local branch. This requirement gives you an opportunity to test "
14243
"the\n"
14244
"resulting working tree for correctness, since the merged revisions could "
14245
"have\n"
14246
"made arbitrary changes. After testing, you should commit the merge using\n"
14247
"``bzr commit``. This clears up the diverged branches situation. Your "
14248
"local\n"
14249
"branch can now be pushed to the mainline.\n"
14250
msgstr ""
14251
"The solution is to merge the revisions from the mainline into your local\n"
14252
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
14253
"mainline. This merge may result in conflicts if the other developer's "
14254
"changes\n"
14255
"overlap with your changes. These conflicts should be resolved before\n"
14256
"continuing. After any conflicts have been resolved, or even if there were "
14257
"no\n"
14258
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
14259
"to your local branch. This requirement gives you an opportunity to test "
14260
"the\n"
14261
"resulting working tree for correctness, since the merged revisions could "
14262
"have\n"
14263
"made arbitrary changes. After testing, you should commit the merge using\n"
14264
"``bzr commit``. This clears up the diverged branches situation. Your "
14265
"local\n"
14266
"branch can now be pushed to the mainline.\n"
14267
14268
#: en/help_topics/env-variables.txt:1
14269
msgid "Environment Variables"
14270
msgstr "Environment Variables"
14271
14272
#: en/help_topics/env-variables.txt:3
14273
msgid ""
14274
"=================== "
14275
"===========================================================\n"
14276
"BZRPATH Path where bzr is to look for shell plugin external\n"
14277
" commands.\n"
14278
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
14279
"EMAIL E-Mail address of the user.\n"
14280
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
14281
"EDITOR Editor for editing commit messages.\n"
14282
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
14283
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
14284
"BZR_PLUGINS_AT Plugins to load from a directory not in "
14285
"BZR_PLUGIN_PATH.\n"
14286
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
14287
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
14288
"and\n"
14289
" HOME.\n"
14290
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
14291
"URLs).\n"
14292
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
14293
"sshcorp,\n"
14294
" plink or lsh.\n"
14295
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
14296
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
14297
"BZR_COLUMNS Override implicit terminal width.\n"
14298
"BZR_CONCURRENCY Number of processes that can be run concurrently "
14299
"(selftest)\n"
14300
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
14301
"'text'.\n"
14302
"BZR_PDB Control whether to launch a debugger on error.\n"
14303
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
14304
" breakin debugger.\n"
14305
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
14306
"(instead\n"
14307
" of char-based).\n"
14308
"=================== "
14309
"===========================================================\n"
14310
msgstr ""
14311
"=================== "
14312
"===========================================================\n"
14313
"BZRPATH Path where bzr is to look for shell plugin external\n"
14314
" commands.\n"
14315
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
14316
"EMAIL E-Mail address of the user.\n"
14317
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
14318
"EDITOR Editor for editing commit messages.\n"
14319
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
14320
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
14321
"BZR_PLUGINS_AT Plugins to load from a directory not in "
14322
"BZR_PLUGIN_PATH.\n"
14323
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
14324
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
14325
"and\n"
14326
" HOME.\n"
14327
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
14328
"URLs).\n"
14329
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
14330
"sshcorp,\n"
14331
" plink or lsh.\n"
14332
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
14333
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
14334
"BZR_COLUMNS Override implicit terminal width.\n"
14335
"BZR_CONCURRENCY Number of processes that can be run concurrently "
14336
"(selftest)\n"
14337
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
14338
"'text'.\n"
14339
"BZR_PDB Control whether to launch a debugger on error.\n"
14340
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
14341
" breakin debugger.\n"
14342
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
14343
"(instead\n"
14344
" of char-based).\n"
14345
"=================== "
14346
"===========================================================\n"
14347
14348
#: en/help_topics/eol.txt:1
14349
msgid ""
14350
"End of Line Conversion\n"
14351
"======================"
14352
msgstr ""
14353
"End of Line Conversion\n"
14354
"======================"
14355
14356
#: en/help_topics/eol.txt:4
14357
msgid ""
14358
"EOL conversion is provided as a content filter where Bazaar internally\n"
14359
"stores a canonical format but outputs a convenience format. See\n"
14360
"``bzr help content-filters`` for general information about using these."
14361
msgstr ""
14362
"EOL conversion is provided as a content filter where Bazaar internally\n"
14363
"stores a canonical format but outputs a convenience format. See\n"
14364
"``bzr help content-filters`` for general information about using these."
14365
14366
#: en/help_topics/eol.txt:8
14367
msgid ""
14368
"Note: Content filtering is only supported in recently added formats,\n"
14369
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
14370
"in a recent format. (Just setting the format on the repository\n"
14371
"is not enough.) If content filtering does not appear to be working, use\n"
14372
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
14373
"or later."
14374
msgstr ""
14375
"Note: Content filtering is only supported in recently added formats,\n"
14376
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
14377
"in a recent format. (Just setting the format on the repository\n"
14378
"is not enough.) If content filtering does not appear to be working, use\n"
14379
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
14380
"or later."
14381
14382
#: en/help_topics/eol.txt:15
14383
msgid ""
14384
"EOL conversion needs to be enabled for selected file patterns using\n"
14385
"rules. See ``bzr help rules`` for general information on defining rules.\n"
14386
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
14387
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
14388
"supported in a future verison of Bazaar."
14389
msgstr ""
14390
"EOL conversion needs to be enabled for selected file patterns using\n"
14391
"rules. See ``bzr help rules`` for general information on defining rules.\n"
14392
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
14393
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
14394
"supported in a future version of Bazaar."
14395
14396
#: en/help_topics/eol.txt:21
14397
msgid ""
14398
"To configure which files to filter, set ``eol`` to one of the values below.\n"
14399
"(If a value is not set, ``exact`` is the default.)"
14400
msgstr ""
14401
"To configure which files to filter, set ``eol`` to one of the values below.\n"
14402
"(If a value is not set, ``exact`` is the default.)"
14403
14404
#: en/help_topics/eol.txt:24
14405
msgid ""
14406
" ========== ===================================== ======================\n"
14407
" Value Checkout end-of-lines as Commit end-of-lines as\n"
14408
" ========== ===================================== ======================\n"
14409
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
14410
" ---------- ------------------------------------- ----------------------\n"
14411
" ``lf`` ``lf`` ``lf``\n"
14412
" ---------- ------------------------------------- ----------------------\n"
14413
" ``crlf`` ``crlf`` ``lf``\n"
14414
" ---------- ------------------------------------- ----------------------\n"
14415
" ``exact`` No conversion Exactly as in file\n"
14416
" ========== ===================================== ======================"
14417
msgstr ""
14418
" ========== ===================================== ======================\n"
14419
" Value Checkout end-of-lines as Commit end-of-lines as\n"
14420
" ========== ===================================== ======================\n"
14421
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
14422
" ---------- ------------------------------------- ----------------------\n"
14423
" ``lf`` ``lf`` ``lf``\n"
14424
" ---------- ------------------------------------- ----------------------\n"
14425
" ``crlf`` ``crlf`` ``lf``\n"
14426
" ---------- ------------------------------------- ----------------------\n"
14427
" ``exact`` No conversion Exactly as in file\n"
14428
" ========== ===================================== ======================"
14429
14430
#: en/help_topics/eol.txt:36
14431
msgid ""
14432
"Note: For safety reasons, no conversion is applied to any file where a null\n"
14433
"byte is detected in the file."
14434
msgstr ""
14435
"Note: For safety reasons, no conversion is applied to any file where a null\n"
14436
"byte is detected in the file."
14437
14438
#: en/help_topics/eol.txt:39
14439
msgid ""
14440
"For users working on a cross-platform project, here is a suggested rule\n"
14441
"to use as a starting point::"
14442
msgstr ""
14443
"For users working on a cross-platform project, here is a suggested rule\n"
14444
"to use as a starting point::"
14445
14446
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
14447
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
14448
msgid ""
14449
" [name *]\n"
14450
" eol = native"
14451
msgstr ""
14452
" [name *]\n"
14453
" eol = native"
14454
14455
#: en/help_topics/eol.txt:45
14456
msgid ""
14457
"If you have binary files that do not contain a null byte though, be\n"
14458
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
14459
"by giving more explicit patterns earlier in the rules file. For example::"
14460
msgstr ""
14461
"If you have binary files that do not contain a null byte though, be\n"
14462
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
14463
"by giving more explicit patterns earlier in the rules file. For example::"
14464
14465
#: en/help_topics/eol.txt:49
14466
msgid ""
14467
" [name *.png]\n"
14468
" eol = exact"
14469
msgstr ""
14470
" [name *.png]\n"
14471
" eol = exact"
14472
14473
#: en/help_topics/eol.txt:55
14474
msgid ""
14475
"If your working tree is on a network drive shared by users on different\n"
14476
"operating systems, you typically want to force certain conventions for\n"
14477
"certain files. In that way, if a file is created with the wrong line\n"
14478
"endings or line endings get mixed during editing, it gets committed\n"
14479
"correctly and gets checked out correctly. For example::"
14480
msgstr ""
14481
"If your working tree is on a network drive shared by users on different\n"
14482
"operating systems, you typically want to force certain conventions for\n"
14483
"certain files. In that way, if a file is created with the wrong line\n"
14484
"endings or line endings get mixed during editing, it gets committed\n"
14485
"correctly and gets checked out correctly. For example::"
14486
14487
#: en/help_topics/eol.txt:61
14488
msgid ""
14489
" [name *.bat]\n"
14490
" eol = crlf"
14491
msgstr ""
14492
" [name *.bat]\n"
14493
" eol = crlf"
14494
14495
#: en/help_topics/eol.txt:64
14496
msgid ""
14497
" [name *.sh]\n"
14498
" eol = lf"
14499
msgstr ""
14500
" [name *.sh]\n"
14501
" eol = lf"
14502
14503
#: en/help_topics/eol.txt:70
14504
msgid ""
14505
"If you take the care to create files with their required endings, you can\n"
14506
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
14507
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
14508
"introducing mixed line endings will be corrected during commit for files\n"
14509
"with those settings."
14510
msgstr ""
14511
"If you take the care to create files with their required endings, you can\n"
14512
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
14513
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
14514
"introducing mixed line endings will be corrected during commit for files\n"
14515
"with those settings."
14516
14517
#: en/help_topics/eol.txt:76
14518
msgid ""
14519
"If you have sample test data that deliberately has text files with mixed\n"
14520
"newline conventions, you can ask for those to be left alone like this::"
14521
msgstr ""
14522
"If you have sample test data that deliberately has text files with mixed\n"
14523
"newline conventions, you can ask for those to be left alone like this::"
14524
14525
#: en/help_topics/eol.txt:79
14526
msgid ""
14527
" [name test_data/]\n"
14528
" eol = exact"
14529
msgstr ""
14530
" [name test_data/]\n"
14531
" eol = exact"
14532
14533
#: en/help_topics/eol.txt:85
14534
msgid ""
14535
"Note that ``exact`` does not imply the file is binary but it does mean\n"
14536
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
14537
"of content analysis to detect binary files for commands like ``diff``.\n"
14538
"In the future, a ``binary = true`` rule may be added but it is not\n"
14539
"supported yet.)"
14540
msgstr ""
14541
"Note that ``exact`` does not imply the file is binary but it does mean\n"
14542
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
14543
"of content analysis to detect binary files for commands like ``diff``.\n"
14544
"In the future, a ``binary = true`` rule may be added but it is not\n"
14545
"supported yet.)"
14546
14547
#: en/help_topics/eol.txt:91
14548
msgid ""
14549
"If you have an existing repository with text files already stored using\n"
14550
"Windows newline conventions (``crlf``), then you may want to keep using "
14551
"that\n"
14552
"convention in the repository. Forcing certain files to this convention\n"
14553
"may also help users who do not have rules configured. To do this, set\n"
14554
"``eol`` to one of the values below."
14555
msgstr ""
14556
"If you have an existing repository with text files already stored using\n"
14557
"Windows newline conventions (``crlf``), then you may want to keep using "
14558
"that\n"
14559
"convention in the repository. Forcing certain files to this convention\n"
14560
"may also help users who do not have rules configured. To do this, set\n"
14561
"``eol`` to one of the values below."
14562
14563
#: en/help_topics/eol.txt:97
14564
msgid ""
14565
" ============================ ======================== "
14566
"======================\n"
14567
" Value Checkout end-of-lines as Commit end-of-lines "
14568
"as\n"
14569
" ============================ ======================== "
14570
"======================\n"
14571
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
14572
" ``lf`` otherwise\n"
14573
" ---------------------------- ------------------------ ----------------------"
14574
"\n"
14575
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
14576
" ---------------------------- ------------------------ ----------------------"
14577
"\n"
14578
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
14579
" ============================ ======================== ======================"
14580
msgstr ""
14581
" ============================ ======================== "
14582
"======================\n"
14583
" Value Checkout end-of-lines as Commit end-of-lines "
14584
"as\n"
14585
" ============================ ======================== "
14586
"======================\n"
14587
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
14588
" ``lf`` otherwise\n"
14589
" ---------------------------- ------------------------ ----------------------"
14590
"\n"
14591
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
14592
" ---------------------------- ------------------------ ----------------------"
14593
"\n"
14594
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
14595
" ============================ ======================== ======================"
14596
14597
#: en/help_topics/eol.txt:108
14598
msgid ""
14599
"For users working on an existing project that uses Windows newline\n"
14600
"conventions in their Bazaar repository, this rule is suggested as a\n"
14601
"starting point::"
14602
msgstr ""
14603
"For users working on an existing project that uses Windows newline\n"
14604
"conventions in their Bazaar repository, this rule is suggested as a\n"
14605
"starting point::"
14606
14607
#: en/help_topics/eol.txt:112
14608
msgid ""
14609
" [name *]\n"
14610
" eol = native-with-crlf-in-repo"
14611
msgstr ""
14612
" [name *]\n"
14613
" eol = native-with-crlf-in-repo"
14614
14615
#: en/help_topics/eol.txt:115
14616
msgid ""
14617
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
14618
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
14619
"``crlf`` and ``exact``."
14620
msgstr ""
14621
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
14622
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
14623
"``crlf`` and ``exact``."
14624
14625
#: en/help_topics/eol.txt:119
14626
msgid ""
14627
"Note: Bazaar's EOL conversion will convert the content of files but\n"
14628
"never reject files because a given line ending or mixed line endings\n"
14629
"are found. A precommit hook should be used if you wish to validate\n"
14630
"(and not just convert) content before committing.\n"
14631
msgstr ""
14632
"Note: Bazaar's EOL conversion will convert the content of files but\n"
14633
"never reject files because a given line ending or mixed line endings\n"
14634
"are found. A pre-commit hook should be used if you wish to validate\n"
14635
"(and not just convert) content before committing.\n"
14636
14637
#: en/help_topics/hidden-commands.txt:1
14638
msgid ""
14639
"added List files added in working tree.\n"
14640
"ancestry List all revisions merged into this branch.\n"
14641
"assert-fail Test reporting of assertion failures\n"
14642
"bundle-info Output interesting stats about a bundle\n"
14643
"bundle-revisions Create a merge-directive for submitting changes.\n"
14644
"cat-revision Write out metadata for a revision.\n"
14645
"dump-btree Dump the contents of a btree index file to stdout.\n"
14646
"export-pot Export command helps and error messages in po format.\n"
14647
"file-id Print file_id of a particular file or directory.\n"
14648
"file-path Print path of file_ids to a file or directory.\n"
14649
"find-merge-base Find and print a base revision for merging two "
14650
"branches.\n"
14651
"hooks Show hooks.\n"
14652
"inventory Show inventory of the current working copy or a "
14653
"revision.\n"
14654
"local-time-offset Show the offset in seconds from GMT to local time.\n"
14655
"lookup-revision Lookup the revision-id from a revision-number\n"
14656
"merge-directive Generate a merge directive for auto-merge tools.\n"
14657
"modified List files modified in working tree.\n"
14658
"re-sign Create a digital signature for an existing revision.\n"
14659
"reference list, view and set branch locations for nested trees.\n"
14660
"relpath Show path of a file relative to root\n"
14661
"repair-workingtree Reset the working tree state file.\n"
14662
"revision-history Display the list of revision ids on a branch.\n"
14663
"revision-info Show revision number and revision id for a given "
14664
"revision\n"
14665
" identifier.\n"
14666
"rocks Statement of optimism.\n"
14667
"selftest Run internal test suite.\n"
14668
"shell-complete Show appropriate completions for context.\n"
14669
"test-script Run a shell-like test from a file.\n"
14670
"touching-revisions Return revision-ids which affected a particular file.\n"
14671
"unknowns List unknown files.\n"
14672
"wait-until-signalled Test helper for\n"
14673
" test_start_and_stop_bzr_subprocess_send_signal.\n"
14674
msgstr ""
14675
"added List files added in working tree.\n"
14676
"ancestry List all revisions merged into this branch.\n"
14677
"assert-fail Test reporting of assertion failures\n"
14678
"bundle-info Output interesting stats about a bundle\n"
14679
"bundle-revisions Create a merge-directive for submitting changes.\n"
14680
"cat-revision Write out metadata for a revision.\n"
14681
"dump-btree Dump the contents of a btree index file to stdout.\n"
14682
"export-pot Export command helps and error messages in po format.\n"
14683
"file-id Print file_id of a particular file or directory.\n"
14684
"file-path Print path of file_ids to a file or directory.\n"
14685
"find-merge-base Find and print a base revision for merging two "
14686
"branches.\n"
14687
"hooks Show hooks.\n"
14688
"inventory Show inventory of the current working copy or a "
14689
"revision.\n"
14690
"local-time-offset Show the offset in seconds from GMT to local time.\n"
14691
"lookup-revision Lookup the revision-id from a revision-number\n"
14692
"merge-directive Generate a merge directive for auto-merge tools.\n"
14693
"modified List files modified in working tree.\n"
14694
"re-sign Create a digital signature for an existing revision.\n"
14695
"reference list, view and set branch locations for nested trees.\n"
14696
"relpath Show path of a file relative to root\n"
14697
"repair-workingtree Reset the working tree state file.\n"
14698
"revision-history Display the list of revision ids on a branch.\n"
14699
"revision-info Show revision number and revision id for a given "
14700
"revision\n"
14701
" identifier.\n"
14702
"rocks Statement of optimism.\n"
14703
"selftest Run internal test suite.\n"
14704
"shell-complete Show appropriate completions for context.\n"
14705
"test-script Run a shell-like test from a file.\n"
14706
"touching-revisions Return revision-ids which affected a particular file.\n"
14707
"unknowns List unknown files.\n"
14708
"wait-until-signalled Test helper for\n"
14709
" test_start_and_stop_bzr_subprocess_send_signal.\n"
14710
14711
#: en/help_topics/hooks.txt:1
14712
msgid ""
14713
"\n"
14714
"Hooks\n"
14715
"====="
14716
msgstr ""
14717
"\n"
14718
"Hooks\n"
14719
"====="
14720
14721
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
14722
msgid ""
14723
"Introduction\n"
14724
"------------"
14725
msgstr ""
14726
"Introduction\n"
14727
"------------"
14728
14729
#: en/help_topics/hooks.txt:8
14730
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
14731
msgstr "A hook of type *xxx* of class *yyy* needs to be registered using::"
14732
14733
#: en/help_topics/hooks.txt:10
14734
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
14735
msgstr " yyy.hooks.install_named_hook(\"xxx\", ...)"
14736
14737
#: en/help_topics/hooks.txt:12
14738
msgid ""
14739
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
14740
msgstr ""
14741
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
14742
14743
#: en/help_topics/hooks.txt:14
14744
msgid ""
14745
"The class that contains each hook is given before the hooks it supplies. "
14746
"For\n"
14747
"instance, BranchHooks as the class is the hooks class for\n"
14748
"`bzrlib.branch.Branch.hooks`."
14749
msgstr ""
14750
"The class that contains each hook is given before the hooks it supplies. "
14751
"For\n"
14752
"instance, BranchHooks as the class is the hooks class for\n"
14753
"`bzrlib.branch.Branch.hooks`."
14754
14755
#: en/help_topics/hooks.txt:18
14756
msgid ""
14757
"Each description also indicates whether the hook runs on the client (the\n"
14758
"machine where bzr was invoked) or the server (the machine addressed by\n"
14759
"the branch URL). These may be, but are not necessarily, the same machine."
14760
msgstr ""
14761
"Each description also indicates whether the hook runs on the client (the\n"
14762
"machine where bzr was invoked) or the server (the machine addressed by\n"
14763
"the branch URL). These may be, but are not necessarily, the same machine."
14764
14765
#: en/help_topics/hooks.txt:22
14766
msgid ""
14767
"Plugins (including hooks) are run on the server if all of these is true:"
14768
msgstr ""
14769
"Plugins (including hooks) are run on the server if all of these is true:"
14770
14771
#: en/help_topics/hooks.txt:24
14772
msgid ""
14773
" * The connection is via a smart server (accessed with a URL starting with\n"
14774
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
14775
"\"http://\"\n"
14776
" URL when a smart server is available via HTTP)."
14777
msgstr ""
14778
" * The connection is via a smart server (accessed with a URL starting with\n"
14779
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
14780
"\"http://\"\n"
14781
" URL when a smart server is available via HTTP)."
14782
14783
#: en/help_topics/hooks.txt:28
14784
msgid ""
14785
" * The hook is either server specific or part of general infrastructure "
14786
"rather\n"
14787
" than client specific code (such as commit)."
14788
msgstr ""
14789
" * The hook is either server specific or part of general infrastructure "
14790
"rather\n"
14791
" than client specific code (such as commit)."
14792
14793
#: en/help_topics/hooks.txt:31
14794
msgid ""
14795
"\n"
14796
"BranchHooks\n"
14797
"-----------"
14798
msgstr ""
14799
"\n"
14800
"BranchHooks\n"
14801
"-----------"
14802
14803
#: en/help_topics/hooks.txt:35
14804
msgid ""
14805
"automatic_tag_name\n"
14806
"~~~~~~~~~~~~~~~~~~"
14807
msgstr ""
14808
"automatic_tag_name\n"
14809
"~~~~~~~~~~~~~~~~~~"
14810
14811
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
14812
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
14813
msgid "Introduced in: 2.2"
14814
msgstr "Introduced in: 2.2"
14815
14816
#: en/help_topics/hooks.txt:40
14817
msgid ""
14818
"Called to determine an automatic tag name for a revision.\n"
14819
"automatic_tag_name is called with (branch, revision_id) and should\n"
14820
"return a tag name or None if no tag name could be determined. The\n"
14821
"first non-None tag name returned will be used."
14822
msgstr ""
14823
"Called to determine an automatic tag name for a revision.\n"
14824
"automatic_tag_name is called with (branch, revision_id) and should\n"
14825
"return a tag name or None if no tag name could be determined. The\n"
14826
"first non-None tag name returned will be used."
14827
14828
#: en/help_topics/hooks.txt:45
14829
msgid ""
14830
"open\n"
14831
"~~~~"
14832
msgstr ""
14833
"open\n"
14834
"~~~~"
14835
14836
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
14837
#: en/help_topics/hooks.txt:307
14838
msgid "Introduced in: 1.8"
14839
msgstr "Introduced in: 1.8"
14840
14841
#: en/help_topics/hooks.txt:50
14842
msgid ""
14843
"Called with the Branch object that has been opened after a branch is\n"
14844
"opened."
14845
msgstr ""
14846
"Called with the Branch object that has been opened after a branch is\n"
14847
"opened."
14848
14849
#: en/help_topics/hooks.txt:53
14850
msgid ""
14851
"post_branch_init\n"
14852
"~~~~~~~~~~~~~~~~"
14853
msgstr ""
14854
"post_branch_init\n"
14855
"~~~~~~~~~~~~~~~~"
14856
14857
#: en/help_topics/hooks.txt:58
14858
msgid ""
14859
"Called after new branch initialization completes. post_branch_init is\n"
14860
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
14861
"branch and checkout (both heavyweight and lightweight) will all\n"
14862
"trigger this hook."
14863
msgstr ""
14864
"Called after new branch initialisation completes. post_branch_init is\n"
14865
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
14866
"branch and checkout (both heavyweight and lightweight) will all\n"
14867
"trigger this hook."
14868
14869
#: en/help_topics/hooks.txt:63
14870
msgid ""
14871
"post_change_branch_tip\n"
14872
"~~~~~~~~~~~~~~~~~~~~~~"
14873
msgstr ""
14874
"post_change_branch_tip\n"
14875
"~~~~~~~~~~~~~~~~~~~~~~"
14876
14877
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
14878
msgid "Introduced in: 1.4"
14879
msgstr "Introduced in: 1.4"
14880
14881
#: en/help_topics/hooks.txt:68
14882
msgid ""
14883
"Called in bzr client and server after a change to the tip of a branch\n"
14884
"is made. post_change_branch_tip is called with a\n"
14885
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
14886
"uncommit will all trigger this hook."
14887
msgstr ""
14888
"Called in bzr client and server after a change to the tip of a branch\n"
14889
"is made. post_change_branch_tip is called with a\n"
14890
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
14891
"uncommit will all trigger this hook."
14892
14893
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
14894
msgid ""
14895
"post_commit\n"
14896
"~~~~~~~~~~~"
14897
msgstr ""
14898
"post_commit\n"
14899
"~~~~~~~~~~~"
14900
14901
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
14902
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
14903
msgid "Introduced in: 0.15"
14904
msgstr "Introduced in: 0.15"
14905
14906
#: en/help_topics/hooks.txt:78
14907
msgid ""
14908
"Called in the bzr client after a commit has completed. post_commit is\n"
14909
"called with (local, master, old_revno, old_revid, new_revno,\n"
14910
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
14911
"branch."
14912
msgstr ""
14913
"Called in the bzr client after a commit has completed. post_commit is\n"
14914
"called with (local, master, old_revno, old_revid, new_revno,\n"
14915
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
14916
"branch."
14917
14918
#: en/help_topics/hooks.txt:83
14919
msgid ""
14920
"post_pull\n"
14921
"~~~~~~~~~"
14922
msgstr ""
14923
"post_pull\n"
14924
"~~~~~~~~~"
14925
14926
#: en/help_topics/hooks.txt:88
14927
msgid ""
14928
"Called after a pull operation completes. post_pull is called with a\n"
14929
"bzrlib.branch.PullResult object and only runs in the bzr client."
14930
msgstr ""
14931
"Called after a pull operation completes. post_pull is called with a\n"
14932
"bzrlib.branch.PullResult object and only runs in the bzr client."
14933
14934
#: en/help_topics/hooks.txt:91
14935
msgid ""
14936
"post_push\n"
14937
"~~~~~~~~~"
14938
msgstr ""
14939
"post_push\n"
14940
"~~~~~~~~~"
14941
14942
#: en/help_topics/hooks.txt:96
14943
msgid ""
14944
"Called after a push operation completes. post_push is called with a\n"
14945
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
14946
msgstr ""
14947
"Called after a push operation completes. post_push is called with a\n"
14948
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
14949
14950
#: en/help_topics/hooks.txt:99
14951
msgid ""
14952
"post_switch\n"
14953
"~~~~~~~~~~~"
14954
msgstr ""
14955
"post_switch\n"
14956
"~~~~~~~~~~~"
14957
14958
#: en/help_topics/hooks.txt:104
14959
msgid ""
14960
"Called after a checkout switches branch. post_switch is called with a\n"
14961
"bzrlib.branch.SwitchHookParams."
14962
msgstr ""
14963
"Called after a checkout switches branch. post_switch is called with a\n"
14964
"bzrlib.branch.SwitchHookParams."
14965
14966
#: en/help_topics/hooks.txt:107
14967
msgid ""
14968
"post_uncommit\n"
14969
"~~~~~~~~~~~~~"
14970
msgstr ""
14971
"post_uncommit\n"
14972
"~~~~~~~~~~~~~"
14973
14974
#: en/help_topics/hooks.txt:112
14975
msgid ""
14976
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
14977
"called with (local, master, old_revno, old_revid, new_revno,\n"
14978
"new_revid) where local is the local branch or None, master is the\n"
14979
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
14980
"of None."
14981
msgstr ""
14982
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
14983
"called with (local, master, old_revno, old_revid, new_revno,\n"
14984
"new_revid) where local is the local branch or None, master is the\n"
14985
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
14986
"of None."
14987
14988
#: en/help_topics/hooks.txt:118
14989
msgid ""
14990
"pre_change_branch_tip\n"
14991
"~~~~~~~~~~~~~~~~~~~~~"
14992
msgstr ""
14993
"pre_change_branch_tip\n"
14994
"~~~~~~~~~~~~~~~~~~~~~"
14995
14996
#: en/help_topics/hooks.txt:121
14997
msgid "Introduced in: 1.6"
14998
msgstr "Introduced in: 1.6"
14999
15000
#: en/help_topics/hooks.txt:123
15001
msgid ""
15002
"Called in bzr client and server before a change to the tip of a branch\n"
15003
"is made. pre_change_branch_tip is called with a\n"
15004
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
15005
"uncommit will all trigger this hook."
15006
msgstr ""
15007
"Called in bzr client and server before a change to the tip of a branch\n"
15008
"is made. pre_change_branch_tip is called with a\n"
15009
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
15010
"uncommit will all trigger this hook."
15011
15012
#: en/help_topics/hooks.txt:128
15013
msgid ""
15014
"pre_commit\n"
15015
"~~~~~~~~~~"
15016
msgstr ""
15017
"pre_commit\n"
15018
"~~~~~~~~~~"
15019
15020
#: en/help_topics/hooks.txt:131
15021
msgid "Introduced in: 0.91"
15022
msgstr "Introduced in: 0.91"
15023
15024
#: en/help_topics/hooks.txt:133
15025
msgid ""
15026
"Called after a commit is calculated but before it is completed.\n"
15027
"pre_commit is called with (local, master, old_revno, old_revid,\n"
15028
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
15029
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
15030
"TreeDelta object describing changes from the basis revision. hooks\n"
15031
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
15032
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
15033
"tree."
15034
msgstr ""
15035
"Called after a commit is calculated but before it is completed.\n"
15036
"pre_commit is called with (local, master, old_revno, old_revid,\n"
15037
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
15038
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
15039
"TreeDelta object describing changes from the basis revision. hooks\n"
15040
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
15041
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
15042
"tree."
15043
15044
#: en/help_topics/hooks.txt:142
15045
msgid ""
15046
"transform_fallback_location\n"
15047
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
15048
msgstr ""
15049
"transform_fallback_location\n"
15050
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
15051
15052
#: en/help_topics/hooks.txt:145
15053
msgid "Introduced in: 1.9"
15054
msgstr "Introduced in: 1.9"
15055
15056
#: en/help_topics/hooks.txt:147
15057
msgid ""
15058
"Called when a stacked branch is activating its fallback locations.\n"
15059
"transform_fallback_location is called with (branch, url), and should\n"
15060
"return a new url. Returning the same url allows it to be used as-is,\n"
15061
"returning a different one can be used to cause the branch to stack on\n"
15062
"a closer copy of that fallback_location. Note that the branch cannot\n"
15063
"have history accessing methods called on it during this hook because\n"
15064
"the fallback locations have not been activated. When there are\n"
15065
"multiple hooks installed for transform_fallback_location, all are\n"
15066
"called with the url returned from the previous hook.The order is\n"
15067
"however undefined."
15068
msgstr ""
15069
"Called when a stacked branch is activating its fallback locations.\n"
15070
"transform_fallback_location is called with (branch, url), and should\n"
15071
"return a new url. Returning the same url allows it to be used as-is,\n"
15072
"returning a different one can be used to cause the branch to stack on\n"
15073
"a closer copy of that fallback_location. Note that the branch cannot\n"
15074
"have history accessing methods called on it during this hook because\n"
15075
"the fallback locations have not been activated. When there are\n"
15076
"multiple hooks installed for transform_fallback_location, all are\n"
15077
"called with the url returned from the previous hook.The order is\n"
15078
"however undefined."
15079
15080
#: en/help_topics/hooks.txt:158
15081
msgid ""
15082
"CommandHooks\n"
15083
"------------"
15084
msgstr ""
15085
"CommandHooks\n"
15086
"------------"
15087
15088
#: en/help_topics/hooks.txt:161
15089
msgid ""
15090
"extend_command\n"
15091
"~~~~~~~~~~~~~~"
15092
msgstr ""
15093
"extend_command\n"
15094
"~~~~~~~~~~~~~~"
15095
15096
#: en/help_topics/hooks.txt:164
15097
msgid "Introduced in: 1.13"
15098
msgstr "Introduced in: 1.13"
15099
15100
#: en/help_topics/hooks.txt:166
15101
msgid ""
15102
"Called after creating a command object to allow modifications such as\n"
15103
"adding or removing options, docs etc. Called with the new\n"
15104
"bzrlib.commands.Command object."
15105
msgstr ""
15106
"Called after creating a command object to allow modifications such as\n"
15107
"adding or removing options, docs etc. Called with the new\n"
15108
"bzrlib.commands.Command object."
15109
15110
#: en/help_topics/hooks.txt:170
15111
msgid ""
15112
"get_command\n"
15113
"~~~~~~~~~~~"
15114
msgstr ""
15115
"get_command\n"
15116
"~~~~~~~~~~~"
15117
15118
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
15119
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
15120
msgid "Introduced in: 1.17"
15121
msgstr "Introduced in: 1.17"
15122
15123
#: en/help_topics/hooks.txt:175
15124
msgid ""
15125
"Called when creating a single command. Called with (cmd_or_None,\n"
15126
"command_name). get_command should either return the cmd_or_None\n"
15127
"parameter, or a replacement Command object that should be used for the\n"
15128
"command. Note that the Command.hooks hooks are core infrastructure.\n"
15129
"Many users will prefer to use bzrlib.commands.register_command or\n"
15130
"plugin_cmds.register_lazy."
15131
msgstr ""
15132
"Called when creating a single command. Called with (cmd_or_None,\n"
15133
"command_name). get_command should either return the cmd_or_None\n"
15134
"parameter, or a replacement Command object that should be used for the\n"
15135
"command. Note that the Command.hooks hooks are core infrastructure.\n"
15136
"Many users will prefer to use bzrlib.commands.register_command or\n"
15137
"plugin_cmds.register_lazy."
15138
15139
#: en/help_topics/hooks.txt:182
15140
msgid ""
15141
"get_missing_command\n"
15142
"~~~~~~~~~~~~~~~~~~~"
15143
msgstr ""
15144
"get_missing_command\n"
15145
"~~~~~~~~~~~~~~~~~~~"
15146
15147
#: en/help_topics/hooks.txt:187
15148
msgid ""
15149
"Called when creating a single command if no command could be found.\n"
15150
"Called with (command_name). get_missing_command should either return\n"
15151
"None, or a Command object to be used for the command."
15152
msgstr ""
15153
"Called when creating a single command if no command could be found.\n"
15154
"Called with (command_name). get_missing_command should either return\n"
15155
"None, or a Command object to be used for the command."
15156
15157
#: en/help_topics/hooks.txt:191
15158
msgid ""
15159
"list_commands\n"
15160
"~~~~~~~~~~~~~"
15161
msgstr ""
15162
"list_commands\n"
15163
"~~~~~~~~~~~~~"
15164
15165
#: en/help_topics/hooks.txt:196
15166
msgid ""
15167
"Called when enumerating commands. Called with a set of cmd_name\n"
15168
"strings for all the commands found so far. This set is safe to mutate\n"
15169
"- e.g. to remove a command. list_commands should return the updated\n"
15170
"set of command names."
15171
msgstr ""
15172
"Called when enumerating commands. Called with a set of cmd_name\n"
15173
"strings for all the commands found so far. This set is safe to mutate\n"
15174
"- e.g. to remove a command. list_commands should return the updated\n"
15175
"set of command names."
15176
15177
#: en/help_topics/hooks.txt:201
15178
msgid ""
15179
"post_command\n"
15180
"~~~~~~~~~~~~"
15181
msgstr ""
15182
"post_command\n"
15183
"~~~~~~~~~~~~"
15184
15185
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
15186
msgid "Introduced in: 2.6"
15187
msgstr "Introduced in: 2.6"
15188
15189
#: en/help_topics/hooks.txt:206
15190
msgid "Called after executing a command. Called with the command object."
15191
msgstr "Called after executing a command. Called with the command object."
15192
15193
#: en/help_topics/hooks.txt:208
15194
msgid ""
15195
"pre_command\n"
15196
"~~~~~~~~~~~"
15197
msgstr ""
15198
"pre_command\n"
15199
"~~~~~~~~~~~"
15200
15201
#: en/help_topics/hooks.txt:213
15202
msgid "Called prior to executing a command. Called with the command object."
15203
msgstr "Called prior to executing a command. Called with the command object."
15204
15205
#: en/help_topics/hooks.txt:215
15206
msgid ""
15207
"_ConfigHooks\n"
15208
"------------"
15209
msgstr ""
15210
"_ConfigHooks\n"
15211
"------------"
15212
15213
#: en/help_topics/hooks.txt:218
15214
msgid ""
15215
"get\n"
15216
"~~~"
15217
msgstr ""
15218
"get\n"
15219
"~~~"
15220
15221
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
15222
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
15223
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
15224
#: en/help_topics/hooks.txt:446
15225
msgid "Introduced in: 2.4"
15226
msgstr "Introduced in: 2.4"
15227
15228
#: en/help_topics/hooks.txt:223
15229
msgid ""
15230
"Invoked when a config option is read. The signature is (stack, name,\n"
15231
"value)."
15232
msgstr ""
15233
"Invoked when a config option is read. The signature is (stack, name,\n"
15234
"value)."
15235
15236
#: en/help_topics/hooks.txt:226
15237
msgid ""
15238
"load\n"
15239
"~~~~"
15240
msgstr ""
15241
"load\n"
15242
"~~~~"
15243
15244
#: en/help_topics/hooks.txt:231
15245
msgid "Invoked when a config store is loaded. The signature is (store)."
15246
msgstr "Invoked when a config store is loaded. The signature is (store)."
15247
15248
#: en/help_topics/hooks.txt:233
15249
msgid ""
15250
"remove\n"
15251
"~~~~~~"
15252
msgstr ""
15253
"remove\n"
15254
"~~~~~~"
15255
15256
#: en/help_topics/hooks.txt:238
15257
msgid ""
15258
"Invoked when a config option is removed. The signature is (stack,\n"
15259
"name)."
15260
msgstr ""
15261
"Invoked when a config option is removed. The signature is (stack,\n"
15262
"name)."
15263
15264
#: en/help_topics/hooks.txt:241
15265
msgid ""
15266
"save\n"
15267
"~~~~"
15268
msgstr ""
15269
"save\n"
15270
"~~~~"
15271
15272
#: en/help_topics/hooks.txt:246
15273
msgid "Invoked when a config store is saved. The signature is (store)."
15274
msgstr "Invoked when a config store is saved. The signature is (store)."
15275
15276
#: en/help_topics/hooks.txt:248
15277
msgid ""
15278
"set\n"
15279
"~~~"
15280
msgstr ""
15281
"set\n"
15282
"~~~"
15283
15284
#: en/help_topics/hooks.txt:253
15285
msgid ""
15286
"Invoked when a config option is set. The signature is (stack, name,\n"
15287
"value)."
15288
msgstr ""
15289
"Invoked when a config option is set. The signature is (stack, name,\n"
15290
"value)."
15291
15292
#: en/help_topics/hooks.txt:256
15293
msgid ""
15294
"ControlDirHooks\n"
15295
"---------------"
15296
msgstr ""
15297
"ControlDirHooks\n"
15298
"---------------"
15299
15300
#: en/help_topics/hooks.txt:259
15301
msgid ""
15302
"post_repo_init\n"
15303
"~~~~~~~~~~~~~~"
15304
msgstr ""
15305
"post_repo_init\n"
15306
"~~~~~~~~~~~~~~"
15307
15308
#: en/help_topics/hooks.txt:264
15309
msgid ""
15310
"Invoked after a repository has been initialized. post_repo_init is\n"
15311
"called with a bzrlib.controldir.RepoInitHookParams."
15312
msgstr ""
15313
"Invoked after a repository has been initialised. post_repo_init is\n"
15314
"called with a bzrlib.controldir.RepoInitHookParams."
15315
15316
#: en/help_topics/hooks.txt:267
15317
msgid ""
15318
"pre_open\n"
15319
"~~~~~~~~"
15320
msgstr ""
15321
"pre_open\n"
15322
"~~~~~~~~"
15323
15324
#: en/help_topics/hooks.txt:270
15325
msgid "Introduced in: 1.14"
15326
msgstr "Introduced in: 1.14"
15327
15328
#: en/help_topics/hooks.txt:272
15329
msgid ""
15330
"Invoked before attempting to open a ControlDir with the transport that\n"
15331
"the open will use."
15332
msgstr ""
15333
"Invoked before attempting to open a ControlDir with the transport that\n"
15334
"the open will use."
15335
15336
#: en/help_topics/hooks.txt:275
15337
msgid ""
15338
"InfoHooks\n"
15339
"---------"
15340
msgstr ""
15341
"InfoHooks\n"
15342
"---------"
15343
15344
#: en/help_topics/hooks.txt:278
15345
msgid ""
15346
"repository\n"
15347
"~~~~~~~~~~"
15348
msgstr ""
15349
"repository\n"
15350
"~~~~~~~~~~"
15351
15352
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
15353
#: en/help_topics/hooks.txt:524
15354
msgid "Introduced in: 1.15"
15355
msgstr "Introduced in: 1.15"
15356
15357
#: en/help_topics/hooks.txt:283
15358
msgid ""
15359
"Invoked when displaying the statistics for a repository. repository is\n"
15360
"called with a statistics dictionary as returned by the repository and\n"
15361
"a file-like object to write to."
15362
msgstr ""
15363
"Invoked when displaying the statistics for a repository. repository is\n"
15364
"called with a statistics dictionary as returned by the repository and\n"
15365
"a file-like object to write to."
15366
15367
#: en/help_topics/hooks.txt:287
15368
msgid ""
15369
"LockHooks\n"
15370
"---------"
15371
msgstr ""
15372
"LockHooks\n"
15373
"---------"
15374
15375
#: en/help_topics/hooks.txt:290
15376
msgid ""
15377
"lock_acquired\n"
15378
"~~~~~~~~~~~~~"
15379
msgstr ""
15380
"lock_acquired\n"
15381
"~~~~~~~~~~~~~"
15382
15383
#: en/help_topics/hooks.txt:295
15384
msgid ""
15385
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
15386
msgstr ""
15387
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
15388
15389
#: en/help_topics/hooks.txt:297
15390
msgid ""
15391
"lock_broken\n"
15392
"~~~~~~~~~~~"
15393
msgstr ""
15394
"lock_broken\n"
15395
"~~~~~~~~~~~"
15396
15397
#: en/help_topics/hooks.txt:302
15398
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
15399
msgstr "Called with a bzrlib.lock.LockResult when a physical lock is broken."
15400
15401
#: en/help_topics/hooks.txt:304
15402
msgid ""
15403
"lock_released\n"
15404
"~~~~~~~~~~~~~"
15405
msgstr ""
15406
"lock_released\n"
15407
"~~~~~~~~~~~~~"
15408
15409
#: en/help_topics/hooks.txt:309
15410
msgid ""
15411
"Called with a bzrlib.lock.LockResult when a physical lock is released."
15412
msgstr ""
15413
"Called with a bzrlib.lock.LockResult when a physical lock is released."
15414
15415
#: en/help_topics/hooks.txt:311
15416
msgid ""
15417
"MergeHooks\n"
15418
"----------"
15419
msgstr ""
15420
"MergeHooks\n"
15421
"----------"
15422
15423
#: en/help_topics/hooks.txt:314
15424
msgid ""
15425
"merge_file_content\n"
15426
"~~~~~~~~~~~~~~~~~~"
15427
msgstr ""
15428
"merge_file_content\n"
15429
"~~~~~~~~~~~~~~~~~~"
15430
15431
#: en/help_topics/hooks.txt:317
15432
msgid "Introduced in: 2.1"
15433
msgstr "Introduced in: 2.1"
15434
15435
#: en/help_topics/hooks.txt:319
15436
msgid ""
15437
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
15438
"object when starting a merge. Should return either None or a subclass\n"
15439
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
15440
"called per file that needs to be merged (including when one side has\n"
15441
"deleted the file and the other has changed it). See the\n"
15442
"AbstractPerFileMerger API docs for details on how it is used by merge."
15443
msgstr ""
15444
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
15445
"object when starting a merge. Should return either None or a subclass\n"
15446
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
15447
"called per file that needs to be merged (including when one side has\n"
15448
"deleted the file and the other has changed it). See the\n"
15449
"AbstractPerFileMerger API docs for details on how it is used by merge."
15450
15451
#: en/help_topics/hooks.txt:326
15452
msgid ""
15453
"post_merge\n"
15454
"~~~~~~~~~~"
15455
msgstr ""
15456
"post_merge\n"
15457
"~~~~~~~~~~"
15458
15459
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
15460
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
15461
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
15462
msgid "Introduced in: 2.5"
15463
msgstr "Introduced in: 2.5"
15464
15465
#: en/help_topics/hooks.txt:331
15466
msgid ""
15467
"Called after a merge. Receives a Merger object as the single argument.\n"
15468
"The return value is ignored."
15469
msgstr ""
15470
"Called after a merge. Receives a Merger object as the single argument.\n"
15471
"The return value is ignored."
15472
15473
#: en/help_topics/hooks.txt:334
15474
msgid ""
15475
"pre_merge\n"
15476
"~~~~~~~~~"
15477
msgstr ""
15478
"pre_merge\n"
15479
"~~~~~~~~~"
15480
15481
#: en/help_topics/hooks.txt:339
15482
msgid ""
15483
"Called before a merge. Receives a Merger object as the single\n"
15484
"argument."
15485
msgstr ""
15486
"Called before a merge. Receives a Merger object as the single\n"
15487
"argument."
15488
15489
#: en/help_topics/hooks.txt:342
15490
msgid ""
15491
"MergeDirectiveHooks\n"
15492
"-------------------"
15493
msgstr ""
15494
"MergeDirectiveHooks\n"
15495
"-------------------"
15496
15497
#: en/help_topics/hooks.txt:345
15498
msgid ""
15499
"merge_request_body\n"
15500
"~~~~~~~~~~~~~~~~~~"
15501
msgstr ""
15502
"merge_request_body\n"
15503
"~~~~~~~~~~~~~~~~~~"
15504
15505
#: en/help_topics/hooks.txt:348
15506
msgid "Introduced in: 1.15.0"
15507
msgstr "Introduced in: 1.15.0"
15508
15509
#: en/help_topics/hooks.txt:350
15510
msgid ""
15511
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
15512
"request. Callbacks must return a body. If more than one callback is\n"
15513
"registered, the output of one callback is provided to the next."
15514
msgstr ""
15515
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
15516
"request. Callbacks must return a body. If more than one callback is\n"
15517
"registered, the output of one callback is provided to the next."
15518
15519
#: en/help_topics/hooks.txt:354
15520
msgid ""
15521
"MessageEditorHooks\n"
15522
"------------------"
15523
msgstr ""
15524
"MessageEditorHooks\n"
15525
"------------------"
15526
15527
#: en/help_topics/hooks.txt:357
15528
msgid ""
15529
"commit_message_template\n"
15530
"~~~~~~~~~~~~~~~~~~~~~~~"
15531
msgstr ""
15532
"commit_message_template\n"
15533
"~~~~~~~~~~~~~~~~~~~~~~~"
15534
15535
#: en/help_topics/hooks.txt:360
15536
msgid "Introduced in: 1.10"
15537
msgstr "Introduced in: 1.10"
15538
15539
#: en/help_topics/hooks.txt:362
15540
msgid ""
15541
"Called when a commit message is being generated.\n"
15542
"commit_message_template is called with the bzrlib.commit.Commit object\n"
15543
"and the message that is known so far. commit_message_template must\n"
15544
"return a new message to use (which could be the same as it was given).\n"
15545
"When there are multiple hooks registered for commit_message_template,\n"
15546
"they are chained with the result from the first passed into the\n"
15547
"second, and so on."
15548
msgstr ""
15549
"Called when a commit message is being generated.\n"
15550
"commit_message_template is called with the bzrlib.commit.Commit object\n"
15551
"and the message that is known so far. commit_message_template must\n"
15552
"return a new message to use (which could be the same as it was given).\n"
15553
"When there are multiple hooks registered for commit_message_template,\n"
15554
"they are chained with the result from the first passed into the\n"
15555
"second, and so on."
15556
15557
#: en/help_topics/hooks.txt:370
15558
msgid ""
15559
"set_commit_message\n"
15560
"~~~~~~~~~~~~~~~~~~"
15561
msgstr ""
15562
"set_commit_message\n"
15563
"~~~~~~~~~~~~~~~~~~"
15564
15565
#: en/help_topics/hooks.txt:375
15566
msgid ""
15567
"Set a fixed commit message. set_commit_message is called with the\n"
15568
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
15569
"properties by editing commit.builder._revprops) and the message so\n"
15570
"far. set_commit_message must return the message to use or None if it\n"
15571
"should use the message editor as normal."
15572
msgstr ""
15573
"Set a fixed commit message. set_commit_message is called with the\n"
15574
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
15575
"properties by editing commit.builder._revprops) and the message so\n"
15576
"far. set_commit_message must return the message to use or None if it\n"
15577
"should use the message editor as normal."
15578
15579
#: en/help_topics/hooks.txt:381
15580
msgid ""
15581
"MutableTreeHooks\n"
15582
"----------------"
15583
msgstr ""
15584
"MutableTreeHooks\n"
15585
"----------------"
15586
15587
#: en/help_topics/hooks.txt:384
15588
msgid ""
15589
"post_build_tree\n"
15590
"~~~~~~~~~~~~~~~"
15591
msgstr ""
15592
"post_build_tree\n"
15593
"~~~~~~~~~~~~~~~"
15594
15595
#: en/help_topics/hooks.txt:389
15596
msgid ""
15597
"Called after a completely new tree is built. The hook is called with\n"
15598
"the tree as its only argument."
15599
msgstr ""
15600
"Called after a completely new tree is built. The hook is called with\n"
15601
"the tree as its only argument."
15602
15603
#: en/help_topics/hooks.txt:395
15604
msgid "Introduced in: 2.0"
15605
msgstr "Introduced in: 2.0"
15606
15607
#: en/help_topics/hooks.txt:397
15608
msgid ""
15609
"Called after a commit is performed on a tree. The hook is called with\n"
15610
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
15611
"commit was performed on is available via the mutable_tree attribute of\n"
15612
"that object."
15613
msgstr ""
15614
"Called after a commit is performed on a tree. The hook is called with\n"
15615
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
15616
"commit was performed on is available via the mutable_tree attribute of\n"
15617
"that object."
15618
15619
#: en/help_topics/hooks.txt:402
15620
msgid ""
15621
"post_transform\n"
15622
"~~~~~~~~~~~~~~"
15623
msgstr ""
15624
"post_transform\n"
15625
"~~~~~~~~~~~~~~"
15626
15627
#: en/help_topics/hooks.txt:407
15628
msgid ""
15629
"Called after a tree transform has been performed on a tree. The hook\n"
15630
"is called with the tree that is being transformed and the transform."
15631
msgstr ""
15632
"Called after a tree transform has been performed on a tree. The hook\n"
15633
"is called with the tree that is being transformed and the transform."
15634
15635
#: en/help_topics/hooks.txt:410
15636
msgid ""
15637
"pre_transform\n"
15638
"~~~~~~~~~~~~~"
15639
msgstr ""
15640
"pre_transform\n"
15641
"~~~~~~~~~~~~~"
15642
15643
#: en/help_topics/hooks.txt:415
15644
msgid ""
15645
"Called before a tree transform on this tree. The hook is called with\n"
15646
"the tree that is being transformed and the transform."
15647
msgstr ""
15648
"Called before a tree transform on this tree. The hook is called with\n"
15649
"the tree that is being transformed and the transform."
15650
15651
#: en/help_topics/hooks.txt:418
15652
msgid ""
15653
"start_commit\n"
15654
"~~~~~~~~~~~~"
15655
msgstr ""
15656
"start_commit\n"
15657
"~~~~~~~~~~~~"
15658
15659
#: en/help_topics/hooks.txt:423
15660
msgid ""
15661
"Called before a commit is performed on a tree. The start commit hook\n"
15662
"is able to change the tree before the commit takes place. start_commit\n"
15663
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
15664
"being performed on."
15665
msgstr ""
15666
"Called before a commit is performed on a tree. The start commit hook\n"
15667
"is able to change the tree before the commit takes place. start_commit\n"
15668
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
15669
"being performed on."
15670
15671
#: en/help_topics/hooks.txt:428
15672
msgid ""
15673
"SmartClientHooks\n"
15674
"----------------"
15675
msgstr ""
15676
"SmartClientHooks\n"
15677
"----------------"
15678
15679
#: en/help_topics/hooks.txt:431
15680
msgid ""
15681
"call\n"
15682
"~~~~"
15683
msgstr ""
15684
"call\n"
15685
"~~~~"
15686
15687
#: en/help_topics/hooks.txt:434
15688
msgid "Introduced in: unknown"
15689
msgstr "Introduced in: unknown"
15690
15691
#: en/help_topics/hooks.txt:436
15692
msgid ""
15693
"Called when the smart client is submitting a request to the smart\n"
15694
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
15695
"Streaming request bodies, and responses, are not accessible."
15696
msgstr ""
15697
"Called when the smart client is submitting a request to the smart\n"
15698
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
15699
"Streaming request bodies, and responses, are not accessible."
15700
15701
#: en/help_topics/hooks.txt:440
15702
msgid ""
15703
"SmartServerHooks\n"
15704
"----------------"
15705
msgstr ""
15706
"SmartServerHooks\n"
15707
"----------------"
15708
15709
#: en/help_topics/hooks.txt:443
15710
msgid ""
15711
"server_exception\n"
15712
"~~~~~~~~~~~~~~~~"
15713
msgstr ""
15714
"server_exception\n"
15715
"~~~~~~~~~~~~~~~~"
15716
15717
#: en/help_topics/hooks.txt:448
15718
msgid ""
15719
"Called by the bzr server when an exception occurs. server_exception is\n"
15720
"called with the sys.exc_info() tuple return true for the hook if the\n"
15721
"exception has been handled, in which case the server will exit\n"
15722
"normally."
15723
msgstr ""
15724
"Called by the bzr server when an exception occurs. server_exception is\n"
15725
"called with the sys.exc_info() tuple return true for the hook if the\n"
15726
"exception has been handled, in which case the server will exit\n"
15727
"normally."
15728
15729
#: en/help_topics/hooks.txt:453
15730
msgid ""
15731
"server_started\n"
15732
"~~~~~~~~~~~~~~"
15733
msgstr ""
15734
"server_started\n"
15735
"~~~~~~~~~~~~~~"
15736
15737
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
15738
msgid "Introduced in: 0.16"
15739
msgstr "Introduced in: 0.16"
15740
15741
#: en/help_topics/hooks.txt:458
15742
msgid ""
15743
"Called by the bzr server when it starts serving a directory.\n"
15744
"server_started is called with (backing urls, public url), where\n"
15745
"backing_url is a list of URLs giving the server-specific directory\n"
15746
"locations, and public_url is the public URL for the directory being\n"
15747
"served."
15748
msgstr ""
15749
"Called by the bzr server when it starts serving a directory.\n"
15750
"server_started is called with (backing urls, public url), where\n"
15751
"backing_url is a list of URLs giving the server-specific directory\n"
15752
"locations, and public_url is the public URL for the directory being\n"
15753
"served."
15754
15755
#: en/help_topics/hooks.txt:464
15756
msgid ""
15757
"server_started_ex\n"
15758
"~~~~~~~~~~~~~~~~~"
15759
msgstr ""
15760
"server_started_ex\n"
15761
"~~~~~~~~~~~~~~~~~"
15762
15763
#: en/help_topics/hooks.txt:469
15764
msgid ""
15765
"Called by the bzr server when it starts serving a directory.\n"
15766
"server_started is called with (backing_urls, server_obj)."
15767
msgstr ""
15768
"Called by the bzr server when it starts serving a directory.\n"
15769
"server_started is called with (backing_urls, server_obj)."
15770
15771
#: en/help_topics/hooks.txt:472
15772
msgid ""
15773
"server_stopped\n"
15774
"~~~~~~~~~~~~~~"
15775
msgstr ""
15776
"server_stopped\n"
15777
"~~~~~~~~~~~~~~"
15778
15779
#: en/help_topics/hooks.txt:477
15780
msgid ""
15781
"Called by the bzr server when it stops serving a directory.\n"
15782
"server_stopped is called with the same parameters as the\n"
15783
"server_started hook: (backing_urls, public_url)."
15784
msgstr ""
15785
"Called by the bzr server when it stops serving a directory.\n"
15786
"server_stopped is called with the same parameters as the\n"
15787
"server_started hook: (backing_urls, public_url)."
15788
15789
#: en/help_topics/hooks.txt:481
15790
msgid ""
15791
"StatusHooks\n"
15792
"-----------"
15793
msgstr ""
15794
"StatusHooks\n"
15795
"-----------"
15796
15797
#: en/help_topics/hooks.txt:484
15798
msgid ""
15799
"post_status\n"
15800
"~~~~~~~~~~~"
15801
msgstr ""
15802
"post_status\n"
15803
"~~~~~~~~~~~"
15804
15805
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
15806
msgid "Introduced in: 2.3"
15807
msgstr "Introduced in: 2.3"
15808
15809
#: en/help_topics/hooks.txt:489
15810
msgid ""
15811
"Called with argument StatusHookParams after Bazaar has displayed the\n"
15812
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15813
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15814
"correspond to the command line options specified by the user for the\n"
15815
"status command. to_file is the output stream for writing."
15816
msgstr ""
15817
"Called with argument StatusHookParams after Bazaar has displayed the\n"
15818
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15819
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15820
"correspond to the command line options specified by the user for the\n"
15821
"status command. to_file is the output stream for writing."
15822
15823
#: en/help_topics/hooks.txt:495
15824
msgid ""
15825
"pre_status\n"
15826
"~~~~~~~~~~"
15827
msgstr ""
15828
"pre_status\n"
15829
"~~~~~~~~~~"
15830
15831
#: en/help_topics/hooks.txt:500
15832
msgid ""
15833
"Called with argument StatusHookParams before Bazaar displays the\n"
15834
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15835
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15836
"correspond to the command line options specified by the user for the\n"
15837
"status command. to_file is the output stream for writing."
15838
msgstr ""
15839
"Called with argument StatusHookParams before Bazaar displays the\n"
15840
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15841
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15842
"correspond to the command line options specified by the user for the\n"
15843
"status command. to_file is the output stream for writing."
15844
15845
#: en/help_topics/hooks.txt:506
15846
msgid ""
15847
"TransportHooks\n"
15848
"--------------"
15849
msgstr ""
15850
"TransportHooks\n"
15851
"--------------"
15852
15853
#: en/help_topics/hooks.txt:509
15854
msgid ""
15855
"post_connect\n"
15856
"~~~~~~~~~~~~"
15857
msgstr ""
15858
"post_connect\n"
15859
"~~~~~~~~~~~~"
15860
15861
#: en/help_topics/hooks.txt:514
15862
msgid ""
15863
"Called after a new connection is established or a reconnect occurs.\n"
15864
"The sole argument passed is either the connected transport or smart\n"
15865
"medium instance."
15866
msgstr ""
15867
"Called after a new connection is established or a reconnect occurs.\n"
15868
"The sole argument passed is either the connected transport or smart\n"
15869
"medium instance."
15870
15871
#: en/help_topics/hooks.txt:518
15872
msgid ""
15873
"RioVersionInfoBuilderHooks\n"
15874
"--------------------------"
15875
msgstr ""
15876
"RioVersionInfoBuilderHooks\n"
15877
"--------------------------"
15878
15879
#: en/help_topics/hooks.txt:521
15880
msgid ""
15881
"revision\n"
15882
"~~~~~~~~"
15883
msgstr ""
15884
"revision\n"
15885
"~~~~~~~~"
15886
15887
#: en/help_topics/hooks.txt:526
15888
msgid ""
15889
"Invoked when adding information about a revision to the RIO stanza\n"
15890
"that is printed. revision is called with a revision object and a RIO\n"
15891
"stanza.\n"
15892
msgstr ""
15893
"Invoked when adding information about a revision to the RIO stanza\n"
15894
"that is printed. revision is called with a revision object and a RIO\n"
15895
"stanza.\n"
15896
15897
#: en/help_topics/location-alias.txt:1
15898
msgid ""
15899
"Location aliases\n"
15900
"================"
15901
msgstr ""
15902
"Location aliases\n"
15903
"================"
15904
15905
#: en/help_topics/location-alias.txt:4
15906
msgid ""
15907
"Bazaar defines several aliases for locations associated with a branch. "
15908
"These\n"
15909
"can be used with most commands that expect a location, such as `bzr push`."
15910
msgstr ""
15911
"Bazaar defines several aliases for locations associated with a branch. "
15912
"These\n"
15913
"can be used with most commands that expect a location, such as `bzr push`."
15914
15915
#: en/help_topics/location-alias.txt:7
15916
msgid "The aliases are::"
15917
msgstr "The aliases are::"
15918
15919
#: en/help_topics/location-alias.txt:9
15920
msgid ""
15921
" :bound The branch this branch is bound to, for bound branches.\n"
15922
" :parent The parent of this branch.\n"
15923
" :public The public location of this branch.\n"
15924
" :push The saved location used for `bzr push` with no arguments.\n"
15925
" :submit The submit branch for this branch.\n"
15926
" :this This branch."
15927
msgstr ""
15928
" :bound The branch this branch is bound to, for bound branches.\n"
15929
" :parent The parent of this branch.\n"
15930
" :public The public location of this branch.\n"
15931
" :push The saved location used for `bzr push` with no arguments.\n"
15932
" :submit The submit branch for this branch.\n"
15933
" :this This branch."
15934
15935
#: en/help_topics/location-alias.txt:16
15936
msgid "For example, to push to the parent location::"
15937
msgstr "For example, to push to the parent location::"
15938
15939
#: en/help_topics/location-alias.txt:18
15940
msgid " bzr push :parent\n"
15941
msgstr " bzr push :parent\n"
15942
15943
#: en/help_topics/log-formats.txt:1
15944
msgid ""
15945
"Log Formats\n"
15946
"==========="
15947
msgstr ""
15948
"Log Formats\n"
15949
"==========="
15950
15951
#: en/help_topics/log-formats.txt:4
15952
msgid ""
15953
"A log format controls how information about each revision is displayed.\n"
15954
"The standard log formats are compared below::"
15955
msgstr ""
15956
"A log format controls how information about each revision is displayed.\n"
15957
"The standard log formats are compared below::"
15958
15959
#: en/help_topics/log-formats.txt:7
15960
msgid ""
15961
" Feature long short line\n"
15962
" ---------------------- ------------- ------------ -------------------\n"
15963
" design goal detailed view concise view 1 revision per line\n"
15964
" committer name+email name only name only\n"
15965
" author name+email - -\n"
15966
" date-time format full date only date only\n"
15967
" commit message full full top line\n"
15968
" tags yes yes yes\n"
15969
" merges indicator - yes -\n"
15970
" status/delta optional optional -\n"
15971
" diff/patch optional optional -\n"
15972
" revision-id optional optional -\n"
15973
" branch nick yes - -\n"
15974
" foreign vcs properties yes yes -\n"
15975
" preferred levels all 1 1\n"
15976
" digital signature optional - -"
15977
msgstr ""
15978
" Feature long short line\n"
15979
" ---------------------- ------------- ------------ -------------------\n"
15980
" design goal detailed view concise view 1 revision per line\n"
15981
" committer name+email name only name only\n"
15982
" author name+email - -\n"
15983
" date-time format full date only date only\n"
15984
" commit message full full top line\n"
15985
" tags yes yes yes\n"
15986
" merges indicator - yes -\n"
15987
" status/delta optional optional -\n"
15988
" diff/patch optional optional -\n"
15989
" revision-id optional optional -\n"
15990
" branch nick yes - -\n"
15991
" foreign vcs properties yes yes -\n"
15992
" preferred levels all 1 1\n"
15993
" digital signature optional - -"
15994
15995
#: en/help_topics/log-formats.txt:24
15996
msgid ""
15997
"The default format is ``long``. To change this, define the ``log_format``\n"
15998
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
15999
msgstr ""
16000
"The default format is ``long``. To change this, define the ``log_format``\n"
16001
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
16002
16003
#: en/help_topics/log-formats.txt:27
16004
msgid ""
16005
" [DEFAULT]\n"
16006
" log_format = short"
16007
msgstr ""
16008
" [DEFAULT]\n"
16009
" log_format = short"
16010
16011
#: en/help_topics/log-formats.txt:30
16012
msgid ""
16013
"Alternatively, to change the log format used for a given query, use the\n"
16014
"--long, --short or --line options."
16015
msgstr ""
16016
"Alternatively, to change the log format used for a given query, use the\n"
16017
"--long, --short or --line options."
16018
16019
#: en/help_topics/log-formats.txt:33
16020
msgid ""
16021
"If one of the standard log formats does not meet your needs, additional\n"
16022
"formats can be provided by plugins.\n"
16023
msgstr ""
16024
"If one of the standard log formats does not meet your needs, additional\n"
16025
"formats can be provided by plugins.\n"
16026
16027
#: en/help_topics/other-formats.txt:1
16028
msgid "Other Storage Formats"
16029
msgstr "Other Storage Formats"
16030
16031
#: en/help_topics/other-formats.txt:3
16032
msgid "Experimental formats are shown below."
16033
msgstr "Experimental formats are shown below."
16034
16035
#: en/help_topics/other-formats.txt:5
16036
msgid ""
16037
":development-colo:\n"
16038
" (native) The 2a format with experimental support for colocated\n"
16039
" branches."
16040
msgstr ""
16041
":development-colo:\n"
16042
" (native) The 2a format with experimental support for colocated\n"
16043
" branches."
16044
16045
#: en/help_topics/other-formats.txt:9
16046
msgid ""
16047
"\n"
16048
"Deprecated formats are shown below."
16049
msgstr ""
16050
"\n"
16051
"Deprecated formats are shown below."
16052
16053
#: en/help_topics/other-formats.txt:12
16054
msgid ""
16055
":pack-0.92:\n"
16056
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
16057
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
16058
" by bzr < 0.92."
16059
msgstr ""
16060
":pack-0.92:\n"
16061
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
16062
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
16063
" by bzr < 0.92."
16064
16065
#: en/help_topics/patterns.txt:1
16066
msgid ""
16067
"Patterns\n"
16068
"========"
16069
msgstr ""
16070
"Patterns\n"
16071
"========"
16072
16073
#: en/help_topics/patterns.txt:4
16074
msgid ""
16075
"Bazaar uses patterns to match files at various times. For example,\n"
16076
"the ``add`` command skips over files that match ignore patterns\n"
16077
"and preferences can be associated with files using rule patterns.\n"
16078
"The pattern syntax is described below."
16079
msgstr ""
16080
"Bazaar uses patterns to match files at various times. For example,\n"
16081
"the ``add`` command skips over files that match ignore patterns\n"
16082
"and preferences can be associated with files using rule patterns.\n"
16083
"The pattern syntax is described below."
16084
16085
#: en/help_topics/patterns.txt:9
16086
msgid ""
16087
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
16088
"slash or is a regular expression, it is compared to the whole path\n"
16089
"from the branch root. Otherwise, it is compared to only the last\n"
16090
"component of the path. To match a file only in the root directory,\n"
16091
"prepend ``./``. Patterns specifying absolute paths are not allowed."
16092
msgstr ""
16093
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
16094
"slash or is a regular expression, it is compared to the whole path\n"
16095
"from the branch root. Otherwise, it is compared to only the last\n"
16096
"component of the path. To match a file only in the root directory,\n"
16097
"prepend ``./``. Patterns specifying absolute paths are not allowed."
16098
16099
#: en/help_topics/patterns.txt:15
16100
msgid "Patterns may include globbing wildcards such as::"
16101
msgstr "Patterns may include globbing wildcards such as::"
16102
16103
#: en/help_topics/patterns.txt:17
16104
msgid ""
16105
" ? - Matches any single character except '/'\n"
16106
" * - Matches 0 or more characters except '/'\n"
16107
" /**/ - Matches 0 or more directories in a path\n"
16108
" [a-z] - Matches a single character from within a group of characters"
16109
msgstr ""
16110
" ? - Matches any single character except '/'\n"
16111
" * - Matches 0 or more characters except '/'\n"
16112
" /**/ - Matches 0 or more directories in a path\n"
16113
" [a-z] - Matches a single character from within a group of characters"
16114
16115
#: en/help_topics/patterns.txt:22
16116
msgid ""
16117
"Patterns may also be `Python regular expressions`_. Regular expression\n"
16118
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
16119
"expression. Regular expression patterns may not include named or\n"
16120
"numbered groups."
16121
msgstr ""
16122
"Patterns may also be `Python regular expressions`_. Regular expression\n"
16123
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
16124
"expression. Regular expression patterns may not include named or\n"
16125
"numbered groups."
16126
16127
#: en/help_topics/patterns.txt:27
16128
msgid ""
16129
"Case insensitive ignore patterns can be specified with regular expressions\n"
16130
"by using the ``i`` (for ignore case) flag in the pattern."
16131
msgstr ""
16132
"Case insensitive ignore patterns can be specified with regular expressions\n"
16133
"by using the ``i`` (for ignore case) flag in the pattern."
16134
16135
#: en/help_topics/patterns.txt:30
16136
msgid ""
16137
"For example, a case insensitive match for ``foo`` may be specified as::"
16138
msgstr ""
16139
"For example, a case insensitive match for ``foo`` may be specified as::"
16140
16141
#: en/help_topics/patterns.txt:32
16142
msgid " RE:(?i)foo"
16143
msgstr " RE:(?i)foo"
16144
16145
#: en/help_topics/patterns.txt:34
16146
msgid ""
16147
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
16148
"matched by that pattern will not be ignored."
16149
msgstr ""
16150
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
16151
"matched by that pattern will not be ignored."
16152
16153
#: en/help_topics/patterns.txt:37
16154
msgid ""
16155
".. _Python regular expressions: http://docs.python.org/library/re.html"
16156
msgstr ""
16157
".. _Python regular expressions: http://docs.python.org/library/re.html"
16158
16159
#: en/help_topics/revisionspec.txt:1
16160
msgid "Revision Identifiers"
16161
msgstr "Revision Identifiers"
16162
16163
#: en/help_topics/revisionspec.txt:3
16164
msgid ""
16165
"A revision identifier refers to a specific state of a branch's history. It\n"
16166
"can be expressed in several ways. It can begin with a keyword to\n"
16167
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
16168
"'before:yesterday' and 'submit:'."
16169
msgstr ""
16170
"A revision identifier refers to a specific state of a branch's history. It\n"
16171
"can be expressed in several ways. It can begin with a keyword to\n"
16172
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
16173
"'before:yesterday' and 'submit:'."
16174
16175
#: en/help_topics/revisionspec.txt:8
16176
msgid ""
16177
"Alternately, it can be given without a keyword, in which case it will be\n"
16178
"checked as a revision number, a tag, a revision id, a date specification, or "
16179
"a\n"
16180
"branch specification, in that order. For example, 'date:today' could be\n"
16181
"written as simply 'today', though if you have a tag called 'today' that "
16182
"will\n"
16183
"be found first."
16184
msgstr ""
16185
"Alternately, it can be given without a keyword, in which case it will be\n"
16186
"checked as a revision number, a tag, a revision id, a date specification, or "
16187
"a\n"
16188
"branch specification, in that order. For example, 'date:today' could be\n"
16189
"written as simply 'today', though if you have a tag called 'today' that "
16190
"will\n"
16191
"be found first."
16192
16193
#: en/help_topics/revisionspec.txt:14
16194
msgid ""
16195
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
16196
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
16197
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
16198
"or\n"
16199
"spaces around the '..')."
16200
msgstr ""
16201
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
16202
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
16203
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
16204
"or\n"
16205
"spaces around the '..')."
16206
16207
#: en/help_topics/revisionspec.txt:19
16208
msgid ""
16209
"Ranges are interpreted differently by different commands. To the \"log\" "
16210
"command,\n"
16211
"a range is a sequence of log messages, but to the \"diff\" command, the "
16212
"range\n"
16213
"denotes a change between revisions (and not a sequence of changes). In\n"
16214
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
16215
"consider it\n"
16216
"to be open-ended, that is, they include one end but not the other. For "
16217
"example:\n"
16218
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
16219
"3649,\n"
16220
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
16221
"and\n"
16222
"3649, but not 3647."
16223
msgstr ""
16224
"Ranges are interpreted differently by different commands. To the \"log\" "
16225
"command,\n"
16226
"a range is a sequence of log messages, but to the \"diff\" command, the "
16227
"range\n"
16228
"denotes a change between revisions (and not a sequence of changes). In\n"
16229
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
16230
"consider it\n"
16231
"to be open-ended, that is, they include one end but not the other. For "
16232
"example:\n"
16233
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
16234
"3649,\n"
16235
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
16236
"and\n"
16237
"3649, but not 3647."
16238
16239
#: en/help_topics/revisionspec.txt:28
16240
msgid "The keywords used as revision selection methods are the following:"
16241
msgstr "The keywords used as revision selection methods are the following:"
16242
16243
#: en/help_topics/revisionspec.txt:30
16244
msgid ""
16245
":revid:\n"
16246
"\tSelects a revision using the revision id.\n"
16247
":submit:\n"
16248
"\tSelects a common ancestor with the submit branch.\n"
16249
":ancestor:\n"
16250
"\tSelects a common ancestor with a second branch.\n"
16251
":date:\n"
16252
"\tSelects a revision on the basis of a datestamp.\n"
16253
":branch:\n"
16254
"\tSelects the last revision of a specified branch.\n"
16255
":tag:\n"
16256
"\tSelects a revision identified by a tag name.\n"
16257
":revno:\n"
16258
"\tSelects a revision using a number.\n"
16259
":before:\n"
16260
"\tSelects the parent of the revision specified.\n"
16261
":annotate:\n"
16262
"\tSelect the revision that last modified the specified line.\n"
16263
":mainline:\n"
16264
"\tSelect mainline revision that merged the specified revision.\n"
16265
":last:\n"
16266
"\tSelects the nth revision from the end."
16267
msgstr ""
16268
":revid:\n"
16269
"\tSelects a revision using the revision id.\n"
16270
":submit:\n"
16271
"\tSelects a common ancestor with the submit branch.\n"
16272
":ancestor:\n"
16273
"\tSelects a common ancestor with a second branch.\n"
16274
":date:\n"
16275
"\tSelects a revision on the basis of a datestamp.\n"
16276
":branch:\n"
16277
"\tSelects the last revision of a specified branch.\n"
16278
":tag:\n"
16279
"\tSelects a revision identified by a tag name.\n"
16280
":revno:\n"
16281
"\tSelects a revision using a number.\n"
16282
":before:\n"
16283
"\tSelects the parent of the revision specified.\n"
16284
":annotate:\n"
16285
"\tSelect the revision that last modified the specified line.\n"
16286
":mainline:\n"
16287
"\tSelect mainline revision that merged the specified revision.\n"
16288
":last:\n"
16289
"\tSelects the nth revision from the end."
16290
16291
#: en/help_topics/revisionspec.txt:53
16292
msgid "In addition, plugins can provide other keywords."
16293
msgstr "In addition, plugins can provide other keywords."
16294
16295
#: en/help_topics/revisionspec.txt:55
16296
msgid "A detailed description of each keyword is given below."
16297
msgstr "A detailed description of each keyword is given below."
16298
16299
#: en/help_topics/revisionspec.txt:57
16300
msgid ":revid:"
16301
msgstr ":revid:"
16302
16303
#: en/help_topics/revisionspec.txt:59
16304
msgid ""
16305
" Supply a specific revision id, that can be used to specify any\n"
16306
" revision id in the ancestry of the branch.\n"
16307
" Including merges, and pending merges.\n"
16308
" Examples::"
16309
msgstr ""
16310
" Supply a specific revision id, that can be used to specify any\n"
16311
" revision id in the ancestry of the branch.\n"
16312
" Including merges, and pending merges.\n"
16313
" Examples::"
16314
16315
#: en/help_topics/revisionspec.txt:64
16316
msgid ""
16317
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
16318
msgstr ""
16319
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
16320
16321
#: en/help_topics/revisionspec.txt:66
16322
msgid ":submit:"
16323
msgstr ":submit:"
16324
16325
#: en/help_topics/revisionspec.txt:68
16326
msgid ""
16327
" Diffing against this shows all the changes that were made in this "
16328
"branch,\n"
16329
" and is a good predictor of what merge will do. The submit branch is\n"
16330
" used by the bundle and merge directive commands. If no submit branch\n"
16331
" is specified, the parent branch is used instead."
16332
msgstr ""
16333
" Diffing against this shows all the changes that were made in this "
16334
"branch,\n"
16335
" and is a good predictor of what merge will do. The submit branch is\n"
16336
" used by the bundle and merge directive commands. If no submit branch\n"
16337
" is specified, the parent branch is used instead."
16338
16339
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
16340
msgid ""
16341
" The common ancestor is the last revision that existed in both\n"
16342
" branches. Usually this is the branch point, but it could also be\n"
16343
" a revision that was merged."
16344
msgstr ""
16345
" The common ancestor is the last revision that existed in both\n"
16346
" branches. Usually this is the branch point, but it could also be\n"
16347
" a revision that was merged."
16348
16349
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
16350
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
16351
#: en/help_topics/revisionspec.txt:153
16352
msgid " Examples::"
16353
msgstr " Examples::"
16354
16355
#: en/help_topics/revisionspec.txt:79
16356
msgid " $ bzr diff -r submit:"
16357
msgstr " $ bzr diff -r submit:"
16358
16359
#: en/help_topics/revisionspec.txt:81
16360
msgid ":ancestor:"
16361
msgstr ":ancestor:"
16362
16363
#: en/help_topics/revisionspec.txt:83
16364
msgid " Supply the path to a branch to select the common ancestor."
16365
msgstr " Supply the path to a branch to select the common ancestor."
16366
16367
#: en/help_topics/revisionspec.txt:89
16368
msgid ""
16369
" This is frequently used with 'diff' to return all of the changes\n"
16370
" that your branch introduces, while excluding the changes that you\n"
16371
" have not merged from the remote branch."
16372
msgstr ""
16373
" This is frequently used with 'diff' to return all of the changes\n"
16374
" that your branch introduces, while excluding the changes that you\n"
16375
" have not merged from the remote branch."
16376
16377
#: en/help_topics/revisionspec.txt:95
16378
msgid ""
16379
" ancestor:/path/to/branch\n"
16380
" $ bzr diff -r ancestor:../../mainline/branch"
16381
msgstr ""
16382
" ancestor:/path/to/branch\n"
16383
" $ bzr diff -r ancestor:../../mainline/branch"
16384
16385
#: en/help_topics/revisionspec.txt:98
16386
msgid ":date:"
16387
msgstr ":date:"
16388
16389
#: en/help_topics/revisionspec.txt:100
16390
msgid ""
16391
" Supply a datestamp to select the first revision that matches the date.\n"
16392
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
16393
" Matches the first entry after a given date (either at midnight or\n"
16394
" at a specified time)."
16395
msgstr ""
16396
" Supply a datestamp to select the first revision that matches the date.\n"
16397
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
16398
" Matches the first entry after a given date (either at midnight or\n"
16399
" at a specified time)."
16400
16401
#: en/help_topics/revisionspec.txt:105
16402
msgid " One way to display all the changes since yesterday would be::"
16403
msgstr " One way to display all the changes since yesterday would be::"
16404
16405
#: en/help_topics/revisionspec.txt:107
16406
msgid " bzr log -r date:yesterday.."
16407
msgstr " bzr log -r date:yesterday.."
16408
16409
#: en/help_topics/revisionspec.txt:111
16410
msgid ""
16411
" date:yesterday -> select the first revision since "
16412
"yesterday\n"
16413
" date:2006-08-14,17:10:14 -> select the first revision after\n"
16414
" August 14th, 2006 at 5:10pm."
16415
msgstr ""
16416
" date:yesterday -> select the first revision since "
16417
"yesterday\n"
16418
" date:2006-08-14,17:10:14 -> select the first revision after\n"
16419
" August 14th, 2006 at 5:10pm."
16420
16421
#: en/help_topics/revisionspec.txt:115
16422
msgid ":branch:"
16423
msgstr ":branch:"
16424
16425
#: en/help_topics/revisionspec.txt:117
16426
msgid " Supply the path to a branch to select its last revision."
16427
msgstr " Supply the path to a branch to select its last revision."
16428
16429
#: en/help_topics/revisionspec.txt:121
16430
msgid " branch:/path/to/branch"
16431
msgstr " branch:/path/to/branch"
16432
16433
#: en/help_topics/revisionspec.txt:123
16434
msgid ":tag:"
16435
msgstr ":tag:"
16436
16437
#: en/help_topics/revisionspec.txt:125
16438
msgid " Tags are stored in the branch and created by the 'tag' command."
16439
msgstr " Tags are stored in the branch and created by the 'tag' command."
16440
16441
#: en/help_topics/revisionspec.txt:127
16442
msgid ":revno:"
16443
msgstr ":revno:"
16444
16445
#: en/help_topics/revisionspec.txt:129
16446
msgid ""
16447
" Use an integer to specify a revision in the history of the branch.\n"
16448
" Optionally a branch can be specified. A negative number will count\n"
16449
" from the end of the branch (-1 is the last revision, -2 the previous\n"
16450
" one). If the negative number is larger than the branch's history, the\n"
16451
" first revision is returned.\n"
16452
" Examples::"
16453
msgstr ""
16454
" Use an integer to specify a revision in the history of the branch.\n"
16455
" Optionally a branch can be specified. A negative number will count\n"
16456
" from the end of the branch (-1 is the last revision, -2 the previous\n"
16457
" one). If the negative number is larger than the branch's history, the\n"
16458
" first revision is returned.\n"
16459
" Examples::"
16460
16461
#: en/help_topics/revisionspec.txt:136
16462
msgid ""
16463
" revno:1 -> return the first revision of this branch\n"
16464
" revno:3:/path/to/branch -> return the 3rd revision of\n"
16465
" the branch '/path/to/branch'\n"
16466
" revno:-1 -> The last revision in a branch.\n"
16467
" -2:http://other/branch -> The second to last revision in the\n"
16468
" remote branch.\n"
16469
" -1000000 -> Most likely the first revision, unless\n"
16470
" your history is very long."
16471
msgstr ""
16472
" revno:1 -> return the first revision of this branch\n"
16473
" revno:3:/path/to/branch -> return the 3rd revision of\n"
16474
" the branch '/path/to/branch'\n"
16475
" revno:-1 -> The last revision in a branch.\n"
16476
" -2:http://other/branch -> The second to last revision in the\n"
16477
" remote branch.\n"
16478
" -1000000 -> Most likely the first revision, unless\n"
16479
" your history is very long."
16480
16481
#: en/help_topics/revisionspec.txt:145
16482
msgid ":before:"
16483
msgstr ":before:"
16484
16485
#: en/help_topics/revisionspec.txt:147
16486
msgid ""
16487
" Supply any revision spec to return the parent of that revision. This "
16488
"is\n"
16489
" mostly useful when inspecting revisions that are not in the revision "
16490
"history\n"
16491
" of a branch."
16492
msgstr ""
16493
" Supply any revision spec to return the parent of that revision. This "
16494
"is\n"
16495
" mostly useful when inspecting revisions that are not in the revision "
16496
"history\n"
16497
" of a branch."
16498
16499
#: en/help_topics/revisionspec.txt:151
16500
msgid ""
16501
" It is an error to request the parent of the null revision (before:0)."
16502
msgstr ""
16503
" It is an error to request the parent of the null revision (before:0)."
16504
16505
#: en/help_topics/revisionspec.txt:155
16506
msgid ""
16507
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
16508
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
16509
" aaaa@bbbb-1234567890\n"
16510
" bzr diff -r before:1913..1913\n"
16511
" -> Find the changes between revision 1913 and its parent "
16512
"(1912).\n"
16513
" (What changes did revision 1913 introduce).\n"
16514
" This is equivalent to: bzr diff -c 1913"
16515
msgstr ""
16516
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
16517
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
16518
" aaaa@bbbb-1234567890\n"
16519
" bzr diff -r before:1913..1913\n"
16520
" -> Find the changes between revision 1913 and its parent "
16521
"(1912).\n"
16522
" (What changes did revision 1913 introduce).\n"
16523
" This is equivalent to: bzr diff -c 1913"
16524
16525
#: en/help_topics/revisionspec.txt:163
16526
msgid ":annotate:"
16527
msgstr ":annotate:"
16528
16529
#: en/help_topics/revisionspec.txt:165
16530
msgid ""
16531
" Select the revision that last modified the specified line. Line is\n"
16532
" specified as path:number. Path is a relative path to the file. "
16533
"Numbers\n"
16534
" start at 1, and are relative to the current version, not the last-\n"
16535
" committed version of the file."
16536
msgstr ""
16537
" Select the revision that last modified the specified line. Line is\n"
16538
" specified as path:number. Path is a relative path to the file. "
16539
"Numbers\n"
16540
" start at 1, and are relative to the current version, not the last-\n"
16541
" committed version of the file."
16542
16543
#: en/help_topics/revisionspec.txt:170
16544
msgid ":mainline:"
16545
msgstr ":mainline:"
16546
16547
#: en/help_topics/revisionspec.txt:172
16548
msgid ""
16549
" Select the revision that merged the specified revision into mainline."
16550
msgstr ""
16551
" Select the revision that merged the specified revision into mainline."
16552
16553
#: en/help_topics/revisionspec.txt:174
16554
msgid ":last:"
16555
msgstr ":last:"
16556
16557
#: en/help_topics/revisionspec.txt:176
16558
msgid ""
16559
" Supply a positive number to get the nth revision from the end.\n"
16560
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
16561
" Examples::"
16562
msgstr ""
16563
" Supply a positive number to get the nth revision from the end.\n"
16564
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
16565
" Examples::"
16566
16567
#: en/help_topics/revisionspec.txt:180
16568
msgid ""
16569
" last:1 -> return the last revision\n"
16570
" last:3 -> return the revision 2 before the end.\n"
16571
msgstr ""
16572
" last:1 -> return the last revision\n"
16573
" last:3 -> return the revision 2 before the end.\n"
16574
16575
#: en/help_topics/rules.txt:1
16576
msgid ""
16577
"Rules\n"
16578
"====="
16579
msgstr ""
16580
"Rules\n"
16581
"====="
16582
16583
#: en/help_topics/rules.txt:7
16584
msgid ""
16585
"Rules are defined in ini file format where the sections are file glob\n"
16586
"patterns and the contents of each section are the preferences for files\n"
16587
"matching that pattern(s). For example::"
16588
msgstr ""
16589
"Rules are defined in ini file format where the sections are file glob\n"
16590
"patterns and the contents of each section are the preferences for files\n"
16591
"matching that pattern(s). For example::"
16592
16593
#: en/help_topics/rules.txt:11
16594
msgid ""
16595
" [name *.bat]\n"
16596
" eol = native"
16597
msgstr ""
16598
" [name *.bat]\n"
16599
" eol = native"
16600
16601
#: en/help_topics/rules.txt:14
16602
msgid ""
16603
" [name *.html *.xml]\n"
16604
" keywords = xml_escape"
16605
msgstr ""
16606
" [name *.html *.xml]\n"
16607
" keywords = xml_escape"
16608
16609
#: en/help_topics/rules.txt:17
16610
msgid ""
16611
"Preferences like these are useful for commands and plugins wishing to\n"
16612
"provide custom behaviour for selected files. For more information on \n"
16613
"end of line conversion see :doc:`eol-help`.\n"
16614
"Keyword support is provided by the `keywords plugin\n"
16615
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
16616
msgstr ""
16617
"Preferences like these are useful for commands and plugins wishing to\n"
16618
"provide custom behaviour for selected files. For more information on \n"
16619
"end of line conversion see :doc:`eol-help`.\n"
16620
"Keyword support is provided by the `keywords plugin\n"
16621
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
16622
16623
#: en/help_topics/rules.txt:23
16624
msgid ""
16625
"Files\n"
16626
"-----"
16627
msgstr ""
16628
"Files\n"
16629
"-----"
16630
16631
#: en/help_topics/rules.txt:26
16632
msgid ""
16633
"Default rules for all branches are defined in the optional file\n"
16634
"``BZR_HOME/rules``. "
16635
msgstr ""
16636
"Default rules for all branches are defined in the optional file\n"
16637
"``BZR_HOME/rules``. "
16638
16639
#: en/help_topics/rules.txt:29
16640
msgid ""
16641
"Rule Patterns\n"
16642
"-------------"
16643
msgstr ""
16644
"Rule Patterns\n"
16645
"-------------"
16646
16647
#: en/help_topics/rules.txt:32
16648
msgid ""
16649
"Patterns are ordered and searching stops as soon as one matches.\n"
16650
"As a consequence, more explicit patterns should be placed towards\n"
16651
"the top of the file. Rule patterns use exactly the same conventions\n"
16652
"as ignore patterns. See :doc:`patterns-help` for details."
16653
msgstr ""
16654
"Patterns are ordered and searching stops as soon as one matches.\n"
16655
"As a consequence, more explicit patterns should be placed towards\n"
16656
"the top of the file. Rule patterns use exactly the same conventions\n"
16657
"as ignore patterns. See :doc:`patterns-help` for details."
16658
16659
#: en/help_topics/rules.txt:37
16660
msgid ".. note::"
16661
msgstr ".. note::"
16662
16663
#: en/help_topics/rules.txt:39
16664
msgid ""
16665
" Patterns containing square brackets or spaces should be\n"
16666
" surrounded in quotes to ensure they are correctly parsed.\n"
16667
msgstr ""
16668
" Patterns containing square brackets or spaces should be\n"
16669
" surrounded in quotes to ensure they are correctly parsed.\n"
16670
16671
#: en/help_topics/topics.txt:1
16672
msgid ""
16673
"authentication Information on configuring authentication\n"
16674
"basic Basic commands\n"
16675
"branches Information on what a branch is\n"
16676
"bugs Bug tracker settings\n"
16677
"checkouts Information on what a checkout is\n"
16678
"commands Basic help for all commands\n"
16679
"configuration Details on the configuration settings available\n"
16680
"conflict-types Types of conflicts and what to do about them\n"
16681
"content-filters Conversion of content into/from working trees\n"
16682
"criss-cross Information on criss-cross merging\n"
16683
"current-formats Current storage formats\n"
16684
"debug-flags Options to show or record debug information\n"
16685
"diverged-branches How to fix diverged branches\n"
16686
"env-variables Environment variable names and values\n"
16687
"eol Information on end-of-line handling\n"
16688
"files Information on configuration and log files\n"
16689
"formats Information on choosing a storage format\n"
16690
"global-options Options that control how Bazaar runs\n"
16691
"hidden-commands All hidden commands\n"
16692
"hooks Points at which custom processing can be added\n"
16693
"launchpad Using Bazaar with Launchpad.net\n"
16694
"location-alias Aliases for remembered locations\n"
16695
"log-formats Details on the logging formats available\n"
16696
"other-formats Experimental and deprecated storage formats\n"
16697
"patterns Information on the pattern syntax\n"
16698
"repositories Basic information on shared repositories.\n"
16699
"revisionspec Explain how to use --revision\n"
16700
"rules Information on defining rule-based preferences\n"
16701
"standalone-trees Information on what a standalone tree is\n"
16702
"standard-options Options that can be used with any command\n"
16703
"status-flags Help on status flags\n"
16704
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
16705
"topics Topics list\n"
16706
"url-special-chars Special character handling in URLs\n"
16707
"urlspec Supported transport protocols\n"
16708
"working-trees Information on working trees\n"
16709
msgstr ""
16710
"authentication Information on configuring authentication\n"
16711
"basic Basic commands\n"
16712
"branches Information on what a branch is\n"
16713
"bugs Bug tracker settings\n"
16714
"checkouts Information on what a checkout is\n"
16715
"commands Basic help for all commands\n"
16716
"configuration Details on the configuration settings available\n"
16717
"conflict-types Types of conflicts and what to do about them\n"
16718
"content-filters Conversion of content into/from working trees\n"
16719
"criss-cross Information on criss-cross merging\n"
16720
"current-formats Current storage formats\n"
16721
"debug-flags Options to show or record debug information\n"
16722
"diverged-branches How to fix diverged branches\n"
16723
"env-variables Environment variable names and values\n"
16724
"eol Information on end-of-line handling\n"
16725
"files Information on configuration and log files\n"
16726
"formats Information on choosing a storage format\n"
16727
"global-options Options that control how Bazaar runs\n"
16728
"hidden-commands All hidden commands\n"
16729
"hooks Points at which custom processing can be added\n"
16730
"launchpad Using Bazaar with Launchpad.net\n"
16731
"location-alias Aliases for remembered locations\n"
16732
"log-formats Details on the logging formats available\n"
16733
"other-formats Experimental and deprecated storage formats\n"
16734
"patterns Information on the pattern syntax\n"
16735
"repositories Basic information on shared repositories.\n"
16736
"revisionspec Explain how to use --revision\n"
16737
"rules Information on defining rule-based preferences\n"
16738
"standalone-trees Information on what a standalone tree is\n"
16739
"standard-options Options that can be used with any command\n"
16740
"status-flags Help on status flags\n"
16741
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
16742
"topics Topics list\n"
16743
"url-special-chars Special character handling in URLs\n"
16744
"urlspec Supported transport protocols\n"
16745
"working-trees Information on working trees\n"
16746
16747
#: en/help_topics/url-special-chars.txt:1
16748
msgid ""
16749
"Special character handling in URLs\n"
16750
"=================================="
16751
msgstr ""
16752
"Special character handling in URLs\n"
16753
"=================================="
16754
16755
#: en/help_topics/url-special-chars.txt:4
16756
msgid "Bazaar allows locations to be specified in multiple ways, either:"
16757
msgstr "Bazaar allows locations to be specified in multiple ways, either:"
16758
16759
#: en/help_topics/url-special-chars.txt:6
16760
msgid " * Fully qualified URLs"
16761
msgstr " * Fully qualified URLs"
16762
16763
#: en/help_topics/url-special-chars.txt:8
16764
msgid " * File system paths, relative or absolute"
16765
msgstr " * File system paths, relative or absolute"
16766
16767
#: en/help_topics/url-special-chars.txt:10
16768
msgid ""
16769
"Internally bzr treats all locations as URLs. For any file system paths\n"
16770
"that are specified it will automatically determine the appropriate URL\n"
16771
"representation, and escape special characters where necessary."
16772
msgstr ""
16773
"Internally bzr treats all locations as URLs. For any file system paths\n"
16774
"that are specified it will automatically determine the appropriate URL\n"
16775
"representation, and escape special characters where necessary."
16776
16777
#: en/help_topics/url-special-chars.txt:14
16778
msgid ""
16779
"There are a few characters which have special meaning in URLs and need "
16780
"careful\n"
16781
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
16782
"value in URLs. Any non-ASCII characters in a file path will automatically "
16783
"be\n"
16784
"urlencoded when the path is converted to a URL."
16785
msgstr ""
16786
"There are a few characters which have special meaning in URLs and need "
16787
"careful\n"
16788
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
16789
"value in URLs. Any non-ASCII characters in a file path will automatically "
16790
"be\n"
16791
"urlencoded when the path is converted to a URL."
16792
16793
#: en/help_topics/url-special-chars.txt:19
16794
msgid ""
16795
"URLs represent non-ASCII characters in an encoding defined by the server, "
16796
"but\n"
16797
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
16798
"be\n"
16799
"generous in what it accepts as a URL and to print them in a way that\n"
16800
"will be readable."
16801
msgstr ""
16802
"URLs represent non-ASCII characters in an encoding defined by the server, "
16803
"but\n"
16804
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
16805
"be\n"
16806
"generous in what it accepts as a URL and to print them in a way that\n"
16807
"will be readable."
16808
16809
#: en/help_topics/url-special-chars.txt:24
16810
msgid ""
16811
"For example, if you have a directory named '/tmp/%2False' these are all "
16812
"valid\n"
16813
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
16814
"slash)::"
16815
msgstr ""
16816
"For example, if you have a directory named '/tmp/%2False' these are all "
16817
"valid\n"
16818
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
16819
"slash)::"
16820
16821
#: en/help_topics/url-special-chars.txt:27
16822
msgid ""
16823
" cd /tmp\n"
16824
" bzr log /tmp/%2False\n"
16825
" bzr log %2False\n"
16826
" bzr log file:///tmp/%252False\n"
16827
" bzr log file://localhost/tmp/%252False\n"
16828
" bzr log file:%252False"
16829
msgstr ""
16830
" cd /tmp\n"
16831
" bzr log /tmp/%2False\n"
16832
" bzr log %2False\n"
16833
" bzr log file:///tmp/%252False\n"
16834
" bzr log file://localhost/tmp/%252False\n"
16835
" bzr log file:%252False"
16836
16837
#: en/help_topics/url-special-chars.txt:34
16838
msgid "These are valid but do not refer to the same file::"
16839
msgstr "These are valid but do not refer to the same file::"
16840
16841
#: en/help_topics/url-special-chars.txt:36
16842
msgid ""
16843
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
16844
" bzr log %252False (refers to a file called /tmp/%252False)"
16845
msgstr ""
16846
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
16847
" bzr log %252False (refers to a file called /tmp/%252False)"
16848
16849
#: en/help_topics/url-special-chars.txt:39
16850
msgid ""
16851
"Comma also has special meaning in URLs, because it denotes `segment "
16852
"parameters`_"
16853
msgstr ""
16854
"Comma also has special meaning in URLs, because it denotes `segment "
16855
"parameters`_"
16856
16857
#: en/help_topics/url-special-chars.txt:41
16858
msgid ""
16859
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
16860
msgstr ""
16861
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
16862
16863
#: en/help_topics/url-special-chars.txt:43
16864
msgid ""
16865
"Comma is also special in any file system paths that are specified. To use a "
16866
"literal\n"
16867
"comma in a file system path, specify a URL and URL encode the comma::"
16868
msgstr ""
16869
"Comma is also special in any file system paths that are specified. To use a "
16870
"literal\n"
16871
"comma in a file system path, specify a URL and URL encode the comma::"
16872
16873
#: en/help_topics/url-special-chars.txt:46
16874
msgid ""
16875
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
16876
"\"branch\" set to \"bla\"\n"
16877
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
16878
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
16879
"\"branch\" set to \"bla\"\n"
16880
msgstr ""
16881
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
16882
"\"branch\" set to \"bla\"\n"
16883
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
16884
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
16885
"\"branch\" set to \"bla\"\n"
16886
16887
#: en/help_topics/urlspec.txt:1
16888
msgid "URL Identifiers"
16889
msgstr "URL Identifiers"
16890
16891
#: en/help_topics/urlspec.txt:3
16892
msgid "Supported URL prefixes::"
16893
msgstr "Supported URL prefixes::"
16894
16895
#: en/help_topics/urlspec.txt:5
16896
msgid ""
16897
" aftp:// Access using active FTP.\n"
16898
" bzr:// Fast access using the Bazaar smart server.\n"
16899
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
16900
" file:// Access using the standard filesystem (default)\n"
16901
" ftp:// Access using passive FTP.\n"
16902
" http:// Read-only access of branches exported on the web.\n"
16903
" https:// Read-only access of branches exported on the web using "
16904
"SSL.\n"
16905
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
16906
msgstr ""
16907
" aftp:// Access using active FTP.\n"
16908
" bzr:// Fast access using the Bazaar smart server.\n"
16909
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
16910
" file:// Access using the standard filesystem (default)\n"
16911
" ftp:// Access using passive FTP.\n"
16912
" http:// Read-only access of branches exported on the web.\n"
16913
" https:// Read-only access of branches exported on the web using "
16914
"SSL.\n"
16915
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
16916
16917
#: en/help_topics/urlspec.txt:14
16918
msgid "Supported modifiers::"
16919
msgstr "Supported modifiers::"
16920
16921
#: en/help_topics/urlspec.txt:16
16922
msgid " gio+ Access using any GIO supported protocols."
16923
msgstr " gio+ Access using any GIO supported protocols."
16924
16925
#: en/help_topics/urlspec.txt:18
16926
msgid "Bazaar supports all of the standard parts within the URL::"
16927
msgstr "Bazaar supports all of the standard parts within the URL::"
16928
16929
#: en/help_topics/urlspec.txt:20
16930
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
16931
msgstr " <protocol>://[user[:password]@]host[:port]/[path]"
16932
16933
#: en/help_topics/urlspec.txt:22
16934
msgid "allowing URLs such as::"
16935
msgstr "allowing URLs such as::"
16936
16937
#: en/help_topics/urlspec.txt:24
16938
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
16939
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
16940
16941
#: en/help_topics/urlspec.txt:26
16942
msgid ""
16943
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
16944
"with '~' as meaning that the rest of the path should be interpreted\n"
16945
"relative to the remote user's home directory. For example if the user\n"
16946
"``remote`` has a home directory of ``/home/remote`` on the server\n"
16947
"shell.example.com, then::"
16948
msgstr ""
16949
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
16950
"with '~' as meaning that the rest of the path should be interpreted\n"
16951
"relative to the remote user's home directory. For example if the user\n"
16952
"``remote`` has a home directory of ``/home/remote`` on the server\n"
16953
"shell.example.com, then::"
16954
16955
#: en/help_topics/urlspec.txt:32
16956
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
16957
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
16958
16959
#: en/help_topics/urlspec.txt:34
16960
msgid "would refer to ``/home/remote/myproject/trunk``."
16961
msgstr "would refer to ``/home/remote/myproject/trunk``."
16962
16963
#: en/help_topics/urlspec.txt:36
16964
msgid ""
16965
"Many commands that accept URLs also accept location aliases too.\n"
16966
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
16967
msgstr ""
16968
"Many commands that accept URLs also accept location aliases too.\n"
16969
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
16970
16971
#~ msgid ""
16972
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
16973
#~ "delete them if they can easily be recovered using revert otherwise they\n"
16974
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
16975
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
16976
#~ "Bazaar but missing in your tree and stop tracking them for you."
16977
#~ msgstr ""
16978
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
16979
#~ "delete them if they can easily be recovered using revert otherwise they\n"
16980
#~ "will be backed up (adding an extension of the form .~#~). If no options or\n"
16981
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
16982
#~ "Bazaar but missing in your tree and stop tracking them for you."
16983
16984
#~ msgid ""
16985
#~ "If unset, the tree root directory name is used as the nickname.\n"
16986
#~ "To print the current nickname, execute with no argument."
16987
#~ msgstr ""
16988
#~ "If unset, the tree root directory name is used as the nickname.\n"
16989
#~ "To print the current nickname, execute with no argument."
16990
16991
#~ msgid ""
16992
#~ "To remove only some changes, without reverting to a prior version, use\n"
16993
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
16994
#~ "will remove the changes introduced by the second last commit (-2), without\n"
16995
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
16996
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
16997
#~ msgstr ""
16998
#~ "To remove only some changes, without reverting to a prior version, use\n"
16999
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
17000
#~ "will remove the changes introduced by the second last commit (-2), without\n"
17001
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
17002
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
17003
17004
#~ msgid ""
17005
#~ "By default, any files that have been manually changed will be backed up\n"
17006
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
17007
#~ "'.~#~' appended to their name, where # is a number."
17008
#~ msgstr ""
17009
#~ "By default, any files that have been manually changed will be backed up\n"
17010
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
17011
#~ "'.~#~' appended to their name, where # is a number."
17012
17013
#~ msgid "Revert files to a previous revision."
17014
#~ msgstr "Revert files to a previous revision."
17015
17016
#~ msgid ""
17017
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
17018
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
17019
#~ "last committed revision is used."
17020
#~ msgstr ""
17021
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
17022
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
17023
#~ "last committed revision is used."
17024
17025
#~ msgid ""
17026
#~ "Listen for connections on nominated port of the form [hostname:]portnumber. "
17027
#~ "Passing 0 as the port number will result in a dynamically allocated port. "
17028
#~ "The default port depends on the protocol."
17029
#~ msgstr ""
17030
#~ "Listen for connections on nominated port of the form [hostname:]portnumber. "
17031
#~ "Passing 0 as the port number will result in a dynamically allocated port. "
17032
#~ "The default port depends on the protocol."
17033
17034
#~ msgid "Unknown mail client: %(mail_client)s"
17035
#~ msgstr "Unknown mail client: %(mail_client)s"
17036
17037
#~ msgid ""
17038
#~ "add Add specified files or directories.\n"
17039
#~ "alias Set/unset and display aliases.\n"
17040
#~ "annotate Show the origin of each line in a file.\n"
17041
#~ "bash-completion Generate a shell function for bash command line "
17042
#~ "completion.\n"
17043
#~ " [bash_completion]\n"
17044
#~ "bind Convert the current branch into a checkout of the "
17045
#~ "supplied\n"
17046
#~ " branch.\n"
17047
#~ "branch Create a new branch that is a copy of an existing branch.\n"
17048
#~ "branches List the branches available at the current location.\n"
17049
#~ "break-lock Break a dead lock.\n"
17050
#~ "cat Write the contents of a file as of a given revision to\n"
17051
#~ " standard output.\n"
17052
#~ "check Validate working tree structure, branch consistency and\n"
17053
#~ " repository history.\n"
17054
#~ "checkout Create a new checkout of an existing branch.\n"
17055
#~ "clean-tree Remove unwanted files from working tree.\n"
17056
#~ "commit Commit changes into a new revision.\n"
17057
#~ "config Display, set or remove a configuration option.\n"
17058
#~ "conflicts List files with conflicts.\n"
17059
#~ "deleted List files deleted in the working tree.\n"
17060
#~ "diff Show differences in the working tree, between revisions "
17061
#~ "or\n"
17062
#~ " branches.\n"
17063
#~ "dpush Push into a different VCS without any custom bzr "
17064
#~ "metadata.\n"
17065
#~ "export Export current or past revision to a destination directory "
17066
#~ "or\n"
17067
#~ " archive.\n"
17068
#~ "help Show help on a command or other topic.\n"
17069
#~ "ignore Ignore specified files or patterns.\n"
17070
#~ "ignored List ignored files and the patterns that matched them.\n"
17071
#~ "info Show information about a working tree, branch or "
17072
#~ "repository.\n"
17073
#~ "init Make a directory into a versioned branch.\n"
17074
#~ "init-repository Create a shared repository for branches to share storage\n"
17075
#~ " space.\n"
17076
#~ "join Combine a tree into its containing tree.\n"
17077
#~ "launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
17078
#~ "launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
17079
#~ "launchpad-open Open a Launchpad branch page in your web browser. "
17080
#~ "[launchpad]\n"
17081
#~ "log Show historical log for a branch or subset of a branch.\n"
17082
#~ "lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
17083
#~ "lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
17084
#~ "ls List files in a tree.\n"
17085
#~ "merge Perform a three-way merge.\n"
17086
#~ "missing Show unmerged/unpulled revisions between two branches.\n"
17087
#~ "mkdir Create a new versioned directory.\n"
17088
#~ "mv Move or rename a file.\n"
17089
#~ "nick Print or set the branch nickname.\n"
17090
#~ "pack Compress the data within a repository.\n"
17091
#~ "plugins List the installed plugins.\n"
17092
#~ "pull Turn this branch into a mirror of another branch.\n"
17093
#~ "push Update a mirror of this branch.\n"
17094
#~ "reconcile Reconcile bzr metadata in a branch.\n"
17095
#~ "reconfigure Reconfigure the type of a bzr directory.\n"
17096
#~ "register-branch Register a branch with launchpad.net. [launchpad]\n"
17097
#~ "remerge Redo a merge.\n"
17098
#~ "remove Remove files or directories.\n"
17099
#~ "remove-branch Remove a branch.\n"
17100
#~ "remove-tree Remove the working tree from a given branch/checkout.\n"
17101
#~ "renames Show list of renamed files.\n"
17102
#~ "resolve Mark a conflict as resolved.\n"
17103
#~ "revert Revert files to a previous revision.\n"
17104
#~ "revno Show current revision number.\n"
17105
#~ "root Show the tree root directory.\n"
17106
#~ "send Mail or create a merge-directive for submitting changes.\n"
17107
#~ "serve Run the bzr server.\n"
17108
#~ "shelve Temporarily set aside some changes from the current tree.\n"
17109
#~ "sign-my-commits Sign all commits by a given committer.\n"
17110
#~ "split Split a subdirectory of a tree into a separate tree.\n"
17111
#~ "status Display status summary.\n"
17112
#~ "switch Set the branch of a checkout and update.\n"
17113
#~ "tag Create, remove or modify a tag naming a revision.\n"
17114
#~ "tags List tags.\n"
17115
#~ "testament Show testament (signing-form) of a revision.\n"
17116
#~ "unbind Convert the current checkout into a regular branch.\n"
17117
#~ "uncommit Remove the last committed revision.\n"
17118
#~ "unshelve Restore shelved changes.\n"
17119
#~ "update Update a working tree to a new revision.\n"
17120
#~ "upgrade Upgrade a repository, branch or working tree to a newer\n"
17121
#~ " format.\n"
17122
#~ "verify-signatures Verify all commit signatures.\n"
17123
#~ "version Show version of bzr.\n"
17124
#~ "version-info Show version information about this tree.\n"
17125
#~ "view Manage filtered views.\n"
17126
#~ "whoami Show or set bzr user id.\n"
17127
#~ msgstr ""
17128
#~ "add Add specified files or directories.\n"
17129
#~ "alias Set/unset and display aliases.\n"
17130
#~ "annotate Show the origin of each line in a file.\n"
17131
#~ "bash-completion Generate a shell function for bash command line "
17132
#~ "completion.\n"
17133
#~ " [bash_completion]\n"
17134
#~ "bind Convert the current branch into a checkout of the "
17135
#~ "supplied\n"
17136
#~ " branch.\n"
17137
#~ "branch Create a new branch that is a copy of an existing branch.\n"
17138
#~ "branches List the branches available at the current location.\n"
17139
#~ "break-lock Break a dead lock.\n"
17140
#~ "cat Write the contents of a file as of a given revision to\n"
17141
#~ " standard output.\n"
17142
#~ "check Validate working tree structure, branch consistency and\n"
17143
#~ " repository history.\n"
17144
#~ "checkout Create a new checkout of an existing branch.\n"
17145
#~ "clean-tree Remove unwanted files from working tree.\n"
17146
#~ "commit Commit changes into a new revision.\n"
17147
#~ "config Display, set or remove a configuration option.\n"
17148
#~ "conflicts List files with conflicts.\n"
17149
#~ "deleted List files deleted in the working tree.\n"
17150
#~ "diff Show differences in the working tree, between revisions "
17151
#~ "or\n"
17152
#~ " branches.\n"
17153
#~ "dpush Push into a different VCS without any custom bzr "
17154
#~ "metadata.\n"
17155
#~ "export Export current or past revision to a destination directory "
17156
#~ "or\n"
17157
#~ " archive.\n"
17158
#~ "help Show help on a command or other topic.\n"
17159
#~ "ignore Ignore specified files or patterns.\n"
17160
#~ "ignored List ignored files and the patterns that matched them.\n"
17161
#~ "info Show information about a working tree, branch or "
17162
#~ "repository.\n"
17163
#~ "init Make a directory into a versioned branch.\n"
17164
#~ "init-repository Create a shared repository for branches to share storage\n"
17165
#~ " space.\n"
17166
#~ "join Combine a tree into its containing tree.\n"
17167
#~ "launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
17168
#~ "launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
17169
#~ "launchpad-open Open a Launchpad branch page in your web browser. "
17170
#~ "[launchpad]\n"
17171
#~ "log Show historical log for a branch or subset of a branch.\n"
17172
#~ "lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
17173
#~ "lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
17174
#~ "ls List files in a tree.\n"
17175
#~ "merge Perform a three-way merge.\n"
17176
#~ "missing Show unmerged/unpulled revisions between two branches.\n"
17177
#~ "mkdir Create a new versioned directory.\n"
17178
#~ "mv Move or rename a file.\n"
17179
#~ "nick Print or set the branch nickname.\n"
17180
#~ "pack Compress the data within a repository.\n"
17181
#~ "plugins List the installed plugins.\n"
17182
#~ "pull Turn this branch into a mirror of another branch.\n"
17183
#~ "push Update a mirror of this branch.\n"
17184
#~ "reconcile Reconcile bzr metadata in a branch.\n"
17185
#~ "reconfigure Reconfigure the type of a bzr directory.\n"
17186
#~ "register-branch Register a branch with launchpad.net. [launchpad]\n"
17187
#~ "remerge Redo a merge.\n"
17188
#~ "remove Remove files or directories.\n"
17189
#~ "remove-branch Remove a branch.\n"
17190
#~ "remove-tree Remove the working tree from a given branch/checkout.\n"
17191
#~ "renames Show list of renamed files.\n"
17192
#~ "resolve Mark a conflict as resolved.\n"
17193
#~ "revert Revert files to a previous revision.\n"
17194
#~ "revno Show current revision number.\n"
17195
#~ "root Show the tree root directory.\n"
17196
#~ "send Mail or create a merge-directive for submitting changes.\n"
17197
#~ "serve Run the bzr server.\n"
17198
#~ "shelve Temporarily set aside some changes from the current tree.\n"
17199
#~ "sign-my-commits Sign all commits by a given committer.\n"
17200
#~ "split Split a subdirectory of a tree into a separate tree.\n"
17201
#~ "status Display status summary.\n"
17202
#~ "switch Set the branch of a checkout and update.\n"
17203
#~ "tag Create, remove or modify a tag naming a revision.\n"
17204
#~ "tags List tags.\n"
17205
#~ "testament Show testament (signing-form) of a revision.\n"
17206
#~ "unbind Convert the current checkout into a regular branch.\n"
17207
#~ "uncommit Remove the last committed revision.\n"
17208
#~ "unshelve Restore shelved changes.\n"
17209
#~ "update Update a working tree to a new revision.\n"
17210
#~ "upgrade Upgrade a repository, branch or working tree to a newer\n"
17211
#~ " format.\n"
17212
#~ "verify-signatures Verify all commit signatures.\n"
17213
#~ "version Show version of bzr.\n"
17214
#~ "version-info Show version information about this tree.\n"
17215
#~ "view Manage filtered views.\n"
17216
#~ "whoami Show or set bzr user id.\n"
17217
17218
#~ msgid ""
17219
#~ "set_rh\n"
17220
#~ "~~~~~~"
17221
#~ msgstr ""
17222
#~ "set_rh\n"
17223
#~ "~~~~~~"
17224
17225
#~ msgid ""
17226
#~ "Invoked whenever the revision history has been set via\n"
17227
#~ "set_revision_history. The api signature is (branch, revision_history),\n"
17228
#~ "and the branch will be write-locked. The set_rh hook can be expensive\n"
17229
#~ "for bzr to trigger, a better hook to use is\n"
17230
#~ "Branch.post_change_branch_tip."
17231
#~ msgstr ""
17232
#~ "Invoked whenever the revision history has been set via\n"
17233
#~ "set_revision_history. The api signature is (branch, revision_history),\n"
17234
#~ "and the branch will be write-locked. The set_rh hook can be expensive\n"
17235
#~ "for bzr to trigger, a better hook to use is\n"
17236
#~ "Branch.post_change_branch_tip."
17237
17238
#~ msgid ""
17239
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
17240
#~ "http://bazaar.canonical.com/"
17241
#~ msgstr ""
17242
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
17243
#~ "http://bazaar.canonical.com/"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1