Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.2 and tip

stable i18n: pull latest translations from Launchpad (fixes #995)

Including messages up to 68df62c90b8a .

Changeset cb79ad63627a

Parent 789e70fe4155

by Wagner Bruna

Changes to 30 files · Browse files at cb79ad63627a Showing diff from parent 789e70fe4155 Diff from another changeset...

 
7
8
9
10
 
11
12
13
 
15
16
17
18
 
19
20
21
 
86
87
88
89
 
90
91
92
 
319
320
321
322
 
323
324
325
 
451
452
453
454
 
455
456
457
 
656
657
658
659
 
660
661
662
663
664
 
665
666
667
668
669
 
670
671
672
673
674
 
675
676
677
678
679
 
680
681
682
683
684
 
685
686
687
 
755
756
757
758
 
759
760
761
 
789
790
791
792
 
793
794
795
 
802
803
804
805
 
806
807
808
 
863
864
865
866
 
867
868
869
870
871
 
872
873
874
875
876
 
877
878
879
880
 
881
882
883
884
 
885
886
887
888
 
889
890
891
892
 
893
894
895
896
 
 
 
 
 
897
898
899
900
 
901
902
903
904
 
905
906
907
908
909
 
910
911
912
913
914
 
915
916
917
918
 
919
920
921
922
923
924
925
 
926
927
928
929
930
931
 
932
933
934
 
1147
1148
1149
1150
1151
1152
 
 
 
1153
1154
1155
1156
1157
1158
1159
 
 
1160
1161
1162
 
2168
2169
2170
2171
 
2172
2173
2174
2175
2176
 
2177
2178
2179
2180
 
2181
2182
2183
2184
 
2185
2186
2187
2188
 
2189
2190
2191
2192
 
2193
2194
2195
2196
 
2197
2198
2199
2200
 
2201
2202
2203
2204
 
2205
2206
2207
2208
 
2209
2210
2211
2212
 
2213
2214
2215
2216
 
2217
2218
2219
2220
2221
 
2222
2223
2224
2225
 
2226
2227
2228
2229
 
2230
2231
2232
2233
 
2234
2235
2236
 
3092
3093
3094
3095
 
3096
3097
3098
3099
 
3100
3101
3102
3103
 
3104
3105
3106
 
3137
3138
3139
3140
 
3141
3142
3143
 
3582
3583
3584
3585
 
3586
3587
3588
 
3591
3592
3593
3594
 
3595
3596
3597
 
3695
3696
3697
3698
 
3699
3700
3701
3702
3703
 
3704
3705
3706
3707
 
3708
3709
3710
3711
3712
 
3713
3714
3715
3716
3717
 
3718
3719
3720
 
3815
3816
3817
3818
 
3819
3820
3821
 
4388
4389
4390
4391
 
 
 
 
 
 
 
 
 
4392
4393
4394
4395
4396
 
4397
4398
4399
4400
4401
 
4402
4403
4404
4405
4406
 
4407
4408
4409
4410
 
4411
4412
4413
4414
4415
 
4416
4417
4418
 
4731
4732
4733
4734
 
4735
4736
4737
4738
 
4739
4740
4741
4742
 
4743
4744
4745
4746
 
4747
4748
4749
4750
4751
 
4752
4753
4754
4755
4756
 
4757
4758
4759
4760
4761
 
4762
4763
4764
4765
4766
4767
4768
 
4769
4770
4771
4772
4773
4774
4775
4776
 
 
4777
4778
4779
4780
 
4781
4782
4783
4784
 
4785
4786
4787
4788
 
4789
4790
4791
4792
 
4793
4794
4795
4796
4797
4798
 
4799
4800
4801
4802
4803
 
4804
4805
4806
4807
4808
 
4809
4810
4811
4812
 
4813
4814
4815
4816
 
4817
4818
4819
4820
 
4821
4822
4823
4824
 
4825
4826
4827
4828
 
4829
4830
4831
4832
 
4833
4834
4835
4836
 
4837
4838
4839
4840
 
4841
4842
4843
4844
 
4845
4846
4847
4848
 
4849
4850
4851
4852
 
4853
4854
4855
4856
 
4857
4858
4859
4860
 
4861
4862
4863
4864
 
4865
4866
4867
4868
 
4869
4870
4871
4872
 
4873
4874
4875
4876
 
4877
4878
4879
4880
 
4881
4882
4883
4884
 
4885
4886
4887
4888
 
4889
4890
4891
4892
 
4893
4894
4895
4896
 
4897
4898
4899
4900
 
4901
4902
4903
4904
 
4905
4906
4907
4908
 
4909
4910
4911
4912
 
4913
4914
4915
4916
 
4917
4918
4919
4920
 
4921
4922
4923
4924
 
4925
4926
4927
4928
 
4929
4930
4931
4932
 
4933
4934
4935
4936
 
4937
4938
4939
4940
 
4941
4942
4943
4944
 
4945
4946
4947
4948
 
4949
4950
4951
4952
 
4953
4954
4955
4956
 
4957
4958
4959
4960
 
4961
4962
4963
4964
 
4965
4966
4967
4968
 
4969
4970
4971
4972
 
4973
4974
4975
4976
 
4977
4978
4979
4980
 
4981
4982
4983
4984
 
4985
4986
4987
4988
 
4989
4990
4991
4992
 
4993
4994
4995
4996
 
4997
4998
4999
5000
 
5001
5002
5003
5004
 
5005
5006
5007
5008
 
5009
5010
5011
5012
 
5013
5014
5015
5016
 
5017
5018
5019
5020
 
5021
5022
5023
5024
 
5025
5026
5027
5028
 
5029
5030
5031
5032
 
5033
5034
5035
5036
5037
 
5038
5039
5040
5041
 
5042
5043
5044
5045
 
5046
5047
5048
5049
 
5050
5051
5052
5053
 
5054
5055
5056
5057
 
5058
5059
5060
5061
 
5062
5063
5064
5065
 
5066
5067
5068
5069
 
5070
5071
5072
5073
 
5074
5075
5076
5077
 
5078
5079
5080
5081
 
5082
5083
5084
5085
 
5086
5087
5088
5089
 
5090
5091
5092
5093
 
5094
5095
5096
5097
 
5098
5099
5100
5101
 
5102
5103
5104
5105
 
5106
5107
5108
5109
 
5110
5111
5112
5113
 
5114
5115
5116
5117
 
5118
5119
5120
5121
 
5122
5123
5124
5125
 
5126
5127
5128
5129
 
5130
5131
5132
5133
 
5134
5135
5136
5137
 
5138
5139
5140
5141
 
5142
5143
5144
5145
 
5146
5147
5148
5149
 
5150
5151
5152
5153
 
5154
5155
5156
5157
5158
 
5159
5160
5161
5162
 
5163
5164
5165
5166
5167
 
5168
5169
5170
5171
 
5172
5173
5174
5175
 
5176
5177
5178
5179
 
5180
5181
5182
5183
 
5184
5185
5186
5187
 
5188
5189
5190
5191
 
5192
5193
5194
5195
 
5196
5197
5198
5199
 
5200
5201
5202
 
5509
5510
5511
5512
 
5513
5514
5515
 
5630
5631
5632
5633
 
5634
5635
5636
 
5738
5739
5740
5741
 
5742
5743
5744
 
6517
6518
6519
6520
 
6521
6522
6523
6524
 
6525
6526
6527
6528
 
6529
6530
6531
6532
 
6533
6534
6535
6536
 
6537
6538
6539
6540
 
6541
6542
6543
6544
 
6545
6546
6547
6548
 
6549
6550
6551
6552
 
6553
6554
6555
6556
 
6557
6558
6559
6560
6561
 
6562
6563
6564
6565
 
6566
6567
6568
6569
 
6570
6571
6572
6573
 
6574
6575
6576
6577
 
6578
6579
6580
6581
 
6582
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
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
 
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
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
6923
6924
6925
 
6926
6927
6928
6929
 
6930
6931
6932
6933
 
6934
6935
6936
6937
 
6938
6939
6940
6941
 
6942
6943
6944
6945
 
6946
6947
6948
6949
 
6950
6951
6952
6953
 
6954
6955
6956
 
6958
6959
6960
6961
 
6962
6963
6964
6965
6966
6967
6968
 
6969
6970
6971
6972
6973
6974
 
6975
6976
6977
6978
6979
6980
 
6981
6982
6983
6984
 
6985
6986
6987
6988
6989
6990
 
6991
6992
6993
6994
 
6995
6996
6997
6998
 
6999
7000
7001
7002
7003
 
7004
7005
7006
7007
 
7008
7009
7010
7011
 
7012
7013
7014
7015
 
7016
7017
7018
 
7
8
9
 
10
11
12
13
 
15
16
17
 
18
19
20
21
 
86
87
88
 
89
90
91
92
 
319
320
321
 
322
323
324
325
 
451
452
453
 
454
455
456
457
 
656
657
658
 
659
660
661
662
663
 
664
665
666
667
668
 
669
670
671
672
673
 
674
675
676
677
678
 
679
680
681
682
683
 
684
685
686
687
 
755
756
757
 
758
759
760
761
 
789
790
791
 
792
793
794
795
 
802
803
804
 
805
806
807
808
 
863
864
865
 
866
867
868
869
870
 
871
872
873
874
875
 
876
877
878
879
 
880
881
882
883
 
884
885
886
887
 
888
889
890
891
 
892
893
894
895
 
896
897
898
899
900
901
902
903
 
904
905
906
907
 
908
909
910
911
912
 
913
914
915
916
917
 
918
919
920
921
 
922
923
924
925
926
927
928
 
929
930
931
932
933
934
 
935
936
937
938
 
1151
1152
1153
 
 
 
1154
1155
1156
1157
1158
1159
1160
1161
 
 
1162
1163
1164
1165
1166
 
2172
2173
2174
 
2175
2176
2177
2178
2179
 
2180
2181
2182
2183
 
2184
2185
2186
2187
 
2188
2189
2190
2191
 
2192
2193
2194
2195
 
2196
2197
2198
2199
 
2200
2201
2202
2203
 
2204
2205
2206
2207
 
2208
2209
2210
2211
 
2212
2213
2214
2215
 
2216
2217
2218
2219
 
2220
2221
2222
2223
2224
 
2225
2226
2227
2228
 
2229
2230
2231
2232
 
2233
2234
2235
2236
 
2237
2238
2239
2240
 
3096
3097
3098
 
3099
3100
3101
3102
 
3103
3104
3105
3106
 
3107
3108
3109
3110
 
3141
3142
3143
 
3144
3145
3146
3147
 
3586
3587
3588
 
3589
3590
3591
3592
 
3595
3596
3597
 
3598
3599
3600
3601
 
3699
3700
3701
 
3702
3703
3704
3705
3706
 
3707
3708
3709
3710
 
3711
3712
3713
3714
3715
 
3716
3717
3718
3719
3720
 
3721
3722
3723
3724
 
3819
3820
3821
 
3822
3823
3824
3825
 
4392
4393
4394
 
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
 
4408
4409
4410
4411
4412
 
4413
4414
4415
4416
4417
 
4418
4419
4420
4421
 
4422
4423
4424
4425
4426
 
4427
4428
4429
4430
 
4743
4744
4745
 
4746
4747
4748
4749
 
4750
4751
4752
4753
 
4754
4755
4756
4757
 
4758
4759
4760
4761
4762
 
4763
4764
4765
4766
4767
 
4768
4769
4770
4771
4772
 
4773
4774
4775
4776
4777
4778
4779
 
4780
4781
4782
4783
4784
4785
4786
 
 
4787
4788
4789
4790
4791
 
4792
4793
4794
4795
 
4796
4797
4798
4799
 
4800
4801
4802
4803
 
4804
4805
4806
4807
4808
4809
 
4810
4811
4812
4813
4814
 
4815
4816
4817
4818
4819
 
4820
4821
4822
4823
 
4824
4825
4826
4827
 
4828
4829
4830
4831
 
4832
4833
4834
4835
 
4836
4837
4838
4839
 
4840
4841
4842
4843
 
4844
4845
4846
4847
 
4848
4849
4850
4851
 
4852
4853
4854
4855
 
4856
4857
4858
4859
 
4860
4861
4862
4863
 
4864
4865
4866
4867
 
4868
4869
4870
4871
 
4872
4873
4874
4875
 
4876
4877
4878
4879
 
4880
4881
4882
4883
 
4884
4885
4886
4887
 
4888
4889
4890
4891
 
4892
4893
4894
4895
 
4896
4897
4898
4899
 
4900
4901
4902
4903
 
4904
4905
4906
4907
 
4908
4909
4910
4911
 
4912
4913
4914
4915
 
4916
4917
4918
4919
 
4920
4921
4922
4923
 
4924
4925
4926
4927
 
4928
4929
4930
4931
 
4932
4933
4934
4935
 
4936
4937
4938
4939
 
4940
4941
4942
4943
 
4944
4945
4946
4947
 
4948
4949
4950
4951
 
4952
4953
4954
4955
 
4956
4957
4958
4959
 
4960
4961
4962
4963
 
4964
4965
4966
4967
 
4968
4969
4970
4971
 
4972
4973
4974
4975
 
4976
4977
4978
4979
 
4980
4981
4982
4983
 
4984
4985
4986
4987
 
4988
4989
4990
4991
 
4992
4993
4994
4995
 
4996
4997
4998
4999
 
5000
5001
5002
5003
 
5004
5005
5006
5007
 
5008
5009
5010
5011
 
5012
5013
5014
5015
 
5016
5017
5018
5019
 
5020
5021
5022
5023
 
5024
5025
5026
5027
 
5028
5029
5030
5031
 
5032
5033
5034
5035
 
5036
5037
5038
5039
 
5040
5041
5042
5043
 
5044
5045
5046
5047
5048
 
5049
5050
5051
5052
 
5053
5054
5055
5056
 
5057
5058
5059
5060
 
5061
5062
5063
5064
 
5065
5066
5067
5068
 
5069
5070
5071
5072
 
5073
5074
5075
5076
 
5077
5078
5079
5080
 
5081
5082
5083
5084
 
5085
5086
5087
5088
 
5089
5090
5091
5092
 
5093
5094
5095
5096
 
5097
5098
5099
5100
 
5101
5102
5103
5104
 
5105
5106
5107
5108
 
5109
5110
5111
5112
 
5113
5114
5115
5116
 
5117
5118
5119
5120
 
5121
5122
5123
5124
 
5125
5126
5127
5128
 
5129
5130
5131
5132
 
5133
5134
5135
5136
 
5137
5138
5139
5140
 
5141
5142
5143
5144
 
5145
5146
5147
5148
 
5149
5150
5151
5152
 
5153
5154
5155
5156
 
5157
5158
5159
5160
 
5161
5162
5163
5164
 
5165
5166
5167
5168
5169
 
5170
5171
5172
5173
 
5174
5175
5176
5177
5178
 
5179
5180
5181
5182
 
5183
5184
5185
5186
 
5187
5188
5189
5190
 
5191
5192
5193
5194
 
5195
5196
5197
5198
 
5199
5200
5201
5202
 
5203
5204
5205
5206
 
5207
5208
5209
5210
 
5211
5212
5213
5214
 
5521
5522
5523
 
5524
5525
5526
5527
 
5642
5643
5644
 
5645
5646
5647
5648
 
5750
5751
5752
 
5753
5754
5755
5756
 
6529
6530
6531
 
6532
6533
6534
6535
 
6536
6537
6538
6539
 
6540
6541
6542
6543
 
6544
6545
6546
6547
 
6548
6549
6550
6551
 
6552
6553
6554
6555
 
6556
6557
6558
6559
 
6560
6561
6562
6563
 
6564
6565
6566
6567
 
6568
6569
6570
6571
6572
 
6573
6574
6575
6576
 
6577
6578
6579
6580
 
6581
6582
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
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
 
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
 
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
6923
 
6924
6925
6926
6927
 
6928
6929
6930
6931
 
6932
6933
6934
6935
6936
 
6937
6938
6939
6940
 
6941
6942
6943
6944
 
6945
6946
6947
6948
 
6949
6950
6951
6952
 
6953
6954
6955
6956
 
6957
6958
6959
6960
 
6961
6962
6963
6964
 
6965
6966
6967
6968
 
6970
6971
6972
 
6973
6974
6975
6976
6977
6978
6979
 
6980
6981
6982
6983
6984
6985
 
6986
6987
6988
6989
6990
6991
 
6992
6993
6994
6995
 
6996
6997
6998
6999
7000
7001
 
7002
7003
7004
7005
 
7006
7007
7008
7009
 
7010
7011
7012
7013
7014
 
7015
7016
7017
7018
 
7019
7020
7021
7022
 
7023
7024
7025
7026
 
7027
7028
7029
7030
@@ -7,7 +7,7 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2011-07-18 12:16-0300\n" +"POT-Creation-Date: 2011-07-23 12:05-0300\n"  "PO-Revision-Date: 2011-03-07 18:36+0000\n"  "Last-Translator: David Planella <david.planella@ubuntu.com>\n"  "Language-Team: Catalan <ca@li.org>\n" @@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n"  "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-07-19 04:40+0000\n" +"X-Launchpad-Export-Date: 2011-07-24 04:37+0000\n"  "X-Generator: Launchpad (build 13405)\n"    #: TortoiseHgOverlayServer.py:51 @@ -86,7 +86,7 @@
 msgstr ""    #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:69 -#: tortoisehg/hgqt/sync.py:1466 +#: tortoisehg/hgqt/sync.py:1485  msgid "Recurse into subrepositories"  msgstr ""   @@ -319,7 +319,7 @@
 msgstr ""    #: tortoisehg/hgqt/backout.py:221 tortoisehg/hgqt/merge.py:215 -#: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:1010 +#: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:1029  #: tortoisehg/hgqt/update.py:98  msgid "Automatically resolve merge conflicts where possible"  msgstr "" @@ -451,7 +451,7 @@
 msgid "Please wait while committing merged files."  msgstr ""   -#: tortoisehg/hgqt/backout.py:613 tortoisehg/hgqt/cmdui.py:308 +#: tortoisehg/hgqt/backout.py:613 tortoisehg/hgqt/cmdui.py:313  #: tortoisehg/hgqt/merge.py:602 tortoisehg/hgtk/p4pending.py:101  msgid "Finished"  msgstr "" @@ -656,32 +656,32 @@
 msgstr ""    #: tortoisehg/hgqt/chunks.py:89 tortoisehg/hgqt/grep.py:547 -#: tortoisehg/hgqt/manifestdialog.py:198 tortoisehg/hgqt/revdetails.py:230 +#: tortoisehg/hgqt/manifestdialog.py:197 tortoisehg/hgqt/revdetails.py:230  #: tortoisehg/util/menuthg.py:76  msgid "Visual Diff"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:199 +#: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:198  #: tortoisehg/hgqt/revdetails.py:231  msgid "View file changes in external diff tool"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:205 +#: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:204  #: tortoisehg/hgqt/revdetails.py:239  msgid "Edit Local"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:206 +#: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:205  #: tortoisehg/hgqt/revdetails.py:240  msgid "Edit current file in working copy"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:207 +#: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:206  #: tortoisehg/hgqt/revdetails.py:241  msgid "Revert to Revision"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:208 +#: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:207  #: tortoisehg/hgqt/revdetails.py:242  msgid "Revert file(s) to contents at this revision"  msgstr "" @@ -755,7 +755,7 @@
 #: tortoisehg/hgqt/clone.py:96 tortoisehg/hgqt/commit.py:108  #: tortoisehg/hgqt/merge.py:202 tortoisehg/hgqt/mq.py:624  #: tortoisehg/hgqt/postreview_ui.py:170 tortoisehg/hgqt/rebase.py:57 -#: tortoisehg/hgqt/sync.py:146 tortoisehg/hgqt/tag.py:64 +#: tortoisehg/hgqt/sync.py:148 tortoisehg/hgqt/tag.py:64  #: tortoisehg/hgtk/hgemail.py:64  msgid "Options"  msgstr "" @@ -789,7 +789,7 @@
 msgid "Do not verify host certificate"  msgstr ""   -#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1482 +#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1501  #: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202  msgid "Remote command:"  msgstr "" @@ -802,7 +802,7 @@
 msgid "&Clone"  msgstr ""   -#: tortoisehg/hgqt/clone.py:183 tortoisehg/hgqt/cmdui.py:753 +#: tortoisehg/hgqt/clone.py:183 tortoisehg/hgqt/cmdui.py:761  #: tortoisehg/hgqt/thgimport.py:118 tortoisehg/hgqt/thgstrip.py:113  #: tortoisehg/hgqt/update.py:142  msgid "Detail" @@ -863,72 +863,76 @@
 msgid "The selected patch folder is not under the source repository."  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:228 tortoisehg/hgqt/thread.py:369 +#: tortoisehg/hgqt/cmdui.py:232 tortoisehg/hgqt/thread.py:369  #, python-format  msgid "[command returned code %d %%s]"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:230 tortoisehg/hgqt/thread.py:371 +#: tortoisehg/hgqt/cmdui.py:234 tortoisehg/hgqt/thread.py:371  #, python-format  msgid "[command completed successfully %s]"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:242 +#: tortoisehg/hgqt/cmdui.py:246  msgid "failed to start command\n"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:246 tortoisehg/hgqt/cmdui.py:539 +#: tortoisehg/hgqt/cmdui.py:250 tortoisehg/hgqt/cmdui.py:547  msgid "error while running command\n"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:294 tortoisehg/hgtk/statusbar.py:39 +#: tortoisehg/hgqt/cmdui.py:298 tortoisehg/hgtk/statusbar.py:39  msgid "Running..."  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:304 +#: tortoisehg/hgqt/cmdui.py:309  msgid "Terminated by user"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:306 +#: tortoisehg/hgqt/cmdui.py:311  msgid "Terminated"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:534 +#: tortoisehg/hgqt/cmdui.py:315 +msgid "Failed!" +msgstr "" + +#: tortoisehg/hgqt/cmdui.py:542  msgid "failed to run command\n"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:535 +#: tortoisehg/hgqt/cmdui.py:543  msgid "crashed\n"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:602 +#: tortoisehg/hgqt/cmdui.py:610  #, python-format  msgid "command parse error: %s"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:608 +#: tortoisehg/hgqt/cmdui.py:616  #, python-format  msgid "no matches found: %s"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:762 +#: tortoisehg/hgqt/cmdui.py:770  msgid "TortoiseHg Command Dialog"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:782 tortoisehg/hgqt/merge.py:101 +#: tortoisehg/hgqt/cmdui.py:790 tortoisehg/hgqt/merge.py:101  #: tortoisehg/hgqt/rebase.py:253 tortoisehg/hgqt/resolve.py:357  #: tortoisehg/hgqt/settings.py:776 tortoisehg/hgtk/commit.py:322  #: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846  msgid "Confirm Exit"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:783 +#: tortoisehg/hgqt/cmdui.py:791  msgid ""  "Mercurial command is still running.\n"  "Are you sure you want to terminate?"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:827 +#: tortoisehg/hgqt/cmdui.py:835  msgid "TortoiseHg"  msgstr ""   @@ -1147,16 +1151,16 @@
 msgstr ""    #: tortoisehg/hgqt/commit.py:932 tortoisehg/hgqt/commit.py:955 -#: tortoisehg/hgqt/commit.py:978 tortoisehg/hgqt/sync.py:952 -#: tortoisehg/hgqt/sync.py:1050 tortoisehg/hgqt/sync.py:1120 -#: tortoisehg/hgqt/sync.py:1288 +#: tortoisehg/hgqt/commit.py:978 tortoisehg/hgqt/sync.py:971 +#: tortoisehg/hgqt/sync.py:1069 tortoisehg/hgqt/sync.py:1139 +#: tortoisehg/hgqt/sync.py:1307  msgid "Iniparse must be installed."  msgstr ""    #: tortoisehg/hgqt/commit.py:947 tortoisehg/hgqt/commit.py:970  #: tortoisehg/hgqt/commit.py:993 tortoisehg/hgqt/settings.py:1107 -#: tortoisehg/hgqt/sync.py:962 tortoisehg/hgqt/sync.py:1061 -#: tortoisehg/hgqt/sync.py:1138 tortoisehg/hgqt/sync.py:1327 +#: tortoisehg/hgqt/sync.py:981 tortoisehg/hgqt/sync.py:1080 +#: tortoisehg/hgqt/sync.py:1157 tortoisehg/hgqt/sync.py:1346  #: tortoisehg/hgtk/thgconfig.py:1654  msgid "Unable to write configuration file"  msgstr "" @@ -2168,69 +2172,69 @@
 msgid "Workbench"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:58 +#: tortoisehg/hgqt/manifestdialog.py:57  #, python-format  msgid "Manifest %s@%s"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:189 tortoisehg/hgtk/thgmq.py:862 +#: tortoisehg/hgqt/manifestdialog.py:188 tortoisehg/hgtk/thgmq.py:862  msgid "Status"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:194 tortoisehg/hgqt/revdetails.py:226 +#: tortoisehg/hgqt/manifestdialog.py:193 tortoisehg/hgqt/revdetails.py:226  msgid "File history"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:195 tortoisehg/hgqt/revdetails.py:227 +#: tortoisehg/hgqt/manifestdialog.py:194 tortoisehg/hgqt/revdetails.py:227  msgid "Show the history of the selected file"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:196 tortoisehg/hgqt/revdetails.py:228 +#: tortoisehg/hgqt/manifestdialog.py:195 tortoisehg/hgqt/revdetails.py:228  msgid "Compare file revisions"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:197 tortoisehg/hgqt/revdetails.py:229 +#: tortoisehg/hgqt/manifestdialog.py:196 tortoisehg/hgqt/revdetails.py:229  msgid "Compare revisions of the selected file"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/hgqt/revdetails.py:232 +#: tortoisehg/hgqt/manifestdialog.py:199 tortoisehg/hgqt/revdetails.py:232  msgid "Visual Diff to Local"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:201 tortoisehg/hgqt/revdetails.py:233 +#: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/hgqt/revdetails.py:233  msgid "View changes to current in external diff tool"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:203 tortoisehg/hgqt/revdetails.py:235 +#: tortoisehg/hgqt/manifestdialog.py:202 tortoisehg/hgqt/revdetails.py:235  msgid "View at Revision"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:204 tortoisehg/hgqt/revdetails.py:236 +#: tortoisehg/hgqt/manifestdialog.py:203 tortoisehg/hgqt/revdetails.py:236  msgid "View file as it appeared at this revision"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:210 tortoisehg/hgqt/revdetails.py:244 +#: tortoisehg/hgqt/manifestdialog.py:209 tortoisehg/hgqt/revdetails.py:244  msgid "Open subrepository"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:211 tortoisehg/hgqt/revdetails.py:245 +#: tortoisehg/hgqt/manifestdialog.py:210 tortoisehg/hgqt/revdetails.py:245  #: tortoisehg/hgqt/revdetails.py:248  msgid "Open the selected subrepository"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:213 tortoisehg/hgqt/revdetails.py:247 +#: tortoisehg/hgqt/manifestdialog.py:212 tortoisehg/hgqt/revdetails.py:247  msgid "Explore subrepository"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:215 +#: tortoisehg/hgqt/manifestdialog.py:214  msgid "Open the selected subrepository in a file browser"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:217 tortoisehg/hgqt/revdetails.py:250 +#: tortoisehg/hgqt/manifestdialog.py:216 tortoisehg/hgqt/revdetails.py:250  msgid "Open terminal in subrepository"  msgstr ""   -#: tortoisehg/hgqt/manifestdialog.py:219 tortoisehg/hgqt/revdetails.py:252 +#: tortoisehg/hgqt/manifestdialog.py:218 tortoisehg/hgqt/revdetails.py:252  msgid "Open a shell terminal in the selected subrepository root"  msgstr ""   @@ -3092,15 +3096,15 @@
 msgid "A terminal shell must be configured"  msgstr ""   -#: tortoisehg/hgqt/qtlib.py:810 +#: tortoisehg/hgqt/qtlib.py:812  msgid "Show Log"  msgstr ""   -#: tortoisehg/hgqt/qtlib.py:980 +#: tortoisehg/hgqt/qtlib.py:982  msgid "Please enter a username"  msgstr ""   -#: tortoisehg/hgqt/qtlib.py:981 +#: tortoisehg/hgqt/qtlib.py:983  msgid "You must identify yourself to Mercurial"  msgstr ""   @@ -3137,7 +3141,7 @@
 msgid "Checkmark files to remove"  msgstr ""   -#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:529 +#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:548  #: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:47  #: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40  msgid "Remove" @@ -3582,7 +3586,7 @@
 msgid "Clone Repository"  msgstr ""   -#: tortoisehg/hgqt/reporegistry.py:410 tortoisehg/hgqt/sync.py:527 +#: tortoisehg/hgqt/reporegistry.py:410 tortoisehg/hgqt/sync.py:546  #: tortoisehg/hgqt/workbench.py:328  msgid "Explore"  msgstr "" @@ -3591,7 +3595,7 @@
 msgid "Open the repository in a file browser"  msgstr ""   -#: tortoisehg/hgqt/reporegistry.py:412 tortoisehg/hgqt/sync.py:528 +#: tortoisehg/hgqt/reporegistry.py:412 tortoisehg/hgqt/sync.py:547  #: tortoisehg/hgqt/workbench.py:331  msgid "Terminal"  msgstr "" @@ -3695,26 +3699,26 @@
 msgid "\"%s\" is not a valid repository inside \"%s\""  msgstr ""   -#: tortoisehg/hgqt/repotreeitem.py:246 +#: tortoisehg/hgqt/repotreeitem.py:250  #, python-format  msgid "Local Repository %s"  msgstr ""   -#: tortoisehg/hgqt/repotreeitem.py:308 +#: tortoisehg/hgqt/repotreeitem.py:312  msgid "Unable to update repository name"  msgstr ""   -#: tortoisehg/hgqt/repotreeitem.py:309 +#: tortoisehg/hgqt/repotreeitem.py:313  #, python-format  msgid "An error occurred while updating the repository hgrc file (%s)"  msgstr ""   -#: tortoisehg/hgqt/repotreeitem.py:488 +#: tortoisehg/hgqt/repotreeitem.py:470  msgid "default"  msgstr ""    #: tortoisehg/hgqt/repotreemodel.py:164 tortoisehg/hgqt/resolve.py:399 -#: tortoisehg/hgqt/sync.py:235 tortoisehg/hgqt/webconf.py:266 +#: tortoisehg/hgqt/sync.py:237 tortoisehg/hgqt/webconf.py:266  msgid "Path"  msgstr ""   @@ -3815,7 +3819,7 @@
 msgid "Reject incoming changesets"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:506 tortoisehg/hgqt/sync.py:912 +#: tortoisehg/hgqt/repowidget.py:506 tortoisehg/hgqt/sync.py:931  #: tortoisehg/hgtk/history.py:2021  #, python-format  msgid "%d outgoing changesets" @@ -4388,31 +4392,39 @@
 msgid "Unable to save file"  msgstr ""   -#: tortoisehg/hgqt/revert.py:22 +#: tortoisehg/hgqt/revert.py:22 tortoisehg/hgqt/revert.py:26 +msgid "Cannot revert to working directory" +msgstr "" + +#: tortoisehg/hgqt/revert.py:23 +msgid "Reverting to the working directory revision does not make sense" +msgstr "" + +#: tortoisehg/hgqt/revert.py:29  #, python-format  msgid "Revert - %s"  msgstr ""   -#: tortoisehg/hgqt/revert.py:33 +#: tortoisehg/hgqt/revert.py:40  #, python-format  msgid "<b>Revert %s to its contents at revision %d?</b>"  msgstr ""   -#: tortoisehg/hgqt/revert.py:37 +#: tortoisehg/hgqt/revert.py:44  #, python-format  msgid "<b>Revert %d files to their contents at revision %d?</b>"  msgstr ""   -#: tortoisehg/hgqt/revert.py:43 +#: tortoisehg/hgqt/revert.py:50  msgid "Revert all files to this revision"  msgstr ""   -#: tortoisehg/hgqt/revert.py:58 tortoisehg/hgqt/wctxactions.py:239 +#: tortoisehg/hgqt/revert.py:65 tortoisehg/hgqt/wctxactions.py:239  #: tortoisehg/hgtk/statusact.py:146  msgid "Confirm Revert"  msgstr ""   -#: tortoisehg/hgqt/revert.py:59 +#: tortoisehg/hgqt/revert.py:66  msgid ""  "Reverting all files will discard changes and leave affected files in a "  "modified state.<br><br>Are you sure you want to use revert?<br><br>(use " @@ -4731,472 +4743,472 @@
 msgid "Close this application?"  msgstr ""   -#: tortoisehg/hgqt/run.py:724 +#: tortoisehg/hgqt/run.py:730  msgid "annotate requires a single filename\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:781 tortoisehg/hgtk/hgtk.py:546 +#: tortoisehg/hgqt/run.py:787 tortoisehg/hgtk/hgtk.py:546  msgid "global options:"  msgstr ""   -#: tortoisehg/hgqt/run.py:783 +#: tortoisehg/hgqt/run.py:789  msgid "use \"thg help\" for the full list of commands"  msgstr ""   -#: tortoisehg/hgqt/run.py:787 +#: tortoisehg/hgqt/run.py:793  msgid ""  "use \"thg help\" for the full list of commands or \"thg -v\" for details"  msgstr ""   -#: tortoisehg/hgqt/run.py:790 +#: tortoisehg/hgqt/run.py:796  #, python-format  msgid "use \"thg -v help%s\" to show aliases and global options"  msgstr ""   -#: tortoisehg/hgqt/run.py:793 +#: tortoisehg/hgqt/run.py:799  #, python-format  msgid "use \"thg -v help %s\" to show global options"  msgstr ""   -#: tortoisehg/hgqt/run.py:805 tortoisehg/hgqt/run.py:914 +#: tortoisehg/hgqt/run.py:811 tortoisehg/hgqt/run.py:920  #: tortoisehg/hgtk/hgtk.py:570 tortoisehg/hgtk/hgtk.py:679  msgid ""  "list of commands:\n"  "\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:813 tortoisehg/hgtk/hgtk.py:578 +#: tortoisehg/hgqt/run.py:819 tortoisehg/hgtk/hgtk.py:578  #, python-format  msgid ""  "\n"  "aliases: %s\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:818 tortoisehg/hgqt/run.py:850 -#: tortoisehg/hgqt/run.py:883 tortoisehg/hgtk/hgtk.py:615 +#: tortoisehg/hgqt/run.py:824 tortoisehg/hgqt/run.py:856 +#: tortoisehg/hgqt/run.py:889 tortoisehg/hgtk/hgtk.py:615  msgid "(no help text available)"  msgstr ""   -#: tortoisehg/hgqt/run.py:826 tortoisehg/hgtk/hgtk.py:591 +#: tortoisehg/hgqt/run.py:832 tortoisehg/hgtk/hgtk.py:591  msgid "options:\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:855 tortoisehg/hgtk/hgtk.py:620 +#: tortoisehg/hgqt/run.py:861 tortoisehg/hgtk/hgtk.py:620  msgid "no commands defined\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:907 +#: tortoisehg/hgqt/run.py:913  msgid "Thg - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:912 tortoisehg/hgtk/hgtk.py:677 +#: tortoisehg/hgqt/run.py:918 tortoisehg/hgtk/hgtk.py:677  msgid ""  "basic commands:\n"  "\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:928 tortoisehg/hgtk/hgtk.py:693 +#: tortoisehg/hgqt/run.py:934 tortoisehg/hgtk/hgtk.py:693  #, python-format  msgid " (default: %s)"  msgstr ""   -#: tortoisehg/hgqt/run.py:945 tortoisehg/hgtk/hgtk.py:710 +#: tortoisehg/hgqt/run.py:951 tortoisehg/hgtk/hgtk.py:710  #, python-format  msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:974 tortoisehg/hgtk/hgtk.py:744 +#: tortoisehg/hgqt/run.py:980 tortoisehg/hgtk/hgtk.py:744  msgid "repository root directory or symbolic path name"  msgstr ""   -#: tortoisehg/hgqt/run.py:975 tortoisehg/hgtk/hgtk.py:745 +#: tortoisehg/hgqt/run.py:981 tortoisehg/hgtk/hgtk.py:745  msgid "enable additional output"  msgstr ""   -#: tortoisehg/hgqt/run.py:976 tortoisehg/hgtk/hgtk.py:746 +#: tortoisehg/hgqt/run.py:982 tortoisehg/hgtk/hgtk.py:746  msgid "suppress output"  msgstr ""   -#: tortoisehg/hgqt/run.py:977 tortoisehg/hgtk/hgtk.py:747 +#: tortoisehg/hgqt/run.py:983 tortoisehg/hgtk/hgtk.py:747  msgid "display help and exit"  msgstr ""   -#: tortoisehg/hgqt/run.py:978 tortoisehg/hgtk/hgtk.py:748 +#: tortoisehg/hgqt/run.py:984 tortoisehg/hgtk/hgtk.py:748  msgid "start debugger"  msgstr ""   -#: tortoisehg/hgqt/run.py:979 tortoisehg/hgtk/hgtk.py:749 +#: tortoisehg/hgqt/run.py:985 tortoisehg/hgtk/hgtk.py:749  msgid "print command execution profile"  msgstr ""   -#: tortoisehg/hgqt/run.py:980 tortoisehg/hgtk/hgtk.py:750 +#: tortoisehg/hgqt/run.py:986 tortoisehg/hgtk/hgtk.py:750  msgid "do not fork GUI process"  msgstr ""   -#: tortoisehg/hgqt/run.py:981 tortoisehg/hgtk/hgtk.py:751 +#: tortoisehg/hgqt/run.py:987 tortoisehg/hgtk/hgtk.py:751  msgid "always fork GUI process"  msgstr ""   -#: tortoisehg/hgqt/run.py:982 tortoisehg/hgtk/hgtk.py:752 +#: tortoisehg/hgqt/run.py:988 tortoisehg/hgtk/hgtk.py:752  msgid "read file list from file"  msgstr ""   -#: tortoisehg/hgqt/run.py:983 +#: tortoisehg/hgqt/run.py:989  msgid "read file list from file encoding utf-8"  msgstr ""   -#: tortoisehg/hgqt/run.py:987 +#: tortoisehg/hgqt/run.py:993  msgid "thg about"  msgstr ""   -#: tortoisehg/hgqt/run.py:988 +#: tortoisehg/hgqt/run.py:994  msgid "thg add [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:990 +#: tortoisehg/hgqt/run.py:996  msgid "revision to annotate"  msgstr ""   -#: tortoisehg/hgqt/run.py:991 tortoisehg/hgqt/run.py:1044 +#: tortoisehg/hgqt/run.py:997 tortoisehg/hgqt/run.py:1050  msgid "open to line"  msgstr ""   -#: tortoisehg/hgqt/run.py:992 tortoisehg/hgqt/run.py:1045 +#: tortoisehg/hgqt/run.py:998 tortoisehg/hgqt/run.py:1051  msgid "initial search pattern"  msgstr ""   -#: tortoisehg/hgqt/run.py:993 +#: tortoisehg/hgqt/run.py:999  msgid "thg annotate"  msgstr ""   -#: tortoisehg/hgqt/run.py:995 +#: tortoisehg/hgqt/run.py:1001  msgid "revision to archive"  msgstr ""   -#: tortoisehg/hgqt/run.py:996 +#: tortoisehg/hgqt/run.py:1002  msgid "thg archive"  msgstr ""   -#: tortoisehg/hgqt/run.py:999 +#: tortoisehg/hgqt/run.py:1005  msgid "merge with old dirstate parent after backout"  msgstr ""   -#: tortoisehg/hgqt/run.py:1000 +#: tortoisehg/hgqt/run.py:1006  msgid "parent to choose when backing out merge"  msgstr ""   -#: tortoisehg/hgqt/run.py:1001 +#: tortoisehg/hgqt/run.py:1007  msgid "revision to backout"  msgstr ""   -#: tortoisehg/hgqt/run.py:1002 +#: tortoisehg/hgqt/run.py:1008  msgid "thg backout [OPTION]... [[-r] REV]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1003 +#: tortoisehg/hgqt/run.py:1009  msgid "thg bisect"  msgstr ""   -#: tortoisehg/hgqt/run.py:1007 +#: tortoisehg/hgqt/run.py:1013  msgid "the clone will include an empty working copy (only a repository)"  msgstr ""   -#: tortoisehg/hgqt/run.py:1010 +#: tortoisehg/hgqt/run.py:1016  msgid "revision, tag or branch to check out"  msgstr ""   -#: tortoisehg/hgqt/run.py:1011 +#: tortoisehg/hgqt/run.py:1017  msgid "include the specified changeset"  msgstr ""   -#: tortoisehg/hgqt/run.py:1013 +#: tortoisehg/hgqt/run.py:1019  msgid "clone only the specified branch"  msgstr ""   -#: tortoisehg/hgqt/run.py:1014 +#: tortoisehg/hgqt/run.py:1020  msgid "use pull protocol to copy metadata"  msgstr ""   -#: tortoisehg/hgqt/run.py:1016 +#: tortoisehg/hgqt/run.py:1022  msgid "use uncompressed transfer (fast over LAN)"  msgstr ""   -#: tortoisehg/hgqt/run.py:1017 +#: tortoisehg/hgqt/run.py:1023  msgid "thg clone [OPTION]... SOURCE [DEST]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1019 tortoisehg/hgtk/hgtk.py:760 +#: tortoisehg/hgqt/run.py:1025 tortoisehg/hgtk/hgtk.py:760  msgid "record user as committer"  msgstr ""   -#: tortoisehg/hgqt/run.py:1020 tortoisehg/hgtk/hgtk.py:761 +#: tortoisehg/hgqt/run.py:1026 tortoisehg/hgtk/hgtk.py:761  msgid "record datecode as commit date"  msgstr ""   -#: tortoisehg/hgqt/run.py:1021 +#: tortoisehg/hgqt/run.py:1027  msgid "thg commit [OPTIONS] [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1022 +#: tortoisehg/hgqt/run.py:1028  msgid "thg drag_move SOURCE... DEST"  msgstr ""   -#: tortoisehg/hgqt/run.py:1023 +#: tortoisehg/hgqt/run.py:1029  msgid "thg drag_copy SOURCE... DEST"  msgstr ""   -#: tortoisehg/hgqt/run.py:1025 +#: tortoisehg/hgqt/run.py:1031  msgid "ignore case during search"  msgstr ""   -#: tortoisehg/hgqt/run.py:1026 +#: tortoisehg/hgqt/run.py:1032  msgid "thg grep"  msgstr ""   -#: tortoisehg/hgqt/run.py:1027 +#: tortoisehg/hgqt/run.py:1033  msgid "thg guess"  msgstr ""   -#: tortoisehg/hgqt/run.py:1028 +#: tortoisehg/hgqt/run.py:1034  msgid "thg hgignore [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1030 tortoisehg/hgtk/hgtk.py:826 +#: tortoisehg/hgqt/run.py:1036 tortoisehg/hgtk/hgtk.py:826  msgid "import to the patch queue (MQ)"  msgstr ""   -#: tortoisehg/hgqt/run.py:1031 +#: tortoisehg/hgqt/run.py:1037  msgid "thg import [OPTION] [SOURCE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1032 +#: tortoisehg/hgqt/run.py:1038  msgid "thg init [DEST]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1035 +#: tortoisehg/hgqt/run.py:1041  msgid "a revision to send"  msgstr ""   -#: tortoisehg/hgqt/run.py:1036 +#: tortoisehg/hgqt/run.py:1042  msgid "thg email [REVS]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1039 tortoisehg/hgtk/hgtk.py:767 +#: tortoisehg/hgqt/run.py:1045 tortoisehg/hgtk/hgtk.py:767  msgid "limit number of changes displayed"  msgstr ""   -#: tortoisehg/hgqt/run.py:1040 +#: tortoisehg/hgqt/run.py:1046  msgid "thg log [OPTIONS] [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1043 +#: tortoisehg/hgqt/run.py:1049  msgid "revision to display"  msgstr ""   -#: tortoisehg/hgqt/run.py:1046 +#: tortoisehg/hgqt/run.py:1052  msgid "thg manifest [-r REV] [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1049 +#: tortoisehg/hgqt/run.py:1055  msgid "revision to merge"  msgstr ""   -#: tortoisehg/hgqt/run.py:1050 +#: tortoisehg/hgqt/run.py:1056  msgid "thg merge [[-r] REV]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1051 +#: tortoisehg/hgqt/run.py:1057  msgid "thg remove [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1052 +#: tortoisehg/hgqt/run.py:1058  msgid "thg mq"  msgstr ""   -#: tortoisehg/hgqt/run.py:1053 +#: tortoisehg/hgqt/run.py:1059  msgid "thg resolve"  msgstr ""   -#: tortoisehg/hgqt/run.py:1054 +#: tortoisehg/hgqt/run.py:1060  msgid "thg revert [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1055 +#: tortoisehg/hgqt/run.py:1061  msgid "thg forget [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1056 +#: tortoisehg/hgqt/run.py:1062  msgid "thg rename SOURCE [DEST]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1060 tortoisehg/hgtk/hgtk.py:792 +#: tortoisehg/hgqt/run.py:1066 tortoisehg/hgtk/hgtk.py:792  #: tortoisehg/hgtk/serve.py:367  msgid "name of the hgweb config file (serve more than one repository)"  msgstr ""   -#: tortoisehg/hgqt/run.py:1062 tortoisehg/hgtk/hgtk.py:794 +#: tortoisehg/hgqt/run.py:1068 tortoisehg/hgtk/hgtk.py:794  msgid "name of the hgweb config file (DEPRECATED)"  msgstr ""   -#: tortoisehg/hgqt/run.py:1063 +#: tortoisehg/hgqt/run.py:1069  msgid "thg serve [--web-conf FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1064 +#: tortoisehg/hgqt/run.py:1070  msgid "thg sync"  msgstr ""   -#: tortoisehg/hgqt/run.py:1066 +#: tortoisehg/hgqt/run.py:1072  msgid "show files without changes"  msgstr ""   -#: tortoisehg/hgqt/run.py:1067 +#: tortoisehg/hgqt/run.py:1073  msgid "show ignored files"  msgstr ""   -#: tortoisehg/hgqt/run.py:1068 +#: tortoisehg/hgqt/run.py:1074  msgid "thg status [OPTIONS] [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1070 tortoisehg/hgqt/run.py:1101 +#: tortoisehg/hgqt/run.py:1076 tortoisehg/hgqt/run.py:1107  msgid "discard uncommitted changes (no backup)"  msgstr ""   -#: tortoisehg/hgqt/run.py:1071 +#: tortoisehg/hgqt/run.py:1077  msgid "do not back up stripped revisions"  msgstr ""   -#: tortoisehg/hgqt/run.py:1072 +#: tortoisehg/hgqt/run.py:1078  msgid "revision to strip"  msgstr ""   -#: tortoisehg/hgqt/run.py:1073 +#: tortoisehg/hgqt/run.py:1079  msgid "thg strip [-f] [-n] [[-r] REV]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1075 +#: tortoisehg/hgqt/run.py:1081  msgid "keep original changesets"  msgstr ""   -#: tortoisehg/hgqt/run.py:1076 +#: tortoisehg/hgqt/run.py:1082  msgid "keep original branch names"  msgstr ""   -#: tortoisehg/hgqt/run.py:1077 +#: tortoisehg/hgqt/run.py:1083  msgid "force detaching of source from its original branch"  msgstr ""   -#: tortoisehg/hgqt/run.py:1080 +#: tortoisehg/hgqt/run.py:1086  msgid "rebase from the specified changeset"  msgstr ""   -#: tortoisehg/hgqt/run.py:1082 +#: tortoisehg/hgqt/run.py:1088  msgid "rebase onto the specified changeset"  msgstr ""   -#: tortoisehg/hgqt/run.py:1083 +#: tortoisehg/hgqt/run.py:1089  msgid "thg rebase -s REV -d REV [--keep] [--detach]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1086 +#: tortoisehg/hgqt/run.py:1092  msgid "replace existing tag"  msgstr ""   -#: tortoisehg/hgqt/run.py:1087 +#: tortoisehg/hgqt/run.py:1093  msgid "make the tag local"  msgstr ""   -#: tortoisehg/hgqt/run.py:1088 +#: tortoisehg/hgqt/run.py:1094  msgid "revision to tag"  msgstr ""   -#: tortoisehg/hgqt/run.py:1089 +#: tortoisehg/hgqt/run.py:1095  msgid "remove a tag"  msgstr ""   -#: tortoisehg/hgqt/run.py:1090 +#: tortoisehg/hgqt/run.py:1096  msgid "use <text> as commit message"  msgstr ""   -#: tortoisehg/hgqt/run.py:1091 +#: tortoisehg/hgqt/run.py:1097  msgid "thg tag [-f] [-l] [-m TEXT] [-r REV] [NAME]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1092 +#: tortoisehg/hgqt/run.py:1098  msgid "thg shelve"  msgstr ""   -#: tortoisehg/hgqt/run.py:1093 +#: tortoisehg/hgqt/run.py:1099  msgid "thg rejects [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1094 +#: tortoisehg/hgqt/run.py:1100  msgid "thg test"  msgstr ""   -#: tortoisehg/hgqt/run.py:1095 +#: tortoisehg/hgqt/run.py:1101  msgid "thg help [COMMAND]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1096 +#: tortoisehg/hgqt/run.py:1102  msgid "thg purge"  msgstr ""   -#: tortoisehg/hgqt/run.py:1097 +#: tortoisehg/hgqt/run.py:1103  msgid "thg qreorder"  msgstr ""   -#: tortoisehg/hgqt/run.py:1098 +#: tortoisehg/hgqt/run.py:1104  msgid "thg qqueue"  msgstr ""   -#: tortoisehg/hgqt/run.py:1102 tortoisehg/hgtk/hgtk.py:805 +#: tortoisehg/hgqt/run.py:1108 tortoisehg/hgtk/hgtk.py:805  #: tortoisehg/hgtk/hgtk.py:820  msgid "revision to update"  msgstr ""   -#: tortoisehg/hgqt/run.py:1103 +#: tortoisehg/hgqt/run.py:1109  msgid "thg update [-C] [[-r] REV]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1105 tortoisehg/hgqt/run.py:1108 +#: tortoisehg/hgqt/run.py:1111 tortoisehg/hgqt/run.py:1114  #: tortoisehg/hgtk/hgtk.py:779 tortoisehg/hgtk/hgtk.py:782  msgid "field to give initial focus"  msgstr ""   -#: tortoisehg/hgqt/run.py:1106 +#: tortoisehg/hgqt/run.py:1112  msgid "thg userconfig"  msgstr ""   -#: tortoisehg/hgqt/run.py:1109 +#: tortoisehg/hgqt/run.py:1115  msgid "thg repoconfig"  msgstr ""   -#: tortoisehg/hgqt/run.py:1111 tortoisehg/hgtk/hgtk.py:808 +#: tortoisehg/hgqt/run.py:1117 tortoisehg/hgtk/hgtk.py:808  msgid "changeset to view in diff tool"  msgstr ""   -#: tortoisehg/hgqt/run.py:1112 tortoisehg/hgtk/hgtk.py:809 +#: tortoisehg/hgqt/run.py:1118 tortoisehg/hgtk/hgtk.py:809  msgid "revisions to view in diff tool"  msgstr ""   -#: tortoisehg/hgqt/run.py:1113 tortoisehg/hgtk/hgtk.py:810 +#: tortoisehg/hgqt/run.py:1119 tortoisehg/hgtk/hgtk.py:810  msgid "bundle file to preview"  msgstr ""   -#: tortoisehg/hgqt/run.py:1114 tortoisehg/hgtk/hgtk.py:811 +#: tortoisehg/hgqt/run.py:1120 tortoisehg/hgtk/hgtk.py:811  msgid "launch visual diff tool"  msgstr ""   -#: tortoisehg/hgqt/run.py:1116 tortoisehg/hgtk/hgtk.py:813 +#: tortoisehg/hgqt/run.py:1122 tortoisehg/hgtk/hgtk.py:813  msgid "print license"  msgstr ""   -#: tortoisehg/hgqt/run.py:1117 +#: tortoisehg/hgqt/run.py:1123  msgid "thg version [OPTION]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1122 +#: tortoisehg/hgqt/run.py:1128  msgid "thg shellconfig"  msgstr ""   @@ -5509,7 +5521,7 @@
 msgid "Commit"  msgstr ""   -#: tortoisehg/hgqt/settings.py:466 tortoisehg/hgqt/sync.py:1241 +#: tortoisehg/hgqt/settings.py:466 tortoisehg/hgqt/sync.py:1260  #: tortoisehg/hgtk/thgconfig.py:90  msgid "Username"  msgstr "" @@ -5630,7 +5642,7 @@
 msgid "Comma separated list of archive formats allowed for downloading"  msgstr ""   -#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgqt/sync.py:223 +#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgqt/sync.py:225  #: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368  msgid "Port"  msgstr "" @@ -5738,7 +5750,7 @@
 msgstr ""    #: tortoisehg/hgqt/settings.py:552 tortoisehg/hgqt/settings.py:672 -#: tortoisehg/hgqt/sync.py:1249 tortoisehg/hgtk/thgconfig.py:234 +#: tortoisehg/hgqt/sync.py:1268 tortoisehg/hgtk/thgconfig.py:234  #: tortoisehg/hgtk/thgconfig.py:370  msgid "Password"  msgstr "" @@ -6517,269 +6529,269 @@
 msgid "Malformed ssh URL"  msgstr ""   -#: tortoisehg/hgqt/sync.py:94 +#: tortoisehg/hgqt/sync.py:96  msgid "TortoiseHg Sync"  msgstr ""   -#: tortoisehg/hgqt/sync.py:113 +#: tortoisehg/hgqt/sync.py:115  msgid "Preview incoming changesets from remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:116 +#: tortoisehg/hgqt/sync.py:118  msgid "Pull incoming changesets from remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:119 +#: tortoisehg/hgqt/sync.py:121  msgid "Filter outgoing changesets to remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:122 +#: tortoisehg/hgqt/sync.py:124  msgid "Push outgoing changesets to remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:124 +#: tortoisehg/hgqt/sync.py:126  msgid "Email outgoing changesets for remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:129 +#: tortoisehg/hgqt/sync.py:131  msgid "Manage pending perforce changelists"  msgstr ""   -#: tortoisehg/hgqt/sync.py:135 +#: tortoisehg/hgqt/sync.py:137  msgid "Unbundle"  msgstr ""   -#: tortoisehg/hgqt/sync.py:139 +#: tortoisehg/hgqt/sync.py:141  msgid "Stop current operation"  msgstr ""   -#: tortoisehg/hgqt/sync.py:153 tortoisehg/hgqt/update.py:68 +#: tortoisehg/hgqt/sync.py:155 tortoisehg/hgqt/update.py:68  #: tortoisehg/hgtk/update.py:78  msgid "Target:"  msgstr ""   -#: tortoisehg/hgqt/sync.py:170 +#: tortoisehg/hgqt/sync.py:172  msgid "<b>Selected Options:</b>"  msgstr ""   -#: tortoisehg/hgqt/sync.py:180 +#: tortoisehg/hgqt/sync.py:182  msgid "<b>Remote Repository:</b>"  msgstr ""   -#: tortoisehg/hgqt/sync.py:191 +#: tortoisehg/hgqt/sync.py:193  msgid "Path Edit Toolbar"  msgstr ""   -#: tortoisehg/hgqt/sync.py:202 +#: tortoisehg/hgqt/sync.py:204  msgid "Security"  msgstr ""   -#: tortoisehg/hgqt/sync.py:203 +#: tortoisehg/hgqt/sync.py:205  msgid "Manage HTTPS connection security and user authentication"  msgstr ""   -#: tortoisehg/hgqt/sync.py:209 +#: tortoisehg/hgqt/sync.py:211  msgid "Hostname"  msgstr ""   -#: tortoisehg/hgqt/sync.py:242 tortoisehg/hgqt/webconf_ui.py:77 +#: tortoisehg/hgqt/sync.py:244 tortoisehg/hgqt/webconf_ui.py:77  msgid "Save"  msgstr ""   -#: tortoisehg/hgqt/sync.py:243 +#: tortoisehg/hgqt/sync.py:245  msgid "Save current URL under an alias"  msgstr ""   -#: tortoisehg/hgqt/sync.py:257 +#: tortoisehg/hgqt/sync.py:259  msgid "Paths in Repository Settings:"  msgstr ""   -#: tortoisehg/hgqt/sync.py:272 +#: tortoisehg/hgqt/sync.py:274  msgid "Related Paths:"  msgstr ""   -#: tortoisehg/hgqt/sync.py:309 +#: tortoisehg/hgqt/sync.py:327  #, python-format  msgid "Preview incoming changesets from %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:310 +#: tortoisehg/hgqt/sync.py:328  #, python-format  msgid "Pull incoming changesets from %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:311 +#: tortoisehg/hgqt/sync.py:329  #, python-format  msgid "Filter outgoing changesets to %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:312 +#: tortoisehg/hgqt/sync.py:330  #, python-format  msgid "Push outgoing changesets to %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:319 +#: tortoisehg/hgqt/sync.py:337  #, python-format  msgid "rev: %d (%s)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:324 tortoisehg/hgtk/commit.py:791 +#: tortoisehg/hgqt/sync.py:342 tortoisehg/hgtk/commit.py:791  msgid "branch: "  msgstr ""   -#: tortoisehg/hgqt/sync.py:330 +#: tortoisehg/hgqt/sync.py:348  msgid "bookmark: "  msgstr ""   -#: tortoisehg/hgqt/sync.py:376 tortoisehg/hgtk/synch.py:157 +#: tortoisehg/hgqt/sync.py:394 tortoisehg/hgtk/synch.py:157  msgid "Post Pull: "  msgstr ""   -#: tortoisehg/hgqt/sync.py:555 +#: tortoisehg/hgqt/sync.py:574  msgid "Repository not local"  msgstr ""   -#: tortoisehg/hgqt/sync.py:556 +#: tortoisehg/hgqt/sync.py:575  msgid "A terminal shell cannot be opened for remote"  msgstr ""   -#: tortoisehg/hgqt/sync.py:561 tortoisehg/hgqt/sync.py:1361 +#: tortoisehg/hgqt/sync.py:580 tortoisehg/hgqt/sync.py:1380  msgid "Confirm path delete"  msgstr ""   -#: tortoisehg/hgqt/sync.py:562 tortoisehg/hgqt/sync.py:1362 +#: tortoisehg/hgqt/sync.py:581 tortoisehg/hgqt/sync.py:1381  #, python-format  msgid "Delete %s from your repo configuration file?"  msgstr ""   -#: tortoisehg/hgqt/sync.py:651 +#: tortoisehg/hgqt/sync.py:670  msgid "No URL selected"  msgstr ""   -#: tortoisehg/hgqt/sync.py:652 +#: tortoisehg/hgqt/sync.py:671  msgid "An URL must be selected for this operation."  msgstr ""   -#: tortoisehg/hgqt/sync.py:667 +#: tortoisehg/hgqt/sync.py:686  msgid "Redundant authentication info"  msgstr ""   -#: tortoisehg/hgqt/sync.py:668 +#: tortoisehg/hgqt/sync.py:687  msgid ""  "You have authentication info configured for this host and inside this URL. "  "Remove authentication info from this URL?"  msgstr ""   -#: tortoisehg/hgqt/sync.py:687 tortoisehg/hgqt/sync.py:693 -#: tortoisehg/hgqt/sync.py:699 tortoisehg/hgqt/sync.py:705 -#: tortoisehg/hgqt/sync.py:712 +#: tortoisehg/hgqt/sync.py:706 tortoisehg/hgqt/sync.py:712 +#: tortoisehg/hgqt/sync.py:718 tortoisehg/hgqt/sync.py:724 +#: tortoisehg/hgqt/sync.py:731  msgid "sync command already running"  msgstr ""   -#: tortoisehg/hgqt/sync.py:730 +#: tortoisehg/hgqt/sync.py:749  #, python-format  msgid "Getting incoming changesets from %s..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:735 tortoisehg/hgqt/sync.py:753 +#: tortoisehg/hgqt/sync.py:754 tortoisehg/hgqt/sync.py:772  #, python-format  msgid "Found incoming changesets from %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:738 tortoisehg/hgqt/sync.py:755 +#: tortoisehg/hgqt/sync.py:757 tortoisehg/hgqt/sync.py:774  #, python-format  msgid "No incoming changesets from %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:740 tortoisehg/hgqt/sync.py:757 +#: tortoisehg/hgqt/sync.py:759 tortoisehg/hgqt/sync.py:776  #, python-format  msgid "Incoming from %s aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:767 +#: tortoisehg/hgqt/sync.py:786  #, python-format  msgid "Pull from %s completed"  msgstr ""   -#: tortoisehg/hgqt/sync.py:769 +#: tortoisehg/hgqt/sync.py:788  #, python-format  msgid "Pull from %s aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:781 tortoisehg/hgqt/update.py:342 +#: tortoisehg/hgqt/sync.py:800 tortoisehg/hgqt/update.py:342  msgid "Merge caused file conflicts"  msgstr ""   -#: tortoisehg/hgqt/sync.py:782 tortoisehg/hgqt/update.py:343 +#: tortoisehg/hgqt/sync.py:801 tortoisehg/hgqt/update.py:343  msgid "File conflicts need to be resolved"  msgstr ""   -#: tortoisehg/hgqt/sync.py:788 +#: tortoisehg/hgqt/sync.py:807  #, python-format  msgid "Pulling from %s..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:803 +#: tortoisehg/hgqt/sync.py:822  #, python-format  msgid "Finding outgoing changesets to %s..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:815 +#: tortoisehg/hgqt/sync.py:834  #, python-format  msgid "%d outgoing changesets to %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:818 +#: tortoisehg/hgqt/sync.py:837  #, python-format  msgid "No outgoing changesets to %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:820 +#: tortoisehg/hgqt/sync.py:839  #, python-format  msgid "Outgoing to %s aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:845 tortoisehg/hgtk/history.py:584 +#: tortoisehg/hgqt/sync.py:864 tortoisehg/hgtk/history.py:584  #, python-format  msgid "%s (submitted)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:847 tortoisehg/hgtk/history.py:586 +#: tortoisehg/hgqt/sync.py:866 tortoisehg/hgtk/history.py:586  #: tortoisehg/hgtk/history.py:592  #, python-format  msgid "%s (pending)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:852 tortoisehg/hgtk/history.py:595 +#: tortoisehg/hgqt/sync.py:871 tortoisehg/hgtk/history.py:595  msgid "Unable to parse p4pending output"  msgstr ""   -#: tortoisehg/hgqt/sync.py:854 tortoisehg/hgtk/history.py:597 +#: tortoisehg/hgqt/sync.py:873 tortoisehg/hgtk/history.py:597  #, python-format  msgid "%d pending changelists found"  msgstr ""   -#: tortoisehg/hgqt/sync.py:856 tortoisehg/hgtk/history.py:599 +#: tortoisehg/hgqt/sync.py:875 tortoisehg/hgtk/history.py:599  msgid "No pending Perforce changelists"  msgstr ""   -#: tortoisehg/hgqt/sync.py:858 tortoisehg/hgtk/history.py:601 +#: tortoisehg/hgqt/sync.py:877 tortoisehg/hgtk/history.py:601  msgid "Aborted p4pending"  msgstr ""   -#: tortoisehg/hgqt/sync.py:860 tortoisehg/hgtk/history.py:603 +#: tortoisehg/hgqt/sync.py:879 tortoisehg/hgtk/history.py:603  msgid "Unable to determine pending changesets"  msgstr ""   -#: tortoisehg/hgqt/sync.py:870 +#: tortoisehg/hgqt/sync.py:889  msgid "Perforce pending..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:878 tortoisehg/hgtk/history.py:2623 +#: tortoisehg/hgqt/sync.py:897 tortoisehg/hgtk/history.py:2623  msgid "Confirm Push to remote Repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:879 tortoisehg/hgtk/history.py:2624 +#: tortoisehg/hgqt/sync.py:898 tortoisehg/hgtk/history.py:2624  #, python-format  msgid ""  "Push to remote repository\n" @@ -6787,170 +6799,170 @@
 "?"  msgstr ""   -#: tortoisehg/hgqt/sync.py:882 +#: tortoisehg/hgqt/sync.py:901  #, python-format  msgid "Push to %s aborted"  msgstr ""   -#: tortoisehg/hgqt/sync.py:886 +#: tortoisehg/hgqt/sync.py:905  #, python-format  msgid "Pushing to %s..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:889 +#: tortoisehg/hgqt/sync.py:908  #, python-format  msgid "Push to %s completed"  msgstr ""   -#: tortoisehg/hgqt/sync.py:891 +#: tortoisehg/hgqt/sync.py:910  #, python-format  msgid "Push to %s aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:908 +#: tortoisehg/hgqt/sync.py:927  msgid "Determining outgoing changesets to email..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:922 tortoisehg/hgtk/history.py:2025 +#: tortoisehg/hgqt/sync.py:941 tortoisehg/hgtk/history.py:2025  msgid "No outgoing changesets"  msgstr ""   -#: tortoisehg/hgqt/sync.py:924 +#: tortoisehg/hgqt/sync.py:943  #, python-format  msgid "Outgoing aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:931 +#: tortoisehg/hgqt/sync.py:950  msgid "Select bundle file"  msgstr ""   -#: tortoisehg/hgqt/sync.py:932 +#: tortoisehg/hgqt/sync.py:951  msgid "Bundle files (*.hg)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:951 +#: tortoisehg/hgqt/sync.py:970  msgid "Unable to remove URL"  msgstr ""   -#: tortoisehg/hgqt/sync.py:973 +#: tortoisehg/hgqt/sync.py:992  msgid "Post Pull Behavior"  msgstr ""   -#: tortoisehg/hgqt/sync.py:977 +#: tortoisehg/hgqt/sync.py:996  msgid "Select post-pull operation for this repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:980 +#: tortoisehg/hgqt/sync.py:999  msgid "None - simply pull changesets"  msgstr ""   -#: tortoisehg/hgqt/sync.py:981 +#: tortoisehg/hgqt/sync.py:1000  msgid "Update - pull, then try to update"  msgstr ""   -#: tortoisehg/hgqt/sync.py:987 +#: tortoisehg/hgqt/sync.py:1006  msgid "Fetch - use fetch (auto merge pulled changes)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:989 +#: tortoisehg/hgqt/sync.py:1008  msgid "Fetch - use fetch extension (fetch is not active!)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:996 +#: tortoisehg/hgqt/sync.py:1015  msgid "Rebase - rebase local commits above pulled changes"  msgstr ""   -#: tortoisehg/hgqt/sync.py:998 +#: tortoisehg/hgqt/sync.py:1017  msgid "Rebase - use rebase extension (rebase is not active!)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1016 +#: tortoisehg/hgqt/sync.py:1035  msgid "<a href=\"config\">Launch settings tool...</a>"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1049 +#: tortoisehg/hgqt/sync.py:1068  msgid "Unable to save post pull operation"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1073 +#: tortoisehg/hgqt/sync.py:1092  msgid "Save Path"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1083 tortoisehg/hgqt/sync.py:1405 +#: tortoisehg/hgqt/sync.py:1102 tortoisehg/hgqt/sync.py:1424  #: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954  msgid "Alias"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1086 tortoisehg/hgqt/sync.py:1405 +#: tortoisehg/hgqt/sync.py:1105 tortoisehg/hgqt/sync.py:1424  #: tortoisehg/hgtk/thgconfig.py:368  msgid "URL"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1095 +#: tortoisehg/hgqt/sync.py:1114  msgid "Remove authentication data from URL"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1097 +#: tortoisehg/hgqt/sync.py:1116  msgid ""  "User authentication data should be associated with the hostname using the "  "security dialog."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1119 +#: tortoisehg/hgqt/sync.py:1138  msgid "Unable to save an URL"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1130 +#: tortoisehg/hgqt/sync.py:1149  msgid "Confirm URL replace"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1131 +#: tortoisehg/hgqt/sync.py:1150  #, python-format  msgid "%s already exists, replace URL?"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1155 +#: tortoisehg/hgqt/sync.py:1174  msgid "Certificate Query Error"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1168 +#: tortoisehg/hgqt/sync.py:1187  msgid "Security: "  msgstr ""   -#: tortoisehg/hgqt/sync.py:1187 +#: tortoisehg/hgqt/sync.py:1206  #, python-format  msgid "<b>Host:</b> %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1189 +#: tortoisehg/hgqt/sync.py:1208  msgid "Secure HTTPS Connection"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1196 +#: tortoisehg/hgqt/sync.py:1215  msgid "Verify with Certificate Authority certificates (best)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1198 +#: tortoisehg/hgqt/sync.py:1217  msgid "Verify with stored host fingerprint (good)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1200 +#: tortoisehg/hgqt/sync.py:1219  msgid "No host validation, but still encrypted (bad)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1207 +#: tortoisehg/hgqt/sync.py:1226  msgid "### host certificate fingerprint ###"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1211 +#: tortoisehg/hgqt/sync.py:1230  msgid "Query"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1230 +#: tortoisehg/hgqt/sync.py:1249  msgid "User Authentication"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1237 +#: tortoisehg/hgqt/sync.py:1256  msgid ""  "Optional. Username to authenticate with. If not given, and the remote\n"  "site requires basic or digest authentication, the user will be prompted for\n" @@ -6958,61 +6970,61 @@
 "foo.username = $USER."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1246 +#: tortoisehg/hgqt/sync.py:1265  msgid ""  "Optional. Password to authenticate with. If not given, and the remote\n"  "site requires basic or digest authentication, the user will be prompted for\n"  "it."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1253 +#: tortoisehg/hgqt/sync.py:1272  msgid ""  "Mercurial keyring extension is enabled. Passwords will be stored in a "  "platform-native secure method."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1259 +#: tortoisehg/hgqt/sync.py:1278  msgid ""  "Optional. PEM encoded client certificate key file. Environment variables\n"  "are expanded in the filename."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1261 +#: tortoisehg/hgqt/sync.py:1280  msgid "User Certificate Key File"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1265 +#: tortoisehg/hgqt/sync.py:1284  msgid ""  "Optional. PEM encoded client certificate chain file. Environment variables\n"  "are expanded in the filename."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1267 +#: tortoisehg/hgqt/sync.py:1286  msgid "User Certificate Chain File"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1287 +#: tortoisehg/hgqt/sync.py:1306  msgid "Unable to save authentication"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1449 +#: tortoisehg/hgqt/sync.py:1468  #, python-format  msgid "%s - sync options"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1456 +#: tortoisehg/hgqt/sync.py:1475  msgid "Allow push of a new branch (--new-branch)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1461 +#: tortoisehg/hgqt/sync.py:1480  msgid "Force push or pull (override safety checks, --force)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1471 +#: tortoisehg/hgqt/sync.py:1490  msgid "Temporarily disable configured HTTP proxy"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1478 +#: tortoisehg/hgqt/sync.py:1497  msgid "Emit debugging output (--debug)"  msgstr ""  
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
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/​sr.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
Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes