Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable i18n: pull translations from Launchpad

Changeset 21ef4a609bf8…

Parent 8d0cf374dccd…

by Steve Borho

Changes to 29 files · Browse files at 21ef4a609bf8 Showing diff from parent 8d0cf374dccd Diff from another changeset...

Change 1 of 38 Show Entire File i18n/​tortoisehg/​ca.po Stacked
 
7
8
9
10
 
11
12
13
14
15
16
17
 
18
19
20
 
25
26
27
28
 
29
30
31
32
33
34
35
 
 
 
36
37
38
 
63
64
65
66
 
67
68
69
 
194
195
196
197
198
199
 
 
 
200
201
202
 
287
288
289
290
 
291
292
293
 
302
303
304
305
 
306
307
308
 
561
562
563
564
 
565
566
567
568
569
 
570
571
572
573
574
 
575
576
577
 
696
697
698
699
 
700
701
702
 
946
947
948
949
 
950
951
952
 
974
975
976
977
978
 
 
979
980
981
982
983
984
985
 
986
987
988
989
990
 
991
992
993
 
1069
1070
1071
1072
 
1073
1074
1075
1076
 
1077
1078
1079
 
1114
1115
1116
1117
 
1118
1119
1120
 
1279
1280
1281
1282
1283
1284
1285
1286
 
 
 
 
1287
1288
1289
 
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
 
1408
1409
1410
1411
 
1412
1413
1414
 
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
 
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
 
1972
1973
1974
1975
1976
 
 
1977
1978
1979
 
1990
1991
1992
1993
 
1994
1995
1996
 
2011
2012
2013
2014
 
2015
2016
2017
2018
2019
2020
 
2021
2022
2023
2024
 
2025
2026
2027
 
2452
2453
2454
2455
 
2456
2457
2458
 
2874
2875
2876
2877
 
2878
2879
2880
2881
2882
 
2883
2884
2885
 
2937
2938
2939
2940
 
2941
2942
2943
 
2946
2947
2948
2949
 
2950
2951
2952
 
2989
2990
2991
2992
 
2993
2994
2995
 
3002
3003
3004
3005
 
3006
3007
3008
 
3435
3436
3437
3438
 
3439
3440
3441
3442
 
3443
3444
3445
3446
3447
 
3448
3449
3450
 
4589
4590
4591
4592
4593
 
 
4594
4595
4596
 
5380
5381
5382
5383
 
5384
5385
5386
5387
 
5388
5389
5390
5391
 
5392
5393
5394
5395
5396
 
5397
5398
5399
5400
5401
 
5402
5403
5404
5405
5406
 
5407
5408
5409
5410
5411
 
5412
5413
5414
5415
5416
 
5417
5418
5419
5420
5421
 
5422
5423
5424
5425
5426
 
5427
5428
5429
 
5534
5535
5536
5537
 
5538
5539
5540
5541
 
5542
5543
5544
 
6584
6585
6586
6587
 
6588
6589
6590
6591
 
6592
6593
6594
6595
 
6596
6597
6598
6599
 
6600
6601
6602
 
 
 
 
 
 
 
 
6603
6604
 
6605
6606
6607
6608
6609
6610
6611
6612
 
6613
6614
6615
6616
 
6617
6618
6619
6620
 
6621
6622
6623
6624
 
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
 
 
 
 
 
 
 
 
 
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
 
6648
6649
6650
6651
 
6652
6653
6654
6655
 
6656
6657
6658
6659
 
6660
6661
6662
6663
 
6664
6665
6666
6667
 
6668
6669
6670
6671
 
6672
6673
6674
6675
 
6676
6677
6678
6679
 
6680
6681
6682
6683
 
6684
6685
6686
6687
 
6688
6689
6690
6691
 
6692
6693
6694
6695
 
6696
6697
6698
6699
 
6700
6701
6702
6703
 
6704
6705
6706
6707
 
6708
6709
6710
6711
 
6712
6713
6714
6715
6716
6717
6718
6719
 
 
 
 
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
 
 
 
 
 
 
 
 
 
 
6736
6737
6738
 
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6755
6756
6757
6758
 
6759
6760
6761
6762
 
6763
6764
6765
6766
 
6767
6768
6769
6770
6771
 
6772
6773
6774
6775
 
6776
6777
6778
6779
6780
 
6781
6782
6783
6784
 
6785
6786
6787
6788
6789
 
6790
6791
6792
6793
 
6794
6795
6796
6797
6798
 
6799
6800
6801
6802
 
6803
6804
6805
6806
6807
 
6808
6809
6810
6811
6812
 
6813
6814
6815
6816
 
6817
6818
6819
6820
 
6821
6822
6823
 
6827
6828
6829
 
 
 
 
6830
6831
6832
 
7682
7683
7684
 
 
 
 
 
 
 
7685
7686
7687
 
8400
8401
8402
8403
8404
8405
8406
8407
8408
8409
 
8661
8662
8663
 
 
 
 
8664
8665
8666
 
8762
8763
8764
 
 
 
 
8765
8766
8767
 
10293
10294
10295
 
 
 
 
10296
10297
10298
 
7
8
9
 
10
11
12
13
14
15
16
 
17
18
19
20
 
25
26
27
 
28
29
30
31
32
 
 
 
33
34
35
36
37
38
 
63
64
65
 
66
67
68
69
 
194
195
196
 
 
 
197
198
199
200
201
202
 
287
288
289
 
290
291
292
293
 
302
303
304
 
305
306
307
308
 
561
562
563
 
564
565
566
567
568
 
569
570
571
572
573
 
574
575
576
577
 
696
697
698
 
699
700
701
702
 
946
947
948
 
949
950
951
952
 
974
975
976
 
 
977
978
979
980
981
982
983
984
 
985
986
987
988
989
 
990
991
992
993
 
1069
1070
1071
 
1072
1073
1074
1075
 
1076
1077
1078
1079
 
1114
1115
1116
 
1117
1118
1119
1120
 
1279
1280
1281
 
 
 
 
 
1282
1283
1284
1285
1286
1287
1288
 
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
 
1407
1408
1409
 
1410
1411
1412
1413
 
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
 
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
 
1971
1972
1973
 
 
1974
1975
1976
1977
1978
 
1989
1990
1991
 
1992
1993
1994
1995
 
2010
2011
2012
 
2013
2014
2015
2016
2017
2018
 
2019
2020
2021
2022
 
2023
2024
2025
2026
 
2451
2452
2453
 
2454
2455
2456
2457
 
2873
2874
2875
 
2876
2877
2878
2879
2880
 
2881
2882
2883
2884
 
2936
2937
2938
 
2939
2940
2941
2942
 
2945
2946
2947
 
2948
2949
2950
2951
 
2988
2989
2990
 
2991
2992
2993
2994
 
3001
3002
3003
 
3004
3005
3006
3007
 
3434
3435
3436
 
3437
3438
3439
3440
 
3441
3442
3443
3444
3445
 
3446
3447
3448
3449
 
4588
4589
4590
 
 
4591
4592
4593
4594
4595
 
5379
5380
5381
 
5382
5383
5384
5385
 
5386
5387
5388
5389
 
5390
5391
5392
5393
5394
 
5395
5396
5397
5398
5399
 
5400
5401
5402
5403
5404
 
5405
5406
5407
5408
5409
 
5410
5411
5412
5413
5414
 
5415
5416
5417
5418
5419
 
5420
5421
5422
5423
5424
 
5425
5426
5427
5428
 
5533
5534
5535
 
5536
5537
5538
5539
 
5540
5541
5542
5543
 
6583
6584
6585
 
6586
6587
6588
6589
 
6590
6591
6592
6593
 
6594
6595
6596
6597
 
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
 
6611
6612
6613
6614
 
 
 
 
 
6615
6616
6617
6618
 
6619
6620
6621
6622
 
6623
6624
6625
6626
 
6627
6628
6629
6630
 
 
 
 
6631
6632
6633
 
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
 
 
 
 
 
 
 
 
 
6646
6647
6648
6649
 
6650
6651
6652
6653
 
6654
6655
6656
6657
 
6658
6659
6660
6661
 
6662
6663
6664
6665
 
6666
6667
6668
6669
 
6670
6671
6672
6673
 
6674
6675
6676
6677
 
6678
6679
6680
6681
 
6682
6683
6684
6685
 
6686
6687
6688
6689
 
6690
6691
6692
6693
 
6694
6695
6696
6697
 
6698
6699
6700
6701
 
6702
6703
6704
6705
 
6706
6707
6708
6709
 
6710
6711
6712
6713
 
 
 
 
6714
6715
6716
6717
6718
6719
6720
6721
 
 
 
 
 
 
 
 
 
 
 
 
 
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
 
6740
6741
6742
 
 
 
 
 
 
 
 
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
 
6762
6763
6764
6765
 
6766
6767
6768
6769
 
6770
6771
6772
6773
6774
 
6775
6776
6777
6778
 
6779
6780
6781
6782
6783
 
6784
6785
6786
6787
 
6788
6789
6790
6791
6792
 
6793
6794
6795
6796
 
6797
6798
6799
6800
6801
 
6802
6803
6804
6805
 
6806
6807
6808
6809
6810
 
6811
6812
6813
6814
6815
 
6816
6817
6818
6819
 
6820
6821
6822
6823
 
6824
6825
6826
6827
 
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
 
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
 
8415
8416
8417
 
 
 
 
8418
8419
8420
 
8672
8673
8674
8675
8676
8677
8678
8679
8680
8681
 
8777
8778
8779
8780
8781
8782
8783
8784
8785
8786
 
10312
10313
10314
10315
10316
10317
10318
10319
10320
10321
@@ -7,14 +7,14 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2011-02-27 13:57-0300\n" +"POT-Creation-Date: 2011-02-28 02:58-0300\n"  "PO-Revision-Date: 2009-10-18 09:21+0000\n"  "Last-Translator: peso <peer.sommerlund@gmail.com>\n"  "Language-Team: Catalan <ca@li.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-28 04:40+0000\n" +"X-Launchpad-Export-Date: 2011-03-01 04:44+0000\n"  "X-Generator: Launchpad (build 12351)\n"    #: TortoiseHgOverlayServer.py:50 @@ -25,14 +25,14 @@
 msgid "Exit"  msgstr "Sortir"   -#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:281 +#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:286  #: tortoisehg/hgtk/gdialog.py:505  msgid "About"  msgstr ""   -#: tortoisehg/hgqt/about.py:60 tortoisehg/hgtk/about.py:79 -msgid "Copyright 2008-2010 Steve Borho and others" -msgstr "Copyright 2008-2010 Steve Borho i altres" +#: tortoisehg/hgqt/about.py:60 +msgid "Copyright 2008-2011 Steve Borho and others" +msgstr ""    #: tortoisehg/hgqt/about.py:65 tortoisehg/hgtk/about.py:42  msgid "Several icons are courtesy of the TortoiseSVN project" @@ -63,7 +63,7 @@
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"  msgstr ""   -#: tortoisehg/hgqt/about.py:192 tortoisehg/hgtk/about.py:70 +#: tortoisehg/hgqt/about.py:189 tortoisehg/hgtk/about.py:70  msgid "A new version of TortoiseHg is ready for download!"  msgstr "Una nova versió de TortoiseHg està llesta per descarregar !"   @@ -194,9 +194,9 @@
 #: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:516  #: tortoisehg/hgqt/commit.py:523 tortoisehg/hgqt/commit.py:550  #: tortoisehg/hgqt/commit.py:563 tortoisehg/hgqt/compress.py:150 -#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:163 -#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgqt/merge.py:392 -#: tortoisehg/hgqt/merge.py:449 tortoisehg/hgqt/rebase.py:214 +#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:165 +#: tortoisehg/hgqt/merge.py:358 tortoisehg/hgqt/merge.py:391 +#: tortoisehg/hgqt/merge.py:450 tortoisehg/hgqt/rebase.py:214  #: tortoisehg/hgqt/rebase.py:235 tortoisehg/hgqt/rename.py:104  #: tortoisehg/hgqt/repotreeitem.py:283 tortoisehg/hgqt/resolve.py:317  #: tortoisehg/hgqt/settings.py:653 tortoisehg/hgqt/settings.py:751 @@ -287,7 +287,7 @@
 msgstr "Grup de canvis retirat: "    #: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:84 -#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:309 +#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:308  #: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169  #: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:135  #: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64 @@ -302,7 +302,7 @@
 msgid "Commit backout before merging with current working parent"  msgstr ""   -#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:326 +#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:325  #: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:898  #: tortoisehg/hgqt/update.py:97  msgid "Automatically resolve merge conflicts where possible" @@ -561,17 +561,17 @@
 msgid "Add or remove patches must be merged in the working directory"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:430 tortoisehg/hgqt/status.py:128 +#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128  #: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475  msgid "All"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:434 tortoisehg/hgqt/qscilib.py:194 +#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/qscilib.py:194  #: tortoisehg/hgqt/status.py:132  msgid "None"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:490 +#: tortoisehg/hgqt/chunks.py:491  #, python-format  msgid "Chunks selected: %d / %d"  msgstr "" @@ -696,7 +696,7 @@
 msgid "Terminated"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:716 +#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:718  #: tortoisehg/hgtk/p4pending.py:101  msgid "Finished"  msgstr "" @@ -946,7 +946,7 @@
 msgid "Compress"  msgstr ""   -#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:257 +#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:259  #: tortoisehg/hgqt/rebase.py:104  msgid "Checking..."  msgstr "" @@ -974,20 +974,20 @@
 msgid "Compress is complete, old history untouched"  msgstr ""   -#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:358 -#: tortoisehg/hgqt/merge.py:391 tortoisehg/hgqt/merge.py:448 +#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:357 +#: tortoisehg/hgqt/merge.py:390 tortoisehg/hgqt/merge.py:449  #: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751  #: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775  #: tortoisehg/hgtk/update.py:233  msgid "&Discard"  msgstr ""   -#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450 +#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451  #: tortoisehg/hgqt/rebase.py:215  msgid "Confirm Discard"  msgstr ""   -#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450 +#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451  #: tortoisehg/hgqt/rebase.py:215  msgid "Discard outstanding changes in working directory?"  msgstr "" @@ -1069,11 +1069,11 @@
 msgid "Output Log"  msgstr ""   -#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:285 +#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:290  msgid "Back"  msgstr ""   -#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:288 +#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:293  msgid "Forward"  msgstr ""   @@ -1114,7 +1114,7 @@
 msgid "Compare revisions of the selected file"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:506 +#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:502  #: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/util/menuthg.py:76  msgid "Visual Diff"  msgstr "" @@ -1279,11 +1279,10 @@
 msgid "Search"  msgstr ""   -#: tortoisehg/hgqt/grep.py:54 tortoisehg/hgqt/merge.py:264 -#: tortoisehg/hgqt/serve_ui.py:87 tortoisehg/hgtk/datamine.py:54 -#: tortoisehg/hgtk/hgcmd.py:46 tortoisehg/hgtk/history.py:448 -#: tortoisehg/hgtk/recovery.py:48 tortoisehg/hgtk/serve.py:65 -#: tortoisehg/hgtk/synch.py:53 +#: tortoisehg/hgqt/grep.py:54 tortoisehg/hgqt/serve_ui.py:87 +#: tortoisehg/hgtk/datamine.py:54 tortoisehg/hgtk/hgcmd.py:46 +#: tortoisehg/hgtk/history.py:448 tortoisehg/hgtk/recovery.py:48 +#: tortoisehg/hgtk/serve.py:65 tortoisehg/hgtk/synch.py:53  msgid "Stop"  msgstr ""   @@ -1337,69 +1336,69 @@
 msgid "\"%s\" removed from path history"  msgstr ""   -#: tortoisehg/hgqt/grep.py:273 +#: tortoisehg/hgqt/grep.py:269  #, python-format  msgid "grep: invalid match pattern: %s\n"  msgstr ""   -#: tortoisehg/hgqt/grep.py:300 +#: tortoisehg/hgqt/grep.py:296  #, python-format  msgid "grep: %s\n"  msgstr ""   -#: tortoisehg/hgqt/grep.py:331 +#: tortoisehg/hgqt/grep.py:327  msgid "No matches found"  msgstr ""   -#: tortoisehg/hgqt/grep.py:333 tortoisehg/hgqt/revset.py:382 +#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:382  #, python-format  msgid "%d matches found"  msgstr ""   -#: tortoisehg/hgqt/grep.py:397 tortoisehg/hgqt/grep.py:410 -#: tortoisehg/hgqt/grep.py:442 +#: tortoisehg/hgqt/grep.py:393 tortoisehg/hgqt/grep.py:406 +#: tortoisehg/hgqt/grep.py:438  msgid "Searching"  msgstr ""   -#: tortoisehg/hgqt/grep.py:397 +#: tortoisehg/hgqt/grep.py:393  msgid "history"  msgstr ""   -#: tortoisehg/hgqt/grep.py:409 +#: tortoisehg/hgqt/grep.py:405  msgid "Interrupted"  msgstr ""   -#: tortoisehg/hgqt/grep.py:443 +#: tortoisehg/hgqt/grep.py:439  msgid "files"  msgstr ""   -#: tortoisehg/hgqt/grep.py:504 +#: tortoisehg/hgqt/grep.py:500  msgid "View file"  msgstr ""   -#: tortoisehg/hgqt/grep.py:505 +#: tortoisehg/hgqt/grep.py:501  msgid "View Changeset"  msgstr ""   -#: tortoisehg/hgqt/grep.py:507 +#: tortoisehg/hgqt/grep.py:503  msgid "Annotate file"  msgstr ""   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:364 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:364  #: tortoisehg/hgtk/datamine.py:654  msgid "File"  msgstr ""   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:652 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:652  msgid "Line"  msgstr ""   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:363 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:363  #: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441  msgid "Rev"  msgstr ""   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgqt/settings.py:451 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgqt/settings.py:451  #: tortoisehg/hgqt/settings.py:551 tortoisehg/hgqt/settings.py:590  #: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655  #: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502 @@ -1408,7 +1407,7 @@
 msgid "User"  msgstr ""   -#: tortoisehg/hgqt/grep.py:651 +#: tortoisehg/hgqt/grep.py:647  msgid "Match Text"  msgstr ""   @@ -1830,76 +1829,76 @@
 msgid "&Exit"  msgstr ""   -#: tortoisehg/hgqt/merge.py:218 tortoisehg/hgqt/revpanel.py:156 +#: tortoisehg/hgqt/merge.py:220 tortoisehg/hgqt/revpanel.py:156  #: tortoisehg/hgtk/merge.py:73  msgid "Not a head revision!"  msgstr ""   -#: tortoisehg/hgqt/merge.py:225 +#: tortoisehg/hgqt/merge.py:227  msgid "Merge from (other revision)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:233 tortoisehg/hgtk/merge.py:47 +#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgtk/merge.py:47  #: tortoisehg/hgtk/merge.py:60  msgid "Unable to merge"  msgstr ""   -#: tortoisehg/hgqt/merge.py:234 +#: tortoisehg/hgqt/merge.py:236  msgid "Merge revision not specified or not found"  msgstr ""   -#: tortoisehg/hgqt/merge.py:239 +#: tortoisehg/hgqt/merge.py:241  msgid "Merge to (working directory)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:248 +#: tortoisehg/hgqt/merge.py:250  msgid "Working directory status"  msgstr ""   -#: tortoisehg/hgqt/merge.py:267 +#: tortoisehg/hgqt/merge.py:266  msgid "<a href=\"view\">View changes...</a>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:273 +#: tortoisehg/hgqt/merge.py:272  msgid ""  "The workding directory is already <b>merged</b>. <a "  "href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "  "existing merge."  msgstr ""   -#: tortoisehg/hgqt/merge.py:282 +#: tortoisehg/hgqt/merge.py:281  msgid ""  "Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "  "href=\"shelve\"><b>shelve</b></a> to patch, or <a "  "href=\"discard\"><b>discard</b></a> changes."  msgstr ""   -#: tortoisehg/hgqt/merge.py:295 +#: tortoisehg/hgqt/merge.py:294  msgid "Or use:"  msgstr ""   -#: tortoisehg/hgqt/merge.py:298 +#: tortoisehg/hgqt/merge.py:297  msgid "Force a merge with outstanding changes (-f/--force)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:319 tortoisehg/hgtk/merge.py:118 +#: tortoisehg/hgqt/merge.py:318 tortoisehg/hgtk/merge.py:118  msgid "Discard all changes from merge target (other) revision"  msgstr ""   -#: tortoisehg/hgqt/merge.py:339 tortoisehg/hgqt/update.py:223 +#: tortoisehg/hgqt/merge.py:338 tortoisehg/hgqt/update.py:223  #: tortoisehg/hgtk/update.py:237  msgid "&Merge"  msgstr ""   -#: tortoisehg/hgqt/merge.py:343 +#: tortoisehg/hgqt/merge.py:342  msgid "Merge another revision to the working directory"  msgstr ""   -#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:215 +#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgtk/merge.py:215  msgid "Confirm Discard Changes"  msgstr ""   -#: tortoisehg/hgqt/merge.py:361 tortoisehg/hgtk/merge.py:216 +#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:216  #, python-format  msgid ""  "The changes from revision %s and all unmerged parents will be discarded.\n" @@ -1907,62 +1906,62 @@
 "Are you sure this is what you want to do?"  msgstr ""   +#: tortoisehg/hgqt/merge.py:370 +msgid "Merging..." +msgstr "" +  #: tortoisehg/hgqt/merge.py:371 -msgid "Merging..." -msgstr "" - -#: tortoisehg/hgqt/merge.py:372  msgid "All conflicting files will be marked unresolved."  msgstr ""   +#: tortoisehg/hgqt/merge.py:388 +msgid "Cancel merge and discard changes?" +msgstr "" +  #: tortoisehg/hgqt/merge.py:389 -msgid "Cancel merge and discard changes?" -msgstr "" - -#: tortoisehg/hgqt/merge.py:390  msgid "Discard unfinished local changes and restart merge?"  msgstr ""   -#: tortoisehg/hgqt/merge.py:393 +#: tortoisehg/hgqt/merge.py:392  msgid "Confirm Clean Up"  msgstr ""   +#: tortoisehg/hgqt/merge.py:395 +msgid "Canceling merge...\n" +msgstr "" +  #: tortoisehg/hgqt/merge.py:396 -msgid "Canceling merge...\n" -msgstr "" - -#: tortoisehg/hgqt/merge.py:397  msgid "(Please close any running merge tool)\n"  msgstr ""   -#: tortoisehg/hgqt/merge.py:415 +#: tortoisehg/hgqt/merge.py:416  msgid "Merge failed"  msgstr ""   -#: tortoisehg/hgqt/merge.py:415 +#: tortoisehg/hgqt/merge.py:416  msgid "Returning to first page"  msgstr ""   -#: tortoisehg/hgqt/merge.py:466 +#: tortoisehg/hgqt/merge.py:467  msgid "Rename Patch"  msgstr ""   -#: tortoisehg/hgqt/merge.py:467 +#: tortoisehg/hgqt/merge.py:468  msgid "Input a new patch name:"  msgstr ""   -#: tortoisehg/hgqt/merge.py:475 +#: tortoisehg/hgqt/merge.py:476  #, python-format  msgid ""  "The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>. <a "  "href=\"rename:%(new)s\"><b>Rename</b></a> again?"  msgstr ""   -#: tortoisehg/hgqt/merge.py:522 +#: tortoisehg/hgqt/merge.py:523  msgid "<b>Uncommitted local changes are detected</b>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:527 tortoisehg/hgtk/recovery.py:52 +#: tortoisehg/hgqt/merge.py:528 tortoisehg/hgtk/recovery.py:52  msgid "Clean"  msgstr ""   @@ -1972,8 +1971,8 @@
 msgid "Parents"  msgstr ""   -#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:521 -#: tortoisehg/hgqt/repomodel.py:523 tortoisehg/hgqt/shelve.py:24 +#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:514 +#: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24  #: tortoisehg/hgqt/thgimport.py:87  msgid "Working Directory"  msgstr "" @@ -1990,7 +1989,7 @@
 msgid "Merge "  msgstr ""   -#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:229 +#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:231  msgid "&Commit"  msgstr ""   @@ -2011,17 +2010,17 @@
 msgid "Please wait while committing merged files."  msgstr ""   -#: tortoisehg/hgqt/merge.py:672 +#: tortoisehg/hgqt/merge.py:674  msgid ""  "There were <b>merge conflicts</b> that must be <a "  "href=\"resolve\"><b>resolved</b></a>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:677 +#: tortoisehg/hgqt/merge.py:679  msgid "No merge conflicts, ready to commit"  msgstr ""   -#: tortoisehg/hgqt/merge.py:729 +#: tortoisehg/hgqt/merge.py:731  msgid "Merge changeset"  msgstr ""   @@ -2452,7 +2451,7 @@
 msgid "Delete"  msgstr ""   -#: tortoisehg/hgqt/qqueue.py:100 tortoisehg/hgqt/workbench.py:271 +#: tortoisehg/hgqt/qqueue.py:100  msgid "Purge"  msgstr ""   @@ -2874,12 +2873,12 @@
 msgid "Include all ancestors"  msgstr ""   -#: tortoisehg/hgqt/repomodel.py:189 +#: tortoisehg/hgqt/repomodel.py:188  #, python-format  msgid "filling (%d)"  msgstr ""   -#: tortoisehg/hgqt/repomodel.py:515 +#: tortoisehg/hgqt/repomodel.py:508  msgid "Mercurial User"  msgstr ""   @@ -2937,7 +2936,7 @@
 msgstr ""    #: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:451 -#: tortoisehg/hgqt/workbench.py:274 +#: tortoisehg/hgqt/workbench.py:279  msgid "Explore"  msgstr ""   @@ -2946,7 +2945,7 @@
 msgstr ""    #: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:452 -#: tortoisehg/hgqt/workbench.py:277 +#: tortoisehg/hgqt/workbench.py:282  msgid "Terminal"  msgstr ""   @@ -2989,7 +2988,7 @@
 msgid "default"  msgstr ""   -#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:363 +#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362  #: tortoisehg/hgqt/sync.py:198 tortoisehg/hgqt/webconf.py:266  msgid "Path"  msgstr "" @@ -3002,7 +3001,7 @@
 msgid "Failed to add repository"  msgstr ""   -#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:576 +#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:581  #, python-format  msgid "%s is not a valid repository"  msgstr "" @@ -3435,16 +3434,16 @@
 msgid "&Quit"  msgstr ""   -#: tortoisehg/hgqt/resolve.py:363 +#: tortoisehg/hgqt/resolve.py:362  msgid "Ext"  msgstr ""   -#: tortoisehg/hgqt/resolve.py:363 tortoisehg/hgqt/thgimport.py:85 +#: tortoisehg/hgqt/resolve.py:362 tortoisehg/hgqt/thgimport.py:85  #: tortoisehg/hgtk/thgimport.py:110  msgid "Repository"  msgstr ""   -#: tortoisehg/hgqt/resolve.py:406 +#: tortoisehg/hgqt/resolve.py:405  msgid "<default>"  msgstr ""   @@ -4589,8 +4588,8 @@
 "Merge, Tag and Backout dialogs. Default: False"  msgstr ""   -#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgqt/workbench.py:252 -#: tortoisehg/hgtk/thgconfig.py:179 tortoisehg/util/menuthg.py:55 +#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgtk/thgconfig.py:179 +#: tortoisehg/util/menuthg.py:55  msgid "Web Server"  msgstr ""   @@ -5380,50 +5379,50 @@
 msgid "Size (KB)"  msgstr ""   -#: tortoisehg/hgqt/status.py:667 +#: tortoisehg/hgqt/status.py:684  msgid ", resolved merge"  msgstr ""   -#: tortoisehg/hgqt/status.py:669 +#: tortoisehg/hgqt/status.py:686  msgid ", unresolved merge"  msgstr ""   -#: tortoisehg/hgqt/status.py:681 +#: tortoisehg/hgqt/status.py:698  #, python-format  msgid "%s is modified"  msgstr ""   -#: tortoisehg/hgqt/status.py:683 +#: tortoisehg/hgqt/status.py:700  #, python-format  msgid "%s is added"  msgstr ""   -#: tortoisehg/hgqt/status.py:685 +#: tortoisehg/hgqt/status.py:702  #, python-format  msgid "%s is removed"  msgstr ""   -#: tortoisehg/hgqt/status.py:687 +#: tortoisehg/hgqt/status.py:704  #, python-format  msgid "%s is not tracked (unknown)"  msgstr ""   -#: tortoisehg/hgqt/status.py:689 +#: tortoisehg/hgqt/status.py:706  #, python-format  msgid "%s is missing!"  msgstr ""   -#: tortoisehg/hgqt/status.py:691 +#: tortoisehg/hgqt/status.py:708  #, python-format  msgid "%s is ignored"  msgstr ""   -#: tortoisehg/hgqt/status.py:693 +#: tortoisehg/hgqt/status.py:710  #, python-format  msgid "%s is not modified (clean)"  msgstr ""   -#: tortoisehg/hgqt/status.py:695 +#: tortoisehg/hgqt/status.py:712  #, python-format  msgid "%s is a dirty subrepo"  msgstr "" @@ -5534,11 +5533,11 @@
 msgid "A terminal shell cannot be opened for remote"  msgstr ""   -#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:676 +#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:681  msgid "No shell configured"  msgstr ""   -#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:677 +#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:682  msgid "A terminal shell must be configured"  msgstr ""   @@ -6584,155 +6583,152 @@
 msgid "Save"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:39 tortoisehg/hgqt/workbench.py:398 +#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:403  msgid "TortoiseHg Workbench"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:64 +#: tortoisehg/hgqt/workbench.py:62  msgid "New Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:66 tortoisehg/hgqt/workbench.py:177 +#: tortoisehg/hgqt/workbench.py:64 tortoisehg/hgqt/workbench.py:183  msgid "Clone Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:68 +#: tortoisehg/hgqt/workbench.py:66  msgid "Open Repository..."  msgstr ""   +#: tortoisehg/hgqt/workbench.py:98 +msgid "&File" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:99 +msgid "&View" +msgstr "" +  #: tortoisehg/hgqt/workbench.py:100 -msgid "&File" +msgid "&Repository"  msgstr ""    #: tortoisehg/hgqt/workbench.py:101 -msgid "&View" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:102 -msgid "&Repository" +msgid "&Help"  msgstr ""    #: tortoisehg/hgqt/workbench.py:103 -msgid "&Help" +msgid "Edit Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:105 -msgid "Edit Toolbar" +msgid "Dock Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:107 -msgid "Dock Toolbar" +msgid "Sync Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:109 -msgid "Sync Toolbar" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:111  msgid "Task Toolbar"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:175 +#: tortoisehg/hgqt/workbench.py:176 +msgid "&Open Repository..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:178 +msgid "&Close Repository" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:181  msgid "&New Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:180 -msgid "&Open Repository..." -msgstr "" - -#: tortoisehg/hgqt/workbench.py:182 -msgid "&Close Repository" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:185 +#: tortoisehg/hgqt/workbench.py:187  msgid "&Settings..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:188 +#: tortoisehg/hgqt/workbench.py:190  msgid "E&xit"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:192 +#: tortoisehg/hgqt/workbench.py:193  msgid "Show Repository Registry"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:199 +#: tortoisehg/hgqt/workbench.py:200  msgid "Show Paths"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:203 +#: tortoisehg/hgqt/workbench.py:204  msgid "Show Output &Log"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:210 +#: tortoisehg/hgqt/workbench.py:211  msgid "Choose Log Columns..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:213 +#: tortoisehg/hgqt/workbench.py:214  msgid "Save Open Repositories On Exit"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:228 +#: tortoisehg/hgqt/workbench.py:230  msgid "Revision &Details"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:230 +#: tortoisehg/hgqt/workbench.py:232  msgid "S&ynchronize"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:231 +#: tortoisehg/hgqt/workbench.py:233  msgid "&Manifest"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:232 +#: tortoisehg/hgqt/workbench.py:234  msgid "&Search"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:234 +#: tortoisehg/hgqt/workbench.py:236  msgid "Patch &Queue"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:236 +#: tortoisehg/hgqt/workbench.py:238  msgid "&Patch Branch"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:239 tortoisehg/hgtk/status.py:1320 +#: tortoisehg/hgqt/workbench.py:241 tortoisehg/hgtk/status.py:1320  msgid "&Refresh"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:242 +#: tortoisehg/hgqt/workbench.py:244  msgid "Refresh current repository"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:243 +#: tortoisehg/hgqt/workbench.py:245  msgid "Refresh &Task Tab"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:246 +#: tortoisehg/hgqt/workbench.py:248  msgid "Refresh only the current task tab"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:248 tortoisehg/hgtk/history.py:1496 -msgid "Load all" -msgstr "" -  #: tortoisehg/hgqt/workbench.py:250 +msgid "Load all revisions" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:252  msgid "Load all revisions into graph"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:254 tortoisehg/hgtk/history.py:1324 -msgid "Bisect" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:257 tortoisehg/hgtk/gdialog.py:493 -#: tortoisehg/hgtk/history.py:291 tortoisehg/hgtk/synch.py:83 -#: tortoisehg/hgtk/thgshelve.py:72 tortoisehg/hgtk/thgshelve.py:145 -#: tortoisehg/hgtk/thgshelve.py:151 tortoisehg/hgtk/thgshelve.py:159 -msgid "Shelve" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/thgimport.py:164 -msgid "Import" +#: tortoisehg/hgqt/workbench.py:254 +msgid "Web Server..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:257 +msgid "Shelve..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/history.py:458 +msgid "Import..."  msgstr ""    #: tortoisehg/hgqt/workbench.py:262 tortoisehg/hgtk/recovery.py:68 @@ -6744,80 +6740,88 @@
 msgstr ""    #: tortoisehg/hgqt/workbench.py:267 -msgid "Resolve" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:269 -msgid "Rollback/Undo" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:293 +msgid "Resolve..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:270 +msgid "Rollback/Undo..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:273 +msgid "Purge..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:276 +msgid "Bisect..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:298  msgid "Filter Toolbar"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:296 +#: tortoisehg/hgqt/workbench.py:301  msgid "Filter graph with revision sets or branches"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:298 +#: tortoisehg/hgqt/workbench.py:303  msgid "Workbench Toolbars"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:305 tortoisehg/hgtk/history.py:438 +#: tortoisehg/hgqt/workbench.py:310 tortoisehg/hgtk/history.py:438  #: tortoisehg/hgtk/history.py:1861 tortoisehg/hgtk/synch.py:57  msgid "Incoming"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:306 +#: tortoisehg/hgqt/workbench.py:311  msgid "Check for incoming changes from default pull target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:308 tortoisehg/hgtk/history.py:440 +#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/history.py:440  #: tortoisehg/hgtk/history.py:1991  msgid "Pull"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:309 +#: tortoisehg/hgqt/workbench.py:314  msgid "Pull incoming changes from default pull target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/history.py:442 +#: tortoisehg/hgqt/workbench.py:316 tortoisehg/hgtk/history.py:442  #: tortoisehg/hgtk/history.py:2034 tortoisehg/hgtk/synch.py:68  msgid "Outgoing"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:312 +#: tortoisehg/hgqt/workbench.py:317  msgid "Detect outgoing changes to default push target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:314 tortoisehg/hgtk/history.py:444 +#: tortoisehg/hgqt/workbench.py:319 tortoisehg/hgtk/history.py:444  #: tortoisehg/hgtk/history.py:2074 tortoisehg/hgtk/synch.py:73  msgid "Push"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:315 +#: tortoisehg/hgqt/workbench.py:320  msgid "Push outgoing changes to default push target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:400 +#: tortoisehg/hgqt/workbench.py:405  #, python-format  msgid "%s - TortoiseHg Workbench - %s"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:403 +#: tortoisehg/hgqt/workbench.py:408  #, python-format  msgid "%s - TortoiseHg Workbench"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:554 +#: tortoisehg/hgqt/workbench.py:559  msgid "Select repository directory to open"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:575 +#: tortoisehg/hgqt/workbench.py:580  msgid "Failed to open repository"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:698 +#: tortoisehg/hgqt/workbench.py:703  #, python-format  msgid "Hg file log viewer [%s] - %s"  msgstr "" @@ -6827,6 +6831,10 @@
 msgid "(version %s)"  msgstr "(versió %s)"   +#: tortoisehg/hgtk/about.py:79 +msgid "Copyright 2008-2010 Steve Borho and others" +msgstr "Copyright 2008-2010 Steve Borho i altres" +  #: tortoisehg/hgtk/about.py:95  #, python-format  msgid "with %s" @@ -7682,6 +7690,13 @@
 msgid "Recovery"  msgstr ""   +#: tortoisehg/hgtk/gdialog.py:493 tortoisehg/hgtk/history.py:291 +#: tortoisehg/hgtk/synch.py:83 tortoisehg/hgtk/thgshelve.py:72 +#: tortoisehg/hgtk/thgshelve.py:145 tortoisehg/hgtk/thgshelve.py:151 +#: tortoisehg/hgtk/thgshelve.py:159 +msgid "Shelve" +msgstr "" +  #: tortoisehg/hgtk/gdialog.py:500  msgid "_Help"  msgstr "" @@ -8400,10 +8415,6 @@
 msgid "Reject Bundle"  msgstr ""   -#: tortoisehg/hgtk/history.py:458 -msgid "Import..." -msgstr "" -  #: tortoisehg/hgtk/history.py:460  msgid "Add Bundle..."  msgstr "" @@ -8661,6 +8672,10 @@
 msgid "Transp_lant to Local"  msgstr ""   +#: tortoisehg/hgtk/history.py:1324 +msgid "Bisect" +msgstr "" +  #: tortoisehg/hgtk/history.py:1332  msgid "_Export Patch..."  msgstr "" @@ -8762,6 +8777,10 @@
 msgstr ""    #: tortoisehg/hgtk/history.py:1496 +msgid "Load all" +msgstr "" + +#: tortoisehg/hgtk/history.py:1496  msgid "load all revisions"  msgstr ""   @@ -10293,6 +10312,10 @@
 msgid "Skipped saving path with no alias"  msgstr ""   +#: tortoisehg/hgtk/thgimport.py:164 +msgid "Import" +msgstr "" +  #: tortoisehg/hgtk/thgimport.py:184  msgid "Imported successfully"  msgstr ""
Change 1 of 38 Show Entire File i18n/​tortoisehg/​cs.po Stacked
 
8
9
10
11
12
13
 
 
 
14
15
16
17
18
 
19
20
21
 
26
27
28
29
 
30
31
32
33
34
35
36
 
 
 
37
38
39
 
64
65
66
67
 
68
69
70
 
195
196
197
198
199
200
 
 
 
201
202
203
 
291
292
293
294
 
295
296
297
 
306
307
308
309
 
310
311
312
 
565
566
567
568
 
569
570
571
572
573
 
574
575
576
577
578
 
579
580
581
 
700
701
702
703
 
704
705
706
 
950
951
952
953
 
954
955
956
 
978
979
980
981
982
 
 
983
984
985
986
987
988
989
 
990
991
992
993
994
 
995
996
997
 
1073
1074
1075
1076
 
1077
1078
1079
1080
 
1081
1082
1083
 
1118
1119
1120
1121
 
1122
1123
1124
 
1283
1284
1285
1286
1287
1288
1289
1290
 
 
 
 
1291
1292
1293
 
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
 
1412
1413
1414
1415
 
1416
1417
1418
 
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
 
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
 
1991
1992
1993
1994
1995
 
 
1996
1997
1998
 
2009
2010
2011
2012
 
2013
2014
2015
 
2030
2031
2032
2033
 
2034
2035
2036
2037
2038
2039
 
2040
2041
2042
2043
 
2044
2045
2046
 
2471
2472
2473
2474
 
2475
2476
2477
 
2893
2894
2895
2896
 
2897
2898
2899
2900
2901
 
2902
2903
2904
 
2956
2957
2958
2959
 
2960
2961
2962
 
2965
2966
2967
2968
 
2969
2970
2971
 
3008
3009
3010
3011
 
3012
3013
3014
 
3021
3022
3023
3024
 
3025
3026
3027
 
3454
3455
3456
3457
 
3458
3459
3460
3461
 
3462
3463
3464
3465
3466
 
3467
3468
3469
 
4649
4650
4651
4652
4653
 
 
4654
4655
4656
 
5469
5470
5471
5472
 
5473
5474
5475
5476
 
5477
5478
5479
5480
 
5481
5482
5483
5484
5485
 
5486
5487
5488
5489
5490
 
5491
5492
5493
5494
5495
 
5496
5497
5498
5499
5500
 
5501
5502
5503
5504
5505
 
5506
5507
5508
5509
5510
 
5511
5512
5513
5514
5515
 
5516
5517
5518
 
5623
5624
5625
5626
 
5627
5628
5629
5630
 
5631
5632
5633
 
6679
6680
6681
6682
 
6683
6684
6685
6686
 
6687
6688
6689
6690
 
6691
6692
6693
6694
 
6695
6696
6697
 
 
 
 
 
 
 
 
6698
6699
 
6700
6701
6702
6703
6704
6705
6706
6707
 
6708
6709
6710
6711
 
6712
6713
6714
6715
 
6716
6717
6718
6719
 
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
 
 
 
 
 
 
 
 
 
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
 
6743
6744
6745
6746
 
6747
6748
6749
6750
 
6751
6752
6753
6754
 
6755
6756
6757
6758
 
6759
6760
6761
6762
 
6763
6764
6765
6766
 
6767
6768
6769
6770
 
6771
6772
6773
6774
 
6775
6776
6777
6778
 
6779
6780
6781
6782
 
6783
6784
6785
6786
 
6787
6788
6789
6790
 
6791
6792
6793
6794
 
6795
6796
6797
6798
 
6799
6800
6801
6802
 
6803
6804
6805
6806
 
6807
6808
6809
6810
6811
6812
6813
6814
 
 
 
 
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
 
 
 
 
 
 
 
 
 
 
 
6832
6833
6834
 
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6850
6851
6852
6853
 
6854
6855
6856
6857
 
6858
6859
6860
6861
 
6862
6863
6864
6865
6866
 
6867
6868
6869
6870
 
6871
6872
6873
6874
6875
 
6876
6877
6878
6879
 
6880
6881
6882
6883
6884
 
6885
6886
6887
6888
 
6889
6890
6891
6892
6893
 
6894
6895
6896
6897
 
6898
6899
6900
6901
6902
 
6903
6904
6905
6906
6907
 
6908
6909
6910
6911
 
6912
6913
6914
6915
 
6916
6917
6918
 
6922
6923
6924
 
 
 
 
6925
6926
6927
 
7807
7808
7809
 
 
 
 
 
 
 
7810
7811
7812
 
8546
8547
8548
8549
8550
8551
8552
8553
8554
8555
 
8807
8808
8809
 
 
 
 
8810
8811
8812
 
8908
8909
8910
 
 
 
 
8911
8912
8913
 
10505
10506
10507
 
 
 
 
10508
10509
10510
 
8
9
10
 
 
 
11
12
13
14
15
16
17
 
18
19
20
21
 
26
27
28
 
29
30
31
32
33
 
 
 
34
35
36
37
38
39
 
64
65
66
 
67
68
69
70
 
195
196
197
 
 
 
198
199
200
201
202
203
 
291
292
293
 
294
295
296
297
 
306
307
308
 
309
310
311
312
 
565
566
567
 
568
569
570
571
572
 
573
574
575
576
577
 
578
579
580
581
 
700
701
702
 
703
704
705
706
 
950
951
952
 
953
954
955
956
 
978
979
980
 
 
981
982
983
984
985
986
987
988
 
989
990
991
992
993
 
994
995
996
997
 
1073
1074
1075
 
1076
1077
1078
1079
 
1080
1081
1082
1083
 
1118
1119
1120
 
1121
1122
1123
1124
 
1283
1284
1285
 
 
 
 
 
1286
1287
1288
1289
1290
1291
1292
 
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
 
1411
1412
1413
 
1414
1415
1416
1417
 
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
 
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
 
1990
1991
1992
 
 
1993
1994
1995
1996
1997
 
2008
2009
2010
 
2011
2012
2013
2014
 
2029
2030
2031
 
2032
2033
2034
2035
2036
2037
 
2038
2039
2040
2041
 
2042
2043
2044
2045
 
2470
2471
2472
 
2473
2474
2475
2476
 
2892
2893
2894
 
2895
2896
2897
2898
2899
 
2900
2901
2902
2903
 
2955
2956
2957
 
2958
2959
2960
2961
 
2964
2965
2966
 
2967
2968
2969
2970
 
3007
3008
3009
 
3010
3011
3012
3013
 
3020
3021
3022
 
3023
3024
3025
3026
 
3453
3454
3455
 
3456
3457
3458
3459
 
3460
3461
3462
3463
3464
 
3465
3466
3467
3468
 
4648
4649
4650
 
 
4651
4652
4653
4654
4655
 
5468
5469
5470
 
5471
5472
5473
5474
 
5475
5476
5477
5478
 
5479
5480
5481
5482
5483
 
5484
5485
5486
5487
5488
 
5489
5490
5491
5492
5493
 
5494
5495
5496
5497
5498
 
5499
5500
5501
5502
5503
 
5504
5505
5506
5507
5508
 
5509
5510
5511
5512
5513
 
5514
5515
5516
5517
 
5622
5623
5624
 
5625
5626
5627
5628
 
5629
5630
5631
5632
 
6678
6679
6680
 
6681
6682
6683
6684
 
6685
6686
6687
6688
 
6689
6690
6691
6692
 
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
 
6706
6707
6708
6709
 
 
 
 
 
6710
6711
6712
6713
 
6714
6715
6716
6717
 
6718
6719
6720
6721
 
6722
6723
6724
6725
 
 
 
 
6726
6727
6728
 
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
 
 
 
 
 
 
 
 
 
6741
6742
6743
6744
 
6745
6746
6747
6748
 
6749
6750
6751
6752
 
6753
6754
6755
6756
 
6757
6758
6759
6760
 
6761
6762
6763
6764
 
6765
6766
6767
6768
 
6769
6770
6771
6772
 
6773
6774
6775
6776
 
6777
6778
6779
6780
 
6781
6782
6783
6784
 
6785
6786
6787
6788
 
6789
6790
6791
6792
 
6793
6794
6795
6796
 
6797
6798
6799
6800
 
6801
6802
6803
6804
 
6805
6806
6807
6808
 
 
 
 
6809
6810
6811
6812
6813
6814
6815
6816
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
 
6835
6836
6837
 
 
 
 
 
 
 
 
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
 
6857
6858
6859
6860
 
6861
6862
6863
6864
 
6865
6866
6867
6868
6869
 
6870
6871
6872
6873
 
6874
6875
6876
6877
6878
 
6879
6880
6881
6882
 
6883
6884
6885
6886
6887
 
6888
6889
6890
6891
 
6892
6893
6894
6895
6896
 
6897
6898
6899
6900
 
6901
6902
6903
6904
6905
 
6906
6907
6908
6909
6910
 
6911
6912
6913
6914
 
6915
6916
6917
6918
 
6919
6920
6921
6922
 
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
 
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
 
8561
8562
8563
 
 
 
 
8564
8565
8566
 
8818
8819
8820
8821
8822
8823
8824
8825
8826
8827
 
8923
8924
8925
8926
8927
8928
8929
8930
8931
8932
 
10524
10525
10526
10527
10528
10529
10530
10531
10532
10533
@@ -8,14 +8,14 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2011-02-27 13:57-0300\n" -"PO-Revision-Date: 2010-11-09 20:55+0000\n" -"Last-Translator: Tovim <Unknown>\n" +"POT-Creation-Date: 2011-02-28 02:58-0300\n" +"PO-Revision-Date: 2011-02-28 21:50+0000\n" +"Last-Translator: Wagner Bruna <Unknown>\n"  "Language-Team: Czech <kde-i18n-doc@kde.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-28 04:40+0000\n" +"X-Launchpad-Export-Date: 2011-03-01 04:44+0000\n"  "X-Generator: Launchpad (build 12351)\n"    #: TortoiseHgOverlayServer.py:50 @@ -26,14 +26,14 @@
 msgid "Exit"  msgstr "Ukončit"   -#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:281 +#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:286  #: tortoisehg/hgtk/gdialog.py:505  msgid "About"  msgstr "O programu"   -#: tortoisehg/hgqt/about.py:60 tortoisehg/hgtk/about.py:79 -msgid "Copyright 2008-2010 Steve Borho and others" -msgstr "Copyright 2008-2010 Steve Borho a další" +#: tortoisehg/hgqt/about.py:60 +msgid "Copyright 2008-2011 Steve Borho and others" +msgstr ""    #: tortoisehg/hgqt/about.py:65 tortoisehg/hgtk/about.py:42  msgid "Several icons are courtesy of the TortoiseSVN project" @@ -64,7 +64,7 @@
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"  msgstr ""   -#: tortoisehg/hgqt/about.py:192 tortoisehg/hgtk/about.py:70 +#: tortoisehg/hgqt/about.py:189 tortoisehg/hgtk/about.py:70  msgid "A new version of TortoiseHg is ready for download!"  msgstr "Nová verze TortoiseHg je připravena ke stažení"   @@ -195,9 +195,9 @@
 #: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:516  #: tortoisehg/hgqt/commit.py:523 tortoisehg/hgqt/commit.py:550  #: tortoisehg/hgqt/commit.py:563 tortoisehg/hgqt/compress.py:150 -#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:163 -#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgqt/merge.py:392 -#: tortoisehg/hgqt/merge.py:449 tortoisehg/hgqt/rebase.py:214 +#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:165 +#: tortoisehg/hgqt/merge.py:358 tortoisehg/hgqt/merge.py:391 +#: tortoisehg/hgqt/merge.py:450 tortoisehg/hgqt/rebase.py:214  #: tortoisehg/hgqt/rebase.py:235 tortoisehg/hgqt/rename.py:104  #: tortoisehg/hgqt/repotreeitem.py:283 tortoisehg/hgqt/resolve.py:317  #: tortoisehg/hgqt/settings.py:653 tortoisehg/hgqt/settings.py:751 @@ -291,7 +291,7 @@
 msgstr "Anulovaná revize: "    #: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:84 -#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:309 +#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:308  #: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169  #: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:135  #: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64 @@ -306,7 +306,7 @@
 msgid "Commit backout before merging with current working parent"  msgstr "Před sloučením s rodičem aktuální revize komitujte zrušení změny"   -#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:326 +#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:325  #: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:898  #: tortoisehg/hgqt/update.py:97  msgid "Automatically resolve merge conflicts where possible" @@ -565,17 +565,17 @@
 msgid "Add or remove patches must be merged in the working directory"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:430 tortoisehg/hgqt/status.py:128 +#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128  #: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475  msgid "All"  msgstr "Vše"   -#: tortoisehg/hgqt/chunks.py:434 tortoisehg/hgqt/qscilib.py:194 +#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/qscilib.py:194  #: tortoisehg/hgqt/status.py:132  msgid "None"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:490 +#: tortoisehg/hgqt/chunks.py:491  #, python-format  msgid "Chunks selected: %d / %d"  msgstr "" @@ -700,7 +700,7 @@
 msgid "Terminated"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:716 +#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:718  #: tortoisehg/hgtk/p4pending.py:101  msgid "Finished"  msgstr "Ukončeno" @@ -950,7 +950,7 @@
 msgid "Compress"  msgstr ""   -#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:257 +#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:259  #: tortoisehg/hgqt/rebase.py:104  msgid "Checking..."  msgstr "" @@ -978,20 +978,20 @@
 msgid "Compress is complete, old history untouched"  msgstr ""   -#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:358 -#: tortoisehg/hgqt/merge.py:391 tortoisehg/hgqt/merge.py:448 +#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:357 +#: tortoisehg/hgqt/merge.py:390 tortoisehg/hgqt/merge.py:449  #: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751  #: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775  #: tortoisehg/hgtk/update.py:233  msgid "&Discard"  msgstr "&Zavrhnout"   -#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450 +#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451  #: tortoisehg/hgqt/rebase.py:215  msgid "Confirm Discard"  msgstr ""   -#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450 +#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451  #: tortoisehg/hgqt/rebase.py:215  msgid "Discard outstanding changes in working directory?"  msgstr "" @@ -1073,11 +1073,11 @@
 msgid "Output Log"  msgstr ""   -#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:285 +#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:290  msgid "Back"  msgstr ""   -#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:288 +#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:293  msgid "Forward"  msgstr ""   @@ -1118,7 +1118,7 @@
 msgid "Compare revisions of the selected file"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:506 +#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:502  #: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/util/menuthg.py:76  msgid "Visual Diff"  msgstr "Vizuální Diff" @@ -1283,11 +1283,10 @@
 msgid "Search"  msgstr "Hledat"   -#: tortoisehg/hgqt/grep.py:54 tortoisehg/hgqt/merge.py:264 -#: tortoisehg/hgqt/serve_ui.py:87 tortoisehg/hgtk/datamine.py:54 -#: tortoisehg/hgtk/hgcmd.py:46 tortoisehg/hgtk/history.py:448 -#: tortoisehg/hgtk/recovery.py:48 tortoisehg/hgtk/serve.py:65 -#: tortoisehg/hgtk/synch.py:53 +#: tortoisehg/hgqt/grep.py:54 tortoisehg/hgqt/serve_ui.py:87 +#: tortoisehg/hgtk/datamine.py:54 tortoisehg/hgtk/hgcmd.py:46 +#: tortoisehg/hgtk/history.py:448 tortoisehg/hgtk/recovery.py:48 +#: tortoisehg/hgtk/serve.py:65 tortoisehg/hgtk/synch.py:53  msgid "Stop"  msgstr "Stop"   @@ -1341,69 +1340,69 @@
 msgid "\"%s\" removed from path history"  msgstr ""   -#: tortoisehg/hgqt/grep.py:273 +#: tortoisehg/hgqt/grep.py:269  #, python-format  msgid "grep: invalid match pattern: %s\n"  msgstr ""   -#: tortoisehg/hgqt/grep.py:300 +#: tortoisehg/hgqt/grep.py:296  #, python-format  msgid "grep: %s\n"  msgstr ""   -#: tortoisehg/hgqt/grep.py:331 +#: tortoisehg/hgqt/grep.py:327  msgid "No matches found"  msgstr ""   -#: tortoisehg/hgqt/grep.py:333 tortoisehg/hgqt/revset.py:382 +#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:382  #, python-format  msgid "%d matches found"  msgstr ""   -#: tortoisehg/hgqt/grep.py:397 tortoisehg/hgqt/grep.py:410 -#: tortoisehg/hgqt/grep.py:442 +#: tortoisehg/hgqt/grep.py:393 tortoisehg/hgqt/grep.py:406 +#: tortoisehg/hgqt/grep.py:438  msgid "Searching"  msgstr ""   -#: tortoisehg/hgqt/grep.py:397 +#: tortoisehg/hgqt/grep.py:393  msgid "history"  msgstr ""   -#: tortoisehg/hgqt/grep.py:409 +#: tortoisehg/hgqt/grep.py:405  msgid "Interrupted"  msgstr ""   -#: tortoisehg/hgqt/grep.py:443 +#: tortoisehg/hgqt/grep.py:439  msgid "files"  msgstr ""   -#: tortoisehg/hgqt/grep.py:504 +#: tortoisehg/hgqt/grep.py:500  msgid "View file"  msgstr ""   -#: tortoisehg/hgqt/grep.py:505 +#: tortoisehg/hgqt/grep.py:501  msgid "View Changeset"  msgstr ""   -#: tortoisehg/hgqt/grep.py:507 +#: tortoisehg/hgqt/grep.py:503  msgid "Annotate file"  msgstr ""   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:364 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:364  #: tortoisehg/hgtk/datamine.py:654  msgid "File"  msgstr "Soubor"   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:652 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:652  msgid "Line"  msgstr "Řádek"   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:363 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:363  #: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441  msgid "Rev"  msgstr "Rev"   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgqt/settings.py:451 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgqt/settings.py:451  #: tortoisehg/hgqt/settings.py:551 tortoisehg/hgqt/settings.py:590  #: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655  #: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502 @@ -1412,7 +1411,7 @@
 msgid "User"  msgstr "Uživatel"   -#: tortoisehg/hgqt/grep.py:651 +#: tortoisehg/hgqt/grep.py:647  msgid "Match Text"  msgstr ""   @@ -1849,76 +1848,76 @@
 msgid "&Exit"  msgstr ""   -#: tortoisehg/hgqt/merge.py:218 tortoisehg/hgqt/revpanel.py:156 +#: tortoisehg/hgqt/merge.py:220 tortoisehg/hgqt/revpanel.py:156  #: tortoisehg/hgtk/merge.py:73  msgid "Not a head revision!"  msgstr "Bez čelní revize!"   -#: tortoisehg/hgqt/merge.py:225 +#: tortoisehg/hgqt/merge.py:227  msgid "Merge from (other revision)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:233 tortoisehg/hgtk/merge.py:47 +#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgtk/merge.py:47  #: tortoisehg/hgtk/merge.py:60  msgid "Unable to merge"  msgstr "Nelze sloučit"   -#: tortoisehg/hgqt/merge.py:234 +#: tortoisehg/hgqt/merge.py:236  msgid "Merge revision not specified or not found"  msgstr ""   -#: tortoisehg/hgqt/merge.py:239 +#: tortoisehg/hgqt/merge.py:241  msgid "Merge to (working directory)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:248 +#: tortoisehg/hgqt/merge.py:250  msgid "Working directory status"  msgstr ""   -#: tortoisehg/hgqt/merge.py:267 +#: tortoisehg/hgqt/merge.py:266  msgid "<a href=\"view\">View changes...</a>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:273 +#: tortoisehg/hgqt/merge.py:272  msgid ""  "The workding directory is already <b>merged</b>. <a "  "href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "  "existing merge."  msgstr ""   -#: tortoisehg/hgqt/merge.py:282 +#: tortoisehg/hgqt/merge.py:281  msgid ""  "Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "  "href=\"shelve\"><b>shelve</b></a> to patch, or <a "  "href=\"discard\"><b>discard</b></a> changes."  msgstr ""   -#: tortoisehg/hgqt/merge.py:295 +#: tortoisehg/hgqt/merge.py:294  msgid "Or use:"  msgstr ""   -#: tortoisehg/hgqt/merge.py:298 +#: tortoisehg/hgqt/merge.py:297  msgid "Force a merge with outstanding changes (-f/--force)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:319 tortoisehg/hgtk/merge.py:118 +#: tortoisehg/hgqt/merge.py:318 tortoisehg/hgtk/merge.py:118  msgid "Discard all changes from merge target (other) revision"  msgstr "Zavrhnout všechny změny z cílové revize sloučení"   -#: tortoisehg/hgqt/merge.py:339 tortoisehg/hgqt/update.py:223 +#: tortoisehg/hgqt/merge.py:338 tortoisehg/hgqt/update.py:223  #: tortoisehg/hgtk/update.py:237  msgid "&Merge"  msgstr "&Sloučit"   -#: tortoisehg/hgqt/merge.py:343 +#: tortoisehg/hgqt/merge.py:342  msgid "Merge another revision to the working directory"  msgstr ""   -#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:215 +#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgtk/merge.py:215  msgid "Confirm Discard Changes"  msgstr ""   -#: tortoisehg/hgqt/merge.py:361 tortoisehg/hgtk/merge.py:216 +#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:216  #, python-format  msgid ""  "The changes from revision %s and all unmerged parents will be discarded.\n" @@ -1926,62 +1925,62 @@
 "Are you sure this is what you want to do?"  msgstr ""   +#: tortoisehg/hgqt/merge.py:370 +msgid "Merging..." +msgstr "" +  #: tortoisehg/hgqt/merge.py:371 -msgid "Merging..." -msgstr "" - -#: tortoisehg/hgqt/merge.py:372  msgid "All conflicting files will be marked unresolved."  msgstr ""   +#: tortoisehg/hgqt/merge.py:388 +msgid "Cancel merge and discard changes?" +msgstr "" +  #: tortoisehg/hgqt/merge.py:389 -msgid "Cancel merge and discard changes?" -msgstr "" - -#: tortoisehg/hgqt/merge.py:390  msgid "Discard unfinished local changes and restart merge?"  msgstr ""   -#: tortoisehg/hgqt/merge.py:393 +#: tortoisehg/hgqt/merge.py:392  msgid "Confirm Clean Up"  msgstr ""   +#: tortoisehg/hgqt/merge.py:395 +msgid "Canceling merge...\n" +msgstr "" +  #: tortoisehg/hgqt/merge.py:396 -msgid "Canceling merge...\n" -msgstr "" - -#: tortoisehg/hgqt/merge.py:397  msgid "(Please close any running merge tool)\n"  msgstr ""   -#: tortoisehg/hgqt/merge.py:415 +#: tortoisehg/hgqt/merge.py:416  msgid "Merge failed"  msgstr ""   -#: tortoisehg/hgqt/merge.py:415 +#: tortoisehg/hgqt/merge.py:416  msgid "Returning to first page"  msgstr ""   -#: tortoisehg/hgqt/merge.py:466 +#: tortoisehg/hgqt/merge.py:467  msgid "Rename Patch"  msgstr ""   -#: tortoisehg/hgqt/merge.py:467 +#: tortoisehg/hgqt/merge.py:468  msgid "Input a new patch name:"  msgstr ""   -#: tortoisehg/hgqt/merge.py:475 +#: tortoisehg/hgqt/merge.py:476  #, python-format  msgid ""  "The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>. <a "  "href=\"rename:%(new)s\"><b>Rename</b></a> again?"  msgstr ""   -#: tortoisehg/hgqt/merge.py:522 +#: tortoisehg/hgqt/merge.py:523  msgid "<b>Uncommitted local changes are detected</b>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:527 tortoisehg/hgtk/recovery.py:52 +#: tortoisehg/hgqt/merge.py:528 tortoisehg/hgtk/recovery.py:52  msgid "Clean"  msgstr "Čistit"   @@ -1991,8 +1990,8 @@
 msgid "Parents"  msgstr "Rodiče"   -#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:521 -#: tortoisehg/hgqt/repomodel.py:523 tortoisehg/hgqt/shelve.py:24 +#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:514 +#: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24  #: tortoisehg/hgqt/thgimport.py:87  msgid "Working Directory"  msgstr "" @@ -2009,7 +2008,7 @@
 msgid "Merge "  msgstr "Sloučit "   -#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:229 +#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:231  msgid "&Commit"  msgstr ""   @@ -2030,17 +2029,17 @@
 msgid "Please wait while committing merged files."  msgstr ""   -#: tortoisehg/hgqt/merge.py:672 +#: tortoisehg/hgqt/merge.py:674  msgid ""  "There were <b>merge conflicts</b> that must be <a "  "href=\"resolve\"><b>resolved</b></a>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:677 +#: tortoisehg/hgqt/merge.py:679  msgid "No merge conflicts, ready to commit"  msgstr ""   -#: tortoisehg/hgqt/merge.py:729 +#: tortoisehg/hgqt/merge.py:731  msgid "Merge changeset"  msgstr ""   @@ -2471,7 +2470,7 @@
 msgid "Delete"  msgstr ""   -#: tortoisehg/hgqt/qqueue.py:100 tortoisehg/hgqt/workbench.py:271 +#: tortoisehg/hgqt/qqueue.py:100  msgid "Purge"  msgstr ""   @@ -2893,12 +2892,12 @@
 msgid "Include all ancestors"  msgstr ""   -#: tortoisehg/hgqt/repomodel.py:189 +#: tortoisehg/hgqt/repomodel.py:188  #, python-format  msgid "filling (%d)"  msgstr ""   -#: tortoisehg/hgqt/repomodel.py:515 +#: tortoisehg/hgqt/repomodel.py:508  msgid "Mercurial User"  msgstr ""   @@ -2956,7 +2955,7 @@
 msgstr ""    #: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:451 -#: tortoisehg/hgqt/workbench.py:274 +#: tortoisehg/hgqt/workbench.py:279  msgid "Explore"  msgstr ""   @@ -2965,7 +2964,7 @@
 msgstr ""    #: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:452 -#: tortoisehg/hgqt/workbench.py:277 +#: tortoisehg/hgqt/workbench.py:282  msgid "Terminal"  msgstr ""   @@ -3008,7 +3007,7 @@
 msgid "default"  msgstr ""   -#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:363 +#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362  #: tortoisehg/hgqt/sync.py:198 tortoisehg/hgqt/webconf.py:266  msgid "Path"  msgstr "" @@ -3021,7 +3020,7 @@
 msgid "Failed to add repository"  msgstr ""   -#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:576 +#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:581  #, python-format  msgid "%s is not a valid repository"  msgstr "" @@ -3454,16 +3453,16 @@
 msgid "&Quit"  msgstr "&Skončit"   -#: tortoisehg/hgqt/resolve.py:363 +#: tortoisehg/hgqt/resolve.py:362  msgid "Ext"  msgstr ""   -#: tortoisehg/hgqt/resolve.py:363 tortoisehg/hgqt/thgimport.py:85 +#: tortoisehg/hgqt/resolve.py:362 tortoisehg/hgqt/thgimport.py:85  #: tortoisehg/hgtk/thgimport.py:110  msgid "Repository"  msgstr "Repozitář"   -#: tortoisehg/hgqt/resolve.py:406 +#: tortoisehg/hgqt/resolve.py:405  msgid "<default>"  msgstr ""   @@ -4649,8 +4648,8 @@
 "nastaveny na neanglický jazyk. Toto nastavení je použito v dialozích "  "procedur Merge, Tag a Backout (odstranit změnu). Implicitně: False"   -#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgqt/workbench.py:252 -#: tortoisehg/hgtk/thgconfig.py:179 tortoisehg/util/menuthg.py:55 +#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgtk/thgconfig.py:179 +#: tortoisehg/util/menuthg.py:55  msgid "Web Server"  msgstr "Web"   @@ -5469,50 +5468,50 @@
 msgid "Size (KB)"  msgstr ""   -#: tortoisehg/hgqt/status.py:667 +#: tortoisehg/hgqt/status.py:684  msgid ", resolved merge"  msgstr ""   -#: tortoisehg/hgqt/status.py:669 +#: tortoisehg/hgqt/status.py:686  msgid ", unresolved merge"  msgstr ""   -#: tortoisehg/hgqt/status.py:681 +#: tortoisehg/hgqt/status.py:698  #, python-format  msgid "%s is modified"  msgstr ""   -#: tortoisehg/hgqt/status.py:683 +#: tortoisehg/hgqt/status.py:700  #, python-format  msgid "%s is added"  msgstr ""   -#: tortoisehg/hgqt/status.py:685 +#: tortoisehg/hgqt/status.py:702  #, python-format  msgid "%s is removed"  msgstr ""   -#: tortoisehg/hgqt/status.py:687 +#: tortoisehg/hgqt/status.py:704  #, python-format  msgid "%s is not tracked (unknown)"  msgstr ""   -#: tortoisehg/hgqt/status.py:689 +#: tortoisehg/hgqt/status.py:706  #, python-format  msgid "%s is missing!"  msgstr ""   -#: tortoisehg/hgqt/status.py:691 +#: tortoisehg/hgqt/status.py:708  #, python-format  msgid "%s is ignored"  msgstr ""   -#: tortoisehg/hgqt/status.py:693 +#: tortoisehg/hgqt/status.py:710  #, python-format  msgid "%s is not modified (clean)"  msgstr ""   -#: tortoisehg/hgqt/status.py:695 +#: tortoisehg/hgqt/status.py:712  #, python-format  msgid "%s is a dirty subrepo"  msgstr "" @@ -5623,11 +5622,11 @@
 msgid "A terminal shell cannot be opened for remote"  msgstr ""   -#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:676 +#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:681  msgid "No shell configured"  msgstr ""   -#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:677 +#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:682  msgid "A terminal shell must be configured"  msgstr ""   @@ -6679,156 +6678,153 @@
 msgid "Save"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:39 tortoisehg/hgqt/workbench.py:398 +#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:403  msgid "TortoiseHg Workbench"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:64 +#: tortoisehg/hgqt/workbench.py:62  msgid "New Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:66 tortoisehg/hgqt/workbench.py:177 +#: tortoisehg/hgqt/workbench.py:64 tortoisehg/hgqt/workbench.py:183  msgid "Clone Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:68 +#: tortoisehg/hgqt/workbench.py:66  msgid "Open Repository..."  msgstr ""   +#: tortoisehg/hgqt/workbench.py:98 +msgid "&File" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:99 +msgid "&View" +msgstr "" +  #: tortoisehg/hgqt/workbench.py:100 -msgid "&File" +msgid "&Repository"  msgstr ""    #: tortoisehg/hgqt/workbench.py:101 -msgid "&View" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:102 -msgid "&Repository" +msgid "&Help"  msgstr ""    #: tortoisehg/hgqt/workbench.py:103 -msgid "&Help" +msgid "Edit Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:105 -msgid "Edit Toolbar" +msgid "Dock Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:107 -msgid "Dock Toolbar" +msgid "Sync Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:109 -msgid "Sync Toolbar" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:111  msgid "Task Toolbar"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:175 +#: tortoisehg/hgqt/workbench.py:176 +msgid "&Open Repository..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:178 +msgid "&Close Repository" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:181  msgid "&New Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:180 -msgid "&Open Repository..." -msgstr "" - -#: tortoisehg/hgqt/workbench.py:182 -msgid "&Close Repository" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:185 +#: tortoisehg/hgqt/workbench.py:187  msgid "&Settings..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:188 +#: tortoisehg/hgqt/workbench.py:190  msgid "E&xit"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:192 +#: tortoisehg/hgqt/workbench.py:193  msgid "Show Repository Registry"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:199 +#: tortoisehg/hgqt/workbench.py:200  msgid "Show Paths"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:203 +#: tortoisehg/hgqt/workbench.py:204  msgid "Show Output &Log"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:210 +#: tortoisehg/hgqt/workbench.py:211  msgid "Choose Log Columns..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:213 +#: tortoisehg/hgqt/workbench.py:214  msgid "Save Open Repositories On Exit"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:228 +#: tortoisehg/hgqt/workbench.py:230  msgid "Revision &Details"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:230 +#: tortoisehg/hgqt/workbench.py:232  msgid "S&ynchronize"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:231 +#: tortoisehg/hgqt/workbench.py:233  msgid "&Manifest"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:232 +#: tortoisehg/hgqt/workbench.py:234  msgid "&Search"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:234 +#: tortoisehg/hgqt/workbench.py:236  msgid "Patch &Queue"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:236 +#: tortoisehg/hgqt/workbench.py:238  msgid "&Patch Branch"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:239 tortoisehg/hgtk/status.py:1320 +#: tortoisehg/hgqt/workbench.py:241 tortoisehg/hgtk/status.py:1320  msgid "&Refresh"  msgstr "&Obnovit"   -#: tortoisehg/hgqt/workbench.py:242 +#: tortoisehg/hgqt/workbench.py:244  msgid "Refresh current repository"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:243 +#: tortoisehg/hgqt/workbench.py:245  msgid "Refresh &Task Tab"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:246 +#: tortoisehg/hgqt/workbench.py:248  msgid "Refresh only the current task tab"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:248 tortoisehg/hgtk/history.py:1496 -msgid "Load all" -msgstr "Načíst vše" -  #: tortoisehg/hgqt/workbench.py:250 +msgid "Load all revisions" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:252  msgid "Load all revisions into graph"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:254 tortoisehg/hgtk/history.py:1324 -msgid "Bisect" -msgstr "Bisect" - -#: tortoisehg/hgqt/workbench.py:257 tortoisehg/hgtk/gdialog.py:493 -#: tortoisehg/hgtk/history.py:291 tortoisehg/hgtk/synch.py:83 -#: tortoisehg/hgtk/thgshelve.py:72 tortoisehg/hgtk/thgshelve.py:145 -#: tortoisehg/hgtk/thgshelve.py:151 tortoisehg/hgtk/thgshelve.py:159 -msgid "Shelve" -msgstr "Shelve" - -#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/thgimport.py:164 -msgid "Import" -msgstr "Import" +#: tortoisehg/hgqt/workbench.py:254 +msgid "Web Server..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:257 +msgid "Shelve..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/history.py:458 +msgid "Import..." +msgstr "Importovat..."    #: tortoisehg/hgqt/workbench.py:262 tortoisehg/hgtk/recovery.py:68  msgid "Verify" @@ -6839,80 +6835,88 @@
 msgstr "Obnovit"    #: tortoisehg/hgqt/workbench.py:267 -msgid "Resolve" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:269 -msgid "Rollback/Undo" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:293 +msgid "Resolve..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:270 +msgid "Rollback/Undo..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:273 +msgid "Purge..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:276 +msgid "Bisect..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:298  msgid "Filter Toolbar"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:296 +#: tortoisehg/hgqt/workbench.py:301  msgid "Filter graph with revision sets or branches"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:298 +#: tortoisehg/hgqt/workbench.py:303  msgid "Workbench Toolbars"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:305 tortoisehg/hgtk/history.py:438 +#: tortoisehg/hgqt/workbench.py:310 tortoisehg/hgtk/history.py:438  #: tortoisehg/hgtk/history.py:1861 tortoisehg/hgtk/synch.py:57  msgid "Incoming"  msgstr "Příchozí"   -#: tortoisehg/hgqt/workbench.py:306 +#: tortoisehg/hgqt/workbench.py:311  msgid "Check for incoming changes from default pull target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:308 tortoisehg/hgtk/history.py:440 +#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/history.py:440  #: tortoisehg/hgtk/history.py:1991  msgid "Pull"  msgstr "Pull"   -#: tortoisehg/hgqt/workbench.py:309 +#: tortoisehg/hgqt/workbench.py:314  msgid "Pull incoming changes from default pull target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/history.py:442 +#: tortoisehg/hgqt/workbench.py:316 tortoisehg/hgtk/history.py:442  #: tortoisehg/hgtk/history.py:2034 tortoisehg/hgtk/synch.py:68  msgid "Outgoing"  msgstr "Odchozí"   -#: tortoisehg/hgqt/workbench.py:312 +#: tortoisehg/hgqt/workbench.py:317  msgid "Detect outgoing changes to default push target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:314 tortoisehg/hgtk/history.py:444 +#: tortoisehg/hgqt/workbench.py:319 tortoisehg/hgtk/history.py:444  #: tortoisehg/hgtk/history.py:2074 tortoisehg/hgtk/synch.py:73  msgid "Push"  msgstr "Push"   -#: tortoisehg/hgqt/workbench.py:315 +#: tortoisehg/hgqt/workbench.py:320  msgid "Push outgoing changes to default push target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:400 +#: tortoisehg/hgqt/workbench.py:405  #, python-format  msgid "%s - TortoiseHg Workbench - %s"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:403 +#: tortoisehg/hgqt/workbench.py:408  #, python-format  msgid "%s - TortoiseHg Workbench"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:554 +#: tortoisehg/hgqt/workbench.py:559  msgid "Select repository directory to open"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:575 +#: tortoisehg/hgqt/workbench.py:580  msgid "Failed to open repository"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:698 +#: tortoisehg/hgqt/workbench.py:703  #, python-format  msgid "Hg file log viewer [%s] - %s"  msgstr "" @@ -6922,6 +6926,10 @@
 msgid "(version %s)"  msgstr "(verze %s)"   +#: tortoisehg/hgtk/about.py:79 +msgid "Copyright 2008-2010 Steve Borho and others" +msgstr "Copyright 2008-2010 Steve Borho a další" +  #: tortoisehg/hgtk/about.py:95  #, python-format  msgid "with %s" @@ -7807,6 +7815,13 @@
 msgid "Recovery"  msgstr "Obnova"   +#: tortoisehg/hgtk/gdialog.py:493 tortoisehg/hgtk/history.py:291 +#: tortoisehg/hgtk/synch.py:83 tortoisehg/hgtk/thgshelve.py:72 +#: tortoisehg/hgtk/thgshelve.py:145 tortoisehg/hgtk/thgshelve.py:151 +#: tortoisehg/hgtk/thgshelve.py:159 +msgid "Shelve" +msgstr "Shelve" +  #: tortoisehg/hgtk/gdialog.py:500  msgid "_Help"  msgstr "Nápověda" @@ -8546,10 +8561,6 @@
 msgid "Reject Bundle"  msgstr "Odmítnout svazek"   -#: tortoisehg/hgtk/history.py:458 -msgid "Import..." -msgstr "Importovat..." -  #: tortoisehg/hgtk/history.py:460  msgid "Add Bundle..."  msgstr "Přidat svazek..." @@ -8807,6 +8818,10 @@
 msgid "Transp_lant to Local"  msgstr "Přemístit k aktuální"   +#: tortoisehg/hgtk/history.py:1324 +msgid "Bisect" +msgstr "Bisect" +  #: tortoisehg/hgtk/history.py:1332  msgid "_Export Patch..."  msgstr "Export oprávky..." @@ -8908,6 +8923,10 @@
 msgstr "načíst další revize"    #: tortoisehg/hgtk/history.py:1496 +msgid "Load all" +msgstr "Načíst vše" + +#: tortoisehg/hgtk/history.py:1496  msgid "load all revisions"  msgstr "načíst všechny revize"   @@ -10505,6 +10524,10 @@
 msgid "Skipped saving path with no alias"  msgstr "Uložení cesty bez aliasu přeskočeno"   +#: tortoisehg/hgtk/thgimport.py:164 +msgid "Import" +msgstr "Import" +  #: tortoisehg/hgtk/thgimport.py:184  msgid "Imported successfully"  msgstr "Úspěšně importováno"
Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_AU.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_GB.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​et.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fa.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hu.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nb.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nn.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​oc.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sv.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​tr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 64 Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
 
7
8
9
10
11
12
 
 
 
13
14
15
16
17
 
18
19
20
 
25
26
27
28
 
29
30
31
32
33
34
35
 
 
 
36
37
38
 
63
64
65
66
 
67
68
69
 
194
195
196
197
198
199
 
 
 
200
201
202
 
293
294
295
296
 
297
298
299
 
308
309
310
311
 
312
313
314
 
382
383
384
385
 
386
387
388
389
 
390
391
392
393
 
394
395
396
 
400
401
402
403
 
404
405
406
407
 
408
409
410
411
 
412
413
414
 
421
422
423
424
 
425
426
427
 
429
430
431
432
 
433
434
435
436
437
 
438
439
440
441
 
442
443
444
445
 
446
447
448
 
452
453
454
455
 
456
457
458
459
460
 
461
462
463
 
468
469
470
471
 
472
473
474
475
476
 
477
478
479
 
493
494
495
496
 
497
498
499
500
 
501
502
503
504
 
505
506
507
508
509
 
510
511
512
 
514
515
516
517
 
518
519
520
521
 
522
523
524
525
526
 
527
528
529
 
533
534
535
536
 
537
538
539
 
541
542
543
544
 
545
546
547
548
 
549
550
551
 
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
 
628
629
630
631
 
632
633
634
635
636
 
637
638
639
 
642
643
644
645
 
646
647
648
 
702
703
704
705
 
706
707
708
 
952
953
954
955
 
956
957
958
 
980
981
982
983
984
 
 
985
986
987
988
989
990
991
 
992
993
994
995
996
 
997
998
999
 
1075
1076
1077
1078
 
1079
1080
1081
1082
 
1083
1084
1085
 
1120
1121
1122
1123
 
1124
1125
1126
 
1285
1286
1287
1288
1289
1290
1291
1292
 
 
 
 
1293
1294
1295
 
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
 
1414
1415
1416
1417
 
1418
1419
1420
 
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
 
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
 
1982
1983
1984
1985
1986
 
 
1987
1988
1989
 
2000
2001
2002
2003
 
2004
2005
2006
 
2021
2022
2023
2024
 
2025
2026
2027
2028
2029
2030
 
2031
2032
2033
2034
 
2035
2036
2037
 
2462
2463
2464
2465
 
2466
2467
2468
 
2884
2885
2886
2887
 
2888
2889
2890
2891
2892
 
2893
2894
2895
 
2947
2948
2949
2950
 
2951
2952
2953
 
2956
2957
2958
2959
 
2960
2961
2962
 
2999
3000
3001
3002
 
3003
3004
3005
 
3012
3013
3014
3015
 
3016
3017
3018
 
3445
3446
3447
3448
 
3449
3450
3451
3452
 
3453
3454
3455
3456
3457
 
3458
3459
3460
 
4030
4031
4032
4033
 
4034
4035
4036
 
4615
4616
4617
4618
4619
 
 
4620
4621
4622
 
5413
5414
5415
5416
 
5417
5418
5419
5420
 
5421
5422
5423
5424
 
5425
5426
5427
5428
5429
 
5430
5431
5432
5433
5434
 
5435
5436
5437
5438
5439
 
5440
5441
5442
5443
5444
 
5445
5446
5447
5448
5449
 
5450
5451
5452
5453
5454
 
5455
5456
5457
5458
5459
 
5460
5461
5462
 
5567
5568
5569
5570
 
5571
5572
5573
5574
 
5575
5576
5577
 
6173
6174
6175
6176
 
6177
6178
6179
6180
6181
 
6182
6183
6184
6185
6186
 
6187
6188
6189
 
6623
6624
6625
6626
 
6627
6628
6629
6630
 
6631
6632
6633
6634
 
6635
6636
6637
6638
 
6639
6640
6641
 
 
 
 
 
 
 
 
6642
6643
 
6644
6645
6646
6647
6648
6649
6650
6651
 
6652
6653
6654
6655
 
6656
6657
6658
6659
 
6660
6661
6662
6663
 
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
 
 
 
 
 
 
 
 
 
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
 
6687
6688
6689
6690
 
6691
6692
6693
6694
 
6695
6696
6697
6698
 
6699
6700
6701
6702
 
6703
6704
6705
6706
 
6707
6708
6709
6710
 
6711
6712
6713
6714
 
6715
6716
6717
6718
 
6719
6720
6721
6722
 
6723
6724
6725
6726
 
6727
6728
6729
6730
 
6731
6732
6733
6734
 
6735
6736
6737
6738
 
6739
6740
6741
6742
 
6743
6744
6745
6746
 
6747
6748
6749
6750
 
6751
6752
6753
6754
6755
6756
6757
6758
 
 
 
 
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
 
 
 
 
 
 
 
 
 
 
 
6776
6777
6778
 
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6794
6795
6796
6797
 
6798
6799
6800
6801
 
6802
6803
6804
6805
 
6806
6807
6808
6809
6810
 
6811
6812
6813
6814
 
6815
6816
6817
6818
6819
 
6820
6821
6822
6823
 
6824
6825
6826
6827
6828
 
6829
6830
6831
6832
 
6833
6834
6835
6836
6837
 
6838
6839
6840
6841
 
6842
6843
6844
6845
6846
 
6847
6848
6849
6850
6851
 
6852
6853
6854
6855
 
6856
6857
6858
6859
 
6860
6861
6862
 
6866
6867
6868
 
 
 
 
6869
6870
6871
 
7519
7520
7521
7522
 
7523
7524
7525
 
7738
7739
7740
 
 
 
 
 
 
 
7741
7742
7743
 
7748
7749
7750
7751
 
7752
7753
7754
7755
 
7756
7757
7758
 
8082
8083
8084
8085
 
8086
8087
8088
 
8241
8242
8243
8244
 
8245
8246
8247
 
8298
8299
8300
8301
 
8302
8303
8304
 
8401
8402
8403
8404
 
8405
8406
8407
 
8471
8472
8473
8474
8475
8476
8477
8478
8479
8480
 
8501
8502
8503
8504
 
8505
8506
8507
 
8599
8600
8601
8602
 
8603
8604
8605
 
8607
8608
8609
8610
 
8611
8612
8613
 
8615
8616
8617
8618
 
8619
8620
8621
 
8639
8640
8641
8642
 
8643
8644
8645
 
8732
8733
8734
 
 
 
 
8735
8736
8737
 
8833
8834
8835
 
 
 
 
8836
8837
8838
 
10388
10389
10390
 
 
 
 
10391
10392
10393
 
11211
11212
11213
11214
 
11215
11216
11217
 
7
8
9
 
 
 
10
11
12
13
14
15
16
 
17
18
19
20
 
25
26
27
 
28
29
30
31
32
 
 
 
33
34
35
36
37
38
 
63
64
65
 
66
67
68
69
 
194
195
196
 
 
 
197
198
199
200
201
202
 
293
294
295
 
296
297
298
299
 
308
309
310
 
311
312
313
314
 
382
383
384
 
385
386
387
388
 
389
390
391
392
 
393
394
395
396
 
400
401
402
 
403
404
405
406
 
407
408
409
410
 
411
412
413
414
 
421
422
423
 
424
425
426
427
 
429
430
431
 
432
433
434
435
436
 
437
438
439
440
 
441
442
443
444
 
445
446
447
448
 
452
453
454
 
455
456
457
458
459
 
460
461
462
463
 
468
469
470
 
471
472
473
474
475
 
476
477
478
479
 
493
494
495
 
496
497
498
499
 
500
501
502
503
 
504
505
506
507
508
 
509
510
511
512
 
514
515
516
 
517
518
519
520
 
521
522
523
524
525
 
526
527
528
529
 
533
534
535
 
536
537
538
539
 
541
542
543
 
544
545
546
547
 
548
549
550
551
 
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
 
628
629
630
 
631
632
633
634
635
 
636
637
638
639
 
642
643
644
 
645
646
647
648
 
702
703
704
 
705
706
707
708
 
952
953
954
 
955
956
957
958
 
980
981
982
 
 
983
984
985
986
987
988
989
990
 
991
992
993
994
995
 
996
997
998
999
 
1075
1076
1077
 
1078
1079
1080
1081
 
1082
1083
1084
1085
 
1120
1121
1122
 
1123
1124
1125
1126
 
1285
1286
1287
 
 
 
 
 
1288
1289
1290
1291
1292
1293
1294
 
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
 
1413
1414
1415
 
1416
1417
1418
1419
 
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
 
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
 
1981
1982
1983
 
 
1984
1985
1986
1987
1988
 
1999
2000
2001
 
2002
2003
2004
2005
 
2020
2021
2022
 
2023
2024
2025
2026
2027
2028
 
2029
2030
2031
2032
 
2033
2034
2035
2036
 
2461
2462
2463
 
2464
2465
2466
2467
 
2883
2884
2885
 
2886
2887
2888
2889
2890
 
2891
2892
2893
2894
 
2946
2947
2948
 
2949
2950
2951
2952
 
2955
2956
2957
 
2958
2959
2960
2961
 
2998
2999
3000
 
3001
3002
3003
3004
 
3011
3012
3013
 
3014
3015
3016
3017
 
3444
3445
3446
 
3447
3448
3449
3450
 
3451
3452
3453
3454
3455
 
3456
3457
3458
3459
 
4029
4030
4031
 
4032
4033
4034
4035
 
4614
4615
4616
 
 
4617
4618
4619
4620
4621
 
5412
5413
5414
 
5415
5416
5417
5418
 
5419
5420
5421
5422
 
5423
5424
5425
5426
5427
 
5428
5429
5430
5431
5432
 
5433
5434
5435
5436
5437
 
5438
5439
5440
5441
5442
 
5443
5444
5445
5446
5447
 
5448
5449
5450
5451
5452
 
5453
5454
5455
5456
5457
 
5458
5459
5460
5461
 
5566
5567
5568
 
5569
5570
5571
5572
 
5573
5574
5575
5576
 
6172
6173
6174
 
6175
6176
6177
6178
6179
 
6180
6181
6182
6183
6184
 
6185
6186
6187
6188
 
6622
6623
6624
 
6625
6626
6627
6628
 
6629
6630
6631
6632
 
6633
6634
6635
6636
 
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
 
6650
6651
6652
6653
 
 
 
 
 
6654
6655
6656
6657
 
6658
6659
6660
6661
 
6662
6663
6664
6665
 
6666
6667
6668
6669
 
 
 
 
6670
6671
6672
 
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
 
 
 
 
 
 
 
 
 
6685
6686
6687
6688
 
6689
6690
6691
6692
 
6693
6694
6695
6696
 
6697
6698
6699
6700
 
6701
6702
6703
6704
 
6705
6706
6707
6708
 
6709
6710
6711
6712
 
6713
6714
6715
6716
 
6717
6718
6719
6720
 
6721
6722
6723
6724
 
6725
6726
6727
6728
 
6729
6730
6731
6732
 
6733
6734
6735
6736
 
6737
6738
6739
6740
 
6741
6742
6743
6744
 
6745
6746
6747
6748
 
6749
6750
6751
6752
 
 
 
 
6753
6754
6755
6756
6757
6758
6759
6760
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
 
6779
6780
6781
 
 
 
 
 
 
 
 
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
 
6801
6802
6803
6804
 
6805
6806
6807
6808
 
6809
6810
6811
6812
6813
 
6814
6815
6816
6817
 
6818
6819
6820
6821
6822
 
6823
6824
6825
6826
 
6827
6828
6829
6830
6831
 
6832
6833
6834
6835
 
6836
6837
6838
6839
6840
 
6841
6842
6843
6844
 
6845
6846
6847
6848
6849
 
6850
6851
6852
6853
6854
 
6855
6856
6857
6858
 
6859
6860
6861
6862
 
6863
6864
6865
6866
 
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
 
7527
7528
7529
 
7530
7531
7532
7533
 
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
 
7763
7764
7765
 
7766
7767
7768
7769
 
7770
7771
7772
7773
 
8097
8098
8099
 
8100
8101
8102
8103
 
8256
8257
8258
 
8259
8260
8261
8262
 
8313
8314
8315
 
8316
8317
8318
8319
 
8416
8417
8418
 
8419
8420
8421
8422
 
8486
8487
8488
 
 
 
 
8489
8490
8491
 
8512
8513
8514
 
8515
8516
8517
8518
 
8610
8611
8612
 
8613
8614
8615
8616
 
8618
8619
8620
 
8621
8622
8623
8624
 
8626
8627
8628
 
8629
8630
8631
8632
 
8650
8651
8652
 
8653
8654
8655
8656
 
8743
8744
8745
8746
8747
8748
8749
8750
8751
8752
 
8848
8849
8850
8851
8852
8853
8854
8855
8856
8857
 
10407
10408
10409
10410
10411
10412
10413
10414
10415
10416
 
11234
11235
11236
 
11237
11238
11239
11240
@@ -7,14 +7,14 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2011-02-27 13:57-0300\n" -"PO-Revision-Date: 2011-02-28 04:36+0000\n" -"Last-Translator: Alex Gissing <jixing_alex@yahoo.com.cn>\n" +"POT-Creation-Date: 2011-02-28 02:58-0300\n" +"PO-Revision-Date: 2011-02-28 22:10+0000\n" +"Last-Translator: Wagner Bruna <Unknown>\n"  "Language-Team: Simplified Chinese <zh_CN@li.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-28 04:46+0000\n" +"X-Launchpad-Export-Date: 2011-03-01 04:50+0000\n"  "X-Generator: Launchpad (build 12351)\n"    #: TortoiseHgOverlayServer.py:50 @@ -25,14 +25,14 @@
 msgid "Exit"  msgstr "退出"   -#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:281 +#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:286  #: tortoisehg/hgtk/gdialog.py:505  msgid "About"  msgstr "关于"   -#: tortoisehg/hgqt/about.py:60 tortoisehg/hgtk/about.py:79 -msgid "Copyright 2008-2010 Steve Borho and others" -msgstr "©2008-2010 Steve Borho 和其他人" +#: tortoisehg/hgqt/about.py:60 +msgid "Copyright 2008-2011 Steve Borho and others" +msgstr ""    #: tortoisehg/hgqt/about.py:65 tortoisehg/hgtk/about.py:42  msgid "Several icons are courtesy of the TortoiseSVN project" @@ -63,7 +63,7 @@
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"  msgstr "附 Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"   -#: tortoisehg/hgqt/about.py:192 tortoisehg/hgtk/about.py:70 +#: tortoisehg/hgqt/about.py:189 tortoisehg/hgtk/about.py:70  msgid "A new version of TortoiseHg is ready for download!"  msgstr "新版 TortoiseHg 己经可以下载了！"   @@ -194,9 +194,9 @@
 #: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:516  #: tortoisehg/hgqt/commit.py:523 tortoisehg/hgqt/commit.py:550  #: tortoisehg/hgqt/commit.py:563 tortoisehg/hgqt/compress.py:150 -#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:163 -#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgqt/merge.py:392 -#: tortoisehg/hgqt/merge.py:449 tortoisehg/hgqt/rebase.py:214 +#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:165 +#: tortoisehg/hgqt/merge.py:358 tortoisehg/hgqt/merge.py:391 +#: tortoisehg/hgqt/merge.py:450 tortoisehg/hgqt/rebase.py:214  #: tortoisehg/hgqt/rebase.py:235 tortoisehg/hgqt/rename.py:104  #: tortoisehg/hgqt/repotreeitem.py:283 tortoisehg/hgqt/resolve.py:317  #: tortoisehg/hgqt/settings.py:653 tortoisehg/hgqt/settings.py:751 @@ -293,7 +293,7 @@
 msgstr "撤销的变更集: "    #: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:84 -#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:309 +#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:308  #: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169  #: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:135  #: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64 @@ -308,7 +308,7 @@
 msgid "Commit backout before merging with current working parent"  msgstr ""   -#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:326 +#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:325  #: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:898  #: tortoisehg/hgqt/update.py:97  msgid "Automatically resolve merge conflicts where possible" @@ -382,15 +382,15 @@
   #: tortoisehg/hgqt/bisect.py:59  msgid "Revision is Good" -msgstr "" +msgstr "修订版正常"    #: tortoisehg/hgqt/bisect.py:61  msgid "Revision is Bad" -msgstr "" +msgstr "修订版有误"    #: tortoisehg/hgqt/bisect.py:63  msgid "Skip this Revision" -msgstr "" +msgstr "跳过此修订版"    #: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:138  #: tortoisehg/hgqt/rebase.py:177 tortoisehg/hgtk/bugreport.py:48 @@ -400,15 +400,15 @@
   #: tortoisehg/hgqt/bisect.py:83  msgid "Error encountered." -msgstr "" +msgstr "有错误发生。"    #: tortoisehg/hgqt/bisect.py:88  msgid "Culprit found." -msgstr "" +msgstr "找到元凶"    #: tortoisehg/hgqt/bisect.py:93 tortoisehg/hgqt/grep.py:65  msgid "Revision" -msgstr "" +msgstr "修订版"    #: tortoisehg/hgqt/bisect.py:94  msgid "Test this revision and report findings. (good/bad/skip)" @@ -421,7 +421,7 @@
 #: tortoisehg/hgqt/wctxactions.py:119  #, python-format  msgid "%s (hint: %s)" -msgstr "" +msgstr "%s (提示: %s)"    #: tortoisehg/hgqt/bookmark.py:54 tortoisehg/hgtk/bookmark.py:71  msgid "Bookmark:" @@ -429,20 +429,20 @@
   #: tortoisehg/hgqt/bookmark.py:61  msgid "New name:" -msgstr "" +msgstr "新名称："    #: tortoisehg/hgqt/bookmark.py:80 tortoisehg/hgqt/tag.py:113  #: tortoisehg/hgqt/wctxactions.py:53 tortoisehg/hgqt/wctxactions.py:59  msgid "&Add" -msgstr "" +msgstr "添加(&A)"    #: tortoisehg/hgqt/bookmark.py:83  msgid "&Rename" -msgstr "" +msgstr "重命名(&R)"    #: tortoisehg/hgqt/bookmark.py:86 tortoisehg/hgqt/tag.py:116  msgid "&Remove" -msgstr "" +msgstr "移除(&R)"    #: tortoisehg/hgqt/bookmark.py:109 tortoisehg/hgtk/bookmark.py:37  #, python-format @@ -452,12 +452,12 @@
 #: tortoisehg/hgqt/bookmark.py:196 tortoisehg/hgqt/bookmark.py:241  #, python-format  msgid "A bookmark named \"%s\" already exists" -msgstr "" +msgstr "书签 \"%s\" 已经存在"    #: tortoisehg/hgqt/bookmark.py:202  #, python-format  msgid "Bookmark '%s' has been added" -msgstr "" +msgstr "书签 \"%s\" 已添加"    #: tortoisehg/hgqt/bookmark.py:216 tortoisehg/hgqt/bookmark.py:237  #: tortoisehg/hgtk/bookmark.py:364 @@ -468,12 +468,12 @@
 #: tortoisehg/hgqt/bookmark.py:222  #, python-format  msgid "Bookmark '%s' has been removed" -msgstr "" +msgstr "书签 \"%s\" 已移除"    #: tortoisehg/hgqt/bookmark.py:249  #, python-format  msgid "Bookmark '%s' has been renamed to '%s'" -msgstr "" +msgstr "书签已 '%s' 重命名为 '%s'"    #: tortoisehg/hgqt/branchop.py:29 tortoisehg/hgtk/commit.py:48  msgid "Select branch of merge commit" @@ -493,20 +493,20 @@
   #: tortoisehg/hgqt/branchop.py:43  msgid "Close current branch" -msgstr "" +msgstr "关闭当前分支"    #: tortoisehg/hgqt/bugreport.py:38  msgid "Quit" -msgstr "" +msgstr "退出"    #: tortoisehg/hgqt/bugreport.py:42 tortoisehg/hgtk/bugreport.py:25  msgid "TortoiseHg Bug Report" -msgstr "TortoiseHg Bug报告" +msgstr "报告 TortoiseHg 错误"    #: tortoisehg/hgqt/bugreport.py:49  msgid ""  "** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues\n" -msgstr "" +msgstr "** 请报告此错误至 http://bitbucket.org/tortoisehg/thg/issues\n"    #: tortoisehg/hgqt/bugreport.py:85 tortoisehg/hgtk/bugreport.py:87  msgid "Save error report to" @@ -514,16 +514,16 @@
   #: tortoisehg/hgqt/bugreport.py:87  msgid "Text files (*.txt)" -msgstr "" +msgstr "文本文件 (*.txt)"    #: tortoisehg/hgqt/bugreport.py:91  msgid "Error writing file" -msgstr "" +msgstr "写文件时发生错误"    #: tortoisehg/hgqt/bugreport.py:114 tortoisehg/hgqt/qqueue.py:345  #: tortoisehg/hgqt/qreorder.py:222  msgid "TortoiseHg Error" -msgstr "" +msgstr "TortoiseHg 有误"    #: tortoisehg/hgqt/bugreport.py:136  msgid "" @@ -533,7 +533,7 @@
   #: tortoisehg/hgqt/chunks.py:119 tortoisehg/hgqt/mq.py:263  msgid "Manually resolve rejected chunks?" -msgstr "" +msgstr "手动解决有问题的部分？"    #: tortoisehg/hgqt/chunks.py:121  msgid "Edit patched file and rejects?" @@ -541,11 +541,11 @@
   #: tortoisehg/hgqt/chunks.py:156  msgid "No deletable chunks" -msgstr "" +msgstr "不可删除的部分"    #: tortoisehg/hgqt/chunks.py:160  msgid "No chunks remain" -msgstr "" +msgstr "无剩余部分"    #: tortoisehg/hgqt/chunks.py:161  msgid "Remove all file changes?" @@ -553,34 +553,34 @@
   #: tortoisehg/hgqt/chunks.py:195  msgid "file has been deleted, refresh" -msgstr "" +msgstr "文件已移除，刷新"    #: tortoisehg/hgqt/chunks.py:198  msgid "file has been modified, refresh" -msgstr "" +msgstr "文件已修改，刷新"    #: tortoisehg/hgqt/chunks.py:232  msgid "Unable to merge chunks" -msgstr "" +msgstr "无法合并部分"    #: tortoisehg/hgqt/chunks.py:233  msgid "Add or remove patches must be merged in the working directory"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:430 tortoisehg/hgqt/status.py:128 +#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128  #: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475  msgid "All"  msgstr "全部"   -#: tortoisehg/hgqt/chunks.py:434 tortoisehg/hgqt/qscilib.py:194 +#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/qscilib.py:194  #: tortoisehg/hgqt/status.py:132  msgid "None" -msgstr "" - -#: tortoisehg/hgqt/chunks.py:490 +msgstr "无" + +#: tortoisehg/hgqt/chunks.py:491  #, python-format  msgid "Chunks selected: %d / %d" -msgstr "" +msgstr "部分选择: %d / %d"    #: tortoisehg/hgqt/clone.py:56 tortoisehg/hgqt/rename.py:65  #: tortoisehg/hgqt/thgimport.py:62 tortoisehg/hgtk/thgimport.py:82 @@ -628,12 +628,12 @@
   #: tortoisehg/hgqt/clone.py:145  msgid "&Clone" -msgstr "" +msgstr "克隆(&C)"    #: tortoisehg/hgqt/clone.py:158  #, python-format  msgid "Clone - %s" -msgstr "" +msgstr "克隆 - %s"    #: tortoisehg/hgqt/clone.py:218 tortoisehg/hgqt/clone.py:245  #: tortoisehg/hgqt/clone.py:252 tortoisehg/hgtk/clone.py:37 @@ -642,7 +642,7 @@
   #: tortoisehg/hgqt/clone.py:219  msgid "Error creating destination folder" -msgstr "" +msgstr "错误 创建目标文件夹"    #: tortoisehg/hgqt/clone.py:220  msgid "Please specify a different path." @@ -702,7 +702,7 @@
 msgid "Terminated"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:716 +#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:718  #: tortoisehg/hgtk/p4pending.py:101  msgid "Finished"  msgstr "完成" @@ -952,7 +952,7 @@
 msgid "Compress"  msgstr ""   -#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:257 +#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:259  #: tortoisehg/hgqt/rebase.py:104  msgid "Checking..."  msgstr "" @@ -980,20 +980,20 @@
 msgid "Compress is complete, old history untouched"  msgstr ""   -#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:358 -#: tortoisehg/hgqt/merge.py:391 tortoisehg/hgqt/merge.py:448 +#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:357 +#: tortoisehg/hgqt/merge.py:390 tortoisehg/hgqt/merge.py:449  #: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751  #: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775  #: tortoisehg/hgtk/update.py:233  msgid "&Discard"  msgstr "丢弃(&D)"   -#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450 +#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451  #: tortoisehg/hgqt/rebase.py:215  msgid "Confirm Discard"  msgstr ""   -#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450 +#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451  #: tortoisehg/hgqt/rebase.py:215  msgid "Discard outstanding changes in working directory?"  msgstr "" @@ -1075,11 +1075,11 @@
 msgid "Output Log"  msgstr ""   -#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:285 +#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:290  msgid "Back"  msgstr ""   -#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:288 +#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:293  msgid "Forward"  msgstr ""   @@ -1120,7 +1120,7 @@
 msgid "Compare revisions of the selected file"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:506 +#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:502  #: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/util/menuthg.py:76  msgid "Visual Diff"  msgstr "比较文件" @@ -1285,11 +1285,10 @@
 msgid "Search"  msgstr "查找"   -#: tortoisehg/hgqt/grep.py:54 tortoisehg/hgqt/merge.py:264 -#: tortoisehg/hgqt/serve_ui.py:87 tortoisehg/hgtk/datamine.py:54 -#: tortoisehg/hgtk/hgcmd.py:46 tortoisehg/hgtk/history.py:448 -#: tortoisehg/hgtk/recovery.py:48 tortoisehg/hgtk/serve.py:65 -#: tortoisehg/hgtk/synch.py:53 +#: tortoisehg/hgqt/grep.py:54 tortoisehg/hgqt/serve_ui.py:87 +#: tortoisehg/hgtk/datamine.py:54 tortoisehg/hgtk/hgcmd.py:46 +#: tortoisehg/hgtk/history.py:448 tortoisehg/hgtk/recovery.py:48 +#: tortoisehg/hgtk/serve.py:65 tortoisehg/hgtk/synch.py:53  msgid "Stop"  msgstr "停止"   @@ -1343,69 +1342,69 @@
 msgid "\"%s\" removed from path history"  msgstr ""   -#: tortoisehg/hgqt/grep.py:273 +#: tortoisehg/hgqt/grep.py:269  #, python-format  msgid "grep: invalid match pattern: %s\n"  msgstr ""   -#: tortoisehg/hgqt/grep.py:300 +#: tortoisehg/hgqt/grep.py:296  #, python-format  msgid "grep: %s\n"  msgstr ""   -#: tortoisehg/hgqt/grep.py:331 +#: tortoisehg/hgqt/grep.py:327  msgid "No matches found"  msgstr ""   -#: tortoisehg/hgqt/grep.py:333 tortoisehg/hgqt/revset.py:382 +#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:382  #, python-format  msgid "%d matches found"  msgstr ""   -#: tortoisehg/hgqt/grep.py:397 tortoisehg/hgqt/grep.py:410 -#: tortoisehg/hgqt/grep.py:442 +#: tortoisehg/hgqt/grep.py:393 tortoisehg/hgqt/grep.py:406 +#: tortoisehg/hgqt/grep.py:438  msgid "Searching"  msgstr ""   -#: tortoisehg/hgqt/grep.py:397 +#: tortoisehg/hgqt/grep.py:393  msgid "history"  msgstr ""   -#: tortoisehg/hgqt/grep.py:409 +#: tortoisehg/hgqt/grep.py:405  msgid "Interrupted"  msgstr ""   -#: tortoisehg/hgqt/grep.py:443 +#: tortoisehg/hgqt/grep.py:439  msgid "files"  msgstr ""   -#: tortoisehg/hgqt/grep.py:504 +#: tortoisehg/hgqt/grep.py:500  msgid "View file"  msgstr ""   -#: tortoisehg/hgqt/grep.py:505 +#: tortoisehg/hgqt/grep.py:501  msgid "View Changeset"  msgstr ""   -#: tortoisehg/hgqt/grep.py:507 +#: tortoisehg/hgqt/grep.py:503  msgid "Annotate file"  msgstr ""   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:364 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:364  #: tortoisehg/hgtk/datamine.py:654  msgid "File"  msgstr "文件"   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:652 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:652  msgid "Line"  msgstr "行"   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:363 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:363  #: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441  msgid "Rev"  msgstr "版本"   -#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgqt/settings.py:451 +#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgqt/settings.py:451  #: tortoisehg/hgqt/settings.py:551 tortoisehg/hgqt/settings.py:590  #: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655  #: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502 @@ -1414,7 +1413,7 @@
 msgid "User"  msgstr "用户"   -#: tortoisehg/hgqt/grep.py:651 +#: tortoisehg/hgqt/grep.py:647  msgid "Match Text"  msgstr ""   @@ -1840,76 +1839,76 @@
 msgid "&Exit"  msgstr ""   -#: tortoisehg/hgqt/merge.py:218 tortoisehg/hgqt/revpanel.py:156 +#: tortoisehg/hgqt/merge.py:220 tortoisehg/hgqt/revpanel.py:156  #: tortoisehg/hgtk/merge.py:73  msgid "Not a head revision!"  msgstr "不是head版本"   -#: tortoisehg/hgqt/merge.py:225 +#: tortoisehg/hgqt/merge.py:227  msgid "Merge from (other revision)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:233 tortoisehg/hgtk/merge.py:47 +#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgtk/merge.py:47  #: tortoisehg/hgtk/merge.py:60  msgid "Unable to merge"  msgstr "无法合并"   -#: tortoisehg/hgqt/merge.py:234 +#: tortoisehg/hgqt/merge.py:236  msgid "Merge revision not specified or not found"  msgstr ""   -#: tortoisehg/hgqt/merge.py:239 +#: tortoisehg/hgqt/merge.py:241  msgid "Merge to (working directory)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:248 +#: tortoisehg/hgqt/merge.py:250  msgid "Working directory status"  msgstr ""   -#: tortoisehg/hgqt/merge.py:267 +#: tortoisehg/hgqt/merge.py:266  msgid "<a href=\"view\">View changes...</a>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:273 +#: tortoisehg/hgqt/merge.py:272  msgid ""  "The workding directory is already <b>merged</b>. <a "  "href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "  "existing merge."  msgstr ""   -#: tortoisehg/hgqt/merge.py:282 +#: tortoisehg/hgqt/merge.py:281  msgid ""  "Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "  "href=\"shelve\"><b>shelve</b></a> to patch, or <a "  "href=\"discard\"><b>discard</b></a> changes."  msgstr ""   -#: tortoisehg/hgqt/merge.py:295 +#: tortoisehg/hgqt/merge.py:294  msgid "Or use:"  msgstr ""   -#: tortoisehg/hgqt/merge.py:298 +#: tortoisehg/hgqt/merge.py:297  msgid "Force a merge with outstanding changes (-f/--force)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:319 tortoisehg/hgtk/merge.py:118 +#: tortoisehg/hgqt/merge.py:318 tortoisehg/hgtk/merge.py:118  msgid "Discard all changes from merge target (other) revision"  msgstr ""   -#: tortoisehg/hgqt/merge.py:339 tortoisehg/hgqt/update.py:223 +#: tortoisehg/hgqt/merge.py:338 tortoisehg/hgqt/update.py:223  #: tortoisehg/hgtk/update.py:237  msgid "&Merge"  msgstr "合并(&M)"   -#: tortoisehg/hgqt/merge.py:343 +#: tortoisehg/hgqt/merge.py:342  msgid "Merge another revision to the working directory"  msgstr ""   -#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:215 +#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgtk/merge.py:215  msgid "Confirm Discard Changes"  msgstr ""   -#: tortoisehg/hgqt/merge.py:361 tortoisehg/hgtk/merge.py:216 +#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:216  #, python-format  msgid ""  "The changes from revision %s and all unmerged parents will be discarded.\n" @@ -1917,62 +1916,62 @@
 "Are you sure this is what you want to do?"  msgstr ""   +#: tortoisehg/hgqt/merge.py:370 +msgid "Merging..." +msgstr "" +  #: tortoisehg/hgqt/merge.py:371 -msgid "Merging..." -msgstr "" - -#: tortoisehg/hgqt/merge.py:372  msgid "All conflicting files will be marked unresolved."  msgstr ""   +#: tortoisehg/hgqt/merge.py:388 +msgid "Cancel merge and discard changes?" +msgstr "" +  #: tortoisehg/hgqt/merge.py:389 -msgid "Cancel merge and discard changes?" -msgstr "" - -#: tortoisehg/hgqt/merge.py:390  msgid "Discard unfinished local changes and restart merge?"  msgstr ""   -#: tortoisehg/hgqt/merge.py:393 +#: tortoisehg/hgqt/merge.py:392  msgid "Confirm Clean Up"  msgstr ""   +#: tortoisehg/hgqt/merge.py:395 +msgid "Canceling merge...\n" +msgstr "" +  #: tortoisehg/hgqt/merge.py:396 -msgid "Canceling merge...\n" -msgstr "" - -#: tortoisehg/hgqt/merge.py:397  msgid "(Please close any running merge tool)\n"  msgstr ""   -#: tortoisehg/hgqt/merge.py:415 +#: tortoisehg/hgqt/merge.py:416  msgid "Merge failed"  msgstr ""   -#: tortoisehg/hgqt/merge.py:415 +#: tortoisehg/hgqt/merge.py:416  msgid "Returning to first page"  msgstr ""   -#: tortoisehg/hgqt/merge.py:466 +#: tortoisehg/hgqt/merge.py:467  msgid "Rename Patch"  msgstr ""   -#: tortoisehg/hgqt/merge.py:467 +#: tortoisehg/hgqt/merge.py:468  msgid "Input a new patch name:"  msgstr ""   -#: tortoisehg/hgqt/merge.py:475 +#: tortoisehg/hgqt/merge.py:476  #, python-format  msgid ""  "The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>. <a "  "href=\"rename:%(new)s\"><b>Rename</b></a> again?"  msgstr ""   -#: tortoisehg/hgqt/merge.py:522 +#: tortoisehg/hgqt/merge.py:523  msgid "<b>Uncommitted local changes are detected</b>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:527 tortoisehg/hgtk/recovery.py:52 +#: tortoisehg/hgqt/merge.py:528 tortoisehg/hgtk/recovery.py:52  msgid "Clean"  msgstr "净化"   @@ -1982,8 +1981,8 @@
 msgid "Parents"  msgstr "父版本"   -#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:521 -#: tortoisehg/hgqt/repomodel.py:523 tortoisehg/hgqt/shelve.py:24 +#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:514 +#: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24  #: tortoisehg/hgqt/thgimport.py:87  msgid "Working Directory"  msgstr "" @@ -2000,7 +1999,7 @@
 msgid "Merge "  msgstr "合并: "   -#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:229 +#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:231  msgid "&Commit"  msgstr ""   @@ -2021,17 +2020,17 @@
 msgid "Please wait while committing merged files."  msgstr ""   -#: tortoisehg/hgqt/merge.py:672 +#: tortoisehg/hgqt/merge.py:674  msgid ""  "There were <b>merge conflicts</b> that must be <a "  "href=\"resolve\"><b>resolved</b></a>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:677 +#: tortoisehg/hgqt/merge.py:679  msgid "No merge conflicts, ready to commit"  msgstr ""   -#: tortoisehg/hgqt/merge.py:729 +#: tortoisehg/hgqt/merge.py:731  msgid "Merge changeset"  msgstr ""   @@ -2462,7 +2461,7 @@
 msgid "Delete"  msgstr ""   -#: tortoisehg/hgqt/qqueue.py:100 tortoisehg/hgqt/workbench.py:271 +#: tortoisehg/hgqt/qqueue.py:100  msgid "Purge"  msgstr ""   @@ -2884,12 +2883,12 @@
 msgid "Include all ancestors"  msgstr ""   -#: tortoisehg/hgqt/repomodel.py:189 +#: tortoisehg/hgqt/repomodel.py:188  #, python-format  msgid "filling (%d)"  msgstr ""   -#: tortoisehg/hgqt/repomodel.py:515 +#: tortoisehg/hgqt/repomodel.py:508  msgid "Mercurial User"  msgstr ""   @@ -2947,7 +2946,7 @@
 msgstr ""    #: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:451 -#: tortoisehg/hgqt/workbench.py:274 +#: tortoisehg/hgqt/workbench.py:279  msgid "Explore"  msgstr ""   @@ -2956,7 +2955,7 @@
 msgstr ""    #: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:452 -#: tortoisehg/hgqt/workbench.py:277 +#: tortoisehg/hgqt/workbench.py:282  msgid "Terminal"  msgstr ""   @@ -2999,7 +2998,7 @@
 msgid "default"  msgstr ""   -#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:363 +#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362  #: tortoisehg/hgqt/sync.py:198 tortoisehg/hgqt/webconf.py:266  msgid "Path"  msgstr "" @@ -3012,7 +3011,7 @@
 msgid "Failed to add repository"  msgstr ""   -#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:576 +#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:581  #, python-format  msgid "%s is not a valid repository"  msgstr "" @@ -3445,16 +3444,16 @@
 msgid "&Quit"  msgstr "退出(&Q)"   -#: tortoisehg/hgqt/resolve.py:363 +#: tortoisehg/hgqt/resolve.py:362  msgid "Ext"  msgstr ""   -#: tortoisehg/hgqt/resolve.py:363 tortoisehg/hgqt/thgimport.py:85 +#: tortoisehg/hgqt/resolve.py:362 tortoisehg/hgqt/thgimport.py:85  #: tortoisehg/hgtk/thgimport.py:110  msgid "Repository"  msgstr "仓库"   -#: tortoisehg/hgqt/resolve.py:406 +#: tortoisehg/hgqt/resolve.py:405  msgid "<default>"  msgstr ""   @@ -4030,7 +4029,7 @@
   #: tortoisehg/hgqt/run.py:980 tortoisehg/hgtk/hgtk.py:826  msgid "import to the patch queue (MQ)" -msgstr "" +msgstr "导入补丁队列 (MQ)"    #: tortoisehg/hgqt/run.py:981  msgid "thg import [OPTION] [SOURCE]..." @@ -4615,8 +4614,8 @@
 "Merge, Tag and Backout dialogs. Default: False"  msgstr ""   -#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgqt/workbench.py:252 -#: tortoisehg/hgtk/thgconfig.py:179 tortoisehg/util/menuthg.py:55 +#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgtk/thgconfig.py:179 +#: tortoisehg/util/menuthg.py:55  msgid "Web Server"  msgstr "Web服务器"   @@ -5413,50 +5412,50 @@
 msgid "Size (KB)"  msgstr ""   -#: tortoisehg/hgqt/status.py:667 +#: tortoisehg/hgqt/status.py:684  msgid ", resolved merge"  msgstr ""   -#: tortoisehg/hgqt/status.py:669 +#: tortoisehg/hgqt/status.py:686  msgid ", unresolved merge"  msgstr ""   -#: tortoisehg/hgqt/status.py:681 +#: tortoisehg/hgqt/status.py:698  #, python-format  msgid "%s is modified"  msgstr ""   -#: tortoisehg/hgqt/status.py:683 +#: tortoisehg/hgqt/status.py:700  #, python-format  msgid "%s is added"  msgstr ""   -#: tortoisehg/hgqt/status.py:685 +#: tortoisehg/hgqt/status.py:702  #, python-format  msgid "%s is removed"  msgstr ""   -#: tortoisehg/hgqt/status.py:687 +#: tortoisehg/hgqt/status.py:704  #, python-format  msgid "%s is not tracked (unknown)"  msgstr ""   -#: tortoisehg/hgqt/status.py:689 +#: tortoisehg/hgqt/status.py:706  #, python-format  msgid "%s is missing!"  msgstr ""   -#: tortoisehg/hgqt/status.py:691 +#: tortoisehg/hgqt/status.py:708  #, python-format  msgid "%s is ignored"  msgstr ""   -#: tortoisehg/hgqt/status.py:693 +#: tortoisehg/hgqt/status.py:710  #, python-format  msgid "%s is not modified (clean)"  msgstr ""   -#: tortoisehg/hgqt/status.py:695 +#: tortoisehg/hgqt/status.py:712  #, python-format  msgid "%s is a dirty subrepo"  msgstr "" @@ -5567,11 +5566,11 @@
 msgid "A terminal shell cannot be opened for remote"  msgstr ""   -#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:676 +#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:681  msgid "No shell configured"  msgstr ""   -#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:677 +#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:682  msgid "A terminal shell must be configured"  msgstr ""   @@ -6173,17 +6172,17 @@
   #: tortoisehg/hgqt/thread.py:294 tortoisehg/hgtk/hgthread.py:198  msgid "SSL: Server certificate verify failed" -msgstr "" +msgstr "SSL: 服务器认证失败"    #: tortoisehg/hgqt/thread.py:296 tortoisehg/hgtk/hgthread.py:200  #, python-format  msgid "SSL: unknown error %s:%s" -msgstr "" +msgstr "SSL: 未知错误 %s:%s"    #: tortoisehg/hgqt/thread.py:298 tortoisehg/hgtk/hgthread.py:202  #, python-format  msgid "SSL error: %s" -msgstr "" +msgstr "SSL 错误: %s"    #: tortoisehg/hgqt/thread.py:303  #, python-format @@ -6623,156 +6622,153 @@
 msgid "Save"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:39 tortoisehg/hgqt/workbench.py:398 +#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:403  msgid "TortoiseHg Workbench"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:64 +#: tortoisehg/hgqt/workbench.py:62  msgid "New Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:66 tortoisehg/hgqt/workbench.py:177 +#: tortoisehg/hgqt/workbench.py:64 tortoisehg/hgqt/workbench.py:183  msgid "Clone Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:68 +#: tortoisehg/hgqt/workbench.py:66  msgid "Open Repository..."  msgstr ""   +#: tortoisehg/hgqt/workbench.py:98 +msgid "&File" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:99 +msgid "&View" +msgstr "" +  #: tortoisehg/hgqt/workbench.py:100 -msgid "&File" +msgid "&Repository"  msgstr ""    #: tortoisehg/hgqt/workbench.py:101 -msgid "&View" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:102 -msgid "&Repository" +msgid "&Help"  msgstr ""    #: tortoisehg/hgqt/workbench.py:103 -msgid "&Help" +msgid "Edit Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:105 -msgid "Edit Toolbar" +msgid "Dock Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:107 -msgid "Dock Toolbar" +msgid "Sync Toolbar"  msgstr ""    #: tortoisehg/hgqt/workbench.py:109 -msgid "Sync Toolbar" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:111  msgid "Task Toolbar"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:175 +#: tortoisehg/hgqt/workbench.py:176 +msgid "&Open Repository..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:178 +msgid "&Close Repository" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:181  msgid "&New Repository..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:180 -msgid "&Open Repository..." -msgstr "" - -#: tortoisehg/hgqt/workbench.py:182 -msgid "&Close Repository" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:185 +#: tortoisehg/hgqt/workbench.py:187  msgid "&Settings..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:188 +#: tortoisehg/hgqt/workbench.py:190  msgid "E&xit"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:192 +#: tortoisehg/hgqt/workbench.py:193  msgid "Show Repository Registry"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:199 +#: tortoisehg/hgqt/workbench.py:200  msgid "Show Paths"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:203 +#: tortoisehg/hgqt/workbench.py:204  msgid "Show Output &Log"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:210 +#: tortoisehg/hgqt/workbench.py:211  msgid "Choose Log Columns..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:213 +#: tortoisehg/hgqt/workbench.py:214  msgid "Save Open Repositories On Exit"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:228 +#: tortoisehg/hgqt/workbench.py:230  msgid "Revision &Details"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:230 +#: tortoisehg/hgqt/workbench.py:232  msgid "S&ynchronize"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:231 +#: tortoisehg/hgqt/workbench.py:233  msgid "&Manifest"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:232 +#: tortoisehg/hgqt/workbench.py:234  msgid "&Search"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:234 +#: tortoisehg/hgqt/workbench.py:236  msgid "Patch &Queue"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:236 +#: tortoisehg/hgqt/workbench.py:238  msgid "&Patch Branch"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:239 tortoisehg/hgtk/status.py:1320 +#: tortoisehg/hgqt/workbench.py:241 tortoisehg/hgtk/status.py:1320  msgid "&Refresh"  msgstr "刷新(&R)"   -#: tortoisehg/hgqt/workbench.py:242 +#: tortoisehg/hgqt/workbench.py:244  msgid "Refresh current repository"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:243 +#: tortoisehg/hgqt/workbench.py:245  msgid "Refresh &Task Tab"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:246 +#: tortoisehg/hgqt/workbench.py:248  msgid "Refresh only the current task tab"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:248 tortoisehg/hgtk/history.py:1496 -msgid "Load all" -msgstr "全部" -  #: tortoisehg/hgqt/workbench.py:250 +msgid "Load all revisions" +msgstr "" + +#: tortoisehg/hgqt/workbench.py:252  msgid "Load all revisions into graph"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:254 tortoisehg/hgtk/history.py:1324 -msgid "Bisect" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:257 tortoisehg/hgtk/gdialog.py:493 -#: tortoisehg/hgtk/history.py:291 tortoisehg/hgtk/synch.py:83 -#: tortoisehg/hgtk/thgshelve.py:72 tortoisehg/hgtk/thgshelve.py:145 -#: tortoisehg/hgtk/thgshelve.py:151 tortoisehg/hgtk/thgshelve.py:159 -msgid "Shelve" -msgstr "剥离改动" - -#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/thgimport.py:164 -msgid "Import" -msgstr "导入" +#: tortoisehg/hgqt/workbench.py:254 +msgid "Web Server..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:257 +msgid "Shelve..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/history.py:458 +msgid "Import..." +msgstr "导入..."    #: tortoisehg/hgqt/workbench.py:262 tortoisehg/hgtk/recovery.py:68  msgid "Verify" @@ -6783,80 +6779,88 @@
 msgstr "恢复"    #: tortoisehg/hgqt/workbench.py:267 -msgid "Resolve" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:269 -msgid "Rollback/Undo" -msgstr "" - -#: tortoisehg/hgqt/workbench.py:293 +msgid "Resolve..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:270 +msgid "Rollback/Undo..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:273 +msgid "Purge..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:276 +msgid "Bisect..." +msgstr "" + +#: tortoisehg/hgqt/workbench.py:298  msgid "Filter Toolbar"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:296 +#: tortoisehg/hgqt/workbench.py:301  msgid "Filter graph with revision sets or branches"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:298 +#: tortoisehg/hgqt/workbench.py:303  msgid "Workbench Toolbars"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:305 tortoisehg/hgtk/history.py:438 +#: tortoisehg/hgqt/workbench.py:310 tortoisehg/hgtk/history.py:438  #: tortoisehg/hgtk/history.py:1861 tortoisehg/hgtk/synch.py:57  msgid "Incoming"  msgstr "拉取预览"   -#: tortoisehg/hgqt/workbench.py:306 +#: tortoisehg/hgqt/workbench.py:311  msgid "Check for incoming changes from default pull target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:308 tortoisehg/hgtk/history.py:440 +#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/history.py:440  #: tortoisehg/hgtk/history.py:1991  msgid "Pull"  msgstr "拉取"   -#: tortoisehg/hgqt/workbench.py:309 +#: tortoisehg/hgqt/workbench.py:314  msgid "Pull incoming changes from default pull target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/history.py:442 +#: tortoisehg/hgqt/workbench.py:316 tortoisehg/hgtk/history.py:442  #: tortoisehg/hgtk/history.py:2034 tortoisehg/hgtk/synch.py:68  msgid "Outgoing"  msgstr "推送预览"   -#: tortoisehg/hgqt/workbench.py:312 +#: tortoisehg/hgqt/workbench.py:317  msgid "Detect outgoing changes to default push target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:314 tortoisehg/hgtk/history.py:444 +#: tortoisehg/hgqt/workbench.py:319 tortoisehg/hgtk/history.py:444  #: tortoisehg/hgtk/history.py:2074 tortoisehg/hgtk/synch.py:73  msgid "Push"  msgstr "推送"   -#: tortoisehg/hgqt/workbench.py:315 +#: tortoisehg/hgqt/workbench.py:320  msgid "Push outgoing changes to default push target"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:400 +#: tortoisehg/hgqt/workbench.py:405  #, python-format  msgid "%s - TortoiseHg Workbench - %s"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:403 +#: tortoisehg/hgqt/workbench.py:408  #, python-format  msgid "%s - TortoiseHg Workbench"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:554 +#: tortoisehg/hgqt/workbench.py:559  msgid "Select repository directory to open"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:575 +#: tortoisehg/hgqt/workbench.py:580  msgid "Failed to open repository"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:698 +#: tortoisehg/hgqt/workbench.py:703  #, python-format  msgid "Hg file log viewer [%s] - %s"  msgstr "" @@ -6866,6 +6870,10 @@
 msgid "(version %s)"  msgstr "(版本 %s)"   +#: tortoisehg/hgtk/about.py:79 +msgid "Copyright 2008-2010 Steve Borho and others" +msgstr "©2008-2010 Steve Borho 和其他人" +  #: tortoisehg/hgtk/about.py:95  #, python-format  msgid "with %s" @@ -7519,7 +7527,7 @@
   #: tortoisehg/hgtk/commit.py:1253  msgid "Finished committing and pushing" -msgstr "" +msgstr "完成提交并推入"    #: tortoisehg/hgtk/commit.py:1255  msgid "Finished committing" @@ -7738,6 +7746,13 @@
 msgid "Recovery"  msgstr "恢复"   +#: tortoisehg/hgtk/gdialog.py:493 tortoisehg/hgtk/history.py:291 +#: tortoisehg/hgtk/synch.py:83 tortoisehg/hgtk/thgshelve.py:72 +#: tortoisehg/hgtk/thgshelve.py:145 tortoisehg/hgtk/thgshelve.py:151 +#: tortoisehg/hgtk/thgshelve.py:159 +msgid "Shelve" +msgstr "剥离改动" +  #: tortoisehg/hgtk/gdialog.py:500  msgid "_Help"  msgstr "帮助(_H)" @@ -7748,11 +7763,11 @@
   #: tortoisehg/hgtk/gdialog.py:503 tortoisehg/hgtk/thgmq.py:861  msgid "Index" -msgstr "" +msgstr "索引"    #: tortoisehg/hgtk/gdialog.py:586 tortoisehg/hgtk/status.py:168  msgid ", please refresh" -msgstr "" +msgstr ", 请刷新"    #: tortoisehg/hgtk/gdialog.py:597  msgid " Messages and Errors" @@ -8082,7 +8097,7 @@
 #: tortoisehg/hgtk/hgtk.py:519 tortoisehg/hgtk/hgtk.py:526  #, python-format  msgid "%s does not exist\n" -msgstr "" +msgstr "%s 不存在\n"    #: tortoisehg/hgtk/hgtk.py:548  msgid "use \"hgtk help\" for the full list of commands" @@ -8241,7 +8256,7 @@
   #: tortoisehg/hgtk/hgtk.py:825  msgid "import to the repository" -msgstr "" +msgstr "导入仓库"    #: tortoisehg/hgtk/hgtk.py:827  msgid "hgtk import [OPTION] [SOURCE]..." @@ -8298,7 +8313,7 @@
   #: tortoisehg/hgtk/history.py:100  msgid "Revision Set" -msgstr "" +msgstr "修订版集"    #: tortoisehg/hgtk/history.py:100 tortoisehg/hgtk/history.py:496  msgid "Keywords" @@ -8401,7 +8416,7 @@
   #: tortoisehg/hgtk/history.py:376  msgid "Identify" -msgstr "" +msgstr "标识"    #: tortoisehg/hgtk/history.py:378  msgid "Pending" @@ -8471,10 +8486,6 @@
 msgid "Reject Bundle"  msgstr "拒绝Bundle"   -#: tortoisehg/hgtk/history.py:458 -msgid "Import..." -msgstr "导入..." -  #: tortoisehg/hgtk/history.py:460  msgid "Add Bundle..."  msgstr "添加Bundle..." @@ -8501,7 +8512,7 @@
   #: tortoisehg/hgtk/history.py:490  msgid "Revision Range" -msgstr "" +msgstr "修订版范围"    #: tortoisehg/hgtk/history.py:589  msgid "Submitted" @@ -8599,7 +8610,7 @@
   #: tortoisehg/hgtk/history.py:774  msgid "No matches" -msgstr "" +msgstr "无匹配"    #: tortoisehg/hgtk/history.py:775  msgid "No revisions matched search" @@ -8607,7 +8618,7 @@
   #: tortoisehg/hgtk/history.py:779  msgid "Invalid revision set" -msgstr "" +msgstr "不可用的修订版集"    #: tortoisehg/hgtk/history.py:785  msgid "Invalid date specification" @@ -8615,7 +8626,7 @@
   #: tortoisehg/hgtk/history.py:792  msgid "Invalid file pattern" -msgstr "" +msgstr "不可用的文件类型"    #: tortoisehg/hgtk/history.py:848  #, python-format @@ -8639,7 +8650,7 @@
 #: tortoisehg/hgtk/history.py:1184  #, python-format  msgid "file patterns \"%s\"" -msgstr "" +msgstr "文件类型 \"%s\""    #: tortoisehg/hgtk/history.py:1197  msgid "merges" @@ -8732,6 +8743,10 @@
 msgid "Transp_lant to Local"  msgstr ""   +#: tortoisehg/hgtk/history.py:1324 +msgid "Bisect" +msgstr "" +  #: tortoisehg/hgtk/history.py:1332  msgid "_Export Patch..."  msgstr "导出补丁(_E)..." @@ -8833,6 +8848,10 @@
 msgstr "更多版本"    #: tortoisehg/hgtk/history.py:1496 +msgid "Load all" +msgstr "全部" + +#: tortoisehg/hgtk/history.py:1496  msgid "load all revisions"  msgstr "所有版本"   @@ -10388,6 +10407,10 @@
 msgid "Skipped saving path with no alias"  msgstr "跳过没有别名的保存路径"   +#: tortoisehg/hgtk/thgimport.py:164 +msgid "Import" +msgstr "导入" +  #: tortoisehg/hgtk/thgimport.py:184  msgid "Imported successfully"  msgstr "导入成功" @@ -11211,7 +11234,7 @@
 #: tortoisehg/util/prej.py:235  #, python-format  msgid "file %s already exists\n" -msgstr "" +msgstr "文件 %s 已经存在\n"    #: tortoisehg/util/prej.py:287  #, python-format
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes