206
206
"dvěma revizemi, předejte rozsah revizí do argumentu revizí.\n"
207
207
"Toto vytvoří stejný výsledek jako volání 'bzr diff --summarize'."
209
#: bzrlib/builtins.py:363
209
#: bzrlib/builtins.py:375
210
210
msgid "Use short status indicators."
211
211
msgstr "Použijt krátké indikátory stavi"
213
#: bzrlib/builtins.py:365
213
#: bzrlib/builtins.py:377
214
214
msgid "Only show versioned files."
215
215
msgstr "Zobrazit pouze soubory s verzí."
217
#: bzrlib/builtins.py:367
217
#: bzrlib/builtins.py:379
218
218
msgid "Don't show pending merges."
219
219
msgstr "Nezobrazovat nevyřízená sloučení."
221
#: bzrlib/builtins.py:370
221
#: bzrlib/builtins.py:382
222
222
msgid "Do not mark object type using indicator."
223
223
msgstr "Neoznačovat typ objektu pomocí indikátoru."
225
#: bzrlib/builtins.py:385
225
#: bzrlib/builtins.py:397
226
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
228
228
"bzr status --revision přijímá právě jeden nebo dva specifikátory revize"
230
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
230
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5197
231
231
msgid "You can only supply one of revision_id or --revision"
232
232
msgstr "Můžete zadat pouze jednu z revision_id nebo --revision"
234
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
234
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5199
235
235
msgid "You must supply either --revision or a revision_id"
236
236
msgstr "Musíte zadat buď --revision nebo revision_id"
238
#: bzrlib/builtins.py:439
238
#: bzrlib/builtins.py:451
240
240
msgid "Repository %r does not support access to raw revision texts"
241
241
msgstr "Úložiště %r nepodporuje přístup k vlastním textům revizí"
243
#: bzrlib/builtins.py:450
243
#: bzrlib/builtins.py:462
244
244
msgid "The repository {0} contains no revision {1}."
245
245
msgstr "Úložiště {0} neobsahuje revizi {1}."
247
#: bzrlib/builtins.py:457
247
#: bzrlib/builtins.py:469
248
248
msgid "You cannot specify a NULL revision."
249
249
msgstr "Nemůžete zadat nulovou revizi."
251
#: bzrlib/builtins.py:549
251
#: bzrlib/builtins.py:561
252
252
msgid "Remove the working tree from a given branch/checkout."
253
253
msgstr "Odstranit pracovní strom ze zadané větve/získání."
255
#: bzrlib/builtins.py:551
255
#: bzrlib/builtins.py:563
257
257
"Since a lightweight checkout is little more than a working tree\n"
258
258
"this will refuse to run against one."
260
260
"Protože odlehčené získání je trošku více než pracovní strom\n"
261
261
"toto odmítne být v nějakém spuštěno."
263
#: bzrlib/builtins.py:554
263
#: bzrlib/builtins.py:566
264
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
265
msgstr "Pro znovuvytvoření pracovního stromu použijte \"bzr checkout\"."
267
#: bzrlib/builtins.py:560
267
#: bzrlib/builtins.py:572
269
269
"Remove the working tree even if it has uncommitted or shelved changes."
271
271
"Odstranit pracovní strom i když má neodevzdané nebo uskladněné změny."
273
#: bzrlib/builtins.py:574
273
#: bzrlib/builtins.py:586
274
274
msgid "No working tree to remove"
275
275
msgstr "Žádný pracovní strom k odstranění"
277
#: bzrlib/builtins.py:576
277
#: bzrlib/builtins.py:588
278
278
msgid "You cannot remove the working tree of a remote path"
279
279
msgstr "Nemůžete odtranit pracovní strom ze vzdálené cesty"
281
#: bzrlib/builtins.py:585
281
#: bzrlib/builtins.py:597
282
282
msgid "You cannot remove the working tree from a lightweight checkout"
283
283
msgstr "Nemůžete odstranit pracovní strom z odlehčeného získání"
285
#: bzrlib/builtins.py:625
285
#: bzrlib/builtins.py:637
287
287
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
288
288
"instead. Use \"--force\" if you are sure you want to reset the working tree."
298
298
", hlavička se zdá být poškozena, zkuste předat -r -1 pro nastavení stavu na "
299
299
"poslední odevzdání"
301
#: bzrlib/builtins.py:640
301
#: bzrlib/builtins.py:652
302
302
msgid "failed to reset the tree state{0}"
303
303
msgstr "nelze resetovat stav stromu{0}"
305
#: bzrlib/builtins.py:644
305
#: bzrlib/builtins.py:656
306
306
msgid "Show current revision number."
307
307
msgstr "Zobrazit číslo současné revize."
309
#: bzrlib/builtins.py:646
309
#: bzrlib/builtins.py:658
310
310
msgid "This is equal to the number of revisions on this branch."
311
311
msgstr "Toto se rovná počtu revizí v této větvi."
313
#: bzrlib/builtins.py:659
313
#: bzrlib/builtins.py:671
314
314
msgid "--tree and --revision can not be used together"
315
315
msgstr "--tree a --revision nelze použít dohromady"
317
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
317
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5953
318
318
msgid "Tags can only be placed on a single revision, not on a range"
319
319
msgstr "Značky mohou být umístěny pouze na jednu revizi, ne na rozsah"
321
#: bzrlib/builtins.py:700
321
#: bzrlib/builtins.py:712
322
322
msgid "Show revno of working tree."
323
323
msgstr "Zobrazit číslo revize pracovního stromu."
325
#: bzrlib/builtins.py:748
325
#: bzrlib/builtins.py:760
326
326
msgid "Add specified files or directories."
327
327
msgstr "Přidat určené soubory nebo adresáře."
329
#: bzrlib/builtins.py:750
329
#: bzrlib/builtins.py:762
331
331
"In non-recursive mode, all the named items are added, regardless\n"
332
332
"of whether they were previously ignored. A warning is given if\n"
427
427
"add.maximum_file_size budou přeskočeny. Pojmenované položky nejsou nikdy\n"
428
428
"přeskočeny kvůli velikosti"
430
#: bzrlib/builtins.py:794
430
#: bzrlib/builtins.py:806
431
431
msgid "Don't recursively add the contents of directories."
432
432
msgstr "Nepřidávat obsah adresářů rekurzivně."
434
#: bzrlib/builtins.py:800
434
#: bzrlib/builtins.py:813
435
435
msgid "Lookup file ids from this tree."
436
436
msgstr "Vyhledat id v tomto stromu"
438
#: bzrlib/builtins.py:836
438
#: bzrlib/builtins.py:849
439
439
msgid "ignored {0} matching \"{1}\"\n"
440
440
msgstr "{0} ignorováno, shoda s \"{1}\"\n"
442
#: bzrlib/builtins.py:841
442
#: bzrlib/builtins.py:854
443
443
msgid "Create a new versioned directory."
444
444
msgstr "Vytvořit nový adresář s verzí."
446
#: bzrlib/builtins.py:843
446
#: bzrlib/builtins.py:856
447
447
msgid "This is equivalent to creating the directory and then adding it."
448
448
msgstr "Toto se rovná vytvoření a přidání adresáře."
450
#: bzrlib/builtins.py:850
450
#: bzrlib/builtins.py:863
451
451
msgid "No error if existing, make parent directories as needed."
453
453
"Žádná chyba pokud existuje, vytvořit nadřazené adresáře, jak je potřeba."
455
#: bzrlib/builtins.py:884
455
#: bzrlib/builtins.py:897
457
457
msgid "added %s\n"
458
458
msgstr "přidáno %s\n"
460
#: bzrlib/builtins.py:926
460
#: bzrlib/builtins.py:939
462
462
msgid "invalid kind %r specified"
463
463
msgstr "zadán neplatný druh %r"
465
#: bzrlib/builtins.py:963
465
#: bzrlib/builtins.py:976
466
466
msgid "Move or rename a file."
467
467
msgstr "Přesunout nebo přejmnovat soubor."
469
#: bzrlib/builtins.py:965
469
#: bzrlib/builtins.py:978
470
470
msgid " bzr mv SOURCE... DESTINATION"
471
471
msgstr " bzr mv ZDROJ... CÍL"
473
#: bzrlib/builtins.py:967
473
#: bzrlib/builtins.py:980
475
475
"If the last argument is a versioned directory, all the other names\n"
476
476
"are moved into it. Otherwise, there must be exactly two arguments\n"
493
493
"přesunut a pouze aktualizuje svůj vnitřní inventář, aby tuto změnu odrážel.\n"
494
494
"To stejné platí při přesunu mnoha ZDROJOVÝCH souborů do CÍLE."
496
#: bzrlib/builtins.py:977
496
#: bzrlib/builtins.py:990
497
497
msgid "Files cannot be moved between branches."
498
498
msgstr "Soubory nemohou být přesouvány mezi větvemi."
500
#: bzrlib/builtins.py:984
500
#: bzrlib/builtins.py:997
502
502
"Move only the bzr identifier of the file, because the file has already been "
505
505
"Přesunout pouze bzr identifikátor souboru, protože soubor již byl přesunut."
507
#: bzrlib/builtins.py:986
507
#: bzrlib/builtins.py:999
508
508
msgid "Automatically guess renames."
509
509
msgstr "Automaticky hádat přejmenování."
511
#: bzrlib/builtins.py:987
511
#: bzrlib/builtins.py:1000
512
512
msgid "Avoid making changes when guessing renames."
513
513
msgstr "Vyhnout se provádění změn při hádání přejmenování."
515
#: bzrlib/builtins.py:996
515
#: bzrlib/builtins.py:1009
516
516
msgid "--dry-run requires --auto."
517
517
msgstr "--dry-run vyžaduje --auto."
519
#: bzrlib/builtins.py:1000
519
#: bzrlib/builtins.py:1013
520
520
msgid "missing file argument"
521
521
msgstr "chybí souborový argument"
523
#: bzrlib/builtins.py:1004
523
#: bzrlib/builtins.py:1017
524
524
msgid "can not move root of branch"
525
525
msgstr "nelze přesunout kořen větve"
527
#: bzrlib/builtins.py:1010
527
#: bzrlib/builtins.py:1023
528
528
msgid "Only one path may be specified to --auto."
529
529
msgstr "Pro --auto může být zadána pouze jedna cesta."
531
#: bzrlib/builtins.py:1013
531
#: bzrlib/builtins.py:1026
532
532
msgid "--after cannot be specified with --auto."
533
533
msgstr "--after nemůže být určeno pomocí --auto."
535
#: bzrlib/builtins.py:1050
535
#: bzrlib/builtins.py:1062
536
536
msgid "to mv multiple files the destination must be a versioned directory"
537
537
msgstr "pro přesun mnoha souborů musí být cíl adresář s verzí"
539
#: bzrlib/builtins.py:1102
539
#: bzrlib/builtins.py:1114
540
540
msgid "Turn this branch into a mirror of another branch."
541
541
msgstr "Přeměnit tuto větvi do odrazu jiné větve"
543
#: bzrlib/builtins.py:1104
543
#: bzrlib/builtins.py:1116
545
545
"By default, this command only works on branches that have not diverged.\n"
546
546
"Branches are considered diverged if the destination branch's most recent \n"
833
833
"Standardně větev selže, pokud cílový adresář existuje, ale neobsahuje "
834
834
"kontrolní adresář. Tento příznak dovolí větvi pokračovat."
836
#: bzrlib/builtins.py:1403
836
#: bzrlib/builtins.py:1417
837
837
msgid "Bind new branch to from location."
838
838
msgstr "Svázat novou větev s umístění z."
840
#: bzrlib/builtins.py:1450
840
#: bzrlib/builtins.py:1464
842
842
msgid "Target directory \"%s\" already exists."
843
843
msgstr "Cílový adresář \"%s\" již existuje."
845
#: bzrlib/builtins.py:1462
845
#: bzrlib/builtins.py:1476
847
847
msgid "Parent of \"%s\" does not exist."
848
848
msgstr "Nadřazený \"%s\" neexistuje."
850
#: bzrlib/builtins.py:1481
850
#: bzrlib/builtins.py:1495
851
851
msgid "The branch {0} has no revision {1}."
852
852
msgstr "Větev {0} nemá revizi {1}"
854
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
854
#: bzrlib/builtins.py:1510 bzrlib/push.py:53
856
856
msgid "Created new stacked branch referring to %s."
857
857
msgstr "Vytvořena nová skládaná větev odkazující na %s"
859
#: bzrlib/builtins.py:1500
859
#: bzrlib/builtins.py:1514
861
861
msgid "Branched %d revision."
862
862
msgid_plural "Branched %d revisions."
1161
1161
"které jsou jím sledovány , ale ve Vašem stromě chybí a přestane je\n"
1162
1162
"pro Vás sledovat."
1164
#: bzrlib/builtins.py:1838
1164
#: bzrlib/builtins.py:1849
1165
1165
msgid "Only remove files that have never been committed."
1166
1166
msgstr "Odstranit pouze soubory, které nikdy nebyly odevzdány."
1168
#: bzrlib/builtins.py:1840
1168
#: bzrlib/builtins.py:1851
1169
1169
msgid "The file deletion mode to be used."
1170
1170
msgstr "Režim smazání souborů, který bude použit."
1172
#: bzrlib/builtins.py:1841
1172
#: bzrlib/builtins.py:1852
1173
1173
msgid "Deletion Strategy"
1174
1174
msgstr "Strategie smazání"
1176
#: bzrlib/builtins.py:1842
1176
#: bzrlib/builtins.py:1853
1177
1177
msgid "Backup changed files (default)."
1178
1178
msgstr "Zálohovat změněné soubory (výchozí)."
1180
#: bzrlib/builtins.py:1843
1180
#: bzrlib/builtins.py:1854
1181
1181
msgid "Delete from bzr but leave the working copy."
1182
1182
msgstr "Smazat z bzr ale ponechat pracovní kopii."
1184
#: bzrlib/builtins.py:1844
1184
#: bzrlib/builtins.py:1855
1185
1185
msgid "Don't backup changed files."
1186
1186
msgstr "Nezálohovat změněné soubory."
1188
#: bzrlib/builtins.py:1845
1188
#: bzrlib/builtins.py:1856
1190
1190
"Delete all the specified files, even if they can not be recovered and even "
1191
1191
"if they are non-empty directories. (deprecated, use no-backup)"
1296
1296
"pokud již v umístění existuje větev, ale nemá žádný pracovní strom,\n"
1297
1297
"je strom vyplněn pomocí 'bzr checkout'."
1299
#: bzrlib/builtins.py:2028
1299
#: bzrlib/builtins.py:2039
1300
1300
msgid "Recipe for importing a tree of files::"
1301
1301
msgstr "Postup pro import sromu souborů::"
1303
#: bzrlib/builtins.py:2030
1309
" bzr commit -m \"imported project\""
1315
" bzr commit -m \"imported project\""
1317
1303
#: bzrlib/builtins.py:2041
1309
" bzr commit -m \"imported project\""
1315
" bzr commit -m \"imported project\""
1317
#: bzrlib/builtins.py:2052
1319
1319
"Create the path leading up to the branch if it does not already exist."
1320
1320
msgstr "Vytvoří cestu vedoucí k větvi, pokud již neexistuje."
1322
#: bzrlib/builtins.py:2044
1322
#: bzrlib/builtins.py:2055
1323
1323
msgid "Specify a format for this branch. See \"help formats\"."
1324
1324
msgstr "Určí formát pro tuto větev. Viz \"help formats\"."
1326
#: bzrlib/builtins.py:2052
1326
#: bzrlib/builtins.py:2063
1328
1328
"Never change revnos or the existing log. Append revisions to it only."
1330
1330
"Nikdy neměnit čísla revizí nebo existující záznam. Pouze ho připojit k "
1333
#: bzrlib/builtins.py:2055
1333
#: bzrlib/builtins.py:2066
1334
1334
msgid "Create a branch without a working tree."
1335
1335
msgstr "Vytvořit větev bz pracovního stromu."
1337
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1337
#: bzrlib/builtins.py:2086 bzrlib/push.py:110
1338
1338
#, python-format
1340
1340
"Parent directory of %s does not exist.\n"
1504
1504
" Zobrazí rozdíl mezi pracovním stromem a posledním odevzdáním::"
1506
#: bzrlib/builtins.py:2223
1506
#: bzrlib/builtins.py:2234
1507
1507
msgid " bzr diff"
1508
1508
msgstr " bzr diff"
1510
#: bzrlib/builtins.py:2225
1510
#: bzrlib/builtins.py:2236
1511
1511
msgid " Difference between the working tree and revision 1::"
1512
1512
msgstr " Rozdíl mezi pracovním stromem a revizí 1::"
1514
#: bzrlib/builtins.py:2227
1514
#: bzrlib/builtins.py:2238
1515
1515
msgid " bzr diff -r1"
1516
1516
msgstr " bzr diff -r1"
1518
#: bzrlib/builtins.py:2229
1518
#: bzrlib/builtins.py:2240
1519
1519
msgid " Difference between revision 3 and revision 1::"
1520
1520
msgstr " Rozdíl mezi revizí 3 a revizí 1::"
1522
#: bzrlib/builtins.py:2231
1522
#: bzrlib/builtins.py:2242
1523
1523
msgid " bzr diff -r1..3"
1524
1524
msgstr " bzr diff -r1..3"
1526
#: bzrlib/builtins.py:2233
1526
#: bzrlib/builtins.py:2244
1527
1527
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1528
1528
msgstr " Rozdíl mezi revizí 3 a revizí 1 ve větvi xxx::"
1530
#: bzrlib/builtins.py:2235
1530
#: bzrlib/builtins.py:2246
1531
1531
msgid " bzr diff -r1..3 xxx"
1532
1532
msgstr " bzr diff -r1..3 xxx"
1534
#: bzrlib/builtins.py:2237
1534
#: bzrlib/builtins.py:2248
1535
1535
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1536
1536
msgstr " Změny obsažené v revizi 2 (stejné jako -r1..2)::"
1538
#: bzrlib/builtins.py:2239
1538
#: bzrlib/builtins.py:2250
1539
1539
msgid " bzr diff -c2"
1540
1540
msgstr " bzr diff -c2"
1542
#: bzrlib/builtins.py:2241
1542
#: bzrlib/builtins.py:2252
1544
1544
" To see the changes introduced by revision X::\n"
1571
1571
" Změny mezi současnou a předchozí revizí\n"
1572
1572
" (stejné jako -c-1 a -r-2..-1)"
1574
#: bzrlib/builtins.py:2254
1574
#: bzrlib/builtins.py:2265
1575
1575
msgid " bzr diff -r-2.."
1576
1576
msgstr " bzr diff -r-2.."
1578
#: bzrlib/builtins.py:2256
1578
#: bzrlib/builtins.py:2267
1579
1579
msgid " Show just the differences for file NEWS::"
1580
1580
msgstr " Zobrazit rozdíly pouze pro soubor NEWS::"
1582
#: bzrlib/builtins.py:2258
1582
#: bzrlib/builtins.py:2269
1583
1583
msgid " bzr diff NEWS"
1584
1584
msgstr " bzr diff NEWS"
1586
#: bzrlib/builtins.py:2260
1586
#: bzrlib/builtins.py:2271
1587
1587
msgid " Show the differences in working tree xxx for file NEWS::"
1588
1588
msgstr " Zobrazit rozdíly pro soubor NEWS v pracovním stromu xxx::"
1590
#: bzrlib/builtins.py:2262
1590
#: bzrlib/builtins.py:2273
1591
1591
msgid " bzr diff xxx/NEWS"
1592
1592
msgstr " bzr diff xxx/NEWS"
1594
#: bzrlib/builtins.py:2264
1594
#: bzrlib/builtins.py:2275
1595
1595
msgid " Show the differences from branch xxx to this working tree:"
1596
1596
msgstr " Zobrazit rozdíly od větve xxx po tento pracovní strom:"
1598
#: bzrlib/builtins.py:2266
1598
#: bzrlib/builtins.py:2277
1599
1599
msgid " bzr diff --old xxx"
1600
1600
msgstr " bzr diff --old xxx"
1602
#: bzrlib/builtins.py:2268
1602
#: bzrlib/builtins.py:2279
1603
1603
msgid " Show the differences between two branches for file NEWS::"
1604
1604
msgstr " Zobrazit rozdíly pro soubor NEWS mezi dvěma větvemi::"
1606
#: bzrlib/builtins.py:2270
1606
#: bzrlib/builtins.py:2281
1607
1607
msgid " bzr diff --old xxx --new yyy NEWS"
1608
1608
msgstr " bzr diff --old xxx --new yyy NEWS"
1610
#: bzrlib/builtins.py:2272
1610
#: bzrlib/builtins.py:2283
1611
1611
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1612
1612
msgstr " Stejné jako 'bzr diff' jen cesty dostanou předponu old/ a new/::"
1614
#: bzrlib/builtins.py:2274
1614
#: bzrlib/builtins.py:2285
1616
1616
" bzr diff --prefix old/:new/\n"
1637
1637
"Nastaví předpony přidané ke starým a novým názvům souborů jako dvě hodnoty "
1638
1638
"oddělené dvojtečkou. (např. \"old/:new/\")."
1640
#: bzrlib/builtins.py:2290
1640
#: bzrlib/builtins.py:2301
1641
1641
msgid "Branch/tree to compare from."
1642
1642
msgstr "Větev/strom z kterého porovnávat."
1644
#: bzrlib/builtins.py:2294
1644
#: bzrlib/builtins.py:2305
1645
1645
msgid "Branch/tree to compare to."
1646
1646
msgstr "Větev/strom s kterým porovnávat."
1648
#: bzrlib/builtins.py:2300
1648
#: bzrlib/builtins.py:2311
1649
1649
msgid "Use this command to compare files."
1650
1650
msgstr "Tento příkaz použijte pro porovnání souborů."
1652
#: bzrlib/builtins.py:2305
1652
#: bzrlib/builtins.py:2316
1653
1653
msgid "Diff format to use."
1654
1654
msgstr "Formát rozdílů k použití."
1656
#: bzrlib/builtins.py:2307
1656
#: bzrlib/builtins.py:2318
1657
1657
msgid "Diff format"
1658
1658
msgstr "Formát rozdílů"
1660
#: bzrlib/builtins.py:2329
1660
#: bzrlib/builtins.py:2340
1661
1661
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1663
1663
"--prefix očekává dvě hodnoty oddělené dvojtečkou (např \"old/:new/\")"
1665
#: bzrlib/builtins.py:2333
1665
#: bzrlib/builtins.py:2344
1666
1666
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1667
1667
msgstr "bzr diff --revision vyžaduje jeden nebo dva specifikátory revize"
1669
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1670
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1669
#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759
1670
#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933
1671
1671
msgid "{0} and {1} are mutually exclusive"
1672
1672
msgstr "{0} a {1} jsou vzájemně se vylučující"
1674
#: bzrlib/builtins.py:2358
1674
#: bzrlib/builtins.py:2369
1676
1676
"List files deleted in the working tree.\n"
2070
2070
" zásuvného modulu historycache. Tento modul ukládá historické\n"
2071
2071
" informace do mezipaměti čímž vyměňuje místo na disku za rychlost."
2073
#: bzrlib/builtins.py:2624
2073
#: bzrlib/builtins.py:2634
2074
2074
msgid "Show from oldest to newest."
2075
2075
msgstr "Zobrazit od nejstarších po nejnovější."
2077
#: bzrlib/builtins.py:2627
2077
#: bzrlib/builtins.py:2637
2078
2078
msgid "Show files changed in each revision."
2079
2079
msgstr "Zobrazit změněné soubory v každé revizi."
2081
#: bzrlib/builtins.py:2633
2081
#: bzrlib/builtins.py:2643
2082
2082
msgid "Show just the specified revision. See also \"help revisionspec\"."
2083
2083
msgstr "Zobrazit pouze zadané revize. Viz také \"help revisionspec\"."
2085
#: bzrlib/builtins.py:2637
2085
#: bzrlib/builtins.py:2647
2086
2086
msgid "What names to list as authors - first, all or committer."
2087
2087
msgstr "Které jména uvést jako autory - první, všechny nebo odevzdávajícího."
2089
#: bzrlib/builtins.py:2638
2089
#: bzrlib/builtins.py:2648
2090
2090
msgid "Authors"
2091
2091
msgstr "Autoři"
2093
#: bzrlib/builtins.py:2643
2093
#: bzrlib/builtins.py:2653
2094
2094
msgid "Number of levels to display - 0 for all, 1 for flat."
2095
2095
msgstr "Počet úrovní k zobrazení - 0 všechny, 1 ploché."
2097
#: bzrlib/builtins.py:2653
2097
#: bzrlib/builtins.py:2663
2098
2098
msgid "Limit the output to the first N revisions."
2099
2099
msgstr "Omezit výstup na prvních N revizí."
2101
#: bzrlib/builtins.py:2658
2101
#: bzrlib/builtins.py:2668
2102
2102
msgid "Show changes made in each revision as a patch."
2103
2103
msgstr "Zobrazit změny provedené v každé revizi jako záplatu."
2105
#: bzrlib/builtins.py:2660
2105
#: bzrlib/builtins.py:2670
2106
2106
msgid "Show merged revisions like --levels 0 does."
2107
2107
msgstr "Zobrazit sloučené revize tak jako --levels 0."
2109
#: bzrlib/builtins.py:2664
2109
#: bzrlib/builtins.py:2674
2110
2110
msgid "Do not report commits with more than one parent."
2111
2111
msgstr "Neoznamovat odevzdání s více než jedním nadřazeným."
2113
#: bzrlib/builtins.py:2666
2113
#: bzrlib/builtins.py:2676
2115
2115
"Display only the revisions that are not part of both ancestries (require -"
2118
2118
"Zobrazit pouze revize, které nejsou součástí obou rodových původů (vyžaduje -"
2121
#: bzrlib/builtins.py:2670
2121
#: bzrlib/builtins.py:2680
2122
2122
msgid "Show digital signature validity."
2123
2123
msgstr "Zobrazit platnost digitálního podpisu."
2125
#: bzrlib/builtins.py:2673
2125
#: bzrlib/builtins.py:2683
2126
2126
msgid "Show revisions whose properties match this expression."
2127
2127
msgstr "Zobrazit revize jejichž vlastnosti odpovídají tomuto výrazu."
2129
#: bzrlib/builtins.py:2677
2129
#: bzrlib/builtins.py:2687
2130
2130
msgid "Show revisions whose message matches this expression."
2131
2131
msgstr "Zobrazit revize jejichž zpráva odpovídá tomuto výrazu."
2133
#: bzrlib/builtins.py:2681
2133
#: bzrlib/builtins.py:2691
2134
2134
msgid "Show revisions whose committer matches this expression."
2135
2135
msgstr "Zobrazit revize jejichž odevzdávající odpovídá tomuto výrazu."
2137
#: bzrlib/builtins.py:2685
2137
#: bzrlib/builtins.py:2695
2138
2138
msgid "Show revisions whose authors match this expression."
2139
2139
msgstr "Zobrazit revize jejichž autoři odpovídaji tomuto výrazu."
2141
#: bzrlib/builtins.py:2689
2141
#: bzrlib/builtins.py:2699
2142
2142
msgid "Show revisions whose bugs match this expression."
2143
2143
msgstr "Zobrazit revize jejichž chyby odpovídají tomuto výrazu."
2145
#: bzrlib/builtins.py:2743
2145
#: bzrlib/builtins.py:2753
2146
2146
msgid "--exclude-common-ancestry requires -r with two revisions"
2147
2147
msgstr "--exclude-common-ancestry vyžaduje -r s fvěma revizemi"
2149
#: bzrlib/builtins.py:2771
2149
#: bzrlib/builtins.py:2781
2150
2150
#, python-format
2151
2151
msgid "Path unknown at end or start of revision range: %s"
2152
2152
msgstr "Na konci nebo začítku rozsahu revizí je neznámá cesta: %s"
2154
#: bzrlib/builtins.py:2888
2154
#: bzrlib/builtins.py:2898
2155
2155
#, python-format
2156
2156
msgid "bzr %s doesn't accept two revisions in different branches."
2157
2157
msgstr "bzr %s nepřijímá dvě rvize v různých větvích."
2159
#: bzrlib/builtins.py:2904
2159
#: bzrlib/builtins.py:2914
2160
2160
#, python-format
2161
2161
msgid "bzr %s --revision takes one or two values."
2162
2162
msgstr "bzr %s --revision očekává jednu nebo dvě hodnoty."
2164
#: bzrlib/builtins.py:2949
2164
#: bzrlib/builtins.py:2959
2166
2166
"List files in a tree.\n"
2169
2169
"Zobrazit soubory ve stormu.\n"
2172
#: bzrlib/builtins.py:2958
2172
#: bzrlib/builtins.py:2968
2173
2173
msgid "Recurse into subdirectories."
2174
2174
msgstr "Rekurzivně do podadresářů."
2176
#: bzrlib/builtins.py:2960
2176
#: bzrlib/builtins.py:2970
2177
2177
msgid "Print paths relative to the root of the branch."
2178
2178
msgstr "Vypsat cesty související s kořenem větve."
2180
#: bzrlib/builtins.py:2962
2180
#: bzrlib/builtins.py:2972
2181
2181
msgid "Print unknown files."
2182
2182
msgstr "Vypsat neznámé soubory."
2184
#: bzrlib/builtins.py:2963
2184
#: bzrlib/builtins.py:2973
2185
2185
msgid "Print versioned files."
2186
2186
msgstr "Vypsat soubory s verzí."
2188
#: bzrlib/builtins.py:2966
2188
#: bzrlib/builtins.py:2976
2189
2189
msgid "Print ignored files."
2190
2190
msgstr "Vypsat ignorované soubory."
2192
#: bzrlib/builtins.py:2968
2192
#: bzrlib/builtins.py:2978
2193
2193
msgid "List entries of a particular kind: file, directory, symlink."
2194
2194
msgstr "Vypsat záznamy určitého druhu: soubor, adresář, symbolický odkaz."
2196
#: bzrlib/builtins.py:2981
2196
#: bzrlib/builtins.py:2991
2197
2197
msgid "invalid kind specified"
2198
2198
msgstr "Zadán neplatný druh"
2200
#: bzrlib/builtins.py:2984
2200
#: bzrlib/builtins.py:2994
2201
2201
msgid "Cannot set both --verbose and --null"
2202
2202
msgstr "Nelze nastavit --verbose a --null najednou"
2204
#: bzrlib/builtins.py:2993
2204
#: bzrlib/builtins.py:3003
2205
2205
msgid "cannot specify both --from-root and PATH"
2206
2206
msgstr "Nelze zadat --from-root a PATH najednou"
2208
#: bzrlib/builtins.py:3080
2208
#: bzrlib/builtins.py:3090
2209
2209
msgid "Ignore specified files or patterns."
2210
2210
msgstr "Ignorovat zadané soubory nebo vzory."
2212
#: bzrlib/builtins.py:3082
2212
#: bzrlib/builtins.py:3092
2213
2213
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2214
2214
msgstr "Viz ``bzr help patterns`` pro podrobnosti o syntaxi vzorů."
2216
#: bzrlib/builtins.py:3084
2216
#: bzrlib/builtins.py:3094
2218
2218
"If a .bzrignore file does not exist, the ignore command\n"
2219
2219
"will create one and add the specified files or patterns to the newly\n"
2304
2304
" Ignorování souboru Makefile v nejvyšší úrovni::"
2306
#: bzrlib/builtins.py:3119
2306
#: bzrlib/builtins.py:3129
2307
2307
msgid " bzr ignore ./Makefile"
2308
2308
msgstr " bzr ignore ./Makefile"
2310
#: bzrlib/builtins.py:3121
2310
#: bzrlib/builtins.py:3131
2311
2311
msgid " Ignore .class files in all directories...::"
2312
2312
msgstr " Ignorovat soubory .class ve všech adresářích...::"
2314
#: bzrlib/builtins.py:3123
2314
#: bzrlib/builtins.py:3133
2315
2315
msgid " bzr ignore \"*.class\""
2316
2316
msgstr " bzr ignore \"*.class\""
2318
#: bzrlib/builtins.py:3125
2318
#: bzrlib/builtins.py:3135
2319
2319
msgid " ...but do not ignore \"special.class\"::"
2320
2320
msgstr " ...ale neignorovat \"special.class\"::"
2322
#: bzrlib/builtins.py:3127
2322
#: bzrlib/builtins.py:3137
2323
2323
msgid " bzr ignore \"!special.class\""
2324
2324
msgstr " bzr ignore \"!special.class\""
2326
#: bzrlib/builtins.py:3129
2326
#: bzrlib/builtins.py:3139
2327
2327
msgid " Ignore files whose name begins with the \"#\" character::"
2328
2328
msgstr " ignorovat soubory, jejichž název začíná znakem \"#\"::"
2330
#: bzrlib/builtins.py:3131
2330
#: bzrlib/builtins.py:3141
2331
2331
msgid " bzr ignore \"RE:^#\""
2332
2332
msgstr " bzr ignore \"RE:^#\""
2334
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2334
#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147
2335
2335
msgid " Ignore .o files under the lib directory::"
2336
2336
msgstr " Ignorovat soubory .o v adresáři lib::"
2338
#: bzrlib/builtins.py:3135
2338
#: bzrlib/builtins.py:3145
2339
2339
msgid " bzr ignore \"lib/**/*.o\""
2340
2340
msgstr " bzr ignore \"lib/**/*.o\""
2342
#: bzrlib/builtins.py:3139
2342
#: bzrlib/builtins.py:3149
2343
2343
msgid " bzr ignore \"RE:lib/.*\\.o\""
2344
2344
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2346
#: bzrlib/builtins.py:3141
2346
#: bzrlib/builtins.py:3151
2347
2347
msgid " Ignore everything but the \"debian\" toplevel directory::"
2348
2348
msgstr " Ignorovat vše, kromě adresáře \"debian\" v nejvyšší úrovni::"
2350
#: bzrlib/builtins.py:3143
2350
#: bzrlib/builtins.py:3153
2352
2352
" bzr ignore \"RE:(?!debian/).*\"\n"
2415
2415
"Vypsat všechny ignorované soubory a vzor ignorování, který způsobil, že\n"
2416
2416
"soubor je ignorován."
2418
#: bzrlib/builtins.py:3214
2418
#: bzrlib/builtins.py:3224
2419
2419
msgid "Alternatively, to list just the files::"
2420
2420
msgstr "Alternativně, pro pouhý výpis souborů::"
2422
#: bzrlib/builtins.py:3216
2422
#: bzrlib/builtins.py:3226
2423
2423
msgid " bzr ls --ignored"
2424
2424
msgstr " bzr ls --ignored"
2426
#: bzrlib/builtins.py:3250
2426
#: bzrlib/builtins.py:3260
2427
2427
#, python-format
2428
2428
msgid "not a valid revision-number: %r"
2429
2429
msgstr "není platné číslo revize: %r"
2431
#: bzrlib/builtins.py:3257
2431
#: bzrlib/builtins.py:3267
2433
2433
"Export current or past revision to a destination directory or archive."
2435
2435
"Exportovat současnou nebo minulou revizi do cílového adresáře nebo archivu."
2437
#: bzrlib/builtins.py:3259
2437
#: bzrlib/builtins.py:3269
2438
2438
msgid "If no revision is specified this exports the last committed revision."
2439
2439
msgstr "Pokud není zadána revize, toto exportuje poslední odevzdanou revizi."
2441
#: bzrlib/builtins.py:3261
2441
#: bzrlib/builtins.py:3271
2443
2443
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2444
2444
"given, try to find the format with the extension. If no extension\n"
2496
2496
" ================= ============================"
2498
#: bzrlib/builtins.py:3288
2498
#: bzrlib/builtins.py:3298
2499
2499
msgid "Type of file to export to."
2500
2500
msgstr "T yp souboru do kterého exportovat."
2502
#: bzrlib/builtins.py:3291
2502
#: bzrlib/builtins.py:3301
2503
2503
msgid "Apply content filters to export the convenient form."
2504
2504
msgstr "Použít filtry obsahu pro export do vhodné formy."
2506
#: bzrlib/builtins.py:3295
2506
#: bzrlib/builtins.py:3305
2507
2507
msgid "Name of the root directory inside the exported file."
2508
2508
msgstr "Název kořenového adresáře uvnitř exportovaného souboru."
2510
#: bzrlib/builtins.py:3297
2510
#: bzrlib/builtins.py:3307
2512
2512
"Set modification time of files to that of the last revision in which it was "
2515
2515
"Nastavit čas změny souborů na ten od poslední revize, v které byly změněny."
2517
#: bzrlib/builtins.py:3300
2517
#: bzrlib/builtins.py:3310
2519
2519
"Export the working tree contents rather than that of the last revision."
2521
2521
"Exportovat obsahy pracovního stromu spíše, než obsah poslední revize."
2523
#: bzrlib/builtins.py:3319
2523
#: bzrlib/builtins.py:3329
2524
2524
msgid "--uncommitted requires a working tree"
2525
2525
msgstr "--uncomitted vyžaduje pracovní strom"
2527
#: bzrlib/builtins.py:3328
2527
#: bzrlib/builtins.py:3338
2528
2528
#, python-format
2529
2529
msgid "Unsupported export format: %s"
2530
2530
msgstr "Nepodporovaný formát exportu: %s"
2532
#: bzrlib/builtins.py:3332
2532
#: bzrlib/builtins.py:3342
2534
2534
"Write the contents of a file as of a given revision to standard output."
2535
2535
msgstr "Vypsat obsahy souboru od dané revize na standadrdní výstup."
2537
#: bzrlib/builtins.py:3334
2537
#: bzrlib/builtins.py:3344
2538
2538
msgid "If no revision is nominated, the last revision is used."
2539
2539
msgstr "Pokud není zadána žádná revize, je použita poslední."
2541
#: bzrlib/builtins.py:3336
2541
#: bzrlib/builtins.py:3346
2543
2543
"Note: Take care to redirect standard output when using this command on a\n"
2546
2546
"Poznámka: Ujistěte se, že standardní výstup přesměrujete při použití tohoto\n"
2547
2547
"příkazu na binární soubor."
2549
#: bzrlib/builtins.py:3342
2549
#: bzrlib/builtins.py:3352
2550
2550
msgid "The path name in the old tree."
2551
2551
msgstr "Název cesty v starém stromu."
2553
#: bzrlib/builtins.py:3343
2553
#: bzrlib/builtins.py:3353
2554
2554
msgid "Apply content filters to display the convenience form."
2555
2555
msgstr "Použít filtry obsahu k zobrazení vhodné formy."
2557
#: bzrlib/builtins.py:3354
2557
#: bzrlib/builtins.py:3364
2558
2558
msgid "bzr cat --revision takes exactly one revision specifier"
2559
2559
msgstr "bzr cat --revision přebírá právě jeden specifikátor revize."
2561
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2561
#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401
2562
2562
msgid "{0!r} is not present in revision {1}"
2563
2563
msgstr "{0!r} není přítomno v revizi {1}"
2565
#: bzrlib/builtins.py:3414
2565
#: bzrlib/builtins.py:3424
2566
2566
msgid "Commit changes into a new revision."
2567
2567
msgstr "Odevzdat změny do nové revize."
2569
#: bzrlib/builtins.py:3416
2569
#: bzrlib/builtins.py:3426
2571
2571
"An explanatory message needs to be given for each commit. This is\n"
2572
2572
"often done by using the --message option (getting the message from the\n"
2925
2925
"Pokud nejsou zadána žádná omezení, všechna data Bazaar, která jsou nalezena\n"
2926
2926
"v zadaném umístění, boudou zkontrolována."
2928
#: bzrlib/builtins.py:3717
2928
#: bzrlib/builtins.py:3727
2929
2929
msgid " Check the tree and branch at 'foo'::"
2930
2930
msgstr " Zkontrolovat strom a větev v 'foo'::"
2932
#: bzrlib/builtins.py:3719
2932
#: bzrlib/builtins.py:3729
2933
2933
msgid " bzr check --tree --branch foo"
2934
2934
msgstr " bzr check --tree --branch foo"
2936
#: bzrlib/builtins.py:3721
2936
#: bzrlib/builtins.py:3731
2937
2937
msgid " Check only the repository at 'bar'::"
2938
2938
msgstr " Zkontrolovat pouze úložiště v 'bar'::"
2940
#: bzrlib/builtins.py:3723
2940
#: bzrlib/builtins.py:3733
2941
2941
msgid " bzr check --repo bar"
2942
2942
msgstr " bzr check --repo bar"
2944
#: bzrlib/builtins.py:3725
2944
#: bzrlib/builtins.py:3735
2945
2945
msgid " Check everything at 'baz'::"
2946
2946
msgstr " Zkontrolovat vše v 'baz'::"
2948
#: bzrlib/builtins.py:3727
2948
#: bzrlib/builtins.py:3737
2949
2949
msgid " bzr check baz"
2950
2950
msgstr " bzr check baz"
2952
#: bzrlib/builtins.py:3733
2952
#: bzrlib/builtins.py:3743
2953
2953
msgid "Check the branch related to the current directory."
2954
2954
msgstr "Zkontrolovat větev vzhledem k současnému adresáři."
2956
#: bzrlib/builtins.py:3735
2956
#: bzrlib/builtins.py:3745
2957
2957
msgid "Check the repository related to the current directory."
2958
2958
msgstr "Zkontrolovat úložiště vzhledem k současnému adresáři."
2960
#: bzrlib/builtins.py:3737
2960
#: bzrlib/builtins.py:3747
2961
2961
msgid "Check the working tree related to the current directory."
2962
2962
msgstr "Zkontrolovat pracovní strom vzhledem k současnému adresáři."
2964
#: bzrlib/builtins.py:3751
2964
#: bzrlib/builtins.py:3761
2965
2965
msgid "Upgrade a repository, branch or working tree to a newer format."
2966
2966
msgstr "Vylepšit úložiště, větev nebo pracovní strom do nového formátu."
2968
#: bzrlib/builtins.py:3753
2968
#: bzrlib/builtins.py:3763
2970
2970
"When the default format has changed after a major new release of\n"
2971
2971
"Bazaar, you may be informed during certain operations that you\n"
3061
3061
" Zobrazit email současného uživatele::"
3063
#: bzrlib/builtins.py:3815
3063
#: bzrlib/builtins.py:3825
3064
3064
msgid " bzr whoami --email"
3065
3065
msgstr " bzr whoami --email"
3067
#: bzrlib/builtins.py:3817
3067
#: bzrlib/builtins.py:3827
3068
3068
msgid " Set the current user::"
3069
3069
msgstr " Nastavit současného uživatele::"
3071
#: bzrlib/builtins.py:3819
3071
#: bzrlib/builtins.py:3829
3072
3072
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3073
3073
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
3075
#: bzrlib/builtins.py:3823
3075
#: bzrlib/builtins.py:3833
3076
3076
msgid "Display email address only."
3077
3077
msgstr "Zobrazit pouze emailovou adresu."
3079
#: bzrlib/builtins.py:3825
3079
#: bzrlib/builtins.py:3835
3080
3080
msgid "Set identity for the current branch instead of globally."
3081
3081
msgstr "Nastavit identitu pro současnou větev místo globálně."
3083
#: bzrlib/builtins.py:3851
3083
#: bzrlib/builtins.py:3861
3084
3084
msgid "--email can only be used to display existing identity"
3085
3085
msgstr "--email může být použit pouze pro zobrazení existující identity."
3087
#: bzrlib/builtins.py:3873
3087
#: bzrlib/builtins.py:3885
3088
3088
msgid "Print or set the branch nickname."
3089
3089
msgstr "Vypsat nebo nastavit přezdívku větve."
3091
#: bzrlib/builtins.py:3875
3091
#: bzrlib/builtins.py:3887
3093
"If unset, the tree root directory name is used as the nickname.\n"
3094
"To print the current nickname, execute with no argument."
3093
"If unset, the colocated branch name is used for colocated branches, and\n"
3094
"the branch directory name is used for other branches. To print the\n"
3095
"current nickname, execute with no argument."
3096
"Pokud je nastavení zrušeno, je název kořenového adresáře použit\n"
3097
"jako přezdívka. Pro výpis současné přezdívky, spusťte bez\n"
3097
"Pokud je nastavení zrušeno, název souběžné větve je použit pro souběžné \n"
3098
"větve a název adresáře větve je použit pro jiné větve. Pro vypsání současné\n"
3099
"přezdívky, spusťte bez argumentu."
3100
#: bzrlib/builtins.py:3878
3101
#: bzrlib/builtins.py:3891
3102
3103
"Bound branches use the nickname of its master branch unless it is set\n"
3118
3119
" Zobrazit současné zkratky::"
3120
#: bzrlib/builtins.py:3903
3121
#: bzrlib/builtins.py:3916
3121
3122
msgid " bzr alias"
3122
3123
msgstr " bzr alias"
3124
#: bzrlib/builtins.py:3905
3125
#: bzrlib/builtins.py:3918
3125
3126
msgid " Show the alias specified for 'll'::"
3126
3127
msgstr " Zobrazit určenou zkratku pro 'll'::"
3128
#: bzrlib/builtins.py:3907
3129
#: bzrlib/builtins.py:3920
3129
3130
msgid " bzr alias ll"
3130
3131
msgstr " bzr alias ll"
3132
#: bzrlib/builtins.py:3909
3133
#: bzrlib/builtins.py:3922
3133
3134
msgid " Set an alias for 'll'::"
3134
3135
msgstr " Nastavit zkratku pro 'll'::"
3136
#: bzrlib/builtins.py:3911
3137
#: bzrlib/builtins.py:3924
3137
3138
msgid " bzr alias ll=\"log --line -r-10..-1\""
3138
3139
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3140
#: bzrlib/builtins.py:3913
3141
#: bzrlib/builtins.py:3926
3141
3142
msgid " To remove an alias for 'll'::"
3142
3143
msgstr " Pro odstranění zkratky pro 'll'::"
3144
#: bzrlib/builtins.py:3915
3145
#: bzrlib/builtins.py:3928
3145
3146
msgid " bzr alias --remove ll"
3146
3147
msgstr " bzr alias --remove ll"
3148
#: bzrlib/builtins.py:3920
3149
#: bzrlib/builtins.py:3933
3149
3150
msgid "Remove the alias."
3150
3151
msgstr "Odstranit zkratku."
3152
#: bzrlib/builtins.py:3938
3153
#: bzrlib/builtins.py:3951
3153
3154
msgid "bzr alias --remove expects an alias to remove."
3154
3155
msgstr "bzr alias --remove očekává zkratku k odstranění."
3156
#: bzrlib/builtins.py:4119
3157
#: bzrlib/builtins.py:4132
3158
3159
"subunit not available. subunit needs to be installed to use --subunit."
3160
3161
"podjednotka není dostupná. Pro použití --subunit je třeba podjednotku "
3161
3162
"nainstalovat."
3163
#: bzrlib/builtins.py:4136
3164
#: bzrlib/builtins.py:4149
3165
3166
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3167
3168
"--benchmark již není od bzr 2.2 podporován; použijte místo toho bzr-usertest"
3169
#: bzrlib/builtins.py:4183
3170
#: bzrlib/builtins.py:4196
3170
3171
msgid "Show version of bzr."
3171
3172
msgstr "Zobrazit verzi bzr."
3173
#: bzrlib/builtins.py:4187
3174
#: bzrlib/builtins.py:4200
3174
3175
msgid "Print just the version number."
3175
3176
msgstr "Vypsat pouze číslo verze."
3177
#: bzrlib/builtins.py:4206
3178
#: bzrlib/builtins.py:4219
3178
3179
msgid "It sure does!\n"
3179
3180
msgstr "To víš že jo!\n"
3181
#: bzrlib/builtins.py:4230
3182
#: bzrlib/builtins.py:4243
3182
3183
#, python-format
3183
3184
msgid "merge base is revision %s\n"
3184
3185
msgstr "základ sloučení je %s\n"
3186
#: bzrlib/builtins.py:4234
3187
#: bzrlib/builtins.py:4247
3187
3188
msgid "Perform a three-way merge."
3188
3189
msgstr "Provést trojí porovnávání sloučení."
3190
#: bzrlib/builtins.py:4236
3191
#: bzrlib/builtins.py:4249
3192
3193
"The source of the merge can be specified either in the form of a branch,\n"
3193
3194
"or in the form of a path to a file containing a merge directive generated\n"
3275
3280
"merge revision which has more than two parents."
3278
#: bzrlib/builtins.py:4283
3283
#: bzrlib/builtins.py:4296
3280
3285
"If one would like to merge changes from the working tree of the other\n"
3281
3286
"branch without merging any committed revisions, the --uncommitted option\n"
3282
3287
"can be given."
3285
#: bzrlib/builtins.py:4287
3290
#: bzrlib/builtins.py:4300
3287
3292
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3288
3293
"you to apply each diff hunk and file change, similar to \"shelve\"."
3291
#: bzrlib/builtins.py:4290
3296
#: bzrlib/builtins.py:4303
3294
3299
" To merge all new revisions from bzr.dev::"
3297
#: bzrlib/builtins.py:4293
3302
#: bzrlib/builtins.py:4306
3298
3303
msgid " bzr merge ../bzr.dev"
3301
#: bzrlib/builtins.py:4295
3306
#: bzrlib/builtins.py:4308
3302
3307
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3305
#: bzrlib/builtins.py:4297
3310
#: bzrlib/builtins.py:4310
3306
3311
msgid " bzr merge -r 82 ../bzr.dev"
3309
#: bzrlib/builtins.py:4299
3314
#: bzrlib/builtins.py:4312
3310
3315
msgid " To merge the changes introduced by 82, without previous changes::"
3313
#: bzrlib/builtins.py:4301
3318
#: bzrlib/builtins.py:4314
3314
3319
msgid " bzr merge -r 81..82 ../bzr.dev"
3317
#: bzrlib/builtins.py:4303
3322
#: bzrlib/builtins.py:4316
3318
3323
msgid " To apply a merge directive contained in /tmp/merge::"
3321
#: bzrlib/builtins.py:4305
3326
#: bzrlib/builtins.py:4318
3322
3327
msgid " bzr merge /tmp/merge"
3325
#: bzrlib/builtins.py:4307
3330
#: bzrlib/builtins.py:4320
3327
3332
" To create a merge revision with three parents from two branches\n"
3328
3333
" feature1a and feature1b:"
3331
#: bzrlib/builtins.py:4310
3336
#: bzrlib/builtins.py:4323
3333
3338
" bzr merge ../feature1a\n"
3334
3339
" bzr merge ../feature1b --force\n"
3335
3340
" bzr commit -m 'revision with three parents'"
3338
#: bzrlib/builtins.py:4322
3343
#: bzrlib/builtins.py:4335
3339
3344
msgid "Merge even if the destination tree has uncommitted changes."
3342
#: bzrlib/builtins.py:4328
3347
#: bzrlib/builtins.py:4341
3344
3349
"Apply uncommitted changes from a working copy, instead of branch changes."
3347
#: bzrlib/builtins.py:4330
3352
#: bzrlib/builtins.py:4343
3349
3354
"If the destination is already completely merged into the source, pull from "
3350
3355
"the source rather than merging. When this happens, you do not need to "
3351
3356
"commit the result."
3354
#: bzrlib/builtins.py:4335
3359
#: bzrlib/builtins.py:4348
3356
3361
"Branch to merge into, rather than the one containing the working directory."
3359
#: bzrlib/builtins.py:4337
3364
#: bzrlib/builtins.py:4350
3360
3365
msgid "Instead of merging, show a diff of the merge."
3363
#: bzrlib/builtins.py:4339
3368
#: bzrlib/builtins.py:4352
3364
3369
msgid "Select changes interactively."
3367
#: bzrlib/builtins.py:4361
3372
#: bzrlib/builtins.py:4374
3369
3374
"Merging into empty branches not currently supported, "
3370
3375
"https://bugs.launchpad.net/bzr/+bug/308562"
3373
#: bzrlib/builtins.py:4388
3378
#: bzrlib/builtins.py:4401
3374
3379
msgid "Cannot use --uncommitted with bundles or merge directives."
3377
#: bzrlib/builtins.py:4399
3382
#: bzrlib/builtins.py:4412
3378
3383
msgid "Cannot use --uncommitted and --revision at the same time."
3381
#: bzrlib/builtins.py:4419
3386
#: bzrlib/builtins.py:4432
3382
3387
msgid "merger: "
3385
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3390
#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71
3386
3391
msgid "Nothing to do."
3389
#: bzrlib/builtins.py:4425
3394
#: bzrlib/builtins.py:4438
3390
3395
msgid "Cannot pull individual files"
3393
#: bzrlib/builtins.py:4433
3398
#: bzrlib/builtins.py:4446
3394
3399
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3397
#: bzrlib/builtins.py:4491
3402
#: bzrlib/builtins.py:4504
3398
3403
#, python-format
3399
3404
msgid "Show-base is not supported for this merge type. %s"
3402
#: bzrlib/builtins.py:4500
3407
#: bzrlib/builtins.py:4513
3403
3408
#, python-format
3404
3409
msgid "Conflict reduction is not supported for merge type %s."
3407
#: bzrlib/builtins.py:4504
3412
#: bzrlib/builtins.py:4517
3408
3413
msgid "Cannot do conflict reduction and show base."
3411
#: bzrlib/builtins.py:4615
3416
#: bzrlib/builtins.py:4628
3412
3417
msgid "No location specified or remembered"
3415
#: bzrlib/builtins.py:4617
3420
#: bzrlib/builtins.py:4630
3416
3421
msgid "{0} remembered {1} location {2}"
3419
#: bzrlib/builtins.py:4623
3424
#: bzrlib/builtins.py:4636
3420
3425
msgid "Redo a merge."
3423
#: bzrlib/builtins.py:4625
3428
#: bzrlib/builtins.py:4638
3425
3430
"Use this if you want to try a different merge technique while resolving\n"
3426
3431
"conflicts. Some merge techniques are better than others, and remerge\n"
3427
3432
"lets you try different ones on different files."
3430
#: bzrlib/builtins.py:4629
3435
#: bzrlib/builtins.py:4642
3432
3437
"The options for remerge have the same meaning and defaults as the ones for\n"
3433
3438
"merge. The difference is that remerge can (only) be run when there is a\n"
3434
3439
"pending merge, and it lets you specify particular files."
3437
#: bzrlib/builtins.py:4633
3442
#: bzrlib/builtins.py:4646
3440
3445
" Re-do the merge of all conflicted files, and show the base text in\n"
3441
3446
" conflict regions, in addition to the usual THIS and OTHER texts::"
3444
#: bzrlib/builtins.py:4637
3449
#: bzrlib/builtins.py:4650
3445
3450
msgid " bzr remerge --show-base"
3448
#: bzrlib/builtins.py:4639
3453
#: bzrlib/builtins.py:4652
3450
3455
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3451
3456
" additional processing to reduce the size of conflict regions::"
3454
#: bzrlib/builtins.py:4642
3459
#: bzrlib/builtins.py:4655
3455
3460
msgid " bzr remerge --merge-type weave --reprocess foobar"
3458
#: bzrlib/builtins.py:4649
3463
#: bzrlib/builtins.py:4662
3459
3464
msgid "Show base revision text in conflicts."
3462
#: bzrlib/builtins.py:4661
3467
#: bzrlib/builtins.py:4674
3464
3469
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3468
#: bzrlib/builtins.py:4717
3473
#: bzrlib/builtins.py:4731
3469
3474
msgid "Revert files to a previous revision."
3472
#: bzrlib/builtins.py:4719
3477
#: bzrlib/builtins.py:4733
3474
3479
"Giving a list of files will revert only those files. Otherwise, all files\n"
3475
3480
"will be reverted. If the revision is not specified with '--revision', the\n"
3476
3481
"last committed revision is used."
3479
#: bzrlib/builtins.py:4723
3484
#: bzrlib/builtins.py:4737
3481
3486
"To remove only some changes, without reverting to a prior version, use\n"
3482
3487
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3571
3576
" 0 - no missing revisions"
3574
#: bzrlib/builtins.py:4847
3579
#: bzrlib/builtins.py:4861
3576
3581
" Determine the missing revisions between this and the branch at the\n"
3577
3582
" remembered pull location::"
3580
#: bzrlib/builtins.py:4850
3585
#: bzrlib/builtins.py:4864
3581
3586
msgid " bzr missing"
3584
#: bzrlib/builtins.py:4852
3589
#: bzrlib/builtins.py:4866
3585
3590
msgid " Determine the missing revisions between this and another branch::"
3588
#: bzrlib/builtins.py:4854
3593
#: bzrlib/builtins.py:4868
3589
3594
msgid " bzr missing http://server/branch"
3592
#: bzrlib/builtins.py:4856
3597
#: bzrlib/builtins.py:4870
3594
3599
" Determine the missing revisions up to a specific revision on the other\n"
3598
#: bzrlib/builtins.py:4859
3603
#: bzrlib/builtins.py:4873
3599
3604
msgid " bzr missing -r ..-10"
3602
#: bzrlib/builtins.py:4861
3607
#: bzrlib/builtins.py:4875
3604
3609
" Determine the missing revisions up to a specific revision on this\n"
3608
#: bzrlib/builtins.py:4864
3613
#: bzrlib/builtins.py:4878
3609
3614
msgid " bzr missing --my-revision ..-10"
3612
#: bzrlib/builtins.py:4871
3617
#: bzrlib/builtins.py:4885
3613
3618
msgid "Reverse the order of revisions."
3616
#: bzrlib/builtins.py:4873
3621
#: bzrlib/builtins.py:4887
3617
3622
msgid "Display changes in the local branch only."
3620
#: bzrlib/builtins.py:4874
3625
#: bzrlib/builtins.py:4888
3621
3626
msgid "Same as --mine-only."
3624
#: bzrlib/builtins.py:4876
3629
#: bzrlib/builtins.py:4890
3625
3630
msgid "Display changes in the remote branch only."
3628
#: bzrlib/builtins.py:4877
3633
#: bzrlib/builtins.py:4891
3629
3634
msgid "Same as --theirs-only."
3632
#: bzrlib/builtins.py:4882
3637
#: bzrlib/builtins.py:4896
3634
3639
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3638
#: bzrlib/builtins.py:4886
3643
#: bzrlib/builtins.py:4900
3640
3645
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3644
#: bzrlib/builtins.py:4889
3649
#: bzrlib/builtins.py:4903
3645
3650
msgid "Show all revisions in addition to the mainline ones."
3648
#: bzrlib/builtins.py:4943
3653
#: bzrlib/builtins.py:4957
3649
3654
msgid "No peer location known or specified."
3652
#: bzrlib/builtins.py:4947
3657
#: bzrlib/builtins.py:4961
3653
3658
msgid "Using saved parent location: {0}\n"
3656
#: bzrlib/builtins.py:4980
3661
#: bzrlib/builtins.py:4994
3657
3662
#, python-format
3658
3663
msgid "You have %d extra revision:\n"
3659
3664
msgid_plural "You have %d extra revisions:\n"
3663
#: bzrlib/builtins.py:4996
3668
#: bzrlib/builtins.py:5010
3664
3669
#, python-format
3665
3670
msgid "You are missing %d revision:\n"
3666
3671
msgid_plural "You are missing %d revisions:\n"
3670
#: bzrlib/builtins.py:5008
3675
#: bzrlib/builtins.py:5022
3671
3676
msgid "This branch has no new revisions.\n"
3674
#: bzrlib/builtins.py:5011
3679
#: bzrlib/builtins.py:5025
3675
3680
msgid "Other branch has no new revisions.\n"
3678
#: bzrlib/builtins.py:5016
3683
#: bzrlib/builtins.py:5030
3679
3684
msgid "Branches are up to date.\n"
3682
#: bzrlib/builtins.py:5027
3687
#: bzrlib/builtins.py:5041
3683
3688
msgid "Compress the data within a repository."
3686
#: bzrlib/builtins.py:5029
3691
#: bzrlib/builtins.py:5043
3688
3693
"This operation compresses the data within a bazaar repository. As\n"
3689
3694
"bazaar supports automatic packing of repository, this operation is\n"
3690
3695
"normally not required to be done manually."
3693
#: bzrlib/builtins.py:5033
3698
#: bzrlib/builtins.py:5047
3695
3700
"During the pack operation, bazaar takes a backup of existing repository\n"
3696
3701
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3742
3747
"plugins using the Python programming language."
3745
#: bzrlib/builtins.py:5091
3750
#: bzrlib/builtins.py:5105
3746
3751
msgid "Show testament (signing-form) of a revision."
3749
#: bzrlib/builtins.py:5094
3754
#: bzrlib/builtins.py:5108
3750
3755
msgid "Produce long-format testament."
3753
#: bzrlib/builtins.py:5096
3758
#: bzrlib/builtins.py:5110
3754
3759
msgid "Produce a strict-format testament."
3757
#: bzrlib/builtins.py:5122
3762
#: bzrlib/builtins.py:5136
3758
3763
msgid "Show the origin of each line in a file."
3761
#: bzrlib/builtins.py:5124
3766
#: bzrlib/builtins.py:5138
3763
3768
"This prints out the given file with an annotation on the left side\n"
3764
3769
"indicating which revision, author and date introduced the change."
3767
#: bzrlib/builtins.py:5127
3772
#: bzrlib/builtins.py:5141
3769
3774
"If the origin is the same for a run of consecutive lines, it is\n"
3770
3775
"shown only at the top, unless the --all option is given."
3773
#: bzrlib/builtins.py:5135
3778
#: bzrlib/builtins.py:5149
3774
3779
msgid "Show annotations on all lines."
3777
#: bzrlib/builtins.py:5136
3782
#: bzrlib/builtins.py:5150
3778
3783
msgid "Show commit date in annotations."
3781
#: bzrlib/builtins.py:5223
3786
#: bzrlib/builtins.py:5237
3782
3787
msgid "Cannot sign a range of non-revision-history revisions"
3785
#: bzrlib/builtins.py:5235
3790
#: bzrlib/builtins.py:5249
3786
3791
msgid "Please supply either one revision, or a range."
3789
#: bzrlib/builtins.py:5239
3794
#: bzrlib/builtins.py:5253
3791
3796
"Convert the current branch into a checkout of the supplied branch.\n"
3792
3797
"If no branch is supplied, rebind to the last bound location."
3795
#: bzrlib/builtins.py:5242
3800
#: bzrlib/builtins.py:5256
3797
3802
"Once converted into a checkout, commits must succeed on the master branch\n"
3798
3803
"before they will be applied to the local branch."
3801
#: bzrlib/builtins.py:5245
3806
#: bzrlib/builtins.py:5259
3803
3808
"Bound branches use the nickname of its master branch unless it is set\n"
3804
3809
"locally, in which case binding will update the local nickname to be\n"
3805
3810
"that of the master."
3808
#: bzrlib/builtins.py:5260
3813
#: bzrlib/builtins.py:5274
3809
3814
msgid "No location supplied. This format does not remember old locations."
3812
#: bzrlib/builtins.py:5265
3817
#: bzrlib/builtins.py:5280
3813
3818
msgid "Branch is already bound"
3816
#: bzrlib/builtins.py:5267
3821
#: bzrlib/builtins.py:5283
3817
3822
msgid "No location supplied and no previous location known"
3820
#: bzrlib/builtins.py:5273
3825
#: bzrlib/builtins.py:5289
3821
3826
msgid "These branches have diverged. Try merging, and then bind again."
3824
#: bzrlib/builtins.py:5280
3829
#: bzrlib/builtins.py:5296
3825
3830
msgid "Convert the current checkout into a regular branch."
3828
#: bzrlib/builtins.py:5282
3833
#: bzrlib/builtins.py:5298
3830
3835
"After unbinding, the local branch is considered independent and subsequent\n"
3831
3836
"commits will be local only."
3834
#: bzrlib/builtins.py:5293
3839
#: bzrlib/builtins.py:5309
3835
3840
msgid "Local branch is not bound"
3838
#: bzrlib/builtins.py:5297
3843
#: bzrlib/builtins.py:5313
3839
3844
msgid "Remove the last committed revision."
3842
#: bzrlib/builtins.py:5299
3847
#: bzrlib/builtins.py:5315
3844
3849
"--verbose will print out what is being removed.\n"
3845
3850
"--dry-run will go through all the motions, but not actually\n"
3846
3851
"remove anything."
3849
#: bzrlib/builtins.py:5303
3854
#: bzrlib/builtins.py:5319
3851
3856
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3852
3857
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3853
3858
"branch at revision 15."
3856
#: bzrlib/builtins.py:5307
3861
#: bzrlib/builtins.py:5323
3858
3863
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3859
3864
"it may make is to restore any pending merges that were present before\n"
3863
#: bzrlib/builtins.py:5318
3868
#: bzrlib/builtins.py:5334
3864
3869
msgid "Don't actually make changes."
3867
#: bzrlib/builtins.py:5319
3872
#: bzrlib/builtins.py:5335
3868
3873
msgid "Say yes to all questions."
3871
#: bzrlib/builtins.py:5321
3876
#: bzrlib/builtins.py:5337
3872
3877
msgid "Keep tags that point to removed revisions."
3875
#: bzrlib/builtins.py:5323
3880
#: bzrlib/builtins.py:5339
3876
3881
msgid "Only remove the commits from the local branch when in a checkout."
3879
#: bzrlib/builtins.py:5372
3884
#: bzrlib/builtins.py:5388
3880
3885
msgid "No revisions to uncommit.\n"
3883
#: bzrlib/builtins.py:5387
3888
#: bzrlib/builtins.py:5403
3884
3889
msgid "Dry-run, pretending to remove the above revisions.\n"
3887
#: bzrlib/builtins.py:5390
3892
#: bzrlib/builtins.py:5406
3888
3893
msgid "The above revision(s) will be removed.\n"
3891
#: bzrlib/builtins.py:5394
3896
#: bzrlib/builtins.py:5410
3892
3897
msgid "Uncommit these revisions"
3895
#: bzrlib/builtins.py:5397
3900
#: bzrlib/builtins.py:5413
3896
3901
msgid "Canceled\n"
3899
#: bzrlib/builtins.py:5404
3904
#: bzrlib/builtins.py:5420
3900
3905
#, python-format
3902
3907
"You can restore the old tip by running:\n"
3903
3908
" bzr pull . -r revid:%s\n"
3906
#: bzrlib/builtins.py:5409
3911
#: bzrlib/builtins.py:5425
3907
3912
msgid "Break a dead lock."
3910
#: bzrlib/builtins.py:5411
3915
#: bzrlib/builtins.py:5427
3912
3917
"This command breaks a lock on a repository, branch, working directory or\n"
3916
#: bzrlib/builtins.py:5414
3921
#: bzrlib/builtins.py:5430
3918
3923
"CAUTION: Locks should only be broken when you are sure that the process\n"
3919
3924
"holding the lock has been stopped."
3922
#: bzrlib/builtins.py:5417
3927
#: bzrlib/builtins.py:5433
3924
3929
"You can get information on what locks are open via the 'bzr info\n"
3925
3930
"[location]' command."
3928
#: bzrlib/builtins.py:5420
3933
#: bzrlib/builtins.py:5436
3931
3936
" bzr break-lock\n"
3933
3938
" bzr break-lock --conf ~/.bazaar"
3936
#: bzrlib/builtins.py:5429
3941
#: bzrlib/builtins.py:5445
3937
3942
msgid "LOCATION is the directory where the config lock is."
3940
#: bzrlib/builtins.py:5431
3945
#: bzrlib/builtins.py:5447
3941
3946
msgid "Do not ask for confirmation before breaking the lock."
3944
#: bzrlib/builtins.py:5466
3949
#: bzrlib/builtins.py:5482
3945
3950
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3948
#: bzrlib/builtins.py:5467
3953
#: bzrlib/builtins.py:5483
3949
3954
msgid "Run the bzr server."
3952
#: bzrlib/builtins.py:5473
3957
#: bzrlib/builtins.py:5489
3953
3958
msgid "Serve on stdin/out for use from inetd or sshd."
3956
#: bzrlib/builtins.py:5474
3961
#: bzrlib/builtins.py:5490
3957
3962
msgid "protocol"
3960
#: bzrlib/builtins.py:5475
3965
#: bzrlib/builtins.py:5491
3961
3966
msgid "Protocol to serve."
3964
#: bzrlib/builtins.py:5479
3969
#: bzrlib/builtins.py:5495
3970
msgid "Listen for connections on nominated address."
3973
#: bzrlib/builtins.py:5497
3966
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3967
"Passing 0 as the port number will result in a dynamically allocated port. "
3968
"The default port depends on the protocol."
3975
"Listen for connections on nominated port. Passing 0 as the port number will "
3976
"result in a dynamically allocated port. The default port depends on the "
3971
#: bzrlib/builtins.py:5485
3980
#: bzrlib/builtins.py:5502
3972
3981
msgid "Serve contents of this directory."
3975
#: bzrlib/builtins.py:5487
3984
#: bzrlib/builtins.py:5504
3977
3986
"By default the server is a readonly server. Supplying --allow-writes "
3978
3987
"enables write access to the contents of the served directory and below. "
3981
3990
"uncontrolled write access to your file system."
3984
#: bzrlib/builtins.py:5496
3993
#: bzrlib/builtins.py:5513
3985
3994
msgid "Override the default idle client timeout (5min)."
3988
#: bzrlib/builtins.py:5546
3997
#: bzrlib/builtins.py:5531
3989
3998
msgid "Combine a tree into its containing tree."
3992
#: bzrlib/builtins.py:5548
4001
#: bzrlib/builtins.py:5533
3993
4002
msgid "This command requires the target tree to be in a rich-root format."
3996
#: bzrlib/builtins.py:5550
4005
#: bzrlib/builtins.py:5535
3998
4007
"The TREE argument should be an independent tree, inside another tree, but\n"
3999
4008
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
4000
4009
"running \"bzr branch\" with the target inside a tree.)"
4003
#: bzrlib/builtins.py:5554
4012
#: bzrlib/builtins.py:5539
4005
4014
"The result is a combined tree, with the subtree no longer an independent\n"
4006
4015
"part. This is marked as a merge of the subtree into the containing tree,\n"
4007
4016
"and all history is preserved."
4010
#: bzrlib/builtins.py:5572
4019
#: bzrlib/builtins.py:5557
4011
4020
#, python-format
4013
4022
"Can't join trees because %s doesn't support rich root data.\n"
4014
4023
"You can use bzr upgrade on the repository."
4017
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
4026
#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573
4018
4027
msgid "Cannot join {0}. {1}"
4021
#: bzrlib/builtins.py:5592
4030
#: bzrlib/builtins.py:5577
4022
4031
msgid "Split a subdirectory of a tree into a separate tree."
4025
#: bzrlib/builtins.py:5594
4034
#: bzrlib/builtins.py:5579
4027
4036
"This command will produce a target tree in a format that supports\n"
4028
4037
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
4029
4038
"converted into earlier formats like 'dirstate-tags'."
4032
#: bzrlib/builtins.py:5598
4041
#: bzrlib/builtins.py:5583
4034
4043
"The TREE argument should be a subdirectory of a working tree. That\n"
4035
4044
"subdirectory will be converted into an independent tree, with its own\n"
4036
4045
"branch. Commits in the top-level tree will not apply to the new subtree."
4039
#: bzrlib/builtins.py:5678
4048
#: bzrlib/builtins.py:5663
4040
4049
msgid "No submit branch specified or known"
4043
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
4052
#: bzrlib/builtins.py:5672 bzrlib/send.py:109
4044
4053
msgid "No public branch specified or known"
4047
#: bzrlib/builtins.py:5691
4056
#: bzrlib/builtins.py:5677
4048
4057
msgid "bzr merge-directive takes at most two one revision identifiers"
4051
#: bzrlib/builtins.py:5700
4060
#: bzrlib/builtins.py:5686
4052
4061
msgid "No revisions to bundle."
4055
#: bzrlib/builtins.py:5719
4064
#: bzrlib/builtins.py:5705
4056
4065
msgid "Mail or create a merge-directive for submitting changes."
4059
#: bzrlib/builtins.py:5721
4068
#: bzrlib/builtins.py:5707
4060
4069
msgid "A merge directive provides many things needed for requesting merges:"
4063
#: bzrlib/builtins.py:5723
4072
#: bzrlib/builtins.py:5709
4064
4073
msgid "* A machine-readable description of the merge to perform"
4067
#: bzrlib/builtins.py:5725
4076
#: bzrlib/builtins.py:5711
4068
4077
msgid "* An optional patch that is a preview of the changes requested"
4071
#: bzrlib/builtins.py:5727
4080
#: bzrlib/builtins.py:5713
4073
4082
"* An optional bundle of revision data, so that the changes can be applied\n"
4074
4083
" directly from the merge directive, without retrieving data from a\n"
4078
#: bzrlib/builtins.py:5731
4087
#: bzrlib/builtins.py:5717
4080
4089
"`bzr send` creates a compact data set that, when applied using bzr\n"
4081
4090
"merge, has the same effect as merging from the source branch. "
4084
#: bzrlib/builtins.py:5734
4093
#: bzrlib/builtins.py:5720
4086
4095
"By default the merge directive is self-contained and can be applied to any\n"
4087
4096
"branch containing submit_branch in its ancestory without needing access to\n"
4088
4097
"the source branch."
4091
#: bzrlib/builtins.py:5738
4100
#: bzrlib/builtins.py:5724
4093
4102
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4094
4103
"revisions, but only a structured request to merge from the\n"
4180
4189
"set them, and use `bzr info` to display them."
4183
#: bzrlib/builtins.py:5813
4192
#: bzrlib/builtins.py:5799
4184
4193
msgid "Write merge directive to this file or directory; use - for stdout."
4187
#: bzrlib/builtins.py:5817
4196
#: bzrlib/builtins.py:5803
4189
4198
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4190
4199
"strict disables the check."
4193
#: bzrlib/builtins.py:5819
4202
#: bzrlib/builtins.py:5805
4194
4203
msgid "Mail the request to this address."
4197
#: bzrlib/builtins.py:5823
4206
#: bzrlib/builtins.py:5809
4198
4207
msgid "Body for the email."
4201
#: bzrlib/builtins.py:5876
4210
#: bzrlib/builtins.py:5862
4202
4211
msgid "Do not include a bundle in the merge directive."
4205
#: bzrlib/builtins.py:5877
4214
#: bzrlib/builtins.py:5863
4206
4215
msgid "Do not include a preview patch in the merge directive."
4209
#: bzrlib/builtins.py:5880
4218
#: bzrlib/builtins.py:5866
4210
4219
msgid "Remember submit and public branch."
4213
#: bzrlib/builtins.py:5882
4222
#: bzrlib/builtins.py:5868
4215
4224
"Branch to generate the submission from, rather than the one containing the "
4216
4225
"working directory."
4219
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4228
#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76
4223
#: bzrlib/builtins.py:5893
4232
#: bzrlib/builtins.py:5879
4224
4233
msgid "Use the specified output format."
4227
#: bzrlib/builtins.py:5915
4236
#: bzrlib/builtins.py:5901
4228
4237
msgid "Create, remove or modify a tag naming a revision."
4231
#: bzrlib/builtins.py:5917
4240
#: bzrlib/builtins.py:5903
4233
4242
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4234
4243
"(--revision) option can be given -rtag:X, where X is any previously\n"
4238
#: bzrlib/builtins.py:5921
4247
#: bzrlib/builtins.py:5907
4240
4249
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4241
4250
"along when you branch, push, pull or merge."
4244
#: bzrlib/builtins.py:5924
4253
#: bzrlib/builtins.py:5910
4246
4255
"It is an error to give a tag name that already exists unless you pass\n"
4247
4256
"--force, in which case the tag is moved to point to the new revision."
4250
#: bzrlib/builtins.py:5927
4259
#: bzrlib/builtins.py:5913
4252
4261
"To rename a tag (change the name but keep it on the same revsion), run "
4254
4263
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4257
#: bzrlib/builtins.py:5930
4266
#: bzrlib/builtins.py:5916
4259
4268
"If no tag name is specified it will be determined through the \n"
4260
4269
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4265
#: bzrlib/builtins.py:5940
4274
#: bzrlib/builtins.py:5926
4266
4275
msgid "Delete this tag rather than placing it."
4269
#: bzrlib/builtins.py:5943
4278
#: bzrlib/builtins.py:5929
4270
4279
msgid "Branch in which to place the tag."
4273
#: bzrlib/builtins.py:5945
4282
#: bzrlib/builtins.py:5931
4274
4283
msgid "Replace existing tags."
4277
#: bzrlib/builtins.py:5960
4286
#: bzrlib/builtins.py:5946
4278
4287
msgid "No tag specified to delete."
4290
#: bzrlib/builtins.py:5948
4292
msgid "Deleted tag %s."
4281
4295
#: bzrlib/builtins.py:5962
4283
msgid "Deleted tag %s."
4286
#: bzrlib/builtins.py:5976
4287
4296
msgid "Please specify a tag name."
4290
#: bzrlib/builtins.py:5984
4299
#: bzrlib/builtins.py:5970
4291
4300
#, python-format
4292
4301
msgid "Tag %s already exists for that revision."
4295
#: bzrlib/builtins.py:5988
4304
#: bzrlib/builtins.py:5974
4296
4305
#, python-format
4297
4306
msgid "Created tag %s."
4300
#: bzrlib/builtins.py:5990
4309
#: bzrlib/builtins.py:5976
4301
4310
#, python-format
4302
4311
msgid "Updated tag %s."
4305
#: bzrlib/builtins.py:5994
4314
#: bzrlib/builtins.py:5980
4306
4315
msgid "List tags."
4309
#: bzrlib/builtins.py:5996
4318
#: bzrlib/builtins.py:5982
4311
4320
"This command shows a table of tag names and the revisions they reference."
4314
#: bzrlib/builtins.py:6002
4323
#: bzrlib/builtins.py:5988
4315
4324
msgid "Branch whose tags should be displayed."
4318
#: bzrlib/builtins.py:6004
4327
#: bzrlib/builtins.py:5990
4319
4328
msgid "Sort tags by different criteria."
4322
#: bzrlib/builtins.py:6004
4331
#: bzrlib/builtins.py:5990
4323
4332
msgid "Sorting"
4326
#: bzrlib/builtins.py:6073
4335
#: bzrlib/builtins.py:6059
4327
4336
msgid "Reconfigure the type of a bzr directory."
4330
#: bzrlib/builtins.py:6075
4339
#: bzrlib/builtins.py:6061
4331
4340
msgid "A target configuration must be specified."
4334
#: bzrlib/builtins.py:6077
4343
#: bzrlib/builtins.py:6063
4336
4345
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4337
4346
"The order of preference is\n"
4342
4351
"If none of these is available, --bind-to must be specified."
4345
#: bzrlib/builtins.py:6091
4354
#: bzrlib/builtins.py:6077
4346
4355
msgid "Tree type"
4349
#: bzrlib/builtins.py:6092
4358
#: bzrlib/builtins.py:6078
4350
4359
msgid "The relation between branch and tree."
4353
#: bzrlib/builtins.py:6094
4362
#: bzrlib/builtins.py:6080
4354
4363
msgid "Reconfigure to be an unbound branch with no working tree."
4357
#: bzrlib/builtins.py:6095
4366
#: bzrlib/builtins.py:6081
4358
4367
msgid "Reconfigure to be an unbound branch with a working tree."
4361
#: bzrlib/builtins.py:6096
4370
#: bzrlib/builtins.py:6082
4362
4371
msgid "Reconfigure to be a bound branch with a working tree."
4365
#: bzrlib/builtins.py:6097
4374
#: bzrlib/builtins.py:6083
4366
4375
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4369
#: bzrlib/builtins.py:6102
4378
#: bzrlib/builtins.py:6088
4370
4379
msgid "Repository type"
4373
#: bzrlib/builtins.py:6103
4382
#: bzrlib/builtins.py:6089
4374
4383
msgid "Location fo the repository."
4377
#: bzrlib/builtins.py:6105
4386
#: bzrlib/builtins.py:6091
4379
4388
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4382
#: bzrlib/builtins.py:6107
4391
#: bzrlib/builtins.py:6093
4383
4392
msgid "Reconfigure to use a shared repository."
4386
#: bzrlib/builtins.py:6111
4395
#: bzrlib/builtins.py:6097
4387
4396
msgid "Trees in Repository"
4390
#: bzrlib/builtins.py:6112
4399
#: bzrlib/builtins.py:6098
4391
4400
msgid "Whether new branches in the repository have trees."
4394
#: bzrlib/builtins.py:6114
4403
#: bzrlib/builtins.py:6100
4396
4405
"Reconfigure repository to create working trees on branches by default."
4399
#: bzrlib/builtins.py:6116
4408
#: bzrlib/builtins.py:6102
4401
4410
"Reconfigure repository to not create working trees on branches by default."
4404
#: bzrlib/builtins.py:6119
4413
#: bzrlib/builtins.py:6105
4405
4414
msgid "Branch to bind checkout to."
4408
#: bzrlib/builtins.py:6121
4417
#: bzrlib/builtins.py:6107
4409
4418
msgid "Perform reconfiguration even if local changes will be lost."
4412
#: bzrlib/builtins.py:6124
4421
#: bzrlib/builtins.py:6110
4413
4422
msgid "Reconfigure a branch to be stacked on another branch."
4416
#: bzrlib/builtins.py:6128
4425
#: bzrlib/builtins.py:6114
4418
4427
"Reconfigure a branch to be unstacked. This may require copying substantial "
4419
4428
"data into it."
4431
#: bzrlib/builtins.py:6124
4432
msgid "Can't use both --stacked-on and --unstacked"
4422
4435
#: bzrlib/builtins.py:6138
4423
msgid "Can't use both --stacked-on and --unstacked"
4426
#: bzrlib/builtins.py:6152
4427
4436
msgid "No target configuration specified"
4430
#: bzrlib/builtins.py:6187
4439
#: bzrlib/builtins.py:6173
4431
4440
msgid "Set the branch of a checkout and update."
4434
#: bzrlib/builtins.py:6189
4443
#: bzrlib/builtins.py:6175
4436
4445
"For lightweight checkouts, this changes the branch being referenced.\n"
4437
4446
"For heavyweight checkouts, this checks that there are no local commits\n"
4510
4519
"want to switch back to your view after that."
4513
#: bzrlib/builtins.py:6281
4522
#: bzrlib/builtins.py:6272
4516
4525
" To define the current view::"
4519
#: bzrlib/builtins.py:6284
4528
#: bzrlib/builtins.py:6275
4520
4529
msgid " bzr view file1 dir1 ..."
4523
#: bzrlib/builtins.py:6286
4532
#: bzrlib/builtins.py:6277
4524
4533
msgid " To list the current view::"
4527
#: bzrlib/builtins.py:6288
4536
#: bzrlib/builtins.py:6279
4528
4537
msgid " bzr view"
4531
#: bzrlib/builtins.py:6290
4540
#: bzrlib/builtins.py:6281
4532
4541
msgid " To delete the current view::"
4535
#: bzrlib/builtins.py:6292
4544
#: bzrlib/builtins.py:6283
4536
4545
msgid " bzr view --delete"
4539
#: bzrlib/builtins.py:6294
4548
#: bzrlib/builtins.py:6285
4540
4549
msgid " To disable the current view without deleting it::"
4543
#: bzrlib/builtins.py:6296
4552
#: bzrlib/builtins.py:6287
4544
4553
msgid " bzr view --switch off"
4547
#: bzrlib/builtins.py:6298
4556
#: bzrlib/builtins.py:6289
4548
4557
msgid " To define a named view and switch to it::"
4551
#: bzrlib/builtins.py:6300
4560
#: bzrlib/builtins.py:6291
4552
4561
msgid " bzr view --name view-name file1 dir1 ..."
4555
#: bzrlib/builtins.py:6302
4564
#: bzrlib/builtins.py:6293
4556
4565
msgid " To list a named view::"
4559
#: bzrlib/builtins.py:6304
4568
#: bzrlib/builtins.py:6295
4560
4569
msgid " bzr view --name view-name"
4563
#: bzrlib/builtins.py:6306
4572
#: bzrlib/builtins.py:6297
4564
4573
msgid " To delete a named view::"
4567
#: bzrlib/builtins.py:6308
4576
#: bzrlib/builtins.py:6299
4568
4577
msgid " bzr view --name view-name --delete"
4571
#: bzrlib/builtins.py:6310
4580
#: bzrlib/builtins.py:6301
4572
4581
msgid " To switch to a named view::"
4575
#: bzrlib/builtins.py:6312
4584
#: bzrlib/builtins.py:6303
4576
4585
msgid " bzr view --switch view-name"
4579
#: bzrlib/builtins.py:6314
4588
#: bzrlib/builtins.py:6305
4580
4589
msgid " To list all views defined::"
4583
#: bzrlib/builtins.py:6316
4592
#: bzrlib/builtins.py:6307
4584
4593
msgid " bzr view --all"
4587
#: bzrlib/builtins.py:6318
4596
#: bzrlib/builtins.py:6309
4588
4597
msgid " To delete all views::"
4591
#: bzrlib/builtins.py:6320
4600
#: bzrlib/builtins.py:6311
4592
4601
msgid " bzr view --delete --all"
4595
#: bzrlib/builtins.py:6327
4604
#: bzrlib/builtins.py:6318
4596
4605
msgid "Apply list or delete action to all views."
4599
#: bzrlib/builtins.py:6330
4608
#: bzrlib/builtins.py:6321
4600
4609
msgid "Delete the view."
4603
#: bzrlib/builtins.py:6333
4612
#: bzrlib/builtins.py:6324
4604
4613
msgid "Name of the view to define, list or delete."
4607
#: bzrlib/builtins.py:6337
4616
#: bzrlib/builtins.py:6328
4608
4617
msgid "Name of the view to switch to."
4611
#: bzrlib/builtins.py:6356
4620
#: bzrlib/builtins.py:6347
4612
4621
msgid "Both --delete and a file list specified"
4615
#: bzrlib/builtins.py:6359
4624
#: bzrlib/builtins.py:6350
4616
4625
msgid "Both --delete and --switch specified"
4619
#: bzrlib/builtins.py:6362
4628
#: bzrlib/builtins.py:6353
4620
4629
msgid "Deleted all views.\n"
4623
#: bzrlib/builtins.py:6364
4632
#: bzrlib/builtins.py:6355
4624
4633
msgid "No current view to delete"
4627
#: bzrlib/builtins.py:6367
4636
#: bzrlib/builtins.py:6358
4628
4637
#, python-format
4629
4638
msgid "Deleted '%s' view.\n"
4632
#: bzrlib/builtins.py:6371
4641
#: bzrlib/builtins.py:6362
4633
4642
msgid "Both --switch and a file list specified"
4636
#: bzrlib/builtins.py:6374
4645
#: bzrlib/builtins.py:6365
4637
4646
msgid "Both --switch and --all specified"
4640
#: bzrlib/builtins.py:6377
4649
#: bzrlib/builtins.py:6368
4641
4650
msgid "No current view to disable"
4644
#: bzrlib/builtins.py:6379
4653
#: bzrlib/builtins.py:6370
4645
4654
#, python-format
4646
4655
msgid "Disabled '%s' view.\n"
4649
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4658
#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396
4650
4659
msgid "Using '{0}' view: {1}\n"
4662
#: bzrlib/builtins.py:6377
4663
msgid "Views defined:\n"
4653
4666
#: bzrlib/builtins.py:6386
4654
msgid "Views defined:\n"
4657
#: bzrlib/builtins.py:6395
4658
4667
msgid "No views defined.\n"
4661
#: bzrlib/builtins.py:6402
4670
#: bzrlib/builtins.py:6393
4662
4671
msgid "Cannot change the 'off' pseudo view"
4665
#: bzrlib/builtins.py:6410
4674
#: bzrlib/builtins.py:6401
4666
4675
msgid "No current view.\n"
4669
#: bzrlib/builtins.py:6413
4678
#: bzrlib/builtins.py:6404
4670
4679
msgid "'{0}' view is: {1}\n"
4673
#: bzrlib/builtins.py:6433
4682
#: bzrlib/builtins.py:6424
4674
4683
msgid " <no hooks installed>\n"
4677
#: bzrlib/builtins.py:6437
4686
#: bzrlib/builtins.py:6428
4678
4687
msgid "Remove a branch."
4681
#: bzrlib/builtins.py:6439
4690
#: bzrlib/builtins.py:6430
4683
4692
"This will remove the branch from the specified location but \n"
4684
4693
"will keep any working tree or repository in place."
4687
#: bzrlib/builtins.py:6444
4696
#: bzrlib/builtins.py:6435
4688
4697
msgid " Remove the branch at repo/trunk::"
4691
#: bzrlib/builtins.py:6446
4700
#: bzrlib/builtins.py:6437
4692
4701
msgid " bzr remove-branch repo/trunk"
4695
#: bzrlib/builtins.py:6461
4704
#: bzrlib/builtins.py:6444
4705
msgid "Remove branch even if it is the active branch."
4708
#: bzrlib/builtins.py:6458
4709
msgid "Branch is active. Use --force to remove it."
4712
#: bzrlib/builtins.py:6462
4696
4713
msgid "Plaintext diff output."
4699
#: bzrlib/builtins.py:6462
4716
#: bzrlib/builtins.py:6463
4700
4717
msgid "Temporarily set aside some changes from the current tree."
4703
#: bzrlib/builtins.py:6464
4720
#: bzrlib/builtins.py:6465
4705
4722
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4706
4723
"ie. out of the way, until a later time when you can bring them back from\n"
4721
4738
"shelve all text changes at once, use shelve --all."
4724
#: bzrlib/builtins.py:6477
4741
#: bzrlib/builtins.py:6478
4726
4743
"If filenames are specified, only the changes to those files will be\n"
4727
4744
"shelved. Other files will be left untouched."
4730
#: bzrlib/builtins.py:6480
4747
#: bzrlib/builtins.py:6481
4732
4749
"If a revision is specified, changes since that revision will be shelved."
4735
#: bzrlib/builtins.py:6482
4752
#: bzrlib/builtins.py:6483
4737
4754
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4738
4755
"restore the most recently shelved changes."
4741
#: bzrlib/builtins.py:6485
4758
#: bzrlib/builtins.py:6486
4743
4760
"For complicated changes, it is possible to edit the changes in a separate\n"
4744
4761
"editor program to decide what the file remaining in the working copy\n"
4745
4762
"should look like. To do this, add the configuration option"
4748
#: bzrlib/builtins.py:6489
4765
#: bzrlib/builtins.py:6490
4749
4766
msgid " change_editor = PROGRAM @new_path @old_path"
4752
#: bzrlib/builtins.py:6491
4769
#: bzrlib/builtins.py:6492
4754
4771
"where @new_path is replaced with the path of the new version of the \n"
4755
4772
"file and @old_path is replaced with the path of the old version of \n"
4761
#: bzrlib/builtins.py:6503
4778
#: bzrlib/builtins.py:6504
4762
4779
msgid "Shelve all changes."
4765
#: bzrlib/builtins.py:6505
4782
#: bzrlib/builtins.py:6506
4766
4783
msgid "Method to use for writing diffs."
4769
#: bzrlib/builtins.py:6505
4786
#: bzrlib/builtins.py:6506
4773
#: bzrlib/builtins.py:6509
4790
#: bzrlib/builtins.py:6510
4774
4791
msgid "List shelved changes."
4777
#: bzrlib/builtins.py:6511
4794
#: bzrlib/builtins.py:6512
4778
4795
msgid "Destroy removed changes instead of shelving them."
4781
#: bzrlib/builtins.py:6540
4798
#: bzrlib/builtins.py:6541
4782
4799
msgid "No shelved changes."
4785
#: bzrlib/builtins.py:6551
4802
#: bzrlib/builtins.py:6552
4786
4803
msgid "Restore shelved changes."
4789
#: bzrlib/builtins.py:6553
4806
#: bzrlib/builtins.py:6554
4791
4808
"By default, the most recently shelved changes are restored. However if you\n"
4792
4809
"specify a shelf by id those changes will be restored instead. This works\n"
4793
4810
"best when the changes don't depend on each other."
4796
#: bzrlib/builtins.py:6562
4813
#: bzrlib/builtins.py:6563
4797
4814
msgid "The action to perform."
4800
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4817
#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694
4804
#: bzrlib/builtins.py:6564
4821
#: bzrlib/builtins.py:6565
4805
4822
msgid "Apply changes and remove from the shelf."
4808
#: bzrlib/builtins.py:6565
4825
#: bzrlib/builtins.py:6566
4809
4826
msgid "Show changes, but do not apply or remove them."
4812
#: bzrlib/builtins.py:6566
4829
#: bzrlib/builtins.py:6567
4814
4831
"Instead of unshelving the changes, show the diff that would result from "
4818
#: bzrlib/builtins.py:6568
4835
#: bzrlib/builtins.py:6569
4819
4836
msgid "Delete changes without applying them."
4822
#: bzrlib/builtins.py:6569
4839
#: bzrlib/builtins.py:6570
4823
4840
msgid "Apply changes but don't delete them."
4826
#: bzrlib/builtins.py:6584
4843
#: bzrlib/builtins.py:6585
4827
4844
msgid "Remove unwanted files from working tree."
4830
#: bzrlib/builtins.py:6586
4847
#: bzrlib/builtins.py:6587
4832
4849
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4833
4850
"files are never deleted."
4836
#: bzrlib/builtins.py:6589
4853
#: bzrlib/builtins.py:6590
4838
4855
"Another class is 'detritus', which includes files emitted by bzr during\n"
4839
4856
"normal operations and selftests. (The value of these files decreases with\n"
4843
#: bzrlib/builtins.py:6593
4860
#: bzrlib/builtins.py:6594
4845
4862
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4846
4863
"flags are respected, and may be combined."
4849
#: bzrlib/builtins.py:6596
4866
#: bzrlib/builtins.py:6597
4850
4867
msgid "To check what clean-tree will do, use --dry-run."
4853
#: bzrlib/builtins.py:6599
4870
#: bzrlib/builtins.py:6600
4854
4871
msgid "Delete all ignored files."
4857
#: bzrlib/builtins.py:6600
4874
#: bzrlib/builtins.py:6601
4859
4876
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4862
#: bzrlib/builtins.py:6603
4879
#: bzrlib/builtins.py:6604
4863
4880
msgid "Delete files unknown to bzr (default)."
4866
#: bzrlib/builtins.py:6604
4883
#: bzrlib/builtins.py:6605
4867
4884
msgid "Show files to delete instead of deleting them."
4870
#: bzrlib/builtins.py:6606
4887
#: bzrlib/builtins.py:6607
4871
4888
msgid "Do not prompt before deleting."
5774
#: bzrlib/errors.py:809
5802
#: bzrlib/errors.py:818
5775
5803
msgid "Revision is not compatible with %(repo_format)s"
5778
#: bzrlib/errors.py:819
5806
#: bzrlib/errors.py:828
5779
5807
msgid "%(context_info)s%(path)s is already versioned."
5782
#: bzrlib/errors.py:840
5810
#: bzrlib/errors.py:849
5783
5811
msgid "%(context_info)s%(path)s is not versioned."
5786
#: bzrlib/errors.py:861
5814
#: bzrlib/errors.py:870
5787
5815
msgid "Path(s) are not versioned: %(paths_as_string)s"
5790
#: bzrlib/errors.py:872
5818
#: bzrlib/errors.py:881
5791
5819
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5794
#: bzrlib/errors.py:891
5822
#: bzrlib/errors.py:900
5795
5823
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5798
#: bzrlib/errors.py:899
5826
#: bzrlib/errors.py:908
5800
5828
"Filename %(filename)r is not valid in your current filesystem encoding "
5801
5829
"%(fs_encoding)s"
5804
#: bzrlib/errors.py:910
5832
#: bzrlib/errors.py:919
5805
5833
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5808
#: bzrlib/errors.py:928
5836
#: bzrlib/errors.py:937
5809
5837
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5812
#: bzrlib/errors.py:967
5840
#: bzrlib/errors.py:976
5813
5841
msgid "Cannot lock %(lock)s: %(why)s"
5816
#: bzrlib/errors.py:977
5844
#: bzrlib/errors.py:986
5818
5846
"A transaction related operation was attempted after the transaction finished."
5821
#: bzrlib/errors.py:1004
5849
#: bzrlib/errors.py:1013
5822
5850
msgid "Cannot lock: transport is read only: %(transport)s"
5825
#: bzrlib/errors.py:1012
5853
#: bzrlib/errors.py:1021
5826
5854
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5829
#: bzrlib/errors.py:1023
5857
#: bzrlib/errors.py:1032
5831
5859
"Lock was broken while still open: %(lock)s - check storage consistency!"
5834
#: bzrlib/errors.py:1034
5862
#: bzrlib/errors.py:1043
5836
5864
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5837
5865
"%(holder)r, wanted to break %(target)r"
5840
#: bzrlib/errors.py:1046
5868
#: bzrlib/errors.py:1055
5842
5870
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5843
5871
"Use 'bzr break-lock' to clear it"
5846
#: bzrlib/errors.py:1059
5874
#: bzrlib/errors.py:1068
5847
5875
msgid "Lock not held: %(lock)s"
5850
#: bzrlib/errors.py:1088
5878
#: bzrlib/errors.py:1097
5851
5879
msgid "No changes to commit"
5854
#: bzrlib/errors.py:1093
5882
#: bzrlib/errors.py:1102
5856
5884
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5859
#: bzrlib/errors.py:1103
5887
#: bzrlib/errors.py:1112
5861
5889
"Excluding paths during commit is not supported by repository at "
5862
5890
"%(repository)r."
5865
#: bzrlib/errors.py:1112
5893
#: bzrlib/errors.py:1121
5867
5895
"The specified commit message contains characters unsupported by the current "
5871
#: bzrlib/errors.py:1118
5899
#: bzrlib/errors.py:1127
5872
5900
msgid "Upgrade URL cannot work with readonly URLs."
5875
#: bzrlib/errors.py:1123
5903
#: bzrlib/errors.py:1132
5876
5904
msgid "The branch format %(format)s is already at the most recent format."
5879
#: bzrlib/errors.py:1146
5907
#: bzrlib/errors.py:1155
5880
5908
msgid "Option --change does not accept revision ranges"
5883
#: bzrlib/errors.py:1151
5911
#: bzrlib/errors.py:1160
5884
5912
msgid "No namespace registered for string: %(spec)r"
5887
#: bzrlib/errors.py:1170
5915
#: bzrlib/errors.py:1179
5889
5917
"Requested revision: '%(spec)s' does not exist in branch: "
5890
5918
"%(branch_url)s%(extra)s"
5893
#: bzrlib/errors.py:1184
5921
#: bzrlib/errors.py:1193
5895
5923
"Operation denied because it would change the main history, which is not "
5896
5924
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5899
#: bzrlib/errors.py:1195
5927
#: bzrlib/errors.py:1204
5901
5929
"These branches have diverged. Use the missing command to see how.\n"
5902
5930
"Use the merge command to reconcile them."
5905
#: bzrlib/errors.py:1215
5933
#: bzrlib/errors.py:1224
5907
5935
"Branches have no common ancestor, and no merge base revision was specified."
5910
#: bzrlib/errors.py:1221
5938
#: bzrlib/errors.py:1230
5912
5940
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5915
#: bzrlib/errors.py:1227
5943
#: bzrlib/errors.py:1236
5916
5944
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5919
#: bzrlib/errors.py:1236
5947
#: bzrlib/errors.py:1245
5921
5949
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5924
#: bzrlib/errors.py:1245
5952
#: bzrlib/errors.py:1254
5925
5953
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5928
#: bzrlib/errors.py:1254
5956
#: bzrlib/errors.py:1263
5929
5957
msgid "Branch %(branch)s has no commits."
5932
#: bzrlib/errors.py:1272
5960
#: bzrlib/errors.py:1281
5934
5962
"Bound branch %(branch)s is out of date with master branch "
5935
5963
"%(master)s.%(extra_help)s"
5938
#: bzrlib/errors.py:1284
5966
#: bzrlib/errors.py:1293
5940
5968
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5941
5969
"bound to %(remote)s."
5944
#: bzrlib/errors.py:1296
5972
#: bzrlib/errors.py:1305
5945
5973
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5948
#: bzrlib/errors.py:1305
5976
#: bzrlib/errors.py:1314
5950
5978
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5954
#: bzrlib/errors.py:1317
5982
#: bzrlib/errors.py:1326
5955
5983
msgid "Error in processing weave: %(msg)s"
5958
#: bzrlib/errors.py:1326
5986
#: bzrlib/errors.py:1335
5959
5987
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5962
#: bzrlib/errors.py:1337
5990
#: bzrlib/errors.py:1346
5963
5991
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5966
#: bzrlib/errors.py:1347
5994
#: bzrlib/errors.py:1356
5967
5995
msgid "Weave invariant violated: %(what)s"
5970
#: bzrlib/errors.py:1356
5998
#: bzrlib/errors.py:1365
5971
5999
msgid "Parents are mismatched between two revisions. %(msg)s"
5974
#: bzrlib/errors.py:1378
6002
#: bzrlib/errors.py:1387
5976
6004
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5980
#: bzrlib/errors.py:1390
6008
#: bzrlib/errors.py:1399
5981
6009
msgid "Versioned file error"
5984
#: bzrlib/errors.py:1395
6012
#: bzrlib/errors.py:1404
5985
6013
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5988
#: bzrlib/errors.py:1405
6016
#: bzrlib/errors.py:1414
5989
6017
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5992
#: bzrlib/errors.py:1415
6020
#: bzrlib/errors.py:1424
5993
6021
msgid "Text did not match its checksum: %(msg)s"
5996
#: bzrlib/errors.py:1541
6024
#: bzrlib/errors.py:1550
5997
6025
msgid "Export format %(format)r not supported"
6000
#: bzrlib/errors.py:1550
6028
#: bzrlib/errors.py:1559
6001
6029
msgid "Transport error: %(msg)s %(orig_error)s"
6004
#: bzrlib/errors.py:1576
6032
#: bzrlib/errors.py:1585
6005
6033
msgid "Generic bzr smart protocol error: %(details)s"
6008
#: bzrlib/errors.py:1584
6036
#: bzrlib/errors.py:1593
6009
6037
msgid "Received bad protocol version marker: %(marker)r"
6012
#: bzrlib/errors.py:1616
6040
#: bzrlib/errors.py:1625
6013
6041
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
6016
#: bzrlib/errors.py:1621
6044
#: bzrlib/errors.py:1630
6017
6045
msgid "Connection error: %(msg)s %(orig_error)s"
6020
#: bzrlib/errors.py:1626
6048
#: bzrlib/errors.py:1635
6021
6049
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
6024
#: bzrlib/errors.py:1647
6052
#: bzrlib/errors.py:1656
6025
6053
msgid "Connection closed: %(msg)s %(orig_error)s"
6028
#: bzrlib/errors.py:1652
6056
#: bzrlib/errors.py:1661
6029
6057
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6032
#: bzrlib/errors.py:1657
6060
#: bzrlib/errors.py:1666
6033
6061
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6036
#: bzrlib/errors.py:1667
6064
#: bzrlib/errors.py:1676
6037
6065
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6040
#: bzrlib/errors.py:1682
6068
#: bzrlib/errors.py:1691
6041
6069
msgid "Certificate error: %(error)s"
6044
#: bzrlib/errors.py:1690
6072
#: bzrlib/errors.py:1699
6045
6073
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6048
#: bzrlib/errors.py:1704
6076
#: bzrlib/errors.py:1713
6049
6077
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6052
#: bzrlib/errors.py:1712
6080
#: bzrlib/errors.py:1721
6053
6081
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6056
#: bzrlib/errors.py:1721
6084
#: bzrlib/errors.py:1730
6057
6085
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6060
#: bzrlib/errors.py:1735
6088
#: bzrlib/errors.py:1744
6061
6089
msgid "Too many redirections"
6064
#: bzrlib/errors.py:1740
6092
#: bzrlib/errors.py:1749
6065
6093
msgid "Working tree has conflicts."
6068
#: bzrlib/errors.py:1744
6096
#: bzrlib/errors.py:1753
6069
6097
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6072
#: bzrlib/errors.py:1753
6100
#: bzrlib/errors.py:1762
6074
6102
"Error(s) parsing config file %(filename)s:\n"
6078
#: bzrlib/errors.py:1763
6106
#: bzrlib/errors.py:1772
6080
6108
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6081
6109
"See ``bzr help %(name)s``"
6084
#: bzrlib/errors.py:1773
6112
#: bzrlib/errors.py:1782
6085
6113
msgid "%(username)r does not seem to contain a reasonable email address"
6088
#: bzrlib/errors.py:1782
6116
#: bzrlib/errors.py:1791
6089
6117
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6092
#: bzrlib/errors.py:1790
6120
#: bzrlib/errors.py:1799
6093
6121
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6096
#: bzrlib/errors.py:1798
6124
#: bzrlib/errors.py:1807
6097
6125
msgid "Unable to import library \"%(library)s\": %(error)s"
6100
#: bzrlib/errors.py:1806
6128
#: bzrlib/errors.py:1815
6101
6129
msgid "python-gpgme is not installed, it is needed to verify signatures"
6104
#: bzrlib/errors.py:1814
6132
#: bzrlib/errors.py:1823
6106
6134
"The working tree for %(basedir)s has changed since the last commit, but "
6107
6135
"weave merge requires that it be unchanged"
6110
#: bzrlib/errors.py:1824
6138
#: bzrlib/errors.py:1833
6112
6140
"Can't reprocess and show base, because reprocessing obscures the "
6113
6141
"relationship of conflicting lines to the base"
6116
#: bzrlib/errors.py:1830
6144
#: bzrlib/errors.py:1839
6117
6145
msgid "Cycle in graph %(graph)r"
6120
#: bzrlib/errors.py:1858
6148
#: bzrlib/errors.py:1867
6121
6149
msgid "File %(filename)s is not conflicted."
6124
#: bzrlib/errors.py:1880
6152
#: bzrlib/errors.py:1889
6125
6153
msgid "No bundle was found in \"%(filename)s\"."
6128
#: bzrlib/errors.py:1889
6156
#: bzrlib/errors.py:1898
6129
6157
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6132
#: bzrlib/errors.py:1899
6160
#: bzrlib/errors.py:1908
6133
6161
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6136
#: bzrlib/errors.py:1912
6164
#: bzrlib/errors.py:1921
6137
6165
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6140
#: bzrlib/errors.py:1922
6168
#: bzrlib/errors.py:1931
6141
6169
msgid "Key %(key)s is already present in map"
6144
#: bzrlib/errors.py:1927
6172
#: bzrlib/errors.py:1936
6145
6173
msgid "The prefix %(prefix)s is in the help search path twice."
6148
#: bzrlib/errors.py:1937
6176
#: bzrlib/errors.py:1946
6150
6178
"No final name for trans_id %(trans_id)r\n"
6151
6179
"file-id: %(file_id)r\n"
6152
6180
"root trans-id: %(root_trans_id)r\n"
6155
#: bzrlib/errors.py:1969
6183
#: bzrlib/errors.py:1978
6156
6184
msgid "Attempt to reuse a transform that has already been applied."
6159
#: bzrlib/errors.py:1974
6187
#: bzrlib/errors.py:1983
6160
6188
msgid "Moving the root directory is not supported at this time"
6163
#: bzrlib/errors.py:1979
6191
#: bzrlib/errors.py:1988
6164
6192
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6167
#: bzrlib/errors.py:1990
6195
#: bzrlib/errors.py:1999
6169
6197
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6172
#: bzrlib/errors.py:2026
6200
#: bzrlib/errors.py:2035
6174
6202
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6177
#: bzrlib/errors.py:2056
6205
#: bzrlib/errors.py:2065
6178
6206
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6181
#: bzrlib/errors.py:2064
6209
#: bzrlib/errors.py:2073
6182
6210
msgid "Nothing to merge."
6185
#: bzrlib/errors.py:2069
6213
#: bzrlib/errors.py:2078
6186
6214
msgid "Format %(format)s cannot be initialised by this version of bzr."
6189
#: bzrlib/errors.py:2078
6217
#: bzrlib/errors.py:2087
6191
6219
"Cannot convert from format %(from_format)s to format %(format)s. "
6195
#: bzrlib/errors.py:2090
6223
#: bzrlib/errors.py:2099
6196
6224
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6199
#: bzrlib/errors.py:2098
6227
#: bzrlib/errors.py:2107
6200
6228
msgid "%(exe_name)s could not be found on this machine"
6203
#: bzrlib/errors.py:2106
6231
#: bzrlib/errors.py:2115
6204
6232
msgid "Diff is not installed on this machine: %(msg)s"
6207
#: bzrlib/errors.py:2114
6235
#: bzrlib/errors.py:2123
6208
6236
msgid "Diff3 is not installed on this machine."
6211
#: bzrlib/errors.py:2120
6239
#: bzrlib/errors.py:2129
6212
6240
msgid "The content being inserted is already present."
6215
#: bzrlib/errors.py:2125
6243
#: bzrlib/errors.py:2134
6217
6245
"This tree contains left-over files from a failed operation.\n"
6218
6246
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6235
6263
" keep, and delete it when you are done."
6238
#: bzrlib/errors.py:2157
6266
#: bzrlib/errors.py:2166
6240
6268
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6241
6269
"examine %(pending_deletion)s to see if it contains any files you wish to "
6242
6270
"keep, and delete it when you are done."
6245
#: bzrlib/errors.py:2167
6273
#: bzrlib/errors.py:2176
6246
6274
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6249
#: bzrlib/errors.py:2181
6277
#: bzrlib/errors.py:2190
6251
6279
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6254
#: bzrlib/errors.py:2194
6282
#: bzrlib/errors.py:2203
6255
6283
msgid "Error in merge modified format"
6258
#: bzrlib/errors.py:2199
6286
#: bzrlib/errors.py:2208
6259
6287
msgid "Format error in conflict listings"
6262
#: bzrlib/errors.py:2203
6290
#: bzrlib/errors.py:2212
6264
6292
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6265
6293
"Error: %(description)s"
6268
#: bzrlib/errors.py:2214
6296
#: bzrlib/errors.py:2223
6270
6298
"An error has been detected in the repository %(repo_path)s.\n"
6271
6299
"Please run bzr reconcile on this repository."
6274
#: bzrlib/errors.py:2225
6302
#: bzrlib/errors.py:2234
6276
6304
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6277
6305
"reason: %(reason)s"
6280
#: bzrlib/errors.py:2238
6308
#: bzrlib/errors.py:2247
6282
6310
"An inconsistent delta was supplied: %(delta)r\n"
6283
6311
"reason: %(reason)s"
6286
#: bzrlib/errors.py:2250
6314
#: bzrlib/errors.py:2259
6287
6315
msgid "To use this feature you must upgrade your branch at %(path)s."
6290
#: bzrlib/errors.py:2259
6318
#: bzrlib/errors.py:2268
6291
6319
msgid "To use this feature you must upgrade your repository at %(path)s."
6294
#: bzrlib/errors.py:2264
6322
#: bzrlib/errors.py:2273
6296
6324
"To use this feature you must upgrade your branch at %(path)s to a format "
6297
6325
"which supports rich roots."
6300
#: bzrlib/errors.py:2270
6328
#: bzrlib/errors.py:2279
6301
6329
msgid "Cannot perform local-only commits on unbound branches."
6304
#: bzrlib/errors.py:2275
6332
#: bzrlib/errors.py:2284
6305
6333
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6308
#: bzrlib/errors.py:2296
6336
#: bzrlib/errors.py:2305
6309
6337
msgid "Ghost tags not supported by format %(format)r."
6312
#: bzrlib/errors.py:2304
6340
#: bzrlib/errors.py:2313
6313
6341
msgid "File is binary but should be text."
6316
#: bzrlib/errors.py:2309
6344
#: bzrlib/errors.py:2318
6317
6345
msgid "The path %(path)s is not permitted on this platform"
6320
#: bzrlib/errors.py:2318
6348
#: bzrlib/errors.py:2327
6322
6350
"Testament did not match expected value.\n"
6323
6351
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6324
6352
" {%(measured)s}"
6327
#: bzrlib/errors.py:2330
6355
#: bzrlib/errors.py:2339
6328
6356
msgid "Not a bzr revision-bundle: %(text)r"
6331
#: bzrlib/errors.py:2339
6359
#: bzrlib/errors.py:2348
6332
6360
msgid "Bad bzr revision-bundle: %(text)r"
6335
#: bzrlib/errors.py:2348
6363
#: bzrlib/errors.py:2357
6336
6364
msgid "Malformed bzr revision-bundle header: %(text)r"
6339
#: bzrlib/errors.py:2353
6367
#: bzrlib/errors.py:2362
6340
6368
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6343
#: bzrlib/errors.py:2358
6371
#: bzrlib/errors.py:2367
6344
6372
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6347
#: bzrlib/errors.py:2363
6375
#: bzrlib/errors.py:2372
6348
6376
msgid "End of line marker was not \\n in bzr revision-bundle"
6351
#: bzrlib/errors.py:2373
6379
#: bzrlib/errors.py:2382
6352
6380
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6355
#: bzrlib/errors.py:2383
6383
#: bzrlib/errors.py:2392
6356
6384
msgid "Root class for inventory serialization errors"
6359
#: bzrlib/errors.py:2387
6387
#: bzrlib/errors.py:2396
6361
6389
"The inventory was not in the expected format:\n"
6365
#: bzrlib/errors.py:2396
6393
#: bzrlib/errors.py:2405
6366
6394
msgid "This operation requires rich root data storage"
6369
#: bzrlib/errors.py:2409
6397
#: bzrlib/errors.py:2418
6370
6398
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6373
#: bzrlib/errors.py:2418
6401
#: bzrlib/errors.py:2427
6375
6403
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6379
#: bzrlib/errors.py:2425
6407
#: bzrlib/errors.py:2434
6381
6409
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6382
6410
"ghost at {%(ghost_revision_id)s}"
6385
#: bzrlib/errors.py:2435
6413
#: bzrlib/errors.py:2444
6386
6414
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6389
#: bzrlib/errors.py:2486
6417
#: bzrlib/errors.py:2495
6391
6419
"A merge directive must provide either a bundle or a public branch location."
6394
#: bzrlib/errors.py:2493
6422
#: bzrlib/errors.py:2502
6395
6423
msgid "Bad merge directive payload %(start)r"
6398
#: bzrlib/errors.py:2503
6426
#: bzrlib/errors.py:2512
6399
6427
msgid "Preview patch does not match requested changes."
6402
#: bzrlib/errors.py:2509
6430
#: bzrlib/errors.py:2518
6403
6431
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6406
#: bzrlib/errors.py:2519
6434
#: bzrlib/errors.py:2528
6408
6436
"Your branch does not have all of the revisions required in order to merge "
6409
6437
"this merge directive and the target location specified in the merge "
6410
6438
"directive is not a branch: %(location)s."
6413
#: bzrlib/errors.py:2531
6441
#: bzrlib/errors.py:2540
6414
6442
msgid "Unsupported entry kind %(kind)s"
6417
#: bzrlib/errors.py:2539
6445
#: bzrlib/errors.py:2548
6418
6446
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6421
#: bzrlib/errors.py:2549
6449
#: bzrlib/errors.py:2558
6422
6450
msgid "Subsume target %(other_tree)s needs to be upgraded."
6425
#: bzrlib/errors.py:2568
6453
#: bzrlib/errors.py:2577
6426
6454
msgid "No such tag: %(tag_name)s"
6429
#: bzrlib/errors.py:2576
6457
#: bzrlib/errors.py:2585
6430
6458
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6433
#: bzrlib/errors.py:2585
6461
#: bzrlib/errors.py:2594
6434
6462
msgid "Tag %(tag_name)s already exists."
6437
#: bzrlib/errors.py:2593
6465
#: bzrlib/errors.py:2602
6439
6467
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6440
6468
"bugs\" for more information on this feature."
6443
#: bzrlib/errors.py:2603
6471
#: bzrlib/errors.py:2612
6445
6473
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6448
#: bzrlib/errors.py:2613
6476
#: bzrlib/errors.py:2622
6450
6478
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6453
#: bzrlib/errors.py:2623
6481
#: bzrlib/errors.py:2632
6454
6482
msgid "Invalid line in bugs property: '%(line)s'"
6457
#: bzrlib/errors.py:2631
6485
#: bzrlib/errors.py:2640
6458
6486
msgid "Invalid bug status: '%(status)s'"
6461
#: bzrlib/errors.py:2639
6489
#: bzrlib/errors.py:2648
6462
6490
msgid "Could not understand response from smart server: %(response_tuple)r"
6465
#: bzrlib/errors.py:2678
6493
#: bzrlib/errors.py:2687
6466
6494
msgid "Server sent an unexpected error: %(error_tuple)r"
6469
#: bzrlib/errors.py:2697
6497
#: bzrlib/errors.py:2706
6470
6498
msgid "Unrecognised container format: %(container_format)r"
6473
#: bzrlib/errors.py:2705
6501
#: bzrlib/errors.py:2714
6474
6502
msgid "Unexpected end of container stream"
6477
#: bzrlib/errors.py:2710
6505
#: bzrlib/errors.py:2719
6478
6506
msgid "Unknown record type: %(record_type)r"
6481
#: bzrlib/errors.py:2718
6509
#: bzrlib/errors.py:2727
6482
6510
msgid "Invalid record: %(reason)s"
6485
#: bzrlib/errors.py:2726
6513
#: bzrlib/errors.py:2735
6486
6514
msgid "Container has data after end marker: %(excess)r"
6489
#: bzrlib/errors.py:2734
6517
#: bzrlib/errors.py:2743
6490
6518
msgid "Container has multiple records with the same name: %(name)s"
6493
#: bzrlib/errors.py:2747
6521
#: bzrlib/errors.py:2756
6494
6522
msgid "Corrupt or incompatible data stream: %(reason)s"
6497
#: bzrlib/errors.py:2755
6525
#: bzrlib/errors.py:2764
6498
6526
msgid "SMTP error: %(error)s"
6501
#: bzrlib/errors.py:2763
6529
#: bzrlib/errors.py:2772
6502
6530
msgid "No message supplied."
6505
#: bzrlib/errors.py:2768
6533
#: bzrlib/errors.py:2777
6506
6534
msgid "No mail-to address (--mail-to) or output (-o) specified."
6509
#: bzrlib/errors.py:2773
6510
msgid "Unknown mail client: %(mail_client)s"
6513
#: bzrlib/errors.py:2781
6537
#: bzrlib/errors.py:2782
6515
6539
"Unable to find mail client with the following names: "
6516
6540
"%(mail_command_list_string)s"
6519
#: bzrlib/errors.py:2791
6543
#: bzrlib/errors.py:2792
6520
6544
msgid "SMTP connection to %(host)s refused"
6523
#: bzrlib/errors.py:2800
6547
#: bzrlib/errors.py:2801
6524
6548
msgid "Please specify smtp_server. No server at default %(host)s."
6527
#: bzrlib/errors.py:2814
6551
#: bzrlib/errors.py:2815
6529
6553
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6533
#: bzrlib/errors.py:2826
6557
#: bzrlib/errors.py:2827
6534
6558
msgid "'%(display_url)s' is already a branch."
6537
#: bzrlib/errors.py:2831
6561
#: bzrlib/errors.py:2832
6538
6562
msgid "'%(display_url)s' is already a tree."
6541
#: bzrlib/errors.py:2836
6565
#: bzrlib/errors.py:2837
6542
6566
msgid "'%(display_url)s' is already a checkout."
6545
#: bzrlib/errors.py:2841
6569
#: bzrlib/errors.py:2842
6546
6570
msgid "'%(display_url)s' is already a lightweight checkout."
6549
#: bzrlib/errors.py:2846
6573
#: bzrlib/errors.py:2847
6550
6574
msgid "'%(display_url)s' is already using a shared repository."
6553
#: bzrlib/errors.py:2851
6577
#: bzrlib/errors.py:2852
6554
6578
msgid "'%(display_url)s' is already standalone."
6557
#: bzrlib/errors.py:2856
6581
#: bzrlib/errors.py:2857
6558
6582
msgid "Shared repository '%(display_url)s' already creates working trees."
6561
#: bzrlib/errors.py:2862
6585
#: bzrlib/errors.py:2863
6563
6587
"Shared repository '%(display_url)s' already doesn't create working trees."
6566
#: bzrlib/errors.py:2868
6590
#: bzrlib/errors.py:2869
6567
6591
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6570
#: bzrlib/errors.py:2873
6594
#: bzrlib/errors.py:2874
6571
6595
msgid "No location could be found to bind to at %(display_url)s."
6574
#: bzrlib/errors.py:2878
6598
#: bzrlib/errors.py:2879
6576
6600
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6577
6601
"status).%(more)s"
6580
#: bzrlib/errors.py:2897
6604
#: bzrlib/errors.py:2898
6582
6606
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6583
6607
"list).%(more)s"
6586
#: bzrlib/errors.py:2903
6610
#: bzrlib/errors.py:2904
6587
6611
msgid "Variable {%(name)s} is not available."
6590
#: bzrlib/errors.py:2911
6614
#: bzrlib/errors.py:2912
6591
6615
msgid "No template specified."
6594
#: bzrlib/errors.py:2916
6618
#: bzrlib/errors.py:2917
6595
6619
msgid "Unable to create symlink %(path_str)son this platform"
6598
#: bzrlib/errors.py:2931
6622
#: bzrlib/errors.py:2932
6600
6624
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6601
6625
"\"original\", \"local\"."
6604
#: bzrlib/errors.py:2965
6628
#: bzrlib/errors.py:2966
6606
6630
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6609
#: bzrlib/errors.py:2977
6633
#: bzrlib/errors.py:2978
6610
6634
msgid "The \"%(config_id)s\" configuration does not exist."
6613
#: bzrlib/errors.py:2985
6637
#: bzrlib/errors.py:2986
6614
6638
msgid "The \"%(option_name)s\" configuration option does not exist."
6617
#: bzrlib/errors.py:2993
6641
#: bzrlib/errors.py:2994
6618
6642
msgid "The alias \"%(alias_name)s\" does not exist."
6621
#: bzrlib/errors.py:3007
6645
#: bzrlib/errors.py:3008
6622
6646
msgid "\"%(alias_name)s\" is not a valid location alias."
6625
#: bzrlib/errors.py:3015
6649
#: bzrlib/errors.py:3016
6626
6650
msgid "No %(alias_name)s location assigned."
6629
#: bzrlib/errors.py:3023
6653
#: bzrlib/errors.py:3024
6630
6654
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6633
#: bzrlib/errors.py:3033
6657
#: bzrlib/errors.py:3034
6634
6658
msgid "Unknown rules detected: %(unknowns_str)s."
6637
#: bzrlib/errors.py:3044
6661
#: bzrlib/errors.py:3045
6638
6662
msgid "Tip change rejected: %(msg)s"
6641
#: bzrlib/errors.py:3052
6665
#: bzrlib/errors.py:3053
6642
6666
msgid "Shelf corrupt."
6645
#: bzrlib/errors.py:3057
6669
#: bzrlib/errors.py:3058
6646
6670
msgid "Corruption while decompressing repository file%(orig_error)s"
6649
#: bzrlib/errors.py:3069
6673
#: bzrlib/errors.py:3070
6650
6674
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6653
#: bzrlib/errors.py:3077
6677
#: bzrlib/errors.py:3078
6654
6678
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6657
#: bzrlib/errors.py:3085
6681
#: bzrlib/errors.py:3086
6659
6683
"An attempt to access a url outside the server jail was made: '%(url)s'."
6662
#: bzrlib/errors.py:3093
6686
#: bzrlib/errors.py:3094
6663
6687
msgid "The user aborted the operation."
6666
#: bzrlib/errors.py:3098
6690
#: bzrlib/errors.py:3099
6667
6691
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6670
#: bzrlib/errors.py:3108
6694
#: bzrlib/errors.py:3109
6671
6695
msgid "No such view: %(view_name)s."
6674
#: bzrlib/errors.py:3118
6698
#: bzrlib/errors.py:3119
6676
6700
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6677
6701
"to a later format."
6680
#: bzrlib/errors.py:3127
6704
#: bzrlib/errors.py:3128
6682
6706
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6685
#: bzrlib/errors.py:3194
6709
#: bzrlib/errors.py:3195
6686
6710
msgid "%(bzrdir)r does not support co-located branches."
6689
#: bzrlib/errors.py:3200
6713
#: bzrlib/errors.py:3201
6691
6715
"Unable to determine your name.\n"
6692
6716
"Please, set your name with the 'whoami' command.\n"
6693
6717
"E.g. bzr whoami \"Your Name <name@example.com>\""
6696
#: bzrlib/errors.py:3209
6720
#: bzrlib/errors.py:3210
6697
6721
msgid "Invalid pattern(s) found. %(msg)s"
6700
#: bzrlib/errors.py:3217
6724
#: bzrlib/errors.py:3218
6702
6726
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6703
6727
"unbind` to fix."
6706
#: bzrlib/errors.py:3228
6730
#: bzrlib/errors.py:3229
6707
6731
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6710
#: bzrlib/errors.py:3237
6734
#: bzrlib/errors.py:3238
6711
6735
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6714
#: bzrlib/errors.py:3246
6738
#: bzrlib/errors.py:3247
6716
6740
"No compatible object available for operations from %(source)r to %(target)r."
6719
#: bzrlib/errors.py:3256
6743
#: bzrlib/errors.py:3257
6721
6745
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6722
6746
"%(arguments)s."
6725
#: bzrlib/errors.py:3266
6749
#: bzrlib/errors.py:3267
6727
6751
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6728
6752
"format %(format)r"
6731
#: bzrlib/errors.py:3278
6755
#: bzrlib/errors.py:3279
6733
6757
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6737
#: bzrlib/errors.py:3291
6761
#: bzrlib/errors.py:3292
6738
6762
msgid "Binary files section encountered."
6741
#: bzrlib/errors.py:3299
6765
#: bzrlib/errors.py:3300
6743
6767
"Malformed patch header. %(desc)s\n"
6747
#: bzrlib/errors.py:3308
6771
#: bzrlib/errors.py:3309
6749
6773
"Malformed hunk header. %(desc)s\n"
6753
#: bzrlib/errors.py:3317
6777
#: bzrlib/errors.py:3318
6755
6779
"Malformed line. %(desc)s\n"
6759
#: bzrlib/errors.py:3327
6783
#: bzrlib/errors.py:3328
6761
6785
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6762
6786
"but patch says it should be \"%(patch_line)s\""
6765
#: bzrlib/errors.py:3338
6789
#: bzrlib/errors.py:3339
6766
6790
msgid "The feature %(feature)s has already been registered."
6814
6838
"regular push."
6817
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6841
#: bzrlib/gpg.py:366
6842
msgid "No GnuPG key results for pattern: {0}"
6845
#: bzrlib/gpg.py:439
6818
6846
msgid "{0} commits with valid signatures"
6821
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6849
#: bzrlib/gpg.py:445
6822
6850
msgid "{0} commit with unknown key"
6823
6851
msgid_plural "{0} commits with unknown keys"
6827
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6855
#: bzrlib/gpg.py:453
6828
6856
msgid "{0} commit not valid"
6829
6857
msgid_plural "{0} commits not valid"
6833
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6861
#: bzrlib/gpg.py:461
6834
6862
msgid "{0} commit not signed"
6835
6863
msgid_plural "{0} commits not signed"
6839
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6867
#: bzrlib/gpg.py:469
6840
6868
msgid "{0} commit with key now expired"
6841
6869
msgid_plural "{0} commits with key now expired"
6845
#: bzrlib/gpg.py:343
6846
msgid "No GnuPG key results for pattern: {0}"
6873
#: bzrlib/gpg.py:489
6874
msgid "{0} commit by author {1} with key {2} now expired"
6875
msgid_plural "{0} commits by author {1} with key {2} now expired"
6849
#: bzrlib/gpg.py:386
6879
#: bzrlib/gpg.py:505
6850
6880
msgid "{0} signed {1} commit"
6851
6881
msgid_plural "{0} signed {1} commits"
6855
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6885
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6856
6886
msgid "{0} commit by author {1}"
6857
6887
msgid_plural "{0} commits by author {1}"
6861
#: bzrlib/gpg.py:433
6891
#: bzrlib/gpg.py:554
6862
6892
msgid "Unknown key {0} signed {1} commit"
6863
6893
msgid_plural "Unknown key {0} signed {1} commits"
6867
#: bzrlib/gpg.py:452
6868
msgid "{0} commit by author {1} with key {2} now expired"
6869
msgid_plural "{0} commits by author {1} with key {2} now expired"
6873
6897
#: bzrlib/groupcompress.py:1739
6874
6898
#, python-format
6875
6899
msgid "Insert claimed random_id=True, but then inserted %r two times"
6878
#: bzrlib/hooks.py:331
6902
#: bzrlib/hooks.py:313
6879
6903
#, python-format
6880
6904
msgid "Introduced in: %s"
6883
#: bzrlib/hooks.py:334
6907
#: bzrlib/hooks.py:316
6884
6908
#, python-format
6885
6909
msgid "Deprecated in: %s"
7165
7193
" otherwise error."
7168
#: bzrlib/plugins/launchpad/__init__.py:99
7196
#: bzrlib/plugins/launchpad/cmds.py:62
7171
7199
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7172
7200
" --project fooproject"
7175
#: bzrlib/plugins/launchpad/__init__.py:106
7203
#: bzrlib/plugins/launchpad/cmds.py:69
7176
7204
msgid "Launchpad project short name to associate with the branch."
7179
#: bzrlib/plugins/launchpad/__init__.py:113
7207
#: bzrlib/plugins/launchpad/cmds.py:76
7181
7209
"Short name for the branch; by default taken from the last component of the "
7185
#: bzrlib/plugins/launchpad/__init__.py:117
7213
#: bzrlib/plugins/launchpad/cmds.py:80
7186
7214
msgid "One-sentence description of the branch."
7189
#: bzrlib/plugins/launchpad/__init__.py:120
7217
#: bzrlib/plugins/launchpad/cmds.py:83
7190
7218
msgid "Longer description of the purpose or contents of the branch."
7193
#: bzrlib/plugins/launchpad/__init__.py:123
7221
#: bzrlib/plugins/launchpad/cmds.py:86
7194
7222
msgid "Branch author's email address, if not yourself."
7197
#: bzrlib/plugins/launchpad/__init__.py:126
7225
#: bzrlib/plugins/launchpad/cmds.py:89
7198
7226
msgid "The bug this branch fixes."
7201
#: bzrlib/plugins/launchpad/__init__.py:129
7229
#: bzrlib/plugins/launchpad/cmds.py:92
7202
7230
msgid "Prepare the request but don't actually send it."
7205
#: bzrlib/plugins/launchpad/__init__.py:151
7233
#: bzrlib/plugins/launchpad/cmds.py:114
7207
7235
"register-branch requires a public branch url - see bzr help register-branch."
7210
#: bzrlib/plugins/launchpad/__init__.py:159
7238
#: bzrlib/plugins/launchpad/cmds.py:122
7211
7239
msgid "--product is deprecated; please use --project."
7214
#: bzrlib/plugins/launchpad/__init__.py:191
7242
#: bzrlib/plugins/launchpad/cmds.py:152
7215
7243
msgid "Open a Launchpad branch page in your web browser."
7218
#: bzrlib/plugins/launchpad/__init__.py:196
7246
#: bzrlib/plugins/launchpad/cmds.py:157
7219
7247
msgid "Do not actually open the browser. Just say the URL we would use."
7222
#: bzrlib/plugins/launchpad/__init__.py:231
7250
#: bzrlib/plugins/launchpad/cmds.py:192
7223
7251
#, python-format
7224
7252
msgid "Opening %s in web browser"
7227
#: bzrlib/plugins/launchpad/__init__.py:241
7255
#: bzrlib/plugins/launchpad/cmds.py:200
7228
7256
msgid "Show or set the Launchpad user ID."
7231
#: bzrlib/plugins/launchpad/__init__.py:243
7259
#: bzrlib/plugins/launchpad/cmds.py:202
7233
7261
"When communicating with Launchpad, some commands need to know your\n"
7234
7262
"Launchpad user ID. This command can be used to set or show the\n"
7235
7263
"user ID that Bazaar will use for such communication."
7238
#: bzrlib/plugins/launchpad/__init__.py:247
7266
#: bzrlib/plugins/launchpad/cmds.py:206
7241
7269
" Show the Launchpad ID of the current user::"
7244
#: bzrlib/plugins/launchpad/__init__.py:250
7272
#: bzrlib/plugins/launchpad/cmds.py:209
7245
7273
msgid " bzr launchpad-login"
7248
#: bzrlib/plugins/launchpad/__init__.py:252
7276
#: bzrlib/plugins/launchpad/cmds.py:211
7249
7277
msgid " Set the Launchpad ID of the current user to 'bob'::"
7252
#: bzrlib/plugins/launchpad/__init__.py:254
7280
#: bzrlib/plugins/launchpad/cmds.py:213
7253
7281
msgid " bzr launchpad-login bob"
7256
#: bzrlib/plugins/launchpad/__init__.py:261
7284
#: bzrlib/plugins/launchpad/cmds.py:220
7257
7285
msgid "Don't check that the user name is valid."
7260
#: bzrlib/plugins/launchpad/__init__.py:276
7261
#: bzrlib/plugins/launchpad/__init__.py:287
7288
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7262
7289
msgid "Launchpad user ID exists and has SSH keys.\n"
7265
#: bzrlib/plugins/launchpad/__init__.py:279
7292
#: bzrlib/plugins/launchpad/cmds.py:238
7266
7293
msgid "No Launchpad user ID configured.\n"
7269
#: bzrlib/plugins/launchpad/__init__.py:290
7296
#: bzrlib/plugins/launchpad/cmds.py:249
7270
7297
#, python-format
7271
7298
msgid "Launchpad user ID set to '%s'.\n"
7274
#: bzrlib/plugins/launchpad/__init__.py:298
7301
#: bzrlib/plugins/launchpad/cmds.py:255
7275
7302
msgid "Ask Launchpad to mirror a branch now."
7278
#: bzrlib/plugins/launchpad/__init__.py:318
7305
#: bzrlib/plugins/launchpad/cmds.py:272
7279
7306
msgid "Propose merging a branch on Launchpad."
7282
#: bzrlib/plugins/launchpad/__init__.py:320
7309
#: bzrlib/plugins/launchpad/cmds.py:274
7284
7311
"This will open your usual editor to provide the initial comment. When it\n"
7285
7312
"has created the proposal, it will open it in your default web browser."
7288
#: bzrlib/plugins/launchpad/__init__.py:323
7315
#: bzrlib/plugins/launchpad/cmds.py:277
7290
7317
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7291
7318
"is not supplied, the remembered submit branch will be used. If no submit\n"
7292
7319
"branch is remembered, the development focus will be used."
7295
#: bzrlib/plugins/launchpad/__init__.py:327
7322
#: bzrlib/plugins/launchpad/cmds.py:281
7297
7324
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7298
7325
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7300
7327
"may optionally be followed by '=' and the review type. For example:"
7303
#: bzrlib/plugins/launchpad/__init__.py:332
7330
#: bzrlib/plugins/launchpad/cmds.py:286
7304
7331
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7307
#: bzrlib/plugins/launchpad/__init__.py:334
7334
#: bzrlib/plugins/launchpad/cmds.py:288
7309
7336
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7310
7337
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7313
#: bzrlib/plugins/launchpad/__init__.py:339
7340
#: bzrlib/plugins/launchpad/cmds.py:293
7314
7341
msgid "Propose the merge on staging."
7317
#: bzrlib/plugins/launchpad/__init__.py:341
7344
#: bzrlib/plugins/launchpad/cmds.py:295
7318
7345
msgid "Commit message."
7321
#: bzrlib/plugins/launchpad/__init__.py:343
7348
#: bzrlib/plugins/launchpad/cmds.py:297
7322
7349
msgid "Mark the proposal as approved immediately."
7325
#: bzrlib/plugins/launchpad/__init__.py:345
7352
#: bzrlib/plugins/launchpad/cmds.py:298
7353
msgid "The bug this proposal fixes."
7356
#: bzrlib/plugins/launchpad/cmds.py:300
7326
7357
msgid "Requested reviewer and optional type."
7329
#: bzrlib/plugins/launchpad/__init__.py:382
7360
#: bzrlib/plugins/launchpad/cmds.py:335
7330
7361
msgid "Find the proposal to merge this revision."
7333
#: bzrlib/plugins/launchpad/__init__.py:384
7364
#: bzrlib/plugins/launchpad/cmds.py:337
7335
7366
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7336
7367
"This works only if the selected branch was the merge proposal target, and\n"
7338
7369
"are opened in a web browser."
7341
#: bzrlib/plugins/launchpad/__init__.py:389
7372
#: bzrlib/plugins/launchpad/cmds.py:342
7343
7374
"Any revision involved in the merge may be specified-- the revision in\n"
7344
7375
"which the merge was performed, or one of the revisions that was merged."
7347
#: bzrlib/plugins/launchpad/__init__.py:392
7378
#: bzrlib/plugins/launchpad/cmds.py:345
7348
7379
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7351
#: bzrlib/plugins/launchpad/__init__.py:394
7382
#: bzrlib/plugins/launchpad/cmds.py:347
7352
7383
msgid " bzr lp-find-proposal -r annotate:README:1"
7355
#: bzrlib/plugins/launchpad/__init__.py:409
7386
#: bzrlib/plugins/launchpad/cmds.py:363
7356
7387
msgid "No review found."
7359
#: bzrlib/plugins/launchpad/__init__.py:410
7390
#: bzrlib/plugins/launchpad/cmds.py:364
7360
7391
#, python-format
7361
7392
msgid "%d proposals(s) found."
7364
#: bzrlib/plugins/launchpad/__init__.py:420
7395
#: bzrlib/plugins/launchpad/cmds.py:374
7365
7396
msgid "Finding revision-id"
7368
#: bzrlib/plugins/launchpad/__init__.py:427
7399
#: bzrlib/plugins/launchpad/cmds.py:381
7369
7400
msgid "Finding merge"
7372
#: bzrlib/plugins/launchpad/__init__.py:432
7403
#: bzrlib/plugins/launchpad/cmds.py:386
7373
7404
msgid "Finding revno"
7376
#: bzrlib/plugins/launchpad/__init__.py:437
7407
#: bzrlib/plugins/launchpad/cmds.py:392
7377
7408
msgid "Finding Launchpad branch"
7380
#: bzrlib/plugins/launchpad/__init__.py:440
7411
#: bzrlib/plugins/launchpad/cmds.py:395
7381
7412
msgid "Finding proposals"
7384
#: bzrlib/plugins/launchpad/account.py:66
7385
msgid "Setting ssh/sftp usernames for launchpad.net."
7388
7415
#: bzrlib/plugins/launchpad/lp_api.py:241
7389
7416
#: bzrlib/plugins/launchpad/lp_api.py:246
7390
7417
#, python-format
7431
#: bzrlib/plugins/launchpad/lp_propose.py:149
7458
#: bzrlib/plugins/launchpad/lp_propose.py:150
7432
7459
#, python-format
7433
7460
msgid "There is already a branch merge proposal: %s"
7436
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7463
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7437
7464
msgid "pb parameter to convert() is deprecated"
7440
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7467
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7441
7468
msgid "starting upgrade from format 4 to 5"
7444
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7471
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7445
7472
msgid "note: upgrade may be faster if all store files are ungzipped first"
7448
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7475
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7449
7476
msgid "converting revision"
7452
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7479
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7453
7480
msgid "upgraded to weaves:"
7456
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7483
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7457
7484
#, python-format
7458
7485
msgid "%6d revisions and inventories"
7461
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7488
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7462
7489
#, python-format
7463
7490
msgid "%6d revisions not present"
7466
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7493
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7467
7494
#, python-format
7468
7495
msgid "%6d texts"
7471
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7498
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7472
7499
msgid "writing weave"
7475
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7476
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7502
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7503
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7477
7504
msgid "inventory"
7480
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7507
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7481
7508
msgid "write revision"
7484
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7511
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7485
7512
msgid "loading revision"
7488
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7515
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7489
7516
#, python-format
7490
7517
msgid "revision {%s} not present in branch; will be converted as a ghost"
7493
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7520
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7494
7521
msgid "starting upgrade from format 5 to 6"
7497
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7524
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7498
7525
#, python-format
7499
7526
msgid "adding prefixes to %s"
7502
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7529
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7503
7530
msgid "starting upgrade from format 6 to metadir"
7506
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7533
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7507
7534
msgid "Removing ancestry.weave"
7510
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7537
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7511
7538
msgid "Finding branch files"
7514
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7541
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7515
7542
msgid "Upgrading repository"
7518
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7545
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7519
7546
msgid "Upgrading branch"
7522
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7549
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7523
7550
msgid "No working tree."
7526
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7553
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7527
7554
msgid "Upgrading working tree"
7530
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7557
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7531
7558
#, python-format
7532
7559
msgid "Make %s lock"
7535
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7562
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7536
7563
#, python-format
7537
7564
msgid "Moving %s"
12587
12598
"set of command names."
12590
#: en/help_topics/hooks.txt:212
12601
#: en/help_topics/hooks.txt:201
12607
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12608
msgid "Introduced in: 2.6"
12611
#: en/help_topics/hooks.txt:206
12612
msgid "Called after executing a command. Called with the command object."
12615
#: en/help_topics/hooks.txt:208
12621
#: en/help_topics/hooks.txt:213
12622
msgid "Called prior to executing a command. Called with the command object."
12625
#: en/help_topics/hooks.txt:215
12592
12627
"_ConfigHooks\n"
12593
12628
"------------"
12596
#: en/help_topics/hooks.txt:215
12631
#: en/help_topics/hooks.txt:218
12602
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12603
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12604
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12605
#: en/help_topics/hooks.txt:443
12637
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12638
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12639
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12640
#: en/help_topics/hooks.txt:446
12606
12641
msgid "Introduced in: 2.4"
12609
#: en/help_topics/hooks.txt:220
12644
#: en/help_topics/hooks.txt:223
12611
12646
"Invoked when a config option is read. The signature is (stack, name,\n"
12615
#: en/help_topics/hooks.txt:223
12650
#: en/help_topics/hooks.txt:226
12621
#: en/help_topics/hooks.txt:228
12656
#: en/help_topics/hooks.txt:231
12622
12657
msgid "Invoked when a config store is loaded. The signature is (store)."
12625
#: en/help_topics/hooks.txt:230
12660
#: en/help_topics/hooks.txt:233
12631
#: en/help_topics/hooks.txt:235
12666
#: en/help_topics/hooks.txt:238
12633
12668
"Invoked when a config option is removed. The signature is (stack,\n"
12637
#: en/help_topics/hooks.txt:238
12672
#: en/help_topics/hooks.txt:241
12643
#: en/help_topics/hooks.txt:243
12678
#: en/help_topics/hooks.txt:246
12644
12679
msgid "Invoked when a config store is saved. The signature is (store)."
12647
#: en/help_topics/hooks.txt:245
12682
#: en/help_topics/hooks.txt:248
12653
#: en/help_topics/hooks.txt:250
12688
#: en/help_topics/hooks.txt:253
12655
12690
"Invoked when a config option is set. The signature is (stack, name,\n"
12659
#: en/help_topics/hooks.txt:253
12694
#: en/help_topics/hooks.txt:256
12661
12696
"ControlDirHooks\n"
12662
12697
"---------------"
12665
#: en/help_topics/hooks.txt:256
12700
#: en/help_topics/hooks.txt:259
12667
12702
"post_repo_init\n"
12668
12703
"~~~~~~~~~~~~~~"
12671
#: en/help_topics/hooks.txt:261
12706
#: en/help_topics/hooks.txt:264
12673
12708
"Invoked after a repository has been initialized. post_repo_init is\n"
12674
12709
"called with a bzrlib.controldir.RepoInitHookParams."
12677
#: en/help_topics/hooks.txt:264
12712
#: en/help_topics/hooks.txt:267
12683
#: en/help_topics/hooks.txt:267
12718
#: en/help_topics/hooks.txt:270
12684
12719
msgid "Introduced in: 1.14"
12687
#: en/help_topics/hooks.txt:269
12722
#: en/help_topics/hooks.txt:272
12689
12724
"Invoked before attempting to open a ControlDir with the transport that\n"
12690
12725
"the open will use."
12693
#: en/help_topics/hooks.txt:272
12728
#: en/help_topics/hooks.txt:275
12695
12730
"InfoHooks\n"
12699
#: en/help_topics/hooks.txt:275
12734
#: en/help_topics/hooks.txt:278
12701
12736
"repository\n"
12705
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12706
#: en/help_topics/hooks.txt:521
12740
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12741
#: en/help_topics/hooks.txt:524
12707
12742
msgid "Introduced in: 1.15"
12710
#: en/help_topics/hooks.txt:280
12745
#: en/help_topics/hooks.txt:283
12712
12747
"Invoked when displaying the statistics for a repository. repository is\n"
12713
12748
"called with a statistics dictionary as returned by the repository and\n"
12714
12749
"a file-like object to write to."
12717
#: en/help_topics/hooks.txt:284
12752
#: en/help_topics/hooks.txt:287
12719
12754
"LockHooks\n"
12723
#: en/help_topics/hooks.txt:287
12758
#: en/help_topics/hooks.txt:290
12725
12760
"lock_acquired\n"
12726
12761
"~~~~~~~~~~~~~"
12729
#: en/help_topics/hooks.txt:292
12764
#: en/help_topics/hooks.txt:295
12731
12766
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12734
#: en/help_topics/hooks.txt:294
12769
#: en/help_topics/hooks.txt:297
12736
12771
"lock_broken\n"
12737
12772
"~~~~~~~~~~~"
12740
#: en/help_topics/hooks.txt:299
12775
#: en/help_topics/hooks.txt:302
12741
12776
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12744
#: en/help_topics/hooks.txt:301
12779
#: en/help_topics/hooks.txt:304
12746
12781
"lock_released\n"
12747
12782
"~~~~~~~~~~~~~"
12750
#: en/help_topics/hooks.txt:306
12785
#: en/help_topics/hooks.txt:309
12752
12787
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12755
#: en/help_topics/hooks.txt:308
12790
#: en/help_topics/hooks.txt:311
12757
12792
"MergeHooks\n"
12761
#: en/help_topics/hooks.txt:311
12796
#: en/help_topics/hooks.txt:314
12763
12798
"merge_file_content\n"
12764
12799
"~~~~~~~~~~~~~~~~~~"
12767
#: en/help_topics/hooks.txt:314
12802
#: en/help_topics/hooks.txt:317
12768
12803
msgid "Introduced in: 2.1"
12771
#: en/help_topics/hooks.txt:316
12806
#: en/help_topics/hooks.txt:319
12773
12808
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12774
12809
"object when starting a merge. Should return either None or a subclass\n"
12778
12813
"AbstractPerFileMerger API docs for details on how it is used by merge."
12781
#: en/help_topics/hooks.txt:323
12816
#: en/help_topics/hooks.txt:326
12783
12818
"post_merge\n"
12787
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12788
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12789
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12822
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12823
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12824
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12790
12825
msgid "Introduced in: 2.5"
12793
#: en/help_topics/hooks.txt:328
12828
#: en/help_topics/hooks.txt:331
12795
12830
"Called after a merge. Receives a Merger object as the single argument.\n"
12796
12831
"The return value is ignored."
12799
#: en/help_topics/hooks.txt:331
12834
#: en/help_topics/hooks.txt:334
12801
12836
"pre_merge\n"
12805
#: en/help_topics/hooks.txt:336
12840
#: en/help_topics/hooks.txt:339
12807
12842
"Called before a merge. Receives a Merger object as the single\n"
12811
#: en/help_topics/hooks.txt:339
12846
#: en/help_topics/hooks.txt:342
12813
12848
"MergeDirectiveHooks\n"
12814
12849
"-------------------"
12817
#: en/help_topics/hooks.txt:342
12852
#: en/help_topics/hooks.txt:345
12819
12854
"merge_request_body\n"
12820
12855
"~~~~~~~~~~~~~~~~~~"
12823
#: en/help_topics/hooks.txt:345
12858
#: en/help_topics/hooks.txt:348
12824
12859
msgid "Introduced in: 1.15.0"
12827
#: en/help_topics/hooks.txt:347
12862
#: en/help_topics/hooks.txt:350
12829
12864
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12830
12865
"request. Callbacks must return a body. If more than one callback is\n"
12831
12866
"registered, the output of one callback is provided to the next."
12834
#: en/help_topics/hooks.txt:351
12869
#: en/help_topics/hooks.txt:354
12836
12871
"MessageEditorHooks\n"
12837
12872
"------------------"
12840
#: en/help_topics/hooks.txt:354
12875
#: en/help_topics/hooks.txt:357
12842
12877
"commit_message_template\n"
12843
12878
"~~~~~~~~~~~~~~~~~~~~~~~"
12846
#: en/help_topics/hooks.txt:357
12881
#: en/help_topics/hooks.txt:360
12847
12882
msgid "Introduced in: 1.10"
12850
#: en/help_topics/hooks.txt:359
12885
#: en/help_topics/hooks.txt:362
12852
12887
"Called when a commit message is being generated.\n"
12853
12888
"commit_message_template is called with the bzrlib.commit.Commit object\n"