Source

kick-start_fork / po / de.po

The default branch has multiple heads

Full commit
   1
   2
   3
   4
   5
   6
   7
   8
   9
  10
  11
  12
  13
  14
  15
  16
  17
  18
  19
  20
  21
  22
  23
  24
  25
  26
  27
  28
  29
  30
  31
  32
  33
  34
  35
  36
  37
  38
  39
  40
  41
  42
  43
  44
  45
  46
  47
  48
  49
  50
  51
  52
  53
  54
  55
  56
  57
  58
  59
  60
  61
  62
  63
  64
  65
  66
  67
  68
  69
  70
  71
  72
  73
  74
  75
  76
  77
  78
  79
  80
  81
  82
  83
  84
  85
  86
  87
  88
  89
  90
  91
  92
  93
  94
  95
  96
  97
  98
  99
 100
 101
 102
 103
 104
 105
 106
 107
 108
 109
 110
 111
 112
 113
 114
 115
 116
 117
 118
 119
 120
 121
 122
 123
 124
 125
 126
 127
 128
 129
 130
 131
 132
 133
 134
 135
 136
 137
 138
 139
 140
 141
 142
 143
 144
 145
 146
 147
 148
 149
 150
 151
 152
 153
 154
 155
 156
 157
 158
 159
 160
 161
 162
 163
 164
 165
 166
 167
 168
 169
 170
 171
 172
 173
 174
 175
 176
 177
 178
 179
 180
 181
 182
 183
 184
 185
 186
 187
 188
 189
 190
 191
 192
 193
 194
 195
 196
 197
 198
 199
 200
 201
 202
 203
 204
 205
 206
 207
 208
 209
 210
 211
 212
 213
 214
 215
 216
 217
 218
 219
 220
 221
 222
 223
 224
 225
 226
 227
 228
 229
 230
 231
 232
 233
 234
 235
 236
 237
 238
 239
 240
 241
 242
 243
 244
 245
 246
 247
 248
 249
 250
 251
 252
 253
 254
 255
 256
 257
 258
 259
 260
 261
 262
 263
 264
 265
 266
 267
 268
 269
 270
 271
 272
 273
 274
 275
 276
 277
 278
 279
 280
 281
 282
 283
 284
 285
 286
 287
 288
 289
 290
 291
 292
 293
 294
 295
 296
 297
 298
 299
 300
 301
 302
 303
 304
 305
 306
 307
 308
 309
 310
 311
 312
 313
 314
 315
 316
 317
 318
 319
 320
 321
 322
 323
 324
 325
 326
 327
 328
 329
 330
 331
 332
 333
 334
 335
 336
 337
 338
 339
 340
 341
 342
 343
 344
 345
 346
 347
 348
 349
 350
 351
 352
 353
 354
 355
 356
 357
 358
 359
 360
 361
 362
 363
 364
 365
 366
 367
 368
 369
 370
 371
 372
 373
 374
 375
 376
 377
 378
 379
 380
 381
 382
 383
 384
 385
 386
 387
 388
 389
 390
 391
 392
 393
 394
 395
 396
 397
 398
 399
 400
 401
 402
 403
 404
 405
 406
 407
 408
 409
 410
 411
 412
 413
 414
 415
 416
 417
 418
 419
 420
 421
 422
 423
 424
 425
 426
 427
 428
 429
 430
 431
 432
 433
 434
 435
 436
 437
 438
 439
 440
 441
 442
 443
 444
 445
 446
 447
 448
 449
 450
 451
 452
 453
 454
 455
 456
 457
 458
 459
 460
 461
 462
 463
 464
 465
 466
 467
 468
 469
 470
 471
 472
 473
 474
 475
 476
 477
 478
 479
 480
 481
 482
 483
 484
 485
 486
 487
 488
 489
 490
 491
 492
 493
 494
 495
 496
 497
 498
 499
 500
 501
 502
 503
 504
 505
 506
 507
 508
 509
 510
 511
 512
 513
 514
 515
 516
 517
 518
 519
 520
 521
 522
 523
 524
 525
 526
 527
 528
 529
 530
 531
 532
 533
 534
 535
 536
 537
 538
 539
 540
 541
 542
 543
 544
 545
 546
 547
 548
 549
 550
 551
 552
 553
 554
 555
 556
 557
 558
 559
 560
 561
 562
 563
 564
 565
 566
 567
 568
 569
 570
 571
 572
 573
 574
 575
 576
 577
 578
 579
 580
 581
 582
 583
 584
 585
 586
 587
 588
 589
 590
 591
 592
 593
 594
 595
 596
 597
 598
 599
 600
 601
 602
 603
 604
 605
 606
 607
 608
 609
 610
 611
 612
 613
 614
 615
 616
 617
 618
 619
 620
 621
 622
 623
 624
 625
 626
 627
 628
 629
 630
 631
 632
 633
 634
 635
 636
 637
 638
 639
 640
 641
 642
 643
 644
 645
 646
 647
 648
 649
 650
 651
 652
 653
 654
 655
 656
 657
 658
 659
 660
 661
 662
 663
 664
 665
 666
 667
 668
 669
 670
 671
 672
 673
 674
 675
 676
 677
 678
 679
 680
 681
 682
 683
 684
 685
 686
 687
 688
 689
 690
 691
 692
 693
 694
 695
 696
 697
 698
 699
 700
 701
 702
 703
 704
 705
 706
 707
 708
 709
 710
 711
 712
 713
 714
 715
 716
 717
 718
 719
 720
 721
 722
 723
 724
 725
 726
 727
 728
 729
 730
 731
 732
 733
 734
 735
 736
 737
 738
 739
 740
 741
 742
 743
 744
 745
 746
 747
 748
 749
 750
 751
 752
 753
 754
 755
 756
 757
 758
 759
 760
 761
 762
 763
 764
 765
 766
 767
 768
 769
 770
 771
 772
 773
 774
 775
 776
 777
 778
 779
 780
 781
 782
 783
 784
 785
 786
 787
 788
 789
 790
 791
 792
 793
 794
 795
 796
 797
 798
 799
 800
 801
 802
 803
 804
 805
 806
 807
 808
 809
 810
 811
 812
 813
 814
 815
 816
 817
 818
 819
 820
 821
 822
 823
 824
 825
 826
 827
 828
 829
 830
 831
 832
 833
 834
 835
 836
 837
 838
 839
 840
 841
 842
 843
 844
 845
 846
 847
 848
 849
 850
 851
 852
 853
 854
 855
 856
 857
 858
 859
 860
 861
 862
 863
 864
 865
 866
 867
 868
 869
 870
 871
 872
 873
 874
 875
 876
 877
 878
 879
 880
 881
 882
 883
 884
 885
 886
 887
 888
 889
 890
 891
 892
 893
 894
 895
 896
 897
 898
 899
 900
 901
 902
 903
 904
 905
 906
 907
 908
 909
 910
 911
 912
 913
 914
 915
 916
 917
 918
 919
 920
 921
 922
 923
 924
 925
 926
 927
 928
 929
 930
 931
 932
 933
 934
 935
 936
 937
 938
 939
 940
 941
 942
 943
 944
 945
 946
 947
 948
 949
 950
 951
 952
 953
 954
 955
 956
 957
 958
 959
 960
 961
 962
 963
 964
 965
 966
 967
 968
 969
 970
 971
 972
 973
 974
 975
 976
 977
 978
 979
 980
 981
 982
 983
 984
 985
 986
 987
 988
 989
 990
 991
 992
 993
 994
 995
 996
 997
 998
 999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
# German translations for aragost Trifork Mercurial Kick Start.
# Copyright (C) 2011 aragost Trifork
# This file is distributed under the same license as the aragost Trifork
# Mercurial Kick Start.
# Martin Geisler <mg@lazybytes.net>, 2011.
#
# Translation dictionary:
#
# revision            Revision
# tag                 Marker
# working directory   Arbeitsverzeichnis
#
msgid ""
msgstr ""
"Project-Id-Version: aragost Trifork Mercurial Kick Start\n"
"Report-Msgid-Bugs-To: <mg@aragost.com>\n"
"POT-Creation-Date: 2011-05-11 14:55+0100\n"
"PO-Revision-Date: 2011-05-11 14:12+0200\n"
"Last-Translator: Martin Geisler <mg@lazybytes.net>\n"
"Language-Team: German\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: src/about/index.txt:12
msgid ""
"=====\n"
"About\n"
"====="
msgstr ""
"====\n"
"Über\n"
"===="

#: src/about/index.txt:16
msgid ""
"The Mercurial Kick Start guide is maintained by `Martin Geisler`_.\n"
"Please get in contact if you have ideas for improvements or if you\n"
"want to contribute a chapter."
msgstr ""
"Der Mercurial Kick-Start-Leitfaden wird von `Martin Geisler`_ verwaltet.\n"
"Wenn Sie Verbesserungsideen haben oder ein Kapitel beitragen wollen, \n"
"Kontaktieren Sie uns bitte."

#: src/about/index.txt:20
msgid ""
"The source for the guide is `hosted on Bitbucket`_. You can get a copy\n"
"with::"
msgstr ""
"Der Quellcode dieses Leitfadens ist `auf Bitbucket verfügbar`_. Um eine\n"
"Kopie zu erhalten, nutzen Sie::"

#: src/about/index.txt:23
msgid "  $ hg clone https://bitbucket.org/aragost/kick-start/"
msgstr "  $ hg clone https://bitbucket.org/aragost/kick-start/"

#: src/about/index.txt:25
msgid ""
"Run ``make`` to build everything. This only works on Linux --- see the\n"
"``README`` file for information about what you need to install."
msgstr ""
"Nutzen Sie  ``make``, um alles zu bauen; funktioniert nur in GNU/linux --- "
"in der\n"
"\"``README``-Datei finden Sie Informationen, welche Abhängegkeiten sie dafür "
"installieren müssen."

#: src/about/index.txt:28
msgid ""
"The guide is licensed under the `GNU GPL`_. You are free to modify it\n"
"and you can distribute your modifications as long as you distribute\n"
"the source with them. See the license text for the full details."
msgstr ""
"Der Leitfaden ist unter der `GNU GPL` lizensiert. Sie dürfen ihn ändern und "
"ihre \n"
"veränderte Version weitergeben, solange Sie die Quelldateien mitliefern. "
"Feinheiten\n"
"finden Sie in der Lizenz."

#: src/about/index.txt:32
msgid ""
".. _Martin Geisler: mg@aragost.com\n"
".. _hosted on Bitbucket: https://bitbucket.org/aragost/kick-start/\n"
".. _GNU GPL: https://bitbucket.org/aragost/kick-start/src/tip/COPYING"
msgstr ""
".. _Martin Geisler: mg@aragost.com\n"
".. _auf Bitbucket verfügbar: https://bitbucket.org/aragost/kick-start/\n"
".. _GNU GPL: https://bitbucket.org/aragost/kick-start/src/tip/COPYING"

#: src/about/index.txt:36
msgid ""
"Translations\n"
"============"
msgstr ""
"Übersetzungen\n"
"============="

#: src/about/index.txt:39
msgid "A big thanks goes to the translators:"
msgstr "Vielen Dank an die Übersetzer:"

#: src/about/index.txt:41
msgid "* Czech: Tovim"
msgstr "* Tschechisch: Tovim"

#: src/basic/index.txt:12
msgid ""
"===============\n"
"Basic Mercurial\n"
"==============="
msgstr ""
"========================\n"
"Grundlagen von Mercurial\n"
"========================"

# german:translated the forst 128 lines.
#: src/basic/index.txt:16
msgid ""
"We will begin with the basics of Mercurial. We believe the best way to\n"
"learn is to do things yourself, so we encourage you to follow along\n"
"and execute the commands you see \"Alice\" and \"Bob\" execute. You can\n"
"tell who is executing the command by the color of their terminal:\n"
"Alice has a pale peach colored terminal, Bob has a pale turquoise\n"
"color, and Carla (introduced later) has a lavender color."
msgstr ""
"Wir beginnen mit den Grundlagen von Mercurial. Wir sind der Ansicht, dass \n"
"man am Besten lernt, wenn man Dinge selbst ausprobiert, daher möchten wir\n"
"Sie ermutigen, mitzumachen und die Befehle, die „Alice“ und „Bob“ nutzen \n"
"auch selbst auszuführen. Die Farben zeigen an, wer den jeweiligen Befehl\n"
"ausführt: \n"
"Alice hat eine blass !TODO PEACH! gefärbte Konsole, Bobs Konsole ist blass \n"
"Türkis, und Carla (die später vorgestellt wird) nutzt Lavendel als Farbe."

#: src/basic/index.txt:23
msgid ""
"There are also some exercises later that cover the same things that\n"
"Alice and Bob did."
msgstr "Später gibt es Übungen zu den Handlungen von Alice und Bob."

#: src/basic/index.txt:28
msgid ""
"Installation & Configuration\n"
"============================"
msgstr ""
"Installation und Konfiguration\n"
"=============================="

#: src/basic/index.txt:31
msgid ""
"Mercurial is available for most platforms, including Windows, Mac OS\n"
"X, and GNU/Linux:"
msgstr ""
"Mercurial ist auf den meisten Plattformen verfügbar, unklusive Windows, Mac "
"OS X,\n"
"and GNU/Linux:"

#: src/basic/index.txt:34
msgid ""
"Windows:\n"
"  Please only install TortoiseHg_, which gives you a complete\n"
"  installation with Mercurial and a set of graphical tools for\n"
"  examining and manipulating the repository."
msgstr ""
"Windows:\n"
"  Bitte installieren sie nur TortoiseHg_, das ihnen eine vollständige\n"
"  Installation mit Mercurial und einer Sammlung von Grafischen Werkzeugen\n"
"  bietet."

#: src/basic/index.txt:39
msgid ""
"  After installation, you will have a right-click menu in Windows\n"
"  Explorer that gives you access to the graphical tools. After logging\n"
"  out and in again, you will also have a `hg` and a `hgtk` program\n"
"  available in a Command Prompt. You can use the `hgtk` program to\n"
"  start the graphical TortoiseHg tools."
msgstr ""
"  Nach der Installation werden sie im Windows-Explorer ein Rechtsklick-Menü\n"
"  haben, das Ihnen Zugriff auf die grafischen Werzeuge gibt. Nech "
"Abmeldung \n"
"  und erneuter Anmeldung werden Sie außerdem auf der Befehlszeile \n"
"  ein `hg` und ein `hgtk` Programmzur Verfügung haben. Sie können das "
"`hgtk`-\n"
"  Programm nutzen, um die grafischen TortoiseHg-Werkzeuge zu starten.\n"
"  "

#: src/basic/index.txt:45
msgid "  .. tip::"
msgstr "  .. tip::"

#: src/basic/index.txt:47
msgid ""
"     While the examples will use a few Unix commands, you can easily\n"
"     translate them back to the equivalent commands for the Command\n"
"     Prompt::"
msgstr ""
"     Obwohl die Beispiele einige Unix-Befehle nutzen, können Sie sie\n"
"     einfach in die Äquivalinten Befehle im Command-Prompt übersetzen::"

#: src/basic/index.txt:51
msgid ""
"       ls          -> dir\n"
"       cat         -> type\n"
"       echo \"abc\"  -> echo abc"
msgstr ""
"       ls          -> dir\n"
"       cat         -> type\n"
"       echo \"abc\"  -> echo abc"

#: src/basic/index.txt:55
msgid ""
"Linux:\n"
"  Please install Mercurial_ using either your package manager or from\n"
"  source. A source install is recommended, which is very easy: execute\n"
"  ``make local`` and symlink the `hg` script to a directory in your\n"
"  ``PATH``."
msgstr ""
"Linux:\n"
"  Bitte Installieren Sie Mercurial_ entweder über Ihre Paketverwaltung \n"
"  oder aus den Quellen. Eine Installation aus den Quellen wird empfohlen \n"
"  und ist sehr einfach: Führen Sie einfach ``make local`` in Mercurial-"
"Ordner aus\n"
"  und erstellen sie einen Symling zu dem `hg`-Skript in einem Ordner in "
"ihrem ``PATH``"

#: src/basic/index.txt:61
msgid ""
"  To install TortoiseHg, you need the PyGTK bindings. They are\n"
"  available in most distributions. Then follow `these instructions`__.\n"
"  That gives you the `hgtk` program."
msgstr ""

#: src/basic/index.txt:65
msgid ""
"Mac OS X:\n"
"  There are binary packages available for Mercurial_. The PyGTK\n"
"  bindings are difficult to install on Mac OS X, so instead of\n"
"  TortoiseHg, recommend using Murky_ to examine the repository\n"
"  history."
msgstr ""

#: src/basic/index.txt:71
msgid ""
".. _TortoiseHg: http://tortoisehg.org/\n"
".. _Mercurial: http://mercurial.selenic.com/\n"
".. __: http://bitbucket.org/tortoisehg/stable/wiki/hgtk\n"
".. _Murky: http://bitbucket.org/snej/murky/"
msgstr ""
".. _TortoiseHg: http://tortoisehg.org/\n"
".. _Mercurial: http://mercurial.selenic.com/\n"
".. __: http://bitbucket.org/tortoisehg/stable/wiki/hgtk\n"
".. _Murky: http://bitbucket.org/snej/murky/"

#: src/basic/index.txt:76
msgid ""
"We will be using the command line in our examples but will sometime\n"
"show the repository state in the Repository Explorer (`hgtk log`) from\n"
"TortoiseHg."
msgstr ""

#: src/basic/index.txt:80 src/subrepositories/index.txt:77
#: src/tasks/index.txt:395
msgid ".. note::"
msgstr ""

#: src/basic/index.txt:82
msgid ""
"   TortoiseHg version 2.0 was recently released and the `hgtk` program\n"
"   is now known as `thg`. The guide still uses the `hgtk` program from\n"
"   TortoiseHg version 1.x. This means that the screenshots shown here\n"
"   will look different from what you see when you use the latest\n"
"   version of TortoiseHg."
msgstr ""

#: src/basic/index.txt:88
msgid ""
"   We will update the guide to TortoiseHg 2.0 later and hope the\n"
"   temporary mismatch wont cause any problems."
msgstr ""

#: src/basic/index.txt:91
msgid "After installing Mercurial, try running `hg version`:"
msgstr ""

#: src/basic/index.txt:105
msgid ""
"It is of course fine if you see a version number greater than 1.8.1.\n"
"Mercurial 1.4 is also okay for our purposes, but we always recommend\n"
"upgrading to the newest version available for your platform. You can\n"
"verify your installation with:"
msgstr ""

#: src/basic/index.txt:125
msgid ""
"The username is normally missing immediately after installation. You\n"
"set it by putting the name in a configuration file. On Unix-like\n"
"systems this is ``$HOME/.hgrc`` and on Windows the file is called\n"
"``%HOME%\\Mercurial.ini`` (see `hg help config` for all locations or\n"
"use `hgtk userconfig` if you prefer). Create the file with this\n"
"content::"
msgstr ""

#: src/basic/index.txt:132
msgid ""
"   [ui]\n"
"   username = Firstname Lastname <example@example.net>"
msgstr ""

#: src/basic/index.txt:135
msgid ""
"but with your own name. We will use ``Alice <alice@example.net>``\n"
"first and her terminals look like the two you saw above. Running `hg\n"
"debuginstall` should no longer report any problems."
msgstr ""

#: src/basic/index.txt:146
msgid ""
"Basic Commands\n"
"=============="
msgstr ""

#: src/basic/index.txt:149
msgid ""
"We will now make a swift tour through the basic commands. These are\n"
"all similar to older systems such as Subversion or even CVS. If you\n"
"are using TortoiseHg under Windows, then you might want to also refer\n"
"to their `quick start guide`_."
msgstr ""

#: src/basic/index.txt:154
msgid ""
".. _quick start guide: http://tortoisehg.bitbucket.org/manual/1.0/quick.html"
msgstr ""
".. _quick start guide: http://tortoisehg.bitbucket.org/manual/1.0/quick.html"

#: src/basic/index.txt:156
msgid ""
"Creating a Repository\n"
"---------------------"
msgstr ""

#: src/basic/index.txt:159
msgid "Create a repository with the `hg init` command:"
msgstr ""

#: src/basic/index.txt:169
msgid ""
"The `hg init` command created a new directory which is the new\n"
"repository. We could also have made the ``example`` directory\n"
"ourselves and issued a blank `hg init` inside that directory to turn\n"
"it into a repository."
msgstr ""

#: src/basic/index.txt:174
msgid "Entering ``example`` we can look around:"
msgstr ""

#: src/basic/index.txt:185
msgid ""
"As you can see, the new repository is empty except for a ``.hg``\n"
"directory in the repository root. Mercurial stores the history and\n"
"some other administrative files inside this directory."
msgstr ""

#: src/basic/index.txt:189
msgid ""
"Creating a Changeset\n"
"--------------------"
msgstr ""

#: src/basic/index.txt:192
msgid ""
"Let us create a file and ask Mercurial about the status of the\n"
"repository:"
msgstr ""

#: src/basic/index.txt:202
msgid ""
"The reply tells us that ``hello.txt`` is unknown to Mercurial, i.e.,\n"
"it is not yet tracked. This is just like, say, Subversion. We can add\n"
"the file:"
msgstr ""

#: src/basic/index.txt:213
msgid ""
"which changes the status to \"A\" for \"added\". The file is not yet\n"
"stored in the repository history --- we'll do this by making a commit:"
msgstr ""

#: src/basic/index.txt:221
msgid ""
"No output indicates success --- Mercurial wont interrupt you unless\n"
"necessary."
msgstr ""

#: src/basic/index.txt:224
msgid ""
"Inspecting History\n"
"------------------"
msgstr ""

#: src/basic/index.txt:227
msgid "You can see the newly created changeset with `hg log`:"
msgstr ""

#: src/basic/index.txt:239
msgid ""
"Success, you have made a commit with Mercurial! Let us modify the file\n"
"and ask Mercurial to show us how the files in working copy differ from\n"
"the last revision:"
msgstr ""

#: src/basic/index.txt:256
msgid ""
"We can change our mind and revert the file back to how it looked\n"
"before:"
msgstr ""

#: src/basic/index.txt:266
msgid "Let us make another change to our file:"
msgstr ""

#: src/basic/index.txt:275
msgid ""
"We can now ask Mercurial to annotate the file, that is, to show when\n"
"each line was last modified:"
msgstr ""

#: src/basic/index.txt:286
msgid ""
"Quite right, Mercurial tells us that the first line is from revision\n"
"0, and that the two final lines are from revision 1. TortoiseHg offers\n"
"a very nice interactive annotate tool, see `hgtk annotate`."
msgstr ""

#: src/basic/index.txt:290
msgid ""
"Annotating files is an invaluable help when fixing bugs: after finding\n"
"the bug, you can use `hg annotate` to find out when the offending line\n"
"was introduced in your file. Then use `hg log` to retrieve the\n"
"associated commit message, which can hopefully explain what the\n"
"committer was trying to do when he changed the line:"
msgstr ""

#: src/basic/index.txt:306
msgid ""
"The two changesets in our repository are in sequence. This is best\n"
"illustrated with the help of the standard `graphlog extension`__. To\n"
"keep the core of Mercurial slim, a lot of functionality is delegated\n"
"to extensions. Many of the best extensions are shipped with Mercurial\n"
"and they are easy to enable. To enable graphlog, Alice simply adds::"
msgstr ""

#: src/basic/index.txt:312
msgid ""
"  [extensions]\n"
"  graphlog ="
msgstr ""
"  [extensions]\n"
"  graphlog ="

#: src/basic/index.txt:315
msgid ".. __: http://mercurial.selenic.com/wiki/GraphlogExtension"
msgstr ".. __: http://mercurial.selenic.com/wiki/GraphlogExtension"

#: src/basic/index.txt:317
msgid ""
"to her configuration file. She can then run `hg help graphlog` to\n"
"learn more about the extension. This extension is particularly simple,\n"
"it just gives Alice a new command:"
msgstr ""

#: src/basic/index.txt:339
msgid ""
"This shows how the changeset ``2e982bdc137f`` is a child of\n"
"``d312da7770f4``. The same can be seen in `hgtk log`:"
msgstr ""

#: src/basic/index.txt:345
msgid ""
"The files in the working copy are always synchronized to a particular\n"
"changeset. In `hgtk log`, this is shown with a slightly larger bullet\n"
"in the changeset graph and with an underline in the Summary column. In\n"
"the output of `hg glog`, the working directory parent revision is\n"
"highlighted with a ``@``-sign."
msgstr ""

#: src/basic/index.txt:351
msgid ""
"Time Travel\n"
"-----------"
msgstr ""

#: src/basic/index.txt:354
msgid ""
"You can change the working copy parent revision with the `hg update`\n"
"command. This is useful to go back and examine old versions of your\n"
"code, for instance if you need to test an old version of your software\n"
"with a new operating system. Here Alice will just go back to revision\n"
"0 to look at her old file. She first uses the `hg parents` command to\n"
"ascertain where she is in the graph:"
msgstr ""

#: src/basic/index.txt:371
msgid "and she then makes the jump:"
msgstr ""

#: src/basic/index.txt:384
msgid "Her file is now back at the old version:"
msgstr ""

#: src/basic/index.txt:392
msgid ""
"but the newer version is not forgotten. Mercurial can easily retrieve\n"
"it for her:"
msgstr ""

#: src/basic/index.txt:403
msgid ""
"The `hg cat` command is useful to quickly see old versions of files\n"
"instead of using `hg update` to change the entire working directory to\n"
"an old version. Going back to the tip revision is easy, just do `hg\n"
"update` without an argument:"
msgstr ""

#: src/basic/index.txt:419 src/basic/index.txt:748
msgid ""
"Exercises\n"
"---------"
msgstr ""

#: src/basic/index.txt:422
msgid "1. Use `hg init` to create a repository called ``kick-start``."
msgstr ""

#: src/basic/index.txt:424
msgid ""
"2. Enter ``kick-start`` and create a couple of files. Schedule them\n"
"   for addition with `hg add`. You can use `hg revert` to cancel a\n"
"   pending addition if you change your mind."
msgstr ""

#: src/basic/index.txt:428
msgid ""
"3. Use `hg commit` to commit the files. An editor will be started if\n"
"   you do not specify a commit message on the command line."
msgstr ""

#: src/basic/index.txt:431
msgid "4. Make a couple of more commits."
msgstr ""

#: src/basic/index.txt:433
msgid ""
"5. Use `hg update` to update the working directory to an older\n"
"   revision. Notice how the output of `hg parents` changes to match\n"
"   and compare this with `hg tip`, which stays fixed then you use `hg\n"
"   update`."
msgstr ""

#: src/basic/index.txt:438
msgid ""
"6. Try making a commit when the working parent is an old revision. You\n"
"   will be told that you have created a new \"head\" --- a head is a\n"
"   changeset without any children. Use `hg heads` to see the\n"
"   repository heads and look at the graph in `hgtk log`."
msgstr ""

#: src/basic/index.txt:443
msgid ""
"   Notice how the newly created changeset has the changeset listed\n"
"   previously in `hg parents` as its parent changeset. This is an\n"
"   invariant in Mercurial: the working copy parent revision becomes\n"
"   the parent revision of the next changeset."
msgstr ""

#: src/basic/index.txt:448
msgid ""
"7. Multiple heads represent multiple divergent lines of development.\n"
"   You will normally merge these lines using `hg merge`. If your\n"
"   changes do not overlap, then the merge will be easy. Otherwise you\n"
"   will have to resolve the conflicts --- more about this later."
msgstr ""

#: src/basic/index.txt:453
msgid ""
"   Notice how `hg parents` print two changesets after you issued `hg\n"
"   merge`. Again, this means that the next commit will have two\n"
"   parents. You can see the parents in `hg glog` or `hgtk log` after\n"
"   you commit."
msgstr ""

#: src/basic/index.txt:459
msgid ""
"Working with Others\n"
"==================="
msgstr ""

#: src/basic/index.txt:462
msgid ""
"Right now Alice's repository is in her home directory. Her co-worker,\n"
"Bob, also needs to work on the project. We will show his commands with\n"
"a light blue background color."
msgstr ""

#: src/basic/index.txt:466
msgid ""
"Making a Clone\n"
"--------------"
msgstr ""

#: src/basic/index.txt:469
msgid ""
"In these examples, we will let Alice and Bob share a local filesystem.\n"
"This could very well be a company-wide network filesystem. Changes can\n"
"also be shared over SSH and HTTP connections --- people even use emails\n"
"or USB sticks to move around changesets. They then typically use a\n"
"compressed binary format produced by the `hg bundle` command. This is\n"
"not necessary here, instead Bob uses `hg clone` with a relative path\n"
"to Alice's repository:"
msgstr ""

#: src/basic/index.txt:489
msgid ""
"Bob now has his own fully independent copy of Alice's repository. He\n"
"can make such a clone as long as he has read access to Alice's files.\n"
"Bob can make his own changesets in his clone, without affecting Alice.\n"
"He makes a couple of changes:"
msgstr ""

#: src/basic/index.txt:509
msgid "The repository now has four changesets:"
msgstr ""

#: src/basic/index.txt:514
msgid ""
"Comparing Clones\n"
"----------------"
msgstr ""

#: src/basic/index.txt:517
msgid ""
"The clone knows where it originates from and Bob can ask if there are\n"
"any changesets in Alice's clone that he does not already have:"
msgstr ""

#: src/basic/index.txt:528
msgid "He can also ask Mercurial what changeset he has that Alice lacks:"
msgstr ""

#: src/basic/index.txt:547
msgid ""
"This hopefully makes sense: Bob created two new changesets in his own\n"
"clone, so Alice does not have them yet."
msgstr ""

#: src/basic/index.txt:550
msgid ""
"Moving Changesets\n"
"-----------------"
msgstr ""

#: src/basic/index.txt:553
msgid ""
"Bob does not have write access to the files in Alice's home directory,\n"
"so he cannot write his changesets to her clone. But he lets her know\n"
"that he has made a clone and asks her to retrieve the changesets. She\n"
"does this with the `hg pull` command. Before using the command, she\n"
"enters the path to Bob's clone in the ``.hg/hgrc`` file. This a\n"
"repository-local configuration file. She enters::"
msgstr ""

#: src/basic/index.txt:560
msgid ""
"  [paths]\n"
"  default = /home/bob/example"
msgstr ""

#: src/basic/index.txt:563
msgid ""
"to make Bob's clone the default target when doing `hg pull` and other\n"
"commands that involve a remote repository. She can see what will be\n"
"pulled with `hg incoming`:"
msgstr ""

#: src/basic/index.txt:586
msgid ""
"Notice how this is symmetric to when Bob executed `hg outgoing` in his\n"
"clone. She decides to go ahead and pull Bob's changes:"
msgstr ""

#: src/basic/index.txt:602
msgid ""
"The final message is a hint to Alice to her know that her working copy\n"
"parent revision has not changed:"
msgstr ""

#: src/basic/index.txt:608
msgid ""
"The parent revision is unchanged since Alice may have been working on\n"
"a change of her own, and so she might not be interested in updating\n"
"right away. In this case she does update:"
msgstr ""

#: src/basic/index.txt:619
msgid ""
"You will almost always want to run `hg update` after `hg pull` and for\n"
"this reason, there is a shortcut: `hg pull -u` will automatically\n"
"update after pulling in new changes."
msgstr ""

#: src/basic/index.txt:623
msgid ""
"Divergent Lines of Development\n"
"------------------------------"
msgstr ""

#: src/basic/index.txt:626
msgid "Alice reworks the ``hello.txt`` file a bit:"
msgstr ""

#: src/basic/index.txt:644
msgid "At the same time, Bob is working. He creates a new file:"
msgstr ""

#: src/basic/index.txt:654
msgid ""
"Both Alice and Bob have now made a changeset that is a child of\n"
"``51b2976b01e8``, but neither of them knows about this since they have\n"
"not yet pulled or pushed the changes anywhere.  Alice decides to pull\n"
"from Bob:"
msgstr ""

#: src/basic/index.txt:672
msgid ""
"What happened? A mentioned above, a \"head\" changeset is a changeset\n"
"without any children. Since Alice and Bob have made *different*\n"
"changes based on ``51b2976b01e8``, there is now two changesets in the\n"
"repository without any children. These heads are divergent lines of\n"
"development, as can be seen in `hgtk log`:"
msgstr ""

#: src/basic/index.txt:681
msgid ""
"The two lines of development should be reconciled, and the `hg merge`\n"
"command is the way to do that:"
msgstr ""

#: src/basic/index.txt:691
msgid ""
"There were no conflicts since Alice and Bob edited different files.\n"
"After `hg merge`, the working copy has *two* parents --- this is now you\n"
"can tell that a merge is in progress if you have left your\n"
"computer and forgotten about it. The merge is not yet committed since\n"
"you might need to edit the files to make your code compile. Just\n"
"because there were no overlapping edits (no conflicts), there might\n"
"still be some semantic conflicts which Mercurial cannot detect. It is\n"
"therefore a good idea to run the test suite after a merge. In our\n"
"case, Alice goes ahead with the commit:"
msgstr ""

#: src/basic/index.txt:707
msgid "The two heads are now bound together in the changeset graph:"
msgstr ""

#: src/basic/index.txt:712
msgid ""
"The merge changeset contains changes from both of its parent\n"
"revisions. You should think of a merge changeset as your way of saying\n"
"to the world: this is how you should combine changeset ``X`` with\n"
"changeset ``Y``. When others pull the merge changeset from your\n"
"repository, it will go into the right place in their changeset graph.\n"
"They will therefore not have to do the same merge. We can see this if\n"
"we let Bob pull from Alice:"
msgstr ""

#: src/basic/index.txt:736
msgid ""
"Notice how the changesets appear in a different order in Bob's\n"
"repository compared to Alice's repository --- the \"Happy, happy!\"\n"
"changeset has switched order with the \"Welcome file.\" changeset.\n"
"Changesets always retain their ID, the longer hexadecimal number, but\n"
"the revision number can change. The revision number simply depends on\n"
"the order in which changesets was added to a repository, and when two\n"
"people pull from each other, they will most likely end up with\n"
"different revision numbers for the same changesets. You should\n"
"therefore *always* refer to a changeset by its ID when talking to\n"
"others. But you can still use the revision numbers with commands like\n"
"`hg update` that work inside your local repository."
msgstr ""

#: src/basic/index.txt:751
msgid "1. Create a repository and make a couple of commits inside it."
msgstr ""

#: src/basic/index.txt:753
msgid ""
"2. Make two clones of your repository. Notice how the ``.hg/hgrc``\n"
"   file records the location of the original repository. The `hg\n"
"   paths` command will show you the paths defined."
msgstr ""

#: src/basic/index.txt:757
msgid "2. Add another path to ``.hg/hgrc``, such as::"
msgstr ""

#: src/basic/index.txt:759
msgid "     bob = /home/bob/test"
msgstr ""

#: src/basic/index.txt:761
msgid ""
"   You will now be able to execute `hg pull bob`, `hg outgoing bob`,\n"
"   etc. It is a good idea to add shortcuts for people you collaborate\n"
"   with often."
msgstr ""

#: src/basic/index.txt:765
msgid ""
"3. Experiment with pulling and pushing changes. Note how the working\n"
"   directory is not changed even though history is added to the\n"
"   repository. The working copy parent revision is only changed with\n"
"   `hg update`."
msgstr ""

#: src/basic/index.txt:770
msgid ""
"Mercurial supports disconnected collaboration. This works by\n"
"exchanging changesets in what is called *bundles*. A bundle is a\n"
"compressed, binary representation of a number of changesets."
msgstr ""

#: src/basic/index.txt:774
msgid ""
"1. Create a new changeset in one of your repositories. Use `hg bundle\n"
"   --base X out.bundle` to create a bundle in ``out.bundle`` that\n"
"   contains all changesets following ``X``. The idea is that you\n"
"   record somewhere the last known shared changeset between you and\n"
"   the target, and use that as the base."
msgstr ""

#: src/basic/index.txt:780
msgid ""
"2. Go to the target repository and use `hg unbundle` to import the\n"
"   changesets from the bundle. In this example you will most likely\n"
"   have both repositories on your own machine, but in reality the two\n"
"   repositories could be on machines that are never online at the same\n"
"   time. In that case, bundles offer a way for you to move changesets\n"
"   over, say, email."
msgstr ""

#: src/basic/index.txt:787
msgid "You can also publish your repository via HTTP:"
msgstr ""

#: src/basic/index.txt:789
msgid ""
"1. Execute `hg serve` in a repository. You can now access the\n"
"   repository in a browser with ``http://localhost:8000``. Try to\n"
"   start a server for both Alice's and Bob's repository."
msgstr ""

#: src/basic/index.txt:793
msgid "2. Try to pull from a repository published with `hg serve`."
msgstr ""

#: src/basic/index.txt:795
msgid ""
"Note `hg serve` is intended for ad-hoc publishing. For permanent\n"
"publishing you can for example use Apache with the ``hgweb.cgi``\n"
"script supplied with Mercurial."
msgstr ""

#: src/basic/index.txt:800 src/hgsubversion/index.txt:330
#: src/tasks/index.txt:943
msgid ""
"Summary\n"
"======="
msgstr ""

#: src/basic/index.txt:803
msgid ""
"You have seen most of the basic commands in Mercurial and you have\n"
"seen how the history graph works. The important commands are:"
msgstr ""

#: src/basic/index.txt:806
msgid ""
"* `hg init`: create a new repository.\n"
"* `hg add`: schedule a file for addition.\n"
"* `hg diff`: see changes that will be included in the next commit.\n"
"* `hg commit`: save your changes in the current repository.\n"
"* `hg log`: see all changes in your repository.\n"
"* `hg pull`: get all changes from another repository into the current one.\n"
"* `hg push`: send all changes from your repository to another one.\n"
"* `hg merge`: join different lines of history."
msgstr ""

#: src/basic/index.txt:815
msgid "And very importantly:"
msgstr ""

#: src/basic/index.txt:817
msgid "* `hg help`"
msgstr ""

#: src/hgsubversion/index.txt:12
msgid ""
"===========================\n"
"Interacting with Subversion\n"
"==========================="
msgstr ""

#: src/hgsubversion/index.txt:16
msgid ""
"The `hgsubversion extension`__ turns Mercurial into a Subversion\n"
"client. This gives you offline commits and all the other nice features\n"
"of Mercurial while letting you push changesets back to Subversion."
msgstr ""

#: src/hgsubversion/index.txt:22
msgid ""
"Installation\n"
"============"
msgstr ""

#: src/hgsubversion/index.txt:25
msgid ".. __: http://bitbucket.org/durin42/hgsubversion/"
msgstr ".. __: http://bitbucket.org/durin42/hgsubversion/"

#: src/hgsubversion/index.txt:38
msgid ""
"The extension requires the Python Subversion bindings. The bindings\n"
"are bundled with TortoiseHg on Windows and on Linux you want to search\n"
"for a package called ``python-subversion`` or similar. You must\n"
"install the extension yourself by running::"
msgstr ""

#: src/hgsubversion/index.txt:43
msgid ""
"   $ hg clone https://hgsubversion.googlecode.com/hg/#1.1.2 hgsubversion"
msgstr ""
"   $ hg clone https://hgsubversion.googlecode.com/hg/#1.1.2 hgsubversion"

#: src/hgsubversion/index.txt:45
msgid ""
"You can leave out the version number if you want the very latest\n"
"version, the version number shown above is the one used for this\n"
"guide. Now put::"
msgstr ""

#: src/hgsubversion/index.txt:49
msgid ""
"   [extensions]\n"
"   hgsubversion = path/to/hgsubversion"
msgstr ""

#: src/hgsubversion/index.txt:52
msgid ""
"into your configuration file to load the extension. If you have\n"
"installed the extension using your package manager, then it has most\n"
"likely been put in your ``PYTHONPATH`` and so you just need to add::"
msgstr ""

#: src/hgsubversion/index.txt:56
msgid ""
"   [extensions]\n"
"   hgsubversion ="
msgstr ""

#: src/hgsubversion/index.txt:59
msgid ""
"Use `hg help hgsubversion` to double-check that the extension is\n"
"enabled."
msgstr ""

#: src/hgsubversion/index.txt:62
msgid ""
"Cloning Subversion\n"
"=================="
msgstr ""

#: src/hgsubversion/index.txt:65
msgid ""
"We have prepared a Subversion repository with a small Hello World\n"
"program. There is a repository for each group, named ``hello1``,\n"
"``hello2``, …, ``hello5``. Please clone the one corresponding to your\n"
"group number:"
msgstr ""

#: src/hgsubversion/index.txt:98
msgid ""
"She inspects the repository with `hgtk log` to see that the tags were\n"
"defined properly:"
msgstr ""

#: src/hgsubversion/index.txt:104
msgid ""
"The final Subversion revision sets the ``svn:ignore`` property to\n"
"``hello`` in order to ignore the compiled binary. In Mercurial, ignore\n"
"patterns are controlled in the top-level ``.hgignore`` file. This file\n"
"can be generated with the command:"
msgstr ""

#: src/hgsubversion/index.txt:114
msgid ""
"Normally, one would commit the ``.hgignore`` file in order to share it\n"
"with everybody who uses the repository. However, since Subversion is\n"
"still the master in this setup, you might not want to push the\n"
"``.hgignore`` file back there. For that reason, the generated\n"
"``.hgignore`` file ignores itself. You can regenerate it from time to\n"
"time with `hg svn genignore --force`."
msgstr ""

#: src/hgsubversion/index.txt:121
msgid ""
"Pushing to Subversion\n"
"====================="
msgstr ""

#: src/hgsubversion/index.txt:124
msgid "Alice can now edit the files and commit them with Mercurial:"
msgstr ""

#: src/hgsubversion/index.txt:142
msgid ""
"The change is not yet on the Subversion server --- like normal, `hg\n"
"push` is needed. Pushing the changeset involves rewriting it. This is\n"
"because the Subversion server is the master and when you commit to a\n"
"Subversion server, it will determine the username and timestamp that\n"
"goes into the revision. On the Mercurial side, the changeset is\n"
"rewritten to reflect the updated meta data:"
msgstr ""

#: src/hgsubversion/index.txt:169
msgid "You can see the updated changeset like this:"
msgstr ""

#: src/hgsubversion/index.txt:191
msgid ""
"Notice how the author and timestamp changed because the Subversion\n"
"server updated the meta data. Because changesets are rewritten, you\n"
"should not make further Mercurial clones of your original clone. If\n"
"you do so, you will have to manually strip the old versions of\n"
"changesets that are pushed to Subversion."
msgstr ""

#: src/hgsubversion/index.txt:197
msgid ""
"Pulling from Subversion\n"
"======================="
msgstr ""

#: src/hgsubversion/index.txt:200
msgid "Alice makes a couple of more local changes in her Mercurial clone:"
msgstr ""

#: src/hgsubversion/index.txt:249
msgid "Meanwhile, the Subversion repository has been changed:"
msgstr ""

#: src/hgsubversion/index.txt:281
msgid "The new revision causes a fork in the history:"
msgstr ""

#: src/hgsubversion/index.txt:286
msgid ""
"When Alice push, her two changesets (``7d780c6154fb`` and\n"
"``12445668eefc``) will automatically be rebased on top of the revision\n"
"she just pulled from Subversion (``2099057558d2``):"
msgstr ""

#: src/hgsubversion/index.txt:323
msgid ""
"Again, this is necessary since Subversion is a strictly linear system.\n"
"The new history looks like this:"
msgstr ""

#: src/hgsubversion/index.txt:333
msgid ""
"The hgsubversion extension lets you use Mercurial as a Subversion\n"
"client. This immediately gives you the following advantages compared\n"
"to the normal Subversion client:"
msgstr ""

#: src/hgsubversion/index.txt:337
msgid ""
"* Full history on client. This enables the fast bug-hunting techniques\n"
"  offered by Mercurial, be it simply searching the history for the\n"
"  introduction of a particular string with `hg grep` or `hg annotate`,\n"
"  or be it the more advanced binary search done with `hg bisect`."
msgstr ""

#: src/hgsubversion/index.txt:342
msgid ""
"  People simply begin working differently with their tools when they\n"
"  become sufficiently fast. Mercurial is designed to make local access\n"
"  fast."
msgstr ""

#: src/hgsubversion/index.txt:346
msgid ""
"* Local (offline) commits. Version control is all about tracking the\n"
"  development of the code. In particular, version control should let\n"
"  people experiment with new ideas and features. To do this, people\n"
"  need to commit often --- maybe every five minutes when they think they\n"
"  have come a little closer to a working solution."
msgstr ""

#: src/hgsubversion/index.txt:352
msgid ""
"  Subversion forces people to publish these revisions immediately.\n"
"  People will therefore tend to hold off on committing, especially to\n"
"  the trunk, out of fear of breaking the build. If people work on a\n"
"  branch, all these commits will pollute the history and make\n"
"  reviewing hard."
msgstr ""

#: src/hgsubversion/index.txt:358
msgid ""
"  Mercurial lets people commit as often as they feel necessary. The\n"
"  changes can later be refined into fewer, and more meaningful commits\n"
"  that are easy to review and which avoids a lot of false starts.\n"
"  These refined commits are then pushed to the Subversion server."
msgstr ""

#: src/hgsubversion/index.txt:363
msgid ""
"* Distributed development. You saw above how changesets are rebased\n"
"  when pushed to Subversion. This makes it tedious to collaborate with\n"
"  others if the changesets on which you are working are continuously\n"
"  changed under your feet."
msgstr ""

#: src/hgsubversion/index.txt:368
msgid ""
"  However, it is possible to work in a distributed fashion on a new\n"
"  feature. It merely requires that the collaborators wait with pushing\n"
"  to Subversion until they are done. So you can make as many clones as\n"
"  you want and push/pull between them as you like. When the feature is\n"
"  done, you integrate it in Subversion and ask the rest of your team\n"
"  to ditch their local clones and pull the rebased changesets from the\n"
"  Subversion server."
msgstr ""

#: src/hgsubversion/index.txt:376
msgid ""
"The hgsubversion extension can also be used as a way to convert to\n"
"Mercurial. Mercurial already ships with a convert extension, but\n"
"hgsubversion is known to convert some repositories better and more\n"
"accurately."
msgstr ""

#: src/hgsubversion/index.txt:381
msgid ""
"The main problem in converting from Subversion (or really, any legacy\n"
"system) to Mercurial is the lack of rigor in the old systems.\n"
"Subversion has no tags and no branches, it only has a (very) strong\n"
"convention that says that a copy from ``trunk/`` to ``branches/foo``\n"
"indicates the creation of a branch named \"foo\". But nothing prevents\n"
"someone from copying half of ``trunk/`` to ``branches/foo``, or from\n"
"making a commit that modifies files in both ``trunk/`` and\n"
"``branches/foo`` simultaneously."
msgstr ""

#: src/hgsubversion/index.txt:390
msgid ""
"This kind of \"cruft\" cannot always be represented in a meaningful way\n"
"in Mercurial, but hgsubversion still does a good job at interpreting\n"
"the developers' intentions."
msgstr ""

#: src/index.txt:12
msgid ""
"====================\n"
"Mercurial Kick Start\n"
"===================="
msgstr ""
"====================\n"
"Mercurial Kick Start\n"
"===================="

#: src/index.txt:19
msgid ""
"Welcome to the `aragost Trifork`_ Mercurial Kick Start. We have\n"
"prepared several different sets of exercises for you:"
msgstr ""

#: src/index.txt:22
msgid ""
"`Basic Mercurial`_:\n"
"  Install Mercurial and get started right away. We will show you the\n"
"  basic commands and show you how to work with others as a team."
msgstr ""

#: src/index.txt:26
msgid ""
"`Task Based Development`_:\n"
"  Building on the first set of exercises, we will now show how\n"
"  Mercurial lets your organize your tasks using branches. A release\n"
"  manager will then review and merge the tasks."
msgstr ""

#: src/index.txt:31
msgid ""
"`Remote Repositories`_:\n"
"  A closer look at how you can interact with remote repositories in\n"
"  Mercurial. You will see how HTTP and SSH URLs can be used and learn\n"
"  how to best cache your credentials for each type of URL."
msgstr ""

#: src/index.txt:36
msgid ""
"`Interacting with Subversion`_:\n"
"  Mercurial is can be used as a client for Subversion. This\n"
"  immediately gives you all the benefits of Mercurial: improved\n"
"  performance and offline commits."
msgstr ""

#: src/index.txt:41
msgid ""
"`Subrepositories`_:\n"
"   Mercurial lets you link other repositories to your repositories,\n"
"   which can be useful for e.g. libraries. Both Mercurial and \n"
"   Subversion repositories are supported as  subrepositories."
msgstr ""

#: src/index.txt:46
msgid ""
"We welcome new contributions, please see the `about page`_ for more\n"
"information."
msgstr ""

#: src/index.txt:49
msgid ".. _about page: about/"
msgstr ""
".. __: `Basic Mercurial`_\n"
".. __: `Task Based Development`_\n"
".. __: `Remote Repositories`_\n"
".. __: `Interacting with Subversion`_\n"
".. __: `Subrepositories`_\n"
"\n"
".. __: about/"

#: src/remote/index.txt:12
msgid ""
"===================\n"
"Remote Repositories\n"
"==================="
msgstr ""

#: src/remote/index.txt:16
msgid ""
"This guide will show you how Mercurial can be used to talk with remote\n"
"repositories over HTTP and SSH."
msgstr ""

#: src/remote/index.txt:41
msgid ""
"In the `Basic Mercurial`_ guide, you saw how Alice and Bob could push\n"
"and pull between each other on the same filesystem. This is a fine\n"
"setup when Alice and Bob share a filesystem between them, but most\n"
"users have direct access to each other's files like that. This is why\n"
"Mercurial can access remote repositories over a network connection."
msgstr ""

#: src/remote/index.txt:47
msgid "Mercurial speaks two network protocols:"
msgstr ""

#: src/remote/index.txt:49
msgid "* HTTP: the protocol used by normal webservers."
msgstr ""

#: src/remote/index.txt:51
msgid ""
"  Mercurial comes with a small built-in webserver that you can start\n"
"  with `hg serve` and which will let you browse the repository history\n"
"  using your normal webbrowser. For more heavy-duty use, the\n"
"  ``hgweb.cgi`` script is recommended."
msgstr ""

#: src/remote/index.txt:56
msgid "* SSH: the secure shell protocol used on many Unix systems."
msgstr ""

#: src/remote/index.txt:58
msgid ""
"  If you already have an account on a server with Mercurial installed,\n"
"  then using SSH is the easiest way to close a repository. It is\n"
"  possible to setup an account with a restricted account so that users\n"
"  can only execute Mercurial-related commands do not get a full login\n"
"  shell."
msgstr ""

#: src/remote/index.txt:65
msgid ""
"Working with Repositories over HTTP\n"
"==================================="
msgstr ""

#: src/remote/index.txt:68
msgid ""
"We start by taking a look at how you can interact with repositories\n"
"over HTTP. This protocol is very popular since it integrates well most\n"
"companies' existing infrastructure: when you have a functioning\n"
"webserver that can be accessed on port 80, then you have all you need\n"
"to serve Mercurial repositories too."
msgstr ""

#: src/remote/index.txt:74
msgid ""
"Cloning over HTTP\n"
"-----------------"
msgstr ""

#: src/remote/index.txt:77
msgid "We will start by letting Alice clone a small example repository:"
msgstr ""

#: src/remote/index.txt:92
msgid ""
"As you can see, this is not relly different from when Alice cloned a\n"
"repository using a filesystem path: in both cases, Alice ends up with\n"
"a complete copy of the repository and the ``default`` branch is\n"
"checked out."
msgstr ""

#: src/remote/index.txt:97
msgid ""
"Under the covers, Mercurial is able to make the local clone much more\n"
"efficient than a clone made over HTTP. This is not just due to the\n"
"fact that reading data over the network is slower than reading it from\n"
"a disk, but also because a local clone will re-use the space in the\n"
"``.hg`` directory by using hardlinks between the files. The two clones\n"
"will thus share the disk space used by the two ``.hg`` directories and\n"
"it is only the working copies that take up new disk space. This is\n"
"what makes it feasible to create as many local throw-away clones as\n"
"you like."
msgstr ""

#: src/remote/index.txt:107
msgid "Alice can now make her own commits in her clone:"
msgstr ""

#: src/remote/index.txt:116
msgid ""
"This is the essense of distributed revision control --- Alice can get\n"
"her own independent copy of the repository and work on it locally. She\n"
"can compare her clone with the remote server:"
msgstr ""

#: src/remote/index.txt:132
msgid ""
"She wont be able to push her changeset to the server since she does\n"
"not have write access to this particular repository."
msgstr ""

#: src/remote/index.txt:136
msgid ""
"Serving a Repository over HTTP\n"
"------------------------------"
msgstr ""

#: src/remote/index.txt:139
msgid ""
"As mentioned earlier, Mercurial has a built-in webserver. You can use\n"
"this to quickly share a repository with another machine on your LAN,\n"
"or even for browsing the history yourself."
msgstr ""

#: src/remote/index.txt:143
msgid "We will let Alice serve her clone of the ``hello`` repository:"
msgstr ""

#: src/remote/index.txt:153
msgid ""
"The repository can now be browsed with a normal webbrowser at the\n"
"address http://localhost:8000/. There you can see the project history\n"
"and the changeset graph, you can examine individual changesets, you\n"
"can see lists of tags and branches, you can annotate files, and you\n"
"can retrieve any revision as a tarball or a zip-file. In other words,\n"
"the built-in webserver is very convenient for humans, as well as for\n"
"computers :-)"
msgstr ""

#: src/remote/index.txt:161
msgid "Bob can make a clone of Alice's repository:"
msgstr ""

#: src/remote/index.txt:178
msgid ""
"If Bob makes a change and tries to push it back, he is met with the\n"
"following error:"
msgstr ""

#: src/remote/index.txt:191
msgid ""
"What happens is that Mercurial's webserver wont let you push over\n"
"plain HTTP by default, it requires you to use a HTTPS URL. Alice can\n"
"disable this requirement by using ``--config web.push_ssl=No`` on the\n"
"command line when she serves the repository. She first kills the old\n"
"`hg serve` process and then starts a new:"
msgstr ""

#: src/remote/index.txt:205
msgid ""
"When Bob tries again he is met by a new error because repositories are\n"
"read-only by default:"
msgstr ""

#: src/remote/index.txt:216
msgid ""
"Notice that the push was aborted without giving Bob any chance of\n"
"entering a username or password. The reason for this is that the\n"
"built-in webserver does *not* support authentication. That is, there\n"
"is no user management built into it. This may sound odd, but the idea\n"
"is that you would not run `hg serve` in a production environment.\n"
"Instead you would run the ``hgweb.cgi`` script supplied with Mercurial\n"
"and you would run this CGI script in a real webserver such as Apache.\n"
"This webserver will have the necessary infrastructure to do proper\n"
"user authentication. An advantage of this setup is that you can do the\n"
"authentication using whatever method you prefer: if you have a setup\n"
"where you authenticate users against an LDAP database, then you just\n"
"reuse that for Mercurial."
msgstr ""

#: src/remote/index.txt:229
msgid ""
"For our example, we will let Alice disable the authentication check\n"
"with yet another command line option:"
msgstr ""

#: src/remote/index.txt:240
msgid "Bob can now push his changeset back to Alice:"
msgstr ""

#: src/remote/index.txt:253
msgid ""
"Here there were no authentication, but for most real-world\n"
"repositories you will have to authenticate in order to push changesets\n"
"back (and sometimes also in order to pull changesets). We will discuss\n"
"`caching of HTTP(S) credentials`_ below."
msgstr ""

#: src/remote/index.txt:263 src/remote/index.txt:316
msgid ""
"Filesystem Permissions\n"
"----------------------"
msgstr ""

#: src/remote/index.txt:266
msgid ""
"When you access a repository through the ``hgweb.cgi`` script, then\n"
"the access is really done by the webserver. The webserver process will\n"
"run as some user on the server and that user must have read access to\n"
"the repository files in order to serve them."
msgstr ""

#: src/remote/index.txt:271
msgid ""
"When people push changes back over HTTP, it is also the webserver\n"
"process that writes the new files in the ``.hg`` directory. The\n"
"usernames embedded in the changesets play no role here."
msgstr ""

#: src/remote/index.txt:276
msgid ""
"Working with Repositories over SSH\n"
"=================================="
msgstr ""

#: src/remote/index.txt:279
msgid ""
"The other network protocol supported by Mercurial is SSH. When using\n"
"SSH URLs, Mercurial will login to the server and setup a SSH tunnel\n"
"between two Mercurial processes. The two processes will then\n"
"communicate with each other in order to push or pull changesets."
msgstr ""

#: src/remote/index.txt:284
msgid ""
"This implies that there need to be a SSH account on the server. Many\n"
"system administrators will therefore prefer the HTTP based setup\n"
"instead since that ties into their existing webserver setup."
msgstr ""

#: src/remote/index.txt:288
msgid ""
"However, if you do have an account on the server and if Mercurial is\n"
"installed on the system, then the SSH protocol is very seamless for a\n"
"user. The only thing to remember is that the syntax is a URL syntax\n"
"and not a ``scp`` or ``rsync`` SSH path. So you write::"
msgstr ""

#: src/remote/index.txt:293
msgid "    $ hg clone ssh://server/path/to/repository"
msgstr ""

#: src/remote/index.txt:295
msgid "and not::"
msgstr ""

#: src/remote/index.txt:297
msgid "    $ hg clone server:path/to/repository"
msgstr ""

#: src/remote/index.txt:299
msgid ""
"Note also that ``path/to/repository`` is *relative to your home\n"
"directory* on the server. If you want to use an absolute path on the\n"
"server, then use a URL like this::"
msgstr ""

#: src/remote/index.txt:303
msgid "    $ hg clone ssh://server//absolute/path/to/repository"
msgstr ""

#: src/remote/index.txt:305
msgid ""
"The first slash is part of the URL syntax, the second slash is part of\n"
"the path on the server, so that the above URL will find\n"
"``/absolute/path/to/repository`` on the server."
msgstr ""

#: src/remote/index.txt:309
msgid ""
"Unlike with HTTP URLs, you can use a SSH URL as a target for `hg\n"
"clone`. This lets you do::"
msgstr ""

#: src/remote/index.txt:312
msgid "    $ hg clone . ssh://server/path/to/repository"
msgstr ""

#: src/remote/index.txt:314
msgid "in order to clone the current repository to the server."
msgstr ""

#: src/remote/index.txt:319
msgid ""
"Because Mercurial makes a login on the server, it is the user on the\n"
"server that must have read access to the repository files in order for\n"
"you to make a clone or to pull changesets. Likewise, it is the user on\n"
"the server that must have write access to the repository files in\n"
"order for you to push changesets back."
msgstr ""

#: src/remote/index.txt:325
msgid ""
"If you see errors when pushing changes over SSH, then add `--debug` to\n"
"your push command and see what Mercurial is doing. Try logging in with\n"
"the same user over SSH and check that you can access the files."
msgstr ""

#: src/remote/index.txt:330
msgid ""
"Caching of HTTP(S) Credentials\n"
"=============================="
msgstr ""

#: src/remote/index.txt:333
msgid ""
"When you talk to a webserver, it can prompt Mercurial for a username\n"
"and password in order to authenticate you. You will then normally be\n"
"asked to enter the information in the prompt::"
msgstr ""

#: src/remote/index.txt:337
msgid ""
"   $ hg clone https://bitbucket.org/aragost/private\n"
"   http authorization required\n"
"   realm: Bitbucket.org HTTP\n"
"   user: aragost\n"
"   password: <secret>\n"
"   abort: http authorization required"
msgstr ""

#: src/remote/index.txt:344
msgid ""
"Since you will have to authenticate on every command that involves the\n"
"remote repository (that is commands like `hg clone`, `hg pull`, `hg\n"
"push`, `hg incoming`, and `hg outgoing`) you will quickly get tired of\n"
"this. There are several ways to make Mercurial save the credentials.\n"
"We will present them here in order of preference."
msgstr ""

#: src/remote/index.txt:350
msgid ".. tip::"
msgstr ""

#: src/remote/index.txt:352
msgid ""
"   You may be wondering how you can make Mercurial cache your SSH\n"
"   passphrase. The answer is that you cannot do this --- the SSH\n"
"   authentication is external to Mercurial and you must use a standard\n"
"   *SSH agent* to cache the passphrase."
msgstr ""

#: src/remote/index.txt:357
msgid ""
"   An SSH agent is a program that runs in the background and keeps a\n"
"   decrypted version of your SSH private key in memory. Whenever you\n"
"   need to make a SSH connection, the ``ssh`` program will ask the\n"
"   agent if it has a suitable decrypted private key. If so, the\n"
"   connection can be made without you entering any password, otherwise\n"
"   ``ssh`` will prompt you for a password like normal."
msgstr ""

#: src/remote/index.txt:364
msgid ""
"   You add your key to the SSH agent with ``ssh-add`` on Linux and Mac\n"
"   OS X and you use Pageant_ when using Putty on Windows."
msgstr ""

#: src/remote/index.txt:367
msgid ""
".. _pageant: http://the.earth.li/~sgtatham/putty/0.60/htmldoc/Chapter9.html"
msgstr ""

#: src/remote/index.txt:369
msgid ""
"Keyring Extension\n"
"-----------------"
msgstr ""

#: src/remote/index.txt:379
msgid ""
"The `keyring extension`_ will hook into Mercurial and intercept\n"
"password requests. The passwords you enter a then stored securely in\n"
"an OS-specific password database and you wont have to enter them\n"
"again. It stores passwords used for HTTP(S) authentication and SMTP\n"
"authentication (as done by the `patchbomb extension`_ among others)."
msgstr ""

#: src/remote/index.txt:385
msgid ""
"This solution is the standard solution for Windows when you use\n"
"TortoiseHg since they ship both the extension and the extra libraries\n"
"needed to talk with the Windows password backend. On others systems,\n"
"you will have to install the apropriate backend libraries yourself."
msgstr ""

#: src/remote/index.txt:390
msgid ""
".. _keyring extension: http://mercurial.selenic.com/wiki/KeyringExtension\n"
".. _patchbomb extension: http://mercurial.selenic.com/wiki/PatchbombExtension"
msgstr ""

#: src/remote/index.txt:394
msgid ""
"Stored in User Configuration File\n"
"---------------------------------"
msgstr ""

#: src/remote/index.txt:405
msgid ""
"You can save the credentials directly in your Mercurial configuration\n"
"file. You do this with the `auth section`_::"
msgstr ""

#: src/remote/index.txt:408
msgid ""
"   [auth]\n"
"   bb.prefix = https://bitbucket.org/\n"
"   bb.username = alice\n"
"   bb.password = <secret>"
msgstr ""

#: src/remote/index.txt:413
msgid ""
"The ``[auth]`` section contains a number of entries, and the entries\n"
"are grouped by an arbitrary key chosen by you. Above, we used ``bb``\n"
"as the key for Bitbucket, but we could have picked anything. If you\n"
"have more sites you want to store the password for, then you need to\n"
"use different keys for each host::"
msgstr ""

#: src/remote/index.txt:419
msgid ""
"   [auth]\n"
"   site-a.prefix = https://hg.site-a.net/\n"
"   site-a.username = userA\n"
"   site-a.password = <secret-a>"
msgstr ""

#: src/remote/index.txt:424
msgid ""
"   site-b.prefix = https://site-b.org/repos/\n"
"   site-b.username = userB\n"
"   site-b.password = <secret-b>"
msgstr ""

#: src/remote/index.txt:428
msgid ".. _auth section: http://www.selenic.com/mercurial/hgrc.5.html#auth"
msgstr ""

#: src/remote/index.txt:431
msgid ""
"Embedded in Push/Pull URL\n"
"-------------------------"
msgstr ""

#: src/remote/index.txt:440
msgid ""
"This final way takes advantage of a built-in feature in the\n"
"specification of URLs: one can embed a username and password directly\n"
"into them. The URL syntax is::"
msgstr ""

#: src/remote/index.txt:444
msgid "   scheme://username:password@domain:port/path"
msgstr ""

#: src/remote/index.txt:446
msgid "so if you execute ::"
msgstr ""

#: src/remote/index.txt:448
msgid "   hg clone https://alice:<secret>@bitbucket.org/aragost/private"
msgstr ""

#: src/remote/index.txt:450
msgid ""
"then Mercurial will automatically use ``alice`` as the username and\n"
"``<secret>`` as the password when logging into Bitbucket. If the clone\n"
"is succesful, then the full URL is stored as the default path in the\n"
"``.hg/hgrc`` file like normal. Because the username and password is\n"
"stored in the URL, future invocations of `hg pull` and `hg push` will\n"
"do the authentication automatically without any prompts."
msgstr ""

#: src/remote/index.txt:458
msgid ""
"Configuring Shorthand URL Schemes\n"
"================================="
msgstr ""

#: src/remote/index.txt:461
msgid ""
"When you work a lot with repositories on the same host, then it might\n"
"become annoying to repeatedly type::"
msgstr ""

#: src/remote/index.txt:464
msgid "   hg clone https://hg.my-long-servername.com/repos/"
msgstr ""

#: src/remote/index.txt:466
msgid ""
"Shortening HTTP URLs\n"
"--------------------"
msgstr ""

#: src/remote/index.txt:469
msgid ""
"Mercurial has a standard extension that will help you shorten those\n"
"URLs. You enable the `schemes extension`_ and can then add the\n"
"following to your configuration file::"
msgstr ""

#: src/remote/index.txt:473
msgid ""
"   [schemes]\n"
"   bb = https://bitbucket.org/"
msgstr ""
"   [schemes]\n"
"   bb = https://bitbucket.org/"

#: src/remote/index.txt:476
msgid "This lets you write::"
msgstr ""

#: src/remote/index.txt:478
msgid "   hg clone bb://aragost/private"
msgstr ""

#: src/remote/index.txt:480
msgid "instead of the longer::"
msgstr ""

#: src/remote/index.txt:482
msgid "   hg clone https://bitbucket.org/aragost/private"
msgstr ""

#: src/remote/index.txt:484
msgid ""
".. _schemes extension: http://mercurial.selenic.com/wiki/SchemesExtension"
msgstr ""

#: src/remote/index.txt:486
msgid ""
"See `hg help schemes` after enabling the extension for the full\n"
"syntax."
msgstr ""

#: src/remote/index.txt:489
msgid ""
"Shortening SSH URLs\n"
"-------------------"
msgstr ""

#: src/remote/index.txt:492
msgid ""
"You can use the schemes extension for SSH URLs too, but it is also\n"
"interesting to note that OpenSSH_ has its own way of shortening URLs.\n"
"Add these lines to your ``~/.ssh/config`` file (creating it if\n"
"needed)::"
msgstr ""

#: src/remote/index.txt:497
msgid ""
"   Host bb\n"
"   Compression yes\n"
"   HostName bitbucket.org\n"
"   User hg"
msgstr ""
"   Host bb\n"
"   Compression yes\n"
"   HostName bitbucket.org\n"
"   User hg"

#: src/remote/index.txt:502
msgid "This will let you write::"
msgstr ""

#: src/remote/index.txt:504
msgid "   hg clone ssh://bb/aragost/private"
msgstr "   hg clone ssh://bb/aragost/private"

#: src/remote/index.txt:506
msgid "instead of::"
msgstr ""

#: src/remote/index.txt:508
msgid "   hg clone ssh://hg@bitbucket.org/aragost/private"
msgstr "   hg clone ssh://hg@bitbucket.org/aragost/private"

#: src/remote/index.txt:510
msgid ""
"Notice how this configuration even set the username for you, something\n"
"that is particularly easy to forget when using SSH with Bitbucket. We\n"
"also used the oportunity to enable compression for the SSH tunnel,\n"
"which will improve performance overall."
msgstr ""

#: src/remote/index.txt:516
msgid ""
"If you are using Putty_ on Windows (TortoiseHg does come with a\n"
"bundled install of Putty) then you can do the same by configuring and\n"
"saving a connection. If you save the configuration under the name\n"
"``bb``, then you can begin using ``ssh://bb/`` style URLs with\n"
"Mercurial."
msgstr ""

#: src/remote/index.txt:522
msgid ""
".. _OpenSSH: http://www.openssh.com/\n"
".. _Putty: http://www.chiark.greenend.org.uk/~sgtatham/putty/"
msgstr ""

#: src/remote/index.txt:526 src/subrepositories/index.txt:414
#: src/tasks/index.txt:815
msgid ""
"Exercises\n"
"========="
msgstr ""

#: src/remote/index.txt:529
msgid "1. Go to https://bitbucket.org/ and create an account for yourself."
msgstr ""

#: src/remote/index.txt:531
msgid ""
"2. Create a private repository called ``test`` and clone it to your\n"
"   local machine."
msgstr ""

#: src/remote/index.txt:534
msgid ""
"3. Add and commit a file to the repository and push it back to\n"
"   Bitbucket."
msgstr ""

#: src/remote/index.txt:537
msgid ""
"4. Make a clone of https://bitbucket.org/aragost/hello/ on your local\n"
"   machine."
msgstr ""

#: src/remote/index.txt:540
msgid ""
"5. Create a new repository on Bitbucket called ``hello`` and push the\n"
"   hello clone from your machine up to Bitbucket."
msgstr ""

#: src/remote/index.txt:543
msgid ""
"   Notice how you can push changesets into an empty repository. This\n"
"   is because you can expand a `hg clone` to `hg init` followed by `hg\n"
"   pull` (except that you wont get hardlinks as described above)."
msgstr ""

#: src/remote/index.txt:547
msgid ""
"   What happens if you try to push from your ``hello`` clone to your\n"
"   ``test`` clone on Bitbucket? How does Mercurial know if the\n"
"   repositories are related?"
msgstr ""

#: src/subrepositories/index.txt:12
msgid ""
"===============\n"
"Subrepositories\n"
"==============="
msgstr ""

#: src/subrepositories/index.txt:18
msgid ""
"Introduction\n"
"============"
msgstr ""

#: src/subrepositories/index.txt:21
msgid ""
"Mercurial has a features called subrepositories. This feature allows\n"
"you to threat a collection of repositories as a group."
msgstr ""

#: src/subrepositories/index.txt:24
msgid ""
"Reusing code is an important concept of software architecture.\n"
"Subrepositories support a way of reusing, by having shared libraries\n"
"and modules as subrepositories for the projects using them."
msgstr ""

#: src/subrepositories/index.txt:28
msgid "Subrepositories can be nested."
msgstr ""

#: src/subrepositories/index.txt:30
msgid ""
"The basic commands when using subrepositories are the same as ordinary\n"
"repositories. However where meaningful commands take a `--subrepo`\n"
"option to recurse down into the subrepositories."
msgstr ""

#: src/subrepositories/index.txt:34
msgid ""
"When executing a command within the working directory of a\n"
"subrepository. Then the behavior will be exactly the same as if it\n"
"wasn't a subrepository, so a subrepository doesn't \"know\" it is within\n"
"another repository."
msgstr ""

#: src/subrepositories/index.txt:47
msgid ""
"Subrepositories\n"
"==============="
msgstr ""

#: src/subrepositories/index.txt:50
msgid ""
"Subrepositories are just normal repositories, therefore we first\n"
"create one repository and another one within, using the `hg init`\n"
"command:"
msgstr ""

#: src/subrepositories/index.txt:63
msgid ""
"We have now created two repositories, one nested within the other.\n"
"This doesn't make the inner repository to a subrepository. The\n"
"subrepository does also have to be marked as such in the repository\n"
"containing the subrepository."
msgstr ""

#: src/subrepositories/index.txt:68
msgid ""
"Marking a subrepository is done by creating and entry for it in the\n"
"special ``.hgsub file.`` This is done by adding the following line:"
msgstr ""

#: src/subrepositories/index.txt:79
msgid ""
"   The way to interpret the .hgsub file is as a set of lines of the\n"
"   form:"
msgstr ""

#: src/subrepositories/index.txt:82
msgid "       ``where/to/put/the/subrepo = where/to/get/the/subrepo``"
msgstr ""

#: src/subrepositories/index.txt:84
msgid ""
"   The left-hand side is a path relative to the root of your clone and\n"
"   it tells Mercurial where to put the subrepository in your clone."
msgstr ""

#: src/subrepositories/index.txt:87
msgid ""
"   The right-hand side is a either a path relative to the place you\n"
"   clone from, or an absolute path. If it is a relative path then if\n"
"   you do ``hg clone mainrepo my-main`` then Mercurial will create a\n"
"   new repository at ``my-main/where/to/put/the/subrepo`` and will\n"
"   fill it with changesets taken from\n"
"   ``mainrepo/where/to/get/the/subrepo``. If it is an absolute path it\n"
"   will naturally take the changesets from\n"
"   ``where/to/get/the/subrepo``."
msgstr ""

#: src/subrepositories/index.txt:96
msgid ""
"   In the simple case where you have 'subrepo = subrepo', you end up\n"
"   with Mercurial doing these commands"
msgstr ""

#: src/subrepositories/index.txt:106
msgid ""
"   and if you had used ``subrepo = ../subrepo``, then the commands\n"
"   would be"
msgstr ""

#: src/subrepositories/index.txt:116
msgid ""
"   where the last URL is the normalization version of\n"
"   ``http://server/repos/repo/../subrepo``"
msgstr ""

#: src/subrepositories/index.txt:120
msgid ""
"Remote Subrepositories\n"
"======================"
msgstr ""

#: src/subrepositories/index.txt:123
msgid ""
"We do also want to link a remote subrepository to our project. This\n"
"procedure is similar to before:"
msgstr ""

#: src/subrepositories/index.txt:142
msgid ""
"Note that we clone the repository to the place where it should be,\n"
"because just adding the entry in the ``.hgsub`` file will not do\n"
"anything unless there is a repository and the given location."
msgstr ""

#: src/subrepositories/index.txt:146
msgid ""
"Subversion Subrepositories\n"
"=========================="
msgstr ""

#: src/subrepositories/index.txt:149
msgid ""
"A company might have some libraries in Subversion repositories and can\n"
"for different reasons not convert them to Mercurial. No problem,\n"
"Mercurial can have SVN repositories as subrepositories. The procedure\n"
"is as above, except that ``[svn]`` should be prepended to the URL in\n"
"the ``.hgsub`` file."
msgstr ""

#: src/subrepositories/index.txt:155
msgid "Therefore adding a SVN subrepository will be like the following:"
msgstr ""

#: src/subrepositories/index.txt:172
msgid ""
"Then SVN commands should be used within the subrepository and\n"
"mercurial commands in the super repository."
msgstr ""

#: src/subrepositories/index.txt:175
msgid ""
"Committing\n"
"=========="
msgstr ""

#: src/subrepositories/index.txt:178
msgid ""
"The status can as always be seen with `hg status` but you have to add\n"
"a `--subrepo` option to recurse through the subrepositories. We see\n"
"that the files from the subrepositories doesn't act like such, before\n"
"committing the ``.hgsub`` file."
msgstr ""

#: src/subrepositories/index.txt:198
msgid "Our changes are not committed yet, so this we will do now."
msgstr ""

#: src/subrepositories/index.txt:210
msgid ""
"The default behavior of commit is to first recurse through\n"
"subrepositories and commit in each. Then commit the outer repository.\n"
"The reason for this is that subrepositories are also a part of the\n"
"project being under version control, therefore a snapshot of the whole\n"
"project makes most sense. The resulting state of subrepositories will\n"
"be saved in a special file called ``.hgsubstate``. This file is not\n"
"intended to be edited by the user, but tracks which version of the\n"
"subrepository that is linked with the repository."
msgstr ""

#: src/subrepositories/index.txt:219
msgid ""
"Pushing and Pulling\n"
"==================="
msgstr ""

#: src/subrepositories/index.txt:222
msgid ""
"Mercurial will always attempt to first push all subrepository of a\n"
"repository before pushing the current repository, thereby ensuring\n"
"that the repository being pushed to, cannot end up with referring to\n"
"an inexistent version of a subrepository."
msgstr ""

#: src/subrepositories/index.txt:227
msgid ""
"Pulling is on the other hand not recursive, because Mercurial cannot\n"
"know which subrepositories to pull before updating to a specific\n"
"changeset has been done."
msgstr ""

#: src/subrepositories/index.txt:231
msgid ""
"Another Version\n"
"==============="
msgstr ""

#: src/subrepositories/index.txt:234
msgid ""
"As mentioned you should not edit ``.hgsubstate``. But if you want to\n"
"switch the subrepository to a different version, then go to the\n"
"subrepository and update it to the wanted version. This change do also\n"
"has to be recorded in the repository above. Therefore you also have to\n"
"commit that, which will as described above update the state of the\n"
"subrepository in the ``.hgsubstate`` file."
msgstr ""

#: src/subrepositories/index.txt:241
msgid ""
"First we create some changes and commits them in the subrepository,\n"
"and the final commit is for updating and committing the\n"
"``.hgsubstate`` file."
msgstr ""

#: src/subrepositories/index.txt:262
msgid ""
"Now the main repository is linked with the newest revision of the\n"
"subrepository. We realize that we want to link the main repository\n"
"with an earlier version of the subrepository. This is done by updating\n"
"the subrepository to the wanted revision and the performing a commit\n"
"from the main repository, Again to update and commit the\n"
"``.hgsubstate`` file."
msgstr ""

#: src/subrepositories/index.txt:296
msgid ""
"Update On Demand\n"
"================"
msgstr ""

#: src/subrepositories/index.txt:299
msgid ""
"Update do naturally also perform actions on the subrepositories, since\n"
"updating to another revision of a repository might mean that we have\n"
"to update the subrepository to another revision as well."
msgstr ""

#: src/subrepositories/index.txt:303
msgid ""
"As mentioned the ``.hgsubstate`` file tracks the revision of the\n"
"subrepository to use. Therefore we do not know which version of the\n"
"subrepository to update to before this is checked out. Therefore the\n"
"repository is first updated and then the subrepositories are updated\n"
"according to the updated version of the ``.hgsubstate`` file. This\n"
"might also involve pulling from the subrepository path, if the\n"
"revision in the ``.hgsubstate`` file has not yet been pulled."
msgstr ""

#: src/subrepositories/index.txt:312
msgid ""
"Converting Folder Into a Subrepository\n"
"======================================"
msgstr ""

#: src/subrepositories/index.txt:315
msgid ""
"A project might contain a folder with some code, which at a later\n"
"point is realized should be used across different projects. This code\n"
"could of course just be copied to a repository, which the projects\n"
"could include as subrepository. This would however mean that we would\n"
"loose our precious history of these files."
msgstr ""

#: src/subrepositories/index.txt:321
msgid ""
"The way to do it, is by converting a folder into a repository, using\n"
"the convert extension and then include this repository as a\n"
"subrepository in the different projects."
msgstr ""

#: src/subrepositories/index.txt:325
msgid ".. _convert extension: http://mercurial/wiki/..."
msgstr ""

#: src/subrepositories/index.txt:327
msgid ""
"This first part below, just creates our folder and makes and commits\n"
"some changes to its contents."
msgstr ""

#: src/subrepositories/index.txt:346
msgid ""
"Now we want to make the folder into a subrepository. First we just\n"
"makes the folder into an repository. This is done by converting the\n"
"original repository from a mercurial repository to a mercurial\n"
"repository and then using a filemap to specify we only want the\n"
"certain folder."
msgstr ""

#: src/subrepositories/index.txt:352
msgid ""
"The filemap specifies to include the folder, furthermore there is a\n"
"rename mapping, which ensures that the contents of the folder will be\n"
"in the root directory of the repository we create. Then we perform the\n"
"conversion, and see that we now have a repository containing only the\n"
"changeset which edited in the file within the folder. This repository\n"
"we can now include as a subrepository as previously described."
msgstr ""

#: src/subrepositories/index.txt:384
msgid ""
"Detaching a Subrepository\n"
"============================="
msgstr ""

#: src/subrepositories/index.txt:387
msgid ""
"If a subrepository no longer needs to be associated with a project,\n"
"then it is detached from the repository by just deleting the line for\n"
"it in the ``.hgsub`` file. Then `hg status` will show the files from\n"
"that subrepository as unknown files, and you can delete these files\n"
"from your file system."
msgstr ""

#: src/subrepositories/index.txt:393
msgid ""
"Commands Crossing Repository Boundaries\n"
"======================================="
msgstr ""

#: src/subrepositories/index.txt:396
msgid ""
"`hg commit` and `hg update` goes recursively through the\n"
"subrepositories. If there is no change in a subrepository during a\n"
"command, then there will of course not be committed to that\n"
"subrepository."
msgstr ""

#: src/subrepositories/index.txt:401
msgid ""
"Other commands that can work on subrepositories needs a `--subrepos`\n"
"option to recurse through the subrepositories."
msgstr ""

#: src/subrepositories/index.txt:404
msgid ""
"Commands supporting this are e.g. `hg add`, `hg archieve`, `hg diff`,\n"
"`hg incoming`, `hg outgoing`, and `hg status`."
msgstr ""

#: src/subrepositories/index.txt:407
msgid ""
"`hg add` with the `--suprepos` options lets you add a file in a\n"
"subrepository, with syntax as if it was just in another directory."
msgstr ""

#: src/subrepositories/index.txt:410
msgid ""
"The other commands just do what they normally do, but do also recurse\n"
"into the subrepositories when the `--subrepos` flag is on."
msgstr ""

#: src/subrepositories/index.txt:417
msgid ""
"1. Use `hg init` and create, edit and add the `.hgsub` file to create\n"
"   a repository called ``kick-start`` and a subrepository called\n"
"   ``mysubrepo``"
msgstr ""

#: src/subrepositories/index.txt:421
msgid ""
"2. Use `hg add` and `hg commit` to make some commits. Try both within\n"
"   a subrepository and with `--subrepos` to do it across repository\n"
"   boundaries."
msgstr ""

#: src/subrepositories/index.txt:425
msgid ""
"3. Use `hg update` in the subrepository to switch it to an older\n"
"   revision."
msgstr ""

#: src/subrepositories/index.txt:428
msgid ""
"4. Go to main repositories. Use `hg status` to see that the\n"
"   subrepository in the"
msgstr ""

#: src/subrepositories/index.txt:431
msgid ""
"5. Use `hg commit` to update the registered subrepositories revision.\n"
"   What is committed now will therefore include the ``.hgsubstate``\n"
"   file. Therefore the commit is not empty."
msgstr ""

#: src/subrepositories/index.txt:435
msgid "6. Add a SVN repository as subrepository."
msgstr ""

#: src/tasks/index.txt:12
msgid ""
"======================\n"
"Task Based Development\n"
"======================"
msgstr ""

#: src/tasks/index.txt:16
msgid ""
"In this document we will explore a common workflow based around using\n"
"named branches to track the concurrent development of several tasks. A\n"
"set of junior developers, Alice and Bob, will work on the tasks while\n"
"a senior developer, Carla, will review and integrate the changes made\n"
"by Alice and Bob."
msgstr ""

#: src/tasks/index.txt:24
msgid ""
"Overview\n"
"========"
msgstr ""

#: src/tasks/index.txt:27
msgid ""
"The senior developer will be the only one who has write access to the\n"
"main repository. She pulls changes from Alice and Bob and pushes then\n"
"to the main repository after reviewing them. Alice and Bob pulls\n"
"changes from the main repository:"
msgstr ""

#: src/tasks/index.txt:35
msgid ""
"Using this flow, Carla can control what goes into the main repository,\n"
"from which the final builds are made."
msgstr ""

#: src/tasks/index.txt:38
msgid ""
"In a real setup, the repositories will most likely be located on\n"
"different machines, but we will place all four repositories besides\n"
"one another in our examples:"
msgstr ""

#: src/tasks/index.txt:87
msgid "This is only to make the examples easier."
msgstr ""

#: src/tasks/index.txt:89
msgid ""
"Working with a Branch\n"
"====================="
msgstr ""

#: src/tasks/index.txt:92
msgid "Alice begins her work by pulling in changes from the main repository:"
msgstr ""

#: src/tasks/index.txt:108
msgid ""
"Alice now had an up-to-date clone of the main repository. The project\n"
"consist of a single file, ``hello.txt``:"
msgstr ""

#: src/tasks/index.txt:117
msgid ""
"There is clearly a bug here, and Carla has put it in the company bug\n"
"tracker as Issue 1. She tells Alice to fix it by changing the text to\n"
"``Hello, World!``, which seems more appropriate."
msgstr ""

#: src/tasks/index.txt:121
msgid ""
"Creating a Branch\n"
"-----------------"
msgstr ""

#: src/tasks/index.txt:124
msgid "Alice makes a new branch for her work:"
msgstr ""

#: src/tasks/index.txt:133
msgid ""
"The `hg branch` command does not change the history or working copy in\n"
"itself, it only ensure that the next commit is \"stamped\" with\n"
"``issue-1``. Normally, you cannot make an empty commit, but changing\n"
"the branch name counts as a change, so Alice was able to make the\n"
"commit. The repository has just two changesets:"
msgstr ""

#: src/tasks/index.txt:147
msgid ""
"Notice the branch names in the summary column. The names are only\n"
"shown for the changesets that make up *branch heads*. These changesets\n"
"are also marked with a light green circle behind the node in the graph\n"
"column. We have enabled the *View ‣ Color by Branch* option on `hgtk\n"
"log` and you can see how the changeset on the ``default`` branch is\n"
"drawn with a black cirle and how the changeset on the ``issue-1``\n"
"branch is drawn with a pink circle."
msgstr ""

#: src/tasks/index.txt:155
msgid "She then begins hacking:"
msgstr ""

#: src/tasks/index.txt:171
msgid "The world now looks like this:"
msgstr ""

#: src/tasks/index.txt:196
msgid ""
"The two tip-most changesets are on the ``issue-1`` branch, the root\n"
"changeset is on a branch called ``default``, despite no branch name\n"
"being printed. Changesets are always on a branch in Mercurial, but we\n"
"do not display it when they are on the ``default`` branch to reduce\n"
"clutter. Note that changesets on different branches share the same\n"
"changeset graph --- the branch names simply give you an easy way to\n"
"refer to the branch heads: instead of ``97205992f938`` you write\n"
"``issue-1`` and instead of ``e9eb044d45e0`` you write ``default``. In\n"
"this sense, branches work very much like \"floating tags\" that always\n"
"point to the tip-most changeset on a particular branch. These tip-most\n"
"changesets are exactly the ones highlighted with a light green circle\n"
"in `hgtk log`:"
msgstr ""

#: src/tasks/index.txt:212
msgid ""
"Alice comments in the bug tracker that she has fixed the bug and that\n"
"Carla should pull her changes."
msgstr ""

#: src/tasks/index.txt:215
msgid ""
"Merging a Branch\n"
"----------------"
msgstr ""

#: src/tasks/index.txt:218
msgid ""
"Carla has been working too, while Alice fixed the bug, and has added a\n"
"README file:"
msgstr ""

#: src/tasks/index.txt:239
msgid "Carla pulls from Alice:"
msgstr ""

#: src/tasks/index.txt:253
msgid ""
"Mercurial tells her that she has a new head in the repository. This is\n"
"visible with the `hg heads` command:"
msgstr ""

#: src/tasks/index.txt:272
msgid "There are now also two branches in the repository:"
msgstr ""

#: src/tasks/index.txt:282
msgid ""
"Using `hgtk log`, Carla can see how the new branch is attached to the\n"
"``default`` branch:"
msgstr ""

#: src/tasks/index.txt:288
msgid ""
"The two heads are clearly visible and Carla updates to the ``issue-1``\n"
"branch:"
msgstr ""

#: src/tasks/index.txt:297
msgid ""
"Her working directory now looks like Alice's working directory and\n"
"Carla can examine the file. She is not entirely happy with the\n"
"\"modern\" greeting chosen by Alice --- Carla wants the good old classic\n"
"\"Hello\" instead. They discuss this on the bug tracker and Alice agrees\n"
"to make the change. Alice first checks that she is still on the\n"
"``issue-1`` branch and she then fixes the bug:"
msgstr ""

#: src/tasks/index.txt:312
msgid "Carla pulls the new change:"
msgstr ""

#: src/tasks/index.txt:326
msgid ""
"She can use `hg update` to go to the tip of her current branch\n"
"(``issue-1``) or she can be explicit and say `hg update issue-1`\n"
"again:"
msgstr ""

#: src/tasks/index.txt:336
msgid "She agrees that the bug is finally fixed."
msgstr ""

#: src/tasks/index.txt:338
msgid ""
"Closing a Branch\n"
"----------------"
msgstr ""

#: src/tasks/index.txt:341
msgid "The branch is no longer needed, so she marks it as closed:"
msgstr ""

#: src/tasks/index.txt:349
msgid ""
"This makes the ``issue-1`` branch disappear from the `hg branches`\n"
"list:"
msgstr ""

#: src/tasks/index.txt:358
msgid ""
"If she had not closed it, the `hg branches` list could easily become\n"
"unwieldy. Next she updates to the ``default`` branch and merges with\n"
"``issue-1``:"
msgstr ""

#: src/tasks/index.txt:372
msgid ""
"By updating to ``default`` first, she ensures that the merge changeset\n"
"is created on ``default`` and not on ``issue-1``, where it does not\n"
"belong. Note how merging a branch is no different from merging any\n"
"other two changesets --- Mercurial has a very uniform history model."
msgstr ""

#: src/tasks/index.txt:378
msgid ""
"Pushing a Branch\n"
"----------------"
msgstr ""

#: src/tasks/index.txt:381
msgid ""
"She will now push the whole thing to the main repository. She must use\n"
"a `--new-branch` flag since she is pushing new named branches. This is to\n"
"prevent accidentally pushing a named branch prematurely. Without the\n"
"flag she is get a friendly reminder:"
msgstr ""

#: src/tasks/index.txt:397
msgid ""
"   The `--new-branch` flag was introduced in Mercurial 1.6. Older\n"
"   versions of Mercurial required you to use `--force` instead. The\n"
"   danger of using `--force` is that it disables all checks, whereas\n"
"   `--new-branch` wont let you do things like pushing multiple heads."
msgstr ""

#: src/tasks/index.txt:402
msgid "Sure enough, adding the flag makes the push go through:"
msgstr ""

#: src/tasks/index.txt:416
msgid "The main repository is now in this state:"
msgstr ""

#: src/tasks/index.txt:422
msgid ""
"Longer Term Branches\n"
"===================="
msgstr ""

#: src/tasks/index.txt:425
msgid ""
"While Alice was working on fixing Issue 1, Carla asked Bob to look\n"
"into translating the ``hello.txt`` file into more languages. They\n"
"agree to do Danish, German, and French and create Issue 2 for this.\n"
"Like Alice, Bob will work on his own branch for this and he begins by\n"
"pulling changes from the main repository:"
msgstr ""

#: src/tasks/index.txt:455
msgid ""
"At this point, Alice's branch had not yet been merged into the main\n"
"repository, so Bob only sees the two first changesets made by Carla.\n"
"He creates a branch and renames the ``hello.txt`` file to reflect its\n"
"language:"
msgstr ""

#: src/tasks/index.txt:469
msgid "He quickly creates a Danish and a German version and commits those too:"
msgstr ""

#: src/tasks/index.txt:483
msgid ""
"He needs some more time to research the French translation, so he\n"
"postpones that change. His changeset graph is shown below and you'll\n"
"notice that his ``issue-2`` branch has shown up in red:"
msgstr ""

#: src/tasks/index.txt:492
msgid ""
"Merging ``default`` into a Branch\n"
"---------------------------------"
msgstr ""

#: src/tasks/index.txt:495
msgid "Meanwhile, Carla has merged Alice's bugfix into ``default``:"
msgstr ""

#: src/tasks/index.txt:500
msgid ""
"This bugfix is also appropriate for Bob's branch, so he pulls from the\n"
"main repository:"
msgstr ""

#: src/tasks/index.txt:519
msgid ""
"He now merges ``default`` into ``issue-2`` in order to bring the\n"
"bugfix to his branch:"
msgstr ""

#: src/tasks/index.txt:533
msgid ""
"Notice how smoothly Alice's change to ``hello.txt`` was merged into\n"
"the renamed ``hello.en.txt``. Just like a good movie soundtrack, a\n"
"good merge implementation is characterized by the fact that you do not\n"
"notice it --- it should just work and do the right thing. We will\n"
"compare this to how Subversion handles this `below`__. The resulting\n"
"changeset graph looks like this:"
msgstr ""

#: src/tasks/index.txt:543
msgid ""
"Using the colored branches, you can quickly see that the pink\n"
"``issue-1`` branch was merged into the black ``default`` branch, and\n"
"that the whole thing was merged into the red ``issue-2`` branch. The\n"
"colors are huge help when you look at complex histories."
msgstr ""

#: src/tasks/index.txt:548
msgid ""
"Bob has also finally figured out how to translate the file into\n"
"French, so he makes a final commit before asking Carla to review the\n"
"branch."
msgstr ""

#: src/tasks/index.txt:560
msgid ".. __: `Merging Renamed Files in Subversion`_"
msgstr ""

#: src/tasks/index.txt:562
msgid ""
"Happy with his work, he submits it to Carla, who pulls it into her\n"
"repository:"
msgstr ""

#: src/tasks/index.txt:578
msgid "Her repository now looks like this:"
msgstr ""

#: src/tasks/index.txt:583
msgid ""
"Carla double-checks the files and is decides to merge his work now.\n"
"She updates to his branch to close it, and back to ``default`` to\n"
"merge:"
msgstr ""

#: src/tasks/index.txt:602
msgid ""
"The final changeset graph shows nicely how the ``default`` branch (in\n"
"black) was merged into the ``issue-2`` branch (in red), before\n"
"``issue-2`` was merged into ``default`` again:"
msgstr ""

#: src/tasks/index.txt:609
msgid ""
"This is a very typical pattern for longer lived branches: the\n"
"``default`` branch is periodically merged into the more experimental\n"
"branch in order to propagate the latest bugfixes and changes. Keeping\n"
"the branches in sync help make the merges easier. On each merge,\n"
"Mercurial will find the nearest common ancestor and apply the changes\n"
"since that point. With periodic merges, this ancestor point will not\n"
"lie too far in the past, and the branches wont have drifted too far\n"
"away from each other."
msgstr ""

#: src/tasks/index.txt:619
msgid ""
"Merging Renamed Files in Subversion\n"
"-----------------------------------"
msgstr ""

#: src/tasks/index.txt:622
msgid ""
"When merging two branches, it is crucial to be able to find the common\n"
"ancestor between two branches. It is the changes made *since* this\n"
"ancestor that needs to be merged into the target branch. Mercurial\n"
"tracks this ancestor information automatically --- it is an integral\n"
"part of our history model and you have seen again and again in `hgtk\n"
"log`."
msgstr ""

#: src/tasks/index.txt:629
msgid ""
"The history in Subversion is not based on a graph like in Mercurial\n"
"and for a very long time, Subversion had no support for tracking\n"
"merges. This meant that you had to manually dig out the revision\n"
"ranges you wanted to merge when invoking ``svn merge``. Subversion 1.5\n"
"and later does track merges, but the support is incomplete. The\n"
"implementation of merge tracking is described as `extremely complex`__\n"
"in Version Control with Subversion (the \"SVN Book\"). In particular,\n"
"Subversion handles `merges involving renamed files`__ poorly."
msgstr ""

#: src/tasks/index.txt:638
msgid ""
".. __: http://svnbook.red-bean.com/en/1.5/svn-book.html\n"
"              #svn.branchmerge.advanced.finalword"
msgstr ""
".. __: http://svnbook.red-bean.com/en/1.5/svn-book.html\n"
"              #svn.branchmerge.advanced.finalword"

#: src/tasks/index.txt:641
msgid ""
".. __: http://svnbook.red-bean.com/en/1.5/svn-book.html\n"
"              #svn.branchmerge.advanced.moves"
msgstr ""
".. __: http://svnbook.red-bean.com/en/1.5/svn-book.html\n"
"              #svn.branchmerge.advanced.moves"

#: src/tasks/index.txt:644
msgid ""
"Above, we merged the ``issue-2`` branch into ``default``. On\n"
"``default``, the ``hello.txt`` file had been changed and on\n"
"``issue-2``, the ``hello.txt`` file had been renamed to\n"
"``hello.en.txt``. Mercurial did the right thing and applied the change\n"
"to ``hello.en.txt`` while merging. Subversion, on the other hand,\n"
"bails out with a message about a conflict:"
msgstr ""

#: src/tasks/index.txt:682
msgid ""
"Note also that one must use a special flag in Subversion when a branch\n"
"is merged back into the trunk. No such flag is needed in Mercurial\n"
"where there is nothing inherently special about the ``default`` branch\n"
"(except that it is, well…, the default branch)."
msgstr ""

#: src/tasks/index.txt:687
msgid ""
"Transplanting Changes\n"
"---------------------"
msgstr ""

#: src/tasks/index.txt:690
msgid ""
"When named branches are in use for a longer time, it happens that\n"
"changesets are needed on more than one branch. Above, Bob could simply\n"
"pull all the changes from the main repository, but this is often not\n"
"desirable because the change you want is mixed with other changes."
msgstr ""

#: src/tasks/index.txt:695
msgid ""
"The typical scenario is a bugfix that is committed to ``default``,\n"
"when it should really have been committed to a branch for the last\n"
"stable release. Consider a repository that has this graph:"
msgstr ""

#: src/tasks/index.txt:743
msgid ""
"Here two branches are used: ``default`` (in black) for the ongoing\n"
"development, and ``stable`` (in pink) for bugfixes and releases. You\n"
"can see how ``stable`` is merged into ``default`` after a bugfix in\n"
"order to propagate bugfixes into the current development. When a\n"
"release is made, the merge is made in the other direction --- from\n"
"``default`` into ``stable`` --- and a tag is added. The result is two\n"
"parallel tracks of development, where the pink ``stable`` branch\n"
"always contain a subset of the changesets on the black ``default``\n"
"branch."
msgstr ""

#: src/tasks/index.txt:753
msgid ""
"The final commit fixes an old bug and a little later, Carla realizes\n"
"that this bug is also present in the 2.0 release they made earlier.\n"
"The changeset should therefore really have been made on the ``stable``\n"
"branch. It is too late to simply merge ``default`` into ``stable``,\n"
"since that would also merge the experimental change."
msgstr ""

#: src/tasks/index.txt:759
msgid ""
"The solution is to use the `transplant extension`__ that ships with\n"
"Mercurial. Carla enables it by putting::"
msgstr ""

#: src/tasks/index.txt:762
msgid ""
"  [extensions]\n"
"  transplant ="
msgstr ""
"  [extensions]\n"
"  transplant ="

#: src/tasks/index.txt:765
msgid ""
"in her ``.hgrc`` file and while being on the ``stable`` branch, she\n"
"does:"
msgstr ""

#: src/tasks/index.txt:778
msgid "This copies the changeset to her branch:"
msgstr ""

#: src/tasks/index.txt:783
msgid ""
"The copying is done by exporting the original changeset as a patch and\n"
"applying it to the working copy, followed by a commit. Since the\n"
"duplicate changeset has a different past than the original, it will\n"
"get a new changeset hash. If unlucky, Carla might encounter conflicts\n"
"when transplanting and she will have to fix those manually before\n"
"making the commit. Most small bugfixes apply cleanly, however. She can\n"
"now merge the ``stable`` branch back into ``default``:"
msgstr ""

#: src/tasks/index.txt:802
msgid ""
"Note that changesets are not really moved with this technique. In a\n"
"distributed environment, it is close to impossible to destroy history,\n"
"so Mercurial will by default only let you append to your history. This\n"
"means that fixing mistakes involve making a new changeset that undoes\n"
"the mistake. In our case, we fixed the mistake by duplicating the\n"
"changeset. When merging, these duplicates are automatically\n"
"reconciled:"
msgstr ""

#: src/tasks/index.txt:813
msgid ".. __: http://mercurial.selenic.com/wiki/TransplantExtension"
msgstr ".. __: http://mercurial.selenic.com/wiki/TransplantExtension"

#: src/tasks/index.txt:818
msgid ""
"We will now split you into groups of five. Each group picks one who\n"
"should play the role of Carla, i.e., who should pull from the others\n"
"and decide what to merge. We will call this person C."
msgstr ""

#: src/tasks/index.txt:822
msgid "Now follow these steps:"
msgstr ""

#: src/tasks/index.txt:824
msgid "1. C starts by cloning an example repository from::"
msgstr ""

#: src/tasks/index.txt:826
msgid "     http://mercurial.aragost.com/repos/cantons/"
msgstr "     http://mercurial.aragost.com/repos/cantons/"

#: src/tasks/index.txt:828
msgid ""
"   When it has been cloned, C starts the built-in webserver in\n"
"   Mercurial with `hg serve`."
msgstr ""

#: src/tasks/index.txt:831
msgid ""
"2. The other group members make a clone from C. You'll need to\n"
"   exchange IP addresses at this point. You can also enable the\n"
"   `zeroconf extension`__, wait a second, and then do `hg paths`.\n"
"   Hopefully you will be able to see each other's repositories in the\n"
"   list."
msgstr ""

#: src/tasks/index.txt:837
msgid "   .. __: http://mercurial.selenic.com/wiki/ZeroconfExtension"
msgstr "   .. __: http://mercurial.selenic.com/wiki/ZeroconfExtension"

#: src/tasks/index.txt:839
msgid ""
"   On Windows, you should beware that since `hg serve` makes the\n"
"   repository available on port 8000 by default, Mercurial will try to\n"
"   name the clone something like ``172.16.0.1:8000``, which is an\n"
"   illegal filename on Windows. So you should specify a second\n"
"   argument to `hg clone` in order to give the clone a suitable name."
msgstr ""

#: src/tasks/index.txt:845
msgid ""
"3. In the clone, you will find a file named ``cantons.txt``. It has a\n"
"   list of Swiss canton abbreviations. The abbreviations need to be\n"
"   expanded, e.g., the line saying::"
msgstr ""

#: src/tasks/index.txt:849
msgid "     * FR"
msgstr "     * FR"

#: src/tasks/index.txt:851
msgid "   should be changed to say::"
msgstr ""

#: src/tasks/index.txt:853
msgid "     * FR: Fribourg"
msgstr ""

#: src/tasks/index.txt:855
msgid ""
"   C will appoint a range of letters to each of the other group\n"
"   members."
msgstr ""

#: src/tasks/index.txt:858
msgid ""
"4. Make a branch for your range, e.g., with `hg branch range-a-b`.\n"
"   Then expand each abbreviation. Make a commit after expanding\n"
"   the abbreviations for a single letter."
msgstr ""

#: src/tasks/index.txt:862
msgid ""
"5. While people are busy expanding abbreviations, C will add another\n"
"   section to the file. It should look like this::"
msgstr ""

#: src/tasks/index.txt:865
msgid ""
"     By Language\n"
"     ==========="
msgstr ""

#: src/tasks/index.txt:868
msgid ""
"     The official languages of Switzerland are French, German, Italian, and\n"
"     Romansh:"
msgstr ""

#: src/tasks/index.txt:871
msgid ""
"     French\n"
"     ------"
msgstr ""

#: src/tasks/index.txt:874
msgid "     French is spoken in: VD, ..."
msgstr ""

#: src/tasks/index.txt:877
msgid ""
"     German\n"
"     ------"
msgstr ""

#: src/tasks/index.txt:880
msgid "     German is spoken in: FR, ..."
msgstr ""

#: src/tasks/index.txt:883
msgid ""
"     Italian\n"
"     -------"
msgstr ""

#: src/tasks/index.txt:886
msgid "     Italian is spoken in: GR, ..."
msgstr ""

#: src/tasks/index.txt:889
msgid ""
"     Romansh\n"
"     -------"
msgstr ""

#: src/tasks/index.txt:892
msgid "     Romansh is spoken in: GR."
msgstr ""

#: src/tasks/index.txt:894
msgid ""
"   Fill in the missing cantons for French, German, and Italian and\n"
"   commit the change. Wait for the others to finish expanding their\n"
"   abbreviations."
msgstr ""

#: src/tasks/index.txt:898
msgid ""
"6. When someone is finished expanding his abbreviations, he should use\n"
"   `hg serve` and let C know where to find his work, just like we did\n"
"   it above."
msgstr ""

#: src/tasks/index.txt:902
msgid ""
"7. C will now pull from other group members and merge their changes\n"
"   into ``default``. If everybody has paid attention and edited their\n"
"   section only, then there should be no conflicts."
msgstr ""

#: src/tasks/index.txt:906
msgid ""
"8. Finally, note that Wikipedia is `there to help you`__ if you get\n"
"   stuck ``:-)``"
msgstr ""

#: src/tasks/index.txt:909
msgid "   .. __: http://en.wikipedia.org/wiki/Cantons_of_Switzerland"
msgstr "   .. __: http://en.wikipedia.org/wiki/Cantons_of_Switzerland"

#: src/tasks/index.txt:911
msgid "Next we will experiment with resolving conflicts:"
msgstr ""

#: src/tasks/index.txt:913
msgid ""
"1. Have two group members edit the same line --- one can add a line\n"
"   with the French canton name, the other with the Italian name."
msgstr ""

#: src/tasks/index.txt:916
msgid ""
"2. The conflict will be discovered when C pulls the changes and runs\n"
"   `hg merge`. Depending on the exact configuration of Mercurial, a\n"
"   merge tool will be run. Under Windows and under Linux, KDiff3 is\n"
"   the default tool. It looks like this when started:"
msgstr ""

#: src/tasks/index.txt:923
msgid ""
"   The bottom pane holds the result of the merge, and there is\n"
"   currently three merge conflicts. You can right-click on a ``<Merge\n"
"   Conflict>`` line and choose to resolve it by including lines from\n"
"   file B (your local version) or C (the other version).\n"
"   In our case we want to include both changes:"
msgstr ""

#: src/tasks/index.txt:931
msgid ""
"   Save the output and exit KDiff3. Mercurial will notice that the\n"
"   merge tool exited successfully and mark the files as resolved.\n"
"   Check with `hg resolve --list`."
msgstr ""

#: src/tasks/index.txt:935
msgid ""
"   If Mercurial is not configured to start a merge tool, then you will\n"
"   have to edit the file yourself to remove the conflict markers\n"
"   inserted by Mercurial. Use `hg resolve --mark cantons.txt` when\n"
"   done to mark the file as resolved."
msgstr ""

#: src/tasks/index.txt:940
msgid "3. Commit the result of the merge as normal."
msgstr ""

#: src/tasks/index.txt:946
msgid ""
"We have shown you how named branches can be used to add structure to a\n"
"Mercurial repository. They make it easy to work with several distinct\n"
"branches of development at the same time, without mixing them up."
msgstr ""