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