To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to po/brz.pot
- browse files at revision 7531
- compare with another revision
- download diff
- download tarball
- view history from revision 7531
- Committer: Gustav Hartvigsson
- Date: 2021-01-09 21:36:27 UTC
- Revision ID: gustav.hartvigsson@gmail.com-20210109213627-h1xwcutzy9m7a99b
Added 'Case Preserving Working Tree Use Cases' from Canonical Wiki
* Addod a page from the Canonical Bazaar wiki
with information on the scmeatics of case
perserving filesystems an a case insensitive
filesystem works.
* Needs re-work, but this will do as it is the
same inforamoton as what was on the linked
page in the currint documentation.
* Addod a page from the Canonical Bazaar wiki
with information on the scmeatics of case
perserving filesystems an a case insensitive
filesystem works.
* Needs re-work, but this will do as it is the
same inforamoton as what was on the linked
page in the currint documentation.
- files added:
- .github
- .github/workflows
- breezy/bzr/tests
- breezy/bzr/tests/blackbox
- breezy/plugins/github
- breezy/plugins/github/tests
- breezy/plugins/gitlab
- breezy/plugins/gitlab/tests
- breezy/plugins/propose/tests
- files removed:
- .travis.yml
- files renamed:
- breezy/tests/blackbox/test_dump_btree.py => breezy/bzr/tests/blackbox/test_dump_btree.py
- breezy/tests/per_bzrdir/ => breezy/bzr/tests/per_bzrdir/
- breezy/tests/per_inventory/ => breezy/bzr/tests/per_inventory/
- breezy/tests/per_pack_repository.py => breezy/bzr/tests/per_pack_repository.py
- breezy/tests/per_repository_chk/ => breezy/bzr/tests/per_repository_chk/
- breezy/tests/per_repository_vf/ => breezy/bzr/tests/per_repository_vf/
- breezy/tests/per_versionedfile.py => breezy/bzr/tests/per_versionedfile.py
- breezy/tests/test__btree_serializer.py => breezy/bzr/tests/test__btree_serializer.py
- breezy/tests/test__chk_map.py => breezy/bzr/tests/test__chk_map.py
- breezy/tests/test__dirstate_helpers.py => breezy/bzr/tests/test__dirstate_helpers.py
- breezy/tests/test__groupcompress.py => breezy/bzr/tests/test__groupcompress.py
- breezy/tests/test_btree_index.py => breezy/bzr/tests/test_btree_index.py
- breezy/tests/test_bundle.py => breezy/bzr/tests/test_bundle.py
- breezy/tests/test_bzrdir.py => breezy/bzr/tests/test_bzrdir.py
- breezy/tests/test_chk_map.py => breezy/bzr/tests/test_chk_map.py
- breezy/tests/test_chk_serializer.py => breezy/bzr/tests/test_chk_serializer.py
- breezy/tests/test_dirstate.py => breezy/bzr/tests/test_dirstate.py
- breezy/tests/test_generate_ids.py => breezy/bzr/tests/test_generate_ids.py
- breezy/tests/test_groupcompress.py => breezy/bzr/tests/test_groupcompress.py
- breezy/tests/test_index.py => breezy/bzr/tests/test_index.py
- breezy/tests/test_inv.py => breezy/bzr/tests/test_inv.py
- breezy/tests/test_inventory_delta.py => breezy/bzr/tests/test_inventory_delta.py
- breezy/tests/test_knit.py => breezy/bzr/tests/test_knit.py
- breezy/tests/test_pack.py => breezy/bzr/tests/test_pack.py
- breezy/tests/test_read_bundle.py => breezy/bzr/tests/test_read_bundle.py
- breezy/tests/test_remote.py => breezy/bzr/tests/test_remote.py
- breezy/tests/test_repository.py => breezy/bzr/tests/test_repository.py
- breezy/tests/test_serializer.py => breezy/bzr/tests/test_serializer.py
- breezy/tests/test_smart.py => breezy/bzr/tests/test_smart.py
- breezy/tests/test_smart_request.py => breezy/bzr/tests/test_smart_request.py
- breezy/tests/test_smart_signals.py => breezy/bzr/tests/test_smart_signals.py
- breezy/tests/test_smart_transport.py => breezy/bzr/tests/test_smart_transport.py
- breezy/tests/test_testament.py => breezy/bzr/tests/test_testament.py
- breezy/tests/test_versionedfile.py => breezy/bzr/tests/test_versionedfile.py
- breezy/tests/test_vf_search.py => breezy/bzr/tests/test_vf_search.py
- breezy/tests/test_weave.py => breezy/bzr/tests/test_weave.py
- breezy/tests/test_workingtree_4.py => breezy/bzr/tests/test_workingtree_4.py
- breezy/tests/test_xml.py => breezy/bzr/tests/test_xml.py
- breezy/plugins/propose/github.py => breezy/plugins/github/hoster.py
- breezy/plugins/propose/gitlabs.py => breezy/plugins/gitlab/hoster.py
- breezy/plugins/propose/launchpad.py => breezy/plugins/launchpad/hoster.py
- files modified:
- .bzrignore
added
removed
po/brz.pot
8
8
msgstr ""
9
9
"Project-Id-Version: brz\n"
10
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2019-01-14 01:26+0000\n"
11
"POT-Creation-Date: 2020-05-21 19:00+0000\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
108
108
msgid "Write log to this file."
109
109
msgstr ""
110
110
111
#: breezy/branch.py:832
111
#: breezy/branch.py:828
112
112
msgid "Unstacking"
113
113
msgstr ""
114
114
115
#: breezy/branch.py:2020
115
#: breezy/branch.py:2009
116
116
#, python-format
117
117
msgid "Pushed up to revision %d."
118
118
msgstr ""
119
119
120
#: breezy/branch.py:2022
120
#: breezy/branch.py:2012
121
#, python-format
122
msgid "Pushed up to revision id %s."
123
msgstr ""
124
125
#: breezy/branch.py:2015
121
126
#, python-format
122
127
msgid "%d tag updated."
123
128
msgid_plural "%d tags updated."
124
129
msgstr[0] ""
125
130
msgstr[1] ""
126
131
127
#: breezy/branch.py:2026
132
#: breezy/branch.py:2019
128
133
msgid "No new revisions or tags to push."
129
134
msgstr ""
130
135
131
#: breezy/branch.py:2028
136
#: breezy/branch.py:2021
132
137
msgid "No new revisions to push."
133
138
msgstr ""
134
139
135
#: breezy/branch.py:2048
140
#: breezy/branch.py:2041
136
141
#, python-brace-format
137
142
msgid "checked branch {0} format {1}"
138
143
msgstr ""
139
144
140
#: breezy/branch.py:2051
145
#: breezy/branch.py:2044
141
146
#, python-format
142
147
msgid "found error:%s"
143
148
msgstr ""
144
149
145
#: breezy/builtins.py:259 breezy/builtins.py:3015 breezy/workingtree.py:243
150
#: breezy/builtins.py:262 breezy/builtins.py:3094 breezy/workingtree.py:251
146
151
#, python-format
147
152
msgid "Ignoring files outside view. View is %s"
148
153
msgstr ""
149
154
150
#: breezy/builtins.py:269
155
#: breezy/builtins.py:272
151
156
#, python-format
152
157
msgid "brz %s --revision takes exactly one revision identifier"
153
158
msgstr ""
154
159
155
#: breezy/builtins.py:324
160
#: breezy/builtins.py:327
156
161
msgid "Display status summary."
157
162
msgstr ""
158
163
159
#: breezy/builtins.py:326
164
#: breezy/builtins.py:329
160
165
msgid ""
161
166
"This reports on versioned and unknown files, reporting them\n"
162
167
"grouped by state. Possible states are:"
163
168
msgstr ""
164
169
165
#: breezy/builtins.py:329
170
#: breezy/builtins.py:332
166
171
msgid ""
167
172
"added\n"
168
173
" Versioned in the working copy but not in the previous revision."
169
174
msgstr ""
170
175
171
#: breezy/builtins.py:332
176
#: breezy/builtins.py:335
172
177
msgid ""
173
178
"removed\n"
174
179
" Versioned in the previous revision but removed or deleted\n"
175
180
" in the working copy."
176
181
msgstr ""
177
182
178
#: breezy/builtins.py:336
183
#: breezy/builtins.py:339
179
184
msgid ""
180
185
"renamed\n"
181
186
" Path of this file changed from the previous revision;\n"
183
188
" parent directory was renamed."
184
189
msgstr ""
185
190
186
#: breezy/builtins.py:341
191
#: breezy/builtins.py:344
187
192
msgid ""
188
193
"modified\n"
189
194
" Text has changed since the previous revision."
190
195
msgstr ""
191
196
192
#: breezy/builtins.py:344
197
#: breezy/builtins.py:347
193
198
msgid ""
194
199
"kind changed\n"
195
200
" File kind has been changed (e.g. from file to directory)."
196
201
msgstr ""
197
202
198
#: breezy/builtins.py:347
203
#: breezy/builtins.py:350
199
204
msgid ""
200
205
"unknown\n"
201
206
" Not versioned and not matching an ignore pattern."
202
207
msgstr ""
203
208
204
#: breezy/builtins.py:350
209
#: breezy/builtins.py:353
205
210
msgid ""
206
211
"Additionally for directories, symlinks and files with a changed\n"
207
"executable bit, Bazaar indicates their type using a trailing\n"
212
"executable bit, Breezy indicates their type using a trailing\n"
208
213
"character: '/', '@' or '*' respectively. These decorations can be\n"
209
214
"disabled using the '--no-classify' option."
210
215
msgstr ""
211
216
212
#: breezy/builtins.py:355
217
#: breezy/builtins.py:358
213
218
msgid ""
214
219
"To see ignored files use 'brz ignored'. For details on the\n"
215
220
"changes to file texts, use 'brz diff'."
216
221
msgstr ""
217
222
218
#: breezy/builtins.py:358
223
#: breezy/builtins.py:361
219
224
msgid ""
220
225
"Note that --short or -S gives status flags for each item, similar\n"
221
226
"to Subversion's status command. To get output similar to svn -q,\n"
222
227
"use brz status -SV."
223
228
msgstr ""
224
229
225
#: breezy/builtins.py:362
230
#: breezy/builtins.py:365
226
231
msgid ""
227
232
"If no arguments are specified, the status of the entire working\n"
228
233
"directory is shown. Otherwise, only the status of the specified\n"
230
235
"is reported for everything inside that directory."
231
236
msgstr ""
232
237
233
#: breezy/builtins.py:367
238
#: breezy/builtins.py:370
234
239
msgid ""
235
240
"Before merges are committed, the pending merge tip revisions are\n"
236
241
"shown. To see all pending merge revisions, use the -v option.\n"
238
243
"the no-pending option or specify a file/directory."
239
244
msgstr ""
240
245
241
#: breezy/builtins.py:372
246
#: breezy/builtins.py:375
242
247
msgid ""
243
248
"To compare the working directory to a specific revision, pass a\n"
244
249
"single revision to the revision argument."
245
250
msgstr ""
246
251
247
#: breezy/builtins.py:375
252
#: breezy/builtins.py:378
248
253
msgid ""
249
254
"To see which files have changed in a specific revision, or between\n"
250
255
"two revisions, pass a revision range to the revision argument.\n"
252
257
msgstr ""
253
258
254
259
# help of 'short' option of 'status' command
255
#: breezy/builtins.py:384
260
#: breezy/builtins.py:387
256
261
msgid "Use short status indicators."
257
262
msgstr ""
258
263
259
264
# help of 'versioned' option of 'status' command
260
#: breezy/builtins.py:386
265
#: breezy/builtins.py:389
261
266
msgid "Only show versioned files."
262
267
msgstr ""
263
268
264
269
# help of 'no-pending' option of 'status' command
265
#: breezy/builtins.py:388
270
#: breezy/builtins.py:391
266
271
msgid "Don't show pending merges."
267
272
msgstr ""
268
273
269
274
# help of 'no-classify' option of 'status' command
270
#: breezy/builtins.py:390
275
#: breezy/builtins.py:393
271
276
msgid "Do not mark object type using indicator."
272
277
msgstr ""
273
278
274
#: breezy/builtins.py:405
279
#: breezy/builtins.py:408
275
280
msgid "brz status --revision takes exactly one or two revision specifiers"
276
281
msgstr ""
277
282
278
#: breezy/builtins.py:449 breezy/builtins.py:5251
283
#: breezy/builtins.py:452 breezy/builtins.py:5331
279
284
msgid "You can only supply one of revision_id or --revision"
280
285
msgstr ""
281
286
282
#: breezy/builtins.py:453 breezy/builtins.py:5254
287
#: breezy/builtins.py:456 breezy/builtins.py:5334
283
288
msgid "You must supply either --revision or a revision_id"
284
289
msgstr ""
285
290
286
#: breezy/builtins.py:460
291
#: breezy/builtins.py:463
287
292
#, python-format
288
293
msgid "Repository %r does not support access to raw revision texts"
289
294
msgstr ""
290
295
291
#: breezy/builtins.py:471
296
#: breezy/builtins.py:474
292
297
#, python-brace-format
293
298
msgid "The repository {0} contains no revision {1}."
294
299
msgstr ""
295
300
296
#: breezy/builtins.py:478
301
#: breezy/builtins.py:481
297
302
msgid "You cannot specify a NULL revision."
298
303
msgstr ""
299
304
300
#: breezy/builtins.py:484
305
#: breezy/builtins.py:487
301
306
msgid "Remove the working tree from a given branch/checkout."
302
307
msgstr ""
303
308
304
#: breezy/builtins.py:486
309
#: breezy/builtins.py:489
305
310
msgid ""
306
311
"Since a lightweight checkout is little more than a working tree\n"
307
312
"this will refuse to run against one."
308
313
msgstr ""
309
314
310
#: breezy/builtins.py:489
315
#: breezy/builtins.py:492
311
316
msgid "To re-create the working tree, use \"brz checkout\"."
312
317
msgstr ""
313
318
314
319
# help of 'force' option of 'remove-tree' command
315
#: breezy/builtins.py:495
320
#: breezy/builtins.py:498
316
321
msgid "Remove the working tree even if it has uncommitted or shelved changes."
317
322
msgstr ""
318
323
319
#: breezy/builtins.py:510
324
#: breezy/builtins.py:513
320
325
msgid "No working tree to remove"
321
326
msgstr ""
322
327
323
#: breezy/builtins.py:513
328
#: breezy/builtins.py:516
324
329
msgid "You cannot remove the working tree of a remote path"
325
330
msgstr ""
326
331
327
#: breezy/builtins.py:523
332
#: breezy/builtins.py:526
328
333
msgid "You cannot remove the working tree from a lightweight checkout"
329
334
msgstr ""
330
335
331
#: breezy/builtins.py:564
336
#: breezy/builtins.py:567
332
337
msgid ""
333
338
"The tree does not appear to be corrupt. You probably want \"brz revert\" "
334
339
"instead. Use \"--force\" if you are sure you want to reset the working tree."
335
340
msgstr ""
336
341
337
#: breezy/builtins.py:575
342
#: breezy/builtins.py:578
338
343
msgid ""
339
344
", the header appears corrupt, try passing -r -1 to set the state to the last "
340
345
"commit"
341
346
msgstr ""
342
347
343
#: breezy/builtins.py:580
348
#: breezy/builtins.py:583
344
349
#, python-brace-format
345
350
msgid "failed to reset the tree state{0}"
346
351
msgstr ""
347
352
348
#: breezy/builtins.py:584
353
#: breezy/builtins.py:587
349
354
msgid "Show current revision number."
350
355
msgstr ""
351
356
352
#: breezy/builtins.py:586
357
#: breezy/builtins.py:589
353
358
msgid "This is equal to the number of revisions on this branch."
354
359
msgstr ""
355
360
356
#: breezy/builtins.py:600
361
#: breezy/builtins.py:603
357
362
msgid "--tree and --revision can not be used together"
358
363
msgstr ""
359
364
360
#: breezy/builtins.py:616
365
#: breezy/builtins.py:619
361
366
msgid "Revision numbers only make sense for single revisions, not ranges"
362
367
msgstr ""
363
368
364
369
# help of 'tree' option of 'revno' command
365
#: breezy/builtins.py:639
370
#: breezy/builtins.py:642
366
371
msgid "Show revno of working tree."
367
372
msgstr ""
368
373
369
#: breezy/builtins.py:688
374
#: breezy/builtins.py:691
370
375
msgid "Add specified files or directories."
371
376
msgstr ""
372
377
373
#: breezy/builtins.py:690
378
#: breezy/builtins.py:693
374
379
msgid ""
375
380
"In non-recursive mode, all the named items are added, regardless\n"
376
381
"of whether they were previously ignored. A warning is given if\n"
377
382
"any of the named files are already versioned."
378
383
msgstr ""
379
384
380
#: breezy/builtins.py:694
385
#: breezy/builtins.py:697
381
386
msgid ""
382
387
"In recursive mode (the default), files are treated the same way\n"
383
388
"but the behaviour for directories is different. Directories that\n"
388
393
"directories. If no names are given '.' is assumed."
389
394
msgstr ""
390
395
391
#: breezy/builtins.py:702
396
#: breezy/builtins.py:705
392
397
msgid ""
393
398
"A warning will be printed when nested trees are encountered,\n"
394
399
"unless they are explicitly ignored."
395
400
msgstr ""
396
401
397
#: breezy/builtins.py:705
402
#: breezy/builtins.py:708
398
403
msgid ""
399
404
"Therefore simply saying 'brz add' will version all files that\n"
400
405
"are currently unknown."
401
406
msgstr ""
402
407
403
#: breezy/builtins.py:708
408
#: breezy/builtins.py:711
404
409
msgid ""
405
410
"Adding a file whose parent directory is not versioned will\n"
406
411
"implicitly add the parent, and so on up to the root. This means\n"
408
413
"get added when you add a file in the directory."
409
414
msgstr ""
410
415
411
#: breezy/builtins.py:713
416
#: breezy/builtins.py:716
412
417
msgid ""
413
418
"--dry-run will show which files would be added, but not actually\n"
414
419
"add them."
415
420
msgstr ""
416
421
417
#: breezy/builtins.py:716
422
#: breezy/builtins.py:719
418
423
msgid ""
419
424
"--file-ids-from will try to use the file ids from the supplied path.\n"
420
425
"It looks up ids trying to find a matching parent directory with the\n"
425
430
"into a subdirectory of this one."
426
431
msgstr ""
427
432
428
#: breezy/builtins.py:724
433
#: breezy/builtins.py:727
429
434
msgid ""
430
435
"Any files matching patterns in the ignore list will not be added\n"
431
436
"unless they are explicitly mentioned."
432
437
msgstr ""
433
438
434
#: breezy/builtins.py:727
439
#: breezy/builtins.py:730
435
440
msgid ""
436
441
"In recursive mode, files larger than the configuration option\n"
437
442
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
439
444
msgstr ""
440
445
441
446
# help of 'no-recurse' option of 'add' command
442
#: breezy/builtins.py:734
447
#: breezy/builtins.py:737
443
448
msgid "Don't recursively add the contents of directories."
444
449
msgstr ""
445
450
446
451
# help of 'file-ids-from' option of 'add' command
447
#: breezy/builtins.py:742
452
#: breezy/builtins.py:745
448
453
msgid "Lookup file ids from this tree."
449
454
msgstr ""
450
455
451
#: breezy/builtins.py:779
456
#: breezy/builtins.py:757
457
msgid ""
458
"Ignoring --file-ids-from, since the tree does not support setting file ids."
459
msgstr ""
460
461
#: breezy/builtins.py:788
452
462
#, python-brace-format
453
463
msgid "ignored {0} matching \"{1}\"\n"
454
464
msgstr ""
455
465
456
#: breezy/builtins.py:784
466
#: breezy/builtins.py:793
457
467
msgid "Create a new versioned directory."
458
468
msgstr ""
459
469
460
#: breezy/builtins.py:786
470
#: breezy/builtins.py:795
461
471
msgid "This is equivalent to creating the directory and then adding it."
462
472
msgstr ""
463
473
464
474
# help of 'parents' option of 'mkdir' command
465
#: breezy/builtins.py:793
475
#: breezy/builtins.py:802
466
476
msgid "No error if existing, make parent directories as needed."
467
477
msgstr ""
468
478
469
#: breezy/builtins.py:827
479
#: breezy/builtins.py:836
470
480
#, python-format
471
481
msgid "added %s\n"
472
482
msgstr ""
473
483
474
#: breezy/builtins.py:871
484
#: breezy/builtins.py:883
475
485
#, python-format
476
486
msgid "invalid kind %r specified"
477
487
msgstr ""
478
488
479
#: breezy/builtins.py:909
489
#: breezy/builtins.py:921
480
490
msgid "Copy a file."
481
491
msgstr ""
482
492
483
#: breezy/builtins.py:911
493
#: breezy/builtins.py:923
484
494
msgid " brz cp SOURCE... DESTINATION"
485
495
msgstr ""
486
496
487
#: breezy/builtins.py:913
497
#: breezy/builtins.py:925
488
498
msgid ""
489
499
"If the last argument is a versioned directory, all the other names\n"
490
500
"are copied into it. Otherwise, there must be exactly two arguments\n"
491
501
"and the file is copied to a new name."
492
502
msgstr ""
493
503
494
#: breezy/builtins.py:917
504
#: breezy/builtins.py:929
495
505
msgid ""
496
506
"Files cannot be copied between branches. Only files can be copied\n"
497
507
"at the moment."
498
508
msgstr ""
499
509
500
#: breezy/builtins.py:933 breezy/builtins.py:1026
510
#: breezy/builtins.py:945 breezy/builtins.py:1038
501
511
msgid "missing file argument"
502
512
msgstr ""
503
513
504
#: breezy/builtins.py:939
514
#: breezy/builtins.py:951
505
515
msgid "can not copy root of branch"
506
516
msgstr ""
507
517
508
#: breezy/builtins.py:947
518
#: breezy/builtins.py:959
509
519
msgid "to copy multiple files the destination must be a versioned directory"
510
520
msgstr ""
511
521
512
#: breezy/builtins.py:961 breezy/builtins.py:977
522
#: breezy/builtins.py:973 breezy/builtins.py:989
513
523
#, python-format
514
524
msgid "Could not copy %s => %s: %s is not versioned."
515
525
msgstr ""
516
526
517
#: breezy/builtins.py:965
527
#: breezy/builtins.py:977
518
528
#, python-format
519
529
msgid "Could not copy %s => %s . %s is not versioned\\."
520
530
msgstr ""
521
531
522
#: breezy/builtins.py:969
532
#: breezy/builtins.py:981
523
533
#, python-format
524
534
msgid "Could not copy %s => %s . %s is a directory."
525
535
msgstr ""
526
536
527
#: breezy/builtins.py:981
537
#: breezy/builtins.py:993
528
538
#, python-format
529
539
msgid "Could not copy to %s: %s is not a directory."
530
540
msgstr ""
531
541
532
#: breezy/builtins.py:988
542
#: breezy/builtins.py:1000
533
543
msgid "Move or rename a file."
534
544
msgstr ""
535
545
536
#: breezy/builtins.py:990
546
#: breezy/builtins.py:1002
537
547
msgid " brz mv SOURCE... DESTINATION"
538
548
msgstr ""
539
549
540
#: breezy/builtins.py:992
550
#: breezy/builtins.py:1004
541
551
msgid ""
542
552
"If the last argument is a versioned directory, all the other names\n"
543
553
"are moved into it. Otherwise, there must be exactly two arguments\n"
544
554
"and the file is changed to a new name."
545
555
msgstr ""
546
556
547
#: breezy/builtins.py:996
557
#: breezy/builtins.py:1008
548
558
msgid ""
549
559
"If OLDNAME does not exist on the filesystem but is versioned and\n"
550
560
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
553
563
"The same is valid when moving many SOURCE files to a DESTINATION."
554
564
msgstr ""
555
565
556
#: breezy/builtins.py:1002
566
#: breezy/builtins.py:1014
557
567
msgid "Files cannot be moved between branches."
558
568
msgstr ""
559
569
560
570
# help of 'after' option of 'mv' command
561
#: breezy/builtins.py:1009
571
#: breezy/builtins.py:1021
562
572
msgid ""
563
573
"Move only the brz identifier of the file, because the file has already been "
564
574
"moved."
565
575
msgstr ""
566
576
567
577
# help of 'auto' option of 'mv' command
568
#: breezy/builtins.py:1011
578
#: breezy/builtins.py:1023
569
579
msgid "Automatically guess renames."
570
580
msgstr ""
571
581
572
582
# help of 'dry-run' option of 'mv' command
573
#: breezy/builtins.py:1013
583
#: breezy/builtins.py:1025
574
584
msgid "Avoid making changes when guessing renames."
575
585
msgstr ""
576
586
577
#: breezy/builtins.py:1022
587
#: breezy/builtins.py:1034
578
588
msgid "--dry-run requires --auto."
579
589
msgstr ""
580
590
581
#: breezy/builtins.py:1032
591
#: breezy/builtins.py:1044
582
592
msgid "can not move root of branch"
583
593
msgstr ""
584
594
585
#: breezy/builtins.py:1039
595
#: breezy/builtins.py:1051
586
596
msgid "Only one path may be specified to --auto."
587
597
msgstr ""
588
598
589
#: breezy/builtins.py:1042
599
#: breezy/builtins.py:1054
590
600
msgid "--after cannot be specified with --auto."
591
601
msgstr ""
592
602
593
#: breezy/builtins.py:1078
603
#: breezy/builtins.py:1090
594
604
msgid "to mv multiple files the destination must be a versioned directory"
595
605
msgstr ""
596
606
597
#: breezy/builtins.py:1131
607
#: breezy/builtins.py:1143
598
608
msgid "Turn this branch into a mirror of another branch."
599
609
msgstr ""
600
610
601
#: breezy/builtins.py:1133
611
#: breezy/builtins.py:1145
602
612
msgid ""
603
613
"By default, this command only works on branches that have not diverged.\n"
604
614
"Branches are considered diverged if the destination branch's most recent\n"
606
616
"parent."
607
617
msgstr ""
608
618
609
#: breezy/builtins.py:1138
619
#: breezy/builtins.py:1150
610
620
msgid ""
611
621
"If branches have diverged, you can use 'brz merge' to integrate the changes\n"
612
622
"from one into the other. Once one branch has merged, the other should\n"
613
623
"be able to pull it again."
614
624
msgstr ""
615
625
616
#: breezy/builtins.py:1142
626
#: breezy/builtins.py:1154
617
627
msgid ""
618
628
"If you want to replace your local changes and just want your branch to\n"
619
629
"match the remote one, use pull --overwrite. This will work even if the two\n"
620
630
"branches have diverged."
621
631
msgstr ""
622
632
623
#: breezy/builtins.py:1146
633
#: breezy/builtins.py:1158
624
634
msgid ""
625
635
"If there is no default location set, the first pull will set it (use\n"
626
636
"--no-remember to avoid setting it). After that, you can omit the\n"
628
638
"value will only be saved if the remote location can be accessed."
629
639
msgstr ""
630
640
631
#: breezy/builtins.py:1151
641
#: breezy/builtins.py:1163
632
642
msgid ""
633
643
"The --verbose option will display the revisions pulled using the log_format\n"
634
644
"configuration option. You can use a different format by overriding it with\n"
635
645
"-Olog_format=<other_format>."
636
646
msgstr ""
637
647
638
#: breezy/builtins.py:1155
648
#: breezy/builtins.py:1167
639
649
msgid ""
640
650
"Note: The location can be specified either in the form of a branch,\n"
641
651
"or in the form of a path to a file containing a merge directive generated\n"
643
653
msgstr ""
644
654
645
655
# help of 'verbose' option of 'pull' command
646
#: breezy/builtins.py:1163
656
#: breezy/builtins.py:1175
647
657
msgid "Show logs of pulled revisions."
648
658
msgstr ""
649
659
650
660
# help of 'directory' option of 'pull' command
651
#: breezy/builtins.py:1165
661
#: breezy/builtins.py:1177
652
662
msgid ""
653
663
"Branch to pull into, rather than the one containing the working directory."
654
664
msgstr ""
655
665
656
666
# help of 'local' option of 'pull' command
657
#: breezy/builtins.py:1168
667
#: breezy/builtins.py:1180
658
668
msgid ""
659
669
"Perform a local pull in a bound branch. Local pulls are not applied to the "
660
670
"master branch."
661
671
msgstr ""
662
672
663
#: breezy/builtins.py:1205
673
#: breezy/builtins.py:1217
664
674
msgid "No working tree, ignoring --show-base"
665
675
msgstr ""
666
676
667
#: breezy/builtins.py:1221
677
#: breezy/builtins.py:1233 breezy/plugins/rewrite/commands.py:479
668
678
msgid "No pull location known or specified."
669
679
msgstr ""
670
680
671
#: breezy/builtins.py:1228
681
#: breezy/builtins.py:1240
672
682
#, python-format
673
683
msgid "Using saved parent location: %s\n"
674
684
msgstr ""
675
685
676
#: breezy/builtins.py:1235 breezy/builtins.py:4449
686
#: breezy/builtins.py:1247 breezy/builtins.py:4529
677
687
msgid "Cannot use -r with merge directives or bundles"
678
688
msgstr ""
679
689
680
#: breezy/builtins.py:1278
690
#: breezy/builtins.py:1290
681
691
msgid "Update a mirror of this branch."
682
692
msgstr ""
683
693
684
#: breezy/builtins.py:1280
694
#: breezy/builtins.py:1292
685
695
msgid ""
686
696
"The target branch will not have its working tree populated because this\n"
687
697
"is both expensive, and is not supported on remote file systems."
688
698
msgstr ""
689
699
690
#: breezy/builtins.py:1283
700
#: breezy/builtins.py:1295
691
701
msgid ""
692
702
"Some smart servers or protocols *may* put the working tree in place in\n"
693
703
"the future."
694
704
msgstr ""
695
705
696
#: breezy/builtins.py:1286
706
#: breezy/builtins.py:1298
697
707
msgid ""
698
708
"This command only works on branches that have not diverged. Branches are\n"
699
709
"considered diverged if the destination branch's most recent commit is one\n"
700
710
"that has not been merged (directly or indirectly) by the source branch."
701
711
msgstr ""
702
712
703
#: breezy/builtins.py:1290
713
#: breezy/builtins.py:1302
704
714
msgid ""
705
715
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
706
716
"the other branch completely, discarding its unmerged changes."
707
717
msgstr ""
708
718
709
#: breezy/builtins.py:1293
719
#: breezy/builtins.py:1305
710
720
msgid ""
711
721
"If you want to ensure you have the different changes in the other branch,\n"
712
722
"do a merge (see brz help merge) from the other branch, and commit that.\n"
713
723
"After that you will be able to do a push without '--overwrite'."
714
724
msgstr ""
715
725
716
#: breezy/builtins.py:1297
726
#: breezy/builtins.py:1309
717
727
msgid ""
718
728
"If there is no default push location set, the first push will set it (use\n"
719
729
"--no-remember to avoid setting it). After that, you can omit the\n"
721
731
"value will only be saved if the remote location can be accessed."
722
732
msgstr ""
723
733
724
#: breezy/builtins.py:1302
734
#: breezy/builtins.py:1314
725
735
msgid ""
726
736
"The --verbose option will display the revisions pushed using the log_format\n"
727
737
"configuration option. You can use a different format by overriding it with\n"
729
739
msgstr ""
730
740
731
741
# help of 'directory' option of 'push' command
732
#: breezy/builtins.py:1313
742
#: breezy/builtins.py:1325
733
743
msgid ""
734
744
"Branch to push from, rather than the one containing the working directory."
735
745
msgstr ""
736
746
737
747
# help of 'use-existing-dir' option of 'push' command
738
#: breezy/builtins.py:1316
748
#: breezy/builtins.py:1328
739
749
msgid ""
740
750
"By default push will fail if the target directory exists, but does not "
741
751
"already have a control directory. This flag will allow push to proceed."
742
752
msgstr ""
743
753
744
754
# help of 'stacked' option of 'push' command
745
#: breezy/builtins.py:1321
755
#: breezy/builtins.py:1333
746
756
msgid ""
747
757
"Create a stacked branch that references the public location of the parent "
748
758
"branch."
749
759
msgstr ""
750
760
751
761
# help of 'stacked-on' option of 'push' command
752
#: breezy/builtins.py:1324
762
#: breezy/builtins.py:1336
753
763
msgid ""
754
764
"Create a stacked branch that refers to another branch for the commit "
755
765
"history. Only the work not present in the referenced branch is included in "
757
767
msgstr ""
758
768
759
769
# help of 'strict' option of 'push' command
760
#: breezy/builtins.py:1329
770
#: breezy/builtins.py:1341
761
771
msgid ""
762
772
"Refuse to push if there are uncommitted changes in the working tree, --no-"
763
773
"strict disables the check."
764
774
msgstr ""
765
775
766
776
# help of 'no-tree' option of 'push' command
767
#: breezy/builtins.py:1332
777
#: breezy/builtins.py:1344
768
778
msgid "Don't populate the working tree, even for protocols that support it."
769
779
msgstr ""
770
780
771
781
# help of 'overwrite-tags' option of 'pull' command
772
782
# help of 'overwrite-tags' option of 'push' command
773
#: breezy/builtins.py:1335
783
#: breezy/builtins.py:1347
774
784
msgid "Overwrite tags only."
775
785
msgstr ""
776
786
777
787
# help of 'lossy' option of 'push' command
778
#: breezy/builtins.py:1336
788
#: breezy/builtins.py:1348
779
789
msgid ""
780
790
"Allow lossy push, i.e. dropping metadata that can't be represented in the "
781
791
"target."
782
792
msgstr ""
783
793
784
#: breezy/builtins.py:1388
794
#: breezy/builtins.py:1402
785
795
msgid "Could not determine branch to refer to."
786
796
msgstr ""
787
797
788
#: breezy/builtins.py:1397
798
#: breezy/builtins.py:1411
789
799
#, python-format
790
800
msgid ""
791
801
"No push location known or specified. To push to the parent branch (at %s), "
792
802
"use 'brz push :parent'."
793
803
msgstr ""
794
804
795
#: breezy/builtins.py:1403
805
#: breezy/builtins.py:1417
796
806
msgid "No push location known or specified."
797
807
msgstr ""
798
808
799
#: breezy/builtins.py:1407
809
#: breezy/builtins.py:1421
800
810
#, python-format
801
811
msgid "Using saved push location: %s"
802
812
msgstr ""
803
813
804
#: breezy/builtins.py:1418
814
#: breezy/builtins.py:1432
805
815
msgid "Create a new branch that is a copy of an existing branch."
806
816
msgstr ""
807
817
808
#: breezy/builtins.py:1420
818
#: breezy/builtins.py:1434
809
819
msgid ""
810
820
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
811
821
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
816
826
"create ./foo-bar."
817
827
msgstr ""
818
828
819
#: breezy/builtins.py:1427
829
#: breezy/builtins.py:1441
820
830
msgid ""
821
831
"To retrieve the branch as of a particular revision, supply the --revision\n"
822
832
"parameter, as in \"branch foo/bar -r 5\"."
823
833
msgstr ""
824
834
825
835
# help of 'no-tree' option of 'branch' command
826
#: breezy/builtins.py:1439
836
#: breezy/builtins.py:1454
827
837
msgid "Create a branch without a working-tree."
828
838
msgstr ""
829
839
830
840
# help of 'switch' option of 'branch' command
831
#: breezy/builtins.py:1441
841
#: breezy/builtins.py:1456
832
842
msgid "Switch the checkout in the current directory to the new branch."
833
843
msgstr ""
834
844
835
845
# help of 'stacked' option of 'branch' command
836
#: breezy/builtins.py:1444
846
#: breezy/builtins.py:1459
837
847
msgid ""
838
848
"Create a stacked branch referring to the source branch. The new branch will "
839
849
"depend on the availability of the source branch for all operations."
840
850
msgstr ""
841
851
842
852
# help of 'standalone' option of 'branch' command
843
#: breezy/builtins.py:1448
853
#: breezy/builtins.py:1463
844
854
msgid "Do not use a shared repository, even if available."
845
855
msgstr ""
846
856
847
857
# help of 'use-existing-dir' option of 'branch' command
848
#: breezy/builtins.py:1450
858
#: breezy/builtins.py:1465
849
859
msgid ""
850
860
"By default branch will fail if the target directory exists, but does not "
851
861
"already have a control directory. This flag will allow branch to proceed."
852
862
msgstr ""
853
863
854
864
# help of 'bind' option of 'branch' command
855
#: breezy/builtins.py:1455
865
#: breezy/builtins.py:1470
856
866
msgid "Bind new branch to from location."
857
867
msgstr ""
858
868
859
#: breezy/builtins.py:1492
869
# help of 'colocated-branch' option of 'branch' command
870
#: breezy/builtins.py:1474
871
msgid "Name of colocated branch to sprout."
872
msgstr ""
873
874
#: breezy/builtins.py:1515
860
875
#, python-format
861
876
msgid "Target directory \"%s\" already exists."
862
877
msgstr ""
863
878
864
#: breezy/builtins.py:1504
879
#: breezy/builtins.py:1527
865
880
#, python-format
866
881
msgid "Parent of \"%s\" does not exist."
867
882
msgstr ""
868
883
869
#: breezy/builtins.py:1522
884
#: breezy/builtins.py:1546
870
885
#, python-brace-format
871
886
msgid "The branch {0} has no revision {1}."
872
887
msgstr ""
873
888
874
#: breezy/builtins.py:1538 breezy/push.py:54
889
#: breezy/builtins.py:1563 breezy/push.py:54
875
890
#, python-format
876
891
msgid "Created new stacked branch referring to %s."
877
892
msgstr ""
878
893
879
#: breezy/builtins.py:1544
894
#: breezy/builtins.py:1569
880
895
#, python-format
881
896
msgid "Branched %d revision."
882
897
msgid_plural "Branched %d revisions."
883
898
msgstr[0] ""
884
899
msgstr[1] ""
885
900
886
#: breezy/builtins.py:1548 breezy/push.py:57
901
#: breezy/builtins.py:1573 breezy/push.py:57
887
902
msgid "Created new branch."
888
903
msgstr ""
889
904
890
#: breezy/builtins.py:1553
905
#: breezy/builtins.py:1578
891
906
#, python-format
892
907
msgid "New branch bound to %s"
893
908
msgstr ""
894
909
895
#: breezy/builtins.py:1558
910
#: breezy/builtins.py:1583
896
911
#, python-format
897
912
msgid "Switched to branch: %s"
898
913
msgstr ""
899
914
900
#: breezy/builtins.py:1563
915
#: breezy/builtins.py:1588
901
916
msgid "List the branches available at the current location."
902
917
msgstr ""
903
918
904
#: breezy/builtins.py:1565
919
#: breezy/builtins.py:1590
905
920
msgid ""
906
921
"This command will print the names of all the branches at the current\n"
907
922
"location."
908
923
msgstr ""
909
924
910
925
# help of 'recursive' option of 'branches' command
911
#: breezy/builtins.py:1572
926
#: breezy/builtins.py:1597
912
927
msgid ""
913
928
"Recursively scan for branches rather than just looking in the specified "
914
929
"location."
915
930
msgstr ""
916
931
917
#: breezy/builtins.py:1601
932
#: breezy/builtins.py:1626
918
933
msgid "(default)"
919
934
msgstr ""
920
935
921
#: breezy/builtins.py:1613
936
#: breezy/builtins.py:1638
922
937
msgid "Create a new checkout of an existing branch."
923
938
msgstr ""
924
939
925
#: breezy/builtins.py:1615
940
#: breezy/builtins.py:1640
926
941
msgid ""
927
942
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree\n"
928
943
"for the branch found in '.'. This is useful if you have removed the working\n"
930
945
"current location using SFTP."
931
946
msgstr ""
932
947
933
#: breezy/builtins.py:1620
948
#: breezy/builtins.py:1645
934
949
msgid ""
935
950
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION\n"
936
951
"will be used. In other words, \"checkout ../foo/bar\" will attempt to "
942
957
"attempt to create ./foo-bar."
943
958
msgstr ""
944
959
945
#: breezy/builtins.py:1627
960
#: breezy/builtins.py:1652
946
961
msgid ""
947
962
"To retrieve the branch as of a particular revision, supply the --revision\n"
948
963
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be\n"
951
966
msgstr ""
952
967
953
968
# help of 'lightweight' option of 'checkout' command
954
#: breezy/builtins.py:1637
969
#: breezy/builtins.py:1662
955
970
msgid ""
956
971
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
957
972
"the branch for every operation. Normal checkouts can perform common "
961
976
962
977
# help of 'files-from' option of 'branch' command
963
978
# help of 'files-from' option of 'checkout' command
964
#: breezy/builtins.py:1644
979
#: breezy/builtins.py:1669
965
980
msgid "Get file contents from this tree."
966
981
msgstr ""
967
982
968
983
# help of 'hardlink' option of 'branch' command
969
984
# help of 'hardlink' option of 'checkout' command
970
#: breezy/builtins.py:1646
985
#: breezy/builtins.py:1671
971
986
msgid "Hard-link working tree files where possible."
972
987
msgstr ""
973
988
974
#: breezy/builtins.py:1686
989
#: breezy/builtins.py:1711
990
msgid ""
991
"Clone a control directory.\n"
992
" "
993
msgstr ""
994
995
# help of 'no-recurse-nested' option of 'branch' command
996
# help of 'no-recurse-nested' option of 'clone' command
997
#: breezy/builtins.py:1717
998
msgid "Do not recursively check out nested trees."
999
msgstr ""
1000
1001
#: breezy/builtins.py:1739
1002
msgid "Created new control directory."
1003
msgstr ""
1004
1005
#: breezy/builtins.py:1743
975
1006
msgid ""
976
1007
"Show list of renamed files.\n"
977
1008
" "
978
1009
msgstr ""
979
1010
980
#: breezy/builtins.py:1714
1011
#: breezy/builtins.py:1771
981
1012
msgid "Update a working tree to a new revision."
982
1013
msgstr ""
983
1014
984
#: breezy/builtins.py:1716
1015
#: breezy/builtins.py:1773
985
1016
msgid ""
986
1017
"This will perform a merge of the destination revision (the tip of the\n"
987
1018
"branch, or the specified revision) into the working tree, and then make\n"
988
1019
"that revision the basis revision for the working tree."
989
1020
msgstr ""
990
1021
991
#: breezy/builtins.py:1720
1022
#: breezy/builtins.py:1777
992
1023
msgid ""
993
1024
"You can use this to visit an older revision, or to update a working tree\n"
994
1025
"that is out of date from its branch."
995
1026
msgstr ""
996
1027
997
#: breezy/builtins.py:1723
1028
#: breezy/builtins.py:1780
998
1029
msgid ""
999
1030
"If there are any uncommitted changes in the tree, they will be carried\n"
1000
1031
"across and remain as uncommitted changes after the update. To discard\n"
1002
1033
"with the changes brought in by the change in basis revision."
1003
1034
msgstr ""
1004
1035
1005
#: breezy/builtins.py:1728
1036
#: breezy/builtins.py:1785
1006
1037
msgid ""
1007
1038
"If the tree's branch is bound to a master branch, brz will also update\n"
1008
1039
"the branch from the master."
1009
1040
msgstr ""
1010
1041
1011
#: breezy/builtins.py:1731
1042
#: breezy/builtins.py:1788
1012
1043
msgid ""
1013
"You cannot update just a single file or directory, because each Bazaar\n"
1044
"You cannot update just a single file or directory, because each Breezy\n"
1014
1045
"working tree has just a single basis revision. If you want to restore a\n"
1015
1046
"file that has been removed locally, use 'brz revert' instead of 'brz\n"
1016
1047
"update'. If you want to restore a file to its state in a previous\n"
1018
1049
"out the old content of that file to a new location."
1019
1050
msgstr ""
1020
1051
1021
#: breezy/builtins.py:1738
1052
#: breezy/builtins.py:1795
1022
1053
msgid ""
1023
1054
"The 'dir' argument, if given, must be the location of the root of a\n"
1024
1055
"working tree to update. By default, the working tree that contains the\n"
1025
1056
"current working directory is used."
1026
1057
msgstr ""
1027
1058
1028
#: breezy/builtins.py:1754
1059
#: breezy/builtins.py:1811
1029
1060
msgid "brz update --revision takes exactly one revision"
1030
1061
msgstr ""
1031
1062
1032
#: breezy/builtins.py:1762
1063
#: breezy/builtins.py:1819
1033
1064
msgid "brz update can only update a whole tree, not a file or subdirectory"
1034
1065
msgstr ""
1035
1066
1036
#: breezy/builtins.py:1793
1067
#: breezy/builtins.py:1849
1037
1068
#, python-brace-format
1038
1069
msgid "Tree is up to date at revision {0} of branch {1}"
1039
1070
msgstr ""
1040
1071
1041
#: breezy/builtins.py:1809
1072
#: breezy/builtins.py:1865
1042
1073
#, python-format
1043
1074
msgid ""
1044
1075
"branch has no revision %s\n"
1045
1076
"brz update --revision only works for a revision in the branch history"
1046
1077
msgstr ""
1047
1078
1048
#: breezy/builtins.py:1815
1079
#: breezy/builtins.py:1871
1049
1080
#, python-brace-format
1050
1081
msgid "Updated to revision {0} of branch {1}"
1051
1082
msgstr ""
1052
1083
1053
#: breezy/builtins.py:1819
1084
#: breezy/builtins.py:1875
1054
1085
msgid ""
1055
1086
"Your local commits will now show as pending merges with 'brz status', and "
1056
1087
"can be committed with 'brz commit'."
1057
1088
msgstr ""
1058
1089
1059
#: breezy/builtins.py:1828
1090
#: breezy/builtins.py:1884
1060
1091
msgid "Show information about a working tree, branch or repository."
1061
1092
msgstr ""
1062
1093
1063
#: breezy/builtins.py:1830
1094
#: breezy/builtins.py:1886
1064
1095
msgid ""
1065
1096
"This command will show all known locations and formats associated to the\n"
1066
1097
"tree, branch or repository."
1067
1098
msgstr ""
1068
1099
1069
#: breezy/builtins.py:1833
1100
#: breezy/builtins.py:1889
1070
1101
msgid ""
1071
1102
"In verbose mode, statistical information is included with each report.\n"
1072
1103
"To see extended statistic information, use a verbosity level of 2 or\n"
1073
1104
"higher by specifying the verbose option multiple times, e.g. -vv."
1074
1105
msgstr ""
1075
1106
1076
#: breezy/builtins.py:1837
1107
#: breezy/builtins.py:1893
1077
1108
msgid "Branches and working trees will also report any missing revisions."
1078
1109
msgstr ""
1079
1110
1080
#: breezy/builtins.py:1839 breezy/builtins.py:3750 breezy/builtins.py:4917
1081
#: breezy/builtins.py:6519 breezy/plugins/fastimport/cmds.py:211
1082
#: breezy/plugins/fastimport/cmds.py:417 breezy/plugins/propose/cmds.py:274
1111
#: breezy/builtins.py:1895 breezy/builtins.py:3830 breezy/builtins.py:4997
1112
#: breezy/builtins.py:6591 breezy/plugins/fastimport/cmds.py:211
1113
#: breezy/plugins/fastimport/cmds.py:417 breezy/plugins/propose/cmds.py:285
1083
1114
msgid ":Examples:"
1084
1115
msgstr ""
1085
1116
1086
#: breezy/builtins.py:1841
1117
#: breezy/builtins.py:1897
1087
1118
msgid " Display information on the format and related locations:"
1088
1119
msgstr ""
1089
1120
1090
#: breezy/builtins.py:1843
1121
#: breezy/builtins.py:1899
1091
1122
msgid " brz info"
1092
1123
msgstr ""
1093
1124
1094
#: breezy/builtins.py:1845
1125
#: breezy/builtins.py:1901
1095
1126
msgid ""
1096
1127
" Display the above together with extended format information and\n"
1097
1128
" basic statistics (like the number of files in the working tree and\n"
1098
1129
" number of revisions in the branch and repository):"
1099
1130
msgstr ""
1100
1131
1101
#: breezy/builtins.py:1849
1132
#: breezy/builtins.py:1905
1102
1133
msgid " brz info -v"
1103
1134
msgstr ""
1104
1135
1105
#: breezy/builtins.py:1851
1136
#: breezy/builtins.py:1907
1106
1137
msgid " Display the above together with number of committers to the branch:"
1107
1138
msgstr ""
1108
1139
1109
#: breezy/builtins.py:1853
1140
#: breezy/builtins.py:1909
1110
1141
msgid " brz info -vv"
1111
1142
msgstr ""
1112
1143
1113
#: breezy/builtins.py:1872
1144
#: breezy/builtins.py:1928
1114
1145
msgid "Remove files or directories."
1115
1146
msgstr ""
1116
1147
1117
#: breezy/builtins.py:1874
1148
#: breezy/builtins.py:1930
1118
1149
msgid ""
1119
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1150
"This makes Breezy stop tracking changes to the specified files. Breezy will\n"
1120
1151
"delete them if they can easily be recovered using revert otherwise they\n"
1121
1152
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1122
"parameters are given Bazaar will scan for files that are being tracked by\n"
1123
"Bazaar but missing in your tree and stop tracking them for you."
1153
"parameters are given Breezy will scan for files that are being tracked by\n"
1154
"Breezy but missing in your tree and stop tracking them for you."
1124
1155
msgstr ""
1125
1156
1126
1157
# help of 'new' option of 'remove' command
1127
#: breezy/builtins.py:1883
1158
#: breezy/builtins.py:1939
1128
1159
msgid "Only remove files that have never been committed."
1129
1160
msgstr ""
1130
1161
1131
1162
# help of 'file-deletion-strategy' option of 'remove' command
1132
#: breezy/builtins.py:1885
1163
#: breezy/builtins.py:1941
1133
1164
msgid "The file deletion mode to be used."
1134
1165
msgstr ""
1135
1166
1136
1167
# title of 'file-deletion-strategy' option of 'remove' command
1137
#: breezy/builtins.py:1886
1168
#: breezy/builtins.py:1942
1138
1169
msgid "Deletion Strategy"
1139
1170
msgstr ""
1140
1171
1141
1172
# help of 'file-deletion-strategy=safe' option of 'remove' command
1142
#: breezy/builtins.py:1887
1173
#: breezy/builtins.py:1943
1143
1174
msgid "Backup changed files (default)."
1144
1175
msgstr ""
1145
1176
1146
1177
# help of 'file-deletion-strategy=keep' option of 'remove' command
1147
#: breezy/builtins.py:1888
1178
#: breezy/builtins.py:1944
1148
1179
msgid "Delete from brz but leave the working copy."
1149
1180
msgstr ""
1150
1181
1151
1182
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1152
#: breezy/builtins.py:1889
1183
#: breezy/builtins.py:1945
1153
1184
msgid "Don't backup changed files."
1154
1185
msgstr ""
1155
1186
1156
#: breezy/builtins.py:1910
1187
#: breezy/builtins.py:1966
1157
1188
msgid "No matching files."
1158
1189
msgstr ""
1159
1190
1160
#: breezy/builtins.py:1927
1191
#: breezy/builtins.py:1983
1161
1192
msgid "Reconcile brz metadata in a branch."
1162
1193
msgstr ""
1163
1194
1164
#: breezy/builtins.py:1929
1195
#: breezy/builtins.py:1985
1165
1196
msgid ""
1166
1197
"This can correct data mismatches that may have been caused by\n"
1167
1198
"previous ghost operations or brz upgrades. You should only\n"
1169
1200
"advises you to run it."
1170
1201
msgstr ""
1171
1202
1172
#: breezy/builtins.py:1934
1203
#: breezy/builtins.py:1990
1173
1204
msgid ""
1174
1205
"If a second branch is provided, cross-branch reconciliation is\n"
1175
1206
"also attempted, which will check that data like the tree root\n"
1177
1208
"correctly in both branches."
1178
1209
msgstr ""
1179
1210
1180
#: breezy/builtins.py:1939
1211
#: breezy/builtins.py:1995
1181
1212
msgid ""
1182
1213
"At the same time it is run it may recompress data resulting in\n"
1183
1214
"a potential saving in disk space or performance gain."
1184
1215
msgstr ""
1185
1216
1186
#: breezy/builtins.py:1942
1217
#: breezy/builtins.py:1998
1187
1218
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1188
1219
msgstr ""
1189
1220
1190
1221
# help of 'format=git-bare' option of 'init' command
1191
# help of 'format=git-bare' option of 'init-repository' command
1222
# help of 'format=git-bare' option of 'init-shared-repository' command
1192
1223
# help of 'format=git-bare' option of 'upgrade' command
1193
#: breezy/builtins.py:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
1224
#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
1194
1225
msgid "Bare GIT repository (no working tree)."
1195
1226
msgstr ""
1196
1227
1197
1228
# help of 'format=2a' option of 'init' command
1198
1229
# help of 'format=bzr' option of 'init' command
1199
1230
# help of 'format=default' option of 'init' command
1200
# help of 'format=2a' option of 'init-repository' command
1201
# help of 'format=bzr' option of 'init-repository' command
1202
# help of 'format=default' option of 'init-repository' command
1231
# help of 'format=2a' option of 'init-shared-repository' command
1232
# help of 'format=bzr' option of 'init-shared-repository' command
1233
# help of 'format=default' option of 'init-shared-repository' command
1203
1234
# help of 'format=2a' option of 'upgrade' command
1204
1235
# help of 'format=bzr' option of 'upgrade' command
1205
1236
# help of 'format=default' option of 'upgrade' command
1206
#: breezy/builtins.py:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
1237
#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
1207
1238
msgid "Format for the bzr 2.0 series.\n"
1208
1239
msgstr ""
1209
1240
1210
1241
# help of 'format=git' option of 'init' command
1211
# help of 'format=git' option of 'init-repository' command
1242
# help of 'format=git' option of 'init-shared-repository' command
1212
1243
# help of 'format=git' option of 'upgrade' command
1213
#: breezy/builtins.py:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
1244
#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
1214
1245
msgid "GIT repository."
1215
1246
msgstr ""
1216
1247
1217
#: breezy/builtins.py:2010
1248
#: breezy/builtins.py:2066
1218
1249
msgid "Make a directory into a versioned branch."
1219
1250
msgstr ""
1220
1251
1221
#: breezy/builtins.py:2012
1252
#: breezy/builtins.py:2068
1222
1253
msgid ""
1223
1254
"Use this to create an empty branch, or before importing an\n"
1224
1255
"existing project."
1225
1256
msgstr ""
1226
1257
1227
#: breezy/builtins.py:2015
1258
#: breezy/builtins.py:2071
1228
1259
msgid ""
1229
1260
"If there is a repository in a parent directory of the location, then\n"
1230
1261
"the history of the branch will be stored in the repository. Otherwise\n"
1232
1263
"in the .bzr directory."
1233
1264
msgstr ""
1234
1265
1235
#: breezy/builtins.py:2020
1266
#: breezy/builtins.py:2076
1236
1267
msgid ""
1237
1268
"If there is already a branch at the location but it has no working tree,\n"
1238
1269
"the tree can be populated with 'brz checkout'."
1239
1270
msgstr ""
1240
1271
1241
#: breezy/builtins.py:2023
1272
#: breezy/builtins.py:2079
1242
1273
msgid "Recipe for importing a tree of files::"
1243
1274
msgstr ""
1244
1275
1245
#: breezy/builtins.py:2025
1276
#: breezy/builtins.py:2081
1246
1277
msgid ""
1247
1278
" cd ~/project\n"
1248
1279
" brz init\n"
1253
1284
1254
1285
# help of 'create-prefix' option of 'init' command
1255
1286
# help of 'create-prefix' option of 'push' command
1256
#: breezy/builtins.py:2036
1287
#: breezy/builtins.py:2092
1257
1288
msgid "Create the path leading up to the branch if it does not already exist."
1258
1289
msgstr ""
1259
1290
1260
1291
# help of 'format' option of 'init' command
1261
#: breezy/builtins.py:2039
1292
#: breezy/builtins.py:2095
1262
1293
msgid "Specify a format for this branch. See \"help formats\" for a full list."
1263
1294
msgstr ""
1264
1295
1265
1296
# help of 'append-revisions-only' option of 'init' command
1266
#: breezy/builtins.py:2048
1297
#: breezy/builtins.py:2104
1267
1298
msgid "Never change revnos or the existing log. Append revisions to it only."
1268
1299
msgstr ""
1269
1300
1270
1301
# help of 'no-tree' option of 'init' command
1271
#: breezy/builtins.py:2051
1302
#: breezy/builtins.py:2107
1272
1303
msgid "Create a branch without a working tree."
1273
1304
msgstr ""
1274
1305
1275
#: breezy/builtins.py:2072 breezy/push.py:112
1306
#: breezy/builtins.py:2128 breezy/push.py:112
1276
1307
#, python-format
1277
1308
msgid ""
1278
1309
"Parent directory of %s does not exist.\n"
1279
1310
"You may supply --create-prefix to create all leading parent directories."
1280
1311
msgstr ""
1281
1312
1282
#: breezy/builtins.py:2107
1313
#: breezy/builtins.py:2163
1283
1314
msgid ""
1284
1315
"This branch format cannot be set to append-revisions-only. Try --default."
1285
1316
msgstr ""
1286
1317
1287
#: breezy/builtins.py:2118
1318
#: breezy/builtins.py:2174
1288
1319
#, python-brace-format
1289
1320
msgid "Created a {0} (format: {1})\n"
1290
1321
msgstr ""
1291
1322
1292
#: breezy/builtins.py:2127
1323
#: breezy/builtins.py:2183
1293
1324
#, python-format
1294
1325
msgid "Using shared repository: %s\n"
1295
1326
msgstr ""
1296
1327
1297
#: breezy/builtins.py:2131
1328
#: breezy/builtins.py:2187
1298
1329
msgid "Create a shared repository for branches to share storage space."
1299
1330
msgstr ""
1300
1331
1301
#: breezy/builtins.py:2133
1332
#: breezy/builtins.py:2189
1302
1333
msgid ""
1303
1334
"New branches created under the repository directory will store their\n"
1304
1335
"revisions in the repository, not in the branch directory. For branches\n"
1306
1337
"speeds up the creation of new branches."
1307
1338
msgstr ""
1308
1339
1309
#: breezy/builtins.py:2138
1340
#: breezy/builtins.py:2194
1310
1341
msgid ""
1311
1342
"If the --no-trees option is given then the branches in the repository\n"
1312
1343
"will not have working trees by default. They will still exist as\n"
1316
1347
"branches, such as on a server."
1317
1348
msgstr ""
1318
1349
1319
#: breezy/builtins.py:2145
1350
#: breezy/builtins.py:2201
1320
1351
msgid ""
1321
1352
":Examples:\n"
1322
1353
" Create a shared repository holding just branches::"
1323
1354
msgstr ""
1324
1355
1325
#: breezy/builtins.py:2148
1356
#: breezy/builtins.py:2204
1326
1357
msgid ""
1327
" brz init-repo --no-trees repo\n"
1358
" brz init-shared-repo --no-trees repo\n"
1328
1359
" brz init repo/trunk"
1329
1360
msgstr ""
1330
1361
1331
#: breezy/builtins.py:2151
1362
#: breezy/builtins.py:2207
1332
1363
msgid " Make a lightweight checkout elsewhere::"
1333
1364
msgstr ""
1334
1365
1335
#: breezy/builtins.py:2153
1366
#: breezy/builtins.py:2209
1336
1367
msgid ""
1337
1368
" brz checkout --lightweight repo/trunk trunk-checkout\n"
1338
1369
" cd trunk-checkout\n"
1339
1370
" (add files here)"
1340
1371
msgstr ""
1341
1372
1342
# help of 'format' option of 'init-repository' command
1343
#: breezy/builtins.py:2161
1373
# help of 'format' option of 'init-shared-repository' command
1374
#: breezy/builtins.py:2217
1344
1375
msgid ""
1345
1376
"Specify a format for this repository. See \"brz help formats\" for details."
1346
1377
msgstr ""
1347
1378
1348
# title of 'format' option of 'init-repository' command
1379
# title of 'format' option of 'init-shared-repository' command
1349
1380
# title of 'format' option of 'fast-import' command
1350
#: breezy/builtins.py:2167 breezy/plugins/fastimport/cmds.py:287
1381
#: breezy/builtins.py:2223 breezy/plugins/fastimport/cmds.py:287
1351
1382
msgid "Repository format"
1352
1383
msgstr ""
1353
1384
1354
# help of 'no-trees' option of 'init-repository' command
1355
#: breezy/builtins.py:2169
1385
# help of 'no-trees' option of 'init-shared-repository' command
1386
#: breezy/builtins.py:2225
1356
1387
msgid "Branches in the repository will default to not having a working tree."
1357
1388
msgstr ""
1358
1389
1359
#: breezy/builtins.py:2200
1390
# help of 'color' option of 'diff' command
1391
#: breezy/builtins.py:2255
1392
msgid ""
1393
"Color mode to use. \"always\": Always colorize output (default). \"auto\": "
1394
"Only colorize output if terminal supports it and STDOUT is a TTY. \"never"
1395
"\": Never colorize output."
1396
msgstr ""
1397
1398
#: breezy/builtins.py:2256
1360
1399
msgid "Show differences in the working tree, between revisions or branches."
1361
1400
msgstr ""
1362
1401
1363
#: breezy/builtins.py:2202
1402
#: breezy/builtins.py:2258
1364
1403
msgid ""
1365
1404
"If no arguments are given, all changes for the current tree are listed.\n"
1366
1405
"If files are given, only the changes in those files are listed.\n"
1370
1409
"given."
1371
1410
msgstr ""
1372
1411
1373
#: breezy/builtins.py:2209
1412
#: breezy/builtins.py:2265
1374
1413
msgid ""
1375
1414
"\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
1376
1415
"produces patches suitable for \"patch -p1\"."
1377
1416
msgstr ""
1378
1417
1379
#: breezy/builtins.py:2212
1418
#: breezy/builtins.py:2268
1380
1419
msgid ""
1381
1420
"Note that when using the -r argument with a range of revisions, the\n"
1382
1421
"differences are computed between the two specified revisions. That\n"
1386
1425
"in the range."
1387
1426
msgstr ""
1388
1427
1389
#: breezy/builtins.py:2219
1428
#: breezy/builtins.py:2275
1390
1429
msgid ""
1391
1430
":Exit values:\n"
1392
1431
" 1 - changed\n"
1395
1434
" 0 - no change"
1396
1435
msgstr ""
1397
1436
1398
#: breezy/builtins.py:2225
1437
#: breezy/builtins.py:2281
1399
1438
msgid ""
1400
1439
":Examples:\n"
1401
1440
" Shows the difference in the working tree versus the last commit::"
1402
1441
msgstr ""
1403
1442
1404
#: breezy/builtins.py:2228
1443
#: breezy/builtins.py:2284
1405
1444
msgid " brz diff"
1406
1445
msgstr ""
1407
1446
1408
#: breezy/builtins.py:2230
1447
#: breezy/builtins.py:2286
1409
1448
msgid " Difference between the working tree and revision 1::"
1410
1449
msgstr ""
1411
1450
1412
#: breezy/builtins.py:2232
1451
#: breezy/builtins.py:2288
1413
1452
msgid " brz diff -r1"
1414
1453
msgstr ""
1415
1454
1416
#: breezy/builtins.py:2234
1455
#: breezy/builtins.py:2290
1417
1456
msgid " Difference between revision 3 and revision 1::"
1418
1457
msgstr ""
1419
1458
1420
#: breezy/builtins.py:2236
1459
#: breezy/builtins.py:2292
1421
1460
msgid " brz diff -r1..3"
1422
1461
msgstr ""
1423
1462
1424
#: breezy/builtins.py:2238
1463
#: breezy/builtins.py:2294
1425
1464
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1426
1465
msgstr ""
1427
1466
1428
#: breezy/builtins.py:2240
1467
#: breezy/builtins.py:2296
1429
1468
msgid " brz diff -r1..3 xxx"
1430
1469
msgstr ""
1431
1470
1432
#: breezy/builtins.py:2242
1471
#: breezy/builtins.py:2298
1433
1472
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1434
1473
msgstr ""
1435
1474
1436
#: breezy/builtins.py:2244
1475
#: breezy/builtins.py:2300
1437
1476
msgid " brz diff -c2"
1438
1477
msgstr ""
1439
1478
1440
#: breezy/builtins.py:2246
1479
#: breezy/builtins.py:2302
1441
1480
msgid " To see the changes introduced by revision X::"
1442
1481
msgstr ""
1443
1482
1444
#: breezy/builtins.py:2248
1483
#: breezy/builtins.py:2304
1445
1484
msgid " brz diff -cX"
1446
1485
msgstr ""
1447
1486
1448
#: breezy/builtins.py:2250
1487
#: breezy/builtins.py:2306
1449
1488
msgid ""
1450
1489
" Note that in the case of a merge, the -c option shows the changes\n"
1451
1490
" compared to the left hand parent. To see the changes against\n"
1452
1491
" another parent, use::"
1453
1492
msgstr ""
1454
1493
1455
#: breezy/builtins.py:2254
1494
#: breezy/builtins.py:2310
1456
1495
msgid " brz diff -r<chosen_parent>..X"
1457
1496
msgstr ""
1458
1497
1459
#: breezy/builtins.py:2256
1498
#: breezy/builtins.py:2312
1460
1499
msgid ""
1461
1500
" The changes between the current revision and the previous revision\n"
1462
1501
" (equivalent to -c-1 and -r-2..-1)"
1463
1502
msgstr ""
1464
1503
1465
#: breezy/builtins.py:2259
1504
#: breezy/builtins.py:2315
1466
1505
msgid " brz diff -r-2.."
1467
1506
msgstr ""
1468
1507
1469
#: breezy/builtins.py:2261
1508
#: breezy/builtins.py:2317
1470
1509
msgid " Show just the differences for file NEWS::"
1471
1510
msgstr ""
1472
1511
1473
#: breezy/builtins.py:2263
1512
#: breezy/builtins.py:2319
1474
1513
msgid " brz diff NEWS"
1475
1514
msgstr ""
1476
1515
1477
#: breezy/builtins.py:2265
1516
#: breezy/builtins.py:2321
1478
1517
msgid " Show the differences in working tree xxx for file NEWS::"
1479
1518
msgstr ""
1480
1519
1481
#: breezy/builtins.py:2267
1520
#: breezy/builtins.py:2323
1482
1521
msgid " brz diff xxx/NEWS"
1483
1522
msgstr ""
1484
1523
1485
#: breezy/builtins.py:2269
1524
#: breezy/builtins.py:2325
1486
1525
msgid " Show the differences from branch xxx to this working tree:"
1487
1526
msgstr ""
1488
1527
1489
#: breezy/builtins.py:2271
1528
#: breezy/builtins.py:2327
1490
1529
msgid " brz diff --old xxx"
1491
1530
msgstr ""
1492
1531
1493
#: breezy/builtins.py:2273
1532
#: breezy/builtins.py:2329
1494
1533
msgid " Show the differences between two branches for file NEWS::"
1495
1534
msgstr ""
1496
1535
1497
#: breezy/builtins.py:2275
1536
#: breezy/builtins.py:2331
1498
1537
msgid " brz diff --old xxx --new yyy NEWS"
1499
1538
msgstr ""
1500
1539
1501
#: breezy/builtins.py:2277
1540
#: breezy/builtins.py:2333
1502
1541
msgid " Same as 'brz diff' but prefix paths with old/ and new/::"
1503
1542
msgstr ""
1504
1543
1505
#: breezy/builtins.py:2279
1544
#: breezy/builtins.py:2335
1506
1545
msgid " brz diff --prefix old/:new/"
1507
1546
msgstr ""
1508
1547
1509
#: breezy/builtins.py:2281
1548
#: breezy/builtins.py:2337
1510
1549
msgid " Show the differences using a custom diff program with options::"
1511
1550
msgstr ""
1512
1551
1513
#: breezy/builtins.py:2283
1552
#: breezy/builtins.py:2339
1514
1553
msgid " brz diff --using /usr/bin/diff --diff-options -wu"
1515
1554
msgstr ""
1516
1555
1517
1556
# help of 'diff-options' option of 'diff' command
1518
#: breezy/builtins.py:2289
1557
#: breezy/builtins.py:2345
1519
1558
msgid "Pass these options to the external diff program."
1520
1559
msgstr ""
1521
1560
1522
1561
# help of 'prefix' option of 'diff' command
1523
#: breezy/builtins.py:2292
1562
#: breezy/builtins.py:2348
1524
1563
msgid ""
1525
1564
"Set prefixes added to old and new filenames, as two values separated by a "
1526
1565
"colon. (eg \"old/:new/\")."
1527
1566
msgstr ""
1528
1567
1529
1568
# help of 'old' option of 'diff' command
1530
#: breezy/builtins.py:2295
1569
#: breezy/builtins.py:2351
1531
1570
msgid "Branch/tree to compare from."
1532
1571
msgstr ""
1533
1572
1534
1573
# help of 'new' option of 'diff' command
1535
#: breezy/builtins.py:2299
1574
#: breezy/builtins.py:2355
1536
1575
msgid "Branch/tree to compare to."
1537
1576
msgstr ""
1538
1577
1539
1578
# help of 'using' option of 'diff' command
1540
#: breezy/builtins.py:2305
1579
#: breezy/builtins.py:2361
1541
1580
msgid "Use this command to compare files."
1542
1581
msgstr ""
1543
1582
1544
1583
# help of 'format' option of 'diff' command
1545
#: breezy/builtins.py:2310
1584
#: breezy/builtins.py:2366
1546
1585
msgid "Diff format to use."
1547
1586
msgstr ""
1548
1587
1549
1588
# title of 'format' option of 'diff' command
1550
#: breezy/builtins.py:2312
1589
#: breezy/builtins.py:2368
1551
1590
msgid "Diff format"
1552
1591
msgstr ""
1553
1592
1554
1593
# help of 'context' option of 'diff' command
1555
#: breezy/builtins.py:2314
1594
#: breezy/builtins.py:2370
1556
1595
msgid "How many lines of context to show."
1557
1596
msgstr ""
1558
1597
1559
#: breezy/builtins.py:2339
1598
# title of 'color' option of 'diff' command
1599
#: breezy/builtins.py:2376
1600
msgid "Color Mode"
1601
msgstr ""
1602
1603
# help of 'check-style' option of 'diff' command
1604
#: breezy/builtins.py:2383
1605
msgid "Warn if trailing whitespace or spurious changes have been added."
1606
msgstr ""
1607
1608
#: breezy/builtins.py:2408
1560
1609
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1561
1610
msgstr ""
1562
1611
1563
#: breezy/builtins.py:2343
1612
#: breezy/builtins.py:2412
1564
1613
msgid "brz diff --revision takes exactly one or two revision specifiers"
1565
1614
msgstr ""
1566
1615
1567
#: breezy/builtins.py:2348 breezy/builtins.py:2744 breezy/builtins.py:2752
1616
#: breezy/builtins.py:2417 breezy/builtins.py:2823 breezy/builtins.py:2831
1568
1617
#, python-brace-format
1569
1618
msgid "{0} and {1} are mutually exclusive"
1570
1619
msgstr ""
1571
1620
1572
#: breezy/builtins.py:2368
1621
#: breezy/builtins.py:2447
1573
1622
msgid ""
1574
1623
"List files deleted in the working tree.\n"
1575
1624
" "
1576
1625
msgstr ""
1577
1626
1578
#: breezy/builtins.py:2443
1627
#: breezy/builtins.py:2522
1579
1628
msgid "Show the tree root directory."
1580
1629
msgstr ""
1581
1630
1582
#: breezy/builtins.py:2445
1631
#: breezy/builtins.py:2524
1583
1632
msgid ""
1584
1633
"The root is the nearest enclosing directory with a control\n"
1585
1634
"directory."
1586
1635
msgstr ""
1587
1636
1588
#: breezy/builtins.py:2461
1637
#: breezy/builtins.py:2540
1589
1638
msgid "The limit argument must be an integer."
1590
1639
msgstr ""
1591
1640
1592
#: breezy/builtins.py:2469
1641
#: breezy/builtins.py:2548
1593
1642
msgid "The levels argument must be an integer."
1594
1643
msgstr ""
1595
1644
1596
#: breezy/builtins.py:2474
1645
#: breezy/builtins.py:2553
1597
1646
msgid "Show historical log for a branch or subset of a branch."
1598
1647
msgstr ""
1599
1648
1600
#: breezy/builtins.py:2476
1649
#: breezy/builtins.py:2555
1601
1650
msgid ""
1602
1651
"log is brz's default tool for exploring the history of a branch.\n"
1603
1652
"The branch to use is taken from the first parameter. If no parameters\n"
1605
1654
"Here are some simple examples::"
1606
1655
msgstr ""
1607
1656
1608
#: breezy/builtins.py:2481
1657
#: breezy/builtins.py:2560
1609
1658
msgid ""
1610
1659
" brz log log the current branch\n"
1611
1660
" brz log foo.py log a file in its branch\n"
1612
1661
" brz log http://server/branch log a branch on a server"
1613
1662
msgstr ""
1614
1663
1615
#: breezy/builtins.py:2485
1664
#: breezy/builtins.py:2564
1616
1665
msgid ""
1617
1666
"The filtering, ordering and information shown for each revision can\n"
1618
1667
"be controlled as explained below. By default, all revisions are\n"
1622
1671
"were merged."
1623
1672
msgstr ""
1624
1673
1625
#: breezy/builtins.py:2492
1674
#: breezy/builtins.py:2571
1626
1675
msgid ":Output control:"
1627
1676
msgstr ""
1628
1677
1629
#: breezy/builtins.py:2494
1678
#: breezy/builtins.py:2573
1630
1679
msgid ""
1631
1680
" The log format controls how information about each revision is\n"
1632
1681
" displayed. The standard log formats are called ``long``, ``short``\n"
1634
1683
" for more details on log formats."
1635
1684
msgstr ""
1636
1685
1637
#: breezy/builtins.py:2499
1686
#: breezy/builtins.py:2578
1638
1687
msgid ""
1639
1688
" The following options can be used to control what information is\n"
1640
1689
" displayed::"
1641
1690
msgstr ""
1642
1691
1643
#: breezy/builtins.py:2502
1692
#: breezy/builtins.py:2581
1644
1693
msgid ""
1645
1694
" -l N display a maximum of N revisions\n"
1646
1695
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1649
1698
" --show-ids display revision-ids (and file-ids), not just revnos"
1650
1699
msgstr ""
1651
1700
1652
#: breezy/builtins.py:2508
1701
#: breezy/builtins.py:2587
1653
1702
msgid ""
1654
1703
" Note that the default number of levels to display is a function of the\n"
1655
1704
" log format. If the -n option is not used, the standard log formats show\n"
1656
1705
" just the top level (mainline)."
1657
1706
msgstr ""
1658
1707
1659
#: breezy/builtins.py:2512
1708
#: breezy/builtins.py:2591
1660
1709
msgid ""
1661
1710
" Status summaries are shown using status flags like A, M, etc. To see\n"
1662
1711
" the changes explained using words like ``added`` and ``modified``\n"
1663
1712
" instead, use the -vv option."
1664
1713
msgstr ""
1665
1714
1666
#: breezy/builtins.py:2516
1715
#: breezy/builtins.py:2595
1667
1716
msgid ":Ordering control:"
1668
1717
msgstr ""
1669
1718
1670
#: breezy/builtins.py:2518
1719
#: breezy/builtins.py:2597
1671
1720
msgid ""
1672
1721
" To display revisions from oldest to newest, use the --forward option.\n"
1673
1722
" In most cases, using this option will have little impact on the total\n"
1675
1724
" display revisions like --reverse does when it can."
1676
1725
msgstr ""
1677
1726
1678
#: breezy/builtins.py:2523
1727
#: breezy/builtins.py:2602
1679
1728
msgid ":Revision filtering:"
1680
1729
msgstr ""
1681
1730
1682
#: breezy/builtins.py:2525
1731
#: breezy/builtins.py:2604
1683
1732
msgid ""
1684
1733
" The -r option can be used to specify what revision or range of revisions\n"
1685
1734
" to filter against. The various forms are shown below::"
1686
1735
msgstr ""
1687
1736
1688
#: breezy/builtins.py:2528
1737
#: breezy/builtins.py:2607
1689
1738
msgid ""
1690
1739
" -rX display revision X\n"
1691
1740
" -rX.. display revision X and later\n"
1693
1742
" -rX..Y display from X to Y inclusive"
1694
1743
msgstr ""
1695
1744
1696
#: breezy/builtins.py:2533
1745
#: breezy/builtins.py:2612
1697
1746
msgid ""
1698
1747
" See ``brz help revisionspec`` for details on how to specify X and Y.\n"
1699
1748
" Some common examples are given below::"
1700
1749
msgstr ""
1701
1750
1702
#: breezy/builtins.py:2536
1751
#: breezy/builtins.py:2615
1703
1752
msgid ""
1704
1753
" -r-1 show just the tip\n"
1705
1754
" -r-10.. show the last 10 mainline revisions\n"
1709
1758
" -rdate:yesterday.. show changes since yesterday"
1710
1759
msgstr ""
1711
1760
1712
#: breezy/builtins.py:2543
1761
#: breezy/builtins.py:2622
1713
1762
msgid ""
1714
1763
" When logging a range of revisions using -rX..Y, log starts at\n"
1715
1764
" revision Y and searches back in history through the primary\n"
1719
1768
" a nested merge revision and the log will be truncated accordingly."
1720
1769
msgstr ""
1721
1770
1722
#: breezy/builtins.py:2550
1771
#: breezy/builtins.py:2629
1723
1772
msgid ":Path filtering:"
1724
1773
msgstr ""
1725
1774
1726
#: breezy/builtins.py:2552
1775
#: breezy/builtins.py:2631
1727
1776
msgid ""
1728
1777
" If parameters are given and the first one is not a branch, the log\n"
1729
1778
" will be filtered to show only those revisions that changed the\n"
1730
1779
" nominated files or directories."
1731
1780
msgstr ""
1732
1781
1733
#: breezy/builtins.py:2556
1782
#: breezy/builtins.py:2635
1734
1783
msgid ""
1735
1784
" Filenames are interpreted within their historical context. To log a\n"
1736
1785
" deleted file, specify a revision range so that the file existed at\n"
1737
1786
" the end or start of the range."
1738
1787
msgstr ""
1739
1788
1740
#: breezy/builtins.py:2560
1789
#: breezy/builtins.py:2639
1741
1790
msgid ""
1742
1791
" Historical context is also important when interpreting pathnames of\n"
1743
1792
" renamed files/directories. Consider the following example:"
1744
1793
msgstr ""
1745
1794
1746
#: breezy/builtins.py:2563
1795
#: breezy/builtins.py:2642
1747
1796
msgid ""
1748
1797
" * revision 1: add tutorial.txt\n"
1749
1798
" * revision 2: modify tutorial.txt\n"
1750
1799
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1751
1800
msgstr ""
1752
1801
1753
#: breezy/builtins.py:2567
1802
#: breezy/builtins.py:2646
1754
1803
msgid " In this case:"
1755
1804
msgstr ""
1756
1805
1757
#: breezy/builtins.py:2569
1806
#: breezy/builtins.py:2648
1758
1807
msgid " * ``brz log guide.txt`` will log the file added in revision 1"
1759
1808
msgstr ""
1760
1809
1761
#: breezy/builtins.py:2571
1810
#: breezy/builtins.py:2650
1762
1811
msgid " * ``brz log tutorial.txt`` will log the new file added in revision 3"
1763
1812
msgstr ""
1764
1813
1765
#: breezy/builtins.py:2573
1814
#: breezy/builtins.py:2652
1766
1815
msgid ""
1767
1816
" * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
1768
1817
" the original file in revision 2."
1769
1818
msgstr ""
1770
1819
1771
#: breezy/builtins.py:2576
1820
#: breezy/builtins.py:2655
1772
1821
msgid ""
1773
1822
" * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
1774
1823
" was no file called guide.txt in revision 2."
1775
1824
msgstr ""
1776
1825
1777
#: breezy/builtins.py:2579
1826
#: breezy/builtins.py:2658
1778
1827
msgid ""
1779
1828
" Renames are always followed by log. By design, there is no need to\n"
1780
1829
" explicitly ask for this (and no way to stop logging a file back\n"
1781
1830
" until it was last renamed)."
1782
1831
msgstr ""
1783
1832
1784
#: breezy/builtins.py:2583
1833
#: breezy/builtins.py:2662
1785
1834
msgid ":Other filtering:"
1786
1835
msgstr ""
1787
1836
1788
#: breezy/builtins.py:2585
1837
#: breezy/builtins.py:2664
1789
1838
msgid ""
1790
1839
" The --match option can be used for finding revisions that match a\n"
1791
1840
" regular expression in a commit message, committer, author or bug.\n"
1794
1843
" --match-message can be used to only match a specific field."
1795
1844
msgstr ""
1796
1845
1797
#: breezy/builtins.py:2591
1846
#: breezy/builtins.py:2670
1798
1847
msgid ":Tips & tricks:"
1799
1848
msgstr ""
1800
1849
1801
#: breezy/builtins.py:2593
1850
#: breezy/builtins.py:2672
1802
1851
msgid ""
1803
1852
" GUI tools and IDEs are often better at exploring history than command\n"
1804
1853
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1807
1856
" <http://wiki.bazaar.canonical.com/IDEIntegration>."
1808
1857
msgstr ""
1809
1858
1810
#: breezy/builtins.py:2599
1859
#: breezy/builtins.py:2678
1811
1860
msgid " You may find it useful to add the aliases below to ``breezy.conf``::"
1812
1861
msgstr ""
1813
1862
1814
#: breezy/builtins.py:2601
1863
#: breezy/builtins.py:2680
1815
1864
msgid ""
1816
1865
" [ALIASES]\n"
1817
1866
" tip = log -r-1\n"
1819
1868
" show = log -v -p"
1820
1869
msgstr ""
1821
1870
1822
#: breezy/builtins.py:2606
1871
#: breezy/builtins.py:2685
1823
1872
msgid ""
1824
1873
" ``brz tip`` will then show the latest revision while ``brz top``\n"
1825
1874
" will show the last 10 mainline revisions. To see the details of a\n"
1826
1875
" particular revision X, ``brz show -rX``."
1827
1876
msgstr ""
1828
1877
1829
#: breezy/builtins.py:2610
1878
#: breezy/builtins.py:2689
1830
1879
msgid ""
1831
1880
" If you are interested in looking deeper into a particular merge X,\n"
1832
1881
" use ``brz log -n0 -rX``."
1833
1882
msgstr ""
1834
1883
1835
#: breezy/builtins.py:2613
1884
#: breezy/builtins.py:2692
1836
1885
msgid ""
1837
1886
" ``brz log -v`` on a branch with lots of history is currently\n"
1838
1887
" very slow. A fix for this issue is currently under development.\n"
1840
1889
" be given when using the -v option."
1841
1890
msgstr ""
1842
1891
1843
#: breezy/builtins.py:2618
1892
#: breezy/builtins.py:2697
1844
1893
msgid ""
1845
1894
" brz has a generic full-text matching plugin, brz-search, that can be\n"
1846
1895
" used to find revisions matching user names, commit messages, etc.\n"
1848
1897
" a list of words but not others."
1849
1898
msgstr ""
1850
1899
1851
#: breezy/builtins.py:2623
1900
#: breezy/builtins.py:2702
1852
1901
msgid ""
1853
1902
" When exploring non-mainline history on large projects with deep\n"
1854
1903
" history, the performance of log can be greatly improved by installing\n"
1857
1906
msgstr ""
1858
1907
1859
1908
# help of 'forward' option of 'log' command
1860
#: breezy/builtins.py:2632
1909
#: breezy/builtins.py:2711
1861
1910
msgid "Show from oldest to newest."
1862
1911
msgstr ""
1863
1912
1864
1913
# help of 'verbose' option of 'log' command
1865
#: breezy/builtins.py:2635
1914
#: breezy/builtins.py:2714
1866
1915
msgid "Show files changed in each revision."
1867
1916
msgstr ""
1868
1917
1869
1918
# help of 'change' option of 'log' command
1870
#: breezy/builtins.py:2641
1919
#: breezy/builtins.py:2720
1871
1920
msgid "Show just the specified revision. See also \"help revisionspec\"."
1872
1921
msgstr ""
1873
1922
1874
1923
# help of 'authors' option of 'log' command
1875
#: breezy/builtins.py:2645
1924
#: breezy/builtins.py:2724
1876
1925
msgid "What names to list as authors - first, all or committer."
1877
1926
msgstr ""
1878
1927
1879
1928
# title of 'authors' option of 'log' command
1880
#: breezy/builtins.py:2646
1929
#: breezy/builtins.py:2725
1881
1930
msgid "Authors"
1882
1931
msgstr ""
1883
1932
1884
1933
# help of 'levels' option of 'log' command
1885
#: breezy/builtins.py:2652
1934
#: breezy/builtins.py:2731
1886
1935
msgid "Number of levels to display - 0 for all, 1 for flat."
1887
1936
msgstr ""
1888
1937
1889
1938
# help of 'limit' option of 'log' command
1890
#: breezy/builtins.py:2662
1939
#: breezy/builtins.py:2741
1891
1940
msgid "Limit the output to the first N revisions."
1892
1941
msgstr ""
1893
1942
1894
1943
# help of 'show-diff' option of 'log' command
1895
#: breezy/builtins.py:2667
1944
#: breezy/builtins.py:2746
1896
1945
msgid "Show changes made in each revision as a patch."
1897
1946
msgstr ""
1898
1947
1899
1948
# help of 'include-merged' option of 'log' command
1900
#: breezy/builtins.py:2669
1949
#: breezy/builtins.py:2748
1901
1950
msgid "Show merged revisions like --levels 0 does."
1902
1951
msgstr ""
1903
1952
1904
1953
# help of 'omit-merges' option of 'log' command
1905
#: breezy/builtins.py:2673
1954
#: breezy/builtins.py:2752
1906
1955
msgid "Do not report commits with more than one parent."
1907
1956
msgstr ""
1908
1957
1909
1958
# help of 'exclude-common-ancestry' option of 'log' command
1910
#: breezy/builtins.py:2675
1959
#: breezy/builtins.py:2754
1911
1960
msgid ""
1912
1961
"Display only the revisions that are not part of both ancestries (require -"
1913
1962
"rX..Y)."
1914
1963
msgstr ""
1915
1964
1916
1965
# help of 'signatures' option of 'log' command
1917
#: breezy/builtins.py:2679
1966
#: breezy/builtins.py:2758
1918
1967
msgid "Show digital signature validity."
1919
1968
msgstr ""
1920
1969
1921
1970
# help of 'match' option of 'log' command
1922
#: breezy/builtins.py:2682
1971
#: breezy/builtins.py:2761
1923
1972
msgid "Show revisions whose properties match this expression."
1924
1973
msgstr ""
1925
1974
1926
1975
# help of 'match-message' option of 'log' command
1927
#: breezy/builtins.py:2686
1976
#: breezy/builtins.py:2765
1928
1977
msgid "Show revisions whose message matches this expression."
1929
1978
msgstr ""
1930
1979
1931
1980
# help of 'match-committer' option of 'log' command
1932
#: breezy/builtins.py:2690
1981
#: breezy/builtins.py:2769
1933
1982
msgid "Show revisions whose committer matches this expression."
1934
1983
msgstr ""
1935
1984
1936
1985
# help of 'match-author' option of 'log' command
1937
#: breezy/builtins.py:2694
1986
#: breezy/builtins.py:2773
1938
1987
msgid "Show revisions whose authors match this expression."
1939
1988
msgstr ""
1940
1989
1941
1990
# help of 'match-bugs' option of 'log' command
1942
#: breezy/builtins.py:2698
1991
#: breezy/builtins.py:2777
1943
1992
msgid "Show revisions whose bugs match this expression."
1944
1993
msgstr ""
1945
1994
1946
#: breezy/builtins.py:2738
1995
#: breezy/builtins.py:2817
1947
1996
msgid "--exclude-common-ancestry requires -r with two revisions"
1948
1997
msgstr ""
1949
1998
1950
#: breezy/builtins.py:2766
1999
#: breezy/builtins.py:2845
1951
2000
#, python-format
1952
2001
msgid "Path unknown at end or start of revision range: %s"
1953
2002
msgstr ""
1954
2003
1955
#: breezy/builtins.py:2884
2004
#: breezy/builtins.py:2963
1956
2005
#, python-format
1957
2006
msgid "brz %s doesn't accept two revisions in different branches."
1958
2007
msgstr ""
1959
2008
1960
#: breezy/builtins.py:2900
2009
#: breezy/builtins.py:2979
1961
2010
#, python-format
1962
2011
msgid "brz %s --revision takes one or two values."
1963
2012
msgstr ""
1964
2013
1965
#: breezy/builtins.py:2945
2014
#: breezy/builtins.py:3024
1966
2015
msgid ""
1967
2016
"List files in a tree.\n"
1968
2017
" "
1969
2018
msgstr ""
1970
2019
1971
2020
# help of 'recursive' option of 'ls' command
1972
#: breezy/builtins.py:2954
2021
#: breezy/builtins.py:3033
1973
2022
msgid "Recurse into subdirectories."
1974
2023
msgstr ""
1975
2024
1976
2025
# help of 'from-root' option of 'ls' command
1977
#: breezy/builtins.py:2956
2026
#: breezy/builtins.py:3035
1978
2027
msgid "Print paths relative to the root of the branch."
1979
2028
msgstr ""
1980
2029
1981
2030
# help of 'unknown' option of 'ls' command
1982
#: breezy/builtins.py:2958
2031
#: breezy/builtins.py:3037
1983
2032
msgid "Print unknown files."
1984
2033
msgstr ""
1985
2034
1986
2035
# help of 'versioned' option of 'ls' command
1987
#: breezy/builtins.py:2959
2036
#: breezy/builtins.py:3038
1988
2037
msgid "Print versioned files."
1989
2038
msgstr ""
1990
2039
1991
2040
# help of 'ignored' option of 'ls' command
1992
#: breezy/builtins.py:2962
2041
#: breezy/builtins.py:3041
1993
2042
msgid "Print ignored files."
1994
2043
msgstr ""
1995
2044
1996
2045
# help of 'kind' option of 'ls' command
1997
#: breezy/builtins.py:2964
2046
#: breezy/builtins.py:3043
1998
2047
msgid ""
1999
2048
"List entries of a particular kind: file, directory, symlink, tree-reference."
2000
2049
msgstr ""
2001
2050
2002
#: breezy/builtins.py:2979
2051
#: breezy/builtins.py:3058
2003
2052
msgid "invalid kind specified"
2004
2053
msgstr ""
2005
2054
2006
#: breezy/builtins.py:2983
2055
#: breezy/builtins.py:3062
2007
2056
msgid "Cannot set both --verbose and --null"
2008
2057
msgstr ""
2009
2058
2010
#: breezy/builtins.py:2992
2059
#: breezy/builtins.py:3071
2011
2060
msgid "cannot specify both --from-root and PATH"
2012
2061
msgstr ""
2013
2062
2014
#: breezy/builtins.py:3079
2063
#: breezy/builtins.py:3158
2015
2064
msgid "Ignore specified files or patterns."
2016
2065
msgstr ""
2017
2066
2018
#: breezy/builtins.py:3081
2067
#: breezy/builtins.py:3160
2019
2068
msgid "See ``brz help patterns`` for details on the syntax of patterns."
2020
2069
msgstr ""
2021
2070
2022
#: breezy/builtins.py:3083
2071
#: breezy/builtins.py:3162
2023
2072
msgid ""
2024
2073
"If a .bzrignore file does not exist, the ignore command\n"
2025
2074
"will create one and add the specified files or patterns to the newly\n"
2028
2077
"the use of the ignore command will require an explicit add command."
2029
2078
msgstr ""
2030
2079
2031
#: breezy/builtins.py:3089
2080
#: breezy/builtins.py:3168
2032
2081
msgid ""
2033
2082
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2034
2083
"After adding, editing or deleting that file either indirectly by\n"
2036
2085
"it."
2037
2086
msgstr ""
2038
2087
2039
#: breezy/builtins.py:3094
2088
#: breezy/builtins.py:3173
2040
2089
msgid ""
2041
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2042
"the global ignore file can be found in the application data directory as\n"
2043
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2090
"Breezy also supports a global ignore file ~/.config/breezy/ignore. On\n"
2091
"Windows the global ignore file can be found in the application data\n"
2092
"directory as\n"
2093
"C:\\Documents and Settings\\<user>\\Application Data\\Breezy\\3.0\\ignore.\n"
2044
2094
"Global ignores are not touched by this command. The global ignore file\n"
2045
2095
"can be edited directly using an editor."
2046
2096
msgstr ""
2047
2097
2048
#: breezy/builtins.py:3100
2098
#: breezy/builtins.py:3180
2049
2099
msgid ""
2050
2100
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2051
2101
"precedence over regular ignores. Such exceptions are used to specify\n"
2052
2102
"files that should be versioned which would otherwise be ignored."
2053
2103
msgstr ""
2054
2104
2055
#: breezy/builtins.py:3104
2105
#: breezy/builtins.py:3184
2056
2106
msgid ""
2057
2107
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2058
2108
"precedence over the '!' exception patterns."
2059
2109
msgstr ""
2060
2110
2061
#: breezy/builtins.py:3107
2111
#: breezy/builtins.py:3187
2062
2112
msgid ":Notes:"
2063
2113
msgstr ""
2064
2114
2065
#: breezy/builtins.py:3109
2115
#: breezy/builtins.py:3189
2066
2116
msgid ""
2067
2117
"* Ignore patterns containing shell wildcards must be quoted from\n"
2068
2118
" the shell on Unix."
2069
2119
msgstr ""
2070
2120
2071
#: breezy/builtins.py:3112
2121
#: breezy/builtins.py:3192
2072
2122
msgid ""
2073
2123
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2074
2124
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2075
2125
msgstr ""
2076
2126
2077
#: breezy/builtins.py:3115
2127
#: breezy/builtins.py:3195
2078
2128
msgid ""
2079
2129
":Examples:\n"
2080
2130
" Ignore the top level Makefile::"
2081
2131
msgstr ""
2082
2132
2083
#: breezy/builtins.py:3118
2133
#: breezy/builtins.py:3198
2084
2134
msgid " brz ignore ./Makefile"
2085
2135
msgstr ""
2086
2136
2087
#: breezy/builtins.py:3120
2137
#: breezy/builtins.py:3200
2088
2138
msgid " Ignore .class files in all directories...::"
2089
2139
msgstr ""
2090
2140
2091
#: breezy/builtins.py:3122
2141
#: breezy/builtins.py:3202
2092
2142
msgid " brz ignore \"*.class\""
2093
2143
msgstr ""
2094
2144
2095
#: breezy/builtins.py:3124
2145
#: breezy/builtins.py:3204
2096
2146
msgid " ...but do not ignore \"special.class\"::"
2097
2147
msgstr ""
2098
2148
2099
#: breezy/builtins.py:3126
2149
#: breezy/builtins.py:3206
2100
2150
msgid " brz ignore \"!special.class\""
2101
2151
msgstr ""
2102
2152
2103
#: breezy/builtins.py:3128
2153
#: breezy/builtins.py:3208
2104
2154
msgid " Ignore files whose name begins with the \"#\" character::"
2105
2155
msgstr ""
2106
2156
2107
#: breezy/builtins.py:3130
2157
#: breezy/builtins.py:3210
2108
2158
msgid " brz ignore \"RE:^#\""
2109
2159
msgstr ""
2110
2160
2111
#: breezy/builtins.py:3132 breezy/builtins.py:3136
2161
#: breezy/builtins.py:3212 breezy/builtins.py:3216
2112
2162
msgid " Ignore .o files under the lib directory::"
2113
2163
msgstr ""
2114
2164
2115
#: breezy/builtins.py:3134
2165
#: breezy/builtins.py:3214
2116
2166
msgid " brz ignore \"lib/**/*.o\""
2117
2167
msgstr ""
2118
2168
2119
#: breezy/builtins.py:3138
2169
#: breezy/builtins.py:3218
2120
2170
msgid " brz ignore \"RE:lib/.*\\.o\""
2121
2171
msgstr ""
2122
2172
2123
#: breezy/builtins.py:3140
2173
#: breezy/builtins.py:3220
2124
2174
msgid " Ignore everything but the \"debian\" toplevel directory::"
2125
2175
msgstr ""
2126
2176
2127
#: breezy/builtins.py:3142
2177
#: breezy/builtins.py:3222
2128
2178
msgid " brz ignore \"RE:(?!debian/).*\""
2129
2179
msgstr ""
2130
2180
2131
#: breezy/builtins.py:3144
2181
#: breezy/builtins.py:3224
2132
2182
msgid ""
2133
2183
" Ignore everything except the \"local\" toplevel directory,\n"
2134
2184
" but always ignore autosave files ending in ~, even under local/::"
2135
2185
msgstr ""
2136
2186
2137
#: breezy/builtins.py:3147
2187
#: breezy/builtins.py:3227
2138
2188
msgid ""
2139
2189
" brz ignore \"*\"\n"
2140
2190
" brz ignore \"!./local\"\n"
2142
2192
msgstr ""
2143
2193
2144
2194
# help of 'default-rules' option of 'ignore' command
2145
#: breezy/builtins.py:3156
2195
#: breezy/builtins.py:3236
2146
2196
msgid "Display the default ignore rules that brz uses."
2147
2197
msgstr ""
2148
2198
2149
#: breezy/builtins.py:3168
2199
#: breezy/builtins.py:3248
2150
2200
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2151
2201
msgstr ""
2152
2202
2153
#: breezy/builtins.py:3179
2203
#: breezy/builtins.py:3259
2154
2204
#, python-format
2155
2205
msgid "Invalid ignore pattern found. %s"
2156
2206
msgid_plural "Invalid ignore patterns found. %s"
2157
2207
msgstr[0] ""
2158
2208
msgstr[1] ""
2159
2209
2160
#: breezy/builtins.py:3188
2210
#: breezy/builtins.py:3268
2161
2211
msgid "NAME_PATTERN should not be an absolute path"
2162
2212
msgstr ""
2163
2213
2164
#: breezy/builtins.py:3200
2214
#: breezy/builtins.py:3280
2165
2215
#, python-format
2166
2216
msgid ""
2167
2217
"Warning: the following files are version controlled and match your ignore "
2171
2221
"them.\n"
2172
2222
msgstr ""
2173
2223
2174
#: breezy/builtins.py:3207
2224
#: breezy/builtins.py:3287
2175
2225
msgid "List ignored files and the patterns that matched them."
2176
2226
msgstr ""
2177
2227
2178
#: breezy/builtins.py:3209
2228
#: breezy/builtins.py:3289
2179
2229
msgid ""
2180
2230
"List all the ignored files and the ignore pattern that caused the file to\n"
2181
2231
"be ignored."
2182
2232
msgstr ""
2183
2233
2184
#: breezy/builtins.py:3212
2234
#: breezy/builtins.py:3292
2185
2235
msgid "Alternatively, to list just the files::"
2186
2236
msgstr ""
2187
2237
2188
#: breezy/builtins.py:3214
2238
#: breezy/builtins.py:3294
2189
2239
msgid " brz ls --ignored"
2190
2240
msgstr ""
2191
2241
2192
#: breezy/builtins.py:3248
2242
#: breezy/builtins.py:3328
2193
2243
#, python-format
2194
2244
msgid "not a valid revision-number: %r"
2195
2245
msgstr ""
2196
2246
2197
#: breezy/builtins.py:3256
2247
#: breezy/builtins.py:3336
2198
2248
msgid "Export current or past revision to a destination directory or archive."
2199
2249
msgstr ""
2200
2250
2201
#: breezy/builtins.py:3258
2251
#: breezy/builtins.py:3338
2202
2252
msgid "If no revision is specified this exports the last committed revision."
2203
2253
msgstr ""
2204
2254
2205
#: breezy/builtins.py:3260
2255
#: breezy/builtins.py:3340
2206
2256
msgid ""
2207
2257
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2208
2258
"given, try to find the format with the extension. If no extension\n"
2209
2259
"is found exports to a directory (equivalent to --format=dir)."
2210
2260
msgstr ""
2211
2261
2212
#: breezy/builtins.py:3264
2262
#: breezy/builtins.py:3344
2213
2263
msgid ""
2214
2264
"If root is supplied, it will be used as the root directory inside\n"
2215
2265
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2216
2266
"to the exported filename. The root option has no effect for 'dir' format."
2217
2267
msgstr ""
2218
2268
2219
#: breezy/builtins.py:3268
2269
#: breezy/builtins.py:3348
2220
2270
msgid ""
2221
2271
"If branch is omitted then the branch containing the current working\n"
2222
2272
"directory will be used."
2223
2273
msgstr ""
2224
2274
2225
#: breezy/builtins.py:3271
2275
#: breezy/builtins.py:3351
2226
2276
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2227
2277
msgstr ""
2228
2278
2229
#: breezy/builtins.py:3273
2279
#: breezy/builtins.py:3353
2230
2280
msgid ""
2231
2281
" ================= =========================\n"
2232
2282
" Supported formats Autodetected by extension\n"
2240
2290
msgstr ""
2241
2291
2242
2292
# help of 'format' option of 'export' command
2243
#: breezy/builtins.py:3288
2293
#: breezy/builtins.py:3368
2244
2294
msgid "Type of file to export to."
2245
2295
msgstr ""
2246
2296
2247
2297
# help of 'filters' option of 'export' command
2248
#: breezy/builtins.py:3291
2298
#: breezy/builtins.py:3371
2249
2299
msgid "Apply content filters to export the convenient form."
2250
2300
msgstr ""
2251
2301
2252
2302
# help of 'root' option of 'export' command
2253
#: breezy/builtins.py:3295
2303
#: breezy/builtins.py:3375
2254
2304
msgid "Name of the root directory inside the exported file."
2255
2305
msgstr ""
2256
2306
2257
2307
# help of 'per-file-timestamps' option of 'export' command
2258
#: breezy/builtins.py:3297
2308
#: breezy/builtins.py:3377
2259
2309
msgid ""
2260
2310
"Set modification time of files to that of the last revision in which it was "
2261
2311
"changed."
2262
2312
msgstr ""
2263
2313
2264
2314
# help of 'uncommitted' option of 'export' command
2265
#: breezy/builtins.py:3300
2315
#: breezy/builtins.py:3380
2266
2316
msgid "Export the working tree contents rather than that of the last revision."
2267
2317
msgstr ""
2268
2318
2269
#: breezy/builtins.py:3320
2319
#: breezy/builtins.py:3400
2270
2320
msgid "--uncommitted requires a working tree"
2271
2321
msgstr ""
2272
2322
2273
#: breezy/builtins.py:3348
2323
#: breezy/builtins.py:3428
2274
2324
#, python-format
2275
2325
msgid "Unsupported export format: %s"
2276
2326
msgstr ""
2277
2327
2278
#: breezy/builtins.py:3352
2328
#: breezy/builtins.py:3432
2279
2329
msgid "Write the contents of a file as of a given revision to standard output."
2280
2330
msgstr ""
2281
2331
2282
#: breezy/builtins.py:3354
2332
#: breezy/builtins.py:3434
2283
2333
msgid "If no revision is nominated, the last revision is used."
2284
2334
msgstr ""
2285
2335
2286
#: breezy/builtins.py:3356
2336
#: breezy/builtins.py:3436
2287
2337
msgid ""
2288
2338
"Note: Take care to redirect standard output when using this command on a\n"
2289
2339
"binary file."
2290
2340
msgstr ""
2291
2341
2292
2342
# help of 'name-from-revision' option of 'cat' command
2293
#: breezy/builtins.py:3363
2343
#: breezy/builtins.py:3443
2294
2344
msgid "The path name in the old tree."
2295
2345
msgstr ""
2296
2346
2297
2347
# help of 'filters' option of 'cat' command
2298
#: breezy/builtins.py:3364
2348
#: breezy/builtins.py:3444
2299
2349
msgid "Apply content filters to display the convenience form."
2300
2350
msgstr ""
2301
2351
2302
#: breezy/builtins.py:3375
2352
#: breezy/builtins.py:3455
2303
2353
msgid "brz cat --revision takes exactly one revision specifier"
2304
2354
msgstr ""
2305
2355
2306
#: breezy/builtins.py:3395 breezy/builtins.py:3409
2356
#: breezy/builtins.py:3475 breezy/builtins.py:3489
2307
2357
msgid "{0!r} is not present in revision {1}"
2308
2358
msgstr ""
2309
2359
2310
#: breezy/builtins.py:3436
2360
#: breezy/builtins.py:3516
2311
2361
msgid "Commit changes into a new revision."
2312
2362
msgstr ""
2313
2363
2314
#: breezy/builtins.py:3438
2364
#: breezy/builtins.py:3518
2315
2365
msgid ""
2316
2366
"An explanatory message needs to be given for each commit. This is\n"
2317
2367
"often done by using the --message option (getting the message from the\n"
2321
2371
"boilerplate text loaded into the editor, use the --show-diff option."
2322
2372
msgstr ""
2323
2373
2324
#: breezy/builtins.py:3445
2374
#: breezy/builtins.py:3525
2325
2375
msgid ""
2326
2376
"By default, the entire tree is committed and the person doing the\n"
2327
2377
"commit is assumed to be the author. These defaults can be overridden\n"
2328
2378
"as explained below."
2329
2379
msgstr ""
2330
2380
2331
#: breezy/builtins.py:3449
2381
#: breezy/builtins.py:3529
2332
2382
msgid ":Selective commits:"
2333
2383
msgstr ""
2334
2384
2335
#: breezy/builtins.py:3451
2385
#: breezy/builtins.py:3531
2336
2386
msgid ""
2337
2387
" If selected files are specified, only changes to those files are\n"
2338
2388
" committed. If a directory is specified then the directory and\n"
2339
2389
" everything within it is committed."
2340
2390
msgstr ""
2341
2391
2342
#: breezy/builtins.py:3455
2392
#: breezy/builtins.py:3535
2343
2393
msgid ""
2344
2394
" When excludes are given, they take precedence over selected files.\n"
2345
2395
" For example, to commit only changes within foo, but not changes\n"
2346
2396
" within foo/bar::"
2347
2397
msgstr ""
2348
2398
2349
#: breezy/builtins.py:3459
2399
#: breezy/builtins.py:3539
2350
2400
msgid " brz commit foo -x foo/bar"
2351
2401
msgstr ""
2352
2402
2353
#: breezy/builtins.py:3461
2403
#: breezy/builtins.py:3541
2354
2404
msgid " A selective commit after a merge is not yet supported."
2355
2405
msgstr ""
2356
2406
2357
#: breezy/builtins.py:3463
2407
#: breezy/builtins.py:3543
2358
2408
msgid ":Custom authors:"
2359
2409
msgstr ""
2360
2410
2361
#: breezy/builtins.py:3465
2411
#: breezy/builtins.py:3545
2362
2412
msgid ""
2363
2413
" If the author of the change is not the same person as the committer,\n"
2364
2414
" you can specify the author's name using the --author option. The\n"
2368
2418
" author."
2369
2419
msgstr ""
2370
2420
2371
#: breezy/builtins.py:3472
2421
#: breezy/builtins.py:3552
2372
2422
msgid ":Checks:"
2373
2423
msgstr ""
2374
2424
2375
#: breezy/builtins.py:3474
2425
#: breezy/builtins.py:3554
2376
2426
msgid ""
2377
2427
" A common mistake is to forget to add a new file or directory before\n"
2378
2428
" running the commit command. The --strict option checks for unknown\n"
2381
2431
" for details."
2382
2432
msgstr ""
2383
2433
2384
#: breezy/builtins.py:3480
2434
#: breezy/builtins.py:3560
2385
2435
msgid ":Things to note:"
2386
2436
msgstr ""
2387
2437
2388
#: breezy/builtins.py:3482
2438
#: breezy/builtins.py:3562
2389
2439
msgid ""
2390
" If you accidentially commit the wrong changes or make a spelling\n"
2440
" If you accidentally commit the wrong changes or make a spelling\n"
2391
2441
" mistake in the commit message say, you can use the uncommit command\n"
2392
2442
" to undo it. See ``brz help uncommit`` for details."
2393
2443
msgstr ""
2394
2444
2395
#: breezy/builtins.py:3486
2445
#: breezy/builtins.py:3566
2396
2446
msgid ""
2397
2447
" Hooks can also be configured to run after a commit. This allows you\n"
2398
2448
" to trigger updates to external systems like bug trackers. The --fixes\n"
2401
2451
msgstr ""
2402
2452
2403
2453
# help of 'exclude' option of 'commit' command
2404
#: breezy/builtins.py:3497
2454
#: breezy/builtins.py:3577
2405
2455
msgid "Do not consider changes made to a given path."
2406
2456
msgstr ""
2407
2457
2408
2458
# help of 'message' option of 'commit' command
2409
#: breezy/builtins.py:3500
2459
#: breezy/builtins.py:3580
2410
2460
msgid "Description of the new revision."
2411
2461
msgstr ""
2412
2462
2413
2463
# help of 'unchanged' option of 'commit' command
2414
#: breezy/builtins.py:3503
2464
#: breezy/builtins.py:3583
2415
2465
msgid "Commit even if nothing has changed."
2416
2466
msgstr ""
2417
2467
2418
2468
# help of 'file' option of 'commit' command
2419
#: breezy/builtins.py:3507
2469
#: breezy/builtins.py:3587
2420
2470
msgid "Take commit message from this file."
2421
2471
msgstr ""
2422
2472
2423
2473
# help of 'strict' option of 'commit' command
2424
#: breezy/builtins.py:3509
2474
#: breezy/builtins.py:3589
2425
2475
msgid "Refuse to commit if there are unknown files in the working tree."
2426
2476
msgstr ""
2427
2477
2428
2478
# help of 'commit-time' option of 'commit' command
2429
#: breezy/builtins.py:3512
2479
#: breezy/builtins.py:3592
2430
2480
msgid ""
2431
2481
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2432
2482
"08:00:00 +0100'."
2433
2483
msgstr ""
2434
2484
2435
2485
# help of 'bugs' option of 'commit' command
2436
#: breezy/builtins.py:3516
2486
#: breezy/builtins.py:3596
2437
2487
msgid "Link to a related bug. (see \"brz help bugs\")."
2438
2488
msgstr ""
2439
2489
2440
2490
# help of 'fixes' option of 'commit' command
2441
#: breezy/builtins.py:3519
2491
#: breezy/builtins.py:3599
2442
2492
msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
2443
2493
msgstr ""
2444
2494
2445
2495
# help of 'author' option of 'commit' command
2446
#: breezy/builtins.py:3523
2496
#: breezy/builtins.py:3603
2447
2497
msgid "Set the author's name, if it's different from the committer."
2448
2498
msgstr ""
2449
2499
2450
2500
# help of 'local' option of 'commit' command
2451
#: breezy/builtins.py:3526
2501
#: breezy/builtins.py:3606
2452
2502
msgid ""
2453
2503
"Perform a local commit in a bound branch. Local commits are not pushed to "
2454
2504
"the master branch until a normal commit is performed."
2455
2505
msgstr ""
2456
2506
2457
2507
# help of 'show-diff' option of 'commit' command
2458
#: breezy/builtins.py:3532
2508
#: breezy/builtins.py:3612
2459
2509
msgid ""
2460
2510
"When no message is supplied, show the diff along with the status summary in "
2461
2511
"the message editor."
2462
2512
msgstr ""
2463
2513
2464
2514
# help of 'lossy' option of 'commit' command
2465
#: breezy/builtins.py:3535
2515
#: breezy/builtins.py:3615
2466
2516
msgid ""
2467
2517
"When committing to a foreign version control system do not push data that "
2468
2518
"can not be natively represented."
2469
2519
msgstr ""
2470
2520
2471
#: breezy/builtins.py:3552
2521
#: breezy/builtins.py:3632
2472
2522
#, python-format
2473
2523
msgid ""
2474
2524
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2476
2526
"See \"brz help bugs\" for more information on this feature. Commit refused."
2477
2527
msgstr ""
2478
2528
2479
#: breezy/builtins.py:3561
2529
#: breezy/builtins.py:3641
2480
2530
#, python-format
2481
2531
msgid ""
2482
2532
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
2484
2534
"Commit refused."
2485
2535
msgstr ""
2486
2536
2487
#: breezy/builtins.py:3570
2537
#: breezy/builtins.py:3650
2488
2538
#, python-format
2489
2539
msgid "Unrecognized bug %s. Commit refused."
2490
2540
msgstr ""
2491
2541
2492
#: breezy/builtins.py:3573
2542
#: breezy/builtins.py:3653
2493
2543
#, python-format
2494
2544
msgid ""
2495
2545
"%s\n"
2496
2546
"Commit refused."
2497
2547
msgstr ""
2498
2548
2499
#: breezy/builtins.py:3600
2549
#: breezy/builtins.py:3680
2500
2550
msgid "Could not parse --commit-time: "
2501
2551
msgstr ""
2502
2552
2503
#: breezy/builtins.py:3644
2553
#: breezy/builtins.py:3724
2504
2554
msgid "please specify either --message or --file"
2505
2555
msgstr ""
2506
2556
2507
#: breezy/builtins.py:3674
2557
#: breezy/builtins.py:3754
2508
2558
msgid "please specify a commit message with either --message or --file"
2509
2559
msgstr ""
2510
2560
2511
#: breezy/builtins.py:3677
2561
#: breezy/builtins.py:3757
2512
2562
msgid ""
2513
2563
"Empty commit message specified. Please specify a commit message with either "
2514
2564
"--message or --file or leave a blank message with --message \"\"."
2515
2565
msgstr ""
2516
2566
2517
#: breezy/builtins.py:3697
2567
#: breezy/builtins.py:3777
2518
2568
msgid ""
2519
2569
"No changes to commit. Please 'brz add' the files you want to commit, or use "
2520
2570
"--unchanged to force an empty commit."
2521
2571
msgstr ""
2522
2572
2523
#: breezy/builtins.py:3701
2573
#: breezy/builtins.py:3781
2524
2574
msgid ""
2525
2575
"Conflicts detected in working tree. Use \"brz conflicts\" to list, \"brz "
2526
2576
"resolve FILE\" to resolve."
2527
2577
msgstr ""
2528
2578
2529
#: breezy/builtins.py:3705
2579
#: breezy/builtins.py:3785
2530
2580
msgid "Commit refused because there are unknown files in the working tree."
2531
2581
msgstr ""
2532
2582
2533
#: breezy/builtins.py:3708
2583
#: breezy/builtins.py:3788
2534
2584
msgid ""
2535
2585
"\n"
2536
2586
"To commit to master branch, run update and then commit.\n"
2537
2587
"You can also pass --local to commit to continue working disconnected."
2538
2588
msgstr ""
2539
2589
2540
#: breezy/builtins.py:3716
2590
#: breezy/builtins.py:3796
2541
2591
msgid ""
2542
2592
"Validate working tree structure, branch consistency and repository history."
2543
2593
msgstr ""
2544
2594
2545
#: breezy/builtins.py:3718
2595
#: breezy/builtins.py:3798
2546
2596
msgid ""
2547
2597
"This command checks various invariants about branch and repository storage\n"
2548
2598
"to detect data corruption or brz bugs."
2549
2599
msgstr ""
2550
2600
2551
#: breezy/builtins.py:3721
2601
#: breezy/builtins.py:3801
2552
2602
msgid ""
2553
2603
"The working tree and branch checks will only give output if a problem is\n"
2554
2604
"detected. The output fields of the repository check are:"
2555
2605
msgstr ""
2556
2606
2557
#: breezy/builtins.py:3724
2607
#: breezy/builtins.py:3804
2558
2608
msgid ""
2559
2609
"revisions\n"
2560
2610
" This is just the number of revisions checked. It doesn't\n"
2561
2611
" indicate a problem."
2562
2612
msgstr ""
2563
2613
2564
#: breezy/builtins.py:3728
2614
#: breezy/builtins.py:3808
2565
2615
msgid ""
2566
2616
"versionedfiles\n"
2567
2617
" This is just the number of versionedfiles checked. It\n"
2568
2618
" doesn't indicate a problem."
2569
2619
msgstr ""
2570
2620
2571
#: breezy/builtins.py:3732
2621
#: breezy/builtins.py:3812
2572
2622
msgid ""
2573
2623
"unreferenced ancestors\n"
2574
2624
" Texts that are ancestors of other texts, but\n"
2575
2625
" are not properly referenced by the revision ancestry. This is a\n"
2576
" subtle problem that Bazaar can work around."
2626
" subtle problem that Breezy can work around."
2577
2627
msgstr ""
2578
2628
2579
#: breezy/builtins.py:3737
2629
#: breezy/builtins.py:3817
2580
2630
msgid ""
2581
2631
"unique file texts\n"
2582
2632
" This is the total number of unique file contents\n"
2583
2633
" seen in the checked revisions. It does not indicate a problem."
2584
2634
msgstr ""
2585
2635
2586
#: breezy/builtins.py:3741
2636
#: breezy/builtins.py:3821
2587
2637
msgid ""
2588
2638
"repeated file texts\n"
2589
2639
" This is the total number of repeated texts seen\n"
2592
2642
" indicate a problem."
2593
2643
msgstr ""
2594
2644
2595
#: breezy/builtins.py:3747
2645
#: breezy/builtins.py:3827
2596
2646
msgid ""
2597
"If no restrictions are specified, all Bazaar data that is found at the "
2598
"given\n"
2647
"If no restrictions are specified, all data that is found at the given\n"
2599
2648
"location will be checked."
2600
2649
msgstr ""
2601
2650
2602
#: breezy/builtins.py:3752
2651
#: breezy/builtins.py:3832
2603
2652
msgid " Check the tree and branch at 'foo'::"
2604
2653
msgstr ""
2605
2654
2606
#: breezy/builtins.py:3754
2655
#: breezy/builtins.py:3834
2607
2656
msgid " brz check --tree --branch foo"
2608
2657
msgstr ""
2609
2658
2610
#: breezy/builtins.py:3756
2659
#: breezy/builtins.py:3836
2611
2660
msgid " Check only the repository at 'bar'::"
2612
2661
msgstr ""
2613
2662
2614
#: breezy/builtins.py:3758
2663
#: breezy/builtins.py:3838
2615
2664
msgid " brz check --repo bar"
2616
2665
msgstr ""
2617
2666
2618
#: breezy/builtins.py:3760
2667
#: breezy/builtins.py:3840
2619
2668
msgid " Check everything at 'baz'::"
2620
2669
msgstr ""
2621
2670
2622
#: breezy/builtins.py:3762
2671
#: breezy/builtins.py:3842
2623
2672
msgid " brz check baz"
2624
2673
msgstr ""
2625
2674
2626
2675
# help of 'branch' option of 'check' command
2627
#: breezy/builtins.py:3768
2676
#: breezy/builtins.py:3848
2628
2677
msgid "Check the branch related to the current directory."
2629
2678
msgstr ""
2630
2679
2631
2680
# help of 'repo' option of 'check' command
2632
#: breezy/builtins.py:3770
2681
#: breezy/builtins.py:3850
2633
2682
msgid "Check the repository related to the current directory."
2634
2683
msgstr ""
2635
2684
2636
2685
# help of 'tree' option of 'check' command
2637
#: breezy/builtins.py:3772
2686
#: breezy/builtins.py:3852
2638
2687
msgid "Check the working tree related to the current directory."
2639
2688
msgstr ""
2640
2689
2641
#: breezy/builtins.py:3786
2690
#: breezy/builtins.py:3866
2642
2691
msgid "Upgrade a repository, branch or working tree to a newer format."
2643
2692
msgstr ""
2644
2693
2645
#: breezy/builtins.py:3788
2694
#: breezy/builtins.py:3868
2646
2695
msgid ""
2647
2696
"When the default format has changed after a major new release of\n"
2648
"Bazaar, you may be informed during certain operations that you\n"
2697
"Bazaar/Breezy, you may be informed during certain operations that you\n"
2649
2698
"should upgrade. Upgrading to a newer format may improve performance\n"
2650
2699
"or make new features available. It may however limit interoperability\n"
2651
"with older repositories or with older versions of Bazaar."
2700
"with older repositories or with older versions of Bazaar or Breezy."
2652
2701
msgstr ""
2653
2702
2654
#: breezy/builtins.py:3794
2703
#: breezy/builtins.py:3874
2655
2704
msgid ""
2656
2705
"If you wish to upgrade to a particular format rather than the\n"
2657
2706
"current default, that can be specified using the --format option.\n"
2661
2710
"2.x default) so downgrading is not always possible."
2662
2711
msgstr ""
2663
2712
2664
#: breezy/builtins.py:3801
2713
#: breezy/builtins.py:3881
2665
2714
msgid ""
2666
2715
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2667
2716
"process (where # is a number). By default, this is left there on\n"
2672
2721
"afterwards."
2673
2722
msgstr ""
2674
2723
2675
#: breezy/builtins.py:3809
2724
#: breezy/builtins.py:3889
2676
2725
msgid ""
2677
2726
"If the location given is a shared repository, dependent branches\n"
2678
2727
"are also converted provided the repository converts successfully.\n"
2680
2729
"tried."
2681
2730
msgstr ""
2682
2731
2683
#: breezy/builtins.py:3814
2732
#: breezy/builtins.py:3894
2684
2733
msgid ""
2685
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2734
"For more information on upgrades, see the Breezy Upgrade Guide,\n"
2686
2735
"https://www.breezy-vcs.org/doc/en/upgrade-guide/."
2687
2736
msgstr ""
2688
2737
2689
2738
# help of 'format' option of 'upgrade' command
2690
#: breezy/builtins.py:3822
2739
#: breezy/builtins.py:3902
2691
2740
msgid "Upgrade to a specific format. See \"brz help formats\" for details."
2692
2741
msgstr ""
2693
2742
2694
2743
# title of 'format' option of 'init' command
2695
2744
# title of 'format' option of 'upgrade' command
2696
#: breezy/builtins.py:3827
2745
#: breezy/builtins.py:3907
2697
2746
msgid "Branch format"
2698
2747
msgstr ""
2699
2748
2700
2749
# help of 'clean' option of 'upgrade' command
2701
#: breezy/builtins.py:3829
2750
#: breezy/builtins.py:3909
2702
2751
msgid "Remove the backup.bzr directory if successful."
2703
2752
msgstr ""
2704
2753
2705
2754
# help of 'dry-run' option of 'add' command
2706
2755
# help of 'dry-run' option of 'upgrade' command
2707
#: breezy/builtins.py:3831
2756
# help of 'dry-run' option of 'rebase' command
2757
#: breezy/builtins.py:3911 breezy/plugins/rewrite/commands.py:97
2708
2758
msgid "Show what would be done, but don't actually do anything."
2709
2759
msgstr ""
2710
2760
2711
#: breezy/builtins.py:3846
2761
#: breezy/builtins.py:3926
2712
2762
msgid "Show or set brz user id."
2713
2763
msgstr ""
2714
2764
2715
#: breezy/builtins.py:3848
2765
#: breezy/builtins.py:3928
2716
2766
msgid ""
2717
2767
":Examples:\n"
2718
2768
" Show the email of the current user::"
2719
2769
msgstr ""
2720
2770
2721
#: breezy/builtins.py:3851
2771
#: breezy/builtins.py:3931
2722
2772
msgid " brz whoami --email"
2723
2773
msgstr ""
2724
2774
2725
#: breezy/builtins.py:3853
2775
#: breezy/builtins.py:3933
2726
2776
msgid " Set the current user::"
2727
2777
msgstr ""
2728
2778
2729
#: breezy/builtins.py:3855
2779
#: breezy/builtins.py:3935
2730
2780
msgid " brz whoami \"Frank Chu <fchu@example.com>\""
2731
2781
msgstr ""
2732
2782
2733
2783
# help of 'email' option of 'whoami' command
2734
#: breezy/builtins.py:3859
2784
#: breezy/builtins.py:3939
2735
2785
msgid "Display email address only."
2736
2786
msgstr ""
2737
2787
2738
2788
# help of 'branch' option of 'whoami' command
2739
#: breezy/builtins.py:3861
2789
#: breezy/builtins.py:3941
2740
2790
msgid "Set identity for the current branch instead of globally."
2741
2791
msgstr ""
2742
2792
2743
#: breezy/builtins.py:3887
2793
#: breezy/builtins.py:3967
2744
2794
msgid "--email can only be used to display existing identity"
2745
2795
msgstr ""
2746
2796
2747
#: breezy/builtins.py:3911
2797
#: breezy/builtins.py:3991
2748
2798
msgid "Print or set the branch nickname."
2749
2799
msgstr ""
2750
2800
2751
#: breezy/builtins.py:3913
2801
#: breezy/builtins.py:3993
2752
2802
msgid ""
2753
2803
"If unset, the colocated branch name is used for colocated branches, and\n"
2754
2804
"the branch directory name is used for other branches. To print the\n"
2755
2805
"current nickname, execute with no argument."
2756
2806
msgstr ""
2757
2807
2758
#: breezy/builtins.py:3917
2808
#: breezy/builtins.py:3997
2759
2809
msgid ""
2760
2810
"Bound branches use the nickname of its master branch unless it is set\n"
2761
2811
"locally."
2762
2812
msgstr ""
2763
2813
2764
#: breezy/builtins.py:3938
2814
#: breezy/builtins.py:4018
2765
2815
msgid "Set/unset and display aliases."
2766
2816
msgstr ""
2767
2817
2768
#: breezy/builtins.py:3940
2818
#: breezy/builtins.py:4020
2769
2819
msgid ""
2770
2820
":Examples:\n"
2771
2821
" Show the current aliases::"
2772
2822
msgstr ""
2773
2823
2774
#: breezy/builtins.py:3943
2824
#: breezy/builtins.py:4023
2775
2825
msgid " brz alias"
2776
2826
msgstr ""
2777
2827
2778
#: breezy/builtins.py:3945
2828
#: breezy/builtins.py:4025
2779
2829
msgid " Show the alias specified for 'll'::"
2780
2830
msgstr ""
2781
2831
2782
#: breezy/builtins.py:3947
2832
#: breezy/builtins.py:4027
2783
2833
msgid " brz alias ll"
2784
2834
msgstr ""
2785
2835
2786
#: breezy/builtins.py:3949
2836
#: breezy/builtins.py:4029
2787
2837
msgid " Set an alias for 'll'::"
2788
2838
msgstr ""
2789
2839
2790
#: breezy/builtins.py:3951
2840
#: breezy/builtins.py:4031
2791
2841
msgid " brz alias ll=\"log --line -r-10..-1\""
2792
2842
msgstr ""
2793
2843
2794
#: breezy/builtins.py:3953
2844
#: breezy/builtins.py:4033
2795
2845
msgid " To remove an alias for 'll'::"
2796
2846
msgstr ""
2797
2847
2798
#: breezy/builtins.py:3955
2848
#: breezy/builtins.py:4035
2799
2849
msgid " brz alias --remove ll"
2800
2850
msgstr ""
2801
2851
2802
2852
# help of 'remove' option of 'alias' command
2803
#: breezy/builtins.py:3960
2853
#: breezy/builtins.py:4040
2804
2854
msgid "Remove the alias."
2805
2855
msgstr ""
2806
2856
2807
#: breezy/builtins.py:3978
2857
#: breezy/builtins.py:4058
2808
2858
msgid "brz alias --remove expects an alias to remove."
2809
2859
msgstr ""
2810
2860
2811
#: breezy/builtins.py:4169
2861
#: breezy/builtins.py:4249
2812
2862
msgid "subunit not available. subunit needs to be installed to use --subunit."
2813
2863
msgstr ""
2814
2864
2815
#: breezy/builtins.py:4186
2865
#: breezy/builtins.py:4266
2816
2866
msgid "subunit not available. subunit needs to be installed to use --subunit2."
2817
2867
msgstr ""
2818
2868
2819
#: breezy/builtins.py:4195
2869
#: breezy/builtins.py:4275
2820
2870
msgid ""
2821
2871
"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
2822
2872
msgstr ""
2823
2873
2824
#: breezy/builtins.py:4242
2874
#: breezy/builtins.py:4322
2825
2875
msgid "Show version of brz."
2826
2876
msgstr ""
2827
2877
2828
2878
# help of 'short' option of 'version' command
2829
#: breezy/builtins.py:4246
2879
#: breezy/builtins.py:4326
2830
2880
msgid "Print just the version number."
2831
2881
msgstr ""
2832
2882
2833
#: breezy/builtins.py:4265
2883
#: breezy/builtins.py:4345
2834
2884
msgid "It sure does!\n"
2835
2885
msgstr ""
2836
2886
2837
#: breezy/builtins.py:4289
2887
#: breezy/builtins.py:4369
2838
2888
#, python-format
2839
2889
msgid "merge base is revision %s\n"
2840
2890
msgstr ""
2841
2891
2842
#: breezy/builtins.py:4294
2892
#: breezy/builtins.py:4374
2843
2893
msgid "Perform a three-way merge."
2844
2894
msgstr ""
2845
2895
2846
#: breezy/builtins.py:4296
2896
#: breezy/builtins.py:4376
2847
2897
msgid ""
2848
2898
"The source of the merge can be specified either in the form of a branch,\n"
2849
2899
"or in the form of a path to a file containing a merge directive generated\n"
2854
2904
"the current working tree."
2855
2905
msgstr ""
2856
2906
2857
#: breezy/builtins.py:4304
2907
#: breezy/builtins.py:4384
2858
2908
msgid ""
2859
2909
"When merging from a branch, by default brz will try to merge in all new\n"
2860
2910
"work from the other branch, automatically determining an appropriate base\n"
2861
2911
"revision. If this fails, you may need to give an explicit base."
2862
2912
msgstr ""
2863
2913
2864
#: breezy/builtins.py:4308
2914
#: breezy/builtins.py:4388
2865
2915
msgid ""
2866
2916
"To pick a different ending revision, pass \"--revision OTHER\". brz will\n"
2867
2917
"try to merge in all new work up to and including revision OTHER."
2868
2918
msgstr ""
2869
2919
2870
#: breezy/builtins.py:4311
2920
#: breezy/builtins.py:4391
2871
2921
msgid ""
2872
2922
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2873
2923
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2874
2924
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2875
2925
"not already contain revision BASE, such a merge is commonly referred to as\n"
2876
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2926
"a \"cherrypick\". Unlike a normal merge, Breezy does not currently track\n"
2877
2927
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2878
2928
"changes from the other branch is not stored in the commit."
2879
2929
msgstr ""
2880
2930
2881
#: breezy/builtins.py:4319
2931
#: breezy/builtins.py:4399
2882
2932
msgid "Revision numbers are always relative to the source branch."
2883
2933
msgstr ""
2884
2934
2885
#: breezy/builtins.py:4321 breezy/conflicts.py:54 breezy/conflicts.py:109
2935
#: breezy/builtins.py:4401 breezy/conflicts.py:54 breezy/conflicts.py:111
2886
2936
msgid ""
2887
2937
"Merge will do its best to combine the changes in two branches, but there\n"
2888
2938
"are some kinds of problems only a human can fix. When it encounters those,\n"
2890
2940
"before you can commit."
2891
2941
msgstr ""
2892
2942
2893
#: breezy/builtins.py:4326
2943
#: breezy/builtins.py:4406
2894
2944
msgid "Use brz resolve when you have fixed a problem. See also brz conflicts."
2895
2945
msgstr ""
2896
2946
2897
#: breezy/builtins.py:4328
2947
#: breezy/builtins.py:4408
2898
2948
msgid ""
2899
2949
"If there is no default branch set, the first merge will set it (use\n"
2900
2950
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2902
2952
"only be saved if the remote location can be accessed."
2903
2953
msgstr ""
2904
2954
2905
#: breezy/builtins.py:4333
2955
#: breezy/builtins.py:4413
2906
2956
msgid ""
2907
2957
"The results of the merge are placed into the destination working\n"
2908
2958
"directory, where they can be reviewed (with brz diff), tested, and then\n"
2909
2959
"committed to record the result of the merge."
2910
2960
msgstr ""
2911
2961
2912
#: breezy/builtins.py:4337
2962
#: breezy/builtins.py:4417
2913
2963
msgid ""
2914
2964
"merge refuses to run if there are any uncommitted changes, unless\n"
2915
2965
"--force is given. If --force is given, then the changes from the source\n"
2918
2968
"merge revision which has more than two parents."
2919
2969
msgstr ""
2920
2970
2921
#: breezy/builtins.py:4343
2971
#: breezy/builtins.py:4423
2922
2972
msgid ""
2923
2973
"If one would like to merge changes from the working tree of the other\n"
2924
2974
"branch without merging any committed revisions, the --uncommitted option\n"
2925
2975
"can be given."
2926
2976
msgstr ""
2927
2977
2928
#: breezy/builtins.py:4347
2978
#: breezy/builtins.py:4427
2929
2979
msgid ""
2930
2980
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2931
2981
"you to apply each diff hunk and file change, similar to \"shelve\"."
2932
2982
msgstr ""
2933
2983
2934
#: breezy/builtins.py:4350
2984
#: breezy/builtins.py:4430
2935
2985
msgid ""
2936
2986
":Examples:\n"
2937
2987
" To merge all new revisions from brz.dev::"
2938
2988
msgstr ""
2939
2989
2940
#: breezy/builtins.py:4353
2990
#: breezy/builtins.py:4433
2941
2991
msgid " brz merge ../brz.dev"
2942
2992
msgstr ""
2943
2993
2944
#: breezy/builtins.py:4355
2994
#: breezy/builtins.py:4435
2945
2995
msgid " To merge changes up to and including revision 82 from brz.dev::"
2946
2996
msgstr ""
2947
2997
2948
#: breezy/builtins.py:4357
2998
#: breezy/builtins.py:4437
2949
2999
msgid " brz merge -r 82 ../brz.dev"
2950
3000
msgstr ""
2951
3001
2952
#: breezy/builtins.py:4359
3002
#: breezy/builtins.py:4439
2953
3003
msgid " To merge the changes introduced by 82, without previous changes::"
2954
3004
msgstr ""
2955
3005
2956
#: breezy/builtins.py:4361
3006
#: breezy/builtins.py:4441
2957
3007
msgid " brz merge -r 81..82 ../brz.dev"
2958
3008
msgstr ""
2959
3009
2960
#: breezy/builtins.py:4363
3010
#: breezy/builtins.py:4443
2961
3011
msgid " To apply a merge directive contained in /tmp/merge::"
2962
3012
msgstr ""
2963
3013
2964
#: breezy/builtins.py:4365
3014
#: breezy/builtins.py:4445
2965
3015
msgid " brz merge /tmp/merge"
2966
3016
msgstr ""
2967
3017
2968
#: breezy/builtins.py:4367
3018
#: breezy/builtins.py:4447
2969
3019
msgid ""
2970
3020
" To create a merge revision with three parents from two branches\n"
2971
3021
" feature1a and feature1b:"
2972
3022
msgstr ""
2973
3023
2974
#: breezy/builtins.py:4370
3024
#: breezy/builtins.py:4450
2975
3025
msgid ""
2976
3026
" brz merge ../feature1a\n"
2977
3027
" brz merge ../feature1b --force\n"
2979
3029
msgstr ""
2980
3030
2981
3031
# help of 'force' option of 'merge' command
2982
#: breezy/builtins.py:4382
3032
#: breezy/builtins.py:4462
2983
3033
msgid "Merge even if the destination tree has uncommitted changes."
2984
3034
msgstr ""
2985
3035
2986
3036
# help of 'uncommitted' option of 'merge' command
2987
#: breezy/builtins.py:4388
3037
#: breezy/builtins.py:4468
2988
3038
msgid ""
2989
3039
"Apply uncommitted changes from a working copy, instead of branch changes."
2990
3040
msgstr ""
2991
3041
2992
3042
# help of 'pull' option of 'merge' command
2993
#: breezy/builtins.py:4390
3043
#: breezy/builtins.py:4470
2994
3044
msgid ""
2995
3045
"If the destination is already completely merged into the source, pull from "
2996
3046
"the source rather than merging. When this happens, you do not need to "
2998
3048
msgstr ""
2999
3049
3000
3050
# help of 'directory' option of 'merge' command
3001
#: breezy/builtins.py:4395
3051
#: breezy/builtins.py:4475
3002
3052
msgid ""
3003
3053
"Branch to merge into, rather than the one containing the working directory."
3004
3054
msgstr ""
3005
3055
3006
3056
# help of 'preview' option of 'merge' command
3007
#: breezy/builtins.py:4397
3057
#: breezy/builtins.py:4477
3008
3058
msgid "Instead of merging, show a diff of the merge."
3009
3059
msgstr ""
3010
3060
3011
3061
# help of 'interactive' option of 'merge' command
3012
#: breezy/builtins.py:4399
3062
#: breezy/builtins.py:4479
3013
3063
msgid "Select changes interactively."
3014
3064
msgstr ""
3015
3065
3016
#: breezy/builtins.py:4422
3066
#: breezy/builtins.py:4502
3017
3067
msgid ""
3018
3068
"Merging into empty branches not currently supported, https://bugs.launchpad."
3019
3069
"net/bzr/+bug/308562"
3020
3070
msgstr ""
3021
3071
3022
#: breezy/builtins.py:4444
3072
#: breezy/builtins.py:4524
3023
3073
msgid "Cannot use --uncommitted with bundles or merge directives."
3024
3074
msgstr ""
3025
3075
3026
#: breezy/builtins.py:4455
3076
#: breezy/builtins.py:4535
3027
3077
msgid "Cannot use --uncommitted and --revision at the same time."
3028
3078
msgstr ""
3029
3079
3030
#: breezy/builtins.py:4475
3080
#: breezy/builtins.py:4555
3031
3081
msgid "merger: "
3032
3082
msgstr ""
3033
3083
3034
#: breezy/builtins.py:4477 breezy/bundle/apply_bundle.py:65
3084
#: breezy/builtins.py:4557 breezy/bzr/bundle/apply_bundle.py:65
3085
#: breezy/plugins/rewrite/commands.py:518
3035
3086
msgid "Nothing to do."
3036
3087
msgstr ""
3037
3088
3038
#: breezy/builtins.py:4482
3089
#: breezy/builtins.py:4562
3039
3090
msgid "Cannot pull individual files"
3040
3091
msgstr ""
3041
3092
3042
#: breezy/builtins.py:4490
3093
#: breezy/builtins.py:4570
3043
3094
msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
3044
3095
msgstr ""
3045
3096
3046
#: breezy/builtins.py:4548
3097
#: breezy/builtins.py:4628
3047
3098
#, python-format
3048
3099
msgid "Show-base is not supported for this merge type. %s"
3049
3100
msgstr ""
3050
3101
3051
#: breezy/builtins.py:4557
3102
#: breezy/builtins.py:4637
3052
3103
#, python-format
3053
3104
msgid "Conflict reduction is not supported for merge type %s."
3054
3105
msgstr ""
3055
3106
3056
#: breezy/builtins.py:4561
3107
#: breezy/builtins.py:4641
3057
3108
msgid "Cannot do conflict reduction and show base."
3058
3109
msgstr ""
3059
3110
3060
#: breezy/builtins.py:4570
3111
#: breezy/builtins.py:4650
3061
3112
msgid "Plan file merge unsupported: Merge type incompatible with tree formats."
3062
3113
msgstr ""
3063
3114
3064
#: breezy/builtins.py:4681
3115
#: breezy/builtins.py:4761
3065
3116
msgid "No location specified or remembered"
3066
3117
msgstr ""
3067
3118
3068
#: breezy/builtins.py:4683
3119
#: breezy/builtins.py:4763
3069
3120
#, python-brace-format
3070
3121
msgid "{0} remembered {1} location {2}"
3071
3122
msgstr ""
3072
3123
3073
#: breezy/builtins.py:4689
3124
#: breezy/builtins.py:4769
3074
3125
msgid "Redo a merge."
3075
3126
msgstr ""
3076
3127
3077
#: breezy/builtins.py:4691
3128
#: breezy/builtins.py:4771
3078
3129
msgid ""
3079
3130
"Use this if you want to try a different merge technique while resolving\n"
3080
3131
"conflicts. Some merge techniques are better than others, and remerge\n"
3081
3132
"lets you try different ones on different files."
3082
3133
msgstr ""
3083
3134
3084
#: breezy/builtins.py:4695
3135
#: breezy/builtins.py:4775
3085
3136
msgid ""
3086
3137
"The options for remerge have the same meaning and defaults as the ones for\n"
3087
3138
"merge. The difference is that remerge can (only) be run when there is a\n"
3088
3139
"pending merge, and it lets you specify particular files."
3089
3140
msgstr ""
3090
3141
3091
#: breezy/builtins.py:4699
3142
#: breezy/builtins.py:4779
3092
3143
msgid ""
3093
3144
":Examples:\n"
3094
3145
" Re-do the merge of all conflicted files, and show the base text in\n"
3095
3146
" conflict regions, in addition to the usual THIS and OTHER texts::"
3096
3147
msgstr ""
3097
3148
3098
#: breezy/builtins.py:4703
3149
#: breezy/builtins.py:4783
3099
3150
msgid " brz remerge --show-base"
3100
3151
msgstr ""
3101
3152
3102
#: breezy/builtins.py:4705
3153
#: breezy/builtins.py:4785
3103
3154
msgid ""
3104
3155
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3105
3156
" additional processing to reduce the size of conflict regions::"
3106
3157
msgstr ""
3107
3158
3108
#: breezy/builtins.py:4708
3159
#: breezy/builtins.py:4788
3109
3160
msgid " brz remerge --merge-type weave --reprocess foobar"
3110
3161
msgstr ""
3111
3162
3113
3164
# help of 'show-base' option of 'pull' command
3114
3165
# help of 'show-base' option of 'remerge' command
3115
3166
# help of 'show-base' option of 'update' command
3116
#: breezy/builtins.py:4715
3167
#: breezy/builtins.py:4795
3117
3168
msgid "Show base revision text in conflicts."
3118
3169
msgstr ""
3119
3170
3120
#: breezy/builtins.py:4728
3171
#: breezy/builtins.py:4808
3121
3172
msgid ""
3122
3173
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3123
3174
"merges."
3124
3175
msgstr ""
3125
3176
3126
#: breezy/builtins.py:4783
3177
#: breezy/builtins.py:4862
3127
3178
msgid ""
3128
3179
"Set files in the working tree back to the contents of a previous revision."
3129
3180
msgstr ""
3130
3181
3131
#: breezy/builtins.py:4785
3182
#: breezy/builtins.py:4864
3132
3183
msgid ""
3133
3184
"Giving a list of files will revert only those files. Otherwise, all files\n"
3134
3185
"will be reverted. If the revision is not specified with '--revision', the\n"
3137
3188
"the working tree basis revision."
3138
3189
msgstr ""
3139
3190
3140
#: breezy/builtins.py:4791
3191
#: breezy/builtins.py:4870
3141
3192
msgid ""
3142
3193
"To remove only some changes, without reverting to a prior version, use\n"
3143
3194
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3149
3200
"update command."
3150
3201
msgstr ""
3151
3202
3152
#: breezy/builtins.py:4800
3203
#: breezy/builtins.py:4879
3153
3204
msgid ""
3154
3205
"Uncommitted changes to files that are reverted will be discarded.\n"
3155
"Howver, by default, any files that have been manually changed will be\n"
3206
"However, by default, any files that have been manually changed will be\n"
3156
3207
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3157
3208
"files have '.~#~' appended to their name, where # is a number."
3158
3209
msgstr ""
3159
3210
3160
#: breezy/builtins.py:4805
3211
#: breezy/builtins.py:4884
3161
3212
msgid ""
3162
3213
"When you provide files, you can use their current pathname or the pathname\n"
3163
3214
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3165
3216
"reverted."
3166
3217
msgstr ""
3167
3218
3168
#: breezy/builtins.py:4810
3219
#: breezy/builtins.py:4889
3169
3220
msgid ""
3170
3221
"If you have newly added files since the target revision, they will be\n"
3171
3222
"removed. If the files to be removed have been changed, backups will be\n"
3173
3224
"deleted."
3174
3225
msgstr ""
3175
3226
3176
#: breezy/builtins.py:4815
3227
#: breezy/builtins.py:4894
3177
3228
msgid ""
3178
3229
"The working tree contains a list of revisions that have been merged but\n"
3179
3230
"not yet committed. These revisions will be included as additional parents\n"
3185
3236
"reverting any files."
3186
3237
msgstr ""
3187
3238
3188
#: breezy/builtins.py:4824
3239
#: breezy/builtins.py:4903
3189
3240
msgid ""
3190
3241
"Using \"brz revert --forget-merges\", it is possible to apply all of the\n"
3191
3242
"changes from a branch in a single revision. To do this, perform the merge\n"
3200
3251
msgstr ""
3201
3252
3202
3253
# help of 'no-backup' option of 'revert' command
3203
#: breezy/builtins.py:4838
3254
#: breezy/builtins.py:4918
3204
3255
msgid "Do not save backups of reverted files."
3205
3256
msgstr ""
3206
3257
3207
3258
# help of 'forget-merges' option of 'revert' command
3208
#: breezy/builtins.py:4840
3259
#: breezy/builtins.py:4920
3209
3260
msgid "Remove pending merge marker, without changing any files."
3210
3261
msgstr ""
3211
3262
3212
#: breezy/builtins.py:4871
3263
#: breezy/builtins.py:4951
3213
3264
msgid ""
3214
3265
"Show help on a command or other topic.\n"
3215
3266
" "
3216
3267
msgstr ""
3217
3268
3218
3269
# help of 'long' option of 'help' command
3219
#: breezy/builtins.py:4876
3270
#: breezy/builtins.py:4956
3220
3271
msgid "Show help on all commands."
3221
3272
msgstr ""
3222
3273
3223
#: breezy/builtins.py:4905
3274
#: breezy/builtins.py:4985
3224
3275
msgid "Show unmerged/unpulled revisions between two branches."
3225
3276
msgstr ""
3226
3277
3227
#: breezy/builtins.py:4907
3278
#: breezy/builtins.py:4987
3228
3279
msgid "OTHER_BRANCH may be local or remote."
3229
3280
msgstr ""
3230
3281
3231
#: breezy/builtins.py:4909
3282
#: breezy/builtins.py:4989
3232
3283
msgid ""
3233
3284
"To filter on a range of revisions, you can use the command -r begin..end\n"
3234
3285
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3235
3286
"also valid."
3236
3287
msgstr ""
3237
3288
3238
#: breezy/builtins.py:4913
3289
#: breezy/builtins.py:4993
3239
3290
msgid ""
3240
3291
":Exit values:\n"
3241
3292
" 1 - some missing revisions\n"
3242
3293
" 0 - no missing revisions"
3243
3294
msgstr ""
3244
3295
3245
#: breezy/builtins.py:4919
3296
#: breezy/builtins.py:4999
3246
3297
msgid ""
3247
3298
" Determine the missing revisions between this and the branch at the\n"
3248
3299
" remembered pull location::"
3249
3300
msgstr ""
3250
3301
3251
#: breezy/builtins.py:4922
3302
#: breezy/builtins.py:5002
3252
3303
msgid " brz missing"
3253
3304
msgstr ""
3254
3305
3255
#: breezy/builtins.py:4924
3306
#: breezy/builtins.py:5004
3256
3307
msgid " Determine the missing revisions between this and another branch::"
3257
3308
msgstr ""
3258
3309
3259
#: breezy/builtins.py:4926
3310
#: breezy/builtins.py:5006
3260
3311
msgid " brz missing http://server/branch"
3261
3312
msgstr ""
3262
3313
3263
#: breezy/builtins.py:4928
3314
#: breezy/builtins.py:5008
3264
3315
msgid ""
3265
3316
" Determine the missing revisions up to a specific revision on the other\n"
3266
3317
" branch::"
3267
3318
msgstr ""
3268
3319
3269
#: breezy/builtins.py:4931
3320
#: breezy/builtins.py:5011
3270
3321
msgid " brz missing -r ..-10"
3271
3322
msgstr ""
3272
3323
3273
#: breezy/builtins.py:4933
3324
#: breezy/builtins.py:5013
3274
3325
msgid ""
3275
3326
" Determine the missing revisions up to a specific revision on this\n"
3276
3327
" branch::"
3277
3328
msgstr ""
3278
3329
3279
#: breezy/builtins.py:4936
3330
#: breezy/builtins.py:5016
3280
3331
msgid " brz missing --my-revision ..-10"
3281
3332
msgstr ""
3282
3333
3283
3334
# help of 'reverse' option of 'missing' command
3284
#: breezy/builtins.py:4943
3335
#: breezy/builtins.py:5023
3285
3336
msgid "Reverse the order of revisions."
3286
3337
msgstr ""
3287
3338
3288
3339
# help of 'mine-only' option of 'missing' command
3289
#: breezy/builtins.py:4945
3340
#: breezy/builtins.py:5025
3290
3341
msgid "Display changes in the local branch only."
3291
3342
msgstr ""
3292
3343
3293
3344
# help of 'this' option of 'missing' command
3294
#: breezy/builtins.py:4946
3345
#: breezy/builtins.py:5026
3295
3346
msgid "Same as --mine-only."
3296
3347
msgstr ""
3297
3348
3298
3349
# help of 'theirs-only' option of 'missing' command
3299
#: breezy/builtins.py:4948
3350
#: breezy/builtins.py:5028
3300
3351
msgid "Display changes in the remote branch only."
3301
3352
msgstr ""
3302
3353
3303
3354
# help of 'other' option of 'missing' command
3304
#: breezy/builtins.py:4949
3355
#: breezy/builtins.py:5029
3305
3356
msgid "Same as --theirs-only."
3306
3357
msgstr ""
3307
3358
3308
3359
# help of 'revision' option of 'missing' command
3309
#: breezy/builtins.py:4954
3360
#: breezy/builtins.py:5034
3310
3361
msgid ""
3311
3362
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3312
3363
"details."
3313
3364
msgstr ""
3314
3365
3315
3366
# help of 'my-revision' option of 'missing' command
3316
#: breezy/builtins.py:4958
3367
#: breezy/builtins.py:5038
3317
3368
msgid ""
3318
3369
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3319
3370
"details."
3320
3371
msgstr ""
3321
3372
3322
3373
# help of 'include-merged' option of 'missing' command
3323
#: breezy/builtins.py:4961
3374
#: breezy/builtins.py:5041
3324
3375
msgid "Show all revisions in addition to the mainline ones."
3325
3376
msgstr ""
3326
3377
3327
#: breezy/builtins.py:5002
3378
#: breezy/builtins.py:5082
3328
3379
msgid "No peer location known or specified."
3329
3380
msgstr ""
3330
3381
3331
#: breezy/builtins.py:5006
3382
#: breezy/builtins.py:5086
3332
3383
#, python-brace-format
3333
3384
msgid "Using saved parent location: {0}\n"
3334
3385
msgstr ""
3335
3386
3336
#: breezy/builtins.py:5039
3387
#: breezy/builtins.py:5119
3337
3388
#, python-format
3338
3389
msgid "You have %d extra revision:\n"
3339
3390
msgid_plural "You have %d extra revisions:\n"
3340
3391
msgstr[0] ""
3341
3392
msgstr[1] ""
3342
3393
3343
#: breezy/builtins.py:5059
3394
#: breezy/builtins.py:5139
3344
3395
#, python-format
3345
3396
msgid "You are missing %d revision:\n"
3346
3397
msgid_plural "You are missing %d revisions:\n"
3347
3398
msgstr[0] ""
3348
3399
msgstr[1] ""
3349
3400
3350
#: breezy/builtins.py:5074
3401
#: breezy/builtins.py:5154
3351
3402
msgid "This branch has no new revisions.\n"
3352
3403
msgstr ""
3353
3404
3354
#: breezy/builtins.py:5077
3405
#: breezy/builtins.py:5157
3355
3406
msgid "Other branch has no new revisions.\n"
3356
3407
msgstr ""
3357
3408
3358
#: breezy/builtins.py:5082
3409
#: breezy/builtins.py:5162
3359
3410
msgid "Branches are up to date.\n"
3360
3411
msgstr ""
3361
3412
3362
#: breezy/builtins.py:5093
3413
#: breezy/builtins.py:5173
3363
3414
msgid "Compress the data within a repository."
3364
3415
msgstr ""
3365
3416
3366
#: breezy/builtins.py:5095
3417
#: breezy/builtins.py:5175
3367
3418
msgid ""
3368
3419
"This operation compresses the data within a bazaar repository. As\n"
3369
3420
"bazaar supports automatic packing of repository, this operation is\n"
3370
3421
"normally not required to be done manually."
3371
3422
msgstr ""
3372
3423
3373
#: breezy/builtins.py:5099
3424
#: breezy/builtins.py:5179
3374
3425
msgid ""
3375
3426
"During the pack operation, bazaar takes a backup of existing repository\n"
3376
3427
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3379
3430
"used."
3380
3431
msgstr ""
3381
3432
3382
#: breezy/builtins.py:5105
3433
#: breezy/builtins.py:5185
3383
3434
msgid ""
3384
3435
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3385
3436
"during or immediately after repacking, you may be left with a state\n"
3388
3439
msgstr ""
3389
3440
3390
3441
# help of 'clean-obsolete-packs' option of 'pack' command
3391
#: breezy/builtins.py:5115
3442
#: breezy/builtins.py:5195
3392
3443
msgid "Delete obsolete packs to save disk space."
3393
3444
msgstr ""
3394
3445
3395
#: breezy/builtins.py:5129
3446
#: breezy/builtins.py:5209
3396
3447
msgid "List the installed plugins."
3397
3448
msgstr ""
3398
3449
3399
#: breezy/builtins.py:5131
3450
#: breezy/builtins.py:5211
3400
3451
msgid ""
3401
3452
"This command displays the list of installed plugins including\n"
3402
3453
"version of plugin and a short description of each."
3403
3454
msgstr ""
3404
3455
3405
#: breezy/builtins.py:5134
3456
#: breezy/builtins.py:5214
3406
3457
msgid "--verbose shows the path where each plugin is located."
3407
3458
msgstr ""
3408
3459
3409
#: breezy/builtins.py:5136
3460
#: breezy/builtins.py:5216
3410
3461
msgid ""
3411
"A plugin is an external component for Bazaar that extends the\n"
3412
"revision control system, by adding or replacing code in Bazaar.\n"
3462
"A plugin is an external component for Breezy that extends the\n"
3463
"revision control system, by adding or replacing code in Breezy.\n"
3413
3464
"Plugins can do a variety of things, including overriding commands,\n"
3414
3465
"adding new commands, providing additional network transports and\n"
3415
3466
"customizing log output."
3416
3467
msgstr ""
3417
3468
3418
#: breezy/builtins.py:5142
3469
#: breezy/builtins.py:5222
3419
3470
msgid ""
3420
3471
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3421
3472
"for further information on plugins including where to find them and how to\n"
3423
3474
"plugins using the Python programming language."
3424
3475
msgstr ""
3425
3476
3426
#: breezy/builtins.py:5158
3477
#: breezy/builtins.py:5238
3427
3478
msgid "Show testament (signing-form) of a revision."
3428
3479
msgstr ""
3429
3480
3430
3481
# help of 'long' option of 'testament' command
3431
#: breezy/builtins.py:5161
3482
#: breezy/builtins.py:5241
3432
3483
msgid "Produce long-format testament."
3433
3484
msgstr ""
3434
3485
3435
3486
# help of 'strict' option of 'testament' command
3436
#: breezy/builtins.py:5163
3487
#: breezy/builtins.py:5243
3437
3488
msgid "Produce a strict-format testament."
3438
3489
msgstr ""
3439
3490
3440
#: breezy/builtins.py:5191
3491
#: breezy/builtins.py:5271
3441
3492
msgid "Show the origin of each line in a file."
3442
3493
msgstr ""
3443
3494
3444
#: breezy/builtins.py:5193
3495
#: breezy/builtins.py:5273
3445
3496
msgid ""
3446
3497
"This prints out the given file with an annotation on the left side\n"
3447
3498
"indicating which revision, author and date introduced the change."
3448
3499
msgstr ""
3449
3500
3450
#: breezy/builtins.py:5196
3501
#: breezy/builtins.py:5276
3451
3502
msgid ""
3452
3503
"If the origin is the same for a run of consecutive lines, it is\n"
3453
3504
"shown only at the top, unless the --all option is given."
3454
3505
msgstr ""
3455
3506
3456
3507
# help of 'all' option of 'annotate' command
3457
#: breezy/builtins.py:5204
3508
#: breezy/builtins.py:5284
3458
3509
msgid "Show annotations on all lines."
3459
3510
msgstr ""
3460
3511
3461
3512
# help of 'long' option of 'annotate' command
3462
#: breezy/builtins.py:5205
3513
#: breezy/builtins.py:5285
3463
3514
msgid "Show commit date in annotations."
3464
3515
msgstr ""
3465
3516
3466
#: breezy/builtins.py:5293
3517
#: breezy/builtins.py:5362
3467
3518
msgid "Cannot sign a range of non-revision-history revisions"
3468
3519
msgstr ""
3469
3520
3470
#: breezy/builtins.py:5306
3521
#: breezy/builtins.py:5369
3471
3522
msgid "Please supply either one revision, or a range."
3472
3523
msgstr ""
3473
3524
3474
#: breezy/builtins.py:5310
3525
#: breezy/builtins.py:5373
3475
3526
msgid ""
3476
3527
"Convert the current branch into a checkout of the supplied branch.\n"
3477
3528
"If no branch is supplied, rebind to the last bound location."
3478
3529
msgstr ""
3479
3530
3480
#: breezy/builtins.py:5313
3531
#: breezy/builtins.py:5376
3481
3532
msgid ""
3482
3533
"Once converted into a checkout, commits must succeed on the master branch\n"
3483
3534
"before they will be applied to the local branch."
3484
3535
msgstr ""
3485
3536
3486
#: breezy/builtins.py:5316
3537
#: breezy/builtins.py:5379
3487
3538
msgid ""
3488
3539
"Bound branches use the nickname of its master branch unless it is set\n"
3489
3540
"locally, in which case binding will update the local nickname to be\n"
3490
3541
"that of the master."
3491
3542
msgstr ""
3492
3543
3493
#: breezy/builtins.py:5332
3544
#: breezy/builtins.py:5395
3494
3545
msgid "No location supplied. This format does not remember old locations."
3495
3546
msgstr ""
3496
3547
3497
#: breezy/builtins.py:5338
3548
#: breezy/builtins.py:5401
3498
3549
msgid "Branch is already bound"
3499
3550
msgstr ""
3500
3551
3501
#: breezy/builtins.py:5341
3552
#: breezy/builtins.py:5404
3502
3553
msgid "No location supplied and no previous location known"
3503
3554
msgstr ""
3504
3555
3505
#: breezy/builtins.py:5348
3556
#: breezy/builtins.py:5411
3506
3557
msgid "These branches have diverged. Try merging, and then bind again."
3507
3558
msgstr ""
3508
3559
3509
#: breezy/builtins.py:5355
3560
#: breezy/builtins.py:5418
3510
3561
msgid "Convert the current checkout into a regular branch."
3511
3562
msgstr ""
3512
3563
3513
#: breezy/builtins.py:5357
3564
#: breezy/builtins.py:5420
3514
3565
msgid ""
3515
3566
"After unbinding, the local branch is considered independent and subsequent\n"
3516
3567
"commits will be local only."
3517
3568
msgstr ""
3518
3569
3519
#: breezy/builtins.py:5368
3570
#: breezy/builtins.py:5431
3520
3571
msgid "Local branch is not bound"
3521
3572
msgstr ""
3522
3573
3523
#: breezy/builtins.py:5372
3574
#: breezy/builtins.py:5435
3524
3575
msgid "Remove the last committed revision."
3525
3576
msgstr ""
3526
3577
3527
#: breezy/builtins.py:5374
3578
#: breezy/builtins.py:5437
3528
3579
msgid ""
3529
3580
"--verbose will print out what is being removed.\n"
3530
3581
"--dry-run will go through all the motions, but not actually\n"
3531
3582
"remove anything."
3532
3583
msgstr ""
3533
3584
3534
#: breezy/builtins.py:5378
3585
#: breezy/builtins.py:5441
3535
3586
msgid ""
3536
3587
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3537
3588
"specified revision. For example, \"brz uncommit -r 15\" will leave the\n"
3538
3589
"branch at revision 15."
3539
3590
msgstr ""
3540
3591
3541
#: breezy/builtins.py:5382
3592
#: breezy/builtins.py:5445
3542
3593
msgid ""
3543
3594
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3544
3595
"it may make is to restore any pending merges that were present before\n"
3546
3597
msgstr ""
3547
3598
3548
3599
# help of 'dry-run' option of 'uncommit' command
3549
#: breezy/builtins.py:5393
3600
#: breezy/builtins.py:5456
3550
3601
msgid "Don't actually make changes."
3551
3602
msgstr ""
3552
3603
3553
3604
# help of 'force' option of 'uncommit' command
3554
#: breezy/builtins.py:5394
3605
#: breezy/builtins.py:5457
3555
3606
msgid "Say yes to all questions."
3556
3607
msgstr ""
3557
3608
3558
3609
# help of 'keep-tags' option of 'uncommit' command
3559
#: breezy/builtins.py:5396
3610
#: breezy/builtins.py:5459
3560
3611
msgid "Keep tags that point to removed revisions."
3561
3612
msgstr ""
3562
3613
3563
3614
# help of 'local' option of 'uncommit' command
3564
#: breezy/builtins.py:5398
3615
#: breezy/builtins.py:5461
3565
3616
msgid "Only remove the commits from the local branch when in a checkout."
3566
3617
msgstr ""
3567
3618
3568
#: breezy/builtins.py:5447
3619
#: breezy/builtins.py:5510
3569
3620
msgid "No revisions to uncommit.\n"
3570
3621
msgstr ""
3571
3622
3572
#: breezy/builtins.py:5462
3623
#: breezy/builtins.py:5525
3573
3624
msgid "Dry-run, pretending to remove the above revisions.\n"
3574
3625
msgstr ""
3575
3626
3576
#: breezy/builtins.py:5466
3627
#: breezy/builtins.py:5529
3577
3628
msgid "The above revision(s) will be removed.\n"
3578
3629
msgstr ""
3579
3630
3580
#: breezy/builtins.py:5470
3631
#: breezy/builtins.py:5533
3581
3632
msgid "Uncommit these revisions"
3582
3633
msgstr ""
3583
3634
3584
#: breezy/builtins.py:5473
3635
#: breezy/builtins.py:5536
3585
3636
msgid "Canceled\n"
3586
3637
msgstr ""
3587
3638
3588
#: breezy/builtins.py:5481
3639
#: breezy/builtins.py:5545
3640
#, python-format
3641
msgid ""
3642
"You can restore the old tip by running:\n"
3643
" brz pull -d %s %s -r revid:%s\n"
3644
msgstr ""
3645
3646
#: breezy/builtins.py:5550
3589
3647
#, python-format
3590
3648
msgid ""
3591
3649
"You can restore the old tip by running:\n"
3592
3650
" brz pull . -r revid:%s\n"
3593
3651
msgstr ""
3594
3652
3595
#: breezy/builtins.py:5487
3653
#: breezy/builtins.py:5556
3596
3654
msgid "Break a dead lock."
3597
3655
msgstr ""
3598
3656
3599
#: breezy/builtins.py:5489
3657
#: breezy/builtins.py:5558
3600
3658
msgid ""
3601
3659
"This command breaks a lock on a repository, branch, working directory or\n"
3602
3660
"config file."
3603
3661
msgstr ""
3604
3662
3605
#: breezy/builtins.py:5492
3663
#: breezy/builtins.py:5561
3606
3664
msgid ""
3607
3665
"CAUTION: Locks should only be broken when you are sure that the process\n"
3608
3666
"holding the lock has been stopped."
3609
3667
msgstr ""
3610
3668
3611
#: breezy/builtins.py:5495
3669
#: breezy/builtins.py:5564
3612
3670
msgid ""
3613
3671
"You can get information on what locks are open via the 'brz info\n"
3614
3672
"[location]' command."
3615
3673
msgstr ""
3616
3674
3617
#: breezy/builtins.py:5498
3675
#: breezy/builtins.py:5567
3618
3676
msgid ""
3619
3677
":Examples:\n"
3620
3678
" brz break-lock\n"
3621
3679
" brz break-lock brz+ssh://example.com/brz/foo\n"
3622
" brz break-lock --conf ~/.bazaar"
3680
" brz break-lock --conf ~/.config/breezy"
3623
3681
msgstr ""
3624
3682
3625
3683
# help of 'config' option of 'break-lock' command
3626
#: breezy/builtins.py:5507
3684
#: breezy/builtins.py:5576
3627
3685
msgid "LOCATION is the directory where the config lock is."
3628
3686
msgstr ""
3629
3687
3630
3688
# help of 'force' option of 'break-lock' command
3631
#: breezy/builtins.py:5509
3689
#: breezy/builtins.py:5578
3632
3690
msgid "Do not ask for confirmation before breaking the lock."
3633
3691
msgstr ""
3634
3692
3635
3693
# help of 'protocol=git' option of 'serve' command
3636
#: breezy/builtins.py:5544
3694
#: breezy/builtins.py:5613
3637
3695
msgid "Git Smart server protocol over TCP. (default port: 9418)"
3638
3696
msgstr ""
3639
3697
3640
3698
# help of 'protocol=git-receive-pack' option of 'serve' command
3641
#: breezy/builtins.py:5544
3699
#: breezy/builtins.py:5613
3642
3700
msgid "Git Smart server receive pack command. (inetd mode only)"
3643
3701
msgstr ""
3644
3702
3645
3703
# help of 'protocol=git-upload-pack' option of 'serve' command
3646
#: breezy/builtins.py:5544
3704
#: breezy/builtins.py:5613
3647
3705
msgid "Git Smart server upload pack command. (inetd mode only)"
3648
3706
msgstr ""
3649
3707
3650
3708
# help of 'protocol=bzr' option of 'serve' command
3651
#: breezy/builtins.py:5544
3709
#: breezy/builtins.py:5613
3652
3710
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3653
3711
msgstr ""
3654
3712
3655
#: breezy/builtins.py:5545
3713
#: breezy/builtins.py:5614
3656
3714
msgid "Run the brz server."
3657
3715
msgstr ""
3658
3716
3659
3717
# help of 'inet' option of 'serve' command
3660
#: breezy/builtins.py:5551
3718
#: breezy/builtins.py:5620
3661
3719
msgid "Serve on stdin/out for use from inetd or sshd."
3662
3720
msgstr ""
3663
3721
3664
3722
# title of 'protocol' option of 'serve' command
3665
#: breezy/builtins.py:5552
3723
#: breezy/builtins.py:5621
3666
3724
msgid "protocol"
3667
3725
msgstr ""
3668
3726
3669
3727
# help of 'protocol' option of 'serve' command
3670
#: breezy/builtins.py:5553
3728
#: breezy/builtins.py:5622
3671
3729
msgid "Protocol to serve."
3672
3730
msgstr ""
3673
3731
3674
3732
# help of 'listen' option of 'serve' command
3675
#: breezy/builtins.py:5558
3733
#: breezy/builtins.py:5627
3676
3734
msgid "Listen for connections on nominated address."
3677
3735
msgstr ""
3678
3736
3679
3737
# help of 'port' option of 'serve' command
3680
#: breezy/builtins.py:5561
3738
#: breezy/builtins.py:5630
3681
3739
msgid ""
3682
3740
"Listen for connections on nominated port. Passing 0 as the port number will "
3683
3741
"result in a dynamically allocated port. The default port depends on the "
3685
3743
msgstr ""
3686
3744
3687
3745
# help of 'directory' option of 'serve' command
3688
#: breezy/builtins.py:5566
3746
#: breezy/builtins.py:5635
3689
3747
msgid "Serve contents of this directory."
3690
3748
msgstr ""
3691
3749
3692
3750
# help of 'allow-writes' option of 'serve' command
3693
#: breezy/builtins.py:5568
3751
#: breezy/builtins.py:5637
3694
3752
msgid ""
3695
3753
"By default the server is a readonly server. Supplying --allow-writes "
3696
3754
"enables write access to the contents of the served directory and below. "
3700
3758
msgstr ""
3701
3759
3702
3760
# help of 'client-timeout' option of 'serve' command
3703
#: breezy/builtins.py:5577
3761
#: breezy/builtins.py:5646
3704
3762
msgid "Override the default idle client timeout (5min)."
3705
3763
msgstr ""
3706
3764
3707
#: breezy/builtins.py:5595
3765
#: breezy/builtins.py:5664
3708
3766
msgid "Combine a tree into its containing tree."
3709
3767
msgstr ""
3710
3768
3711
#: breezy/builtins.py:5597
3769
#: breezy/builtins.py:5666
3712
3770
msgid "This command requires the target tree to be in a rich-root format."
3713
3771
msgstr ""
3714
3772
3715
#: breezy/builtins.py:5599
3773
#: breezy/builtins.py:5668
3716
3774
msgid ""
3717
3775
"The TREE argument should be an independent tree, inside another tree, but\n"
3718
3776
"not part of it. (Such trees can be produced by \"brz split\", but also by\n"
3719
3777
"running \"brz branch\" with the target inside a tree.)"
3720
3778
msgstr ""
3721
3779
3722
#: breezy/builtins.py:5603
3780
#: breezy/builtins.py:5672
3723
3781
msgid ""
3724
3782
"The result is a combined tree, with the subtree no longer an independent\n"
3725
3783
"part. This is marked as a merge of the subtree into the containing tree,\n"
3726
3784
"and all history is preserved."
3727
3785
msgstr ""
3728
3786
3729
#: breezy/builtins.py:5622
3787
#: breezy/builtins.py:5691
3730
3788
#, python-format
3731
3789
msgid ""
3732
3790
"Can't join trees because %s doesn't support rich root data.\n"
3733
3791
"You can use brz upgrade on the repository."
3734
3792
msgstr ""
3735
3793
3736
#: breezy/builtins.py:5632 breezy/builtins.py:5638
3794
#: breezy/builtins.py:5701 breezy/builtins.py:5707
3737
3795
#, python-brace-format
3738
3796
msgid "Cannot join {0}. {1}"
3739
3797
msgstr ""
3740
3798
3741
#: breezy/builtins.py:5642
3799
#: breezy/builtins.py:5711
3742
3800
msgid "Split a subdirectory of a tree into a separate tree."
3743
3801
msgstr ""
3744
3802
3745
#: breezy/builtins.py:5644
3803
#: breezy/builtins.py:5713
3746
3804
msgid ""
3747
3805
"This command will produce a target tree in a format that supports\n"
3748
3806
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3749
3807
"converted into earlier formats like 'dirstate-tags'."
3750
3808
msgstr ""
3751
3809
3752
#: breezy/builtins.py:5648
3810
#: breezy/builtins.py:5717
3753
3811
msgid ""
3754
3812
"The TREE argument should be a subdirectory of a working tree. That\n"
3755
3813
"subdirectory will be converted into an independent tree, with its own\n"
3756
3814
"branch. Commits in the top-level tree will not apply to the new subtree."
3757
3815
msgstr ""
3758
3816
3759
#: breezy/builtins.py:5730
3817
#: breezy/builtins.py:5799
3760
3818
msgid "No submit branch specified or known"
3761
3819
msgstr ""
3762
3820
3763
#: breezy/builtins.py:5740 breezy/send.py:109
3821
#: breezy/builtins.py:5809 breezy/send.py:108
3764
3822
msgid "No public branch specified or known"
3765
3823
msgstr ""
3766
3824
3767
#: breezy/builtins.py:5745
3825
#: breezy/builtins.py:5814
3768
3826
msgid "brz merge-directive takes at most two one revision identifiers"
3769
3827
msgstr ""
3770
3828
3771
#: breezy/builtins.py:5754
3829
#: breezy/builtins.py:5823
3772
3830
msgid "No revisions to bundle."
3773
3831
msgstr ""
3774
3832
3775
#: breezy/builtins.py:5773
3833
#: breezy/builtins.py:5842
3776
3834
msgid "Mail or create a merge-directive for submitting changes."
3777
3835
msgstr ""
3778
3836
3779
#: breezy/builtins.py:5775
3837
#: breezy/builtins.py:5844
3780
3838
msgid "A merge directive provides many things needed for requesting merges:"
3781
3839
msgstr ""
3782
3840
3783
#: breezy/builtins.py:5777
3841
#: breezy/builtins.py:5846
3784
3842
msgid "* A machine-readable description of the merge to perform"
3785
3843
msgstr ""
3786
3844
3787
#: breezy/builtins.py:5779
3845
#: breezy/builtins.py:5848
3788
3846
msgid "* An optional patch that is a preview of the changes requested"
3789
3847
msgstr ""
3790
3848
3791
#: breezy/builtins.py:5781
3849
#: breezy/builtins.py:5850
3792
3850
msgid ""
3793
3851
"* An optional bundle of revision data, so that the changes can be applied\n"
3794
3852
" directly from the merge directive, without retrieving data from a\n"
3795
3853
" branch."
3796
3854
msgstr ""
3797
3855
3798
#: breezy/builtins.py:5785
3856
#: breezy/builtins.py:5854
3799
3857
msgid ""
3800
3858
"`brz send` creates a compact data set that, when applied using brz\n"
3801
3859
"merge, has the same effect as merging from the source branch."
3802
3860
msgstr ""
3803
3861
3804
#: breezy/builtins.py:5788
3862
#: breezy/builtins.py:5857
3805
3863
msgid ""
3806
3864
"By default the merge directive is self-contained and can be applied to any\n"
3807
3865
"branch containing submit_branch in its ancestory without needing access to\n"
3808
3866
"the source branch."
3809
3867
msgstr ""
3810
3868
3811
#: breezy/builtins.py:5792
3869
#: breezy/builtins.py:5861
3812
3870
msgid ""
3813
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3871
"If --no-bundle is specified, then Breezy doesn't send the contents of the\n"
3814
3872
"revisions, but only a structured request to merge from the\n"
3815
3873
"public_location. In that case the public_branch is needed and it must be\n"
3816
3874
"up-to-date and accessible to the recipient. The public_branch is always\n"
3817
3875
"included if known, so that people can check it later."
3818
3876
msgstr ""
3819
3877
3820
#: breezy/builtins.py:5798
3878
#: breezy/builtins.py:5867
3821
3879
msgid ""
3822
3880
"The submit branch defaults to the parent of the source branch, but can be\n"
3823
3881
"overridden. Both submit branch and public branch will be remembered in\n"
3826
3884
"be changed using --from."
3827
3885
msgstr ""
3828
3886
3829
#: breezy/builtins.py:5804
3887
#: breezy/builtins.py:5873
3830
3888
msgid ""
3831
3889
"Both the submit branch and the public branch follow the usual behavior with\n"
3832
3890
"respect to --remember: If there is no default location set, the first send\n"
3835
3893
"--remember. The value will only be saved if the location can be accessed."
3836
3894
msgstr ""
3837
3895
3838
#: breezy/builtins.py:5810
3896
#: breezy/builtins.py:5879
3839
3897
msgid ""
3840
3898
"In order to calculate those changes, brz must analyse the submit branch.\n"
3841
3899
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3843
3901
"in the merge directive."
3844
3902
msgstr ""
3845
3903
3846
#: breezy/builtins.py:5815
3904
#: breezy/builtins.py:5884
3847
3905
msgid ""
3848
3906
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3849
3907
"given, in which case it is sent to a file."
3850
3908
msgstr ""
3851
3909
3852
#: breezy/builtins.py:5818
3910
#: breezy/builtins.py:5887
3853
3911
msgid ""
3854
3912
"Mail is sent using your preferred mail program. This should be transparent\n"
3855
3913
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3856
3914
"If the preferred client can't be found (or used), your editor will be used."
3857
3915
msgstr ""
3858
3916
3859
#: breezy/builtins.py:5822
3917
#: breezy/builtins.py:5891
3860
3918
msgid ""
3861
3919
"To use a specific mail program, set the mail_client configuration option.\n"
3862
3920
"Supported values for specific clients are \"claws\", \"evolution\", \"kmail"
3868
3926
"may also add supported clients."
3869
3927
msgstr ""
3870
3928
3871
#: breezy/builtins.py:5828
3929
#: breezy/builtins.py:5897
3872
3930
msgid ""
3873
3931
"If mail is being sent, a to address is required. This can be supplied\n"
3874
3932
"either on the commandline, by setting the submit_to configuration\n"
3876
3934
"in the submit branch."
3877
3935
msgstr ""
3878
3936
3879
#: breezy/builtins.py:5833
3937
#: breezy/builtins.py:5902
3880
3938
msgid ""
3881
3939
"The merge directives created by brz send may be applied using brz merge or\n"
3882
3940
"brz pull by specifying a file containing a merge directive as the location."
3883
3941
msgstr ""
3884
3942
3885
#: breezy/builtins.py:5836
3943
#: breezy/builtins.py:5905
3886
3944
msgid ""
3887
3945
"brz send makes extensive use of public locations to map local locations "
3888
3946
"into\n"
3891
3949
msgstr ""
3892
3950
3893
3951
# help of 'output' option of 'send' command
3894
#: breezy/builtins.py:5860
3952
#: breezy/builtins.py:5929
3895
3953
msgid "Write merge directive to this file or directory; use - for stdout."
3896
3954
msgstr ""
3897
3955
3898
3956
# help of 'strict' option of 'send' command
3899
#: breezy/builtins.py:5864
3957
#: breezy/builtins.py:5933
3900
3958
msgid ""
3901
3959
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3902
3960
"strict disables the check."
3903
3961
msgstr ""
3904
3962
3905
3963
# help of 'mail-to' option of 'send' command
3906
#: breezy/builtins.py:5866
3964
#: breezy/builtins.py:5935
3907
3965
msgid "Mail the request to this address."
3908
3966
msgstr ""
3909
3967
3910
3968
# help of 'body' option of 'send' command
3911
#: breezy/builtins.py:5870
3969
#: breezy/builtins.py:5939
3912
3970
msgid "Body for the email."
3913
3971
msgstr ""
3914
3972
3915
3973
# help of 'no-bundle' option of 'send' command
3916
#: breezy/builtins.py:5917
3974
#: breezy/builtins.py:5986
3917
3975
msgid "Do not include a bundle in the merge directive."
3918
3976
msgstr ""
3919
3977
3920
3978
# help of 'no-patch' option of 'send' command
3921
#: breezy/builtins.py:5918
3979
#: breezy/builtins.py:5987
3922
3980
msgid "Do not include a preview patch in the merge directive."
3923
3981
msgstr ""
3924
3982
3925
3983
# help of 'remember' option of 'send' command
3926
#: breezy/builtins.py:5921
3984
#: breezy/builtins.py:5990
3927
3985
msgid "Remember submit and public branch."
3928
3986
msgstr ""
3929
3987
3930
3988
# help of 'from' option of 'send' command
3931
#: breezy/builtins.py:5923
3989
#: breezy/builtins.py:5992
3932
3990
msgid ""
3933
3991
"Branch to generate the submission from, rather than the one containing the "
3934
3992
"working directory."
3936
3994
3937
3995
# title of 'format' option of 'send' command
3938
3996
# title of 'format' option of 'version-info' command
3939
#: breezy/builtins.py:5933 breezy/cmd_version_info.py:77
3997
#: breezy/builtins.py:6002 breezy/cmd_version_info.py:79
3940
3998
msgid "format"
3941
3999
msgstr ""
3942
4000
3943
4001
# help of 'format' option of 'send' command
3944
#: breezy/builtins.py:5934
4002
#: breezy/builtins.py:6003
3945
4003
msgid "Use the specified output format."
3946
4004
msgstr ""
3947
4005
3948
#: breezy/builtins.py:5956
4006
#: breezy/builtins.py:6025
3949
4007
msgid "Create, remove or modify a tag naming a revision."
3950
4008
msgstr ""
3951
4009
3952
#: breezy/builtins.py:5958
4010
#: breezy/builtins.py:6027
3953
4011
msgid ""
3954
4012
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3955
4013
"(--revision) option can be given -rtag:X, where X is any previously\n"
3956
4014
"created tag."
3957
4015
msgstr ""
3958
4016
3959
#: breezy/builtins.py:5962
4017
#: breezy/builtins.py:6031
3960
4018
msgid ""
3961
4019
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3962
4020
"along when you branch, push, pull or merge."
3963
4021
msgstr ""
3964
4022
3965
#: breezy/builtins.py:5965
4023
#: breezy/builtins.py:6034
3966
4024
msgid ""
3967
4025
"It is an error to give a tag name that already exists unless you pass\n"
3968
4026
"--force, in which case the tag is moved to point to the new revision."
3969
4027
msgstr ""
3970
4028
3971
#: breezy/builtins.py:5968
4029
#: breezy/builtins.py:6037
3972
4030
msgid ""
3973
4031
"To rename a tag (change the name but keep it on the same revsion), run "
3974
4032
"``brz\n"
3975
4033
"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
3976
4034
msgstr ""
3977
4035
3978
#: breezy/builtins.py:5971
4036
#: breezy/builtins.py:6040
3979
4037
msgid ""
3980
4038
"If no tag name is specified it will be determined through the\n"
3981
4039
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3984
4042
msgstr ""
3985
4043
3986
4044
# help of 'delete' option of 'tag' command
3987
#: breezy/builtins.py:5981
4045
#: breezy/builtins.py:6050
3988
4046
msgid "Delete this tag rather than placing it."
3989
4047
msgstr ""
3990
4048
3991
4049
# help of 'directory' option of 'tag' command
3992
#: breezy/builtins.py:5984
4050
#: breezy/builtins.py:6053
3993
4051
msgid "Branch in which to place the tag."
3994
4052
msgstr ""
3995
4053
3996
4054
# help of 'force' option of 'tag' command
3997
#: breezy/builtins.py:5986
4055
#: breezy/builtins.py:6055
3998
4056
msgid "Replace existing tags."
3999
4057
msgstr ""
4000
4058
4001
#: breezy/builtins.py:6002
4059
#: breezy/builtins.py:6071
4002
4060
msgid "No tag specified to delete."
4003
4061
msgstr ""
4004
4062
4005
#: breezy/builtins.py:6004
4063
#: breezy/builtins.py:6073
4006
4064
#, python-format
4007
4065
msgid "Deleted tag %s."
4008
4066
msgstr ""
4009
4067
4010
#: breezy/builtins.py:6009
4068
#: breezy/builtins.py:6078
4011
4069
msgid "Tags can only be placed on a single revision, not on a range"
4012
4070
msgstr ""
4013
4071
4014
#: breezy/builtins.py:6018
4072
#: breezy/builtins.py:6087
4015
4073
msgid "Please specify a tag name."
4016
4074
msgstr ""
4017
4075
4018
#: breezy/builtins.py:6026
4076
#: breezy/builtins.py:6095
4019
4077
#, python-format
4020
4078
msgid "Tag %s already exists for that revision."
4021
4079
msgstr ""
4022
4080
4023
#: breezy/builtins.py:6030
4081
#: breezy/builtins.py:6099
4024
4082
#, python-format
4025
4083
msgid "Created tag %s."
4026
4084
msgstr ""
4027
4085
4028
#: breezy/builtins.py:6032
4086
#: breezy/builtins.py:6101
4029
4087
#, python-format
4030
4088
msgid "Updated tag %s."
4031
4089
msgstr ""
4032
4090
4033
#: breezy/builtins.py:6036
4091
#: breezy/builtins.py:6105
4034
4092
msgid "List tags."
4035
4093
msgstr ""
4036
4094
4037
#: breezy/builtins.py:6038
4095
#: breezy/builtins.py:6107
4038
4096
msgid ""
4039
4097
"This command shows a table of tag names and the revisions they reference."
4040
4098
msgstr ""
4041
4099
4042
4100
# help of 'directory' option of 'tags' command
4043
#: breezy/builtins.py:6044
4101
#: breezy/builtins.py:6113
4044
4102
msgid "Branch whose tags should be displayed."
4045
4103
msgstr ""
4046
4104
4047
4105
# help of 'sort' option of 'tags' command
4048
#: breezy/builtins.py:6046
4106
#: breezy/builtins.py:6115
4049
4107
msgid "Sort tags by different criteria."
4050
4108
msgstr ""
4051
4109
4052
4110
# title of 'sort' option of 'tags' command
4053
#: breezy/builtins.py:6046
4111
#: breezy/builtins.py:6115
4054
4112
msgid "Sorting"
4055
4113
msgstr ""
4056
4114
4057
#: breezy/builtins.py:6116
4115
#: breezy/builtins.py:6185
4058
4116
msgid "Reconfigure the type of a brz directory."
4059
4117
msgstr ""
4060
4118
4061
#: breezy/builtins.py:6118
4119
#: breezy/builtins.py:6187
4062
4120
msgid "A target configuration must be specified."
4063
4121
msgstr ""
4064
4122
4065
#: breezy/builtins.py:6120
4123
#: breezy/builtins.py:6189
4066
4124
msgid ""
4067
4125
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4068
4126
"The order of preference is\n"
4074
4132
msgstr ""
4075
4133
4076
4134
# title of 'tree_type' option of 'reconfigure' command
4077
#: breezy/builtins.py:6134
4135
#: breezy/builtins.py:6203
4078
4136
msgid "Tree type"
4079
4137
msgstr ""
4080
4138
4081
4139
# help of 'tree_type' option of 'reconfigure' command
4082
#: breezy/builtins.py:6135
4140
#: breezy/builtins.py:6204
4083
4141
msgid "The relation between branch and tree."
4084
4142
msgstr ""
4085
4143
4086
4144
# help of 'tree_type=branch' option of 'reconfigure' command
4087
#: breezy/builtins.py:6137
4145
#: breezy/builtins.py:6206
4088
4146
msgid "Reconfigure to be an unbound branch with no working tree."
4089
4147
msgstr ""
4090
4148
4091
4149
# help of 'tree_type=tree' option of 'reconfigure' command
4092
#: breezy/builtins.py:6138
4150
#: breezy/builtins.py:6207
4093
4151
msgid "Reconfigure to be an unbound branch with a working tree."
4094
4152
msgstr ""
4095
4153
4096
4154
# help of 'tree_type=checkout' option of 'reconfigure' command
4097
#: breezy/builtins.py:6139
4155
#: breezy/builtins.py:6208
4098
4156
msgid "Reconfigure to be a bound branch with a working tree."
4099
4157
msgstr ""
4100
4158
4101
4159
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
4102
#: breezy/builtins.py:6140
4160
#: breezy/builtins.py:6209
4103
4161
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4104
4162
msgstr ""
4105
4163
4106
4164
# title of 'repository_type' option of 'reconfigure' command
4107
#: breezy/builtins.py:6145
4165
#: breezy/builtins.py:6214
4108
4166
msgid "Repository type"
4109
4167
msgstr ""
4110
4168
4111
4169
# help of 'repository_type' option of 'reconfigure' command
4112
#: breezy/builtins.py:6146
4170
#: breezy/builtins.py:6215
4113
4171
msgid "Location fo the repository."
4114
4172
msgstr ""
4115
4173
4116
4174
# help of 'repository_type=standalone' option of 'reconfigure' command
4117
#: breezy/builtins.py:6148
4175
#: breezy/builtins.py:6217
4118
4176
msgid ""
4119
4177
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4120
4178
msgstr ""
4121
4179
4122
4180
# help of 'repository_type=use-shared' option of 'reconfigure' command
4123
#: breezy/builtins.py:6150
4181
#: breezy/builtins.py:6219
4124
4182
msgid "Reconfigure to use a shared repository."
4125
4183
msgstr ""
4126
4184
4127
4185
# title of 'repository_trees' option of 'reconfigure' command
4128
#: breezy/builtins.py:6154
4186
#: breezy/builtins.py:6223
4129
4187
msgid "Trees in Repository"
4130
4188
msgstr ""
4131
4189
4132
4190
# help of 'repository_trees' option of 'reconfigure' command
4133
#: breezy/builtins.py:6155
4191
#: breezy/builtins.py:6224
4134
4192
msgid "Whether new branches in the repository have trees."
4135
4193
msgstr ""
4136
4194
4137
4195
# help of 'repository_trees=with-trees' option of 'reconfigure' command
4138
#: breezy/builtins.py:6157
4196
#: breezy/builtins.py:6226
4139
4197
msgid "Reconfigure repository to create working trees on branches by default."
4140
4198
msgstr ""
4141
4199
4142
4200
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
4143
#: breezy/builtins.py:6159
4201
#: breezy/builtins.py:6228
4144
4202
msgid ""
4145
4203
"Reconfigure repository to not create working trees on branches by default."
4146
4204
msgstr ""
4147
4205
4148
4206
# help of 'bind-to' option of 'reconfigure' command
4149
#: breezy/builtins.py:6162
4207
#: breezy/builtins.py:6231
4150
4208
msgid "Branch to bind checkout to."
4151
4209
msgstr ""
4152
4210
4153
4211
# help of 'force' option of 'reconfigure' command
4154
#: breezy/builtins.py:6164
4212
#: breezy/builtins.py:6233
4155
4213
msgid "Perform reconfiguration even if local changes will be lost."
4156
4214
msgstr ""
4157
4215
4158
4216
# help of 'stacked-on' option of 'reconfigure' command
4159
#: breezy/builtins.py:6167
4217
#: breezy/builtins.py:6236
4160
4218
msgid "Reconfigure a branch to be stacked on another branch."
4161
4219
msgstr ""
4162
4220
4163
4221
# help of 'unstacked' option of 'reconfigure' command
4164
#: breezy/builtins.py:6171
4222
#: breezy/builtins.py:6240
4165
4223
msgid ""
4166
4224
"Reconfigure a branch to be unstacked. This may require copying substantial "
4167
4225
"data into it."
4168
4226
msgstr ""
4169
4227
4170
#: breezy/builtins.py:6182
4228
#: breezy/builtins.py:6251
4171
4229
msgid "Can't use both --stacked-on and --unstacked"
4172
4230
msgstr ""
4173
4231
4174
#: breezy/builtins.py:6196
4232
#: breezy/builtins.py:6265
4175
4233
msgid "No target configuration specified"
4176
4234
msgstr ""
4177
4235
4178
#: breezy/builtins.py:6231
4236
#: breezy/builtins.py:6300
4179
4237
msgid "Set the branch of a checkout and update."
4180
4238
msgstr ""
4181
4239
4182
#: breezy/builtins.py:6233
4240
#: breezy/builtins.py:6302
4183
4241
msgid ""
4184
4242
"For lightweight checkouts, this changes the branch being referenced.\n"
4185
4243
"For heavyweight checkouts, this checks that there are no local commits\n"
4187
4245
"of the new location and binds to it."
4188
4246
msgstr ""
4189
4247
4190
#: breezy/builtins.py:6238
4248
#: breezy/builtins.py:6307
4191
4249
msgid ""
4192
4250
"In both cases, the working tree is updated and uncommitted changes\n"
4193
4251
"are merged. The user can commit or revert these as they desire."
4194
4252
msgstr ""
4195
4253
4196
#: breezy/builtins.py:6241
4254
#: breezy/builtins.py:6310
4197
4255
msgid "Pending merges need to be committed or reverted before using switch."
4198
4256
msgstr ""
4199
4257
4200
#: breezy/builtins.py:6243
4258
#: breezy/builtins.py:6312
4201
4259
msgid ""
4202
4260
"The path to the branch to switch to can be specified relative to the parent\n"
4203
4261
"directory of the current branch. For example, if you are currently in a\n"
4205
4263
"/path/to/newbranch."
4206
4264
msgstr ""
4207
4265
4208
#: breezy/builtins.py:6248
4266
#: breezy/builtins.py:6317
4209
4267
msgid ""
4210
4268
"Bound branches use the nickname of its master branch unless it is set\n"
4211
4269
"locally, in which case switching will update the local nickname to be\n"
4213
4271
msgstr ""
4214
4272
4215
4273
# help of 'force' option of 'switch' command
4216
#: breezy/builtins.py:6256
4274
#: breezy/builtins.py:6325
4217
4275
msgid "Switch even if local commits will be lost."
4218
4276
msgstr ""
4219
4277
4220
4278
# help of 'create-branch' option of 'switch' command
4221
#: breezy/builtins.py:6259
4279
#: breezy/builtins.py:6328
4222
4280
msgid "Create the target branch from this one before switching to it."
4223
4281
msgstr ""
4224
4282
4225
4283
# help of 'store' option of 'switch' command
4226
#: breezy/builtins.py:6262
4284
#: breezy/builtins.py:6331
4227
4285
msgid "Store and restore uncommitted changes in the branch."
4228
4286
msgstr ""
4229
4287
4230
#: breezy/builtins.py:6276
4288
#: breezy/builtins.py:6344
4231
4289
msgid "You must supply either a revision or a location"
4232
4290
msgstr ""
4233
4291
4234
#: breezy/builtins.py:6289
4292
#: breezy/builtins.py:6359
4235
4293
msgid "cannot create branch without source branch"
4236
4294
msgstr ""
4237
4295
4238
#: breezy/builtins.py:6315
4296
#: breezy/builtins.py:6387
4239
4297
msgid ""
4240
4298
"switching would create a branch reference loop. Use the \"bzr up\" command "
4241
4299
"to switch to a different revision."
4242
4300
msgstr ""
4243
4301
4244
#: breezy/builtins.py:6323
4302
#: breezy/builtins.py:6395
4245
4303
#, python-format
4246
4304
msgid "Switched to branch %s at %s"
4247
4305
msgstr ""
4248
4306
4249
#: breezy/builtins.py:6326
4307
#: breezy/builtins.py:6398
4250
4308
#, python-format
4251
4309
msgid "Switched to branch %s"
4252
4310
msgstr ""
4253
4311
4254
#: breezy/builtins.py:6328
4312
#: breezy/builtins.py:6400
4255
4313
#, python-format
4256
4314
msgid "Switched to branch at %s"
4257
4315
msgstr ""
4258
4316
4259
#: breezy/builtins.py:6333
4317
#: breezy/builtins.py:6405
4260
4318
msgid "Manage filtered views."
4261
4319
msgstr ""
4262
4320
4263
#: breezy/builtins.py:6335
4321
#: breezy/builtins.py:6407
4264
4322
msgid ""
4265
4323
"Views provide a mask over the tree so that users can focus on\n"
4266
4324
"a subset of a tree when doing their work. After creating a view,\n"
4270
4328
"must be within the current view."
4271
4329
msgstr ""
4272
4330
4273
#: breezy/builtins.py:6342
4331
#: breezy/builtins.py:6414
4274
4332
msgid ""
4275
4333
"In most cases, a view has a short life-span: it is created to make\n"
4276
4334
"a selected change and is deleted once that change is committed.\n"
4278
4336
"and switch between them."
4279
4337
msgstr ""
4280
4338
4281
#: breezy/builtins.py:6347
4339
#: breezy/builtins.py:6419
4282
4340
msgid ""
4283
4341
"To disable the current view without deleting it, you can switch to\n"
4284
4342
"the pseudo view called ``off``. This can be useful when you need\n"
4286
4344
"want to switch back to your view after that."
4287
4345
msgstr ""
4288
4346
4289
#: breezy/builtins.py:6352
4347
#: breezy/builtins.py:6424
4290
4348
msgid ""
4291
4349
":Examples:\n"
4292
4350
" To define the current view::"
4293
4351
msgstr ""
4294
4352
4295
#: breezy/builtins.py:6355
4353
#: breezy/builtins.py:6427
4296
4354
msgid " brz view file1 dir1 ..."
4297
4355
msgstr ""
4298
4356
4299
#: breezy/builtins.py:6357
4357
#: breezy/builtins.py:6429
4300
4358
msgid " To list the current view::"
4301
4359
msgstr ""
4302
4360
4303
#: breezy/builtins.py:6359
4361
#: breezy/builtins.py:6431
4304
4362
msgid " brz view"
4305
4363
msgstr ""
4306
4364
4307
#: breezy/builtins.py:6361
4365
#: breezy/builtins.py:6433
4308
4366
msgid " To delete the current view::"
4309
4367
msgstr ""
4310
4368
4311
#: breezy/builtins.py:6363
4369
#: breezy/builtins.py:6435
4312
4370
msgid " brz view --delete"
4313
4371
msgstr ""
4314
4372
4315
#: breezy/builtins.py:6365
4373
#: breezy/builtins.py:6437
4316
4374
msgid " To disable the current view without deleting it::"
4317
4375
msgstr ""
4318
4376
4319
#: breezy/builtins.py:6367
4377
#: breezy/builtins.py:6439
4320
4378
msgid " brz view --switch off"
4321
4379
msgstr ""
4322
4380
4323
#: breezy/builtins.py:6369
4381
#: breezy/builtins.py:6441
4324
4382
msgid " To define a named view and switch to it::"
4325
4383
msgstr ""
4326
4384
4327
#: breezy/builtins.py:6371
4385
#: breezy/builtins.py:6443
4328
4386
msgid " brz view --name view-name file1 dir1 ..."
4329
4387
msgstr ""
4330
4388
4331
#: breezy/builtins.py:6373
4389
#: breezy/builtins.py:6445
4332
4390
msgid " To list a named view::"
4333
4391
msgstr ""
4334
4392
4335
#: breezy/builtins.py:6375
4393
#: breezy/builtins.py:6447
4336
4394
msgid " brz view --name view-name"
4337
4395
msgstr ""
4338
4396
4339
#: breezy/builtins.py:6377
4397
#: breezy/builtins.py:6449
4340
4398
msgid " To delete a named view::"
4341
4399
msgstr ""
4342
4400
4343
#: breezy/builtins.py:6379
4401
#: breezy/builtins.py:6451
4344
4402
msgid " brz view --name view-name --delete"
4345
4403
msgstr ""
4346
4404
4347
#: breezy/builtins.py:6381
4405
#: breezy/builtins.py:6453
4348
4406
msgid " To switch to a named view::"
4349
4407
msgstr ""
4350
4408
4351
#: breezy/builtins.py:6383
4409
#: breezy/builtins.py:6455
4352
4410
msgid " brz view --switch view-name"
4353
4411
msgstr ""
4354
4412
4355
#: breezy/builtins.py:6385
4413
#: breezy/builtins.py:6457
4356
4414
msgid " To list all views defined::"
4357
4415
msgstr ""
4358
4416
4359
#: breezy/builtins.py:6387
4417
#: breezy/builtins.py:6459
4360
4418
msgid " brz view --all"
4361
4419
msgstr ""
4362
4420
4363
#: breezy/builtins.py:6389
4421
#: breezy/builtins.py:6461
4364
4422
msgid " To delete all views::"
4365
4423
msgstr ""
4366
4424
4367
#: breezy/builtins.py:6391
4425
#: breezy/builtins.py:6463
4368
4426
msgid " brz view --delete --all"
4369
4427
msgstr ""
4370
4428
4371
4429
# help of 'all' option of 'view' command
4372
#: breezy/builtins.py:6398
4430
#: breezy/builtins.py:6470
4373
4431
msgid "Apply list or delete action to all views."
4374
4432
msgstr ""
4375
4433
4376
4434
# help of 'delete' option of 'view' command
4377
#: breezy/builtins.py:6401
4435
#: breezy/builtins.py:6473
4378
4436
msgid "Delete the view."
4379
4437
msgstr ""
4380
4438
4381
4439
# help of 'name' option of 'view' command
4382
#: breezy/builtins.py:6404
4440
#: breezy/builtins.py:6476
4383
4441
msgid "Name of the view to define, list or delete."
4384
4442
msgstr ""
4385
4443
4386
4444
# help of 'switch' option of 'view' command
4387
#: breezy/builtins.py:6408
4445
#: breezy/builtins.py:6480
4388
4446
msgid "Name of the view to switch to."
4389
4447
msgstr ""
4390
4448
4391
#: breezy/builtins.py:6427
4449
#: breezy/builtins.py:6499
4392
4450
msgid "Both --delete and a file list specified"
4393
4451
msgstr ""
4394
4452
4395
#: breezy/builtins.py:6430
4453
#: breezy/builtins.py:6502
4396
4454
msgid "Both --delete and --switch specified"
4397
4455
msgstr ""
4398
4456
4399
#: breezy/builtins.py:6433
4457
#: breezy/builtins.py:6505
4400
4458
msgid "Deleted all views.\n"
4401
4459
msgstr ""
4402
4460
4403
#: breezy/builtins.py:6436
4461
#: breezy/builtins.py:6508
4404
4462
msgid "No current view to delete"
4405
4463
msgstr ""
4406
4464
4407
#: breezy/builtins.py:6439
4465
#: breezy/builtins.py:6511
4408
4466
#, python-format
4409
4467
msgid "Deleted '%s' view.\n"
4410
4468
msgstr ""
4411
4469
4412
#: breezy/builtins.py:6443
4470
#: breezy/builtins.py:6515
4413
4471
msgid "Both --switch and a file list specified"
4414
4472
msgstr ""
4415
4473
4416
#: breezy/builtins.py:6446
4474
#: breezy/builtins.py:6518
4417
4475
msgid "Both --switch and --all specified"
4418
4476
msgstr ""
4419
4477
4420
#: breezy/builtins.py:6450
4478
#: breezy/builtins.py:6522
4421
4479
msgid "No current view to disable"
4422
4480
msgstr ""
4423
4481
4424
#: breezy/builtins.py:6452
4482
#: breezy/builtins.py:6524
4425
4483
#, python-format
4426
4484
msgid "Disabled '%s' view.\n"
4427
4485
msgstr ""
4428
4486
4429
#: breezy/builtins.py:6458 breezy/builtins.py:6481
4487
#: breezy/builtins.py:6530 breezy/builtins.py:6553
4430
4488
#, python-brace-format
4431
4489
msgid "Using '{0}' view: {1}\n"
4432
4490
msgstr ""
4433
4491
4434
#: breezy/builtins.py:6461
4492
#: breezy/builtins.py:6533
4435
4493
msgid "Views defined:\n"
4436
4494
msgstr ""
4437
4495
4438
#: breezy/builtins.py:6470
4496
#: breezy/builtins.py:6542
4439
4497
msgid "No views defined.\n"
4440
4498
msgstr ""
4441
4499
4442
#: breezy/builtins.py:6477
4500
#: breezy/builtins.py:6549
4443
4501
msgid "Cannot change the 'off' pseudo view"
4444
4502
msgstr ""
4445
4503
4446
#: breezy/builtins.py:6486
4504
#: breezy/builtins.py:6558
4447
4505
msgid "No current view.\n"
4448
4506
msgstr ""
4449
4507
4450
#: breezy/builtins.py:6490
4508
#: breezy/builtins.py:6562
4451
4509
#, python-brace-format
4452
4510
msgid "'{0}' view is: {1}\n"
4453
4511
msgstr ""
4454
4512
4455
#: breezy/builtins.py:6510
4513
#: breezy/builtins.py:6582
4456
4514
msgid " <no hooks installed>\n"
4457
4515
msgstr ""
4458
4516
4459
#: breezy/builtins.py:6514
4517
#: breezy/builtins.py:6586
4460
4518
msgid "Remove a branch."
4461
4519
msgstr ""
4462
4520
4463
#: breezy/builtins.py:6516
4521
#: breezy/builtins.py:6588
4464
4522
msgid ""
4465
4523
"This will remove the branch from the specified location but\n"
4466
4524
"will keep any working tree or repository in place."
4467
4525
msgstr ""
4468
4526
4469
#: breezy/builtins.py:6521
4527
#: breezy/builtins.py:6593
4470
4528
msgid " Remove the branch at repo/trunk::"
4471
4529
msgstr ""
4472
4530
4473
#: breezy/builtins.py:6523
4531
#: breezy/builtins.py:6595
4474
4532
msgid " brz remove-branch repo/trunk"
4475
4533
msgstr ""
4476
4534
4477
4535
# help of 'force' option of 'remove-branch' command
4478
#: breezy/builtins.py:6530
4536
#: breezy/builtins.py:6602
4479
4537
msgid "Remove branch even if it is the active branch."
4480
4538
msgstr ""
4481
4539
4482
#: breezy/builtins.py:6544
4540
#: breezy/builtins.py:6616
4483
4541
msgid "Branch is active. Use --force to remove it."
4484
4542
msgstr ""
4485
4543
4486
4544
# help of 'writer=plain' option of 'shelve' command
4487
#: breezy/builtins.py:6548
4545
#: breezy/builtins.py:6620
4488
4546
msgid "Plaintext diff output."
4489
4547
msgstr ""
4490
4548
4491
#: breezy/builtins.py:6549
4549
#: breezy/builtins.py:6621
4492
4550
msgid "Temporarily set aside some changes from the current tree."
4493
4551
msgstr ""
4494
4552
4495
#: breezy/builtins.py:6551
4553
#: breezy/builtins.py:6623
4496
4554
msgid ""
4497
4555
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4498
4556
"ie. out of the way, until a later time when you can bring them back from\n"
4501
4559
"will they survive its deletion."
4502
4560
msgstr ""
4503
4561
4504
#: breezy/builtins.py:6557
4562
#: breezy/builtins.py:6629
4505
4563
msgid "If shelve --list is specified, previously-shelved changes are listed."
4506
4564
msgstr ""
4507
4565
4508
#: breezy/builtins.py:6559
4566
#: breezy/builtins.py:6631
4509
4567
msgid ""
4510
4568
"Shelve is intended to help separate several sets of changes that have\n"
4511
4569
"been inappropriately mingled. If you just want to get rid of all changes\n"
4513
4571
"shelve all text changes at once, use shelve --all."
4514
4572
msgstr ""
4515
4573
4516
#: breezy/builtins.py:6564
4574
#: breezy/builtins.py:6636
4517
4575
msgid ""
4518
4576
"If filenames are specified, only the changes to those files will be\n"
4519
4577
"shelved. Other files will be left untouched."
4520
4578
msgstr ""
4521
4579
4522
#: breezy/builtins.py:6567
4580
#: breezy/builtins.py:6639
4523
4581
msgid ""
4524
4582
"If a revision is specified, changes since that revision will be shelved."
4525
4583
msgstr ""
4526
4584
4527
#: breezy/builtins.py:6569
4585
#: breezy/builtins.py:6641
4528
4586
msgid ""
4529
4587
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4530
4588
"restore the most recently shelved changes."
4531
4589
msgstr ""
4532
4590
4533
#: breezy/builtins.py:6572
4591
#: breezy/builtins.py:6644
4534
4592
msgid ""
4535
4593
"For complicated changes, it is possible to edit the changes in a separate\n"
4536
4594
"editor program to decide what the file remaining in the working copy\n"
4537
4595
"should look like. To do this, add the configuration option"
4538
4596
msgstr ""
4539
4597
4540
#: breezy/builtins.py:6576
4541
msgid " change_editor = PROGRAM @new_path @old_path"
4598
#: breezy/builtins.py:6648
4599
msgid " change_editor = PROGRAM {new_path} {old_path}"
4542
4600
msgstr ""
4543
4601
4544
#: breezy/builtins.py:6578
4602
#: breezy/builtins.py:6650
4545
4603
msgid ""
4546
"where @new_path is replaced with the path of the new version of the\n"
4547
"file and @old_path is replaced with the path of the old version of\n"
4604
"where {new_path} is replaced with the path of the new version of the\n"
4605
"file and {old_path} is replaced with the path of the old version of\n"
4548
4606
"the file. The PROGRAM should save the new file with the desired\n"
4549
4607
"contents of the file in the working tree."
4550
4608
msgstr ""
4551
4609
4552
4610
# help of 'all' option of 'shelve' command
4553
#: breezy/builtins.py:6590
4611
#: breezy/builtins.py:6662
4554
4612
msgid "Shelve all changes."
4555
4613
msgstr ""
4556
4614
4557
4615
# help of 'writer' option of 'shelve' command
4558
#: breezy/builtins.py:6592
4616
#: breezy/builtins.py:6664
4559
4617
msgid "Method to use for writing diffs."
4560
4618
msgstr ""
4561
4619
4562
4620
# title of 'writer' option of 'shelve' command
4563
#: breezy/builtins.py:6592
4621
#: breezy/builtins.py:6664
4564
4622
msgid "writer"
4565
4623
msgstr ""
4566
4624
4567
4625
# help of 'list' option of 'shelve' command
4568
#: breezy/builtins.py:6596
4626
#: breezy/builtins.py:6668
4569
4627
msgid "List shelved changes."
4570
4628
msgstr ""
4571
4629
4572
4630
# help of 'destroy' option of 'shelve' command
4573
#: breezy/builtins.py:6598
4631
#: breezy/builtins.py:6670
4574
4632
msgid "Destroy removed changes instead of shelving them."
4575
4633
msgstr ""
4576
4634
4577
#: breezy/builtins.py:6627
4635
#: breezy/builtins.py:6699
4578
4636
msgid "No shelved changes."
4579
4637
msgstr ""
4580
4638
4581
#: breezy/builtins.py:6638
4639
#: breezy/builtins.py:6710
4582
4640
msgid "Restore shelved changes."
4583
4641
msgstr ""
4584
4642
4585
#: breezy/builtins.py:6640
4643
#: breezy/builtins.py:6712
4586
4644
msgid ""
4587
4645
"By default, the most recently shelved changes are restored. However if you\n"
4588
4646
"specify a shelf by id those changes will be restored instead. This works\n"
4590
4648
msgstr ""
4591
4649
4592
4650
# help of 'action' option of 'unshelve' command
4593
#: breezy/builtins.py:6649
4651
#: breezy/builtins.py:6721
4594
4652
msgid "The action to perform."
4595
4653
msgstr ""
4596
4654
4597
4655
# title of 'action' option of 'resolve' command
4598
4656
# title of 'action' option of 'unshelve' command
4599
#: breezy/builtins.py:6649 breezy/conflicts.py:707
4657
#: breezy/builtins.py:6721 breezy/conflicts.py:717
4600
4658
msgid "action"
4601
4659
msgstr ""
4602
4660
4603
4661
# help of 'action=apply' option of 'unshelve' command
4604
#: breezy/builtins.py:6651
4662
#: breezy/builtins.py:6723
4605
4663
msgid "Apply changes and remove from the shelf."
4606
4664
msgstr ""
4607
4665
4608
4666
# help of 'action=dry-run' option of 'unshelve' command
4609
#: breezy/builtins.py:6652
4667
#: breezy/builtins.py:6724
4610
4668
msgid "Show changes, but do not apply or remove them."
4611
4669
msgstr ""
4612
4670
4613
4671
# help of 'action=preview' option of 'unshelve' command
4614
#: breezy/builtins.py:6653
4672
#: breezy/builtins.py:6725
4615
4673
msgid ""
4616
4674
"Instead of unshelving the changes, show the diff that would result from "
4617
4675
"unshelving."
4618
4676
msgstr ""
4619
4677
4620
4678
# help of 'action=delete-only' option of 'unshelve' command
4621
#: breezy/builtins.py:6655
4679
#: breezy/builtins.py:6727
4622
4680
msgid "Delete changes without applying them."
4623
4681
msgstr ""
4624
4682
4625
4683
# help of 'action=keep' option of 'unshelve' command
4626
#: breezy/builtins.py:6656
4684
#: breezy/builtins.py:6728
4627
4685
msgid "Apply changes but don't delete them."
4628
4686
msgstr ""
4629
4687
4630
#: breezy/builtins.py:6671
4688
#: breezy/builtins.py:6743
4631
4689
msgid "Remove unwanted files from working tree."
4632
4690
msgstr ""
4633
4691
4634
#: breezy/builtins.py:6673
4692
#: breezy/builtins.py:6745
4635
4693
msgid ""
4636
4694
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4637
4695
"files are never deleted."
4638
4696
msgstr ""
4639
4697
4640
#: breezy/builtins.py:6676
4698
#: breezy/builtins.py:6748
4641
4699
msgid ""
4642
4700
"Another class is 'detritus', which includes files emitted by brz during\n"
4643
4701
"normal operations and selftests. (The value of these files decreases with\n"
4644
4702
"time.)"
4645
4703
msgstr ""
4646
4704
4647
#: breezy/builtins.py:6680
4705
#: breezy/builtins.py:6752
4648
4706
msgid ""
4649
4707
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4650
4708
"flags are respected, and may be combined."
4651
4709
msgstr ""
4652
4710
4653
#: breezy/builtins.py:6683
4711
#: breezy/builtins.py:6755
4654
4712
msgid "To check what clean-tree will do, use --dry-run."
4655
4713
msgstr ""
4656
4714
4657
4715
# help of 'ignored' option of 'clean-tree' command
4658
#: breezy/builtins.py:6686
4716
#: breezy/builtins.py:6758
4659
4717
msgid "Delete all ignored files."
4660
4718
msgstr ""
4661
4719
4662
4720
# help of 'detritus' option of 'clean-tree' command
4663
#: breezy/builtins.py:6687
4721
#: breezy/builtins.py:6759
4664
4722
msgid ""
4665
4723
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4666
4724
msgstr ""
4667
4725
4668
4726
# help of 'unknown' option of 'clean-tree' command
4669
#: breezy/builtins.py:6690
4727
#: breezy/builtins.py:6762
4670
4728
msgid "Delete files unknown to brz (default)."
4671
4729
msgstr ""
4672
4730
4673
4731
# help of 'dry-run' option of 'clean-tree' command
4674
#: breezy/builtins.py:6691
4732
#: breezy/builtins.py:6763
4675
4733
msgid "Show files to delete instead of deleting them."
4676
4734
msgstr ""
4677
4735
4678
4736
# help of 'force' option of 'clean-tree' command
4679
#: breezy/builtins.py:6693
4737
#: breezy/builtins.py:6765
4680
4738
msgid "Do not prompt before deleting."
4681
4739
msgstr ""
4682
4740
4683
#: breezy/builtins.py:6772
4741
#: breezy/builtins.py:6842
4684
4742
msgid "Import sources from a directory, tarball or zip file"
4685
4743
msgstr ""
4686
4744
4687
#: breezy/builtins.py:6774
4745
#: breezy/builtins.py:6844
4688
4746
msgid ""
4689
4747
"This command will import a directory, tarball or zip file into a bzr\n"
4690
4748
"tree, replacing any versioned files already present. If a directory is\n"
4692
4750
"is not versioned, it is created."
4693
4751
msgstr ""
4694
4752
4695
#: breezy/builtins.py:6779
4753
#: breezy/builtins.py:6849
4696
4754
msgid "Tarballs may be gzip or bzip2 compressed. This is autodetected."
4697
4755
msgstr ""
4698
4756
4699
#: breezy/builtins.py:6781
4757
#: breezy/builtins.py:6851
4700
4758
msgid ""
4701
4759
"If the tarball or zip has a single root directory, that directory is\n"
4702
4760
"stripped when extracting the tarball. This is not done for directories."
4703
4761
msgstr ""
4704
4762
4705
#: breezy/builtins.py:6793
4763
#: breezy/builtins.py:6863
4706
4764
msgid "Hardlink matching files to another tree."
4707
4765
msgstr ""
4708
4766
4709
#: breezy/builtins.py:6795
4767
#: breezy/builtins.py:6865
4710
4768
msgid "Only files with identical content and execute bit will be linked."
4711
4769
msgstr ""
4712
4770
4713
#: breezy/bundle/__init__.py:61
4714
msgid "A directory cannot be a bundle"
4715
msgstr ""
4716
4717
#: breezy/bundle/apply_bundle.py:38
4771
#: breezy/builtins.py:6905
4772
msgid "Print lines matching PATTERN for specified files and revisions."
4773
msgstr ""
4774
4775
#: breezy/builtins.py:6907
4776
msgid ""
4777
"This command searches the specified files and revisions for a given\n"
4778
"pattern. The pattern is specified as a Python regular expressions[1]."
4779
msgstr ""
4780
4781
#: breezy/builtins.py:6910
4782
msgid ""
4783
"If the file name is not specified, the revisions starting with the\n"
4784
"current directory are searched recursively. If the revision number is\n"
4785
"not specified, the working copy is searched. To search the last committed\n"
4786
"revision, use the '-r -1' or '-r last:1' option."
4787
msgstr ""
4788
4789
#: breezy/builtins.py:6915
4790
msgid ""
4791
"Unversioned files are not searched unless explicitly specified on the\n"
4792
"command line. Unversioned directores are not searched."
4793
msgstr ""
4794
4795
#: breezy/builtins.py:6918
4796
msgid ""
4797
"When searching a pattern, the output is shown in the 'filepath:string'\n"
4798
"format. If a revision is explicitly searched, the output is shown as\n"
4799
"'filepath~N:string', where N is the revision number."
4800
msgstr ""
4801
4802
#: breezy/builtins.py:6922
4803
msgid ""
4804
"--include and --exclude options can be used to search only (or exclude\n"
4805
"from search) files with base name matches the specified Unix style GLOB\n"
4806
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
4807
"to quote wildcard or backslash character literally. Note that the glob\n"
4808
"pattern is not a regular expression."
4809
msgstr ""
4810
4811
#: breezy/builtins.py:6928
4812
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
4813
msgstr ""
4814
4815
# help of 'color' option of 'grep' command
4816
#: breezy/builtins.py:6937
4817
msgid "Show match in color. WHEN is never, always or auto."
4818
msgstr ""
4819
4820
# help of 'diff' option of 'grep' command
4821
#: breezy/builtins.py:6939
4822
msgid "Grep for pattern in changeset for each revision."
4823
msgstr ""
4824
4825
# help of 'exclude' option of 'grep' command
4826
#: breezy/builtins.py:6941
4827
msgid "Skip files whose base name matches GLOB."
4828
msgstr ""
4829
4830
# help of 'include' option of 'grep' command
4831
#: breezy/builtins.py:6943
4832
msgid "Search only files whose base name matches GLOB."
4833
msgstr ""
4834
4835
# help of 'files-with-matches' option of 'grep' command
4836
#: breezy/builtins.py:6945
4837
msgid "Print only the name of each input file in which PATTERN is found."
4838
msgstr ""
4839
4840
# help of 'files-without-match' option of 'grep' command
4841
#: breezy/builtins.py:6948
4842
msgid "Print only the name of each input file in which PATTERN is not found."
4843
msgstr ""
4844
4845
# help of 'fixed-string' option of 'grep' command
4846
#: breezy/builtins.py:6951
4847
msgid "Interpret PATTERN is a single fixed string (not regex)."
4848
msgstr ""
4849
4850
# help of 'from-root' option of 'grep' command
4851
#: breezy/builtins.py:6953
4852
msgid ""
4853
"Search for pattern starting from the root of the branch. (implies --"
4854
"recursive)"
4855
msgstr ""
4856
4857
# help of 'ignore-case' option of 'grep' command
4858
#: breezy/builtins.py:6956
4859
msgid "Ignore case distinctions while matching."
4860
msgstr ""
4861
4862
# help of 'levels' option of 'grep' command
4863
#: breezy/builtins.py:6958
4864
msgid ""
4865
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
4866
msgstr ""
4867
4868
# help of 'line-number' option of 'grep' command
4869
#: breezy/builtins.py:6963
4870
msgid "Show 1-based line number."
4871
msgstr ""
4872
4873
# help of 'no-recursive' option of 'grep' command
4874
#: breezy/builtins.py:6965
4875
msgid "Don't recurse into subdirectories. (default is --recursive)"
4876
msgstr ""
4877
4878
# help of 'null' option of 'grep' command
4879
#: breezy/builtins.py:6967
4880
msgid ""
4881
"Write an ASCII NUL (\\0) separator between output lines rather than a "
4882
"newline."
4883
msgstr ""
4884
4885
#: breezy/builtins.py:7083
4886
msgid "Apply a named patch to the current tree."
4887
msgstr ""
4888
4889
#: breezy/builtins.py:7085 breezy/plugins/propose/cmds.py:215
4890
msgid " "
4891
msgstr ""
4892
4893
# help of 'strip' option of 'patch' command
4894
#: breezy/builtins.py:7089
4895
msgid ""
4896
"Strip the smallest prefix containing num leading slashes from filenames."
4897
msgstr ""
4898
4899
# help of 'silent' option of 'patch' command
4900
#: breezy/builtins.py:7091
4901
msgid "Suppress chatter."
4902
msgstr ""
4903
4904
#: breezy/bzr/bundle/apply_bundle.py:38
4718
4905
msgid "Install revisions"
4719
4906
msgstr ""
4720
4907
4721
#: breezy/bundle/commands.py:66
4908
#: breezy/bzr/bundle/commands.py:69
4722
4909
msgid "--verbose requires a merge directive"
4723
4910
msgstr ""
4724
4911
4725
#: breezy/bundle/commands.py:70
4912
#: breezy/bzr/bundle/commands.py:73
4726
4913
msgid "Bundle format not supported"
4727
4914
msgstr ""
4728
4915
4729
#: breezy/bundle/commands.py:80
4916
#: breezy/bzr/bundle/commands.py:83
4730
4917
msgid "Records\n"
4731
4918
msgstr ""
4732
4919
4733
#: breezy/bundle/commands.py:84
4920
#: breezy/bzr/bundle/commands.py:87
4734
4921
#, python-brace-format
4735
4922
msgid "{0}: {1} ({2} multiparent)\n"
4736
4923
msgstr ""
4737
4924
4738
#: breezy/bundle/commands.py:86
4925
#: breezy/bzr/bundle/commands.py:89
4739
4926
#, python-format
4740
4927
msgid "unique files: %d\n"
4741
4928
msgstr ""
4742
4929
4743
#: breezy/bundle/commands.py:95
4930
#: breezy/bzr/bundle/commands.py:98
4744
4931
msgid "Revisions\n"
4745
4932
msgstr ""
4746
4933
4747
#: breezy/bundle/commands.py:96
4934
#: breezy/bzr/bundle/commands.py:99
4748
4935
#, python-format
4749
4936
msgid "nicks: %s\n"
4750
4937
msgstr ""
4751
4938
4752
#: breezy/bundle/commands.py:98
4939
#: breezy/bzr/bundle/commands.py:101
4753
4940
#, python-format
4754
4941
msgid ""
4755
4942
"committers: \n"
4756
4943
"%s\n"
4757
4944
msgstr ""
4758
4945
4759
#: breezy/bundle/commands.py:107
4946
#: breezy/bzr/bundle/commands.py:110
4760
4947
msgid "Decoded contents\n"
4761
4948
msgstr ""
4762
4949
4763
#: breezy/bundle/serializer/v4.py:314
4950
#: breezy/bzr/bundle/serializer/v4.py:315
4764
4951
#, python-format
4765
4952
msgid "Bundling %d revision."
4766
4953
msgid_plural "Bundling %d revisions."
4767
4954
msgstr[0] ""
4768
4955
msgstr[1] ""
4769
4956
4770
#: breezy/bzr/bzrdir.py:504
4957
#: breezy/bzr/bzrdir.py:508
4771
4958
#, python-brace-format
4772
4959
msgid ""
4773
4960
"making backup of {0}\n"
4774
4961
" to {1}"
4775
4962
msgstr ""
4776
4963
4777
#: breezy/bzr/bzrdir.py:525
4964
#: breezy/bzr/bzrdir.py:529
4778
4965
#, python-brace-format
4779
4966
msgid "renamed {0} to {1}"
4780
4967
msgstr ""
4781
4968
4782
#: breezy/bzr/bzrdir.py:1591
4969
#: breezy/bzr/bzrdir.py:1615
4783
4970
#, python-format
4784
4971
msgid ""
4785
4972
"Source repository format does not support stacking, using format:\n"
4786
4973
" %s"
4787
4974
msgstr ""
4788
4975
4789
#: breezy/bzr/bzrdir.py:1611
4976
#: breezy/bzr/bzrdir.py:1635
4790
4977
#, python-format
4791
4978
msgid ""
4792
4979
"Source branch format does not support stacking, using format:\n"
4793
4980
" %s"
4794
4981
msgstr ""
4795
4982
4796
#: breezy/bzr/bzrdir.py:1748
4983
#: breezy/bzr/bzrdir.py:1772
4797
4984
msgid "starting repository conversion"
4798
4985
msgstr ""
4799
4986
4800
#: breezy/bzr/bzrdir.py:1875
4987
#: breezy/bzr/bzrdir.py:1898
4801
4988
#, python-brace-format
4802
4989
msgid "Using default stacking branch {0} at {1}"
4803
4990
msgstr ""
4904
5091
"{{{4}}}"
4905
5092
msgstr ""
4906
5093
4907
#: breezy/bzr/fetch.py:102
5094
#: breezy/bzr/fetch.py:99
4908
5095
msgid "Finding revisions"
4909
5096
msgstr ""
4910
5097
4911
#: breezy/bzr/fetch.py:107
5098
#: breezy/bzr/fetch.py:104
4912
5099
msgid "Fetching revisions"
4913
5100
msgstr ""
4914
5101
4915
#: breezy/bzr/groupcompress.py:1748
5102
#: breezy/bzr/groupcompress.py:1799
4916
5103
#, python-format
4917
5104
msgid "Insert claimed random_id=True, but then inserted %r two times"
4918
5105
msgstr ""
4919
5106
4920
#: breezy/bzr/knit.py:1835 breezy/bzr/knit.py:1873
5107
#: breezy/bzr/knit.py:1879 breezy/bzr/knit.py:1917
4921
5108
msgid "Walking content"
4922
5109
msgstr ""
4923
5110
4924
#: breezy/bzr/knit.py:3406
5111
#: breezy/bzr/knit.py:3465
4925
5112
msgid "annotating"
4926
5113
msgstr ""
4927
5114
4975
5162
msgid "revision_history ok."
4976
5163
msgstr ""
4977
5164
4978
#: breezy/bzr/remote.py:1302
5165
#: breezy/bzr/remote.py:1322
4979
5166
#, python-format
4980
5167
msgid "bzr: ERROR (ignored): %s"
4981
5168
msgstr ""
4982
5169
4983
#: breezy/bzr/remote.py:2610
5170
#: breezy/bzr/remote.py:2644
4984
5171
msgid "Copying repository content as tarball..."
4985
5172
msgstr ""
4986
5173
4989
5176
msgid "HPSS calls: {0} ({1} vfs) {2}"
4990
5177
msgstr ""
4991
5178
4992
#: breezy/bzr/smart/ping.py:33
5179
#: breezy/bzr/smart/ping.py:34
4993
5180
msgid "Pings a Bazaar smart server."
4994
5181
msgstr ""
4995
5182
4996
#: breezy/bzr/smart/ping.py:35
5183
#: breezy/bzr/smart/ping.py:36
4997
5184
msgid ""
4998
5185
"This command sends a 'hello' request to the given location using the brz\n"
4999
5186
"smart protocol, and reports the response."
5023
5210
msgid "listening on port: %s"
5024
5211
msgstr ""
5025
5212
5026
#: breezy/bzr/vf_repository.py:786
5213
#: breezy/bzr/vf_repository.py:801
5027
5214
msgid "inventories"
5028
5215
msgstr ""
5029
5216
5030
#: breezy/bzr/vf_repository.py:812
5217
#: breezy/bzr/vf_repository.py:827
5031
5218
msgid "texts"
5032
5219
msgstr ""
5033
5220
5034
#: breezy/bzr/vf_repository.py:1325 breezy/bzr/vf_repository.py:1335
5221
#: breezy/bzr/vf_repository.py:1334 breezy/bzr/vf_repository.py:1344
5035
5222
msgid "Calculating text parents"
5036
5223
msgstr ""
5037
5224
5038
#: breezy/bzr/vf_repository.py:1413
5225
#: breezy/bzr/vf_repository.py:1422
5039
5226
msgid "Fetch texts"
5040
5227
msgstr ""
5041
5228
5042
#: breezy/bzr/vf_repository.py:2293
5229
#: breezy/bzr/vf_repository.py:2301
5043
5230
msgid "loading text store"
5044
5231
msgstr ""
5045
5232
5046
#: breezy/bzr/vf_repository.py:2300
5233
#: breezy/bzr/vf_repository.py:2308
5047
5234
msgid "checking text graph"
5048
5235
msgstr ""
5049
5236
5050
#: breezy/bzr/vf_repository.py:2742 breezy/bzr/vf_repository.py:2756
5051
#: breezy/bzr/vf_repository.py:2868
5237
#: breezy/bzr/vf_repository.py:2753 breezy/bzr/vf_repository.py:2767
5238
#: breezy/bzr/vf_repository.py:2880
5052
5239
msgid "Transferring revisions"
5053
5240
msgstr ""
5054
5241
5055
#: breezy/check.py:64
5242
#: breezy/check.py:65
5056
5243
#, python-format
5057
5244
msgid "Checking branch at '%s'."
5058
5245
msgstr ""
5062
5249
msgid "Checking working tree at '%s'."
5063
5250
msgstr ""
5064
5251
5065
#: breezy/check.py:137 breezy/check.py:151
5252
#: breezy/check.py:134 breezy/check.py:148
5066
5253
msgid "No branch found at specified location."
5067
5254
msgstr ""
5068
5255
5069
#: breezy/check.py:139 breezy/check.py:149
5256
#: breezy/check.py:136 breezy/check.py:146
5070
5257
msgid "No working tree found at specified location."
5071
5258
msgstr ""
5072
5259
5073
#: breezy/check.py:142
5260
#: breezy/check.py:139
5074
5261
#, python-format
5075
5262
msgid "Checking repository at '%s'."
5076
5263
msgstr ""
5077
5264
5078
#: breezy/check.py:153
5265
#: breezy/check.py:150
5079
5266
msgid "No repository found at specified location."
5080
5267
msgstr ""
5081
5268
5109
5296
msgid "No files deleted."
5110
5297
msgstr ""
5111
5298
5112
#: breezy/cmd_version_info.py:49
5299
#: breezy/cmd_version_info.py:51
5113
5300
#, python-brace-format
5114
5301
msgid "No known version info format {0}. Supported types are: {1}"
5115
5302
msgstr ""
5116
5303
5117
5304
# help of 'format=custom' option of 'version-info' command
5118
#: breezy/cmd_version_info.py:53
5305
#: breezy/cmd_version_info.py:55
5119
5306
msgid "Version info in Custom template-based format."
5120
5307
msgstr ""
5121
5308
5122
5309
# help of 'format=python' option of 'version-info' command
5123
#: breezy/cmd_version_info.py:53
5310
#: breezy/cmd_version_info.py:55
5124
5311
msgid "Version info in Python format."
5125
5312
msgstr ""
5126
5313
5127
5314
# help of 'format=rio' option of 'version-info' command
5128
#: breezy/cmd_version_info.py:53
5315
#: breezy/cmd_version_info.py:55
5129
5316
msgid "Version info in RIO (simple text) format (default)."
5130
5317
msgstr ""
5131
5318
5132
#: breezy/cmd_version_info.py:54
5319
#: breezy/cmd_version_info.py:56
5133
5320
msgid "Show version information about this tree."
5134
5321
msgstr ""
5135
5322
5136
#: breezy/cmd_version_info.py:56
5323
#: breezy/cmd_version_info.py:58
5137
5324
msgid ""
5138
5325
"You can use this command to add information about version into\n"
5139
5326
"source code of an application. The output can be in one of the\n"
5140
5327
"supported formats or in a custom format based on a template."
5141
5328
msgstr ""
5142
5329
5143
#: breezy/cmd_version_info.py:60 en/help_topics/configuration.txt:699
5330
#: breezy/cmd_version_info.py:62 en/help_topics/configuration.txt:699
5144
5331
#: en/help_topics/configuration.txt:725
5145
5332
msgid "For example::"
5146
5333
msgstr ""
5147
5334
5148
#: breezy/cmd_version_info.py:62
5335
#: breezy/cmd_version_info.py:64
5149
5336
msgid ""
5150
5337
" brz version-info --custom \\\n"
5151
5338
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5152
5339
msgstr ""
5153
5340
5154
#: breezy/cmd_version_info.py:65
5341
#: breezy/cmd_version_info.py:67
5155
5342
msgid ""
5156
5343
"will produce a C header file with formatted string containing the\n"
5157
5344
"current revision number. Other supported variables in templates are:"
5158
5345
msgstr ""
5159
5346
5160
#: breezy/cmd_version_info.py:68
5347
#: breezy/cmd_version_info.py:70
5161
5348
msgid ""
5162
5349
" * {date} - date of the last revision\n"
5163
5350
" * {build_date} - current date\n"
5169
5356
msgstr ""
5170
5357
5171
5358
# help of 'format' option of 'version-info' command
5172
#: breezy/cmd_version_info.py:78
5359
#: breezy/cmd_version_info.py:80
5173
5360
msgid "Select the output format."
5174
5361
msgstr ""
5175
5362
5176
5363
# help of 'all' option of 'version-info' command
5177
#: breezy/cmd_version_info.py:82
5364
#: breezy/cmd_version_info.py:84
5178
5365
msgid "Include all possible information."
5179
5366
msgstr ""
5180
5367
5181
5368
# help of 'check-clean' option of 'version-info' command
5182
#: breezy/cmd_version_info.py:83
5369
#: breezy/cmd_version_info.py:85
5183
5370
msgid "Check if tree is clean."
5184
5371
msgstr ""
5185
5372
5186
5373
# help of 'include-history' option of 'version-info' command
5187
#: breezy/cmd_version_info.py:85
5374
#: breezy/cmd_version_info.py:87
5188
5375
msgid "Include the revision-history."
5189
5376
msgstr ""
5190
5377
5191
5378
# help of 'include-file-revisions' option of 'version-info' command
5192
#: breezy/cmd_version_info.py:87
5379
#: breezy/cmd_version_info.py:89
5193
5380
msgid "Include the last revision for each file."
5194
5381
msgstr ""
5195
5382
5196
5383
# help of 'template' option of 'version-info' command
5197
#: breezy/cmd_version_info.py:89
5384
#: breezy/cmd_version_info.py:91
5198
5385
msgid "Template for the output."
5199
5386
msgstr ""
5200
5387
5201
#: breezy/cmd_version_info.py:103
5388
#: breezy/cmd_version_info.py:105
5202
5389
msgid "brz version-info --revision takes exactly one revision specifier"
5203
5390
msgstr ""
5204
5391
5212
5399
msgid "unknown command \"%s\""
5213
5400
msgstr ""
5214
5401
5215
#: breezy/commands.py:560
5402
#: breezy/commands.py:563
5216
5403
msgid "No help for this command."
5217
5404
msgstr ""
5218
5405
5219
#: breezy/commands.py:573
5406
#: breezy/commands.py:576
5220
5407
#, python-format
5221
5408
msgid ":Purpose: %s\n"
5222
5409
msgstr ""
5223
5410
5224
#: breezy/commands.py:575
5411
#: breezy/commands.py:578
5225
5412
#, python-format
5226
5413
msgid ""
5227
5414
":Usage:\n"
5228
5415
"%s\n"
5229
5416
msgstr ""
5230
5417
5231
#: breezy/commands.py:577
5418
#: breezy/commands.py:580
5232
5419
#, python-format
5233
5420
msgid ":Usage: %s\n"
5234
5421
msgstr ""
5235
5422
5236
#: breezy/commands.py:597
5423
#: breezy/commands.py:600
5237
5424
#, python-format
5238
5425
msgid ":Options:%s"
5239
5426
msgstr ""
5240
5427
5241
#: breezy/commands.py:608
5428
#: breezy/commands.py:611
5242
5429
#, python-format
5243
5430
msgid ""
5244
5431
":Description:\n"
5246
5433
"\n"
5247
5434
msgstr ""
5248
5435
5249
#: breezy/commands.py:618
5436
#: breezy/commands.py:621
5250
5437
#, python-format
5251
5438
msgid ""
5252
5439
"See brz help %s for more details and examples.\n"
5253
5440
"\n"
5254
5441
msgstr ""
5255
5442
5256
#: breezy/commands.py:623
5443
#: breezy/commands.py:626
5257
5444
msgid ":Aliases: "
5258
5445
msgstr ""
5259
5446
5260
#: breezy/commands.py:627
5447
#: breezy/commands.py:630
5261
5448
#, python-format
5262
5449
msgid ":From: plugin \"%s\"\n"
5263
5450
msgstr ""
5264
5451
5265
#: breezy/commands.py:639
5452
#: breezy/commands.py:642
5266
5453
#, python-brace-format
5267
5454
msgid ":doc:`{0} <{1}-help>`"
5268
5455
msgstr ""
5269
5456
5270
#: breezy/commands.py:643
5457
#: breezy/commands.py:646
5271
5458
#, python-format
5272
5459
msgid ":See also: %s"
5273
5460
msgstr ""
5274
5461
5275
#: breezy/commands.py:917
5462
#: breezy/commands.py:919
5276
5463
msgid "Only ASCII permitted in option names"
5277
5464
msgstr ""
5278
5465
5279
#: breezy/commands.py:942 breezy/commands.py:950
5466
#: breezy/commands.py:944 breezy/commands.py:952
5280
5467
msgid "command {0!r} needs one or more {1}"
5281
5468
msgstr ""
5282
5469
5283
#: breezy/commands.py:959
5470
#: breezy/commands.py:961
5284
5471
msgid "command {0!r} requires argument {1}"
5285
5472
msgstr ""
5286
5473
5287
#: breezy/commands.py:966
5474
#: breezy/commands.py:968
5288
5475
#, python-brace-format
5289
5476
msgid "extra argument to command {0}: {1}"
5290
5477
msgstr ""
5291
5478
5292
#: breezy/commands.py:1038
5479
#: breezy/commands.py:1044
5293
5480
#, python-format
5294
5481
msgid "Profile data written to \"%s\"."
5295
5482
msgstr ""
5296
5483
5297
#: breezy/commit.py:152 breezy/commit.py:727
5484
#: breezy/commit.py:151 breezy/commit.py:715
5298
5485
msgid "added"
5299
5486
msgstr ""
5300
5487
5301
#: breezy/commit.py:152 breezy/commit.py:737
5488
#: breezy/commit.py:151 breezy/commit.py:725
5302
5489
msgid "modified"
5303
5490
msgstr ""
5304
5491
5305
#: breezy/commit.py:158
5492
#: breezy/commit.py:157
5306
5493
#, python-format
5307
5494
msgid "Committing to: %s"
5308
5495
msgstr ""
5312
5499
msgid "Committed revision %d."
5313
5500
msgstr ""
5314
5501
5315
#: breezy/commit.py:171
5502
#: breezy/commit.py:170
5503
#, python-format
5504
msgid "Committed revid %s."
5505
msgstr ""
5506
5507
#: breezy/commit.py:173
5316
5508
#, python-format
5317
5509
msgid "deleted %s"
5318
5510
msgstr ""
5319
5511
5320
#: breezy/commit.py:174
5512
#: breezy/commit.py:176
5321
5513
#, python-format
5322
5514
msgid "missing %s"
5323
5515
msgstr ""
5324
5516
5325
#: breezy/commit.py:515
5517
#: breezy/commit.py:495
5326
5518
#, python-brace-format
5327
5519
msgid ""
5328
5520
"Conflicting tags in bound branch:\n"
5329
5521
"{0}"
5330
5522
msgstr ""
5331
5523
5332
#: breezy/commit.py:729
5524
#: breezy/commit.py:717
5333
5525
msgid "renamed"
5334
5526
msgstr ""
5335
5527
5336
#: breezy/commit.py:794
5528
#: breezy/commit.py:782
5337
5529
#, python-brace-format
5338
5530
msgid "{0} [{1}] - Stage"
5339
5531
msgstr ""
5340
5532
5341
#: breezy/commit.py:797
5533
#: breezy/commit.py:785
5342
5534
#, python-format
5343
5535
msgid "%s - Stage"
5344
5536
msgstr ""
5345
5537
5346
#: breezy/commit_signature_commands.py:34
5538
#: breezy/commit_signature_commands.py:35
5347
5539
msgid "Sign all commits by a given committer."
5348
5540
msgstr ""
5349
5541
5350
#: breezy/commit_signature_commands.py:36
5542
#: breezy/commit_signature_commands.py:37
5351
5543
msgid ""
5352
5544
"If location is not specified the local tree is used.\n"
5353
5545
"If committer is not specified the default committer is used."
5354
5546
msgstr ""
5355
5547
5356
#: breezy/commit_signature_commands.py:39
5548
#: breezy/commit_signature_commands.py:40
5357
5549
msgid "This does not sign commits that already have signatures."
5358
5550
msgstr ""
5359
5551
5360
5552
# help of 'dry-run' option of 'sign-my-commits' command
5361
#: breezy/commit_signature_commands.py:47
5553
#: breezy/commit_signature_commands.py:48
5362
5554
msgid ""
5363
5555
"Don't actually sign anything, just print the revisions that would be signed."
5364
5556
msgstr ""
5365
5557
5366
#: breezy/commit_signature_commands.py:95
5558
#: breezy/commit_signature_commands.py:90
5367
5559
#, python-format
5368
5560
msgid "Signed %d revision.\n"
5369
5561
msgid_plural "Signed %d revisions.\n"
5370
5562
msgstr[0] ""
5371
5563
msgstr[1] ""
5372
5564
5373
#: breezy/commit_signature_commands.py:100
5565
#: breezy/commit_signature_commands.py:95
5374
5566
msgid "Verify all commit signatures."
5375
5567
msgstr ""
5376
5568
5377
#: breezy/commit_signature_commands.py:102
5569
#: breezy/commit_signature_commands.py:97
5378
5570
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
5379
5571
msgstr ""
5380
5572
5381
5573
# help of 'acceptable-keys' option of 'verify-signatures' command
5382
#: breezy/commit_signature_commands.py:107
5574
#: breezy/commit_signature_commands.py:102
5383
5575
msgid ""
5384
5576
"Comma separated list of GPG key patterns which are acceptable for "
5385
5577
"verification."
5386
5578
msgstr ""
5387
5579
5388
#: breezy/commit_signature_commands.py:146
5580
#: breezy/commit_signature_commands.py:141
5389
5581
msgid "Cannot verify a range of non-revision-history revisions"
5390
5582
msgstr ""
5391
5583
5392
#: breezy/commit_signature_commands.py:165
5584
#: breezy/commit_signature_commands.py:160
5393
5585
msgid "All commits signed with verifiable keys"
5394
5586
msgstr ""
5395
5587
5396
#: breezy/config.py:2509
5588
#: breezy/config.py:2256
5397
5589
#, python-brace-format
5398
5590
msgid "{0} is not an SI unit."
5399
5591
msgstr ""
5400
5592
5401
#: breezy/config.py:3032
5593
#: breezy/config.py:2793
5402
5594
#, python-brace-format
5403
5595
msgid ""
5404
5596
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5405
5597
"will be saved."
5406
5598
msgstr ""
5407
5599
5408
#: breezy/config.py:3177
5600
#: breezy/config.py:2938
5409
5601
#, python-format
5410
5602
msgid "Invalid '%s', should be of the form 'name=value'"
5411
5603
msgstr ""
5412
5604
5413
#: breezy/config.py:4121
5605
#: breezy/config.py:3881
5414
5606
msgid "Display, set or remove a configuration option."
5415
5607
msgstr ""
5416
5608
5417
#: breezy/config.py:4123
5609
#: breezy/config.py:3883
5418
5610
msgid "Display the active value for option NAME."
5419
5611
msgstr ""
5420
5612
5421
#: breezy/config.py:4125
5613
#: breezy/config.py:3885
5422
5614
msgid ""
5423
5615
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5424
5616
"matching options are displayed mentioning their scope and without resolving\n"
5426
5618
"account is the first one displayed for each option."
5427
5619
msgstr ""
5428
5620
5429
#: breezy/config.py:4130
5621
#: breezy/config.py:3890
5430
5622
msgid ""
5431
5623
"If NAME is not given, --all .* is implied (all options are displayed for "
5432
5624
"the\n"
5433
5625
"current scope)."
5434
5626
msgstr ""
5435
5627
5436
#: breezy/config.py:4133
5628
#: breezy/config.py:3893
5437
5629
msgid ""
5438
5630
"Setting a value is achieved by using NAME=value without spaces. The value\n"
5439
5631
"is set in the most relevant scope and can be checked by displaying the\n"
5440
5632
"option again."
5441
5633
msgstr ""
5442
5634
5443
#: breezy/config.py:4137
5635
#: breezy/config.py:3897
5444
5636
msgid "Removing a value is achieved by using --remove NAME."
5445
5637
msgstr ""
5446
5638
5447
5639
# help of 'scope' option of 'config' command
5448
#: breezy/config.py:4147
5640
#: breezy/config.py:3907
5449
5641
msgid "Reduce the scope to the specified configuration file."
5450
5642
msgstr ""
5451
5643
5452
5644
# help of 'all' option of 'config' command
5453
#: breezy/config.py:4151
5645
#: breezy/config.py:3911
5454
5646
msgid "Display all the defined values for the matching options."
5455
5647
msgstr ""
5456
5648
5457
5649
# help of 'remove' option of 'config' command
5458
#: breezy/config.py:4153
5650
#: breezy/config.py:3913
5459
5651
msgid "Remove the option from the configuration file."
5460
5652
msgstr ""
5461
5653
5479
5671
msgid "List paths of files with text conflicts."
5480
5672
msgstr ""
5481
5673
5674
# help of 'action=auto' option of 'resolve' command
5675
#: breezy/conflicts.py:87
5676
msgid "Detect whether conflict has been resolved by user."
5677
msgstr ""
5678
5482
5679
# help of 'action=done' option of 'resolve' command
5483
#: breezy/conflicts.py:87
5680
#: breezy/conflicts.py:89
5484
5681
msgid "Marks the conflict as resolved."
5485
5682
msgstr ""
5486
5683
5487
5684
# help of 'action=take-this' option of 'resolve' command
5488
#: breezy/conflicts.py:90
5685
#: breezy/conflicts.py:92
5489
5686
msgid "Resolve the conflict preserving the version in the working tree."
5490
5687
msgstr ""
5491
5688
5492
5689
# help of 'action=take-other' option of 'resolve' command
5493
#: breezy/conflicts.py:93
5690
#: breezy/conflicts.py:95
5494
5691
msgid "Resolve the conflict taking the merged version into account."
5495
5692
msgstr ""
5496
5693
5497
5694
# help of 'action' option of 'resolve' command
5498
#: breezy/conflicts.py:101
5695
#: breezy/conflicts.py:103
5499
5696
msgid "How to resolve the conflict."
5500
5697
msgstr ""
5501
5698
5502
#: breezy/conflicts.py:107
5699
#: breezy/conflicts.py:109
5503
5700
msgid "Mark a conflict as resolved."
5504
5701
msgstr ""
5505
5702
5506
#: breezy/conflicts.py:114
5703
#: breezy/conflicts.py:116
5507
5704
msgid ""
5508
5705
"Once you have fixed a problem, use \"brz resolve\" to automatically mark\n"
5509
5706
"text conflicts as fixed, \"brz resolve FILE\" to mark a specific conflict "
5512
5709
msgstr ""
5513
5710
5514
5711
# help of 'all' option of 'resolve' command
5515
#: breezy/conflicts.py:122
5712
#: breezy/conflicts.py:124
5516
5713
msgid "Resolve all conflicts in this tree."
5517
5714
msgstr ""
5518
5715
5519
#: breezy/conflicts.py:130
5716
#: breezy/conflicts.py:132
5520
5717
msgid "If --all is specified, no FILE may be provided"
5521
5718
msgstr ""
5522
5719
5523
#: breezy/conflicts.py:155
5720
#: breezy/conflicts.py:152
5524
5721
#, python-format
5525
5722
msgid "%d conflict auto-resolved."
5526
5723
msgid_plural "%d conflicts auto-resolved."
5527
5724
msgstr[0] ""
5528
5725
msgstr[1] ""
5529
5726
5530
#: breezy/conflicts.py:158
5727
#: breezy/conflicts.py:155
5531
5728
msgid "Remaining conflicts:"
5532
5729
msgstr ""
5533
5730
5731
#: breezy/conflicts.py:160
5732
msgid "All conflicts resolved."
5733
msgstr ""
5734
5534
5735
#: breezy/conflicts.py:163
5535
msgid "All conflicts resolved."
5536
msgstr ""
5537
5538
#: breezy/conflicts.py:172
5539
5736
#, python-brace-format
5540
5737
msgid "{0} conflict resolved, {1} remaining"
5541
5738
msgid_plural "{0} conflicts resolved, {1} remaining"
5542
5739
msgstr[0] ""
5543
5740
msgstr[1] ""
5544
5741
5545
#: breezy/controldir.py:731
5742
#: breezy/controldir.py:751
5546
5743
#, python-brace-format
5547
5744
msgid "{0} is{1} redirected to {2}"
5548
5745
msgstr ""
5549
5746
5550
#: breezy/diff.py:413
5747
#: breezy/diff.py:474
5551
5748
#, python-format
5552
5749
msgid "*** Ignoring files outside view. View is %s"
5553
5750
msgstr ""
5594
5791
msgid "%(url)s is not a local path."
5595
5792
msgstr ""
5596
5793
5597
#: breezy/errors.py:301
5794
#: breezy/errors.py:289
5795
msgid ""
5796
"Unable to determine your name.\n"
5797
"Please, set your name with the 'whoami' command.\n"
5798
"E.g. brz whoami \"Your Name <name@example.com>\""
5799
msgstr ""
5800
5801
#: breezy/errors.py:308
5598
5802
msgid "%(not_locked)r is not write locked but needs to be."
5599
5803
msgstr ""
5600
5804
5601
#: breezy/errors.py:309
5805
#: breezy/errors.py:316
5602
5806
msgid "Commit refused because there are unknown files in the tree"
5603
5807
msgstr ""
5604
5808
5605
#: breezy/errors.py:320
5809
#: breezy/errors.py:327
5606
5810
msgid "Generic path error: %(path)r%(extra)s)"
5607
5811
msgstr ""
5608
5812
5609
#: breezy/errors.py:333
5813
#: breezy/errors.py:340
5610
5814
msgid "No such file: %(path)r%(extra)s"
5611
5815
msgstr ""
5612
5816
5613
#: breezy/errors.py:338
5817
#: breezy/errors.py:345
5614
5818
msgid "File exists: %(path)r%(extra)s"
5615
5819
msgstr ""
5616
5820
5617
#: breezy/errors.py:344
5821
#: breezy/errors.py:351
5618
5822
msgid ""
5619
5823
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5620
5824
"after to tell brz about a rename that has already happened)%(extra)s"
5621
5825
msgstr ""
5622
5826
5623
#: breezy/errors.py:360
5827
#: breezy/errors.py:367
5624
5828
msgid "\"%(path)s\" is not a directory %(extra)s"
5625
5829
msgstr ""
5626
5830
5627
#: breezy/errors.py:365
5831
#: breezy/errors.py:372
5628
5832
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5629
5833
msgstr ""
5630
5834
5631
#: breezy/errors.py:370
5835
#: breezy/errors.py:377
5632
5836
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5633
5837
msgstr ""
5634
5838
5635
#: breezy/errors.py:375
5839
#: breezy/errors.py:382
5636
5840
msgid "Hard-linking \"%(path)s\" is not supported"
5637
5841
msgstr ""
5638
5842
5639
#: breezy/errors.py:390
5843
#: breezy/errors.py:397
5640
5844
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5641
5845
msgstr ""
5642
5846
5643
#: breezy/errors.py:395
5847
#: breezy/errors.py:402
5644
5848
msgid "Permission denied: \"%(path)s\"%(extra)s"
5645
5849
msgstr ""
5646
5850
5647
#: breezy/errors.py:412
5851
#: breezy/errors.py:419
5648
5852
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5649
5853
msgstr ""
5650
5854
5651
#: breezy/errors.py:420
5855
#: breezy/errors.py:427
5652
5856
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5653
5857
msgstr ""
5654
5858
5655
#: breezy/errors.py:430
5859
#: breezy/errors.py:437
5656
5860
msgid ""
5657
5861
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5658
5862
"need to upgrade the repository to permit branch stacking."
5659
5863
msgstr ""
5660
5864
5661
#: breezy/errors.py:441
5865
#: breezy/errors.py:448
5662
5866
msgid "Error reading from %(path)r."
5663
5867
msgstr ""
5664
5868
5665
#: breezy/errors.py:460
5869
#: breezy/errors.py:467
5666
5870
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5667
5871
msgstr ""
5668
5872
5669
#: breezy/errors.py:476
5873
#: breezy/errors.py:483
5670
5874
msgid "Path \"%(path)s\" is not unicode normalized"
5671
5875
msgstr ""
5672
5876
5673
#: breezy/errors.py:484
5877
#: breezy/errors.py:491
5674
5878
msgid "Not a branch: \"%(path)s\"%(detail)s."
5675
5879
msgstr ""
5676
5880
5677
#: breezy/errors.py:526
5881
#: breezy/errors.py:533
5678
5882
msgid "No submit branch available for branch \"%(path)s\""
5679
5883
msgstr ""
5680
5884
5681
#: breezy/errors.py:535
5885
#: breezy/errors.py:542
5682
5886
msgid "A control directory already exists: \"%(path)s\"."
5683
5887
msgstr ""
5684
5888
5685
#: breezy/errors.py:540
5889
#: breezy/errors.py:547
5686
5890
msgid "Already a branch: \"%(path)s\"."
5687
5891
msgstr ""
5688
5892
5689
#: breezy/errors.py:545
5893
#: breezy/errors.py:552
5690
5894
msgid "Invalid branch name: %(name)s"
5691
5895
msgstr ""
5692
5896
5693
#: breezy/errors.py:554
5897
#: breezy/errors.py:561
5694
5898
msgid "Parent branch already exists: \"%(path)s\"."
5695
5899
msgstr ""
5696
5900
5697
#: breezy/errors.py:560
5901
#: breezy/errors.py:566
5698
5902
msgid ""
5699
5903
"Directory contains a branch, but no working tree (use brz checkout if you "
5700
5904
"wish to build a working tree): \"%(path)s\""
5701
5905
msgstr ""
5702
5906
5703
#: breezy/errors.py:565
5907
#: breezy/errors.py:572
5704
5908
msgid ""
5705
5909
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5706
5910
msgstr ""
5707
5911
5708
#: breezy/errors.py:575
5912
#: breezy/errors.py:582
5709
5913
msgid "No repository present: \"%(path)s\""
5710
5914
msgstr ""
5711
5915
5712
#: breezy/errors.py:583
5916
#: breezy/errors.py:591
5713
5917
msgid ""
5714
5918
"Unsupported branch format: %(format)s\n"
5715
5919
"Please run 'brz upgrade'"
5716
5920
msgstr ""
5717
5921
5718
#: breezy/errors.py:589
5922
#: breezy/errors.py:596
5719
5923
msgid "Unknown %(kind)s format: %(format)r"
5720
5924
msgstr ""
5721
5925
5722
#: breezy/errors.py:598
5926
#: breezy/errors.py:605
5723
5927
msgid ""
5724
5928
"Line ending corrupted for file: %(file)s; Maybe your files got corrupted in "
5725
5929
"transport?"
5726
5930
msgstr ""
5727
5931
5728
#: breezy/errors.py:607
5932
#: breezy/errors.py:614
5729
5933
msgid "Format %(format)s is not compatible with .bzr version %(controldir)s."
5730
5934
msgstr ""
5731
5935
5732
#: breezy/errors.py:617
5936
#: breezy/errors.py:624
5733
5937
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5734
5938
msgstr ""
5735
5939
5736
#: breezy/errors.py:632
5940
#: breezy/errors.py:642
5737
5941
msgid ""
5738
5942
"%(target)s\n"
5739
5943
"is not compatible with\n"
5741
5945
"%(details)s"
5742
5946
msgstr ""
5743
5947
5744
#: breezy/errors.py:648
5948
#: breezy/errors.py:655
5745
5949
msgid "Revision is not compatible with %(repo_format)s"
5746
5950
msgstr ""
5747
5951
5748
#: breezy/errors.py:658
5952
#: breezy/errors.py:665
5749
5953
msgid "%(context_info)s%(path)s is already versioned."
5750
5954
msgstr ""
5751
5955
5752
#: breezy/errors.py:679
5956
#: breezy/errors.py:686
5753
5957
msgid "%(context_info)s%(path)s is not versioned."
5754
5958
msgstr ""
5755
5959
5756
#: breezy/errors.py:700
5960
#: breezy/errors.py:707
5757
5961
msgid "Path(s) are not versioned: %(paths_as_string)s"
5758
5962
msgstr ""
5759
5963
5760
#: breezy/errors.py:711
5964
#: breezy/errors.py:718
5761
5965
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5762
5966
msgstr ""
5763
5967
5764
#: breezy/errors.py:730
5968
#: breezy/errors.py:737
5765
5969
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5766
5970
msgstr ""
5767
5971
5768
#: breezy/errors.py:738
5972
#: breezy/errors.py:745
5769
5973
msgid ""
5770
5974
"Filename %(filename)r is not valid in your current filesystem encoding "
5771
5975
"%(fs_encoding)s"
5772
5976
msgstr ""
5773
5977
5774
#: breezy/errors.py:749
5978
#: breezy/errors.py:756
5775
5979
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5776
5980
msgstr ""
5777
5981
5778
#: breezy/errors.py:767
5982
#: breezy/errors.py:774
5779
5983
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5780
5984
msgstr ""
5781
5985
5782
#: breezy/errors.py:806
5986
#: breezy/errors.py:813
5783
5987
msgid "Cannot lock %(lock)s: %(why)s"
5784
5988
msgstr ""
5785
5989
5786
#: breezy/errors.py:816
5990
#: breezy/errors.py:823
5787
5991
msgid ""
5788
5992
"A transaction related operation was attempted after the transaction finished."
5789
5993
msgstr ""
5790
5994
5791
#: breezy/errors.py:843
5995
#: breezy/errors.py:850
5792
5996
msgid "Cannot lock: transport is read only: %(transport)s"
5793
5997
msgstr ""
5794
5998
5795
#: breezy/errors.py:851
5999
#: breezy/errors.py:858
5796
6000
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5797
6001
msgstr ""
5798
6002
5799
#: breezy/errors.py:862
6003
#: breezy/errors.py:869
5800
6004
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5801
6005
msgstr ""
5802
6006
5803
#: breezy/errors.py:873
6007
#: breezy/errors.py:880
5804
6008
msgid ""
5805
6009
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5806
6010
"%(holder)r, wanted to break %(target)r"
5807
6011
msgstr ""
5808
6012
5809
#: breezy/errors.py:885
6013
#: breezy/errors.py:893
5810
6014
msgid ""
5811
6015
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5812
6016
"Use 'brz break-lock' to clear it"
5813
6017
msgstr ""
5814
6018
5815
#: breezy/errors.py:898
6019
#: breezy/errors.py:905
5816
6020
msgid "Lock not held: %(lock)s"
5817
6021
msgstr ""
5818
6022
5819
#: breezy/errors.py:927
6023
#: breezy/errors.py:934
5820
6024
msgid "Upgrade URL cannot work with readonly URLs."
5821
6025
msgstr ""
5822
6026
5823
#: breezy/errors.py:932
6027
#: breezy/errors.py:939
5824
6028
msgid "The branch format %(format)s is already at the most recent format."
5825
6029
msgstr ""
5826
6030
5827
#: breezy/errors.py:950
6031
#: breezy/errors.py:957
5828
6032
msgid "Option --change does not accept revision ranges"
5829
6033
msgstr ""
5830
6034
5831
#: breezy/errors.py:955
6035
#: breezy/errors.py:962
5832
6036
msgid "No namespace registered for string: %(spec)r"
5833
6037
msgstr ""
5834
6038
5835
#: breezy/errors.py:974
6039
#: breezy/errors.py:981
5836
6040
msgid ""
5837
6041
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5838
6042
"%(extra)s"
5839
6043
msgstr ""
5840
6044
5841
#: breezy/errors.py:988
6045
#: breezy/errors.py:995
5842
6046
msgid ""
5843
6047
"Operation denied because it would change the main history, which is not "
5844
6048
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5845
6049
msgstr ""
5846
6050
5847
#: breezy/errors.py:999
6051
#: breezy/errors.py:1007
5848
6052
msgid ""
5849
6053
"These branches have diverged. Use the missing command to see how.\n"
5850
6054
"Use the merge command to reconcile them."
5851
6055
msgstr ""
5852
6056
5853
#: breezy/errors.py:1019
6057
#: breezy/errors.py:1026
5854
6058
msgid ""
5855
6059
"Branches have no common ancestor, and no merge base revision was specified."
5856
6060
msgstr ""
5857
6061
5858
#: breezy/errors.py:1025
6062
#: breezy/errors.py:1032
5859
6063
msgid ""
5860
6064
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5861
6065
msgstr ""
5862
6066
5863
#: breezy/errors.py:1031
6067
#: breezy/errors.py:1038
5864
6068
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5865
6069
msgstr ""
5866
6070
5867
#: breezy/errors.py:1040
6071
#: breezy/errors.py:1047
5868
6072
msgid ""
5869
6073
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5870
6074
msgstr ""
5871
6075
5872
#: breezy/errors.py:1049
6076
#: breezy/errors.py:1056
5873
6077
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5874
6078
msgstr ""
5875
6079
5876
#: breezy/errors.py:1058
6080
#: breezy/errors.py:1065
5877
6081
msgid "Branch %(branch)s has no commits."
5878
6082
msgstr ""
5879
6083
5880
#: breezy/errors.py:1075
6084
#: breezy/errors.py:1082
5881
6085
msgid ""
5882
6086
"Bound branch %(branch)s is out of date with master branch %(master)s."
5883
6087
"%(extra_help)s"
5884
6088
msgstr ""
5885
6089
5886
#: breezy/errors.py:1087
6090
#: breezy/errors.py:1094
5887
6091
msgid ""
5888
6092
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5889
6093
"bound to %(remote)s."
5890
6094
msgstr ""
5891
6095
5892
#: breezy/errors.py:1099
6096
#: breezy/errors.py:1106
5893
6097
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5894
6098
msgstr ""
5895
6099
5896
#: breezy/errors.py:1108
6100
#: breezy/errors.py:1115
5897
6101
msgid ""
5898
6102
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5899
6103
"%(error)s"
5900
6104
msgstr ""
5901
6105
5902
#: breezy/errors.py:1120
6106
#: breezy/errors.py:1127
5903
6107
msgid "Versioned file error"
5904
6108
msgstr ""
5905
6109
5906
#: breezy/errors.py:1125
6110
#: breezy/errors.py:1132
5907
6111
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5908
6112
msgstr ""
5909
6113
5910
#: breezy/errors.py:1135
6114
#: breezy/errors.py:1142
5911
6115
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5912
6116
msgstr ""
5913
6117
5914
#: breezy/errors.py:1145
6118
#: breezy/errors.py:1152
5915
6119
msgid "Text did not match its checksum: %(msg)s"
5916
6120
msgstr ""
5917
6121
5918
#: breezy/errors.py:1197
6122
#: breezy/errors.py:1204
5919
6123
msgid "Export format %(format)r not supported"
5920
6124
msgstr ""
5921
6125
5922
#: breezy/errors.py:1206
6126
#: breezy/errors.py:1213
5923
6127
msgid "Transport error: %(msg)s %(orig_error)s"
5924
6128
msgstr ""
5925
6129
5926
#: breezy/errors.py:1232
6130
#: breezy/errors.py:1239
5927
6131
msgid "Generic bzr smart protocol error: %(details)s"
5928
6132
msgstr ""
5929
6133
5930
#: breezy/errors.py:1240
6134
#: breezy/errors.py:1247
5931
6135
msgid "Received bad protocol version marker: %(marker)r"
5932
6136
msgstr ""
5933
6137
5934
#: breezy/errors.py:1272
6138
#: breezy/errors.py:1279
5935
6139
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5936
6140
msgstr ""
5937
6141
5938
#: breezy/errors.py:1277
6142
#: breezy/errors.py:1284
5939
6143
msgid "Connection error: %(msg)s %(orig_error)s"
5940
6144
msgstr ""
5941
6145
5942
#: breezy/errors.py:1282
6146
#: breezy/errors.py:1289
5943
6147
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5944
6148
msgstr ""
5945
6149
5946
#: breezy/errors.py:1303
6150
#: breezy/errors.py:1310
5947
6151
msgid "Connection closed: %(msg)s %(orig_error)s"
5948
6152
msgstr ""
5949
6153
5950
#: breezy/errors.py:1308
6154
#: breezy/errors.py:1315
5951
6155
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5952
6156
msgstr ""
5953
6157
5954
#: breezy/errors.py:1313
6158
#: breezy/errors.py:1320
5955
6159
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5956
6160
msgstr ""
5957
6161
5958
#: breezy/errors.py:1323
6162
#: breezy/errors.py:1330
5959
6163
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5960
6164
msgstr ""
5961
6165
5962
#: breezy/errors.py:1338
6166
#: breezy/errors.py:1345
5963
6167
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5964
6168
msgstr ""
5965
6169
5966
#: breezy/errors.py:1352
6170
#: breezy/errors.py:1359
5967
6171
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5968
6172
msgstr ""
5969
6173
5970
#: breezy/errors.py:1360
6174
#: breezy/errors.py:1367
5971
6175
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5972
6176
msgstr ""
5973
6177
5974
#: breezy/errors.py:1369
6178
#: breezy/errors.py:1376
5975
6179
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5976
6180
msgstr ""
5977
6181
5978
#: breezy/errors.py:1383
6182
#: breezy/errors.py:1390
5979
6183
msgid "Too many redirections"
5980
6184
msgstr ""
5981
6185
5982
#: breezy/errors.py:1388
6186
#: breezy/errors.py:1395
5983
6187
msgid "Working tree has conflicts."
5984
6188
msgstr ""
5985
6189
5986
#: breezy/errors.py:1393
6190
#: breezy/errors.py:1400
5987
6191
msgid "Unable to import library \"%(library)s\": %(error)s"
5988
6192
msgstr ""
5989
6193
5990
#: breezy/errors.py:1401
6194
#: breezy/errors.py:1408
5991
6195
msgid ""
5992
6196
"The working tree for %(basedir)s has changed since the last commit, but "
5993
6197
"weave merge requires that it be unchanged"
5994
6198
msgstr ""
5995
6199
5996
#: breezy/errors.py:1411
6200
#: breezy/errors.py:1418
5997
6201
msgid "Cycle in graph %(graph)r"
5998
6202
msgstr ""
5999
6203
6000
#: breezy/errors.py:1439
6204
#: breezy/errors.py:1446
6001
6205
msgid "File %(filename)s is not conflicted."
6002
6206
msgstr ""
6003
6207
6004
#: breezy/errors.py:1461
6208
#: breezy/errors.py:1468
6005
6209
msgid "No bundle was found in \"%(filename)s\"."
6006
6210
msgstr ""
6007
6211
6008
#: breezy/errors.py:1470
6212
#: breezy/errors.py:1477
6009
6213
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6010
6214
msgstr ""
6011
6215
6012
#: breezy/errors.py:1480
6216
#: breezy/errors.py:1487
6013
6217
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6014
6218
msgstr ""
6015
6219
6016
#: breezy/errors.py:1493
6220
#: breezy/errors.py:1500
6017
6221
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6018
6222
msgstr ""
6019
6223
6020
#: breezy/errors.py:1503
6224
#: breezy/errors.py:1510
6021
6225
msgid "Key %(key)s is already present in map"
6022
6226
msgstr ""
6023
6227
6024
#: breezy/errors.py:1508
6228
#: breezy/errors.py:1515
6025
6229
msgid "The prefix %(prefix)s is in the help search path twice."
6026
6230
msgstr ""
6027
6231
6028
#: breezy/errors.py:1518
6232
#: breezy/errors.py:1528
6029
6233
msgid ""
6030
6234
"No final name for trans_id %(trans_id)r\n"
6031
6235
"file-id: %(file_id)r\n"
6032
6236
"root trans-id: %(root_trans_id)r\n"
6033
6237
msgstr ""
6034
6238
6035
#: breezy/errors.py:1550
6239
#: breezy/errors.py:1557
6036
6240
msgid "Attempt to reuse a transform that has already been applied."
6037
6241
msgstr ""
6038
6242
6039
#: breezy/errors.py:1555
6243
#: breezy/errors.py:1562
6040
6244
msgid "Moving the root directory is not supported at this time"
6041
6245
msgstr ""
6042
6246
6043
#: breezy/errors.py:1560
6247
#: breezy/errors.py:1567
6044
6248
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6045
6249
msgstr ""
6046
6250
6047
#: breezy/errors.py:1571
6251
#: breezy/errors.py:1578
6048
6252
msgid ""
6049
6253
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6050
6254
msgstr ""
6051
6255
6052
#: breezy/errors.py:1607
6256
#: breezy/errors.py:1614
6053
6257
msgid ""
6054
6258
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6055
6259
msgstr ""
6056
6260
6057
#: breezy/errors.py:1637
6261
#: breezy/errors.py:1644
6058
6262
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6059
6263
msgstr ""
6060
6264
6061
#: breezy/errors.py:1645
6265
#: breezy/errors.py:1652
6062
6266
msgid "Nothing to merge."
6063
6267
msgstr ""
6064
6268
6065
#: breezy/errors.py:1650
6269
#: breezy/errors.py:1657
6066
6270
msgid "Format %(format)s cannot be initialised by this version of brz."
6067
6271
msgstr ""
6068
6272
6069
#: breezy/errors.py:1659
6273
#: breezy/errors.py:1666
6070
6274
msgid ""
6071
6275
"Cannot convert from format %(from_format)s to format %(format)s. "
6072
6276
"%(problem)s"
6073
6277
msgstr ""
6074
6278
6075
#: breezy/errors.py:1671
6279
#: breezy/errors.py:1678
6076
6280
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6077
6281
msgstr ""
6078
6282
6079
#: breezy/errors.py:1679
6283
#: breezy/errors.py:1686
6080
6284
msgid "%(exe_name)s could not be found on this machine"
6081
6285
msgstr ""
6082
6286
6083
#: breezy/errors.py:1687
6287
#: breezy/errors.py:1694
6084
6288
msgid "Diff is not installed on this machine: %(msg)s"
6085
6289
msgstr ""
6086
6290
6087
#: breezy/errors.py:1695
6291
#: breezy/errors.py:1702
6088
6292
msgid "Diff3 is not installed on this machine."
6089
6293
msgstr ""
6090
6294
6091
#: breezy/errors.py:1701
6295
#: breezy/errors.py:1708
6092
6296
msgid "The content being inserted is already present."
6093
6297
msgstr ""
6094
6298
6095
#: breezy/errors.py:1706
6299
#: breezy/errors.py:1713
6096
6300
msgid ""
6097
6301
"This tree contains left-over files from a failed operation.\n"
6098
6302
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6100
6304
" keep, and delete it when you are done."
6101
6305
msgstr ""
6102
6306
6103
#: breezy/errors.py:1717
6307
#: breezy/errors.py:1724
6104
6308
msgid ""
6105
6309
"This tree contains left-over files from a failed operation.\n"
6106
6310
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6107
6311
" wish to keep, and delete it when you are done."
6108
6312
msgstr ""
6109
6313
6110
#: breezy/errors.py:1727
6314
#: breezy/errors.py:1734
6111
6315
msgid ""
6112
6316
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6113
6317
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6115
6319
" keep, and delete it when you are done."
6116
6320
msgstr ""
6117
6321
6118
#: breezy/errors.py:1738
6322
#: breezy/errors.py:1745
6119
6323
msgid ""
6120
6324
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6121
6325
"examine %(pending_deletion)s to see if it contains any files you wish to "
6122
6326
"keep, and delete it when you are done."
6123
6327
msgstr ""
6124
6328
6125
#: breezy/errors.py:1748
6329
#: breezy/errors.py:1755
6126
6330
msgid "Working tree is out of date, please run 'brz update'.%(more)s"
6127
6331
msgstr ""
6128
6332
6129
#: breezy/errors.py:1762
6333
#: breezy/errors.py:1769
6130
6334
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6131
6335
msgstr ""
6132
6336
6133
#: breezy/errors.py:1775
6337
#: breezy/errors.py:1782
6134
6338
msgid "Error in merge modified format"
6135
6339
msgstr ""
6136
6340
6137
#: breezy/errors.py:1780
6341
#: breezy/errors.py:1787
6138
6342
msgid "Format error in conflict listings"
6139
6343
msgstr ""
6140
6344
6141
#: breezy/errors.py:1784
6345
#: breezy/errors.py:1792
6142
6346
msgid ""
6143
6347
"An error has been detected in the repository %(repo_path)s.\n"
6144
6348
"Please run brz reconcile on this repository."
6145
6349
msgstr ""
6146
6350
6147
#: breezy/errors.py:1795
6351
#: breezy/errors.py:1803
6148
6352
msgid ""
6149
6353
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6150
6354
"reason: %(reason)s"
6151
6355
msgstr ""
6152
6356
6153
#: breezy/errors.py:1808
6357
#: breezy/errors.py:1816
6154
6358
msgid ""
6155
6359
"An inconsistent delta was supplied: %(delta)r\n"
6156
6360
"reason: %(reason)s"
6157
6361
msgstr ""
6158
6362
6159
#: breezy/errors.py:1820
6363
#: breezy/errors.py:1827
6160
6364
msgid "To use this feature you must upgrade your branch at %(path)s."
6161
6365
msgstr ""
6162
6366
6163
#: breezy/errors.py:1829
6367
#: breezy/errors.py:1836
6164
6368
msgid "To use this feature you must upgrade your repository at %(path)s."
6165
6369
msgstr ""
6166
6370
6167
#: breezy/errors.py:1834
6371
#: breezy/errors.py:1841
6168
6372
msgid ""
6169
6373
"To use this feature you must upgrade your branch at %(path)s to a format "
6170
6374
"which supports rich roots."
6171
6375
msgstr ""
6172
6376
6173
#: breezy/errors.py:1840
6377
#: breezy/errors.py:1847
6174
6378
msgid "Cannot perform local-only commits on unbound branches."
6175
6379
msgstr ""
6176
6380
6177
#: breezy/errors.py:1845
6381
#: breezy/errors.py:1852
6178
6382
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6179
6383
msgstr ""
6180
6384
6181
#: breezy/errors.py:1870
6385
#: breezy/errors.py:1876
6386
msgid "Shared repositories are not supported by %(format)r."
6387
msgstr ""
6388
6389
#: breezy/errors.py:1884
6182
6390
msgid "Ghost tags not supported by format %(format)r."
6183
6391
msgstr ""
6184
6392
6185
#: breezy/errors.py:1878
6393
#: breezy/errors.py:1892
6186
6394
msgid "File is binary but should be text."
6187
6395
msgstr ""
6188
6396
6189
#: breezy/errors.py:1883
6397
#: breezy/errors.py:1897
6190
6398
msgid "The path %(path)s is not permitted on this platform"
6191
6399
msgstr ""
6192
6400
6193
#: breezy/errors.py:1892
6401
#: breezy/errors.py:1906
6194
6402
msgid ""
6195
6403
"Testament did not match expected value.\n"
6196
6404
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6197
6405
" {%(measured)s}"
6198
6406
msgstr ""
6199
6407
6200
#: breezy/errors.py:1904
6408
#: breezy/errors.py:1918
6201
6409
msgid "Not a bzr revision-bundle: %(text)r"
6202
6410
msgstr ""
6203
6411
6204
#: breezy/errors.py:1913
6412
#: breezy/errors.py:1927
6205
6413
msgid "Bad bzr revision-bundle: %(text)r"
6206
6414
msgstr ""
6207
6415
6208
#: breezy/errors.py:1922
6416
#: breezy/errors.py:1936
6209
6417
msgid "Malformed bzr revision-bundle header: %(text)r"
6210
6418
msgstr ""
6211
6419
6212
#: breezy/errors.py:1927
6420
#: breezy/errors.py:1941
6213
6421
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6214
6422
msgstr ""
6215
6423
6216
#: breezy/errors.py:1932
6424
#: breezy/errors.py:1946
6217
6425
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6218
6426
msgstr ""
6219
6427
6220
#: breezy/errors.py:1937
6428
#: breezy/errors.py:1951
6221
6429
msgid "End of line marker was not \\n in bzr revision-bundle"
6222
6430
msgstr ""
6223
6431
6224
#: breezy/errors.py:1947
6432
#: breezy/errors.py:1961
6225
6433
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6226
6434
msgstr ""
6227
6435
6228
#: breezy/errors.py:1957
6436
#: breezy/errors.py:1971
6229
6437
msgid "Root class for inventory serialization errors"
6230
6438
msgstr ""
6231
6439
6232
#: breezy/errors.py:1961
6440
#: breezy/errors.py:1976
6233
6441
msgid ""
6234
6442
"The inventory was not in the expected format:\n"
6235
6443
" %(msg)s"
6236
6444
msgstr ""
6237
6445
6238
#: breezy/errors.py:1970
6446
#: breezy/errors.py:1984
6239
6447
msgid "This operation requires rich root data storage"
6240
6448
msgstr ""
6241
6449
6242
#: breezy/errors.py:1983
6450
#: breezy/errors.py:1997
6243
6451
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6244
6452
msgstr ""
6245
6453
6246
#: breezy/errors.py:1992
6454
#: breezy/errors.py:2006
6247
6455
msgid ""
6248
6456
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6249
6457
"variable."
6250
6458
msgstr ""
6251
6459
6252
#: breezy/errors.py:1999
6460
#: breezy/errors.py:2013
6253
6461
msgid ""
6254
6462
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6255
6463
"ghost at {%(ghost_revision_id)s}"
6256
6464
msgstr ""
6257
6465
6258
#: breezy/errors.py:2009
6466
#: breezy/errors.py:2023
6259
6467
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6260
6468
msgstr ""
6261
6469
6262
#: breezy/errors.py:2061
6470
#: breezy/errors.py:2040
6263
6471
msgid ""
6264
6472
"A merge directive must provide either a bundle or a public branch location."
6265
6473
msgstr ""
6266
6474
6267
#: breezy/errors.py:2068
6475
#: breezy/errors.py:2047
6268
6476
msgid "Bad merge directive payload %(start)r"
6269
6477
msgstr ""
6270
6478
6271
#: breezy/errors.py:2078
6479
#: breezy/errors.py:2057
6272
6480
msgid "Preview patch does not match requested changes."
6273
6481
msgstr ""
6274
6482
6275
#: breezy/errors.py:2084
6483
#: breezy/errors.py:2063
6276
6484
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6277
6485
msgstr ""
6278
6486
6279
#: breezy/errors.py:2094
6487
#: breezy/errors.py:2073
6280
6488
msgid ""
6281
6489
"Your branch does not have all of the revisions required in order to merge "
6282
6490
"this merge directive and the target location specified in the merge "
6283
6491
"directive is not a branch: %(location)s."
6284
6492
msgstr ""
6285
6493
6286
#: breezy/errors.py:2106
6494
#: breezy/errors.py:2085
6287
6495
msgid "Unsupported entry kind %(kind)s"
6288
6496
msgstr ""
6289
6497
6290
#: breezy/errors.py:2114
6498
#: breezy/errors.py:2093
6291
6499
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6292
6500
msgstr ""
6293
6501
6294
#: breezy/errors.py:2124
6502
#: breezy/errors.py:2103
6295
6503
msgid "Subsume target %(other_tree)s needs to be upgraded."
6296
6504
msgstr ""
6297
6505
6298
#: breezy/errors.py:2132
6506
#: breezy/errors.py:2111
6299
6507
msgid "No such tag: %(tag_name)s"
6300
6508
msgstr ""
6301
6509
6302
#: breezy/errors.py:2140
6303
msgid "Tags not supported by %(branch)s; you may be able to use brz upgrade."
6510
#: breezy/errors.py:2119
6511
msgid ""
6512
"Tags not supported by %(branch)s; you may be able to use 'brz upgrade "
6513
"%(branch_url)s'."
6304
6514
msgstr ""
6305
6515
6306
#: breezy/errors.py:2149
6516
#: breezy/errors.py:2129
6307
6517
msgid "Tag %(tag_name)s already exists."
6308
6518
msgstr ""
6309
6519
6310
#: breezy/errors.py:2157
6520
#: breezy/errors.py:2137
6311
6521
msgid "Could not understand response from smart server: %(response_tuple)r"
6312
6522
msgstr ""
6313
6523
6314
#: breezy/errors.py:2196
6524
#: breezy/errors.py:2176
6315
6525
msgid "Server sent an unexpected error: %(error_tuple)r"
6316
6526
msgstr ""
6317
6527
6318
#: breezy/errors.py:2215
6528
#: breezy/errors.py:2195
6319
6529
msgid "Unrecognised container format: %(container_format)r"
6320
6530
msgstr ""
6321
6531
6322
#: breezy/errors.py:2223
6532
#: breezy/errors.py:2203
6323
6533
msgid "Unexpected end of container stream"
6324
6534
msgstr ""
6325
6535
6326
#: breezy/errors.py:2228
6536
#: breezy/errors.py:2208
6327
6537
msgid "Unknown record type: %(record_type)r"
6328
6538
msgstr ""
6329
6539
6330
#: breezy/errors.py:2236
6540
#: breezy/errors.py:2216
6331
6541
msgid "Invalid record: %(reason)s"
6332
6542
msgstr ""
6333
6543
6334
#: breezy/errors.py:2244
6544
#: breezy/errors.py:2224
6335
6545
msgid "Container has data after end marker: %(excess)r"
6336
6546
msgstr ""
6337
6547
6338
#: breezy/errors.py:2252
6548
#: breezy/errors.py:2232
6339
6549
msgid "Container has multiple records with the same name: %(name)s"
6340
6550
msgstr ""
6341
6551
6342
#: breezy/errors.py:2260
6552
#: breezy/errors.py:2240
6343
6553
msgid "Corrupt or incompatible data stream: %(reason)s"
6344
6554
msgstr ""
6345
6555
6346
#: breezy/errors.py:2268
6556
#: breezy/errors.py:2248
6347
6557
msgid ""
6348
6558
"Working tree \"%(display_url)s\" has uncommitted changes (See brz status)."
6349
6559
"%(more)s"
6350
6560
msgstr ""
6351
6561
6352
#: breezy/errors.py:2287
6562
#: breezy/errors.py:2267
6353
6563
msgid ""
6354
6564
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6355
6565
msgstr ""
6356
6566
6357
#: breezy/errors.py:2302
6567
#: breezy/errors.py:2282
6358
6568
msgid ""
6359
6569
"Working tree \"%(display_url)s\" has shelved changes (See brz shelve --list)."
6360
6570
"%(more)s"
6361
6571
msgstr ""
6362
6572
6363
#: breezy/errors.py:2308
6364
msgid "Unable to create symlink %(path_str)son this platform"
6365
msgstr ""
6366
6367
#: breezy/errors.py:2323
6573
#: breezy/errors.py:2288
6368
6574
msgid ""
6369
6575
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6370
6576
msgstr ""
6371
6577
6372
#: breezy/errors.py:2335
6578
#: breezy/errors.py:2300
6373
6579
msgid "The alias \"%(alias_name)s\" does not exist."
6374
6580
msgstr ""
6375
6581
6376
#: breezy/errors.py:2343
6582
#: breezy/errors.py:2308
6377
6583
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6378
6584
msgstr ""
6379
6585
6380
#: breezy/errors.py:2356
6586
#: breezy/errors.py:2321
6381
6587
msgid "Tip change rejected: %(msg)s"
6382
6588
msgstr ""
6383
6589
6384
#: breezy/errors.py:2364
6590
#: breezy/errors.py:2329
6385
6591
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6386
6592
msgstr ""
6387
6593
6388
#: breezy/errors.py:2372
6594
#: breezy/errors.py:2337
6389
6595
msgid "The user aborted the operation."
6390
6596
msgstr ""
6391
6597
6392
#: breezy/errors.py:2424
6598
#: breezy/errors.py:2389
6393
6599
msgid "%(controldir)r does not support co-located branches."
6394
6600
msgstr ""
6395
6601
6396
#: breezy/errors.py:2432
6602
#: breezy/errors.py:2397
6397
6603
msgid ""
6398
6604
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `brz "
6399
6605
"unbind` to fix."
6400
6606
msgstr ""
6401
6607
6402
#: breezy/errors.py:2441
6608
#: breezy/errors.py:2406
6403
6609
msgid ""
6404
6610
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6405
6611
"format %(format)r"
6406
6612
msgstr ""
6407
6613
6408
#: breezy/errors.py:2453
6614
#: breezy/errors.py:2418
6409
6615
msgid ""
6410
6616
"Cannot store uncommitted changes because this branch already stores "
6411
6617
"uncommitted changes."
6412
6618
msgstr ""
6413
6619
6414
#: breezy/export_pot.py:255
6620
#: breezy/export_pot.py:256
6415
6621
#, python-format
6416
6622
msgid "Exporting messages from builtin command: %s"
6417
6623
msgstr ""
6418
6624
6419
#: breezy/export_pot.py:260
6625
#: breezy/export_pot.py:261
6420
6626
#, python-format
6421
6627
msgid "Plugin %s is not loaded"
6422
6628
msgstr ""
6423
6629
6424
#: breezy/export_pot.py:277
6630
#: breezy/export_pot.py:278
6425
6631
#, python-brace-format
6426
6632
msgid "Exporting messages from plugin command: {0} in {1}"
6427
6633
msgstr ""
6428
6634
6429
#: breezy/export_pot.py:298
6635
#: breezy/export_pot.py:299
6430
6636
#, python-format
6431
6637
msgid "Exporting message from error: %s"
6432
6638
msgstr ""
6433
6639
6434
#: breezy/git/commands.py:115
6640
#: breezy/git/commands.py:125
6435
6641
#, python-format
6436
6642
msgid "%r is not a git repository"
6437
6643
msgstr ""
6438
6644
6439
#: breezy/git/commands.py:128
6645
#: breezy/git/commands.py:138
6440
6646
msgid "Target repository doesn't support rich roots"
6441
6647
msgstr ""
6442
6648
6443
#: breezy/git/commands.py:141
6649
#: breezy/git/commands.py:150
6444
6650
msgid "creating branches"
6445
6651
msgstr ""
6446
6652
6447
#: breezy/git/commands.py:165
6653
#: breezy/git/commands.py:172
6448
6654
msgid ""
6449
6655
"Use 'bzr checkout' to create a working tree in the newly created branches."
6450
6656
msgstr ""
6451
6657
6452
#: breezy/git/commands.py:207
6658
#: breezy/git/commands.py:214
6453
6659
#, python-format
6454
6660
msgid "Object not found: %s"
6455
6661
msgstr ""
6456
6662
6457
#: breezy/git/commands.py:280
6458
msgid "error running patch"
6459
msgstr ""
6460
6461
#: breezy/gpg.py:365
6663
#: breezy/gpg.py:372
6462
6664
#, python-brace-format
6463
6665
msgid "No GnuPG key results for pattern: {0}"
6464
6666
msgstr ""
6465
6667
6466
#: breezy/gpg.py:371
6668
#: breezy/gpg.py:378
6467
6669
#, python-brace-format
6468
6670
msgid "{0} commits with valid signatures"
6469
6671
msgstr ""
6470
6672
6471
#: breezy/gpg.py:377
6673
#: breezy/gpg.py:384
6472
6674
#, python-brace-format
6473
6675
msgid "{0} commit with unknown key"
6474
6676
msgid_plural "{0} commits with unknown keys"
6475
6677
msgstr[0] ""
6476
6678
msgstr[1] ""
6477
6679
6478
#: breezy/gpg.py:385
6680
#: breezy/gpg.py:392
6479
6681
#, python-brace-format
6480
6682
msgid "{0} commit not valid"
6481
6683
msgid_plural "{0} commits not valid"
6482
6684
msgstr[0] ""
6483
6685
msgstr[1] ""
6484
6686
6485
#: breezy/gpg.py:393
6687
#: breezy/gpg.py:400
6486
6688
#, python-brace-format
6487
6689
msgid "{0} commit not signed"
6488
6690
msgid_plural "{0} commits not signed"
6489
6691
msgstr[0] ""
6490
6692
msgstr[1] ""
6491
6693
6492
#: breezy/gpg.py:401
6694
#: breezy/gpg.py:408
6493
6695
#, python-brace-format
6494
6696
msgid "{0} commit with key now expired"
6495
6697
msgid_plural "{0} commits with key now expired"
6496
6698
msgstr[0] ""
6497
6699
msgstr[1] ""
6498
6700
6499
#: breezy/gpg.py:421
6701
#: breezy/gpg.py:428
6500
6702
#, python-brace-format
6501
6703
msgid "{0} commit by author {1} with key {2} now expired"
6502
6704
msgid_plural "{0} commits by author {1} with key {2} now expired"
6503
6705
msgstr[0] ""
6504
6706
msgstr[1] ""
6505
6707
6506
#: breezy/gpg.py:437
6708
#: breezy/gpg.py:444
6507
6709
#, python-brace-format
6508
6710
msgid "{0} signed {1} commit"
6509
6711
msgid_plural "{0} signed {1} commits"
6510
6712
msgstr[0] ""
6511
6713
msgstr[1] ""
6512
6714
6513
#: breezy/gpg.py:454 breezy/gpg.py:471
6715
#: breezy/gpg.py:461 breezy/gpg.py:478
6514
6716
#, python-brace-format
6515
6717
msgid "{0} commit by author {1}"
6516
6718
msgid_plural "{0} commits by author {1}"
6517
6719
msgstr[0] ""
6518
6720
msgstr[1] ""
6519
6721
6520
#: breezy/gpg.py:486
6722
#: breezy/gpg.py:493
6521
6723
#, python-brace-format
6522
6724
msgid "Unknown key {0} signed {1} commit"
6523
6725
msgid_plural "Unknown key {0} signed {1} commits"
6534
6736
msgid "Deprecated in: %s"
6535
6737
msgstr ""
6536
6738
6537
#: breezy/lock.py:546
6739
#: breezy/lock.py:470
6538
6740
msgid "{0!r} was {1} locked again"
6539
6741
msgstr ""
6540
6742
6571
6773
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6572
6774
msgstr ""
6573
6775
6574
#: breezy/log.py:424
6776
#: breezy/log.py:411
6575
6777
msgid "Further revision history missing."
6576
6778
msgstr ""
6577
6779
6578
#: breezy/log.py:580
6780
#: breezy/log.py:567
6579
6781
msgid "--exclude-common-ancestry requires two different revisions"
6580
6782
msgstr ""
6581
6783
6582
#: breezy/log.py:582
6784
#: breezy/log.py:569
6583
6785
#, python-format
6584
6786
msgid "invalid direction %r"
6585
6787
msgstr ""
6586
6788
6587
#: breezy/log.py:670
6789
#: breezy/log.py:657
6588
6790
msgid "Start revision not found in history of end revision."
6589
6791
msgstr ""
6590
6792
6591
#: breezy/log.py:1118 breezy/log.py:1176
6793
#: breezy/log.py:1106 breezy/log.py:1164
6592
6794
msgid "Logging revision 0 is invalid."
6593
6795
msgstr ""
6594
6796
6595
#: breezy/log.py:1121 breezy/log.py:1178
6797
#: breezy/log.py:1109 breezy/log.py:1166
6596
6798
msgid "Start revision must be older than the end revision."
6597
6799
msgstr ""
6598
6800
6599
#: breezy/log.py:1875
6801
#: breezy/log.py:1865
6600
6802
#, python-format
6601
6803
msgid "unknown log formatter: %r"
6602
6804
msgstr ""
6603
6805
6604
#: breezy/log.py:2173
6806
#: breezy/log.py:2162
6605
6807
msgid "fixes bug"
6606
6808
msgid_plural "fixes bugs"
6607
6809
msgstr[0] ""
6608
6810
msgstr[1] ""
6609
6811
6610
#: breezy/log.py:2176
6812
#: breezy/log.py:2165
6611
6813
msgid "related bug"
6612
6814
msgid_plural "related bugs"
6613
6815
msgstr[0] ""
6614
6816
msgstr[1] ""
6615
6817
6616
#: breezy/merge.py:673
6818
#: breezy/merge.py:666
6617
6819
msgid "All changes applied successfully."
6618
6820
msgstr ""
6619
6821
6620
#: breezy/merge.py:675
6822
#: breezy/merge.py:668
6621
6823
#, python-format
6622
6824
msgid "%d conflicts encountered."
6623
6825
msgstr ""
6624
6826
6625
#: breezy/merge.py:808 breezy/merge.py:1858
6827
#: breezy/merge.py:799 breezy/merge.py:1834
6626
6828
msgid "Preparing file merge"
6627
6829
msgstr ""
6628
6830
6629
#: breezy/multiparent.py:437
6831
#: breezy/mergeable.py:81
6832
msgid "A directory cannot be a bundle"
6833
msgstr ""
6834
6835
#: breezy/multiparent.py:439
6630
6836
msgid "Importing revisions"
6631
6837
msgstr ""
6632
6838
6633
6839
# help of 'help' option
6634
#: breezy/option.py:547
6840
#: breezy/option.py:551
6635
6841
msgid "Show help message."
6636
6842
msgstr ""
6637
6843
6638
6844
# help of 'quiet' option
6639
#: breezy/option.py:549
6845
#: breezy/option.py:553
6640
6846
msgid "Only display errors and warnings."
6641
6847
msgstr ""
6642
6848
6643
6849
# help of 'usage' option
6644
#: breezy/option.py:552
6850
#: breezy/option.py:556
6645
6851
msgid "Show usage message and options."
6646
6852
msgstr ""
6647
6853
6648
6854
# help of 'verbose' option
6649
#: breezy/option.py:554
6855
#: breezy/option.py:558
6650
6856
msgid "Display more information."
6651
6857
msgstr ""
6652
6858
6653
6859
# help of 'change' option
6654
#: breezy/option.py:562
6860
#: breezy/option.py:566
6655
6861
msgid ""
6656
6862
"Select changes introduced by the specified revision. See also \"help "
6657
6863
"revisionspec\"."
6658
6864
msgstr ""
6659
6865
6660
6866
# help of 'directory' option
6661
#: breezy/option.py:564
6867
#: breezy/option.py:568
6662
6868
msgid "Branch to operate on, instead of working directory."
6663
6869
msgstr ""
6664
6870
6665
6871
# help of 'log-format=long' option
6666
#: breezy/option.py:566
6872
#: breezy/option.py:570
6667
6873
msgid "Detailed log format."
6668
6874
msgstr ""
6669
6875
6670
6876
# help of 'log-format=gnu-changelog' option
6671
#: breezy/option.py:566
6877
#: breezy/option.py:570
6672
6878
msgid "Format used by GNU ChangeLog files."
6673
6879
msgstr ""
6674
6880
6675
6881
# help of 'log-format=line' option
6676
#: breezy/option.py:566
6882
#: breezy/option.py:570
6677
6883
msgid "Log format with one line per revision."
6678
6884
msgstr ""
6679
6885
6680
6886
# help of 'log-format=short' option
6681
#: breezy/option.py:566
6887
#: breezy/option.py:570
6682
6888
msgid "Moderately short log format."
6683
6889
msgstr ""
6684
6890
6685
6891
# help of 'log-format' option
6686
#: breezy/option.py:566
6892
#: breezy/option.py:570
6687
6893
msgid "Use specified log format."
6688
6894
msgstr ""
6689
6895
6690
6896
# title of 'log-format' option
6691
#: breezy/option.py:568
6897
#: breezy/option.py:572
6692
6898
msgid "Log format"
6693
6899
msgstr ""
6694
6900
6695
6901
# help of 'merge-type=lca' option
6696
#: breezy/option.py:570
6902
#: breezy/option.py:574
6697
6903
msgid "LCA-newness merge."
6698
6904
msgstr ""
6699
6905
6700
6906
# help of 'merge-type=diff3' option
6701
#: breezy/option.py:570
6907
#: breezy/option.py:574
6702
6908
msgid "Merge using external diff3."
6703
6909
msgstr ""
6704
6910
6705
6911
# help of 'merge-type=merge3' option
6706
#: breezy/option.py:570
6912
#: breezy/option.py:574
6707
6913
msgid "Native diff3-style merge."
6708
6914
msgstr ""
6709
6915
6710
6916
# help of 'merge-type' option
6711
#: breezy/option.py:570
6917
#: breezy/option.py:574
6712
6918
msgid "Select a particular merge algorithm."
6713
6919
msgstr ""
6714
6920
6715
6921
# help of 'merge-type=weave' option
6716
#: breezy/option.py:570
6922
#: breezy/option.py:574
6717
6923
msgid "Weave-based merge."
6718
6924
msgstr ""
6719
6925
6720
6926
# title of 'merge-type' option
6721
#: breezy/option.py:572
6927
#: breezy/option.py:576
6722
6928
msgid "Merge algorithm"
6723
6929
msgstr ""
6724
6930
6725
6931
# help of 'message' option
6726
#: breezy/option.py:575
6932
#: breezy/option.py:579
6727
6933
msgid "Message string."
6728
6934
msgstr ""
6729
6935
6730
6936
# help of 'null' option
6731
#: breezy/option.py:577
6937
#: breezy/option.py:581
6732
6938
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6733
6939
msgstr ""
6734
6940
6735
6941
# help of 'overwrite' option
6736
#: breezy/option.py:579
6942
#: breezy/option.py:583
6737
6943
msgid "Ignore differences between branches and overwrite unconditionally."
6738
6944
msgstr ""
6739
6945
6740
6946
# help of 'remember' option
6741
#: breezy/option.py:581
6947
#: breezy/option.py:585
6742
6948
msgid "Remember the specified location as a default."
6743
6949
msgstr ""
6744
6950
6745
6951
# help of 'reprocess' option
6746
#: breezy/option.py:583
6952
#: breezy/option.py:587
6747
6953
msgid "Reprocess to reduce spurious conflicts."
6748
6954
msgstr ""
6749
6955
6750
6956
# help of 'revision' option
6751
#: breezy/option.py:587
6957
#: breezy/option.py:591
6752
6958
msgid "See \"help revisionspec\" for details."
6753
6959
msgstr ""
6754
6960
6755
6961
# help of 'show-ids' option
6756
#: breezy/option.py:589
6962
#: breezy/option.py:593
6757
6963
msgid "Show internal object ids."
6758
6964
msgstr ""
6759
6965
6760
6966
# help of 'timezone' option
6761
#: breezy/option.py:592
6967
#: breezy/option.py:596
6762
6968
msgid "Display timezone as local, original, or utc."
6763
6969
msgstr ""
6764
6970
6765
#: breezy/osutils.py:109
6971
#: breezy/osutils.py:100
6766
6972
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6767
6973
msgstr ""
6768
6974
6769
#: breezy/osutils.py:234
6975
#: breezy/osutils.py:225
6770
6976
msgid "lstat/stat of ({0!r}): {1!r}"
6771
6977
msgstr ""
6772
6978
6773
#: breezy/osutils.py:1054 breezy/osutils.py:1065
6979
#: breezy/osutils.py:1051 breezy/osutils.py:1062
6774
6980
#, python-format
6775
6981
msgid "sorry, %r not allowed in path"
6776
6982
msgstr ""
6777
6983
6778
#: breezy/osutils.py:1284
6984
#: breezy/osutils.py:1281
6779
6985
#, python-format
6780
6986
msgid "%r is too short to calculate a relative path"
6781
6987
msgstr ""
6782
6988
6783
6989
# help of 'plugin' option of 'bash-completion' command
6990
# help of 'plugin' option of 'zsh-completion' command
6784
6991
#: breezy/plugins/bash_completion/bashcomp.py:419
6992
#: breezy/plugins/zsh_completion/zshcomp.py:257
6785
6993
msgid "Enable completions for the selected plugin (default: all plugins)"
6786
6994
msgstr ""
6787
6995
6803
7011
msgstr ""
6804
7012
6805
7013
# help of 'function-name' option of 'bash-completion' command
7014
# help of 'function-name' option of 'zsh-completion' command
6806
7015
#: breezy/plugins/bash_completion/bashcomp.py:432
7016
#: breezy/plugins/zsh_completion/zshcomp.py:270
6807
7017
msgid "Name of the generated function (default: _brz)"
6808
7018
msgstr ""
6809
7019
7356
7566
msgid "Don't export tags"
7357
7567
msgstr ""
7358
7568
7359
#: breezy/plugins/grep/cmds.py:83
7360
msgid "Print lines matching PATTERN for specified files and revisions."
7361
msgstr ""
7362
7363
#: breezy/plugins/grep/cmds.py:85
7364
msgid ""
7365
"This command searches the specified files and revisions for a given\n"
7366
"pattern. The pattern is specified as a Python regular expressions[1]."
7367
msgstr ""
7368
7369
#: breezy/plugins/grep/cmds.py:88
7370
msgid ""
7371
"If the file name is not specified, the revisions starting with the\n"
7372
"current directory are searched recursively. If the revision number is\n"
7373
"not specified, the working copy is searched. To search the last committed\n"
7374
"revision, use the '-r -1' or '-r last:1' option."
7375
msgstr ""
7376
7377
#: breezy/plugins/grep/cmds.py:93
7378
msgid ""
7379
"Unversioned files are not searched unless explicitly specified on the\n"
7380
"command line. Unversioned directores are not searched."
7381
msgstr ""
7382
7383
#: breezy/plugins/grep/cmds.py:96
7384
msgid ""
7385
"When searching a pattern, the output is shown in the 'filepath:string'\n"
7386
"format. If a revision is explicitly searched, the output is shown as\n"
7387
"'filepath~N:string', where N is the revision number."
7388
msgstr ""
7389
7390
#: breezy/plugins/grep/cmds.py:100
7391
msgid ""
7392
"--include and --exclude options can be used to search only (or exclude\n"
7393
"from search) files with base name matches the specified Unix style GLOB\n"
7394
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
7395
"to quote wildcard or backslash character literally. Note that the glob\n"
7396
"pattern is not a regular expression."
7397
msgstr ""
7398
7399
#: breezy/plugins/grep/cmds.py:106
7400
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
7401
msgstr ""
7402
7403
# help of 'color' option of 'grep' command
7404
#: breezy/plugins/grep/cmds.py:115
7405
msgid "Show match in color. WHEN is never, always or auto."
7406
msgstr ""
7407
7408
# help of 'diff' option of 'grep' command
7409
#: breezy/plugins/grep/cmds.py:117
7410
msgid "Grep for pattern in changeset for each revision."
7411
msgstr ""
7412
7413
# help of 'exclude' option of 'grep' command
7414
#: breezy/plugins/grep/cmds.py:119
7415
msgid "Skip files whose base name matches GLOB."
7416
msgstr ""
7417
7418
# help of 'include' option of 'grep' command
7419
#: breezy/plugins/grep/cmds.py:121
7420
msgid "Search only files whose base name matches GLOB."
7421
msgstr ""
7422
7423
# help of 'files-with-matches' option of 'grep' command
7424
#: breezy/plugins/grep/cmds.py:123
7425
msgid "Print only the name of each input file in which PATTERN is found."
7426
msgstr ""
7427
7428
# help of 'files-without-match' option of 'grep' command
7429
#: breezy/plugins/grep/cmds.py:126
7430
msgid "Print only the name of each input file in which PATTERN is not found."
7431
msgstr ""
7432
7433
# help of 'fixed-string' option of 'grep' command
7434
#: breezy/plugins/grep/cmds.py:129
7435
msgid "Interpret PATTERN is a single fixed string (not regex)."
7436
msgstr ""
7437
7438
# help of 'from-root' option of 'grep' command
7439
#: breezy/plugins/grep/cmds.py:131
7440
msgid ""
7441
"Search for pattern starting from the root of the branch. (implies --"
7442
"recursive)"
7443
msgstr ""
7444
7445
# help of 'ignore-case' option of 'grep' command
7446
#: breezy/plugins/grep/cmds.py:134
7447
msgid "ignore case distinctions while matching."
7448
msgstr ""
7449
7450
# help of 'levels' option of 'grep' command
7451
#: breezy/plugins/grep/cmds.py:136
7452
msgid ""
7453
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
7454
msgstr ""
7455
7456
# help of 'line-number' option of 'grep' command
7457
#: breezy/plugins/grep/cmds.py:141
7458
msgid "show 1-based line number."
7459
msgstr ""
7460
7461
# help of 'no-recursive' option of 'grep' command
7462
#: breezy/plugins/grep/cmds.py:143
7463
msgid "Don't recurse into subdirectories. (default is --recursive)"
7464
msgstr ""
7465
7466
# help of 'null' option of 'grep' command
7467
#: breezy/plugins/grep/cmds.py:145
7468
msgid ""
7469
"Write an ASCII NUL (\\0) separator between output lines rather than a "
7470
"newline."
7471
msgstr ""
7472
7473
7569
#: breezy/plugins/launchpad/account.py:66
7474
7570
msgid "Setting ssh/sftp usernames for launchpad.net."
7475
7571
msgstr ""
7590
7686
msgid "%d proposals(s) found."
7591
7687
msgstr ""
7592
7688
7593
#: breezy/plugins/launchpad/cmds.py:274
7689
#: breezy/plugins/launchpad/cmds.py:275
7594
7690
msgid "Finding proposals"
7595
7691
msgstr ""
7596
7692
7693
#: breezy/plugins/launchpad/lp_api.py:225
7694
#: breezy/plugins/launchpad/lp_api.py:230
7695
#, python-format
7696
msgid "%s is not registered on Launchpad"
7697
msgstr ""
7698
7597
7699
#: breezy/plugins/launchpad/lp_api.py:240
7700
#, python-format
7701
msgid "%s has no development focus."
7702
msgstr ""
7703
7598
7704
#: breezy/plugins/launchpad/lp_api.py:245
7599
7705
#, python-format
7600
msgid "%s is not registered on Launchpad"
7601
msgstr ""
7602
7603
#: breezy/plugins/launchpad/lp_api.py:255
7604
#, python-format
7605
msgid "%s has no development focus."
7606
msgstr ""
7607
7608
#: breezy/plugins/launchpad/lp_api.py:260
7609
#, python-format
7610
7706
msgid "development focus %s has no branch."
7611
7707
msgstr ""
7612
7708
7613
#: breezy/plugins/launchpad/lp_api.py:265
7709
#: breezy/plugins/launchpad/lp_api.py:250
7614
7710
#, python-format
7615
7711
msgid "source package %s has no branch."
7616
7712
msgstr ""
7617
7713
7618
#: breezy/plugins/launchpad/lp_api.py:269
7714
#: breezy/plugins/launchpad/lp_api.py:254
7619
7715
#, python-format
7620
7716
msgid "%s has no associated product or source package."
7621
7717
msgstr ""
7622
7718
7623
#: breezy/plugins/launchpad/lp_api.py:280
7719
#: breezy/plugins/launchpad/lp_api.py:265
7624
7720
#, python-format
7625
7721
msgid "%s is already up-to-date."
7626
7722
msgstr ""
7627
7723
7628
#: breezy/plugins/launchpad/lp_api.py:287
7724
#: breezy/plugins/launchpad/lp_api.py:272
7629
7725
#, python-format
7630
7726
msgid "Pushing to %s"
7631
7727
msgstr ""
7632
7728
7633
#: breezy/plugins/launchpad/lp_directory.py:165
7729
#: breezy/plugins/launchpad/lp_directory.py:175
7634
7730
#, python-brace-format
7635
7731
msgid ""
7636
7732
"resolution for {0}\n"
7638
7734
" remote: {2}"
7639
7735
msgstr ""
7640
7736
7641
#: breezy/plugins/launchpad/lp_propose.py:152
7642
#: breezy/plugins/propose/cmds.py:197
7737
#: breezy/plugins/launchpad/lp_propose.py:150
7738
#: breezy/plugins/propose/cmds.py:207
7643
7739
#, python-format
7644
7740
msgid "There is already a branch merge proposal: %s"
7645
7741
msgstr ""
7685
7781
msgid "Using parent branch %s"
7686
7782
msgstr ""
7687
7783
7688
#: breezy/plugins/propose/cmds.py:94
7784
#: breezy/plugins/propose/cmds.py:95
7689
7785
#, python-format
7690
7786
msgid "Pushed to %s"
7691
7787
msgstr ""
7692
7788
7693
#: breezy/plugins/propose/cmds.py:128
7789
#: breezy/plugins/propose/cmds.py:129
7694
7790
msgid "Propose a branch for merging."
7695
7791
msgstr ""
7696
7792
7697
#: breezy/plugins/propose/cmds.py:130
7793
#: breezy/plugins/propose/cmds.py:131
7698
7794
msgid ""
7699
7795
"This command creates a merge proposal for the local\n"
7700
7796
"branch to the target branch. The format of the merge\n"
7702
7798
msgstr ""
7703
7799
7704
7800
# title of 'hoster' option of 'propose-merge' command
7705
#: breezy/plugins/propose/cmds.py:138
7801
#: breezy/plugins/propose/cmds.py:139
7706
7802
msgid "hoster"
7707
7803
msgstr ""
7708
7804
7709
7805
# help of 'hoster' option of 'propose-merge' command
7710
#: breezy/plugins/propose/cmds.py:139
7806
#: breezy/plugins/propose/cmds.py:140
7711
7807
msgid "Use the hoster."
7712
7808
msgstr ""
7713
7809
7714
7810
# help of 'reviewers' option of 'propose-merge' command
7715
#: breezy/plugins/propose/cmds.py:142
7811
#: breezy/plugins/propose/cmds.py:143
7716
7812
msgid "Requested reviewers."
7717
7813
msgstr ""
7718
7814
7719
7815
# help of 'name' option of 'propose-merge' command
7720
7816
# help of 'name' option of 'publish-derived' command
7721
#: breezy/plugins/propose/cmds.py:143
7817
#: breezy/plugins/propose/cmds.py:144
7722
7818
msgid "Name of the new remote branch."
7723
7819
msgstr ""
7724
7820
7725
7821
# help of 'description' option of 'propose-merge' command
7726
#: breezy/plugins/propose/cmds.py:144
7822
#: breezy/plugins/propose/cmds.py:145
7727
7823
msgid "Description of the change."
7728
7824
msgstr ""
7729
7825
7730
7826
# help of 'prerequisite' option of 'propose-merge' command
7731
#: breezy/plugins/propose/cmds.py:145
7827
#: breezy/plugins/propose/cmds.py:146
7732
7828
msgid "Prerequisite branch."
7733
7829
msgstr ""
7734
7830
7831
# help of 'wip' option of 'propose-merge' command
7832
#: breezy/plugins/propose/cmds.py:147
7833
msgid "Mark merge request as work-in-progress"
7834
msgstr ""
7835
7836
# help of 'commit-message' option of 'propose-merge' command
7837
#: breezy/plugins/propose/cmds.py:150
7838
msgid "Set commit message for merge, if supported"
7839
msgstr ""
7840
7735
7841
# help of 'labels' option of 'propose-merge' command
7736
#: breezy/plugins/propose/cmds.py:147
7842
#: breezy/plugins/propose/cmds.py:152
7737
7843
msgid "Labels to apply."
7738
7844
msgstr ""
7739
7845
7740
7846
# help of 'no-allow-lossy' option of 'propose-merge' command
7741
7847
# help of 'no-allow-lossy' option of 'publish-derived' command
7742
#: breezy/plugins/propose/cmds.py:149
7848
#: breezy/plugins/propose/cmds.py:154
7743
7849
msgid "Allow fallback to lossy push, if necessary."
7744
7850
msgstr ""
7745
7851
7746
#: breezy/plugins/propose/cmds.py:166 breezy/plugins/propose/cmds.py:222
7852
# help of 'allow-collaboration' option of 'propose-merge' command
7853
#: breezy/plugins/propose/cmds.py:156
7854
msgid "Allow collaboration from target branch maintainer(s)"
7855
msgstr ""
7856
7857
#: breezy/plugins/propose/cmds.py:174 breezy/plugins/propose/cmds.py:233
7747
7858
msgid "No target location specified or remembered"
7748
7859
msgstr ""
7749
7860
7750
#: breezy/plugins/propose/cmds.py:178
7861
#: breezy/plugins/propose/cmds.py:187
7751
7862
#, python-format
7752
7863
msgid "Published branch to %s"
7753
7864
msgstr ""
7754
7865
7755
#: breezy/plugins/propose/cmds.py:198
7866
#: breezy/plugins/propose/cmds.py:209
7756
7867
#, python-format
7757
7868
msgid "Merge proposal created: %s"
7758
7869
msgstr ""
7759
7870
7760
#: breezy/plugins/propose/cmds.py:202
7871
#: breezy/plugins/propose/cmds.py:213
7761
7872
msgid "Find a merge proposal."
7762
7873
msgstr ""
7763
7874
7764
#: breezy/plugins/propose/cmds.py:204
7765
msgid " "
7766
msgstr ""
7767
7768
#: breezy/plugins/propose/cmds.py:227
7875
#: breezy/plugins/propose/cmds.py:238
7769
7876
#, python-format
7770
7877
msgid "Merge proposal: %s\n"
7771
7878
msgstr ""
7772
7879
7773
#: breezy/plugins/propose/cmds.py:231
7880
#: breezy/plugins/propose/cmds.py:242
7774
7881
msgid "Log into GitHub."
7775
7882
msgstr ""
7776
7883
7777
#: breezy/plugins/propose/cmds.py:233
7884
#: breezy/plugins/propose/cmds.py:244
7778
7885
msgid ""
7779
7886
"When communicating with GitHub, some commands need to authenticate to\n"
7780
7887
"GitHub."
7781
7888
msgstr ""
7782
7889
7783
#: breezy/plugins/propose/cmds.py:268
7890
#: breezy/plugins/propose/cmds.py:279
7784
7891
msgid "Log into a GitLab instance."
7785
7892
msgstr ""
7786
7893
7787
#: breezy/plugins/propose/cmds.py:270
7894
#: breezy/plugins/propose/cmds.py:281
7788
7895
msgid ""
7789
7896
"This command takes a GitLab instance URL (e.g. https://gitlab.com)\n"
7790
"as well as a private token. Private tokens can be created via the\n"
7897
"as well as an optional private token. Private tokens can be created via the\n"
7791
7898
"web UI."
7792
7899
msgstr ""
7793
7900
7794
#: breezy/plugins/propose/cmds.py:276
7795
msgid " Log into Debian's salsa:"
7796
msgstr ""
7797
7798
#: breezy/plugins/propose/cmds.py:278
7901
#: breezy/plugins/propose/cmds.py:287
7902
msgid " Log into GNOME's GitLab (prompts for a token):"
7903
msgstr ""
7904
7905
#: breezy/plugins/propose/cmds.py:289
7906
msgid " brz gitlab-login https://gitlab.gnome.org/"
7907
msgstr ""
7908
7909
#: breezy/plugins/propose/cmds.py:291
7910
msgid " Log into Debian's salsa, using a token created earlier:"
7911
msgstr ""
7912
7913
#: breezy/plugins/propose/cmds.py:293
7799
7914
msgid " brz gitlab-login https://salsa.debian.org if4Theis6Eich7aef0zo"
7800
7915
msgstr ""
7801
7916
7802
7917
# help of 'name' option of 'gitlab-login' command
7803
#: breezy/plugins/propose/cmds.py:284
7918
#: breezy/plugins/propose/cmds.py:299
7804
7919
msgid "Name for GitLab site in configuration."
7805
7920
msgstr ""
7806
7921
7807
7922
# help of 'no-check' option of 'gitlab-login' command
7808
#: breezy/plugins/propose/cmds.py:287
7923
#: breezy/plugins/propose/cmds.py:302
7809
7924
msgid "Don't check that the token is valid."
7810
7925
msgstr ""
7811
7926
7812
#: breezy/plugins/propose/github.py:177
7927
#: breezy/plugins/propose/cmds.py:364
7928
msgid "Land a merge proposal."
7929
msgstr ""
7930
7931
# help of 'message' option of 'land-merge-proposal' command
7932
#: breezy/plugins/propose/cmds.py:368
7933
msgid "Commit message to use."
7934
msgstr ""
7935
7936
#: breezy/plugins/propose/github.py:397
7813
7937
#, python-format
7814
7938
msgid "Forking new repository %s from %s"
7815
7939
msgstr ""
7816
7940
7817
#: breezy/plugins/propose/github.py:180
7941
#: breezy/plugins/propose/github.py:400
7818
7942
#, python-format
7819
7943
msgid "Reusing existing repository %s"
7820
7944
msgstr ""
7821
7945
7822
#: breezy/plugins/stats/cmds.py:238
7946
#: breezy/plugins/quilt/merge.py:113
7947
#, python-format
7948
msgid "Applying %d quilt patches."
7949
msgstr ""
7950
7951
#: breezy/plugins/quilt/merge.py:125
7952
#, python-format
7953
msgid "Unapplying %d quilt patches."
7954
msgstr ""
7955
7956
#: breezy/plugins/quilt/merge.py:141
7957
#, python-format
7958
msgid "Committing with %d patches applied and %d patches unapplied."
7959
msgstr ""
7960
7961
#: breezy/plugins/rewrite/commands.py:51
7962
msgid ""
7963
"A conflict occurred replaying a commit. Resolve the conflict and run 'brz "
7964
"rebase-continue' or run 'brz rebase-abort'."
7965
msgstr ""
7966
7967
#: breezy/plugins/rewrite/commands.py:59
7968
msgid "Re-base a branch."
7969
msgstr ""
7970
7971
#: breezy/plugins/rewrite/commands.py:61
7972
msgid ""
7973
"Rebasing is the process of taking a branch and modifying the history so\n"
7974
"that it appears to start from a different point. This can be useful\n"
7975
"to clean up the history before submitting your changes. The tree at the\n"
7976
"end of the process will be the same as if you had merged the other branch,\n"
7977
"but the history will be different."
7978
msgstr ""
7979
7980
#: breezy/plugins/rewrite/commands.py:67
7981
msgid ""
7982
"The command takes the location of another branch on to which the branch in\n"
7983
"the specified directory (by default, the current working directory)\n"
7984
"will be rebased. If a branch is not specified then the parent branch\n"
7985
"is used, and this is usually the desired result."
7986
msgstr ""
7987
7988
#: breezy/plugins/rewrite/commands.py:72
7989
msgid ""
7990
"The first step identifies the revisions that are in the current branch that\n"
7991
"are not in the parent branch. The current branch is then set to be at the\n"
7992
"same revision as the target branch, and each revision is replayed on top\n"
7993
"of the branch. At the end of the process it will appear as though your\n"
7994
"current branch was branched off the current last revision of the target."
7995
msgstr ""
7996
7997
#: breezy/plugins/rewrite/commands.py:78
7998
msgid ""
7999
"Each revision that is replayed may cause conflicts in the tree. If this\n"
8000
"happens the command will stop and allow you to fix them up. Resolve the\n"
8001
"commits as you would for a merge, and then run 'brz resolve' to marked\n"
8002
"them as resolved. Once you have resolved all the conflicts you should\n"
8003
"run 'brz rebase-continue' to continue the rebase operation."
8004
msgstr ""
8005
8006
#: breezy/plugins/rewrite/commands.py:84
8007
msgid ""
8008
"If conflicts are encountered and you decide that you do not wish to "
8009
"continue\n"
8010
"you can run 'brz rebase-abort'."
8011
msgstr ""
8012
8013
#: breezy/plugins/rewrite/commands.py:87
8014
msgid ""
8015
"The '--onto' option allows you to specify a different revision in the\n"
8016
"target branch to start at when replaying the revisions. This means that\n"
8017
"you can change the point at which the current branch will appear to be\n"
8018
"branched from when the operation completes."
8019
msgstr ""
8020
8021
# help of 'always-rebase-merges' option of 'rebase' command
8022
#: breezy/plugins/rewrite/commands.py:100
8023
msgid "Don't skip revisions that merge already present revisions."
8024
msgstr ""
8025
8026
# help of 'pending-merges' option of 'rebase' command
8027
#: breezy/plugins/rewrite/commands.py:103
8028
msgid "Rebase pending merges onto local branch."
8029
msgstr ""
8030
8031
# help of 'onto' option of 'rebase' command
8032
#: breezy/plugins/rewrite/commands.py:105
8033
msgid "Different revision to replay onto."
8034
msgstr ""
8035
8036
#: breezy/plugins/rewrite/commands.py:132
8037
msgid "--revision and --pending-merges are mutually exclusive"
8038
msgstr ""
8039
8040
#: breezy/plugins/rewrite/commands.py:144
8041
msgid "No upstream branch specified."
8042
msgstr ""
8043
8044
#: breezy/plugins/rewrite/commands.py:145
8045
#, python-format
8046
msgid "Rebasing on %s"
8047
msgstr ""
8048
8049
#: breezy/plugins/rewrite/commands.py:152
8050
msgid ""
8051
"A rebase operation was interrupted. Continue using 'brz rebase-continue' or "
8052
"abort using 'brz rebase-abort'"
8053
msgstr ""
8054
8055
#: breezy/plugins/rewrite/commands.py:169
8056
#: breezy/plugins/rewrite/commands.py:386
8057
msgid "--revision takes only one or two arguments"
8058
msgstr ""
8059
8060
#: breezy/plugins/rewrite/commands.py:174
8061
msgid "No pending merges present."
8062
msgstr ""
8063
8064
#: breezy/plugins/rewrite/commands.py:177
8065
msgid "Rebasing more than one pending merge not supported"
8066
msgstr ""
8067
8068
#: breezy/plugins/rewrite/commands.py:203
8069
msgid "No revisions to rebase.\n"
8070
msgstr ""
8071
8072
#: breezy/plugins/rewrite/commands.py:207
8073
msgid "Base branch is descendant of current branch. Pulling instead.\n"
8074
msgstr ""
8075
8076
#: breezy/plugins/rewrite/commands.py:224
8077
#, python-format
8078
msgid "%d revisions will be rebased:"
8079
msgstr ""
8080
8081
#: breezy/plugins/rewrite/commands.py:240
8082
msgid "Abort an interrupted rebase."
8083
msgstr ""
8084
8085
#: breezy/plugins/rewrite/commands.py:272
8086
msgid "Continue an interrupted rebase after resolving conflicts."
8087
msgstr ""
8088
8089
#: breezy/plugins/rewrite/commands.py:295
8090
msgid ""
8091
"There are still conflicts present. Resolve the conflicts and then run 'brz "
8092
"resolve' and try again."
8093
msgstr ""
8094
8095
#: breezy/plugins/rewrite/commands.py:302
8096
msgid "No rebase to continue"
8097
msgstr ""
8098
8099
#: breezy/plugins/rewrite/commands.py:313
8100
msgid ""
8101
"Print list of revisions that still need to be replayed as part of the\n"
8102
"current rebase operation."
8103
msgstr ""
8104
8105
#: breezy/plugins/rewrite/commands.py:337
8106
msgid "No rebase in progress"
8107
msgstr ""
8108
8109
#: breezy/plugins/rewrite/commands.py:340
8110
#, python-format
8111
msgid "Currently replaying: %s"
8112
msgstr ""
8113
8114
#: breezy/plugins/rewrite/commands.py:342
8115
#, python-brace-format
8116
msgid "{0} -> {1}"
8117
msgstr ""
8118
8119
#: breezy/plugins/rewrite/commands.py:388
8120
msgid "--revision is mandatory"
8121
msgstr ""
8122
8123
#: breezy/plugins/rewrite/commands.py:398
8124
msgid "replaying commits"
8125
msgstr ""
8126
8127
#: breezy/plugins/rewrite/commands.py:429
8128
msgid ""
8129
"Rebase revisions based on a branch created with a different import tool."
8130
msgstr ""
8131
8132
#: breezy/plugins/rewrite/commands.py:431
8133
msgid ""
8134
"This will change the identity of revisions whose parents\n"
8135
"were mapped from revisions in the other version control system."
8136
msgstr ""
8137
8138
#: breezy/plugins/rewrite/commands.py:434
8139
msgid ""
8140
"You are recommended to run \"brz check\" in the local repository\n"
8141
"after running this command."
8142
msgstr ""
8143
8144
# help of 'idmap-file' option of 'rebase-foreign' command
8145
#: breezy/plugins/rewrite/commands.py:440
8146
msgid "Write map with old and new revision ids."
8147
msgstr ""
8148
8149
# help of 'directory' option of 'rebase' command
8150
# help of 'directory' option of 'rebase-abort' command
8151
# help of 'directory' option of 'rebase-continue' command
8152
# help of 'directory' option of 'rebase-foreign' command
8153
# help of 'directory' option of 'rebase-todo' command
8154
#: breezy/plugins/rewrite/commands.py:445
8155
msgid ""
8156
"Branch to replay onto, rather than the one containing the working directory."
8157
msgstr ""
8158
8159
#: breezy/plugins/rewrite/commands.py:483
8160
#, python-format
8161
msgid "Using saved location: %s\n"
8162
msgstr ""
8163
8164
#: breezy/plugins/stats/cmds.py:241
7823
8165
msgid "Generate statistics for LOCATION."
7824
8166
msgstr ""
7825
8167
7826
8168
# help of 'show-class' option of 'committer-statistics' command
7827
#: breezy/plugins/stats/cmds.py:243
8169
#: breezy/plugins/stats/cmds.py:246
7828
8170
msgid "Show the class of contributions."
7829
8171
msgstr ""
7830
8172
7831
#: breezy/plugins/stats/cmds.py:383
8173
#: breezy/plugins/stats/cmds.py:386
7832
8174
msgid "Determine credits for LOCATION."
7833
8175
msgstr ""
7834
8176
8177
#: breezy/plugins/upload/cmds.py:466
8178
msgid "Upload a working tree, as a whole or incrementally."
8179
msgstr ""
8180
7835
8181
#: breezy/plugins/upload/cmds.py:468
7836
msgid "Upload a working tree, as a whole or incrementally."
7837
msgstr ""
7838
7839
#: breezy/plugins/upload/cmds.py:470
7840
8182
msgid ""
7841
8183
"If no destination is specified use the last one used.\n"
7842
8184
"If no revision is specified upload the changes since the last upload."
7843
8185
msgstr ""
7844
8186
7845
#: breezy/plugins/upload/cmds.py:473
8187
#: breezy/plugins/upload/cmds.py:471
7846
8188
msgid "Changes include files added, renamed, modified or removed."
7847
8189
msgstr ""
7848
8190
7849
8191
# help of 'full' option of 'upload' command
7850
#: breezy/plugins/upload/cmds.py:481
8192
#: breezy/plugins/upload/cmds.py:479
7851
8193
msgid "Upload the full working tree."
7852
8194
msgstr ""
7853
8195
7854
8196
# help of 'quiet' option of 'upload' command
7855
#: breezy/plugins/upload/cmds.py:482
8197
#: breezy/plugins/upload/cmds.py:480
7856
8198
msgid "Do not output what is being done."
7857
8199
msgstr ""
7858
8200
7859
8201
# help of 'directory' option of 'upload' command
7860
#: breezy/plugins/upload/cmds.py:485
8202
#: breezy/plugins/upload/cmds.py:483
7861
8203
msgid ""
7862
8204
"Branch to upload from, rather than the one containing the working directory."
7863
8205
msgstr ""
7864
8206
7865
8207
# help of 'auto' option of 'upload' command
7866
#: breezy/plugins/upload/cmds.py:491
8208
#: breezy/plugins/upload/cmds.py:489
7867
8209
msgid "Trigger an upload from this branch whenever the tip revision changes."
7868
8210
msgstr ""
7869
8211
7870
#: breezy/plugins/weave_fmt/bzrdir.py:243
8212
#: breezy/plugins/weave_fmt/bzrdir.py:245
7871
8213
msgid "pb parameter to convert() is deprecated"
7872
8214
msgstr ""
7873
8215
7874
#: breezy/plugins/weave_fmt/bzrdir.py:245
8216
#: breezy/plugins/weave_fmt/bzrdir.py:247
7875
8217
msgid "starting upgrade from format 4 to 5"
7876
8218
msgstr ""
7877
8219
7878
#: breezy/plugins/weave_fmt/bzrdir.py:254
8220
#: breezy/plugins/weave_fmt/bzrdir.py:256
7879
8221
msgid "note: upgrade may be faster if all store files are ungzipped first"
7880
8222
msgstr ""
7881
8223
7882
#: breezy/plugins/weave_fmt/bzrdir.py:283
8224
#: breezy/plugins/weave_fmt/bzrdir.py:285
7883
8225
msgid "converting revision"
7884
8226
msgstr ""
7885
8227
7886
#: breezy/plugins/weave_fmt/bzrdir.py:288
8228
#: breezy/plugins/weave_fmt/bzrdir.py:290
7887
8229
msgid "upgraded to weaves:"
7888
8230
msgstr ""
7889
8231
7890
#: breezy/plugins/weave_fmt/bzrdir.py:289
8232
#: breezy/plugins/weave_fmt/bzrdir.py:291
7891
8233
#, python-format
7892
8234
msgid "%6d revisions and inventories"
7893
8235
msgstr ""
7894
8236
7895
#: breezy/plugins/weave_fmt/bzrdir.py:291
8237
#: breezy/plugins/weave_fmt/bzrdir.py:293
7896
8238
#, python-format
7897
8239
msgid "%6d revisions not present"
7898
8240
msgstr ""
7899
8241
7900
#: breezy/plugins/weave_fmt/bzrdir.py:293
8242
#: breezy/plugins/weave_fmt/bzrdir.py:295
7901
8243
#, python-format
7902
8244
msgid "%6d texts"
7903
8245
msgstr ""
7904
8246
7905
#: breezy/plugins/weave_fmt/bzrdir.py:330
8247
#: breezy/plugins/weave_fmt/bzrdir.py:332
7906
8248
msgid "writing weave"
7907
8249
msgstr ""
7908
8250
7909
#: breezy/plugins/weave_fmt/bzrdir.py:334
7910
8251
#: breezy/plugins/weave_fmt/bzrdir.py:336
8252
#: breezy/plugins/weave_fmt/bzrdir.py:338
7911
8253
msgid "inventory"
7912
8254
msgstr ""
7913
8255
7914
#: breezy/plugins/weave_fmt/bzrdir.py:353
8256
#: breezy/plugins/weave_fmt/bzrdir.py:355
7915
8257
msgid "write revision"
7916
8258
msgstr ""
7917
8259
7918
#: breezy/plugins/weave_fmt/bzrdir.py:367
8260
#: breezy/plugins/weave_fmt/bzrdir.py:369
7919
8261
msgid "loading revision"
7920
8262
msgstr ""
7921
8263
7922
#: breezy/plugins/weave_fmt/bzrdir.py:372
8264
#: breezy/plugins/weave_fmt/bzrdir.py:374
7923
8265
#, python-format
7924
8266
msgid "revision {%s} not present in branch; will be converted as a ghost"
7925
8267
msgstr ""
7926
8268
7927
#: breezy/plugins/weave_fmt/bzrdir.py:511
8269
#: breezy/plugins/weave_fmt/bzrdir.py:506
7928
8270
msgid "starting upgrade from format 5 to 6"
7929
8271
msgstr ""
7930
8272
7931
#: breezy/plugins/weave_fmt/bzrdir.py:519
8273
#: breezy/plugins/weave_fmt/bzrdir.py:514
7932
8274
#, python-format
7933
8275
msgid "adding prefixes to %s"
7934
8276
msgstr ""
7935
8277
7936
#: breezy/plugins/weave_fmt/bzrdir.py:561
8278
#: breezy/plugins/weave_fmt/bzrdir.py:556
7937
8279
msgid "starting upgrade from format 6 to metadir"
7938
8280
msgstr ""
7939
8281
8282
#: breezy/plugins/weave_fmt/bzrdir.py:564
8283
msgid "Removing ancestry.weave"
8284
msgstr ""
8285
7940
8286
#: breezy/plugins/weave_fmt/bzrdir.py:569
7941
msgid "Removing ancestry.weave"
7942
msgstr ""
7943
7944
#: breezy/plugins/weave_fmt/bzrdir.py:574
7945
8287
msgid "Finding branch files"
7946
8288
msgstr ""
7947
8289
7948
#: breezy/plugins/weave_fmt/bzrdir.py:584
8290
#: breezy/plugins/weave_fmt/bzrdir.py:579
7949
8291
msgid "Upgrading repository"
7950
8292
msgstr ""
7951
8293
7952
#: breezy/plugins/weave_fmt/bzrdir.py:594
8294
#: breezy/plugins/weave_fmt/bzrdir.py:589
7953
8295
msgid "Upgrading branch"
7954
8296
msgstr ""
7955
8297
7956
#: breezy/plugins/weave_fmt/bzrdir.py:617
8298
#: breezy/plugins/weave_fmt/bzrdir.py:612
7957
8299
msgid "No working tree."
7958
8300
msgstr ""
7959
8301
7960
#: breezy/plugins/weave_fmt/bzrdir.py:624
8302
#: breezy/plugins/weave_fmt/bzrdir.py:619
7961
8303
msgid "Upgrading working tree"
7962
8304
msgstr ""
7963
8305
7964
#: breezy/plugins/weave_fmt/bzrdir.py:644
8306
#: breezy/plugins/weave_fmt/bzrdir.py:639
7965
8307
#, python-format
7966
8308
msgid "Make %s lock"
7967
8309
msgstr ""
7968
8310
7969
#: breezy/plugins/weave_fmt/bzrdir.py:655
8311
#: breezy/plugins/weave_fmt/bzrdir.py:650
7970
8312
#, python-format
7971
8313
msgid "Moving %s"
7972
8314
msgstr ""
7973
8315
8316
#: breezy/plugins/zsh_completion/zshcomp.py:258
8317
msgid "Generate a shell function for zsh command line completion."
8318
msgstr ""
8319
8320
#: breezy/plugins/zsh_completion/zshcomp.py:260
8321
msgid ""
8322
"This command generates a shell function which can be used by zsh to\n"
8323
"automatically complete the currently typed command when the user presses\n"
8324
"the completion key (usually tab)."
8325
msgstr ""
8326
8327
#: breezy/plugins/zsh_completion/zshcomp.py:264
8328
msgid ""
8329
"Commonly used like this:\n"
8330
" eval \"`brz zsh -completion`\""
8331
msgstr ""
8332
7974
8333
#: breezy/push.py:99
7975
8334
#, python-format
7976
8335
msgid ""
8009
8368
"directory out of the way and try again."
8010
8369
msgstr ""
8011
8370
8012
#: breezy/reconcile.py:87
8371
#: breezy/reconcile.py:86
8013
8372
#, python-format
8014
8373
msgid "Reconciling branch %s"
8015
8374
msgstr ""
8016
8375
8017
#: breezy/reconcile.py:92
8376
#: breezy/reconcile.py:91
8018
8377
#, python-format
8019
8378
msgid "Reconciling repository %s"
8020
8379
msgstr ""
8021
8380
8022
#: breezy/reconcile.py:94
8381
#: breezy/reconcile.py:93
8023
8382
msgid "Reconciling repository"
8024
8383
msgstr ""
8025
8384
8026
#: breezy/reconcile.py:100
8385
#: breezy/reconcile.py:99
8027
8386
#, python-format
8028
8387
msgid "%s cannot canonicalize CHKs."
8029
8388
msgstr ""
8030
8389
8031
#: breezy/reconcile.py:106
8390
#: breezy/reconcile.py:105
8032
8391
msgid "Reconcile aborted: revision index has inconsistent parents."
8033
8392
msgstr ""
8034
8393
8035
#: breezy/reconcile.py:108
8394
#: breezy/reconcile.py:107
8036
8395
msgid "Run \"brz check\" for more details."
8037
8396
msgstr ""
8038
8397
8039
#: breezy/reconcile.py:110
8398
#: breezy/reconcile.py:109
8040
8399
msgid "Reconciliation complete."
8041
8400
msgstr ""
8042
8401
8043
#: breezy/reconfigure.py:127
8402
#: breezy/reconfigure.py:126
8044
8403
#, python-brace-format
8045
8404
msgid "{0} is now stacked on {1}\n"
8046
8405
msgstr ""
8047
8406
8048
#: breezy/reconfigure.py:142
8407
#: breezy/reconfigure.py:138
8049
8408
#, python-format
8050
8409
msgid "%s is now not stacked\n"
8051
8410
msgstr ""
8063
8422
msgid "{0} => {1}"
8064
8423
msgstr ""
8065
8424
8066
#: breezy/repository.py:286
8425
#: breezy/repository.py:318
8067
8426
#, python-format
8068
8427
msgid "brz: ERROR (ignored): %s"
8069
8428
msgstr ""
8070
8429
8071
#: breezy/repository.py:1573
8430
#: breezy/repository.py:1599
8072
8431
msgid "Moving repository to repository.backup"
8073
8432
msgstr ""
8074
8433
8075
#: breezy/repository.py:1581
8434
#: breezy/repository.py:1607
8076
8435
msgid "Creating new repository"
8077
8436
msgstr ""
8078
8437
8079
#: breezy/repository.py:1586
8438
#: breezy/repository.py:1611
8080
8439
msgid "Copying content"
8081
8440
msgstr ""
8082
8441
8083
#: breezy/repository.py:1590
8442
#: breezy/repository.py:1613
8084
8443
msgid "Deleting old repository content"
8085
8444
msgstr ""
8086
8445
8087
#: breezy/repository.py:1592
8446
#: breezy/repository.py:1615
8088
8447
msgid "repository converted"
8089
8448
msgstr ""
8090
8449
8091
#: breezy/revisionspec.py:861
8450
#: breezy/revisionspec.py:858
8092
8451
#, python-brace-format
8093
8452
msgid "Using {0} {1}"
8094
8453
msgstr ""
8095
8454
8096
#: breezy/send.py:59
8455
#: breezy/send.py:58
8097
8456
#, python-format
8098
8457
msgid "Mail client \"%s\" does not support specifying body"
8099
8458
msgstr ""
8100
8459
8101
#: breezy/send.py:63
8460
#: breezy/send.py:62
8102
8461
msgid "--remember requires a branch to be specified."
8103
8462
msgstr ""
8104
8463
8105
#: breezy/send.py:78
8464
#: breezy/send.py:77
8106
8465
msgid "No submit branch known or specified"
8107
8466
msgstr ""
8108
8467
8109
#: breezy/send.py:81
8468
#: breezy/send.py:80
8110
8469
#, python-brace-format
8111
8470
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
8112
8471
msgstr ""
8113
8472
8114
#: breezy/send.py:99
8473
#: breezy/send.py:98
8115
8474
#, python-format
8116
8475
msgid "No such send format '%s'."
8117
8476
msgstr ""
8118
8477
8119
#: breezy/send.py:115
8478
#: breezy/send.py:114
8120
8479
msgid "bzr send takes at most two one revision identifiers"
8121
8480
msgstr ""
8122
8481
8123
#: breezy/send.py:128
8482
#: breezy/send.py:127
8124
8483
msgid "No revisions to submit."
8125
8484
msgstr ""
8126
8485
8127
#: breezy/send.py:140
8486
#: breezy/send.py:139
8128
8487
msgid ""
8129
8488
"- not supported for merge directives that use more than one output file."
8130
8489
msgstr ""
8131
8490
8132
#: breezy/send.py:186
8491
#: breezy/send.py:180
8133
8492
msgid "Format 0.9 does not permit bundle with no patch"
8134
8493
msgstr ""
8135
8494
8136
#: breezy/shelf_ui.py:48
8495
#: breezy/shelf_ui.py:49
8137
8496
#, python-format
8138
8497
msgid "Shelve adding file \"%(path)s\"?"
8139
8498
msgstr ""
8140
8499
8141
#: breezy/shelf_ui.py:49
8500
#: breezy/shelf_ui.py:50
8142
8501
msgid "Shelve binary changes?"
8143
8502
msgstr ""
8144
8503
8145
#: breezy/shelf_ui.py:50
8504
#: breezy/shelf_ui.py:51
8146
8505
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
8147
8506
msgstr ""
8148
8507
8149
#: breezy/shelf_ui.py:52
8508
#: breezy/shelf_ui.py:53
8150
8509
#, python-format
8151
8510
msgid "Shelve removing file \"%(path)s\"?"
8152
8511
msgstr ""
8153
8512
8154
#: breezy/shelf_ui.py:53
8513
#: breezy/shelf_ui.py:54
8155
8514
#, python-format
8156
8515
msgid "Shelve %d change(s)?"
8157
8516
msgstr ""
8158
8517
8159
#: breezy/shelf_ui.py:54
8518
#: breezy/shelf_ui.py:55
8160
8519
msgid "Shelve?"
8161
8520
msgstr ""
8162
8521
8163
#: breezy/shelf_ui.py:55
8522
#: breezy/shelf_ui.py:56
8164
8523
#, python-format
8165
8524
msgid ""
8166
8525
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8167
8526
msgstr ""
8168
8527
8169
#: breezy/shelf_ui.py:57
8528
#: breezy/shelf_ui.py:58
8170
8529
#, python-format
8171
8530
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
8172
8531
msgstr ""
8173
8532
8174
#: breezy/shelf_ui.py:72
8533
#: breezy/shelf_ui.py:73
8175
8534
#, python-format
8176
8535
msgid "Changes shelved with id \"%d\"."
8177
8536
msgstr ""
8178
8537
8179
#: breezy/shelf_ui.py:76
8538
#: breezy/shelf_ui.py:77
8180
8539
msgid "Selected changes destroyed."
8181
8540
msgstr ""
8182
8541
8183
#: breezy/shelf_ui.py:80
8542
#: breezy/shelf_ui.py:81
8184
8543
msgid "Selected changes:"
8185
8544
msgstr ""
8186
8545
8187
#: breezy/shelf_ui.py:100
8546
#: breezy/shelf_ui.py:101
8188
8547
#, python-format
8189
8548
msgid "Delete file \"%(path)s\"?"
8190
8549
msgstr ""
8191
8550
8192
#: breezy/shelf_ui.py:101
8551
#: breezy/shelf_ui.py:102
8193
8552
msgid "Apply binary changes?"
8194
8553
msgstr ""
8195
8554
8196
#: breezy/shelf_ui.py:102
8555
#: breezy/shelf_ui.py:103
8197
8556
#, python-format
8198
8557
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
8199
8558
msgstr ""
8200
8559
8201
#: breezy/shelf_ui.py:104
8560
#: breezy/shelf_ui.py:105
8202
8561
#, python-format
8203
8562
msgid "Add file \"%(path)s\"?"
8204
8563
msgstr ""
8205
8564
8206
#: breezy/shelf_ui.py:105
8565
#: breezy/shelf_ui.py:106
8207
8566
#, python-format
8208
8567
msgid "Apply %d change(s)?"
8209
8568
msgstr ""
8210
8569
8211
#: breezy/shelf_ui.py:106
8570
#: breezy/shelf_ui.py:107
8212
8571
msgid "Apply change?"
8213
8572
msgstr ""
8214
8573
8215
#: breezy/shelf_ui.py:107
8574
#: breezy/shelf_ui.py:108
8216
8575
#, python-format
8217
8576
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
8218
8577
msgstr ""
8219
8578
8220
#: breezy/shelf_ui.py:109
8579
#: breezy/shelf_ui.py:110
8221
8580
#, python-format
8222
8581
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
8223
8582
msgstr ""
8224
8583
8225
#: breezy/shelf_ui.py:409
8584
#: breezy/shelf_ui.py:407
8226
8585
msgid "No changes are shelved."
8227
8586
msgstr ""
8228
8587
8229
#: breezy/shelf_ui.py:467
8588
#: breezy/shelf_ui.py:464
8230
8589
#, python-format
8231
8590
msgid "Using changes with id \"%d\"."
8232
8591
msgstr ""
8233
8592
8234
#: breezy/shelf_ui.py:472
8593
#: breezy/shelf_ui.py:469
8235
8594
#, python-format
8236
8595
msgid "Message: %s"
8237
8596
msgstr ""
8238
8597
8239
#: breezy/shelf_ui.py:484
8598
#: breezy/shelf_ui.py:481
8240
8599
#, python-format
8241
8600
msgid "Deleted changes with id \"%d\"."
8242
8601
msgstr ""
8268
8627
"anyway, use --force."
8269
8628
msgstr ""
8270
8629
8271
#: breezy/switch.py:172
8630
#: breezy/switch.py:169
8272
8631
msgid "Cannot switch a branch, only a checkout."
8273
8632
msgstr ""
8274
8633
8275
#: breezy/transform.py:1741 breezy/transform.py:1752 breezy/transform.py:1754
8634
#: breezy/transform.py:1788 breezy/transform.py:1799 breezy/transform.py:1801
8276
8635
msgid "Apply phase"
8277
8636
msgstr ""
8278
8637
8279
#: breezy/transform.py:1777 breezy/transform.py:1840
8638
#: breezy/transform.py:1824 breezy/transform.py:1887
8280
8639
msgid "removing file"
8281
8640
msgstr ""
8282
8641
8283
#: breezy/transform.py:1792 breezy/transform.py:1870
8642
#: breezy/transform.py:1839 breezy/transform.py:1917
8284
8643
msgid "adding file"
8285
8644
msgstr ""
8286
8645
8287
#: breezy/transform.py:2612
8646
#: breezy/transform.py:2648
8288
8647
msgid "Building tree"
8289
8648
msgstr ""
8290
8649
8291
#: breezy/transform.py:2705 breezy/transform.py:2726
8650
#: breezy/transform.py:2741 breezy/transform.py:2762
8292
8651
msgid "Adding file contents"
8293
8652
msgstr ""
8294
8653
8295
#: breezy/transform.py:3027
8654
#: breezy/transform.py:3066
8296
8655
msgid "Resolution pass"
8297
8656
msgstr ""
8298
8657
8299
#: breezy/tree.py:601
8658
#: breezy/tree.py:704
8300
8659
msgid "*** {0} content-filter: {1} => {2!r}"
8301
8660
msgstr ""
8302
8661
8358
8717
msgid "failed to clean-up {0}: {1}"
8359
8718
msgstr ""
8360
8719
8361
#: breezy/win32utils.py:112
8720
#: breezy/win32utils.py:87
8362
8721
msgid "Failed to GetProcessMemoryInfo()"
8363
8722
msgstr ""
8364
8723
8365
#: breezy/win32utils.py:133
8724
#: breezy/win32utils.py:102
8366
8725
msgid "Cannot debug memory on win32 without ctypes or win32process"
8367
8726
msgstr ""
8368
8727
8369
#: breezy/win32utils.py:138
8728
#: breezy/win32utils.py:107
8370
8729
#, python-brace-format
8371
8730
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8372
8731
msgstr ""
8373
8732
8374
#: breezy/win32utils.py:146
8733
#: breezy/win32utils.py:115
8375
8734
#, python-format
8376
8735
msgid "WorkingSize %8d KiB"
8377
8736
msgstr ""
8378
8737
8379
#: breezy/win32utils.py:148
8738
#: breezy/win32utils.py:117
8380
8739
#, python-format
8381
8740
msgid "PeakWorking %8d KiB"
8382
8741
msgstr ""
8383
8742
8384
#: breezy/win32utils.py:150
8743
#: breezy/win32utils.py:119
8385
8744
#, python-format
8386
8745
msgid "PagefileUsage %8d KiB"
8387
8746
msgstr ""
8388
8747
8389
#: breezy/win32utils.py:152
8748
#: breezy/win32utils.py:121
8390
8749
#, python-format
8391
8750
msgid "PeakPagefileUsage %8d KiB"
8392
8751
msgstr ""
8393
8752
8394
#: breezy/win32utils.py:154
8753
#: breezy/win32utils.py:123
8395
8754
#, python-format
8396
8755
msgid "PrivateUsage %8d KiB"
8397
8756
msgstr ""
8398
8757
8399
#: breezy/win32utils.py:156
8758
#: breezy/win32utils.py:125
8400
8759
#, python-format
8401
8760
msgid "PageFaultCount %8d"
8402
8761
msgstr ""
8403
8762
8404
#: breezy/workingtree.py:1202
8763
#: breezy/workingtree.py:1167
8405
8764
msgid "Rerun update after fixing the conflicts."
8406
8765
msgstr ""
8407
8766
8411
8770
8412
8771
#: dummy/help_topics/basic/detail.txt:1
8413
8772
msgid ""
8414
"Breezy 3.0b1 -- a free distributed version-control tool\n"
8773
"Breezy 3.1a0 -- a free distributed version-control tool\n"
8415
8774
"https://www.breezy-vcs.org/"
8416
8775
msgstr ""
8417
8776
8740
9099
#: dummy/help_topics/files/detail.txt:3
8741
9100
msgid ""
8742
9101
":On Unix: ~/.config/breezy/breezy.conf\n"
8743
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8744
"\\Breezy\\\\2.0\\\\breezy.conf"
9102
":On Windows: %APPDATA%\\\\breezy\\\\breezy.conf"
8745
9103
msgstr ""
8746
9104
8747
9105
#: dummy/help_topics/files/detail.txt:6
9040
9398
9041
9399
#: dummy/help_topics/repositories/detail.txt:21
9042
9400
msgid ""
9043
"To create a shared repository use the init-repository command (or the alias\n"
9044
"init-repo). This command takes the location of the repository to create. "
9045
"This\n"
9046
"means that 'brz init-repository repo' will create a directory named 'repo',\n"
9047
"which contains a shared repository. Any new branches that are created in "
9048
"this\n"
9049
"directory will then use it for storage."
9401
"To create a shared repository use the init-shared-repository command (or "
9402
"the\n"
9403
"alias init-shared-repo). This command takes the location of the repository "
9404
"to\n"
9405
"create. This means that 'brz init-shared-repository repo' will create a\n"
9406
"directory named 'repo', which contains a shared repository. Any new "
9407
"branches\n"
9408
"that are created in this directory will then use it for storage."
9050
9409
msgstr ""
9051
9410
9052
9411
#: dummy/help_topics/repositories/detail.txt:27
9060
9419
"need to use up disk space for a working tree. To create a repository in "
9061
9420
"which\n"
9062
9421
"the branches will not have working trees pass the '--no-trees' option to\n"
9063
"'init-repository'."
9422
"'init-shared-repository'."
9064
9423
msgstr ""
9065
9424
9066
9425
#: dummy/help_topics/repositories/detail.txt:38
9067
9426
msgid ""
9068
" init-repository Create a shared repository. Use --no-trees to create "
9069
"one\n"
9070
" in which new branches won't get a working tree.\n"
9427
" init-shared-repository Create a shared repository. Use --no-trees to "
9428
"create\n"
9429
" one in which new branches won't get a working "
9430
"tree.\n"
9071
9431
msgstr ""
9072
9432
9073
9433
#: dummy/help_topics/repositories/summary.txt:1
10922
11282
10923
11283
#: en/help_topics/configuration.txt:530
10924
11284
msgid ""
10925
"If set to true, bzr will automatically break locks held by processes from\n"
10926
"the same machine and user that are no longer alive. Otherwise, it will\n"
11285
"By default, bzr will automatically break locks held by processes from\n"
11286
"the same machine and user that are no longer alive. If disabled, it will\n"
10927
11287
"print a message and you can break the lock manually, if you are satisfied\n"
10928
11288
"the object is no longer in use."
10929
11289
msgstr ""
12277
12637
"BRZ_SSH Path to SSH client, or one of paramiko, openssh, "
12278
12638
"sshcorp,\n"
12279
12639
" plink or lsh.\n"
12280
"BRZ_LOG Location of .brz.log (use '/dev/null' to suppress log).\n"
12281
"BRZ_LOG (Win32) Location of .brz.log (use 'NUL' to suppress log).\n"
12640
"BRZ_LOG Location of brz.log (use '/dev/null' to suppress log).\n"
12641
"BRZ_LOG (Win32) Location of brz.log (use 'NUL' to suppress log).\n"
12282
12642
"BRZ_COLUMNS Override implicit terminal width.\n"
12283
12643
"BRZ_CONCURRENCY Number of processes that can be run concurrently "
12284
12644
"(selftest)\n"
13902
14262
msgstr ""
13903
14263
13904
14264
#: en/help_topics/missing-extensions.txt:26
13905
msgid "The specific modules that failed, and why, are listed in .brz.log.\n"
14265
msgid "The specific modules that failed, and why, are listed in brz.log.\n"
13906
14266
msgstr ""
13907
14267
13908
14268
#: en/help_topics/other-formats.txt:1
14042
14402
14043
14403
#: en/help_topics/revisionspec.txt:30
14044
14404
msgid ""
14405
":revno:\n"
14406
"\tSelects a revision using a number.\n"
14045
14407
":revid:\n"
14046
14408
"\tSelects a revision using the revision id.\n"
14047
":submit:\n"
14048
"\tSelects a common ancestor with the submit branch.\n"
14409
":last:\n"
14410
"\tSelects the nth revision from the end.\n"
14411
":before:\n"
14412
"\tSelects the parent of the revision specified.\n"
14413
":tag:\n"
14414
"\tSelects a revision identified by a tag name.\n"
14415
":date:\n"
14416
"\tSelects a revision on the basis of a datestamp.\n"
14049
14417
":ancestor:\n"
14050
14418
"\tSelects a common ancestor with a second branch.\n"
14051
":date:\n"
14052
"\tSelects a revision on the basis of a datestamp.\n"
14053
14419
":branch:\n"
14054
14420
"\tSelects the last revision of a specified branch.\n"
14055
":tag:\n"
14056
"\tSelects a revision identified by a tag name.\n"
14057
":revno:\n"
14058
"\tSelects a revision using a number.\n"
14059
":before:\n"
14060
"\tSelects the parent of the revision specified.\n"
14421
":submit:\n"
14422
"\tSelects a common ancestor with the submit branch.\n"
14061
14423
":annotate:\n"
14062
14424
"\tSelect the revision that last modified the specified line.\n"
14063
14425
":mainline:\n"
14064
14426
"\tSelect mainline revision that merged the specified revision.\n"
14065
14427
":git:\n"
14066
"\tSelects a revision using a Git revision sha1.\n"
14067
":last:\n"
14068
"\tSelects the nth revision from the end."
14428
"\tSelects a revision using a Git commit SHA1."
14069
14429
msgstr ""
14070
14430
14071
14431
#: en/help_topics/revisionspec.txt:55
14077
14437
msgstr ""
14078
14438
14079
14439
#: en/help_topics/revisionspec.txt:59
14080
msgid ":revid:"
14440
msgid ":revno:"
14081
14441
msgstr ""
14082
14442
14083
14443
#: en/help_topics/revisionspec.txt:61
14084
14444
msgid ""
14085
" Supply a specific revision id, that can be used to specify any\n"
14086
" revision id in the ancestry of the branch.\n"
14087
" Including merges, and pending merges.\n"
14088
" Examples::"
14089
msgstr ""
14090
14091
#: en/help_topics/revisionspec.txt:66
14092
msgid ""
14093
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
14094
msgstr ""
14095
14096
#: en/help_topics/revisionspec.txt:68
14097
msgid ":submit:"
14098
msgstr ""
14099
14100
#: en/help_topics/revisionspec.txt:70
14101
msgid ""
14102
" Diffing against this shows all the changes that were made in this "
14103
"branch,\n"
14104
" and is a good predictor of what merge will do. The submit branch is\n"
14105
" used by the bundle and merge directive commands. If no submit branch\n"
14106
" is specified, the parent branch is used instead."
14107
msgstr ""
14108
14109
#: en/help_topics/revisionspec.txt:75 en/help_topics/revisionspec.txt:87
14110
msgid ""
14111
" The common ancestor is the last revision that existed in both\n"
14112
" branches. Usually this is the branch point, but it could also be\n"
14113
" a revision that was merged."
14114
msgstr ""
14115
14116
#: en/help_topics/revisionspec.txt:79 en/help_topics/revisionspec.txt:95
14117
#: en/help_topics/revisionspec.txt:111 en/help_topics/revisionspec.txt:121
14118
#: en/help_topics/revisionspec.txt:155
14119
msgid " Examples::"
14120
msgstr ""
14121
14122
#: en/help_topics/revisionspec.txt:81
14123
msgid " $ bzr diff -r submit:"
14124
msgstr ""
14125
14126
#: en/help_topics/revisionspec.txt:83
14127
msgid ":ancestor:"
14128
msgstr ""
14129
14130
#: en/help_topics/revisionspec.txt:85
14131
msgid " Supply the path to a branch to select the common ancestor."
14132
msgstr ""
14133
14134
#: en/help_topics/revisionspec.txt:91
14135
msgid ""
14136
" This is frequently used with 'diff' to return all of the changes\n"
14137
" that your branch introduces, while excluding the changes that you\n"
14138
" have not merged from the remote branch."
14139
msgstr ""
14140
14141
#: en/help_topics/revisionspec.txt:97
14142
msgid ""
14143
" ancestor:/path/to/branch\n"
14144
" $ bzr diff -r ancestor:../../mainline/branch"
14145
msgstr ""
14146
14147
#: en/help_topics/revisionspec.txt:100
14148
msgid ":date:"
14149
msgstr ""
14150
14151
#: en/help_topics/revisionspec.txt:102
14152
msgid ""
14153
" Supply a datestamp to select the first revision that matches the date.\n"
14154
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
14155
" Matches the first entry after a given date (either at midnight or\n"
14156
" at a specified time)."
14157
msgstr ""
14158
14159
#: en/help_topics/revisionspec.txt:107
14160
msgid " One way to display all the changes since yesterday would be::"
14161
msgstr ""
14162
14163
#: en/help_topics/revisionspec.txt:109
14164
msgid " brz log -r date:yesterday.."
14165
msgstr ""
14166
14167
#: en/help_topics/revisionspec.txt:113
14168
msgid ""
14169
" date:yesterday -> select the first revision since "
14170
"yesterday\n"
14171
" date:2006-08-14,17:10:14 -> select the first revision after\n"
14172
" August 14th, 2006 at 5:10pm."
14173
msgstr ""
14174
14175
#: en/help_topics/revisionspec.txt:117
14176
msgid ":branch:"
14177
msgstr ""
14178
14179
#: en/help_topics/revisionspec.txt:119
14180
msgid " Supply the path to a branch to select its last revision."
14181
msgstr ""
14182
14183
#: en/help_topics/revisionspec.txt:123
14184
msgid " branch:/path/to/branch"
14185
msgstr ""
14186
14187
#: en/help_topics/revisionspec.txt:125
14188
msgid ":tag:"
14189
msgstr ""
14190
14191
#: en/help_topics/revisionspec.txt:127
14192
msgid " Tags are stored in the branch and created by the 'tag' command."
14193
msgstr ""
14194
14195
#: en/help_topics/revisionspec.txt:129
14196
msgid ":revno:"
14197
msgstr ""
14198
14199
#: en/help_topics/revisionspec.txt:131
14200
msgid ""
14201
14445
" Use an integer to specify a revision in the history of the branch.\n"
14202
14446
" Optionally a branch can be specified. A negative number will count\n"
14203
14447
" from the end of the branch (-1 is the last revision, -2 the previous\n"
14206
14450
" Examples::"
14207
14451
msgstr ""
14208
14452
14209
#: en/help_topics/revisionspec.txt:138
14453
#: en/help_topics/revisionspec.txt:68
14210
14454
msgid ""
14211
14455
" revno:1 -> return the first revision of this branch\n"
14212
14456
" revno:3:/path/to/branch -> return the 3rd revision of\n"
14218
14462
" your history is very long."
14219
14463
msgstr ""
14220
14464
14221
#: en/help_topics/revisionspec.txt:147
14465
#: en/help_topics/revisionspec.txt:77
14466
msgid ":revid:"
14467
msgstr ""
14468
14469
#: en/help_topics/revisionspec.txt:79
14470
msgid ""
14471
" Supply a specific revision id, that can be used to specify any\n"
14472
" revision id in the ancestry of the branch.\n"
14473
" Including merges, and pending merges.\n"
14474
" Examples::"
14475
msgstr ""
14476
14477
#: en/help_topics/revisionspec.txt:84
14478
msgid ""
14479
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
14480
msgstr ""
14481
14482
#: en/help_topics/revisionspec.txt:86
14483
msgid ":last:"
14484
msgstr ""
14485
14486
#: en/help_topics/revisionspec.txt:88
14487
msgid ""
14488
" Supply a positive number to get the nth revision from the end.\n"
14489
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
14490
" Examples::"
14491
msgstr ""
14492
14493
#: en/help_topics/revisionspec.txt:92
14494
msgid ""
14495
" last:1 -> return the last revision\n"
14496
" last:3 -> return the revision 2 before the end."
14497
msgstr ""
14498
14499
#: en/help_topics/revisionspec.txt:95
14222
14500
msgid ":before:"
14223
14501
msgstr ""
14224
14502
14225
#: en/help_topics/revisionspec.txt:149
14503
#: en/help_topics/revisionspec.txt:97
14226
14504
msgid ""
14227
14505
" Supply any revision spec to return the parent of that revision. This "
14228
14506
"is\n"
14231
14509
" of a branch."
14232
14510
msgstr ""
14233
14511
14234
#: en/help_topics/revisionspec.txt:153
14512
#: en/help_topics/revisionspec.txt:101
14235
14513
msgid ""
14236
14514
" It is an error to request the parent of the null revision (before:0)."
14237
14515
msgstr ""
14238
14516
14239
#: en/help_topics/revisionspec.txt:157
14517
#: en/help_topics/revisionspec.txt:103 en/help_topics/revisionspec.txt:128
14518
#: en/help_topics/revisionspec.txt:146 en/help_topics/revisionspec.txt:155
14519
#: en/help_topics/revisionspec.txt:170
14520
msgid " Examples::"
14521
msgstr ""
14522
14523
#: en/help_topics/revisionspec.txt:105
14240
14524
msgid ""
14241
14525
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
14242
14526
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
14248
14532
" This is equivalent to: bzr diff -c 1913"
14249
14533
msgstr ""
14250
14534
14251
#: en/help_topics/revisionspec.txt:165
14535
#: en/help_topics/revisionspec.txt:113
14536
msgid ":tag:"
14537
msgstr ""
14538
14539
#: en/help_topics/revisionspec.txt:115
14540
msgid " Tags are stored in the branch and created by the 'tag' command."
14541
msgstr ""
14542
14543
#: en/help_topics/revisionspec.txt:117
14544
msgid ":date:"
14545
msgstr ""
14546
14547
#: en/help_topics/revisionspec.txt:119
14548
msgid ""
14549
" Supply a datestamp to select the first revision that matches the date.\n"
14550
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
14551
" Matches the first entry after a given date (either at midnight or\n"
14552
" at a specified time)."
14553
msgstr ""
14554
14555
#: en/help_topics/revisionspec.txt:124
14556
msgid " One way to display all the changes since yesterday would be::"
14557
msgstr ""
14558
14559
#: en/help_topics/revisionspec.txt:126
14560
msgid " brz log -r date:yesterday.."
14561
msgstr ""
14562
14563
#: en/help_topics/revisionspec.txt:130
14564
msgid ""
14565
" date:yesterday -> select the first revision since "
14566
"yesterday\n"
14567
" date:2006-08-14,17:10:14 -> select the first revision after\n"
14568
" August 14th, 2006 at 5:10pm."
14569
msgstr ""
14570
14571
#: en/help_topics/revisionspec.txt:134
14572
msgid ":ancestor:"
14573
msgstr ""
14574
14575
#: en/help_topics/revisionspec.txt:136
14576
msgid " Supply the path to a branch to select the common ancestor."
14577
msgstr ""
14578
14579
#: en/help_topics/revisionspec.txt:138 en/help_topics/revisionspec.txt:166
14580
msgid ""
14581
" The common ancestor is the last revision that existed in both\n"
14582
" branches. Usually this is the branch point, but it could also be\n"
14583
" a revision that was merged."
14584
msgstr ""
14585
14586
#: en/help_topics/revisionspec.txt:142
14587
msgid ""
14588
" This is frequently used with 'diff' to return all of the changes\n"
14589
" that your branch introduces, while excluding the changes that you\n"
14590
" have not merged from the remote branch."
14591
msgstr ""
14592
14593
#: en/help_topics/revisionspec.txt:148
14594
msgid ""
14595
" ancestor:/path/to/branch\n"
14596
" $ bzr diff -r ancestor:../../mainline/branch"
14597
msgstr ""
14598
14599
#: en/help_topics/revisionspec.txt:151
14600
msgid ":branch:"
14601
msgstr ""
14602
14603
#: en/help_topics/revisionspec.txt:153
14604
msgid " Supply the path to a branch to select its last revision."
14605
msgstr ""
14606
14607
#: en/help_topics/revisionspec.txt:157
14608
msgid " branch:/path/to/branch"
14609
msgstr ""
14610
14611
#: en/help_topics/revisionspec.txt:159
14612
msgid ":submit:"
14613
msgstr ""
14614
14615
#: en/help_topics/revisionspec.txt:161
14616
msgid ""
14617
" Diffing against this shows all the changes that were made in this "
14618
"branch,\n"
14619
" and is a good predictor of what merge will do. The submit branch is\n"
14620
" used by the bundle and merge directive commands. If no submit branch\n"
14621
" is specified, the parent branch is used instead."
14622
msgstr ""
14623
14624
#: en/help_topics/revisionspec.txt:172
14625
msgid " $ bzr diff -r submit:"
14626
msgstr ""
14627
14628
#: en/help_topics/revisionspec.txt:174
14252
14629
msgid ":annotate:"
14253
14630
msgstr ""
14254
14631
14255
#: en/help_topics/revisionspec.txt:167
14632
#: en/help_topics/revisionspec.txt:176
14256
14633
msgid ""
14257
14634
" Select the revision that last modified the specified line. Line is\n"
14258
14635
" specified as path:number. Path is a relative path to the file. "
14261
14638
" committed version of the file."
14262
14639
msgstr ""
14263
14640
14264
#: en/help_topics/revisionspec.txt:172
14641
#: en/help_topics/revisionspec.txt:181
14265
14642
msgid ":mainline:"
14266
14643
msgstr ""
14267
14644
14268
#: en/help_topics/revisionspec.txt:174
14645
#: en/help_topics/revisionspec.txt:183
14269
14646
msgid ""
14270
14647
" Select the revision that merged the specified revision into mainline."
14271
14648
msgstr ""
14272
14649
14273
#: en/help_topics/revisionspec.txt:176
14650
#: en/help_topics/revisionspec.txt:185
14274
14651
msgid ":git:"
14275
14652
msgstr ""
14276
14653
14277
#: en/help_topics/revisionspec.txt:178
14278
msgid ":last:"
14279
msgstr ""
14280
14281
#: en/help_topics/revisionspec.txt:180
14282
msgid ""
14283
" Supply a positive number to get the nth revision from the end.\n"
14284
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
14285
" Examples::"
14286
msgstr ""
14287
14288
#: en/help_topics/revisionspec.txt:184
14289
msgid ""
14290
" last:1 -> return the last revision\n"
14291
" last:3 -> return the revision 2 before the end.\n"
14654
#: en/help_topics/revisionspec.txt:187
14655
msgid " Selects a revision using a Git commit SHA1, short or long."
14656
msgstr ""
14657
14658
#: en/help_topics/revisionspec.txt:189
14659
msgid ""
14660
" This works for both native Git repositories and Git revisions\n"
14661
" imported into Bazaar repositories.\n"
14292
14662
msgstr ""
14293
14663
14294
14664
#: en/help_topics/rules.txt:1
14514
14884
msgid ""
14515
14885
" bzr:// Fast access using the Bazaar smart server.\n"
14516
14886
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
14887
" cvs+pserver:// The pserver access protocol for CVS.\n"
14517
14888
" file:// Access using the standard filesystem (default)\n"
14518
14889
" git:// Access using the Git smart server protocol.\n"
14519
14890
" git+ssh:// Access using the Git smart server protocol over SSH.\n"
14520
14891
" http:// Read-only access of branches exported on the web.\n"
14521
14892
" https:// Read-only access of branches exported on the web using "
14522
14893
"SSL.\n"
14523
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
14894
" sftp:// Access using SFTP (most SSH servers provide SFTP).\n"
14895
" svn:// Access using the Subversion smart server.\n"
14896
" svn+ssh:// Access using the Subversion smart server tunneled over "
14897
"SSH."
14524
14898
msgstr ""
14525
14899
14526
#: en/help_topics/urlspec.txt:14
14900
#: en/help_topics/urlspec.txt:17
14527
14901
msgid "Supported modifiers::"
14528
14902
msgstr ""
14529
14903
14530
#: en/help_topics/urlspec.txt:16
14904
#: en/help_topics/urlspec.txt:19
14531
14905
msgid " gio+ Access using any GIO supported protocols."
14532
14906
msgstr ""
14533
14907
14534
#: en/help_topics/urlspec.txt:18
14908
#: en/help_topics/urlspec.txt:21
14535
14909
msgid "Breezy supports all of the standard parts within the URL::"
14536
14910
msgstr ""
14537
14911
14538
#: en/help_topics/urlspec.txt:20
14912
#: en/help_topics/urlspec.txt:23
14539
14913
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
14540
14914
msgstr ""
14541
14915
14542
#: en/help_topics/urlspec.txt:22
14916
#: en/help_topics/urlspec.txt:25
14543
14917
msgid "allowing URLs such as::"
14544
14918
msgstr ""
14545
14919
14546
#: en/help_topics/urlspec.txt:24
14920
#: en/help_topics/urlspec.txt:27
14547
14921
msgid " http://brzuser:BadPass@brz.example.com:8080/brz/trunk"
14548
14922
msgstr ""
14549
14923
14550
#: en/help_topics/urlspec.txt:26
14924
#: en/help_topics/urlspec.txt:29
14551
14925
msgid ""
14552
14926
"For brz+ssh:// and sftp:// URLs, Breezy also supports paths that begin\n"
14553
14927
"with '~' as meaning that the rest of the path should be interpreted\n"
14556
14930
"shell.example.com, then::"
14557
14931
msgstr ""
14558
14932
14559
#: en/help_topics/urlspec.txt:32
14933
#: en/help_topics/urlspec.txt:35
14560
14934
msgid " brz+ssh://remote@shell.example.com/~/myproject/trunk"
14561
14935
msgstr ""
14562
14936
14563
#: en/help_topics/urlspec.txt:34
14937
#: en/help_topics/urlspec.txt:37
14564
14938
msgid "would refer to ``/home/remote/myproject/trunk``."
14565
14939
msgstr ""
14566
14940
14567
#: en/help_topics/urlspec.txt:36
14941
#: en/help_topics/urlspec.txt:39
14568
14942
msgid ""
14569
14943
"Many commands that accept URLs also accept location aliases too.\n"
14570
14944
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0