« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6151
- compare with another revision
- compare with revision 0.17.26
- download diff
- download tarball
- view history from revision 6151
- Committer: Patch Queue Manager
- Date: 2011-09-20 10:08:18 UTC
- mfrom: (6150.1.1 i18n-update-bzr.pot)
- Revision ID: pqm@pqm.ubuntu.com-20110920100818-1vsvhoku8cb31trh
(jr) Update bzr.pot (Jonathan Riddell)
- files modified:
- po/bzr.pot
added
removed
po/bzr.pot
8
8
msgstr ""
9
9
"Project-Id-Version: bzr\n"
10
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2011-09-19 12:02+0100\n"
11
"POT-Creation-Date: 2011-09-20 10:41+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
47
47
msgstr ""
48
48
49
49
#: bzrlib/branch.py:3165
50
#, python-format
51
msgid "checked branch %s format %s"
50
msgid "checked branch {0} format {1}"
52
51
msgstr ""
53
52
54
53
#: bzrlib/branch.py:3168
56
55
msgid "found error:%s"
57
56
msgstr ""
58
57
59
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2758 bzrlib/workingtree.py:306
58
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2782 bzrlib/workingtree.py:306
60
59
#, python-format
61
60
msgid "Ignoring files outside view. View is %s"
62
61
msgstr ""
189
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
190
189
msgstr ""
191
190
192
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4885
191
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4927
193
192
msgid "You can only supply one of revision_id or --revision"
194
193
msgstr ""
195
194
196
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4887
195
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4929
197
196
msgid "You must supply either --revision or a revision_id"
198
197
msgstr ""
199
198
505
504
msgid "Using saved parent location: %s\n"
506
505
msgstr ""
507
506
508
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4113
507
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4137
509
508
msgid "Cannot use -r with merge directives or bundles"
510
509
msgstr ""
511
510
696
695
msgid "New branch bound to %s"
697
696
msgstr ""
698
697
699
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5926
698
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5968
700
699
#, python-format
701
700
msgid "Switched to branch: %s"
702
701
msgstr ""
1282
1281
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1283
1282
msgstr ""
1284
1283
1285
#: bzrlib/builtins.py:2103
1286
msgid "--using and --format are mutually exclusive."
1284
#: bzrlib/builtins.py:2104 bzrlib/builtins.py:2502 bzrlib/builtins.py:2515
1285
#: bzrlib/builtins.py:2523 bzrlib/builtins.py:4663
1286
msgid "{0} and {1} are mutually exclusive"
1287
1287
msgstr ""
1288
1288
1289
#: bzrlib/builtins.py:2123
1289
#: bzrlib/builtins.py:2124
1290
1290
msgid ""
1291
1291
"List files deleted in the working tree.\n"
1292
1292
" "
1293
1293
msgstr ""
1294
1294
1295
#: bzrlib/builtins.py:2201
1295
#: bzrlib/builtins.py:2202
1296
1296
msgid "Show the tree root directory."
1297
1297
msgstr ""
1298
1298
1299
#: bzrlib/builtins.py:2203
1299
#: bzrlib/builtins.py:2204
1300
1300
msgid ""
1301
1301
"The root is the nearest enclosing directory with a .bzr control\n"
1302
1302
"directory."
1303
1303
msgstr ""
1304
1304
1305
#: bzrlib/builtins.py:2218
1305
#: bzrlib/builtins.py:2219
1306
1306
msgid "The limit argument must be an integer."
1307
1307
msgstr ""
1308
1308
1309
#: bzrlib/builtins.py:2226
1309
#: bzrlib/builtins.py:2227
1310
1310
msgid "The levels argument must be an integer."
1311
1311
msgstr ""
1312
1312
1313
#: bzrlib/builtins.py:2231
1313
#: bzrlib/builtins.py:2232
1314
1314
msgid "Show historical log for a branch or subset of a branch."
1315
1315
msgstr ""
1316
1316
1317
#: bzrlib/builtins.py:2233
1317
#: bzrlib/builtins.py:2234
1318
1318
msgid ""
1319
1319
"log is bzr's default tool for exploring the history of a branch.\n"
1320
1320
"The branch to use is taken from the first parameter. If no parameters\n"
1322
1322
"Here are some simple examples::"
1323
1323
msgstr ""
1324
1324
1325
#: bzrlib/builtins.py:2238
1325
#: bzrlib/builtins.py:2239
1326
1326
msgid ""
1327
1327
" bzr log log the current branch\n"
1328
1328
" bzr log foo.py log a file in its branch\n"
1329
1329
" bzr log http://server/branch log a branch on a server"
1330
1330
msgstr ""
1331
1331
1332
#: bzrlib/builtins.py:2242
1332
#: bzrlib/builtins.py:2243
1333
1333
msgid ""
1334
1334
"The filtering, ordering and information shown for each revision can\n"
1335
1335
"be controlled as explained below. By default, all revisions are\n"
1339
1339
"were merged."
1340
1340
msgstr ""
1341
1341
1342
#: bzrlib/builtins.py:2249
1342
#: bzrlib/builtins.py:2250
1343
1343
msgid ":Output control:"
1344
1344
msgstr ""
1345
1345
1346
#: bzrlib/builtins.py:2251
1346
#: bzrlib/builtins.py:2252
1347
1347
msgid ""
1348
1348
" The log format controls how information about each revision is\n"
1349
1349
" displayed. The standard log formats are called ``long``, ``short``\n"
1351
1351
" for more details on log formats."
1352
1352
msgstr ""
1353
1353
1354
#: bzrlib/builtins.py:2256
1354
#: bzrlib/builtins.py:2257
1355
1355
msgid ""
1356
1356
" The following options can be used to control what information is\n"
1357
1357
" displayed::"
1358
1358
msgstr ""
1359
1359
1360
#: bzrlib/builtins.py:2259
1360
#: bzrlib/builtins.py:2260
1361
1361
msgid ""
1362
1362
" -l N display a maximum of N revisions\n"
1363
1363
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1366
1366
" --show-ids display revision-ids (and file-ids), not just revnos"
1367
1367
msgstr ""
1368
1368
1369
#: bzrlib/builtins.py:2265
1369
#: bzrlib/builtins.py:2266
1370
1370
msgid ""
1371
1371
" Note that the default number of levels to display is a function of the\n"
1372
1372
" log format. If the -n option is not used, the standard log formats show\n"
1373
1373
" just the top level (mainline)."
1374
1374
msgstr ""
1375
1375
1376
#: bzrlib/builtins.py:2269
1376
#: bzrlib/builtins.py:2270
1377
1377
msgid ""
1378
1378
" Status summaries are shown using status flags like A, M, etc. To see\n"
1379
1379
" the changes explained using words like ``added`` and ``modified``\n"
1380
1380
" instead, use the -vv option."
1381
1381
msgstr ""
1382
1382
1383
#: bzrlib/builtins.py:2273
1383
#: bzrlib/builtins.py:2274
1384
1384
msgid ":Ordering control:"
1385
1385
msgstr ""
1386
1386
1387
#: bzrlib/builtins.py:2275
1387
#: bzrlib/builtins.py:2276
1388
1388
msgid ""
1389
1389
" To display revisions from oldest to newest, use the --forward option.\n"
1390
1390
" In most cases, using this option will have little impact on the total\n"
1392
1392
" display revisions like --reverse does when it can."
1393
1393
msgstr ""
1394
1394
1395
#: bzrlib/builtins.py:2280
1395
#: bzrlib/builtins.py:2281
1396
1396
msgid ":Revision filtering:"
1397
1397
msgstr ""
1398
1398
1399
#: bzrlib/builtins.py:2282
1399
#: bzrlib/builtins.py:2283
1400
1400
msgid ""
1401
1401
" The -r option can be used to specify what revision or range of revisions\n"
1402
1402
" to filter against. The various forms are shown below::"
1403
1403
msgstr ""
1404
1404
1405
#: bzrlib/builtins.py:2285
1405
#: bzrlib/builtins.py:2286
1406
1406
msgid ""
1407
1407
" -rX display revision X\n"
1408
1408
" -rX.. display revision X and later\n"
1410
1410
" -rX..Y display from X to Y inclusive"
1411
1411
msgstr ""
1412
1412
1413
#: bzrlib/builtins.py:2290
1413
#: bzrlib/builtins.py:2291
1414
1414
msgid ""
1415
1415
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1416
1416
" Some common examples are given below::"
1417
1417
msgstr ""
1418
1418
1419
#: bzrlib/builtins.py:2293
1419
#: bzrlib/builtins.py:2294
1420
1420
msgid ""
1421
1421
" -r-1 show just the tip\n"
1422
1422
" -r-10.. show the last 10 mainline revisions\n"
1426
1426
" -rdate:yesterday.. show changes since yesterday"
1427
1427
msgstr ""
1428
1428
1429
#: bzrlib/builtins.py:2300
1429
#: bzrlib/builtins.py:2301
1430
1430
msgid ""
1431
1431
" When logging a range of revisions using -rX..Y, log starts at\n"
1432
1432
" revision Y and searches back in history through the primary\n"
1436
1436
" a nested merge revision and the log will be truncated accordingly."
1437
1437
msgstr ""
1438
1438
1439
#: bzrlib/builtins.py:2307
1439
#: bzrlib/builtins.py:2308
1440
1440
msgid ":Path filtering:"
1441
1441
msgstr ""
1442
1442
1443
#: bzrlib/builtins.py:2309
1443
#: bzrlib/builtins.py:2310
1444
1444
msgid ""
1445
1445
" If parameters are given and the first one is not a branch, the log\n"
1446
1446
" will be filtered to show only those revisions that changed the\n"
1447
1447
" nominated files or directories."
1448
1448
msgstr ""
1449
1449
1450
#: bzrlib/builtins.py:2313
1450
#: bzrlib/builtins.py:2314
1451
1451
msgid ""
1452
1452
" Filenames are interpreted within their historical context. To log a\n"
1453
1453
" deleted file, specify a revision range so that the file existed at\n"
1454
1454
" the end or start of the range."
1455
1455
msgstr ""
1456
1456
1457
#: bzrlib/builtins.py:2317
1457
#: bzrlib/builtins.py:2318
1458
1458
msgid ""
1459
1459
" Historical context is also important when interpreting pathnames of\n"
1460
1460
" renamed files/directories. Consider the following example:"
1461
1461
msgstr ""
1462
1462
1463
#: bzrlib/builtins.py:2320
1463
#: bzrlib/builtins.py:2321
1464
1464
msgid ""
1465
1465
" * revision 1: add tutorial.txt\n"
1466
1466
" * revision 2: modify tutorial.txt\n"
1467
1467
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1468
1468
msgstr ""
1469
1469
1470
#: bzrlib/builtins.py:2324
1470
#: bzrlib/builtins.py:2325
1471
1471
msgid " In this case:"
1472
1472
msgstr ""
1473
1473
1474
#: bzrlib/builtins.py:2326
1474
#: bzrlib/builtins.py:2327
1475
1475
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1476
1476
msgstr ""
1477
1477
1478
#: bzrlib/builtins.py:2328
1478
#: bzrlib/builtins.py:2329
1479
1479
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1480
1480
msgstr ""
1481
1481
1482
#: bzrlib/builtins.py:2330
1482
#: bzrlib/builtins.py:2331
1483
1483
msgid ""
1484
1484
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1485
1485
" the original file in revision 2."
1486
1486
msgstr ""
1487
1487
1488
#: bzrlib/builtins.py:2333
1488
#: bzrlib/builtins.py:2334
1489
1489
msgid ""
1490
1490
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1491
1491
" was no file called guide.txt in revision 2."
1492
1492
msgstr ""
1493
1493
1494
#: bzrlib/builtins.py:2336
1494
#: bzrlib/builtins.py:2337
1495
1495
msgid ""
1496
1496
" Renames are always followed by log. By design, there is no need to\n"
1497
1497
" explicitly ask for this (and no way to stop logging a file back\n"
1498
1498
" until it was last renamed)."
1499
1499
msgstr ""
1500
1500
1501
#: bzrlib/builtins.py:2340
1501
#: bzrlib/builtins.py:2341
1502
1502
msgid ":Other filtering:"
1503
1503
msgstr ""
1504
1504
1505
#: bzrlib/builtins.py:2342
1505
#: bzrlib/builtins.py:2343
1506
1506
msgid ""
1507
1507
" The --match option can be used for finding revisions that match a\n"
1508
1508
" regular expression in a commit message, committer, author or bug.\n"
1511
1511
" --match-message can be used to only match a specific field."
1512
1512
msgstr ""
1513
1513
1514
#: bzrlib/builtins.py:2348
1514
#: bzrlib/builtins.py:2349
1515
1515
msgid ":Tips & tricks:"
1516
1516
msgstr ""
1517
1517
1518
#: bzrlib/builtins.py:2350
1518
#: bzrlib/builtins.py:2351
1519
1519
msgid ""
1520
1520
" GUI tools and IDEs are often better at exploring history than command\n"
1521
1521
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1524
1524
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1525
1525
msgstr ""
1526
1526
1527
#: bzrlib/builtins.py:2356
1527
#: bzrlib/builtins.py:2357
1528
1528
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1529
1529
msgstr ""
1530
1530
1531
#: bzrlib/builtins.py:2358
1531
#: bzrlib/builtins.py:2359
1532
1532
msgid ""
1533
1533
" [ALIASES]\n"
1534
1534
" tip = log -r-1\n"
1536
1536
" show = log -v -p"
1537
1537
msgstr ""
1538
1538
1539
#: bzrlib/builtins.py:2363
1539
#: bzrlib/builtins.py:2364
1540
1540
msgid ""
1541
1541
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1542
1542
" will show the last 10 mainline revisions. To see the details of a\n"
1543
1543
" particular revision X, ``bzr show -rX``."
1544
1544
msgstr ""
1545
1545
1546
#: bzrlib/builtins.py:2367
1546
#: bzrlib/builtins.py:2368
1547
1547
msgid ""
1548
1548
" If you are interested in looking deeper into a particular merge X,\n"
1549
1549
" use ``bzr log -n0 -rX``."
1550
1550
msgstr ""
1551
1551
1552
#: bzrlib/builtins.py:2370
1552
#: bzrlib/builtins.py:2371
1553
1553
msgid ""
1554
1554
" ``bzr log -v`` on a branch with lots of history is currently\n"
1555
1555
" very slow. A fix for this issue is currently under development.\n"
1557
1557
" be given when using the -v option."
1558
1558
msgstr ""
1559
1559
1560
#: bzrlib/builtins.py:2375
1560
#: bzrlib/builtins.py:2376
1561
1561
msgid ""
1562
1562
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1563
1563
" used to find revisions matching user names, commit messages, etc.\n"
1565
1565
" a list of words but not others."
1566
1566
msgstr ""
1567
1567
1568
#: bzrlib/builtins.py:2380
1568
#: bzrlib/builtins.py:2381
1569
1569
msgid ""
1570
1570
" When exploring non-mainline history on large projects with deep\n"
1571
1571
" history, the performance of log can be greatly improved by installing\n"
1574
1574
msgstr ""
1575
1575
1576
1576
# help of 'forward' option of 'log' command
1577
#: bzrlib/builtins.py:2389
1577
#: bzrlib/builtins.py:2390
1578
1578
msgid "Show from oldest to newest."
1579
1579
msgstr ""
1580
1580
1581
1581
# help of 'verbose' option of 'log' command
1582
#: bzrlib/builtins.py:2392
1582
#: bzrlib/builtins.py:2393
1583
1583
msgid "Show files changed in each revision."
1584
1584
msgstr ""
1585
1585
1586
1586
# help of 'change' option of 'log' command
1587
#: bzrlib/builtins.py:2398
1587
#: bzrlib/builtins.py:2399
1588
1588
msgid "Show just the specified revision. See also \"help revisionspec\"."
1589
1589
msgstr ""
1590
1590
1591
1591
# help of 'authors' option of 'log' command
1592
#: bzrlib/builtins.py:2402
1592
#: bzrlib/builtins.py:2403
1593
1593
msgid "What names to list as authors - first, all or committer."
1594
1594
msgstr ""
1595
1595
1596
1596
# title of 'authors' option of 'log' command
1597
#: bzrlib/builtins.py:2403
1597
#: bzrlib/builtins.py:2404
1598
1598
msgid "Authors"
1599
1599
msgstr ""
1600
1600
1601
1601
# help of 'levels' option of 'log' command
1602
#: bzrlib/builtins.py:2408
1602
#: bzrlib/builtins.py:2409
1603
1603
msgid "Number of levels to display - 0 for all, 1 for flat."
1604
1604
msgstr ""
1605
1605
1606
1606
# help of 'limit' option of 'log' command
1607
#: bzrlib/builtins.py:2418
1607
#: bzrlib/builtins.py:2419
1608
1608
msgid "Limit the output to the first N revisions."
1609
1609
msgstr ""
1610
1610
1611
1611
# help of 'show-diff' option of 'log' command
1612
#: bzrlib/builtins.py:2423
1612
#: bzrlib/builtins.py:2424
1613
1613
msgid "Show changes made in each revision as a patch."
1614
1614
msgstr ""
1615
1615
1616
# help of 'include-merges' option of 'log' command
1617
#: bzrlib/builtins.py:2425
1616
# help of 'include-merged' option of 'log' command
1617
#: bzrlib/builtins.py:2426
1618
1618
msgid "Show merged revisions like --levels 0 does."
1619
1619
msgstr ""
1620
1620
1621
# help of 'omit-merges' option of 'log' command
1622
#: bzrlib/builtins.py:2430
1623
msgid "Do not report commits with more than one parent."
1624
msgstr ""
1625
1621
1626
# help of 'exclude-common-ancestry' option of 'log' command
1622
#: bzrlib/builtins.py:2427
1627
#: bzrlib/builtins.py:2432
1623
1628
msgid ""
1624
1629
"Display only the revisions that are not part of both ancestries (require -"
1625
1630
"rX..Y)"
1626
1631
msgstr ""
1627
1632
1628
1633
# help of 'signatures' option of 'log' command
1629
#: bzrlib/builtins.py:2431
1634
#: bzrlib/builtins.py:2436
1630
1635
msgid "Show digital signature validity"
1631
1636
msgstr ""
1632
1637
1633
1638
# help of 'match' option of 'log' command
1634
#: bzrlib/builtins.py:2434
1639
#: bzrlib/builtins.py:2439
1635
1640
msgid "Show revisions whose properties match this expression."
1636
1641
msgstr ""
1637
1642
1638
1643
# help of 'match-message' option of 'log' command
1639
#: bzrlib/builtins.py:2438
1644
#: bzrlib/builtins.py:2443
1640
1645
msgid "Show revisions whose message matches this expression."
1641
1646
msgstr ""
1642
1647
1643
1648
# help of 'match-committer' option of 'log' command
1644
#: bzrlib/builtins.py:2442
1649
#: bzrlib/builtins.py:2447
1645
1650
msgid "Show revisions whose committer matches this expression."
1646
1651
msgstr ""
1647
1652
1648
1653
# help of 'match-author' option of 'log' command
1649
#: bzrlib/builtins.py:2446
1654
#: bzrlib/builtins.py:2451
1650
1655
msgid "Show revisions whose authors match this expression."
1651
1656
msgstr ""
1652
1657
1653
1658
# help of 'match-bugs' option of 'log' command
1654
#: bzrlib/builtins.py:2450
1659
#: bzrlib/builtins.py:2455
1655
1660
msgid "Show revisions whose bugs match this expression."
1656
1661
msgstr ""
1657
1662
1658
#: bzrlib/builtins.py:2487
1663
#: bzrlib/builtins.py:2509
1659
1664
msgid "--exclude-common-ancestry requires -r with two revisions"
1660
1665
msgstr ""
1661
1666
1662
#: bzrlib/builtins.py:2493
1663
msgid "--levels and --include-merges are mutually exclusive"
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2500
1667
msgid "--revision and --change are mutually exclusive"
1668
msgstr ""
1669
1670
#: bzrlib/builtins.py:2513
1667
#: bzrlib/builtins.py:2537
1671
1668
#, python-format
1672
1669
msgid "Path unknown at end or start of revision range: %s"
1673
1670
msgstr ""
1674
1671
1675
#: bzrlib/builtins.py:2630
1672
#: bzrlib/builtins.py:2654
1676
1673
#, python-format
1677
1674
msgid "bzr %s doesn't accept two revisions in different branches."
1678
1675
msgstr ""
1679
1676
1680
#: bzrlib/builtins.py:2646
1677
#: bzrlib/builtins.py:2670
1681
1678
#, python-format
1682
1679
msgid "bzr %s --revision takes one or two values."
1683
1680
msgstr ""
1684
1681
1685
#: bzrlib/builtins.py:2691
1682
#: bzrlib/builtins.py:2715
1686
1683
msgid ""
1687
1684
"List files in a tree.\n"
1688
1685
" "
1689
1686
msgstr ""
1690
1687
1691
1688
# help of 'recursive' option of 'ls' command
1692
#: bzrlib/builtins.py:2700
1689
#: bzrlib/builtins.py:2724
1693
1690
msgid "Recurse into subdirectories."
1694
1691
msgstr ""
1695
1692
1696
1693
# help of 'from-root' option of 'ls' command
1697
#: bzrlib/builtins.py:2702
1694
#: bzrlib/builtins.py:2726
1698
1695
msgid "Print paths relative to the root of the branch."
1699
1696
msgstr ""
1700
1697
1701
1698
# help of 'unknown' option of 'ls' command
1702
#: bzrlib/builtins.py:2704
1699
#: bzrlib/builtins.py:2728
1703
1700
msgid "Print unknown files."
1704
1701
msgstr ""
1705
1702
1706
1703
# help of 'versioned' option of 'ls' command
1707
#: bzrlib/builtins.py:2705
1704
#: bzrlib/builtins.py:2729
1708
1705
msgid "Print versioned files."
1709
1706
msgstr ""
1710
1707
1711
1708
# help of 'ignored' option of 'ls' command
1712
#: bzrlib/builtins.py:2708
1709
#: bzrlib/builtins.py:2732
1713
1710
msgid "Print ignored files."
1714
1711
msgstr ""
1715
1712
1716
1713
# help of 'kind' option of 'ls' command
1717
#: bzrlib/builtins.py:2710
1714
#: bzrlib/builtins.py:2734
1718
1715
msgid "List entries of a particular kind: file, directory, symlink."
1719
1716
msgstr ""
1720
1717
1721
#: bzrlib/builtins.py:2723
1718
#: bzrlib/builtins.py:2747
1722
1719
msgid "invalid kind specified"
1723
1720
msgstr ""
1724
1721
1725
#: bzrlib/builtins.py:2726
1722
#: bzrlib/builtins.py:2750
1726
1723
msgid "Cannot set both --verbose and --null"
1727
1724
msgstr ""
1728
1725
1729
#: bzrlib/builtins.py:2735
1726
#: bzrlib/builtins.py:2759
1730
1727
msgid "cannot specify both --from-root and PATH"
1731
1728
msgstr ""
1732
1729
1733
#: bzrlib/builtins.py:2822
1730
#: bzrlib/builtins.py:2846
1734
1731
msgid "Ignore specified files or patterns."
1735
1732
msgstr ""
1736
1733
1737
#: bzrlib/builtins.py:2824
1734
#: bzrlib/builtins.py:2848
1738
1735
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1739
1736
msgstr ""
1740
1737
1741
#: bzrlib/builtins.py:2826
1738
#: bzrlib/builtins.py:2850
1742
1739
msgid ""
1743
1740
"If a .bzrignore file does not exist, the ignore command\n"
1744
1741
"will create one and add the specified files or patterns to the newly\n"
1747
1744
"the use of the ignore command will require an explicit add command."
1748
1745
msgstr ""
1749
1746
1750
#: bzrlib/builtins.py:2832
1747
#: bzrlib/builtins.py:2856
1751
1748
msgid ""
1752
1749
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1753
1750
"After adding, editing or deleting that file either indirectly by\n"
1755
1752
"it."
1756
1753
msgstr ""
1757
1754
1758
#: bzrlib/builtins.py:2837
1755
#: bzrlib/builtins.py:2861
1759
1756
msgid ""
1760
1757
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1761
1758
"the global ignore file can be found in the application data directory as\n"
1764
1761
"can be edited directly using an editor."
1765
1762
msgstr ""
1766
1763
1767
#: bzrlib/builtins.py:2843
1764
#: bzrlib/builtins.py:2867
1768
1765
msgid ""
1769
1766
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1770
1767
"precedence over regular ignores. Such exceptions are used to specify\n"
1771
1768
"files that should be versioned which would otherwise be ignored."
1772
1769
msgstr ""
1773
1770
1774
#: bzrlib/builtins.py:2847
1771
#: bzrlib/builtins.py:2871
1775
1772
msgid ""
1776
1773
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1777
1774
"precedence over the '!' exception patterns."
1778
1775
msgstr ""
1779
1776
1780
#: bzrlib/builtins.py:2850
1777
#: bzrlib/builtins.py:2874
1781
1778
msgid ""
1782
1779
":Notes: \n"
1783
1780
" \n"
1785
1782
" the shell on Unix."
1786
1783
msgstr ""
1787
1784
1788
#: bzrlib/builtins.py:2855
1785
#: bzrlib/builtins.py:2879
1789
1786
msgid ""
1790
1787
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1791
1788
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1792
1789
msgstr ""
1793
1790
1794
#: bzrlib/builtins.py:2858
1791
#: bzrlib/builtins.py:2882
1795
1792
msgid ""
1796
1793
":Examples:\n"
1797
1794
" Ignore the top level Makefile::"
1798
1795
msgstr ""
1799
1796
1800
#: bzrlib/builtins.py:2861
1797
#: bzrlib/builtins.py:2885
1801
1798
msgid " bzr ignore ./Makefile"
1802
1799
msgstr ""
1803
1800
1804
#: bzrlib/builtins.py:2863
1801
#: bzrlib/builtins.py:2887
1805
1802
msgid " Ignore .class files in all directories...::"
1806
1803
msgstr ""
1807
1804
1808
#: bzrlib/builtins.py:2865
1805
#: bzrlib/builtins.py:2889
1809
1806
msgid " bzr ignore \"*.class\""
1810
1807
msgstr ""
1811
1808
1812
#: bzrlib/builtins.py:2867
1809
#: bzrlib/builtins.py:2891
1813
1810
msgid " ...but do not ignore \"special.class\"::"
1814
1811
msgstr ""
1815
1812
1816
#: bzrlib/builtins.py:2869
1813
#: bzrlib/builtins.py:2893
1817
1814
msgid " bzr ignore \"!special.class\""
1818
1815
msgstr ""
1819
1816
1820
#: bzrlib/builtins.py:2871
1817
#: bzrlib/builtins.py:2895
1821
1818
msgid " Ignore files whose name begins with the \"#\" character::"
1822
1819
msgstr ""
1823
1820
1824
#: bzrlib/builtins.py:2873
1821
#: bzrlib/builtins.py:2897
1825
1822
msgid " bzr ignore \"RE:^#\""
1826
1823
msgstr ""
1827
1824
1828
#: bzrlib/builtins.py:2875
1825
#: bzrlib/builtins.py:2899
1829
1826
msgid " Ignore .o files under the lib directory::"
1830
1827
msgstr ""
1831
1828
1832
#: bzrlib/builtins.py:2877
1829
#: bzrlib/builtins.py:2901
1833
1830
msgid " bzr ignore \"lib/**/*.o\""
1834
1831
msgstr ""
1835
1832
1836
#: bzrlib/builtins.py:2881
1833
#: bzrlib/builtins.py:2905
1837
1834
msgid " bzr ignore \"RE:lib/.*\\.o\""
1838
1835
msgstr ""
1839
1836
1840
#: bzrlib/builtins.py:2883
1837
#: bzrlib/builtins.py:2907
1841
1838
msgid " Ignore everything but the \"debian\" toplevel directory::"
1842
1839
msgstr ""
1843
1840
1844
#: bzrlib/builtins.py:2885
1841
#: bzrlib/builtins.py:2909
1845
1842
msgid ""
1846
1843
" bzr ignore \"RE:(?!debian/).*\"\n"
1847
1844
" \n"
1854
1851
msgstr ""
1855
1852
1856
1853
# help of 'default-rules' option of 'ignore' command
1857
#: bzrlib/builtins.py:2899
1854
#: bzrlib/builtins.py:2923
1858
1855
msgid "Display the default ignore rules that bzr uses."
1859
1856
msgstr ""
1860
1857
1861
#: bzrlib/builtins.py:2911
1858
#: bzrlib/builtins.py:2935
1862
1859
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1863
1860
msgstr ""
1864
1861
1865
#: bzrlib/builtins.py:2922
1862
#: bzrlib/builtins.py:2946
1866
1863
#, python-format
1867
1864
msgid "Invalid ignore pattern found. %s"
1868
1865
msgid_plural "Invalid ignore patterns found. %s"
1869
1866
msgstr[0] ""
1870
1867
msgstr[1] ""
1871
1868
1872
#: bzrlib/builtins.py:2931
1869
#: bzrlib/builtins.py:2955
1873
1870
msgid "NAME_PATTERN should not be an absolute path"
1874
1871
msgstr ""
1875
1872
1876
#: bzrlib/builtins.py:2944
1873
#: bzrlib/builtins.py:2968
1877
1874
#, python-format
1878
1875
msgid ""
1879
1876
"Warning: the following files are version controlled and match your ignore "
1883
1880
"them.\n"
1884
1881
msgstr ""
1885
1882
1886
#: bzrlib/builtins.py:2951
1883
#: bzrlib/builtins.py:2975
1887
1884
msgid "List ignored files and the patterns that matched them."
1888
1885
msgstr ""
1889
1886
1890
#: bzrlib/builtins.py:2953
1887
#: bzrlib/builtins.py:2977
1891
1888
msgid ""
1892
1889
"List all the ignored files and the ignore pattern that caused the file to\n"
1893
1890
"be ignored."
1894
1891
msgstr ""
1895
1892
1896
#: bzrlib/builtins.py:2956
1893
#: bzrlib/builtins.py:2980
1897
1894
msgid "Alternatively, to list just the files::"
1898
1895
msgstr ""
1899
1896
1900
#: bzrlib/builtins.py:2958
1897
#: bzrlib/builtins.py:2982
1901
1898
msgid " bzr ls --ignored"
1902
1899
msgstr ""
1903
1900
1904
#: bzrlib/builtins.py:2992
1901
#: bzrlib/builtins.py:3016
1905
1902
#, python-format
1906
1903
msgid "not a valid revision-number: %r"
1907
1904
msgstr ""
1908
1905
1909
#: bzrlib/builtins.py:2999
1906
#: bzrlib/builtins.py:3023
1910
1907
msgid "Export current or past revision to a destination directory or archive."
1911
1908
msgstr ""
1912
1909
1913
#: bzrlib/builtins.py:3001
1910
#: bzrlib/builtins.py:3025
1914
1911
msgid "If no revision is specified this exports the last committed revision."
1915
1912
msgstr ""
1916
1913
1917
#: bzrlib/builtins.py:3003
1914
#: bzrlib/builtins.py:3027
1918
1915
msgid ""
1919
1916
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1920
1917
"given, try to find the format with the extension. If no extension\n"
1921
1918
"is found exports to a directory (equivalent to --format=dir)."
1922
1919
msgstr ""
1923
1920
1924
#: bzrlib/builtins.py:3007
1921
#: bzrlib/builtins.py:3031
1925
1922
msgid ""
1926
1923
"If root is supplied, it will be used as the root directory inside\n"
1927
1924
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1928
1925
"to the exported filename. The root option has no effect for 'dir' format."
1929
1926
msgstr ""
1930
1927
1931
#: bzrlib/builtins.py:3011
1928
#: bzrlib/builtins.py:3035
1932
1929
msgid ""
1933
1930
"If branch is omitted then the branch containing the current working\n"
1934
1931
"directory will be used."
1935
1932
msgstr ""
1936
1933
1937
#: bzrlib/builtins.py:3014
1934
#: bzrlib/builtins.py:3038
1938
1935
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1939
1936
msgstr ""
1940
1937
1941
#: bzrlib/builtins.py:3016
1938
#: bzrlib/builtins.py:3040
1942
1939
msgid ""
1943
1940
" ================= =========================\n"
1944
1941
" Supported formats Autodetected by extension\n"
1952
1949
msgstr ""
1953
1950
1954
1951
# help of 'format' option of 'export' command
1955
#: bzrlib/builtins.py:3030
1952
#: bzrlib/builtins.py:3054
1956
1953
msgid "Type of file to export to."
1957
1954
msgstr ""
1958
1955
1959
1956
# help of 'filters' option of 'export' command
1960
#: bzrlib/builtins.py:3033
1957
#: bzrlib/builtins.py:3057
1961
1958
msgid "Apply content filters to export the convenient form."
1962
1959
msgstr ""
1963
1960
1964
1961
# help of 'root' option of 'export' command
1965
#: bzrlib/builtins.py:3037
1962
#: bzrlib/builtins.py:3061
1966
1963
msgid "Name of the root directory inside the exported file."
1967
1964
msgstr ""
1968
1965
1969
1966
# help of 'per-file-timestamps' option of 'export' command
1970
#: bzrlib/builtins.py:3039
1967
#: bzrlib/builtins.py:3063
1971
1968
msgid ""
1972
1969
"Set modification time of files to that of the last revision in which it was "
1973
1970
"changed."
1974
1971
msgstr ""
1975
1972
1976
#: bzrlib/builtins.py:3059
1973
#: bzrlib/builtins.py:3083
1977
1974
#, python-format
1978
1975
msgid "Unsupported export format: %s"
1979
1976
msgstr ""
1980
1977
1981
#: bzrlib/builtins.py:3063
1978
#: bzrlib/builtins.py:3087
1982
1979
msgid "Write the contents of a file as of a given revision to standard output."
1983
1980
msgstr ""
1984
1981
1985
#: bzrlib/builtins.py:3065
1982
#: bzrlib/builtins.py:3089
1986
1983
msgid "If no revision is nominated, the last revision is used."
1987
1984
msgstr ""
1988
1985
1989
#: bzrlib/builtins.py:3067
1986
#: bzrlib/builtins.py:3091
1990
1987
msgid ""
1991
1988
"Note: Take care to redirect standard output when using this command on a\n"
1992
1989
"binary file."
1993
1990
msgstr ""
1994
1991
1995
1992
# help of 'filters' option of 'cat' command
1996
#: bzrlib/builtins.py:3074
1993
#: bzrlib/builtins.py:3098
1997
1994
msgid "Apply content filters to display the convenience form."
1998
1995
msgstr ""
1999
1996
2000
#: bzrlib/builtins.py:3085
1997
#: bzrlib/builtins.py:3109
2001
1998
msgid "bzr cat --revision takes exactly one revision specifier"
2002
1999
msgstr ""
2003
2000
2004
#: bzrlib/builtins.py:3110 bzrlib/builtins.py:3122
2001
#: bzrlib/builtins.py:3134 bzrlib/builtins.py:3146
2005
2002
msgid "{0!r} is not present in revision {1}"
2006
2003
msgstr ""
2007
2004
2008
#: bzrlib/builtins.py:3145
2005
#: bzrlib/builtins.py:3169
2009
2006
msgid "Commit changes into a new revision."
2010
2007
msgstr ""
2011
2008
2012
#: bzrlib/builtins.py:3147
2009
#: bzrlib/builtins.py:3171
2013
2010
msgid ""
2014
2011
"An explanatory message needs to be given for each commit. This is\n"
2015
2012
"often done by using the --message option (getting the message from the\n"
2019
2016
"boilerplate text loaded into the editor, use the --show-diff option."
2020
2017
msgstr ""
2021
2018
2022
#: bzrlib/builtins.py:3154
2019
#: bzrlib/builtins.py:3178
2023
2020
msgid ""
2024
2021
"By default, the entire tree is committed and the person doing the\n"
2025
2022
"commit is assumed to be the author. These defaults can be overridden\n"
2026
2023
"as explained below."
2027
2024
msgstr ""
2028
2025
2029
#: bzrlib/builtins.py:3158
2026
#: bzrlib/builtins.py:3182
2030
2027
msgid ":Selective commits:"
2031
2028
msgstr ""
2032
2029
2033
#: bzrlib/builtins.py:3160
2030
#: bzrlib/builtins.py:3184
2034
2031
msgid ""
2035
2032
" If selected files are specified, only changes to those files are\n"
2036
2033
" committed. If a directory is specified then the directory and\n"
2037
2034
" everything within it is committed."
2038
2035
msgstr ""
2039
2036
2040
#: bzrlib/builtins.py:3164
2037
#: bzrlib/builtins.py:3188
2041
2038
msgid ""
2042
2039
" When excludes are given, they take precedence over selected files.\n"
2043
2040
" For example, to commit only changes within foo, but not changes\n"
2044
2041
" within foo/bar::"
2045
2042
msgstr ""
2046
2043
2047
#: bzrlib/builtins.py:3168
2044
#: bzrlib/builtins.py:3192
2048
2045
msgid " bzr commit foo -x foo/bar"
2049
2046
msgstr ""
2050
2047
2051
#: bzrlib/builtins.py:3170
2048
#: bzrlib/builtins.py:3194
2052
2049
msgid " A selective commit after a merge is not yet supported."
2053
2050
msgstr ""
2054
2051
2055
#: bzrlib/builtins.py:3172
2052
#: bzrlib/builtins.py:3196
2056
2053
msgid ":Custom authors:"
2057
2054
msgstr ""
2058
2055
2059
#: bzrlib/builtins.py:3174
2056
#: bzrlib/builtins.py:3198
2060
2057
msgid ""
2061
2058
" If the author of the change is not the same person as the committer,\n"
2062
2059
" you can specify the author's name using the --author option. The\n"
2066
2063
" author."
2067
2064
msgstr ""
2068
2065
2069
#: bzrlib/builtins.py:3181
2066
#: bzrlib/builtins.py:3205
2070
2067
msgid ":Checks:"
2071
2068
msgstr ""
2072
2069
2073
#: bzrlib/builtins.py:3183
2070
#: bzrlib/builtins.py:3207
2074
2071
msgid ""
2075
2072
" A common mistake is to forget to add a new file or directory before\n"
2076
2073
" running the commit command. The --strict option checks for unknown\n"
2079
2076
" for details."
2080
2077
msgstr ""
2081
2078
2082
#: bzrlib/builtins.py:3189
2079
#: bzrlib/builtins.py:3213
2083
2080
msgid ":Things to note:"
2084
2081
msgstr ""
2085
2082
2086
#: bzrlib/builtins.py:3191
2083
#: bzrlib/builtins.py:3215
2087
2084
msgid ""
2088
2085
" If you accidentially commit the wrong changes or make a spelling\n"
2089
2086
" mistake in the commit message say, you can use the uncommit command\n"
2090
2087
" to undo it. See ``bzr help uncommit`` for details."
2091
2088
msgstr ""
2092
2089
2093
#: bzrlib/builtins.py:3195
2090
#: bzrlib/builtins.py:3219
2094
2091
msgid ""
2095
2092
" Hooks can also be configured to run after a commit. This allows you\n"
2096
2093
" to trigger updates to external systems like bug trackers. The --fixes\n"
2099
2096
msgstr ""
2100
2097
2101
2098
# help of 'exclude' option of 'commit' command
2102
#: bzrlib/builtins.py:3205
2099
#: bzrlib/builtins.py:3229
2103
2100
msgid "Do not consider changes made to a given path."
2104
2101
msgstr ""
2105
2102
2106
2103
# help of 'message' option of 'commit' command
2107
#: bzrlib/builtins.py:3208
2104
#: bzrlib/builtins.py:3232
2108
2105
msgid "Description of the new revision."
2109
2106
msgstr ""
2110
2107
2111
2108
# help of 'unchanged' option of 'commit' command
2112
#: bzrlib/builtins.py:3211
2109
#: bzrlib/builtins.py:3235
2113
2110
msgid "Commit even if nothing has changed."
2114
2111
msgstr ""
2115
2112
2116
2113
# help of 'file' option of 'commit' command
2117
#: bzrlib/builtins.py:3215
2114
#: bzrlib/builtins.py:3239
2118
2115
msgid "Take commit message from this file."
2119
2116
msgstr ""
2120
2117
2121
2118
# help of 'strict' option of 'commit' command
2122
#: bzrlib/builtins.py:3217
2119
#: bzrlib/builtins.py:3241
2123
2120
msgid "Refuse to commit if there are unknown files in the working tree."
2124
2121
msgstr ""
2125
2122
2126
2123
# help of 'commit-time' option of 'commit' command
2127
#: bzrlib/builtins.py:3220
2124
#: bzrlib/builtins.py:3244
2128
2125
msgid ""
2129
2126
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2130
2127
"08:00:00 +0100'."
2131
2128
msgstr ""
2132
2129
2133
2130
# help of 'fixes' option of 'commit' command
2134
#: bzrlib/builtins.py:3223
2131
#: bzrlib/builtins.py:3247
2135
2132
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2136
2133
msgstr ""
2137
2134
2138
2135
# help of 'author' option of 'commit' command
2139
#: bzrlib/builtins.py:3226
2136
#: bzrlib/builtins.py:3250
2140
2137
msgid "Set the author's name, if it's different from the committer."
2141
2138
msgstr ""
2142
2139
2143
2140
# help of 'local' option of 'commit' command
2144
#: bzrlib/builtins.py:3229
2141
#: bzrlib/builtins.py:3253
2145
2142
msgid ""
2146
2143
"Perform a local commit in a bound branch. Local commits are not pushed to "
2147
2144
"the master branch until a normal commit is performed."
2148
2145
msgstr ""
2149
2146
2150
2147
# help of 'show-diff' option of 'commit' command
2151
#: bzrlib/builtins.py:3235
2148
#: bzrlib/builtins.py:3259
2152
2149
msgid ""
2153
2150
"When no message is supplied, show the diff along with the status summary in "
2154
2151
"the message editor."
2155
2152
msgstr ""
2156
2153
2157
2154
# help of 'lossy' option of 'commit' command
2158
#: bzrlib/builtins.py:3238
2155
#: bzrlib/builtins.py:3262
2159
2156
msgid ""
2160
2157
"When committing to a foreign version control system do not push data that "
2161
2158
"can not be natively represented."
2162
2159
msgstr ""
2163
2160
2164
#: bzrlib/builtins.py:3256
2161
#: bzrlib/builtins.py:3280
2165
2162
#, python-format
2166
2163
msgid ""
2167
2164
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2169
2166
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2170
2167
msgstr ""
2171
2168
2172
#: bzrlib/builtins.py:3265
2169
#: bzrlib/builtins.py:3289
2173
2170
#, python-format
2174
2171
msgid ""
2175
2172
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2177
2174
"Commit refused."
2178
2175
msgstr ""
2179
2176
2180
#: bzrlib/builtins.py:3274
2177
#: bzrlib/builtins.py:3298
2181
2178
#, python-format
2182
2179
msgid "Unrecognized bug %s. Commit refused."
2183
2180
msgstr ""
2184
2181
2185
#: bzrlib/builtins.py:3277
2186
#, python-format
2187
msgid ""
2188
"%s\n"
2189
"Commit refused."
2190
msgstr ""
2191
2192
2182
#: bzrlib/builtins.py:3301
2183
#, python-format
2184
msgid ""
2185
"%s\n"
2186
"Commit refused."
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:3325
2193
2190
msgid "Could not parse --commit-time: "
2194
2191
msgstr ""
2195
2192
2196
#: bzrlib/builtins.py:3341
2193
#: bzrlib/builtins.py:3365
2197
2194
msgid "please specify either --message or --file"
2198
2195
msgstr ""
2199
2196
2200
#: bzrlib/builtins.py:3370
2197
#: bzrlib/builtins.py:3394
2201
2198
msgid "please specify a commit message with either --message or --file"
2202
2199
msgstr ""
2203
2200
2204
#: bzrlib/builtins.py:3373
2201
#: bzrlib/builtins.py:3397
2205
2202
msgid ""
2206
2203
"Empty commit message specified. Please specify a commit message with either "
2207
2204
"--message or --file or leave a blank message with --message \"\"."
2208
2205
msgstr ""
2209
2206
2210
#: bzrlib/builtins.py:3393
2207
#: bzrlib/builtins.py:3417
2211
2208
msgid ""
2212
2209
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2213
2210
"--unchanged to force an empty commit."
2214
2211
msgstr ""
2215
2212
2216
#: bzrlib/builtins.py:3397
2213
#: bzrlib/builtins.py:3421
2217
2214
msgid ""
2218
2215
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2219
2216
"resolve FILE\" to resolve."
2220
2217
msgstr ""
2221
2218
2222
#: bzrlib/builtins.py:3401
2219
#: bzrlib/builtins.py:3425
2223
2220
msgid "Commit refused because there are unknown files in the working tree."
2224
2221
msgstr ""
2225
2222
2226
#: bzrlib/builtins.py:3404
2223
#: bzrlib/builtins.py:3428
2227
2224
msgid ""
2228
2225
"\n"
2229
2226
"To commit to master branch, run update and then commit.\n"
2230
2227
"You can also pass --local to commit to continue working disconnected."
2231
2228
msgstr ""
2232
2229
2233
#: bzrlib/builtins.py:3412
2230
#: bzrlib/builtins.py:3436
2234
2231
msgid ""
2235
2232
"Validate working tree structure, branch consistency and repository history."
2236
2233
msgstr ""
2237
2234
2238
#: bzrlib/builtins.py:3414
2235
#: bzrlib/builtins.py:3438
2239
2236
msgid ""
2240
2237
"This command checks various invariants about branch and repository storage\n"
2241
2238
"to detect data corruption or bzr bugs."
2242
2239
msgstr ""
2243
2240
2244
#: bzrlib/builtins.py:3417
2241
#: bzrlib/builtins.py:3441
2245
2242
msgid ""
2246
2243
"The working tree and branch checks will only give output if a problem is\n"
2247
2244
"detected. The output fields of the repository check are:"
2248
2245
msgstr ""
2249
2246
2250
#: bzrlib/builtins.py:3420
2247
#: bzrlib/builtins.py:3444
2251
2248
msgid ""
2252
2249
"revisions\n"
2253
2250
" This is just the number of revisions checked. It doesn't\n"
2254
2251
" indicate a problem."
2255
2252
msgstr ""
2256
2253
2257
#: bzrlib/builtins.py:3424
2254
#: bzrlib/builtins.py:3448
2258
2255
msgid ""
2259
2256
"versionedfiles\n"
2260
2257
" This is just the number of versionedfiles checked. It\n"
2261
2258
" doesn't indicate a problem."
2262
2259
msgstr ""
2263
2260
2264
#: bzrlib/builtins.py:3428
2261
#: bzrlib/builtins.py:3452
2265
2262
msgid ""
2266
2263
"unreferenced ancestors\n"
2267
2264
" Texts that are ancestors of other texts, but\n"
2269
2266
" subtle problem that Bazaar can work around."
2270
2267
msgstr ""
2271
2268
2272
#: bzrlib/builtins.py:3433
2269
#: bzrlib/builtins.py:3457
2273
2270
msgid ""
2274
2271
"unique file texts\n"
2275
2272
" This is the total number of unique file contents\n"
2276
2273
" seen in the checked revisions. It does not indicate a problem."
2277
2274
msgstr ""
2278
2275
2279
#: bzrlib/builtins.py:3437
2276
#: bzrlib/builtins.py:3461
2280
2277
msgid ""
2281
2278
"repeated file texts\n"
2282
2279
" This is the total number of repeated texts seen\n"
2285
2282
" indicate a problem."
2286
2283
msgstr ""
2287
2284
2288
#: bzrlib/builtins.py:3443
2285
#: bzrlib/builtins.py:3467
2289
2286
msgid ""
2290
2287
"If no restrictions are specified, all Bazaar data that is found at the "
2291
2288
"given\n"
2292
2289
"location will be checked."
2293
2290
msgstr ""
2294
2291
2295
#: bzrlib/builtins.py:3446
2292
#: bzrlib/builtins.py:3470
2296
2293
msgid ":Examples:"
2297
2294
msgstr ""
2298
2295
2299
#: bzrlib/builtins.py:3448
2296
#: bzrlib/builtins.py:3472
2300
2297
msgid " Check the tree and branch at 'foo'::"
2301
2298
msgstr ""
2302
2299
2303
#: bzrlib/builtins.py:3450
2300
#: bzrlib/builtins.py:3474
2304
2301
msgid " bzr check --tree --branch foo"
2305
2302
msgstr ""
2306
2303
2307
#: bzrlib/builtins.py:3452
2304
#: bzrlib/builtins.py:3476
2308
2305
msgid " Check only the repository at 'bar'::"
2309
2306
msgstr ""
2310
2307
2311
#: bzrlib/builtins.py:3454
2308
#: bzrlib/builtins.py:3478
2312
2309
msgid " bzr check --repo bar"
2313
2310
msgstr ""
2314
2311
2315
#: bzrlib/builtins.py:3456
2312
#: bzrlib/builtins.py:3480
2316
2313
msgid " Check everything at 'baz'::"
2317
2314
msgstr ""
2318
2315
2319
#: bzrlib/builtins.py:3458
2316
#: bzrlib/builtins.py:3482
2320
2317
msgid " bzr check baz"
2321
2318
msgstr ""
2322
2319
2323
2320
# help of 'branch' option of 'check' command
2324
#: bzrlib/builtins.py:3464
2321
#: bzrlib/builtins.py:3488
2325
2322
msgid "Check the branch related to the current directory."
2326
2323
msgstr ""
2327
2324
2328
2325
# help of 'repo' option of 'check' command
2329
#: bzrlib/builtins.py:3466
2326
#: bzrlib/builtins.py:3490
2330
2327
msgid "Check the repository related to the current directory."
2331
2328
msgstr ""
2332
2329
2333
2330
# help of 'tree' option of 'check' command
2334
#: bzrlib/builtins.py:3468
2331
#: bzrlib/builtins.py:3492
2335
2332
msgid "Check the working tree related to the current directory."
2336
2333
msgstr ""
2337
2334
2338
#: bzrlib/builtins.py:3482
2335
#: bzrlib/builtins.py:3506
2339
2336
msgid "Upgrade a repository, branch or working tree to a newer format."
2340
2337
msgstr ""
2341
2338
2342
#: bzrlib/builtins.py:3484
2339
#: bzrlib/builtins.py:3508
2343
2340
msgid ""
2344
2341
"When the default format has changed after a major new release of\n"
2345
2342
"Bazaar, you may be informed during certain operations that you\n"
2348
2345
"with older repositories or with older versions of Bazaar."
2349
2346
msgstr ""
2350
2347
2351
#: bzrlib/builtins.py:3490
2348
#: bzrlib/builtins.py:3514
2352
2349
msgid ""
2353
2350
"If you wish to upgrade to a particular format rather than the\n"
2354
2351
"current default, that can be specified using the --format option.\n"
2358
2355
"2.x default) so downgrading is not always possible."
2359
2356
msgstr ""
2360
2357
2361
#: bzrlib/builtins.py:3497
2358
#: bzrlib/builtins.py:3521
2362
2359
msgid ""
2363
2360
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2364
2361
"process (where # is a number). By default, this is left there on\n"
2369
2366
"afterwards."
2370
2367
msgstr ""
2371
2368
2372
#: bzrlib/builtins.py:3505
2369
#: bzrlib/builtins.py:3529
2373
2370
msgid ""
2374
2371
"If the location given is a shared repository, dependent branches\n"
2375
2372
"are also converted provided the repository converts successfully.\n"
2377
2374
"tried."
2378
2375
msgstr ""
2379
2376
2380
#: bzrlib/builtins.py:3510
2377
#: bzrlib/builtins.py:3534
2381
2378
msgid ""
2382
2379
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2383
2380
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2384
2381
msgstr ""
2385
2382
2386
2383
# help of 'format' option of 'upgrade' command
2387
#: bzrlib/builtins.py:3518
2384
#: bzrlib/builtins.py:3542
2388
2385
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2389
2386
msgstr ""
2390
2387
2391
2388
# title of 'format' option of 'init' command
2392
#: bzrlib/builtins.py:3522
2389
#: bzrlib/builtins.py:3546
2393
2390
msgid "Branch format"
2394
2391
msgstr ""
2395
2392
2396
2393
# help of 'clean' option of 'upgrade' command
2397
#: bzrlib/builtins.py:3524
2394
#: bzrlib/builtins.py:3548
2398
2395
msgid "Remove the backup.bzr directory if successful."
2399
2396
msgstr ""
2400
2397
2401
#: bzrlib/builtins.py:3541
2398
#: bzrlib/builtins.py:3565
2402
2399
msgid "Show or set bzr user id."
2403
2400
msgstr ""
2404
2401
2405
#: bzrlib/builtins.py:3543
2402
#: bzrlib/builtins.py:3567
2406
2403
msgid ""
2407
2404
":Examples:\n"
2408
2405
" Show the email of the current user::"
2409
2406
msgstr ""
2410
2407
2411
#: bzrlib/builtins.py:3546
2408
#: bzrlib/builtins.py:3570
2412
2409
msgid " bzr whoami --email"
2413
2410
msgstr ""
2414
2411
2415
#: bzrlib/builtins.py:3548
2412
#: bzrlib/builtins.py:3572
2416
2413
msgid " Set the current user::"
2417
2414
msgstr ""
2418
2415
2419
#: bzrlib/builtins.py:3550
2416
#: bzrlib/builtins.py:3574
2420
2417
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2421
2418
msgstr ""
2422
2419
2423
2420
# help of 'email' option of 'whoami' command
2424
#: bzrlib/builtins.py:3554
2421
#: bzrlib/builtins.py:3578
2425
2422
msgid "Display email address only."
2426
2423
msgstr ""
2427
2424
2428
2425
# help of 'branch' option of 'whoami' command
2429
#: bzrlib/builtins.py:3556
2426
#: bzrlib/builtins.py:3580
2430
2427
msgid "Set identity for the current branch instead of globally."
2431
2428
msgstr ""
2432
2429
2433
#: bzrlib/builtins.py:3580
2430
#: bzrlib/builtins.py:3604
2434
2431
msgid "--email can only be used to display existing identity"
2435
2432
msgstr ""
2436
2433
2437
#: bzrlib/builtins.py:3602
2434
#: bzrlib/builtins.py:3626
2438
2435
msgid "Print or set the branch nickname."
2439
2436
msgstr ""
2440
2437
2441
#: bzrlib/builtins.py:3604
2438
#: bzrlib/builtins.py:3628
2442
2439
msgid ""
2443
2440
"If unset, the tree root directory name is used as the nickname.\n"
2444
2441
"To print the current nickname, execute with no argument."
2445
2442
msgstr ""
2446
2443
2447
#: bzrlib/builtins.py:3607
2444
#: bzrlib/builtins.py:3631
2448
2445
msgid ""
2449
2446
"Bound branches use the nickname of its master branch unless it is set\n"
2450
2447
"locally."
2451
2448
msgstr ""
2452
2449
2453
#: bzrlib/builtins.py:3627
2450
#: bzrlib/builtins.py:3651
2454
2451
msgid "Set/unset and display aliases."
2455
2452
msgstr ""
2456
2453
2457
#: bzrlib/builtins.py:3629
2454
#: bzrlib/builtins.py:3653
2458
2455
msgid ""
2459
2456
":Examples:\n"
2460
2457
" Show the current aliases::"
2461
2458
msgstr ""
2462
2459
2463
#: bzrlib/builtins.py:3632
2460
#: bzrlib/builtins.py:3656
2464
2461
msgid " bzr alias"
2465
2462
msgstr ""
2466
2463
2467
#: bzrlib/builtins.py:3634
2464
#: bzrlib/builtins.py:3658
2468
2465
msgid " Show the alias specified for 'll'::"
2469
2466
msgstr ""
2470
2467
2471
#: bzrlib/builtins.py:3636
2468
#: bzrlib/builtins.py:3660
2472
2469
msgid " bzr alias ll"
2473
2470
msgstr ""
2474
2471
2475
#: bzrlib/builtins.py:3638
2472
#: bzrlib/builtins.py:3662
2476
2473
msgid " Set an alias for 'll'::"
2477
2474
msgstr ""
2478
2475
2479
#: bzrlib/builtins.py:3640
2476
#: bzrlib/builtins.py:3664
2480
2477
msgid " bzr alias ll=\"log --line -r-10..-1\""
2481
2478
msgstr ""
2482
2479
2483
#: bzrlib/builtins.py:3642
2480
#: bzrlib/builtins.py:3666
2484
2481
msgid " To remove an alias for 'll'::"
2485
2482
msgstr ""
2486
2483
2487
#: bzrlib/builtins.py:3644
2484
#: bzrlib/builtins.py:3668
2488
2485
msgid " bzr alias --remove ll"
2489
2486
msgstr ""
2490
2487
2491
2488
# help of 'remove' option of 'alias' command
2492
#: bzrlib/builtins.py:3649
2489
#: bzrlib/builtins.py:3673
2493
2490
msgid "Remove the alias."
2494
2491
msgstr ""
2495
2492
2496
#: bzrlib/builtins.py:3667
2493
#: bzrlib/builtins.py:3691
2497
2494
msgid "bzr alias --remove expects an alias to remove."
2498
2495
msgstr ""
2499
2496
2500
#: bzrlib/builtins.py:3839
2497
#: bzrlib/builtins.py:3863
2501
2498
msgid "subunit not available. subunit needs to be installed to use --subunit."
2502
2499
msgstr ""
2503
2500
2504
#: bzrlib/builtins.py:3856
2501
#: bzrlib/builtins.py:3880
2505
2502
msgid ""
2506
2503
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2507
2504
msgstr ""
2508
2505
2509
#: bzrlib/builtins.py:3903
2506
#: bzrlib/builtins.py:3927
2510
2507
msgid "Show version of bzr."
2511
2508
msgstr ""
2512
2509
2513
2510
# help of 'short' option of 'version' command
2514
#: bzrlib/builtins.py:3907
2511
#: bzrlib/builtins.py:3931
2515
2512
msgid "Print just the version number."
2516
2513
msgstr ""
2517
2514
2518
#: bzrlib/builtins.py:3926
2515
#: bzrlib/builtins.py:3950
2519
2516
msgid "It sure does!\n"
2520
2517
msgstr ""
2521
2518
2522
#: bzrlib/builtins.py:3950
2519
#: bzrlib/builtins.py:3974
2523
2520
#, python-format
2524
2521
msgid "merge base is revision %s\n"
2525
2522
msgstr ""
2526
2523
2527
#: bzrlib/builtins.py:3954
2524
#: bzrlib/builtins.py:3978
2528
2525
msgid "Perform a three-way merge."
2529
2526
msgstr ""
2530
2527
2531
#: bzrlib/builtins.py:3956
2528
#: bzrlib/builtins.py:3980
2532
2529
msgid ""
2533
2530
"The source of the merge can be specified either in the form of a branch,\n"
2534
2531
"or in the form of a path to a file containing a merge directive generated\n"
2539
2536
"the current working tree."
2540
2537
msgstr ""
2541
2538
2542
#: bzrlib/builtins.py:3964
2539
#: bzrlib/builtins.py:3988
2543
2540
msgid ""
2544
2541
"When merging from a branch, by default bzr will try to merge in all new\n"
2545
2542
"work from the other branch, automatically determining an appropriate base\n"
2546
2543
"revision. If this fails, you may need to give an explicit base."
2547
2544
msgstr ""
2548
2545
2549
#: bzrlib/builtins.py:3968
2546
#: bzrlib/builtins.py:3992
2550
2547
msgid ""
2551
2548
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2552
2549
"try to merge in all new work up to and including revision OTHER."
2553
2550
msgstr ""
2554
2551
2555
#: bzrlib/builtins.py:3971
2552
#: bzrlib/builtins.py:3995
2556
2553
msgid ""
2557
2554
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2558
2555
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2563
2560
"changes from the other branch is not stored in the commit."
2564
2561
msgstr ""
2565
2562
2566
#: bzrlib/builtins.py:3979
2563
#: bzrlib/builtins.py:4003
2567
2564
msgid "Revision numbers are always relative to the source branch."
2568
2565
msgstr ""
2569
2566
2570
#: bzrlib/builtins.py:3986
2567
#: bzrlib/builtins.py:4010
2571
2568
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2572
2569
msgstr ""
2573
2570
2574
#: bzrlib/builtins.py:3988
2571
#: bzrlib/builtins.py:4012
2575
2572
msgid ""
2576
2573
"If there is no default branch set, the first merge will set it (use\n"
2577
2574
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2579
2576
"only be saved if the remote location can be accessed."
2580
2577
msgstr ""
2581
2578
2582
#: bzrlib/builtins.py:3993
2579
#: bzrlib/builtins.py:4017
2583
2580
msgid ""
2584
2581
"The results of the merge are placed into the destination working\n"
2585
2582
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2586
2583
"committed to record the result of the merge."
2587
2584
msgstr ""
2588
2585
2589
#: bzrlib/builtins.py:3997
2586
#: bzrlib/builtins.py:4021
2590
2587
msgid ""
2591
2588
"merge refuses to run if there are any uncommitted changes, unless\n"
2592
2589
"--force is given. If --force is given, then the changes from the source \n"
2595
2592
"merge revision which has more than two parents."
2596
2593
msgstr ""
2597
2594
2598
#: bzrlib/builtins.py:4003
2595
#: bzrlib/builtins.py:4027
2599
2596
msgid ""
2600
2597
"If one would like to merge changes from the working tree of the other\n"
2601
2598
"branch without merging any committed revisions, the --uncommitted option\n"
2602
2599
"can be given."
2603
2600
msgstr ""
2604
2601
2605
#: bzrlib/builtins.py:4007
2602
#: bzrlib/builtins.py:4031
2606
2603
msgid ""
2607
2604
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2608
2605
"you to apply each diff hunk and file change, similar to \"shelve\"."
2609
2606
msgstr ""
2610
2607
2611
#: bzrlib/builtins.py:4010
2608
#: bzrlib/builtins.py:4034
2612
2609
msgid ""
2613
2610
":Examples:\n"
2614
2611
" To merge all new revisions from bzr.dev::"
2615
2612
msgstr ""
2616
2613
2617
#: bzrlib/builtins.py:4013
2614
#: bzrlib/builtins.py:4037
2618
2615
msgid " bzr merge ../bzr.dev"
2619
2616
msgstr ""
2620
2617
2621
#: bzrlib/builtins.py:4015
2618
#: bzrlib/builtins.py:4039
2622
2619
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2623
2620
msgstr ""
2624
2621
2625
#: bzrlib/builtins.py:4017
2622
#: bzrlib/builtins.py:4041
2626
2623
msgid " bzr merge -r 82 ../bzr.dev"
2627
2624
msgstr ""
2628
2625
2629
#: bzrlib/builtins.py:4019
2626
#: bzrlib/builtins.py:4043
2630
2627
msgid " To merge the changes introduced by 82, without previous changes::"
2631
2628
msgstr ""
2632
2629
2633
#: bzrlib/builtins.py:4021
2630
#: bzrlib/builtins.py:4045
2634
2631
msgid " bzr merge -r 81..82 ../bzr.dev"
2635
2632
msgstr ""
2636
2633
2637
#: bzrlib/builtins.py:4023
2634
#: bzrlib/builtins.py:4047
2638
2635
msgid " To apply a merge directive contained in /tmp/merge::"
2639
2636
msgstr ""
2640
2637
2641
#: bzrlib/builtins.py:4025
2638
#: bzrlib/builtins.py:4049
2642
2639
msgid " bzr merge /tmp/merge"
2643
2640
msgstr ""
2644
2641
2645
#: bzrlib/builtins.py:4027
2642
#: bzrlib/builtins.py:4051
2646
2643
msgid ""
2647
2644
" To create a merge revision with three parents from two branches\n"
2648
2645
" feature1a and feature1b:"
2649
2646
msgstr ""
2650
2647
2651
#: bzrlib/builtins.py:4030
2648
#: bzrlib/builtins.py:4054
2652
2649
msgid ""
2653
2650
" bzr merge ../feature1a\n"
2654
2651
" bzr merge ../feature1b --force\n"
2656
2653
msgstr ""
2657
2654
2658
2655
# help of 'force' option of 'merge' command
2659
#: bzrlib/builtins.py:4042
2656
#: bzrlib/builtins.py:4066
2660
2657
msgid "Merge even if the destination tree has uncommitted changes."
2661
2658
msgstr ""
2662
2659
2663
2660
# help of 'uncommitted' option of 'merge' command
2664
#: bzrlib/builtins.py:4048
2661
#: bzrlib/builtins.py:4072
2665
2662
msgid ""
2666
2663
"Apply uncommitted changes from a working copy, instead of branch changes."
2667
2664
msgstr ""
2668
2665
2669
2666
# help of 'pull' option of 'merge' command
2670
#: bzrlib/builtins.py:4050
2667
#: bzrlib/builtins.py:4074
2671
2668
msgid ""
2672
2669
"If the destination is already completely merged into the source, pull from "
2673
2670
"the source rather than merging. When this happens, you do not need to "
2675
2672
msgstr ""
2676
2673
2677
2674
# help of 'directory' option of 'merge' command
2678
#: bzrlib/builtins.py:4055
2675
#: bzrlib/builtins.py:4079
2679
2676
msgid ""
2680
2677
"Branch to merge into, rather than the one containing the working directory."
2681
2678
msgstr ""
2682
2679
2683
2680
# help of 'preview' option of 'merge' command
2684
#: bzrlib/builtins.py:4057
2681
#: bzrlib/builtins.py:4081
2685
2682
msgid "Instead of merging, show a diff of the merge."
2686
2683
msgstr ""
2687
2684
2688
2685
# help of 'interactive' option of 'merge' command
2689
#: bzrlib/builtins.py:4059
2686
#: bzrlib/builtins.py:4083
2690
2687
msgid "Select changes interactively."
2691
2688
msgstr ""
2692
2689
2693
#: bzrlib/builtins.py:4081
2690
#: bzrlib/builtins.py:4105
2694
2691
msgid ""
2695
2692
"Merging into empty branches not currently supported, https://bugs.launchpad."
2696
2693
"net/bzr/+bug/308562"
2697
2694
msgstr ""
2698
2695
2699
#: bzrlib/builtins.py:4108
2696
#: bzrlib/builtins.py:4132
2700
2697
msgid "Cannot use --uncommitted with bundles or merge directives."
2701
2698
msgstr ""
2702
2699
2703
#: bzrlib/builtins.py:4119
2700
#: bzrlib/builtins.py:4143
2704
2701
msgid "Cannot use --uncommitted and --revision at the same time."
2705
2702
msgstr ""
2706
2703
2707
#: bzrlib/builtins.py:4139
2704
#: bzrlib/builtins.py:4163
2708
2705
msgid "merger: "
2709
2706
msgstr ""
2710
2707
2711
#: bzrlib/builtins.py:4141 bzrlib/bundle/apply_bundle.py:67
2708
#: bzrlib/builtins.py:4165 bzrlib/bundle/apply_bundle.py:67
2712
2709
msgid "Nothing to do."
2713
2710
msgstr ""
2714
2711
2715
#: bzrlib/builtins.py:4145
2712
#: bzrlib/builtins.py:4169
2716
2713
msgid "Cannot pull individual files"
2717
2714
msgstr ""
2718
2715
2719
#: bzrlib/builtins.py:4153
2716
#: bzrlib/builtins.py:4177
2720
2717
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2721
2718
msgstr ""
2722
2719
2723
#: bzrlib/builtins.py:4211
2720
#: bzrlib/builtins.py:4235
2724
2721
#, python-format
2725
2722
msgid "Show-base is not supported for this merge type. %s"
2726
2723
msgstr ""
2727
2724
2728
#: bzrlib/builtins.py:4220
2725
#: bzrlib/builtins.py:4244
2729
2726
#, python-format
2730
2727
msgid "Conflict reduction is not supported for merge type %s."
2731
2728
msgstr ""
2732
2729
2733
#: bzrlib/builtins.py:4224
2730
#: bzrlib/builtins.py:4248
2734
2731
msgid "Cannot do conflict reduction and show base."
2735
2732
msgstr ""
2736
2733
2737
#: bzrlib/builtins.py:4335
2734
#: bzrlib/builtins.py:4359
2738
2735
msgid "No location specified or remembered"
2739
2736
msgstr ""
2740
2737
2741
#: bzrlib/builtins.py:4337
2738
#: bzrlib/builtins.py:4361
2742
2739
msgid "{0} remembered {1} location {2}"
2743
2740
msgstr ""
2744
2741
2745
#: bzrlib/builtins.py:4343
2742
#: bzrlib/builtins.py:4367
2746
2743
msgid "Redo a merge."
2747
2744
msgstr ""
2748
2745
2749
#: bzrlib/builtins.py:4345
2746
#: bzrlib/builtins.py:4369
2750
2747
msgid ""
2751
2748
"Use this if you want to try a different merge technique while resolving\n"
2752
2749
"conflicts. Some merge techniques are better than others, and remerge\n"
2753
2750
"lets you try different ones on different files."
2754
2751
msgstr ""
2755
2752
2756
#: bzrlib/builtins.py:4349
2753
#: bzrlib/builtins.py:4373
2757
2754
msgid ""
2758
2755
"The options for remerge have the same meaning and defaults as the ones for\n"
2759
2756
"merge. The difference is that remerge can (only) be run when there is a\n"
2760
2757
"pending merge, and it lets you specify particular files."
2761
2758
msgstr ""
2762
2759
2763
#: bzrlib/builtins.py:4353
2760
#: bzrlib/builtins.py:4377
2764
2761
msgid ""
2765
2762
":Examples:\n"
2766
2763
" Re-do the merge of all conflicted files, and show the base text in\n"
2767
2764
" conflict regions, in addition to the usual THIS and OTHER texts::"
2768
2765
msgstr ""
2769
2766
2770
#: bzrlib/builtins.py:4357
2767
#: bzrlib/builtins.py:4381
2771
2768
msgid " bzr remerge --show-base"
2772
2769
msgstr ""
2773
2770
2774
#: bzrlib/builtins.py:4359
2771
#: bzrlib/builtins.py:4383
2775
2772
msgid ""
2776
2773
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2777
2774
" additional processing to reduce the size of conflict regions::"
2778
2775
msgstr ""
2779
2776
2780
#: bzrlib/builtins.py:4362
2777
#: bzrlib/builtins.py:4386
2781
2778
msgid " bzr remerge --merge-type weave --reprocess foobar"
2782
2779
msgstr ""
2783
2780
2784
2781
# help of 'show-base' option of 'merge' command
2785
#: bzrlib/builtins.py:4369
2782
#: bzrlib/builtins.py:4393
2786
2783
msgid "Show base revision text in conflicts."
2787
2784
msgstr ""
2788
2785
2789
#: bzrlib/builtins.py:4381
2786
#: bzrlib/builtins.py:4405
2790
2787
msgid ""
2791
2788
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2792
2789
"merges."
2793
2790
msgstr ""
2794
2791
2795
#: bzrlib/builtins.py:4437
2792
#: bzrlib/builtins.py:4461
2796
2793
msgid "Revert files to a previous revision."
2797
2794
msgstr ""
2798
2795
2799
#: bzrlib/builtins.py:4439
2796
#: bzrlib/builtins.py:4463
2800
2797
msgid ""
2801
2798
"Giving a list of files will revert only those files. Otherwise, all files\n"
2802
2799
"will be reverted. If the revision is not specified with '--revision', the\n"
2803
2800
"last committed revision is used."
2804
2801
msgstr ""
2805
2802
2806
#: bzrlib/builtins.py:4443
2803
#: bzrlib/builtins.py:4467
2807
2804
msgid ""
2808
2805
"To remove only some changes, without reverting to a prior version, use\n"
2809
2806
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2812
2809
"certain changes on a hunk-by-hunk basis, see the shelve command."
2813
2810
msgstr ""
2814
2811
2815
#: bzrlib/builtins.py:4449
2812
#: bzrlib/builtins.py:4473
2816
2813
msgid ""
2817
2814
"By default, any files that have been manually changed will be backed up\n"
2818
2815
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2819
2816
"'.~#~' appended to their name, where # is a number."
2820
2817
msgstr ""
2821
2818
2822
#: bzrlib/builtins.py:4453
2819
#: bzrlib/builtins.py:4477
2823
2820
msgid ""
2824
2821
"When you provide files, you can use their current pathname or the pathname\n"
2825
2822
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2827
2824
"reverted."
2828
2825
msgstr ""
2829
2826
2830
#: bzrlib/builtins.py:4458
2827
#: bzrlib/builtins.py:4482
2831
2828
msgid ""
2832
2829
"If you have newly added files since the target revision, they will be\n"
2833
2830
"removed. If the files to be removed have been changed, backups will be\n"
2835
2832
"deleted."
2836
2833
msgstr ""
2837
2834
2838
#: bzrlib/builtins.py:4463
2835
#: bzrlib/builtins.py:4487
2839
2836
msgid ""
2840
2837
"The working tree contains a list of revisions that have been merged but\n"
2841
2838
"not yet committed. These revisions will be included as additional parents\n"
2847
2844
"reverting any files."
2848
2845
msgstr ""
2849
2846
2850
#: bzrlib/builtins.py:4472
2847
#: bzrlib/builtins.py:4496
2851
2848
msgid ""
2852
2849
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2853
2850
"changes from a branch in a single revision. To do this, perform the merge\n"
2862
2859
msgstr ""
2863
2860
2864
2861
# help of 'no-backup' option of 'revert' command
2865
#: bzrlib/builtins.py:4486
2862
#: bzrlib/builtins.py:4510
2866
2863
msgid "Do not save backups of reverted files."
2867
2864
msgstr ""
2868
2865
2869
2866
# help of 'forget-merges' option of 'revert' command
2870
#: bzrlib/builtins.py:4488
2867
#: bzrlib/builtins.py:4512
2871
2868
msgid "Remove pending merge marker, without changing any files."
2872
2869
msgstr ""
2873
2870
2874
#: bzrlib/builtins.py:4519
2871
#: bzrlib/builtins.py:4543
2875
2872
msgid ""
2876
2873
"Show help on a command or other topic.\n"
2877
2874
" "
2878
2875
msgstr ""
2879
2876
2880
2877
# help of 'long' option of 'help' command
2881
#: bzrlib/builtins.py:4524
2878
#: bzrlib/builtins.py:4548
2882
2879
msgid "Show help on all commands."
2883
2880
msgstr ""
2884
2881
2885
#: bzrlib/builtins.py:4553
2882
#: bzrlib/builtins.py:4577
2886
2883
msgid "Show unmerged/unpulled revisions between two branches."
2887
2884
msgstr ""
2888
2885
2889
#: bzrlib/builtins.py:4555
2886
#: bzrlib/builtins.py:4579
2890
2887
msgid "OTHER_BRANCH may be local or remote."
2891
2888
msgstr ""
2892
2889
2893
#: bzrlib/builtins.py:4557
2890
#: bzrlib/builtins.py:4581
2894
2891
msgid ""
2895
2892
"To filter on a range of revisions, you can use the command -r begin..end\n"
2896
2893
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2901
2898
" 0 - no missing revisions"
2902
2899
msgstr ""
2903
2900
2904
#: bzrlib/builtins.py:4567
2901
#: bzrlib/builtins.py:4591
2905
2902
msgid ""
2906
2903
" Determine the missing revisions between this and the branch at the\n"
2907
2904
" remembered pull location::"
2908
2905
msgstr ""
2909
2906
2910
#: bzrlib/builtins.py:4570
2907
#: bzrlib/builtins.py:4594
2911
2908
msgid " bzr missing"
2912
2909
msgstr ""
2913
2910
2914
#: bzrlib/builtins.py:4572
2911
#: bzrlib/builtins.py:4596
2915
2912
msgid " Determine the missing revisions between this and another branch::"
2916
2913
msgstr ""
2917
2914
2918
#: bzrlib/builtins.py:4574
2915
#: bzrlib/builtins.py:4598
2919
2916
msgid " bzr missing http://server/branch"
2920
2917
msgstr ""
2921
2918
2922
#: bzrlib/builtins.py:4576
2919
#: bzrlib/builtins.py:4600
2923
2920
msgid ""
2924
2921
" Determine the missing revisions up to a specific revision on the other\n"
2925
2922
" branch::"
2926
2923
msgstr ""
2927
2924
2928
#: bzrlib/builtins.py:4579
2925
#: bzrlib/builtins.py:4603
2929
2926
msgid " bzr missing -r ..-10"
2930
2927
msgstr ""
2931
2928
2932
#: bzrlib/builtins.py:4581
2929
#: bzrlib/builtins.py:4605
2933
2930
msgid ""
2934
2931
" Determine the missing revisions up to a specific revision on this\n"
2935
2932
" branch::"
2936
2933
msgstr ""
2937
2934
2938
#: bzrlib/builtins.py:4584
2935
#: bzrlib/builtins.py:4608
2939
2936
msgid " bzr missing --my-revision ..-10"
2940
2937
msgstr ""
2941
2938
2942
2939
# help of 'reverse' option of 'missing' command
2943
#: bzrlib/builtins.py:4591
2940
#: bzrlib/builtins.py:4615
2944
2941
msgid "Reverse the order of revisions."
2945
2942
msgstr ""
2946
2943
2947
2944
# help of 'mine-only' option of 'missing' command
2948
#: bzrlib/builtins.py:4593
2945
#: bzrlib/builtins.py:4617
2949
2946
msgid "Display changes in the local branch only."
2950
2947
msgstr ""
2951
2948
2952
2949
# help of 'this' option of 'missing' command
2953
#: bzrlib/builtins.py:4594
2950
#: bzrlib/builtins.py:4618
2954
2951
msgid "Same as --mine-only."
2955
2952
msgstr ""
2956
2953
2957
2954
# help of 'theirs-only' option of 'missing' command
2958
#: bzrlib/builtins.py:4596
2955
#: bzrlib/builtins.py:4620
2959
2956
msgid "Display changes in the remote branch only."
2960
2957
msgstr ""
2961
2958
2962
2959
# help of 'other' option of 'missing' command
2963
#: bzrlib/builtins.py:4597
2960
#: bzrlib/builtins.py:4621
2964
2961
msgid "Same as --theirs-only."
2965
2962
msgstr ""
2966
2963
2967
2964
# help of 'revision' option of 'missing' command
2968
#: bzrlib/builtins.py:4602
2965
#: bzrlib/builtins.py:4626
2969
2966
msgid ""
2970
2967
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2971
2968
"details."
2972
2969
msgstr ""
2973
2970
2974
2971
# help of 'my-revision' option of 'missing' command
2975
#: bzrlib/builtins.py:4606
2972
#: bzrlib/builtins.py:4630
2976
2973
msgid ""
2977
2974
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2978
2975
"details."
2979
2976
msgstr ""
2980
2977
2981
# help of 'include-merges' option of 'missing' command
2982
#: bzrlib/builtins.py:4609
2978
# help of 'include-merged' option of 'missing' command
2979
#: bzrlib/builtins.py:4633
2983
2980
msgid "Show all revisions in addition to the mainline ones."
2984
2981
msgstr ""
2985
2982
2986
#: bzrlib/builtins.py:4645
2983
#: bzrlib/builtins.py:4687
2987
2984
msgid "No peer location known or specified."
2988
2985
msgstr ""
2989
2986
2990
#: bzrlib/builtins.py:4649
2987
#: bzrlib/builtins.py:4691
2991
2988
msgid "Using saved parent location: {0}\n"
2992
2989
msgstr ""
2993
2990
2994
#: bzrlib/builtins.py:4682
2991
#: bzrlib/builtins.py:4724
2995
2992
#, python-format
2996
2993
msgid "You have %d extra revision:\n"
2997
2994
msgid_plural "You have %d extra revisions:\n"
2998
2995
msgstr[0] ""
2999
2996
msgstr[1] ""
3000
2997
3001
#: bzrlib/builtins.py:4698
2998
#: bzrlib/builtins.py:4740
3002
2999
#, python-format
3003
3000
msgid "You are missing %d revision:\n"
3004
3001
msgid_plural "You are missing %d revisions:\n"
3005
3002
msgstr[0] ""
3006
3003
msgstr[1] ""
3007
3004
3008
#: bzrlib/builtins.py:4710
3005
#: bzrlib/builtins.py:4752
3009
3006
msgid "This branch has no new revisions.\n"
3010
3007
msgstr ""
3011
3008
3012
#: bzrlib/builtins.py:4713
3009
#: bzrlib/builtins.py:4755
3013
3010
msgid "Other branch has no new revisions.\n"
3014
3011
msgstr ""
3015
3012
3016
#: bzrlib/builtins.py:4718
3013
#: bzrlib/builtins.py:4760
3017
3014
msgid "Branches are up to date.\n"
3018
3015
msgstr ""
3019
3016
3020
#: bzrlib/builtins.py:4729
3017
#: bzrlib/builtins.py:4771
3021
3018
msgid "Compress the data within a repository."
3022
3019
msgstr ""
3023
3020
3024
#: bzrlib/builtins.py:4731
3021
#: bzrlib/builtins.py:4773
3025
3022
msgid ""
3026
3023
"This operation compresses the data within a bazaar repository. As\n"
3027
3024
"bazaar supports automatic packing of repository, this operation is\n"
3028
3025
"normally not required to be done manually."
3029
3026
msgstr ""
3030
3027
3031
#: bzrlib/builtins.py:4735
3028
#: bzrlib/builtins.py:4777
3032
3029
msgid ""
3033
3030
"During the pack operation, bazaar takes a backup of existing repository\n"
3034
3031
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3037
3034
"used."
3038
3035
msgstr ""
3039
3036
3040
#: bzrlib/builtins.py:4741
3037
#: bzrlib/builtins.py:4783
3041
3038
msgid ""
3042
3039
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3043
3040
"during or immediately after repacking, you may be left with a state\n"
3046
3043
msgstr ""
3047
3044
3048
3045
# help of 'clean-obsolete-packs' option of 'pack' command
3049
#: bzrlib/builtins.py:4750
3046
#: bzrlib/builtins.py:4792
3050
3047
msgid "Delete obsolete packs to save disk space."
3051
3048
msgstr ""
3052
3049
3053
#: bzrlib/builtins.py:4764
3050
#: bzrlib/builtins.py:4806
3054
3051
msgid "List the installed plugins."
3055
3052
msgstr ""
3056
3053
3057
#: bzrlib/builtins.py:4766
3054
#: bzrlib/builtins.py:4808
3058
3055
msgid ""
3059
3056
"This command displays the list of installed plugins including\n"
3060
3057
"version of plugin and a short description of each."
3061
3058
msgstr ""
3062
3059
3063
#: bzrlib/builtins.py:4769
3060
#: bzrlib/builtins.py:4811
3064
3061
msgid "--verbose shows the path where each plugin is located."
3065
3062
msgstr ""
3066
3063
3067
#: bzrlib/builtins.py:4771
3064
#: bzrlib/builtins.py:4813
3068
3065
msgid ""
3069
3066
"A plugin is an external component for Bazaar that extends the\n"
3070
3067
"revision control system, by adding or replacing code in Bazaar.\n"
3073
3070
"customizing log output."
3074
3071
msgstr ""
3075
3072
3076
#: bzrlib/builtins.py:4777
3073
#: bzrlib/builtins.py:4819
3077
3074
msgid ""
3078
3075
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3079
3076
"for further information on plugins including where to find them and how to\n"
3081
3078
"plugins using the Python programming language."
3082
3079
msgstr ""
3083
3080
3084
#: bzrlib/builtins.py:4793
3081
#: bzrlib/builtins.py:4835
3085
3082
msgid "Show testament (signing-form) of a revision."
3086
3083
msgstr ""
3087
3084
3088
3085
# help of 'long' option of 'testament' command
3089
#: bzrlib/builtins.py:4796
3086
#: bzrlib/builtins.py:4838
3090
3087
msgid "Produce long-format testament."
3091
3088
msgstr ""
3092
3089
3093
3090
# help of 'strict' option of 'testament' command
3094
#: bzrlib/builtins.py:4798
3091
#: bzrlib/builtins.py:4840
3095
3092
msgid "Produce a strict-format testament."
3096
3093
msgstr ""
3097
3094
3098
#: bzrlib/builtins.py:4824
3095
#: bzrlib/builtins.py:4866
3099
3096
msgid "Show the origin of each line in a file."
3100
3097
msgstr ""
3101
3098
3102
#: bzrlib/builtins.py:4826
3099
#: bzrlib/builtins.py:4868
3103
3100
msgid ""
3104
3101
"This prints out the given file with an annotation on the left side\n"
3105
3102
"indicating which revision, author and date introduced the change."
3106
3103
msgstr ""
3107
3104
3108
#: bzrlib/builtins.py:4829
3105
#: bzrlib/builtins.py:4871
3109
3106
msgid ""
3110
3107
"If the origin is the same for a run of consecutive lines, it is\n"
3111
3108
"shown only at the top, unless the --all option is given."
3112
3109
msgstr ""
3113
3110
3114
3111
# help of 'all' option of 'annotate' command
3115
#: bzrlib/builtins.py:4837
3112
#: bzrlib/builtins.py:4879
3116
3113
msgid "Show annotations on all lines."
3117
3114
msgstr ""
3118
3115
3119
3116
# help of 'long' option of 'annotate' command
3120
#: bzrlib/builtins.py:4838
3117
#: bzrlib/builtins.py:4880
3121
3118
msgid "Show commit date in annotations."
3122
3119
msgstr ""
3123
3120
3124
#: bzrlib/builtins.py:4925
3121
#: bzrlib/builtins.py:4967
3125
3122
msgid "Cannot sign a range of non-revision-history revisions"
3126
3123
msgstr ""
3127
3124
3128
#: bzrlib/builtins.py:4937
3125
#: bzrlib/builtins.py:4979
3129
3126
msgid "Please supply either one revision, or a range."
3130
3127
msgstr ""
3131
3128
3132
#: bzrlib/builtins.py:4941
3129
#: bzrlib/builtins.py:4983
3133
3130
msgid ""
3134
3131
"Convert the current branch into a checkout of the supplied branch.\n"
3135
3132
"If no branch is supplied, rebind to the last bound location."
3136
3133
msgstr ""
3137
3134
3138
#: bzrlib/builtins.py:4944
3135
#: bzrlib/builtins.py:4986
3139
3136
msgid ""
3140
3137
"Once converted into a checkout, commits must succeed on the master branch\n"
3141
3138
"before they will be applied to the local branch."
3142
3139
msgstr ""
3143
3140
3144
#: bzrlib/builtins.py:4947
3141
#: bzrlib/builtins.py:4989
3145
3142
msgid ""
3146
3143
"Bound branches use the nickname of its master branch unless it is set\n"
3147
3144
"locally, in which case binding will update the local nickname to be\n"
3148
3145
"that of the master."
3149
3146
msgstr ""
3150
3147
3151
#: bzrlib/builtins.py:4962
3148
#: bzrlib/builtins.py:5004
3152
3149
msgid "No location supplied. This format does not remember old locations."
3153
3150
msgstr ""
3154
3151
3155
#: bzrlib/builtins.py:4967
3152
#: bzrlib/builtins.py:5009
3156
3153
msgid "Branch is already bound"
3157
3154
msgstr ""
3158
3155
3159
#: bzrlib/builtins.py:4969
3156
#: bzrlib/builtins.py:5011
3160
3157
msgid "No location supplied and no previous location known"
3161
3158
msgstr ""
3162
3159
3163
#: bzrlib/builtins.py:4975
3160
#: bzrlib/builtins.py:5017
3164
3161
msgid "These branches have diverged. Try merging, and then bind again."
3165
3162
msgstr ""
3166
3163
3167
#: bzrlib/builtins.py:4982
3164
#: bzrlib/builtins.py:5024
3168
3165
msgid "Convert the current checkout into a regular branch."
3169
3166
msgstr ""
3170
3167
3171
#: bzrlib/builtins.py:4984
3168
#: bzrlib/builtins.py:5026
3172
3169
msgid ""
3173
3170
"After unbinding, the local branch is considered independent and subsequent\n"
3174
3171
"commits will be local only."
3175
3172
msgstr ""
3176
3173
3177
#: bzrlib/builtins.py:4995
3174
#: bzrlib/builtins.py:5037
3178
3175
msgid "Local branch is not bound"
3179
3176
msgstr ""
3180
3177
3181
#: bzrlib/builtins.py:4999
3178
#: bzrlib/builtins.py:5041
3182
3179
msgid "Remove the last committed revision."
3183
3180
msgstr ""
3184
3181
3185
#: bzrlib/builtins.py:5001
3182
#: bzrlib/builtins.py:5043
3186
3183
msgid ""
3187
3184
"--verbose will print out what is being removed.\n"
3188
3185
"--dry-run will go through all the motions, but not actually\n"
3189
3186
"remove anything."
3190
3187
msgstr ""
3191
3188
3192
#: bzrlib/builtins.py:5005
3189
#: bzrlib/builtins.py:5047
3193
3190
msgid ""
3194
3191
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3195
3192
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3196
3193
"branch at revision 15."
3197
3194
msgstr ""
3198
3195
3199
#: bzrlib/builtins.py:5009
3196
#: bzrlib/builtins.py:5051
3200
3197
msgid ""
3201
3198
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3202
3199
"it may make is to restore any pending merges that were present before\n"
3204
3201
msgstr ""
3205
3202
3206
3203
# help of 'dry-run' option of 'uncommit' command
3207
#: bzrlib/builtins.py:5020
3204
#: bzrlib/builtins.py:5062
3208
3205
msgid "Don't actually make changes."
3209
3206
msgstr ""
3210
3207
3211
3208
# help of 'force' option of 'uncommit' command
3212
#: bzrlib/builtins.py:5021
3209
#: bzrlib/builtins.py:5063
3213
3210
msgid "Say yes to all questions."
3214
3211
msgstr ""
3215
3212
3216
3213
# help of 'keep-tags' option of 'uncommit' command
3217
#: bzrlib/builtins.py:5023
3214
#: bzrlib/builtins.py:5065
3218
3215
msgid "Keep tags that point to removed revisions."
3219
3216
msgstr ""
3220
3217
3221
3218
# help of 'local' option of 'uncommit' command
3222
#: bzrlib/builtins.py:5025
3219
#: bzrlib/builtins.py:5067
3223
3220
msgid "Only remove the commits from the local branch when in a checkout."
3224
3221
msgstr ""
3225
3222
3226
#: bzrlib/builtins.py:5074
3223
#: bzrlib/builtins.py:5116
3227
3224
msgid "No revisions to uncommit.\n"
3228
3225
msgstr ""
3229
3226
3230
#: bzrlib/builtins.py:5089
3227
#: bzrlib/builtins.py:5131
3231
3228
msgid "Dry-run, pretending to remove the above revisions.\n"
3232
3229
msgstr ""
3233
3230
3234
#: bzrlib/builtins.py:5092
3231
#: bzrlib/builtins.py:5134
3235
3232
msgid "The above revision(s) will be removed.\n"
3236
3233
msgstr ""
3237
3234
3238
#: bzrlib/builtins.py:5096
3235
#: bzrlib/builtins.py:5138
3239
3236
msgid "Uncommit these revisions"
3240
3237
msgstr ""
3241
3238
3242
#: bzrlib/builtins.py:5099
3239
#: bzrlib/builtins.py:5141
3243
3240
msgid "Canceled\n"
3244
3241
msgstr ""
3245
3242
3246
#: bzrlib/builtins.py:5106
3243
#: bzrlib/builtins.py:5148
3247
3244
#, python-format
3248
3245
msgid ""
3249
3246
"You can restore the old tip by running:\n"
3250
3247
" bzr pull . -r revid:%s\n"
3251
3248
msgstr ""
3252
3249
3253
#: bzrlib/builtins.py:5111
3250
#: bzrlib/builtins.py:5153
3254
3251
msgid "Break a dead lock."
3255
3252
msgstr ""
3256
3253
3257
#: bzrlib/builtins.py:5113
3254
#: bzrlib/builtins.py:5155
3258
3255
msgid ""
3259
3256
"This command breaks a lock on a repository, branch, working directory or\n"
3260
3257
"config file."
3261
3258
msgstr ""
3262
3259
3263
#: bzrlib/builtins.py:5116
3260
#: bzrlib/builtins.py:5158
3264
3261
msgid ""
3265
3262
"CAUTION: Locks should only be broken when you are sure that the process\n"
3266
3263
"holding the lock has been stopped."
3267
3264
msgstr ""
3268
3265
3269
#: bzrlib/builtins.py:5119
3266
#: bzrlib/builtins.py:5161
3270
3267
msgid ""
3271
3268
"You can get information on what locks are open via the 'bzr info\n"
3272
3269
"[location]' command."
3273
3270
msgstr ""
3274
3271
3275
#: bzrlib/builtins.py:5122
3272
#: bzrlib/builtins.py:5164
3276
3273
msgid ""
3277
3274
":Examples:\n"
3278
3275
" bzr break-lock\n"
3281
3278
msgstr ""
3282
3279
3283
3280
# help of 'config' option of 'break-lock' command
3284
#: bzrlib/builtins.py:5131
3281
#: bzrlib/builtins.py:5173
3285
3282
msgid "LOCATION is the directory where the config lock is."
3286
3283
msgstr ""
3287
3284
3288
3285
# help of 'force' option of 'break-lock' command
3289
#: bzrlib/builtins.py:5133
3286
#: bzrlib/builtins.py:5175
3290
3287
msgid "Do not ask for confirmation before breaking the lock."
3291
3288
msgstr ""
3292
3289
3293
#: bzrlib/builtins.py:5169
3290
#: bzrlib/builtins.py:5211
3294
3291
msgid "Run the bzr server."
3295
3292
msgstr ""
3296
3293
3297
3294
# help of 'inet' option of 'serve' command
3298
#: bzrlib/builtins.py:5175
3295
#: bzrlib/builtins.py:5217
3299
3296
msgid "Serve on stdin/out for use from inetd or sshd."
3300
3297
msgstr ""
3301
3298
3302
3299
# title of 'protocol' option of 'serve' command
3303
#: bzrlib/builtins.py:5176
3300
#: bzrlib/builtins.py:5218
3304
3301
msgid "protocol"
3305
3302
msgstr ""
3306
3303
3307
3304
# help of 'protocol' option of 'serve' command
3308
#: bzrlib/builtins.py:5177
3305
#: bzrlib/builtins.py:5219
3309
3306
msgid "Protocol to serve."
3310
3307
msgstr ""
3311
3308
3312
3309
# help of 'port' option of 'serve' command
3313
#: bzrlib/builtins.py:5181
3310
#: bzrlib/builtins.py:5223
3314
3311
msgid ""
3315
3312
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3316
3313
"Passing 0 as the port number will result in a dynamically allocated port. "
3318
3315
msgstr ""
3319
3316
3320
3317
# help of 'directory' option of 'serve' command
3321
#: bzrlib/builtins.py:5187
3318
#: bzrlib/builtins.py:5229
3322
3319
msgid "Serve contents of this directory."
3323
3320
msgstr ""
3324
3321
3325
3322
# help of 'allow-writes' option of 'serve' command
3326
#: bzrlib/builtins.py:5189
3323
#: bzrlib/builtins.py:5231
3327
3324
msgid ""
3328
3325
"By default the server is a readonly server. Supplying --allow-writes "
3329
3326
"enables write access to the contents of the served directory and below. "
3332
3329
"uncontrolled write access to your file system."
3333
3330
msgstr ""
3334
3331
3335
#: bzrlib/builtins.py:5234
3332
#: bzrlib/builtins.py:5276
3336
3333
msgid "Combine a tree into its containing tree."
3337
3334
msgstr ""
3338
3335
3339
#: bzrlib/builtins.py:5236
3336
#: bzrlib/builtins.py:5278
3340
3337
msgid "This command requires the target tree to be in a rich-root format."
3341
3338
msgstr ""
3342
3339
3343
#: bzrlib/builtins.py:5238
3340
#: bzrlib/builtins.py:5280
3344
3341
msgid ""
3345
3342
"The TREE argument should be an independent tree, inside another tree, but\n"
3346
3343
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3347
3344
"running \"bzr branch\" with the target inside a tree.)"
3348
3345
msgstr ""
3349
3346
3350
#: bzrlib/builtins.py:5242
3347
#: bzrlib/builtins.py:5284
3351
3348
msgid ""
3352
3349
"The result is a combined tree, with the subtree no longer an independent\n"
3353
3350
"part. This is marked as a merge of the subtree into the containing tree,\n"
3354
3351
"and all history is preserved."
3355
3352
msgstr ""
3356
3353
3357
#: bzrlib/builtins.py:5260
3354
#: bzrlib/builtins.py:5302
3358
3355
#, python-format
3359
3356
msgid ""
3360
3357
"Can't join trees because %s doesn't support rich root data.\n"
3361
3358
"You can use bzr upgrade on the repository."
3362
3359
msgstr ""
3363
3360
3364
#: bzrlib/builtins.py:5270 bzrlib/builtins.py:5276
3361
#: bzrlib/builtins.py:5312 bzrlib/builtins.py:5318
3365
3362
msgid "Cannot join {0}. {1}"
3366
3363
msgstr ""
3367
3364
3368
#: bzrlib/builtins.py:5280
3365
#: bzrlib/builtins.py:5322
3369
3366
msgid "Split a subdirectory of a tree into a separate tree."
3370
3367
msgstr ""
3371
3368
3372
#: bzrlib/builtins.py:5282
3369
#: bzrlib/builtins.py:5324
3373
3370
msgid ""
3374
3371
"This command will produce a target tree in a format that supports\n"
3375
3372
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3376
3373
"converted into earlier formats like 'dirstate-tags'."
3377
3374
msgstr ""
3378
3375
3379
#: bzrlib/builtins.py:5286
3376
#: bzrlib/builtins.py:5328
3380
3377
msgid ""
3381
3378
"The TREE argument should be a subdirectory of a working tree. That\n"
3382
3379
"subdirectory will be converted into an independent tree, with its own\n"
3383
3380
"branch. Commits in the top-level tree will not apply to the new subtree."
3384
3381
msgstr ""
3385
3382
3386
#: bzrlib/builtins.py:5366
3383
#: bzrlib/builtins.py:5408
3387
3384
msgid "No submit branch specified or known"
3388
3385
msgstr ""
3389
3386
3390
#: bzrlib/builtins.py:5374 bzrlib/send.py:105
3387
#: bzrlib/builtins.py:5416 bzrlib/send.py:105
3391
3388
msgid "No public branch specified or known"
3392
3389
msgstr ""
3393
3390
3394
#: bzrlib/builtins.py:5379
3391
#: bzrlib/builtins.py:5421
3395
3392
msgid "bzr merge-directive takes at most two one revision identifiers"
3396
3393
msgstr ""
3397
3394
3398
#: bzrlib/builtins.py:5388
3395
#: bzrlib/builtins.py:5430
3399
3396
msgid "No revisions to bundle."
3400
3397
msgstr ""
3401
3398
3402
#: bzrlib/builtins.py:5407
3399
#: bzrlib/builtins.py:5449
3403
3400
msgid "Mail or create a merge-directive for submitting changes."
3404
3401
msgstr ""
3405
3402
3406
#: bzrlib/builtins.py:5409
3403
#: bzrlib/builtins.py:5451
3407
3404
msgid "A merge directive provides many things needed for requesting merges:"
3408
3405
msgstr ""
3409
3406
3410
#: bzrlib/builtins.py:5411
3407
#: bzrlib/builtins.py:5453
3411
3408
msgid "* A machine-readable description of the merge to perform"
3412
3409
msgstr ""
3413
3410
3414
#: bzrlib/builtins.py:5413
3411
#: bzrlib/builtins.py:5455
3415
3412
msgid "* An optional patch that is a preview of the changes requested"
3416
3413
msgstr ""
3417
3414
3418
#: bzrlib/builtins.py:5415
3415
#: bzrlib/builtins.py:5457
3419
3416
msgid ""
3420
3417
"* An optional bundle of revision data, so that the changes can be applied\n"
3421
3418
" directly from the merge directive, without retrieving data from a\n"
3422
3419
" branch."
3423
3420
msgstr ""
3424
3421
3425
#: bzrlib/builtins.py:5419
3422
#: bzrlib/builtins.py:5461
3426
3423
msgid ""
3427
3424
"`bzr send` creates a compact data set that, when applied using bzr\n"
3428
3425
"merge, has the same effect as merging from the source branch. "
3429
3426
msgstr ""
3430
3427
3431
#: bzrlib/builtins.py:5422
3428
#: bzrlib/builtins.py:5464
3432
3429
msgid ""
3433
3430
"By default the merge directive is self-contained and can be applied to any\n"
3434
3431
"branch containing submit_branch in its ancestory without needing access to\n"
3435
3432
"the source branch."
3436
3433
msgstr ""
3437
3434
3438
#: bzrlib/builtins.py:5426
3435
#: bzrlib/builtins.py:5468
3439
3436
msgid ""
3440
3437
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3441
3438
"revisions, but only a structured request to merge from the\n"
3444
3441
"included if known, so that people can check it later."
3445
3442
msgstr ""
3446
3443
3447
#: bzrlib/builtins.py:5432
3444
#: bzrlib/builtins.py:5474
3448
3445
msgid ""
3449
3446
"The submit branch defaults to the parent of the source branch, but can be\n"
3450
3447
"overridden. Both submit branch and public branch will be remembered in\n"
3453
3450
"be changed using --from."
3454
3451
msgstr ""
3455
3452
3456
#: bzrlib/builtins.py:5438
3453
#: bzrlib/builtins.py:5480
3457
3454
msgid ""
3458
3455
"Both the submit branch and the public branch follow the usual behavior with\n"
3459
3456
"respect to --remember: If there is no default location set, the first send\n"
3462
3459
"--remember. The value will only be saved if the location can be accessed."
3463
3460
msgstr ""
3464
3461
3465
#: bzrlib/builtins.py:5444
3462
#: bzrlib/builtins.py:5486
3466
3463
msgid ""
3467
3464
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3468
3465
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3470
3467
"in the merge directive."
3471
3468
msgstr ""
3472
3469
3473
#: bzrlib/builtins.py:5449
3470
#: bzrlib/builtins.py:5491
3474
3471
msgid ""
3475
3472
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3476
3473
"given, in which case it is sent to a file."
3477
3474
msgstr ""
3478
3475
3479
#: bzrlib/builtins.py:5452
3476
#: bzrlib/builtins.py:5494
3480
3477
msgid ""
3481
3478
"Mail is sent using your preferred mail program. This should be transparent\n"
3482
3479
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3483
3480
"If the preferred client can't be found (or used), your editor will be used."
3484
3481
msgstr ""
3485
3482
3486
#: bzrlib/builtins.py:5456
3483
#: bzrlib/builtins.py:5498
3487
3484
msgid ""
3488
3485
"To use a specific mail program, set the mail_client configuration option.\n"
3489
3486
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3495
3492
"supported clients."
3496
3493
msgstr ""
3497
3494
3498
#: bzrlib/builtins.py:5463
3495
#: bzrlib/builtins.py:5505
3499
3496
msgid ""
3500
3497
"If mail is being sent, a to address is required. This can be supplied\n"
3501
3498
"either on the commandline, by setting the submit_to configuration\n"
3503
3500
"in the submit branch."
3504
3501
msgstr ""
3505
3502
3506
#: bzrlib/builtins.py:5468
3503
#: bzrlib/builtins.py:5510
3507
3504
msgid ""
3508
3505
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3509
3506
"and\n"
3513
3510
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3514
3511
msgstr ""
3515
3512
3516
#: bzrlib/builtins.py:5474
3513
#: bzrlib/builtins.py:5516
3517
3514
msgid ""
3518
3515
"The merge directives created by bzr send may be applied using bzr merge or\n"
3519
3516
"bzr pull by specifying a file containing a merge directive as the location."
3520
3517
msgstr ""
3521
3518
3522
#: bzrlib/builtins.py:5477
3519
#: bzrlib/builtins.py:5519
3523
3520
msgid ""
3524
3521
"bzr send makes extensive use of public locations to map local locations "
3525
3522
"into\n"
3528
3525
msgstr ""
3529
3526
3530
3527
# help of 'output' option of 'send' command
3531
#: bzrlib/builtins.py:5501
3528
#: bzrlib/builtins.py:5543
3532
3529
msgid "Write merge directive to this file or directory; use - for stdout."
3533
3530
msgstr ""
3534
3531
3535
3532
# help of 'strict' option of 'send' command
3536
#: bzrlib/builtins.py:5505
3533
#: bzrlib/builtins.py:5547
3537
3534
msgid ""
3538
3535
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3539
3536
"strict disables the check."
3540
3537
msgstr ""
3541
3538
3542
3539
# help of 'mail-to' option of 'send' command
3543
#: bzrlib/builtins.py:5507
3540
#: bzrlib/builtins.py:5549
3544
3541
msgid "Mail the request to this address."
3545
3542
msgstr ""
3546
3543
3547
3544
# help of 'body' option of 'send' command
3548
#: bzrlib/builtins.py:5511
3545
#: bzrlib/builtins.py:5553
3549
3546
msgid "Body for the email."
3550
3547
msgstr ""
3551
3548
3552
3549
# help of 'no-bundle' option of 'send' command
3553
#: bzrlib/builtins.py:5564
3550
#: bzrlib/builtins.py:5606
3554
3551
msgid "Do not include a bundle in the merge directive."
3555
3552
msgstr ""
3556
3553
3557
3554
# help of 'no-patch' option of 'send' command
3558
#: bzrlib/builtins.py:5565
3555
#: bzrlib/builtins.py:5607
3559
3556
msgid "Do not include a preview patch in the merge directive."
3560
3557
msgstr ""
3561
3558
3562
3559
# help of 'remember' option of 'send' command
3563
#: bzrlib/builtins.py:5568
3560
#: bzrlib/builtins.py:5610
3564
3561
msgid "Remember submit and public branch."
3565
3562
msgstr ""
3566
3563
3567
3564
# help of 'from' option of 'send' command
3568
#: bzrlib/builtins.py:5570
3565
#: bzrlib/builtins.py:5612
3569
3566
msgid ""
3570
3567
"Branch to generate the submission from, rather than the one containing the "
3571
3568
"working directory."
3572
3569
msgstr ""
3573
3570
3574
3571
# title of 'format' option of 'send' command
3575
#: bzrlib/builtins.py:5580
3572
#: bzrlib/builtins.py:5622
3576
3573
msgid "format"
3577
3574
msgstr ""
3578
3575
3579
3576
# help of 'format' option of 'send' command
3580
#: bzrlib/builtins.py:5581
3577
#: bzrlib/builtins.py:5623
3581
3578
msgid "Use the specified output format."
3582
3579
msgstr ""
3583
3580
3584
#: bzrlib/builtins.py:5603
3581
#: bzrlib/builtins.py:5645
3585
3582
msgid "Create, remove or modify a tag naming a revision."
3586
3583
msgstr ""
3587
3584
3588
#: bzrlib/builtins.py:5605
3585
#: bzrlib/builtins.py:5647
3589
3586
msgid ""
3590
3587
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3591
3588
"(--revision) option can be given -rtag:X, where X is any previously\n"
3592
3589
"created tag."
3593
3590
msgstr ""
3594
3591
3595
#: bzrlib/builtins.py:5609
3592
#: bzrlib/builtins.py:5651
3596
3593
msgid ""
3597
3594
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3598
3595
"along when you branch, push, pull or merge."
3599
3596
msgstr ""
3600
3597
3601
#: bzrlib/builtins.py:5612
3598
#: bzrlib/builtins.py:5654
3602
3599
msgid ""
3603
3600
"It is an error to give a tag name that already exists unless you pass\n"
3604
3601
"--force, in which case the tag is moved to point to the new revision."
3605
3602
msgstr ""
3606
3603
3607
#: bzrlib/builtins.py:5615
3604
#: bzrlib/builtins.py:5657
3608
3605
msgid ""
3609
3606
"To rename a tag (change the name but keep it on the same revsion), run "
3610
3607
"``bzr\n"
3611
3608
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3612
3609
msgstr ""
3613
3610
3614
#: bzrlib/builtins.py:5618
3611
#: bzrlib/builtins.py:5660
3615
3612
msgid ""
3616
3613
"If no tag name is specified it will be determined through the \n"
3617
3614
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3620
3617
msgstr ""
3621
3618
3622
3619
# help of 'delete' option of 'tag' command
3623
#: bzrlib/builtins.py:5628
3620
#: bzrlib/builtins.py:5670
3624
3621
msgid "Delete this tag rather than placing it."
3625
3622
msgstr ""
3626
3623
3627
3624
# help of 'directory' option of 'tag' command
3628
#: bzrlib/builtins.py:5631
3625
#: bzrlib/builtins.py:5673
3629
3626
msgid "Branch in which to place the tag."
3630
3627
msgstr ""
3631
3628
3632
3629
# help of 'force' option of 'tag' command
3633
#: bzrlib/builtins.py:5633
3630
#: bzrlib/builtins.py:5675
3634
3631
msgid "Replace existing tags."
3635
3632
msgstr ""
3636
3633
3637
#: bzrlib/builtins.py:5648
3634
#: bzrlib/builtins.py:5690
3638
3635
msgid "No tag specified to delete."
3639
3636
msgstr ""
3640
3637
3641
#: bzrlib/builtins.py:5650
3638
#: bzrlib/builtins.py:5692
3642
3639
#, python-format
3643
3640
msgid "Deleted tag %s."
3644
3641
msgstr ""
3645
3642
3646
#: bzrlib/builtins.py:5655
3643
#: bzrlib/builtins.py:5697
3647
3644
msgid "Tags can only be placed on a single revision, not on a range"
3648
3645
msgstr ""
3649
3646
3650
#: bzrlib/builtins.py:5664
3647
#: bzrlib/builtins.py:5706
3651
3648
msgid "Please specify a tag name."
3652
3649
msgstr ""
3653
3650
3654
#: bzrlib/builtins.py:5672
3651
#: bzrlib/builtins.py:5714
3655
3652
#, python-format
3656
3653
msgid "Tag %s already exists for that revision."
3657
3654
msgstr ""
3658
3655
3659
#: bzrlib/builtins.py:5676
3656
#: bzrlib/builtins.py:5718
3660
3657
#, python-format
3661
3658
msgid "Created tag %s."
3662
3659
msgstr ""
3663
3660
3664
#: bzrlib/builtins.py:5678
3661
#: bzrlib/builtins.py:5720
3665
3662
#, python-format
3666
3663
msgid "Updated tag %s."
3667
3664
msgstr ""
3668
3665
3669
#: bzrlib/builtins.py:5682
3666
#: bzrlib/builtins.py:5724
3670
3667
msgid "List tags."
3671
3668
msgstr ""
3672
3669
3673
#: bzrlib/builtins.py:5684
3670
#: bzrlib/builtins.py:5726
3674
3671
msgid ""
3675
3672
"This command shows a table of tag names and the revisions they reference."
3676
3673
msgstr ""
3677
3674
3678
3675
# help of 'directory' option of 'tags' command
3679
#: bzrlib/builtins.py:5690
3676
#: bzrlib/builtins.py:5732
3680
3677
msgid "Branch whose tags should be displayed."
3681
3678
msgstr ""
3682
3679
3683
3680
# help of 'sort' option of 'tags' command
3684
#: bzrlib/builtins.py:5692
3681
#: bzrlib/builtins.py:5734
3685
3682
msgid "Sort tags by different criteria."
3686
3683
msgstr ""
3687
3684
3688
3685
# title of 'sort' option of 'tags' command
3689
#: bzrlib/builtins.py:5692
3686
#: bzrlib/builtins.py:5734
3690
3687
msgid "Sorting"
3691
3688
msgstr ""
3692
3689
3693
#: bzrlib/builtins.py:5737
3690
#: bzrlib/builtins.py:5779
3694
3691
msgid "Reconfigure the type of a bzr directory."
3695
3692
msgstr ""
3696
3693
3697
#: bzrlib/builtins.py:5739
3694
#: bzrlib/builtins.py:5781
3698
3695
msgid "A target configuration must be specified."
3699
3696
msgstr ""
3700
3697
3701
#: bzrlib/builtins.py:5741
3698
#: bzrlib/builtins.py:5783
3702
3699
msgid ""
3703
3700
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3704
3701
"The order of preference is\n"
3710
3707
msgstr ""
3711
3708
3712
3709
# title of 'tree_type' option of 'reconfigure' command
3713
#: bzrlib/builtins.py:5755
3710
#: bzrlib/builtins.py:5797
3714
3711
msgid "Tree type"
3715
3712
msgstr ""
3716
3713
3717
3714
# help of 'tree_type' option of 'reconfigure' command
3718
#: bzrlib/builtins.py:5756
3715
#: bzrlib/builtins.py:5798
3719
3716
msgid "The relation between branch and tree."
3720
3717
msgstr ""
3721
3718
3722
3719
# title of 'repository_type' option of 'reconfigure' command
3723
#: bzrlib/builtins.py:5766
3720
#: bzrlib/builtins.py:5808
3724
3721
msgid "Repository type"
3725
3722
msgstr ""
3726
3723
3727
3724
# help of 'repository_type' option of 'reconfigure' command
3728
#: bzrlib/builtins.py:5767
3725
#: bzrlib/builtins.py:5809
3729
3726
msgid "Location fo the repository."
3730
3727
msgstr ""
3731
3728
3732
3729
# title of 'repository_trees' option of 'reconfigure' command
3733
#: bzrlib/builtins.py:5775
3730
#: bzrlib/builtins.py:5817
3734
3731
msgid "Trees in Repository"
3735
3732
msgstr ""
3736
3733
3737
3734
# help of 'repository_trees' option of 'reconfigure' command
3738
#: bzrlib/builtins.py:5776
3735
#: bzrlib/builtins.py:5818
3739
3736
msgid "Whether new branches in the repository have trees."
3740
3737
msgstr ""
3741
3738
3742
3739
# help of 'bind-to' option of 'reconfigure' command
3743
#: bzrlib/builtins.py:5783
3740
#: bzrlib/builtins.py:5825
3744
3741
msgid "Branch to bind checkout to."
3745
3742
msgstr ""
3746
3743
3747
3744
# help of 'force' option of 'reconfigure' command
3748
#: bzrlib/builtins.py:5785
3745
#: bzrlib/builtins.py:5827
3749
3746
msgid "Perform reconfiguration even if local changes will be lost."
3750
3747
msgstr ""
3751
3748
3752
3749
# help of 'stacked-on' option of 'reconfigure' command
3753
#: bzrlib/builtins.py:5788
3750
#: bzrlib/builtins.py:5830
3754
3751
msgid "Reconfigure a branch to be stacked on another branch."
3755
3752
msgstr ""
3756
3753
3757
3754
# help of 'unstacked' option of 'reconfigure' command
3758
#: bzrlib/builtins.py:5792
3755
#: bzrlib/builtins.py:5834
3759
3756
msgid ""
3760
3757
"Reconfigure a branch to be unstacked. This may require copying substantial "
3761
3758
"data into it."
3762
3759
msgstr ""
3763
3760
3764
#: bzrlib/builtins.py:5802
3761
#: bzrlib/builtins.py:5844
3765
3762
msgid "Can't use both --stacked-on and --unstacked"
3766
3763
msgstr ""
3767
3764
3768
#: bzrlib/builtins.py:5816
3765
#: bzrlib/builtins.py:5858
3769
3766
msgid "No target configuration specified"
3770
3767
msgstr ""
3771
3768
3772
#: bzrlib/builtins.py:5851
3769
#: bzrlib/builtins.py:5893
3773
3770
msgid "Set the branch of a checkout and update."
3774
3771
msgstr ""
3775
3772
3776
#: bzrlib/builtins.py:5853
3773
#: bzrlib/builtins.py:5895
3777
3774
msgid ""
3778
3775
"For lightweight checkouts, this changes the branch being referenced.\n"
3779
3776
"For heavyweight checkouts, this checks that there are no local commits\n"
3781
3778
"of the new location and binds to it."
3782
3779
msgstr ""
3783
3780
3784
#: bzrlib/builtins.py:5858
3781
#: bzrlib/builtins.py:5900
3785
3782
msgid ""
3786
3783
"In both cases, the working tree is updated and uncommitted changes\n"
3787
3784
"are merged. The user can commit or revert these as they desire."
3788
3785
msgstr ""
3789
3786
3790
#: bzrlib/builtins.py:5861
3787
#: bzrlib/builtins.py:5903
3791
3788
msgid "Pending merges need to be committed or reverted before using switch."
3792
3789
msgstr ""
3793
3790
3794
#: bzrlib/builtins.py:5863
3791
#: bzrlib/builtins.py:5905
3795
3792
msgid ""
3796
3793
"The path to the branch to switch to can be specified relative to the parent\n"
3797
3794
"directory of the current branch. For example, if you are currently in a\n"
3799
3796
"/path/to/newbranch."
3800
3797
msgstr ""
3801
3798
3802
#: bzrlib/builtins.py:5868
3799
#: bzrlib/builtins.py:5910
3803
3800
msgid ""
3804
3801
"Bound branches use the nickname of its master branch unless it is set\n"
3805
3802
"locally, in which case switching will update the local nickname to be\n"
3807
3804
msgstr ""
3808
3805
3809
3806
# help of 'force' option of 'switch' command
3810
#: bzrlib/builtins.py:5876
3807
#: bzrlib/builtins.py:5918
3811
3808
msgid "Switch even if local commits will be lost."
3812
3809
msgstr ""
3813
3810
3814
3811
# help of 'create-branch' option of 'switch' command
3815
#: bzrlib/builtins.py:5879
3812
#: bzrlib/builtins.py:5921
3816
3813
msgid "Create the target branch from this one before switching to it."
3817
3814
msgstr ""
3818
3815
3819
#: bzrlib/builtins.py:5891
3816
#: bzrlib/builtins.py:5933
3820
3817
msgid "You must supply either a revision or a location"
3821
3818
msgstr ""
3822
3819
3823
#: bzrlib/builtins.py:5902
3820
#: bzrlib/builtins.py:5944
3824
3821
msgid "cannot create branch without source branch"
3825
3822
msgstr ""
3826
3823
3827
#: bzrlib/builtins.py:5948
3824
#: bzrlib/builtins.py:5990
3828
3825
msgid "Manage filtered views."
3829
3826
msgstr ""
3830
3827
3831
#: bzrlib/builtins.py:5950
3828
#: bzrlib/builtins.py:5992
3832
3829
msgid ""
3833
3830
"Views provide a mask over the tree so that users can focus on\n"
3834
3831
"a subset of a tree when doing their work. After creating a view,\n"
3838
3835
"must be within the current view."
3839
3836
msgstr ""
3840
3837
3841
#: bzrlib/builtins.py:5957
3838
#: bzrlib/builtins.py:5999
3842
3839
msgid ""
3843
3840
"In most cases, a view has a short life-span: it is created to make\n"
3844
3841
"a selected change and is deleted once that change is committed.\n"
3846
3843
"and switch between them."
3847
3844
msgstr ""
3848
3845
3849
#: bzrlib/builtins.py:5962
3846
#: bzrlib/builtins.py:6004
3850
3847
msgid ""
3851
3848
"To disable the current view without deleting it, you can switch to\n"
3852
3849
"the pseudo view called ``off``. This can be useful when you need\n"
3854
3851
"want to switch back to your view after that."
3855
3852
msgstr ""
3856
3853
3857
#: bzrlib/builtins.py:5967
3854
#: bzrlib/builtins.py:6009
3858
3855
msgid ""
3859
3856
":Examples:\n"
3860
3857
" To define the current view::"
3861
3858
msgstr ""
3862
3859
3863
#: bzrlib/builtins.py:5970
3860
#: bzrlib/builtins.py:6012
3864
3861
msgid " bzr view file1 dir1 ..."
3865
3862
msgstr ""
3866
3863
3867
#: bzrlib/builtins.py:5972
3864
#: bzrlib/builtins.py:6014
3868
3865
msgid " To list the current view::"
3869
3866
msgstr ""
3870
3867
3871
#: bzrlib/builtins.py:5974
3868
#: bzrlib/builtins.py:6016
3872
3869
msgid " bzr view"
3873
3870
msgstr ""
3874
3871
3875
#: bzrlib/builtins.py:5976
3872
#: bzrlib/builtins.py:6018
3876
3873
msgid " To delete the current view::"
3877
3874
msgstr ""
3878
3875
3879
#: bzrlib/builtins.py:5978
3876
#: bzrlib/builtins.py:6020
3880
3877
msgid " bzr view --delete"
3881
3878
msgstr ""
3882
3879
3883
#: bzrlib/builtins.py:5980
3880
#: bzrlib/builtins.py:6022
3884
3881
msgid " To disable the current view without deleting it::"
3885
3882
msgstr ""
3886
3883
3887
#: bzrlib/builtins.py:5982
3884
#: bzrlib/builtins.py:6024
3888
3885
msgid " bzr view --switch off"
3889
3886
msgstr ""
3890
3887
3891
#: bzrlib/builtins.py:5984
3888
#: bzrlib/builtins.py:6026
3892
3889
msgid " To define a named view and switch to it::"
3893
3890
msgstr ""
3894
3891
3895
#: bzrlib/builtins.py:5986
3892
#: bzrlib/builtins.py:6028
3896
3893
msgid " bzr view --name view-name file1 dir1 ..."
3897
3894
msgstr ""
3898
3895
3899
#: bzrlib/builtins.py:5988
3896
#: bzrlib/builtins.py:6030
3900
3897
msgid " To list a named view::"
3901
3898
msgstr ""
3902
3899
3903
#: bzrlib/builtins.py:5990
3900
#: bzrlib/builtins.py:6032
3904
3901
msgid " bzr view --name view-name"
3905
3902
msgstr ""
3906
3903
3907
#: bzrlib/builtins.py:5992
3904
#: bzrlib/builtins.py:6034
3908
3905
msgid " To delete a named view::"
3909
3906
msgstr ""
3910
3907
3911
#: bzrlib/builtins.py:5994
3908
#: bzrlib/builtins.py:6036
3912
3909
msgid " bzr view --name view-name --delete"
3913
3910
msgstr ""
3914
3911
3915
#: bzrlib/builtins.py:5996
3912
#: bzrlib/builtins.py:6038
3916
3913
msgid " To switch to a named view::"
3917
3914
msgstr ""
3918
3915
3919
#: bzrlib/builtins.py:5998
3916
#: bzrlib/builtins.py:6040
3920
3917
msgid " bzr view --switch view-name"
3921
3918
msgstr ""
3922
3919
3923
#: bzrlib/builtins.py:6000
3920
#: bzrlib/builtins.py:6042
3924
3921
msgid " To list all views defined::"
3925
3922
msgstr ""
3926
3923
3927
#: bzrlib/builtins.py:6002
3924
#: bzrlib/builtins.py:6044
3928
3925
msgid " bzr view --all"
3929
3926
msgstr ""
3930
3927
3931
#: bzrlib/builtins.py:6004
3928
#: bzrlib/builtins.py:6046
3932
3929
msgid " To delete all views::"
3933
3930
msgstr ""
3934
3931
3935
#: bzrlib/builtins.py:6006
3932
#: bzrlib/builtins.py:6048
3936
3933
msgid " bzr view --delete --all"
3937
3934
msgstr ""
3938
3935
3939
3936
# help of 'all' option of 'view' command
3940
#: bzrlib/builtins.py:6013
3937
#: bzrlib/builtins.py:6055
3941
3938
msgid "Apply list or delete action to all views."
3942
3939
msgstr ""
3943
3940
3944
3941
# help of 'delete' option of 'view' command
3945
#: bzrlib/builtins.py:6016
3942
#: bzrlib/builtins.py:6058
3946
3943
msgid "Delete the view."
3947
3944
msgstr ""
3948
3945
3949
3946
# help of 'name' option of 'view' command
3950
#: bzrlib/builtins.py:6019
3947
#: bzrlib/builtins.py:6061
3951
3948
msgid "Name of the view to define, list or delete."
3952
3949
msgstr ""
3953
3950
3954
3951
# help of 'switch' option of 'view' command
3955
#: bzrlib/builtins.py:6023
3952
#: bzrlib/builtins.py:6065
3956
3953
msgid "Name of the view to switch to."
3957
3954
msgstr ""
3958
3955
3959
#: bzrlib/builtins.py:6042
3956
#: bzrlib/builtins.py:6084
3960
3957
msgid "Both --delete and a file list specified"
3961
3958
msgstr ""
3962
3959
3963
#: bzrlib/builtins.py:6045
3960
#: bzrlib/builtins.py:6087
3964
3961
msgid "Both --delete and --switch specified"
3965
3962
msgstr ""
3966
3963
3967
#: bzrlib/builtins.py:6048
3964
#: bzrlib/builtins.py:6090
3968
3965
msgid "Deleted all views.\n"
3969
3966
msgstr ""
3970
3967
3971
#: bzrlib/builtins.py:6050
3968
#: bzrlib/builtins.py:6092
3972
3969
msgid "No current view to delete"
3973
3970
msgstr ""
3974
3971
3975
#: bzrlib/builtins.py:6053
3972
#: bzrlib/builtins.py:6095
3976
3973
#, python-format
3977
3974
msgid "Deleted '%s' view.\n"
3978
3975
msgstr ""
3979
3976
3980
#: bzrlib/builtins.py:6057
3977
#: bzrlib/builtins.py:6099
3981
3978
msgid "Both --switch and a file list specified"
3982
3979
msgstr ""
3983
3980
3984
#: bzrlib/builtins.py:6060
3981
#: bzrlib/builtins.py:6102
3985
3982
msgid "Both --switch and --all specified"
3986
3983
msgstr ""
3987
3984
3988
#: bzrlib/builtins.py:6063
3985
#: bzrlib/builtins.py:6105
3989
3986
msgid "No current view to disable"
3990
3987
msgstr ""
3991
3988
3992
#: bzrlib/builtins.py:6065
3989
#: bzrlib/builtins.py:6107
3993
3990
#, python-format
3994
3991
msgid "Disabled '%s' view.\n"
3995
3992
msgstr ""
3996
3993
3997
#: bzrlib/builtins.py:6069 bzrlib/builtins.py:6091
3994
#: bzrlib/builtins.py:6111 bzrlib/builtins.py:6133
3998
3995
msgid "Using '{0}' view: {1}\n"
3999
3996
msgstr ""
4000
3997
4001
#: bzrlib/builtins.py:6072
3998
#: bzrlib/builtins.py:6114
4002
3999
msgid "Views defined:\n"
4003
4000
msgstr ""
4004
4001
4005
#: bzrlib/builtins.py:6081
4002
#: bzrlib/builtins.py:6123
4006
4003
msgid "No views defined.\n"
4007
4004
msgstr ""
4008
4005
4009
#: bzrlib/builtins.py:6088
4006
#: bzrlib/builtins.py:6130
4010
4007
msgid "Cannot change the 'off' pseudo view"
4011
4008
msgstr ""
4012
4009
4013
#: bzrlib/builtins.py:6096
4010
#: bzrlib/builtins.py:6138
4014
4011
msgid "No current view.\n"
4015
4012
msgstr ""
4016
4013
4017
#: bzrlib/builtins.py:6099
4014
#: bzrlib/builtins.py:6141
4018
4015
msgid "'{0}' view is: {1}\n"
4019
4016
msgstr ""
4020
4017
4021
#: bzrlib/builtins.py:6119
4018
#: bzrlib/builtins.py:6161
4022
4019
msgid " <no hooks installed>\n"
4023
4020
msgstr ""
4024
4021
4025
#: bzrlib/builtins.py:6123
4022
#: bzrlib/builtins.py:6165
4026
4023
msgid "Remove a branch."
4027
4024
msgstr ""
4028
4025
4029
#: bzrlib/builtins.py:6125
4026
#: bzrlib/builtins.py:6167
4030
4027
msgid ""
4031
4028
"This will remove the branch from the specified location but \n"
4032
4029
"will keep any working tree or repository in place."
4033
4030
msgstr ""
4034
4031
4035
#: bzrlib/builtins.py:6130
4032
#: bzrlib/builtins.py:6172
4036
4033
msgid " Remove the branch at repo/trunk::"
4037
4034
msgstr ""
4038
4035
4039
#: bzrlib/builtins.py:6132
4036
#: bzrlib/builtins.py:6174
4040
4037
msgid " bzr remove-branch repo/trunk"
4041
4038
msgstr ""
4042
4039
4043
#: bzrlib/builtins.py:6148
4040
#: bzrlib/builtins.py:6190
4044
4041
msgid "Temporarily set aside some changes from the current tree."
4045
4042
msgstr ""
4046
4043
4047
#: bzrlib/builtins.py:6150
4044
#: bzrlib/builtins.py:6192
4048
4045
msgid ""
4049
4046
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4050
4047
"ie. out of the way, until a later time when you can bring them back from\n"
4053
4050
"will they survive its deletion."
4054
4051
msgstr ""
4055
4052
4056
#: bzrlib/builtins.py:6156
4053
#: bzrlib/builtins.py:6198
4057
4054
msgid "If shelve --list is specified, previously-shelved changes are listed."
4058
4055
msgstr ""
4059
4056
4060
#: bzrlib/builtins.py:6158
4057
#: bzrlib/builtins.py:6200
4061
4058
msgid ""
4062
4059
"Shelve is intended to help separate several sets of changes that have\n"
4063
4060
"been inappropriately mingled. If you just want to get rid of all changes\n"
4065
4062
"shelve all text changes at once, use shelve --all."
4066
4063
msgstr ""
4067
4064
4068
#: bzrlib/builtins.py:6163
4065
#: bzrlib/builtins.py:6205
4069
4066
msgid ""
4070
4067
"If filenames are specified, only the changes to those files will be\n"
4071
4068
"shelved. Other files will be left untouched."
4072
4069
msgstr ""
4073
4070
4074
#: bzrlib/builtins.py:6166
4071
#: bzrlib/builtins.py:6208
4075
4072
msgid ""
4076
4073
"If a revision is specified, changes since that revision will be shelved."
4077
4074
msgstr ""
4078
4075
4079
#: bzrlib/builtins.py:6168
4076
#: bzrlib/builtins.py:6210
4080
4077
msgid ""
4081
4078
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4082
4079
"restore the most recently shelved changes."
4083
4080
msgstr ""
4084
4081
4085
#: bzrlib/builtins.py:6171
4082
#: bzrlib/builtins.py:6213
4086
4083
msgid ""
4087
4084
"For complicated changes, it is possible to edit the changes in a separate\n"
4088
4085
"editor program to decide what the file remaining in the working copy\n"
4089
4086
"should look like. To do this, add the configuration option"
4090
4087
msgstr ""
4091
4088
4092
#: bzrlib/builtins.py:6175
4089
#: bzrlib/builtins.py:6217
4093
4090
msgid " change_editor = PROGRAM @new_path @old_path"
4094
4091
msgstr ""
4095
4092
4096
#: bzrlib/builtins.py:6177
4093
#: bzrlib/builtins.py:6219
4097
4094
msgid ""
4098
4095
"where @new_path is replaced with the path of the new version of the \n"
4099
4096
"file and @old_path is replaced with the path of the old version of \n"
4103
4100
msgstr ""
4104
4101
4105
4102
# help of 'all' option of 'shelve' command
4106
#: bzrlib/builtins.py:6189
4103
#: bzrlib/builtins.py:6231
4107
4104
msgid "Shelve all changes."
4108
4105
msgstr ""
4109
4106
4110
4107
# help of 'writer' option of 'shelve' command
4111
#: bzrlib/builtins.py:6191
4108
#: bzrlib/builtins.py:6233
4112
4109
msgid "Method to use for writing diffs."
4113
4110
msgstr ""
4114
4111
4115
4112
# title of 'writer' option of 'shelve' command
4116
#: bzrlib/builtins.py:6191
4113
#: bzrlib/builtins.py:6233
4117
4114
msgid "writer"
4118
4115
msgstr ""
4119
4116
4120
4117
# help of 'list' option of 'shelve' command
4121
#: bzrlib/builtins.py:6195
4118
#: bzrlib/builtins.py:6237
4122
4119
msgid "List shelved changes."
4123
4120
msgstr ""
4124
4121
4125
4122
# help of 'destroy' option of 'shelve' command
4126
#: bzrlib/builtins.py:6197
4123
#: bzrlib/builtins.py:6239
4127
4124
msgid "Destroy removed changes instead of shelving them."
4128
4125
msgstr ""
4129
4126
4130
#: bzrlib/builtins.py:6226
4127
#: bzrlib/builtins.py:6268
4131
4128
msgid "No shelved changes."
4132
4129
msgstr ""
4133
4130
4134
#: bzrlib/builtins.py:6237
4131
#: bzrlib/builtins.py:6279
4135
4132
msgid "Restore shelved changes."
4136
4133
msgstr ""
4137
4134
4138
#: bzrlib/builtins.py:6239
4135
#: bzrlib/builtins.py:6281
4139
4136
msgid ""
4140
4137
"By default, the most recently shelved changes are restored. However if you\n"
4141
4138
"specify a shelf by id those changes will be restored instead. This works\n"
4143
4140
msgstr ""
4144
4141
4145
4142
# help of 'action' option of 'unshelve' command
4146
#: bzrlib/builtins.py:6248
4143
#: bzrlib/builtins.py:6290
4147
4144
msgid "The action to perform."
4148
4145
msgstr ""
4149
4146
4150
#: bzrlib/builtins.py:6270
4147
#: bzrlib/builtins.py:6312
4151
4148
msgid "Remove unwanted files from working tree."
4152
4149
msgstr ""
4153
4150
4154
#: bzrlib/builtins.py:6272
4151
#: bzrlib/builtins.py:6314
4155
4152
msgid ""
4156
4153
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4157
4154
"files are never deleted."
4158
4155
msgstr ""
4159
4156
4160
#: bzrlib/builtins.py:6275
4157
#: bzrlib/builtins.py:6317
4161
4158
msgid ""
4162
4159
"Another class is 'detritus', which includes files emitted by bzr during\n"
4163
4160
"normal operations and selftests. (The value of these files decreases with\n"
4164
4161
"time.)"
4165
4162
msgstr ""
4166
4163
4167
#: bzrlib/builtins.py:6279
4164
#: bzrlib/builtins.py:6321
4168
4165
msgid ""
4169
4166
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4170
4167
"flags are respected, and may be combined."
4171
4168
msgstr ""
4172
4169
4173
#: bzrlib/builtins.py:6282
4170
#: bzrlib/builtins.py:6324
4174
4171
msgid "To check what clean-tree will do, use --dry-run."
4175
4172
msgstr ""
4176
4173
4177
4174
# help of 'ignored' option of 'clean-tree' command
4178
#: bzrlib/builtins.py:6285
4175
#: bzrlib/builtins.py:6327
4179
4176
msgid "Delete all ignored files."
4180
4177
msgstr ""
4181
4178
4182
4179
# help of 'detritus' option of 'clean-tree' command
4183
#: bzrlib/builtins.py:6286
4180
#: bzrlib/builtins.py:6328
4184
4181
msgid ""
4185
4182
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4186
4183
msgstr ""
4187
4184
4188
4185
# help of 'unknown' option of 'clean-tree' command
4189
#: bzrlib/builtins.py:6289
4186
#: bzrlib/builtins.py:6331
4190
4187
msgid "Delete files unknown to bzr (default)."
4191
4188
msgstr ""
4192
4189
4193
4190
# help of 'dry-run' option of 'clean-tree' command
4194
#: bzrlib/builtins.py:6290
4191
#: bzrlib/builtins.py:6332
4195
4192
msgid "Show files to delete instead of deleting them."
4196
4193
msgstr ""
4197
4194
4198
4195
# help of 'force' option of 'clean-tree' command
4199
#: bzrlib/builtins.py:6292
4196
#: bzrlib/builtins.py:6334
4200
4197
msgid "Do not prompt before deleting."
4201
4198
msgstr ""
4202
4199
4212
4209
msgstr[1] ""
4213
4210
4214
4211
#: bzrlib/bzrdir.py:636
4215
#, python-format
4216
4212
msgid ""
4217
"making backup of %s\n"
4218
" to %s"
4213
"making backup of {0}\n"
4214
" to {1}"
4219
4215
msgstr ""
4220
4216
4221
4217
#: bzrlib/bzrdir.py:659
4381
4377
msgstr ""
4382
4378
4383
4379
#: bzrlib/clean_tree.py:126
4384
#, python-format
4385
msgid "unable to remove \"%s\": %s."
4380
msgid "unable to remove \"{0}\": {1}."
4386
4381
msgstr ""
4387
4382
4388
#: bzrlib/clean_tree.py:130
4383
#: bzrlib/clean_tree.py:131
4389
4384
msgid "No files deleted."
4390
4385
msgstr ""
4391
4386
4517
4512
msgstr ""
4518
4513
4519
4514
#: bzrlib/commands.py:557
4520
#, python-format
4521
msgid ":doc:`%s <%s-help>`"
4515
msgid ":doc:`{0} <{1}-help>`"
4522
4516
msgstr ""
4523
4517
4524
#: bzrlib/commands.py:560
4518
#: bzrlib/commands.py:561
4525
4519
#, python-format
4526
4520
msgid ":See also: %s"
4527
4521
msgstr ""
4528
4522
4529
#: bzrlib/commands.py:818 bzrlib/gpg.py:317
4523
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4530
4524
msgid "Only ASCII permitted in option names"
4531
4525
msgstr ""
4532
4526
4533
#: bzrlib/commands.py:843 bzrlib/commands.py:851
4527
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4534
4528
msgid "command {0!r} needs one or more {1}"
4535
4529
msgstr ""
4536
4530
4537
#: bzrlib/commands.py:860
4531
#: bzrlib/commands.py:861
4538
4532
msgid "command {0!r} requires argument {1}"
4539
4533
msgstr ""
4540
4534
4541
#: bzrlib/commands.py:867
4535
#: bzrlib/commands.py:868
4542
4536
msgid "extra argument to command {0}: {1}"
4543
4537
msgstr ""
4544
4538
4545
#: bzrlib/commands.py:964
4539
#: bzrlib/commands.py:965
4546
4540
#, python-format
4547
4541
msgid "Profile data written to \"%s\"."
4548
4542
msgstr ""
6083
6077
msgstr ""
6084
6078
6085
6079
#: bzrlib/lock.py:547
6086
#, python-format
6087
msgid "%r was %s locked again"
6080
msgid "{0!r} was {1} locked again"
6088
6081
msgstr ""
6089
6082
6090
#: bzrlib/log.py:562
6083
#: bzrlib/log.py:569
6091
6084
msgid "--exclude-common-ancestry requires two different revisions"
6092
6085
msgstr ""
6093
6086
6094
#: bzrlib/log.py:564
6087
#: bzrlib/log.py:571
6095
6088
#, python-format
6096
6089
msgid "invalid direction %r"
6097
6090
msgstr ""
6098
6091
6099
#: bzrlib/log.py:611
6092
#: bzrlib/log.py:618
6100
6093
msgid "Start revision not found in left-hand history of end revision."
6101
6094
msgstr ""
6102
6095
6103
#: bzrlib/log.py:657
6096
#: bzrlib/log.py:664
6104
6097
msgid "Start revision not found in history of end revision."
6105
6098
msgstr ""
6106
6099
6107
#: bzrlib/log.py:1075 bzrlib/log.py:1133
6100
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6108
6101
msgid "Logging revision 0 is invalid."
6109
6102
msgstr ""
6110
6103
6111
#: bzrlib/log.py:1077 bzrlib/log.py:1135
6104
#: bzrlib/log.py:1084 bzrlib/log.py:1142
6112
6105
msgid "Start revision must be older than the end revision."
6113
6106
msgstr ""
6114
6107
6115
#: bzrlib/log.py:1821
6108
#: bzrlib/log.py:1828
6116
6109
#, python-format
6117
6110
msgid "unknown log formatter: %r"
6118
6111
msgstr ""
6119
6112
6120
#: bzrlib/log.py:2116
6113
#: bzrlib/log.py:2123
6121
6114
msgid "fixes bug"
6122
msgid_plural "fixes bug"
6115
msgid_plural "fixes bugs"
6123
6116
msgstr[0] ""
6124
6117
msgstr[1] ""
6125
6118
6588
6581
msgstr ""
6589
6582
6590
6583
#: bzrlib/reconcile.py:165
6591
#, python-format
6592
msgid "Fixing last revision info %s => %s"
6584
msgid "Fixing last revision info {0} => {1}"
6593
6585
msgstr ""
6594
6586
6595
#: bzrlib/reconcile.py:171
6587
#: bzrlib/reconcile.py:172
6596
6588
msgid "revision_history ok."
6597
6589
msgstr ""
6598
6590
6599
#: bzrlib/reconcile.py:232
6591
#: bzrlib/reconcile.py:233
6600
6592
msgid "Reading inventory data"
6601
6593
msgstr ""
6602
6594
6603
#: bzrlib/reconcile.py:252 bzrlib/reconcile.py:382
6595
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
6604
6596
msgid "Inventory ok."
6605
6597
msgstr ""
6606
6598
6607
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6599
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
6608
6600
msgid "Backing up inventory"
6609
6601
msgstr ""
6610
6602
6611
#: bzrlib/reconcile.py:256
6603
#: bzrlib/reconcile.py:257
6612
6604
msgid "Backup inventory created."
6613
6605
msgstr ""
6614
6606
6615
#: bzrlib/reconcile.py:272 bzrlib/reconcile.py:403
6607
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
6616
6608
msgid "Writing weave"
6617
6609
msgstr ""
6618
6610
6619
#: bzrlib/reconcile.py:275 bzrlib/reconcile.py:406
6611
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
6620
6612
msgid "Inventory regenerated."
6621
6613
msgstr ""
6622
6614
6623
#: bzrlib/reconcile.py:369 bzrlib/reconcile.py:371 bzrlib/reconcile.py:374
6615
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
6624
6616
msgid "Reading indexes"
6625
6617
msgstr ""
6626
6618
6627
#: bzrlib/reconcile.py:378 bzrlib/reconcile.py:380
6619
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
6628
6620
msgid "Checking unused inventories"
6629
6621
msgstr ""
6630
6622
6631
#: bzrlib/reconcile.py:386
6623
#: bzrlib/reconcile.py:387
6632
6624
msgid "Backup Inventory created"
6633
6625
msgstr ""
6634
6626
6635
#: bzrlib/reconcile.py:444
6627
#: bzrlib/reconcile.py:445
6636
6628
msgid "Fixing text parents"
6637
6629
msgstr ""
6638
6630
6645
6637
msgid "%s is now not stacked\n"
6646
6638
msgstr ""
6647
6639
6648
#: bzrlib/remote.py:1877
6640
#: bzrlib/remote.py:1886
6649
6641
msgid "Copying repository content as tarball..."
6650
6642
msgstr ""
6651
6643
6666
6658
msgid "bzr: ERROR (ignored): %s"
6667
6659
msgstr ""
6668
6660
6669
#: bzrlib/repository.py:1803
6661
#: bzrlib/repository.py:1806
6670
6662
msgid "Moving repository to repository.backup"
6671
6663
msgstr ""
6672
6664
6673
#: bzrlib/repository.py:1810
6665
#: bzrlib/repository.py:1813
6674
6666
msgid "Creating new repository"
6675
6667
msgstr ""
6676
6668
6677
#: bzrlib/repository.py:1815
6669
#: bzrlib/repository.py:1818
6678
6670
msgid "Copying content"
6679
6671
msgstr ""
6680
6672
6681
#: bzrlib/repository.py:1819
6673
#: bzrlib/repository.py:1822
6682
6674
msgid "Deleting old repository content"
6683
6675
msgstr ""
6684
6676
6685
#: bzrlib/repository.py:1821
6677
#: bzrlib/repository.py:1824
6686
6678
msgid "repository converted"
6687
6679
msgstr ""
6688
6680
6689
6681
#: bzrlib/revisionspec.py:914
6690
#, python-format
6691
msgid "Using %s %s"
6682
msgid "Using {0} {1}"
6692
6683
msgstr ""
6693
6684
6694
6685
#: bzrlib/send.py:56
6705
6696
msgstr ""
6706
6697
6707
6698
#: bzrlib/send.py:77
6708
#, python-format
6709
msgid "Using saved %s location \"%s\" to determine what changes to submit."
6699
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6710
6700
msgstr ""
6711
6701
6712
6702
#: bzrlib/send.py:94
7004
6994
msgstr ""
7005
6995
7006
6996
#: bzrlib/win32utils.py:158
7007
#, python-format
7008
msgid "WorkingSize %7dKiB\tPeakWorking %7dKiB\t%s"
6997
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7009
6998
msgstr ""
7010
6999
7011
7000
#: bzrlib/win32utils.py:166
Loggerhead is a web-based interface for Breezy
Version: 2.0.1