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

stable 2.0.1 i18n: pull latest translations

Changeset ee531052f78b

Parent 90821b209461

by Steve Borho

Changes to 29 files · Browse files at ee531052f78b Showing diff from parent 90821b209461 Diff from another changeset...

Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
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
 
7
8
9
10
 
11
12
13
14
15
16
17
18
 
 
19
20
21
 
25
26
27
28
 
29
30
31
32
33
 
34
35
36
37
 
38
39
40
41
42
 
43
44
45
46
 
47
48
49
50
51
 
 
52
53
54
 
64
65
66
67
 
68
69
70
 
111
112
113
114
 
 
 
 
 
 
115
116
117
 
120
121
122
123
 
124
125
126
 
 
127
128
129
 
138
139
140
141
142
 
 
143
144
145
 
192
193
194
195
196
197
 
 
 
198
199
200
 
 
201
202
203
 
204
205
 
206
207
208
 
290
291
292
293
294
 
 
295
296
297
 
 
298
299
300
 
307
308
309
310
 
311
312
313
 
316
317
318
319
 
320
321
322
 
327
328
329
330
 
331
332
333
 
337
338
339
340
341
342
 
 
 
343
344
345
 
413
414
415
416
417
 
 
418
419
420
421
422
423
424
 
425
426
427
428
429
430
431
432
433
 
 
 
 
 
 
 
434
435
436
437
438
439
440
441
 
 
 
 
 
 
442
443
444
445
 
 
 
 
 
446
447
448
449
450
 
451
452
453
454
455
 
456
457
458
459
460
 
 
 
 
 
 
 
 
 
 
 
461
462
463
464
465
466
 
467
468
469
470
471
 
472
473
474
 
477
478
479
480
 
481
482
483
484
 
485
486
487
488
 
489
490
491
492
 
493
494
495
 
565
566
567
568
 
569
570
571
572
573
 
574
575
576
577
578
 
579
580
581
582
583
 
584
585
586
587
588
 
589
590
591
592
593
 
594
595
596
597
 
598
599
600
601
 
602
603
604
605
 
606
607
608
609
 
610
611
612
613
 
614
615
616
617
618
619
 
 
620
621
622
623
 
624
625
626
627
 
628
629
630
631
 
632
633
634
635
636
637
 
 
638
639
640
641
 
642
643
644
645
 
646
647
648
649
 
650
651
652
653
 
654
655
656
657
 
658
659
660
661
 
662
663
664
665
 
666
667
668
669
 
670
671
672
 
700
701
702
703
 
704
705
706
 
729
730
731
732
 
733
734
735
736
737
 
738
739
740
741
742
743
 
744
745
746
 
 
 
 
747
748
749
750
751
752
753
754
755
 
756
757
758
759
 
 
 
 
 
 
 
 
 
 
 
 
 
760
761
762
 
 
 
 
763
764
765
766
767
768
769
770
771
 
772
773
774
775
776
 
777
778
779
780
 
781
782
783
784
785
 
786
787
788
789
 
790
791
792
793
 
794
795
796
797
798
 
799
800
801
802
803
 
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
 
 
 
 
 
 
 
 
 
 
 
 
 
 
832
833
834
835
836
837
838
839
840
841
842
843
844
 
 
 
 
 
 
 
 
 
 
845
846
847
848
 
849
850
851
852
 
853
854
855
856
857
858
859
860
861
862
863
864
 
 
 
 
 
865
866
867
868
869
870
871
872
873
874
875
876
 
 
 
 
 
877
878
879
880
881
 
 
882
883
884
885
 
886
887
888
889
 
890
891
892
893
 
894
895
896
897
898
 
899
900
901
902
 
903
904
905
906
 
907
908
909
910
911
912
913
 
 
 
 
914
915
916
917
918
919
920
 
 
 
 
921
922
923
924
925
 
926
927
928
929
 
930
931
932
933
 
934
935
936
937
 
938
939
940
 
979
980
981
982
983
 
 
984
985
986
987
988
989
 
990
991
992
993
994
995
996
 
 
 
997
998
999
 
1081
1082
1083
1084
 
1085
1086
1087
1088
1089
 
1090
1091
1092
1093
 
1094
1095
1096
 
 
 
 
1097
1098
1099
1100
1101
1102
1103
1104
1105
 
1106
1107
1108
1109
 
1110
1111
1112
1113
 
1114
1115
1116
1117
 
1118
1119
1120
1121
 
1122
1123
1124
1125
1126
 
1127
1128
1129
1130
 
1131
1132
1133
1134
 
1135
1136
1137
1138
 
1139
1140
1141
1142
 
1143
1144
1145
1146
 
1147
1148
1149
1150
 
1151
1152
1153
1154
 
1155
1156
1157
1158
 
1159
1160
1161
 
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
 
1229
1230
1231
1232
 
1233
1234
1235
 
1279
1280
1281
1282
 
1283
1284
1285
 
1355
1356
1357
1358
 
1359
1360
1361
 
1389
1390
1391
1392
 
1393
1394
1395
1396
1397
 
1398
1399
1400
1401
 
1402
1403
1404
1405
1406
1407
 
 
1408
1409
1410
 
1412
1413
1414
1415
 
1416
1417
1418
 
1505
1506
1507
1508
 
1509
1510
1511
1512
 
1513
1514
1515
1516
 
1517
1518
1519
1520
 
1521
1522
1523
1524
1525
 
1526
1527
1528
1529
 
1530
1531
1532
1533
 
1534
1535
1536
1537
 
1538
1539
1540
1541
 
1542
1543
1544
1545
 
1546
1547
1548
 
1552
1553
1554
1555
 
1556
1557
1558
1559
 
1560
1561
1562
 
1566
1567
1568
1569
 
1570
1571
1572
1573
 
1574
1575
1576
 
1580
1581
1582
1583
 
1584
1585
1586
1587
 
1588
1589
1590
 
1594
1595
1596
1597
 
1598
1599
1600
1601
 
1602
1603
1604
1605
 
1606
1607
1608
1609
 
1610
1611
1612
1613
 
1614
1615
1616
1617
 
1618
1619
1620
1621
 
1622
1623
1624
1625
 
1626
1627
1628
 
1637
1638
1639
1640
 
1641
1642
1643
1644
 
1645
1646
1647
1648
 
1649
1650
1651
1652
 
1653
1654
1655
1656
1657
1658
 
1659
1660
1661
1662
 
1663
1664
1665
1666
 
1667
1668
1669
 
1681
1682
1683
1684
1685
1686
1687
 
 
 
 
 
1688
1689
1690
1691
1692
 
1693
1694
1695
 
1726
1727
1728
1729
 
1730
1731
1732
 
1829
1830
1831
1832
 
1833
1834
1835
 
1844
1845
1846
1847
1848
 
1849
1850
1851
 
1942
1943
1944
1945
1946
1947
1948
1949
 
 
 
 
 
1950
1951
1952
1953
 
1954
1955
1956
1957
1958
1959
1960
1961
 
 
 
 
 
1962
1963
1964
1965
 
1966
1967
1968
1969
 
1970
1971
1972
1973
 
1974
1975
1976
1977
 
1978
1979
1980
1981
1982
1983
1984
 
1985
1986
1987
1988
 
1989
1990
1991
1992
 
1993
1994
1995
1996
1997
1998
 
1999
2000
2001
2002
2003
2004
 
2005
2006
2007
2008
 
2009
2010
2011
2012
 
2013
2014
2015
2016
 
2017
2018
2019
2020
 
2021
2022
2023
2024
2025
 
2026
2027
2028
2029
 
2030
2031
2032
2033
 
2034
2035
2036
2037
 
2038
2039
2040
2041
2042
2043
 
2044
2045
2046
2047
 
2048
2049
2050
 
2089
2090
2091
 
 
 
 
2092
2093
2094
 
2135
2136
2137
2138
 
2139
2140
2141
2142
2143
 
2144
2145
2146
2147
 
2148
2149
2150
2151
 
2152
2153
2154
2155
 
2156
2157
2158
2159
 
2160
2161
2162
2163
 
2164
2165
2166
2167
 
2168
2169
2170
2171
 
2172
2173
2174
 
2268
2269
2270
2271
 
2272
2273
2274
 
2423
2424
2425
2426
2427
2428
2429
2430
 
 
 
 
2431
2432
2433
 
2456
2457
2458
2459
 
2460
2461
2462
 
2624
2625
2626
 
 
 
 
 
 
 
 
2627
2628
2629
 
2657
2658
2659
2660
 
2661
2662
2663
 
2732
2733
2734
2735
 
2736
2737
2738
2739
 
2740
2741
2742
 
2885
2886
2887
2888
 
2889
2890
2891
2892
2893
 
2894
2895
2896
2897
 
2898
2899
2900
2901
 
2902
2903
2904
 
2964
2965
2966
2967
 
2968
2969
2970
 
2973
2974
2975
2976
 
2977
2978
2979
 
3017
3018
3019
3020
3021
 
 
3022
3023
3024
 
3030
3031
3032
3033
 
3034
3035
3036
3037
3038
 
3039
3040
3041
3042
3043
 
3044
3045
3046
 
3057
3058
3059
3060
 
3061
3062
3063
3064
 
3065
3066
3067
3068
3069
 
3070
3071
3072
3073
 
3074
3075
3076
3077
3078
3079
 
3080
3081
3082
3083
3084
 
3085
3086
3087
3088
3089
 
3090
3091
3092
3093
3094
 
3095
3096
3097
3098
3099
 
3100
3101
3102
3103
 
3104
3105
3106
3107
 
3108
3109
3110
3111
 
3112
3113
3114
3115
3116
 
3117
3118
3119
3120
 
3121
3122
3123
3124
3125
 
3126
3127
3128
3129
 
3130
3131
3132
3133
 
3134
3135
3136
3137
 
3138
3139
3140
 
3142
3143
3144
3145
3146
3147
3148
3149
 
 
 
 
 
3150
3151
3152
3153
 
3154
3155
3156
3157
 
3158
3159
3160
3161
 
3162
3163
3164
3165
 
3166
3167
3168
3169
 
3170
3171
3172
3173
 
3174
3175
3176
3177
 
3178
3179
3180
3181
 
3182
3183
3184
3185
 
3186
3187
3188
3189
 
3190
3191
3192
3193
 
3194
3195
3196
3197
 
3198
3199
3200
3201
 
3202
3203
3204
3205
 
3206
3207
3208
3209
3210
3211
3212
3213
 
 
 
 
 
3214
3215
3216
3217
 
3218
3219
3220
3221
 
3222
3223
3224
3225
 
3226
3227
3228
3229
 
3230
3231
3232
3233
 
3234
3235
3236
3237
 
3238
3239
3240
3241
 
3242
3243
3244
3245
 
3246
3247
3248
3249
 
3250
3251
3252
3253
 
3254
3255
3256
3257
 
3258
3259
3260
3261
 
3262
3263
3264
3265
 
3266
3267
3268
3269
 
3270
3271
3272
3273
3274
3275
3276
3277
 
 
 
 
 
3278
3279
3280
3281
3282
3283
3284
3285
 
 
 
 
 
3286
3287
3288
3289
 
3290
3291
3292
3293
 
3294
3295
3296
3297
 
3298
3299
3300
3301
 
3302
3303
3304
3305
 
3306
3307
3308
3309
3310
3311
 
3312
3313
3314
3315
 
3316
3317
3318
3319
 
3320
3321
3322
3323
 
3324
3325
3326
3327
 
3328
3329
3330
3331
 
3332
3333
3334
3335
 
 
 
 
 
3336
3337
3338
3339
 
3340
3341
3342
 
3460
3461
3462
3463
 
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
 
 
 
 
 
3475
3476
3477
3478
 
3479
3480
3481
3482
3483
 
3484
3485
3486
3487
3488
 
 
 
 
 
 
3489
3490
3491
 
3675
3676
3677
3678
 
3679
3680
3681
3682
 
3683
3684
3685
3686
 
3687
3688
3689
3690
 
3691
3692
3693
3694
 
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
 
3721
3722
3723
3724
 
3725
3726
3727
3728
 
3729
3730
3731
3732
 
3733
3734
3735
 
3815
3816
3817
3818
 
3819
3820
3821
3822
 
3823
3824
3825
3826
 
3827
3828
3829
3830
 
3831
3832
3833
3834
3835
 
3836
3837
3838
3839
3840
 
3841
3842
3843
3844
3845
 
3846
3847
3848
 
3851
3852
3853
3854
 
3855
3856
3857
 
3860
3861
3862
3863
 
3864
3865
3866
3867
3868
 
3869
3870
3871
3872
 
3873
3874
3875
3876
 
3877
3878
3879
3880
 
3881
3882
3883
3884
 
3885
3886
3887
 
3889
3890
3891
3892
 
3893
3894
3895
3896
3897
 
3898
3899
3900
3901
3902
 
3903
3904
3905
3906
 
3907
3908
3909
3910
 
3911
3912
3913
3914
 
3915
3916
3917
3918
 
3919
3920
3921
3922
 
3923
3924
3925
3926
 
3927
3928
3929
3930
 
3931
3932
3933
3934
 
3935
3936
3937
3938
 
3939
3940
3941
3942
 
3943
3944
3945
3946
 
3947
3948
3949
3950
 
3951
3952
3953
3954
 
3955
3956
3957
3958
 
3959
3960
3961
3962
 
3963
3964
3965
3966
 
3967
3968
3969
3970
 
3971
3972
3973
3974
 
3975
3976
3977
3978
 
3979
3980
3981
3982
 
3983
3984
3985
3986
 
3987
3988
3989
3990
 
3991
3992
3993
3994
 
3995
3996
3997
3998
 
3999
4000
4001
4002
 
4003
4004
4005
4006
 
4007
4008
4009
4010
 
4011
4012
4013
4014
 
4015
4016
4017
4018
 
4019
4020
4021
4022
 
4023
4024
4025
4026
 
4027
4028
4029
4030
 
4031
4032
4033
4034
 
4035
4036
4037
4038
 
4039
4040
4041
4042
 
4043
4044
4045
4046
 
4047
4048
4049
4050
 
4051
4052
4053
4054
 
4055
4056
4057
4058
 
4059
4060
4061
4062
 
4063
4064
4065
4066
 
4067
4068
4069
4070
 
4071
4072
4073
4074
 
4075
4076
4077
4078
 
4079
4080
4081
4082
 
4083
4084
4085
4086
 
4087
4088
4089
4090
 
4091
4092
4093
4094
 
4095
4096
4097
4098
 
4099
4100
4101
4102
 
4103
4104
4105
4106
 
4107
4108
4109
4110
 
4111
4112
4113
4114
 
4115
4116
4117
4118
 
4119
4120
4121
4122
 
4123
4124
4125
4126
 
4127
4128
4129
4130
4131
 
4132
4133
4134
4135
 
4136
4137
4138
4139
 
4140
4141
4142
4143
 
4144
4145
4146
4147
 
4148
4149
4150
4151
 
4152
4153
4154
4155
 
4156
4157
4158
4159
 
4160
4161
4162
4163
 
4164
4165
4166
4167
 
4168
4169
4170
4171
 
4172
4173
4174
4175
 
4176
4177
4178
4179
 
4180
4181
4182
4183
 
4184
4185
4186
4187
 
4188
4189
4190
4191
 
4192
4193
4194
4195
 
4196
4197
4198
4199
 
4200
4201
4202
4203
 
4204
4205
4206
4207
 
4208
4209
4210
4211
 
4212
4213
4214
4215
 
4216
4217
4218
4219
 
4220
4221
4222
4223
 
4224
4225
4226
4227
 
4228
4229
4230
4231
 
4232
4233
4234
4235
 
4236
4237
4238
4239
 
4240
4241
4242
4243
 
4244
4245
4246
4247
4248
 
4249
4250
4251
4252
 
4253
4254
4255
4256
4257
 
4258
4259
4260
4261
 
4262
4263
4264
4265
 
4266
4267
4268
4269
 
4270
4271
4272
4273
 
4274
4275
4276
4277
 
4278
4279
4280
4281
 
4282
4283
4284
4285
 
4286
4287
4288
4289
 
4290
4291
4292
 
4324
4325
4326
4327
 
4328
4329
4330
 
4345
4346
4347
4348
 
4349
4350
4351
4352
4353
 
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
 
4433
4434
4435
4436
 
4437
4438
4439
 
4469
4470
4471
4472
 
4473
4474
4475
 
4557
4558
4559
4560
 
4561
4562
4563
 
4570
4571
4572
4573
4574
4575
 
 
 
4576
4577
4578
 
4581
4582
4583
4584
 
4585
4586
4587
 
4591
4592
4593
4594
 
4595
4596
4597
 
4617
4618
4619
4620
 
4621
4622
4623
 
4640
4641
4642
4643
4644
 
 
4645
4646
4647
 
4651
4652
4653
4654
 
4655
4656
4657
 
4662
4663
4664
4665
4666
4667
4668
4669
 
 
4670
4671
4672
 
4680
4681
4682
4683
 
4684
4685
4686
 
4718
4719
4720
4721
 
4722
4723
4724
 
4845
4846
4847
4848
4849
 
 
4850
4851
4852
 
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
 
5201
5202
5203
5204
 
5205
5206
5207
5208
 
5209
5210
5211
 
5213
5214
5215
5216
 
5217
5218
5219
5220
 
5221
5222
5223
5224
 
5225
5226
5227
5228
 
5229
5230
5231
5232
 
5233
5234
5235
5236
5237
 
5238
5239
5240
5241
 
5242
5243
5244
 
5246
5247
5248
5249
 
5250
5251
5252
5253
 
5254
5255
5256
5257
 
5258
5259
5260
5261
 
5262
5263
5264
5265
 
5266
5267
5268
5269
 
5270
5271
5272
5273
 
5274
5275
5276
5277
 
5278
5279
5280
5281
 
5282
5283
5284
5285
 
5286
5287
5288
5289
 
5290
5291
5292
5293
 
5294
5295
5296
5297
 
5298
5299
5300
 
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
5519
5520
 
5521
5522
5523
5524
5525
 
5526
5527
5528
5529
5530
 
5531
5532
5533
5534
5535
 
5536
5537
5538
5539
5540
 
5541
5542
5543
5544
5545
 
5546
5547
5548
5549
5550
 
 
 
 
 
5551
5552
5553
5554
 
5555
5556
5557
5558
 
5559
5560
5561
5562
 
5563
5564
5565
5566
 
5567
5568
5569
5570
 
5571
5572
5573
5574
 
5575
5576
5577
5578
 
5579
5580
5581
5582
 
5583
5584
5585
5586
5587
 
5588
5589
5590
5591
 
5592
5593
5594
5595
 
5596
5597
5598
5599
 
5600
5601
5602
5603
 
5604
5605
5606
5607
 
5608
5609
5610
5611
 
5612
5613
5614
5615
5616
 
5617
5618
5619
5620
5621
 
5622
5623
5624
5625
5626
 
5627
5628
5629
5630
5631
 
5632
5633
5634
5635
5636
 
5637
5638
5639
5640
 
5641
5642
5643
5644
 
5645
5646
5647
5648
 
5649
5650
5651
5652
 
5653
5654
5655
5656
 
5657
5658
5659
5660
 
5661
5662
5663
5664
 
5665
5666
5667
5668
 
5669
5670
5671
5672
5673
 
5674
5675
5676
5677
 
5678
5679
5680
5681
 
5682
5683
5684
5685
 
5686
5687
5688
5689
5690
5691
5692
5693
 
 
 
5694
5695
5696
5697
 
5698
5699
5700
5701
5702
 
5703
5704
5705
5706
5707
 
5708
5709
5710
5711
5712
 
5713
5714
5715
5716
5717
 
5718
5719
5720
5721
5722
 
5723
5724
5725
5726
5727
 
5728
5729
5730
5731
 
5732
5733
5734
5735
 
5736
5737
5738
5739
5740
 
5741
5742
5743
5744
5745
 
5746
5747
5748
5749
5750
 
5751
5752
5753
5754
5755
 
5756
5757
5758
5759
5760
 
5761
5762
5763
5764
5765
 
5766
5767
5768
5769
5770
5771
 
5772
5773
5774
5775
 
5776
5777
5778
5779
5780
 
5781
5782
5783
5784
 
5785
5786
5787
5788
 
5789
5790
5791
5792
 
5793
5794
5795
5796
 
5797
5798
5799
5800
 
5801
5802
5803
 
5808
5809
5810
5811
 
5812
5813
5814
5815
5816
 
5817
5818
5819
5820
5821
 
5822
5823
5824
5825
5826
 
5827
5828
5829
5830
5831
 
5832
5833
5834
5835
 
5836
5837
5838
5839
5840
 
5841
5842
5843
5844
 
5845
5846
5847
5848
5849
 
5850
5851
5852
5853
 
5854
5855
5856
5857
 
5858
5859
5860
5861
 
5862
5863
5864
5865
 
5866
5867
5868
5869
 
5870
5871
5872
5873
 
5874
5875
5876
5877
 
5878
5879
5880
5881
 
5882
5883
5884
5885
 
5886
5887
5888
5889
 
5890
5891
5892
5893
 
5894
5895
5896
5897
 
5898
5899
5900
5901
5902
 
5903
5904
5905
5906
5907
 
5908
5909
5910
5911
 
5912
5913
5914
5915
5916
5917
 
5918
5919
5920
5921
 
5922
5923
5924
5925
 
5926
5927
5928
5929
5930
 
 
 
 
 
5931
5932
5933
5934
 
5935
5936
5937
5938
5939
 
5940
5941
5942
5943
 
5944
5945
5946
5947
 
5948
5949
5950
5951
 
5952
5953
5954
5955
 
5956
5957
5958
5959
 
5960
5961
5962
5963
 
5964
5965
5966
 
5968
5969
5970
5971
 
5972
5973
5974
5975
5976
5977
5978
 
5979
5980
5981
5982
5983
5984
 
5985
5986
5987
5988
5989
5990
 
5991
5992
5993
5994
 
5995
5996
5997
5998
5999
6000
 
6001
6002
6003
6004
 
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
 
6017
6018
6019
 
 
 
 
6020
6021
 
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
 
 
 
 
 
 
 
 
 
 
6033
6034
6035
6036
 
 
 
 
 
6037
6038
6039
6040
 
6041
6042
6043
6044
 
6045
6046
6047
6048
 
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6063
6064
6065
6066
 
6067
6068
6069
6070
 
6071
6072
6073
6074
6075
 
 
 
 
 
 
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
 
6089
6090
6091
6092
6093
 
6094
6095
6096
6097
6098
 
6099
6100
6101
6102
6103
 
6104
6105
6106
 
6225
6226
6227
 
 
 
 
 
 
6228
6229
6230
 
6466
6467
6468
6469
 
6470
6471
6472
6473
 
6474
6475
6476
6477
6478
 
6479
6480
6481
6482
6483
 
6484
6485
6486
6487
 
6488
6489
6490
6491
 
6492
6493
6494
6495
 
6496
6497
6498
6499
 
6500
6501
6502
6503
 
6504
6505
6506
6507
 
6508
6509
6510
6511
 
6512
6513
6514
6515
 
6516
6517
6518
 
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6661
6662
6663
 
6683
6684
6685
6686
 
6687
6688
6689
 
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
 
6945
6946
6947
6948
 
6949
6950
6951
6952
 
6953
6954
6955
6956
 
6957
6958
6959
 
7029
7030
7031
7032
7033
7034
7035
 
 
 
7036
7037
7038
 
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
 
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
 
7434
7435
7436
 
 
 
 
7437
7438
7439
 
7651
7652
7653
7654
 
7655
7656
7657
 
7988
7989
7990
7991
 
7992
7993
7994
7995
 
7996
7997
7998
 
8141
8142
8143
 
 
 
 
8144
8145
8146
 
8648
8649
8650
8651
 
8652
8653
8654
 
9115
9116
9117
9118
 
9119
9120
9121
9122
 
9123
9124
9125
 
9500
9501
9502
9503
 
9504
9505
9506
9507
 
9508
9509
9510
 
9536
9537
9538
9539
 
9540
9541
9542
 
9684
9685
9686
9687
 
9688
9689
9690
9691
 
9692
9693
9694
9695
 
9696
9697
9698
9699
 
9700
9701
9702
9703
 
9704
9705
9706
9707
 
9708
9709
9710
9711
 
9712
9713
9714
9715
 
9716
9717
9718
9719
 
9720
9721
9722
9723
 
9724
9725
9726
9727
 
9728
9729
9730
 
9980
9981
9982
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
9983
9984
9985
 
10018
10019
10020
10021
 
10022
10023
10024
 
10050
10051
10052
10053
 
10054
10055
10056
 
10062
10063
10064
10065
 
10066
10067
10068
10069
10070
 
10071
10072
10073
10074
 
10075
10076
10077
10078
 
10079
10080
10081
10082
 
10083
10084
10085
10086
 
10087
10088
10089
10090
 
10091
10092
10093
10094
 
10095
10096
10097
10098
10099
 
10100
10101
10102
10103
 
10104
10105
10106
10107
 
10108
10109
10110
10111
 
10112
10113
10114
 
10164
10165
10166
 
 
 
 
 
10167
10168
10169
10170
10171
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
10172
10173
10174
 
10195
10196
10197
 
 
 
 
 
 
 
10198
10199
10200
 
10215
10216
10217
10218
10219
10220
10221
 
 
 
 
 
 
 
 
10222
10223
10224
 
10251
10252
10253
10254
10255
10256
10257
10258
10259
 
 
 
 
 
 
10260
10261
10262
10263
 
10264
10265
10266
10267
10268
10269
10270
10271
10272
 
10273
10274
10275
 
10279
10280
10281
10282
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
10283
10284
10285
 
10297
10298
10299
10300
10301
10302
10303
10304
 
 
 
 
 
 
 
 
 
10305
10306
10307
 
10374
10375
10376
10377
10378
10379
10380
10381
10382
10383
10384
10385
10386
10387
10388
10389
10390
10391
10392
10393
10394
10395
10396
10397
10398
10399
10400
10401
10402
10403
10404
 
10426
10427
10428
10429
10430
10431
10432
10433
10434
10435
 
10877
10878
10879
10880
10881
 
 
10882
10883
10884
 
10997
10998
10999
 
 
 
 
11000
11001
11002
 
11395
11396
11397
11398
11399
11400
11401
11402
11403
11404
11405
 
 
 
 
 
 
11406
11407
11408
11409
11410
 
11411
11412
11413
11414
11415
 
11416
11417
11418
11419
11420
11421
11422
 
11423
11424
11425
11426
11427
 
11428
11429
11430
11431
11432
11433
 
 
11434
11435
11436
11437
11438
 
11439
11440
11441
11442
11443
 
11444
11445
11446
11447
 
11448
11449
11450
11451
11452
 
11453
11454
11455
11456
11457
 
11458
11459
11460
11461
11462
 
11463
11464
11465
11466
11467
 
11468
11469
11470
11471
 
11472
11473
11474
 
11487
11488
11489
 
 
 
11490
11491
11492
 
11604
11605
11606
 
 
 
 
 
 
11607
11608
11609
 
11951
11952
11953
 
 
 
 
 
 
 
 
 
 
11954
11955
11956
 
12124
12125
12126
 
 
 
 
12127
12128
12129
 
12220
12221
12222
 
 
 
 
 
 
 
12223
12224
12225
 
12275
12276
12277
 
 
 
 
 
 
 
12278
12279
12280
 
12521
12522
12523
 
 
 
 
 
 
12524
12525
12526
 
 
 
 
 
 
 
 
12527
12528
12529
 
12535
12536
12537
 
 
 
 
 
 
 
 
 
 
7
8
9
 
10
11
12
13
14
15
16
 
 
17
18
19
20
21
 
25
26
27
 
28
29
30
31
32
 
33
34
35
36
 
37
38
39
40
41
 
42
43
44
45
 
46
47
48
49
 
 
50
51
52
53
54
 
64
65
66
 
67
68
69
70
 
111
112
113
 
114
115
116
117
118
119
120
121
122
 
125
126
127
 
128
129
 
 
130
131
132
133
134
 
143
144
145
 
 
146
147
148
149
150
 
197
198
199
 
 
 
200
201
202
203
 
 
204
205
206
207
 
208
209
 
210
211
212
213
 
295
296
297
 
 
298
299
300
 
 
301
302
303
304
305
 
312
313
314
 
315
316
317
318
 
321
322
323
 
324
325
326
327
 
332
333
334
 
335
336
337
338
 
342
343
344
 
 
 
345
346
347
348
349
350
 
418
419
420
 
 
421
422
423
424
425
426
427
428
 
429
430
431
432
 
 
 
 
 
 
433
434
435
436
437
438
439
440
441
442
 
 
 
 
 
443
444
445
446
447
448
449
450
451
 
452
453
454
455
456
457
458
459
460
 
461
462
463
464
465
 
466
467
468
469
470
 
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
 
487
488
489
490
491
 
492
493
494
495
 
498
499
500
 
501
502
503
504
 
505
506
507
508
 
509
510
511
512
 
513
514
515
516
 
586
587
588
 
589
590
591
592
593
 
594
595
596
597
598
 
599
600
601
602
603
 
604
605
606
607
608
 
609
610
611
612
613
 
614
615
616
617
 
618
619
620
621
 
622
623
624
625
 
626
627
628
629
 
630
631
632
633
 
634
635
636
637
638
 
 
639
640
641
642
643
 
644
645
646
647
 
648
649
650
651
 
652
653
654
655
656
 
 
657
658
659
660
661
 
662
663
664
665
 
666
667
668
669
 
670
671
672
673
 
674
675
676
677
 
678
679
680
681
 
682
683
684
685
 
686
687
688
689
 
690
691
692
693
 
721
722
723
 
724
725
726
727
 
750
751
752
 
753
754
755
756
757
 
758
759
760
761
762
763
 
764
765
766
767
768
769
770
771
772
 
 
 
 
773
774
775
 
776
777
778
779
 
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
 
 
 
 
801
802
803
 
804
805
806
807
808
 
809
810
811
812
 
813
814
815
816
817
 
818
819
820
821
 
822
823
824
825
 
826
827
828
829
830
 
831
832
833
834
835
 
836
837
838
839
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
 
 
 
 
 
 
 
 
 
 
857
858
859
860
861
862
863
864
865
866
867
868
869
 
870
871
872
873
 
874
875
876
877
 
 
 
 
 
 
 
 
 
878
879
880
881
882
883
884
885
 
 
 
 
 
 
 
 
 
886
887
888
889
890
891
892
893
 
 
894
895
896
897
898
 
899
900
901
902
 
903
904
905
906
 
907
908
909
910
911
 
912
913
914
915
 
916
917
918
919
 
920
921
922
923
 
 
 
 
924
925
926
927
928
929
930
 
 
 
 
931
932
933
934
935
936
937
938
 
939
940
941
942
 
943
944
945
946
 
947
948
949
950
 
951
952
953
954
 
993
994
995
 
 
996
997
998
999
1000
1001
1002
 
1003
1004
1005
1006
1007
 
 
 
1008
1009
1010
1011
1012
1013
 
1095
1096
1097
 
1098
1099
1100
1101
1102
 
1103
1104
1105
1106
 
1107
1108
1109
1110
1111
1112
1113
1114
1115
 
 
 
 
1116
1117
1118
 
1119
1120
1121
1122
 
1123
1124
1125
1126
 
1127
1128
1129
1130
 
1131
1132
1133
1134
 
1135
1136
1137
1138
1139
 
1140
1141
1142
1143
 
1144
1145
1146
1147
 
1148
1149
1150
1151
 
1152
1153
1154
1155
 
1156
1157
1158
1159
 
1160
1161
1162
1163
 
1164
1165
1166
1167
 
1168
1169
1170
1171
 
1172
1173
1174
1175
 
1206
1207
1208
 
 
 
 
1209
1210
1211
 
1239
1240
1241
 
1242
1243
1244
1245
 
1289
1290
1291
 
1292
1293
1294
1295
 
1365
1366
1367
 
1368
1369
1370
1371
 
1399
1400
1401
 
1402
1403
1404
1405
1406
 
1407
1408
1409
1410
 
1411
1412
1413
1414
1415
 
 
1416
1417
1418
1419
1420
 
1422
1423
1424
 
1425
1426
1427
1428
 
1515
1516
1517
 
1518
1519
1520
1521
 
1522
1523
1524
1525
 
1526
1527
1528
1529
 
1530
1531
1532
1533
1534
 
1535
1536
1537
1538
 
1539
1540
1541
1542
 
1543
1544
1545
1546
 
1547
1548
1549
1550
 
1551
1552
1553
1554
 
1555
1556
1557
1558
 
1562
1563
1564
 
1565
1566
1567
1568
 
1569
1570
1571
1572
 
1576
1577
1578
 
1579
1580
1581
1582
 
1583
1584
1585
1586
 
1590
1591
1592
 
1593
1594
1595
1596
 
1597
1598
1599
1600
 
1604
1605
1606
 
1607
1608
1609
1610
 
1611
1612
1613
1614
 
1615
1616
1617
1618
 
1619
1620
1621
1622
 
1623
1624
1625
1626
 
1627
1628
1629
1630
 
1631
1632
1633
1634
 
1635
1636
1637
1638
 
1647
1648
1649
 
1650
1651
1652
1653
 
1654
1655
1656
1657
 
1658
1659
1660
1661
 
1662
1663
1664
1665
1666
1667
 
1668
1669
1670
1671
 
1672
1673
1674
1675
 
1676
1677
1678
1679
 
1691
1692
1693
 
 
 
 
1694
1695
1696
1697
1698
1699
1700
1701
1702
 
1703
1704
1705
1706
 
1737
1738
1739
 
1740
1741
1742
1743
 
1840
1841
1842
 
1843
1844
1845
1846
 
1855
1856
1857
 
 
1858
1859
1860
1861
 
1952
1953
1954
 
 
 
 
 
1955
1956
1957
1958
1959
1960
1961
1962
 
1963
1964
1965
1966
 
 
 
 
 
1967
1968
1969
1970
1971
1972
1973
1974
 
1975
1976
1977
1978
 
1979
1980
1981
1982
 
1983
1984
1985
1986
 
1987
1988
1989
1990
1991
1992
1993
 
1994
1995
1996
1997
 
1998
1999
2000
2001
 
2002
2003
2004
2005
2006
2007
 
2008
2009
2010
2011
2012
2013
 
2014
2015
2016
2017
 
2018
2019
2020
2021
 
2022
2023
2024
2025
 
2026
2027
2028
2029
 
2030
2031
2032
2033
2034
 
2035
2036
2037
2038
 
2039
2040
2041
2042
 
2043
2044
2045
2046
 
2047
2048
2049
2050
2051
2052
 
2053
2054
2055
2056
 
2057
2058
2059
2060
 
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
 
2149
2150
2151
 
2152
2153
2154
2155
2156
 
2157
2158
2159
2160
 
2161
2162
2163
2164
 
2165
2166
2167
2168
 
2169
2170
2171
2172
 
2173
2174
2175
2176
 
2177
2178
2179
2180
 
2181
2182
2183
2184
 
2185
2186
2187
2188
 
2282
2283
2284
 
2285
2286
2287
2288
 
2437
2438
2439
 
 
 
 
 
2440
2441
2442
2443
2444
2445
2446
 
2469
2470
2471
 
2472
2473
2474
2475
 
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
 
2678
2679
2680
 
2681
2682
2683
2684
 
2753
2754
2755
 
2756
2757
2758
2759
 
2760
2761
2762
2763
 
2906
2907
2908
 
2909
2910
2911
2912
2913
 
2914
2915
2916
2917
 
2918
2919
2920
2921
 
2922
2923
2924
2925
 
2985
2986
2987
 
2988
2989
2990
2991
 
2994
2995
2996
 
2997
2998
2999
3000
 
3038
3039
3040
 
 
3041
3042
3043
3044
3045
 
3051
3052
3053
 
3054
3055
3056
3057
3058
 
3059
3060
3061
3062
3063
 
3064
3065
3066
3067
 
3078
3079
3080
 
3081
3082
3083
3084
 
3085
3086
3087
3088
3089
 
3090
3091
3092
3093
 
3094
3095
3096
3097
3098
3099
 
3100
3101
3102
3103
3104
 
3105
3106
3107
3108
3109
 
3110
3111
3112
3113
3114
 
3115
3116
3117
3118
3119
 
3120
3121
3122
3123
 
3124
3125
3126
3127
 
3128
3129
3130
3131
 
3132
3133
3134
3135
3136
 
3137
3138
3139
3140
 
3141
3142
3143
3144
3145
 
3146
3147
3148
3149
 
3150
3151
3152
3153
 
3154
3155
3156
3157
 
3158
3159
3160
3161
 
3163
3164
3165
 
 
 
 
 
3166
3167
3168
3169
3170
3171
3172
3173
 
3174
3175
3176
3177
 
3178
3179
3180
3181
 
3182
3183
3184
3185
 
3186
3187
3188
3189
 
3190
3191
3192
3193
 
3194
3195
3196
3197
 
3198
3199
3200
3201
 
3202
3203
3204
3205
 
3206
3207
3208
3209
 
3210
3211
3212
3213
 
3214
3215
3216
3217
 
3218
3219
3220
3221
 
3222
3223
3224
3225
 
3226
3227
3228
3229
 
 
 
 
 
3230
3231
3232
3233
3234
3235
3236
3237
 
3238
3239
3240
3241
 
3242
3243
3244
3245
 
3246
3247
3248
3249
 
3250
3251
3252
3253
 
3254
3255
3256
3257
 
3258
3259
3260
3261
 
3262
3263
3264
3265
 
3266
3267
3268
3269
 
3270
3271
3272
3273
 
3274
3275
3276
3277
 
3278
3279
3280
3281
 
3282
3283
3284
3285
 
3286
3287
3288
3289
 
3290
3291
3292
3293
 
 
 
 
 
3294
3295
3296
3297
3298
3299
3300
3301
 
 
 
 
 
3302
3303
3304
3305
3306
3307
3308
3309
 
3310
3311
3312
3313
 
3314
3315
3316
3317
 
3318
3319
3320
3321
 
3322
3323
3324
3325
 
3326
3327
3328
3329
3330
3331
 
3332
3333
3334
3335
 
3336
3337
3338
3339
 
3340
3341
3342
3343
 
3344
3345
3346
3347
 
3348
3349
3350
3351
 
3352
3353
3354
3355
 
3356
3357
3358
3359
3360
3361
3362
3363
 
3364
3365
3366
3367
 
3485
3486
3487
 
3488
3489
3490
3491
3492
3493
3494
 
 
 
 
 
3495
3496
3497
3498
3499
3500
3501
3502
 
3503
3504
3505
3506
3507
 
3508
3509
3510
3511
 
 
3512
3513
3514
3515
3516
3517
3518
3519
3520
 
3704
3705
3706
 
3707
3708
3709
3710
 
3711
3712
3713
3714
 
3715
3716
3717
3718
 
3719
3720
3721
3722
 
3723
3724
3725
3726
 
3727
3728
3729
3730
 
3731
3732
3733
3734
 
3735
3736
3737
3738
3739
3740
 
3741
3742
3743
3744
 
3745
3746
3747
3748
 
3749
3750
3751
3752
 
3753
3754
3755
3756
 
3757
3758
3759
3760
 
3761
3762
3763
3764
 
3844
3845
3846
 
3847
3848
3849
3850
 
3851
3852
3853
3854
 
3855
3856
3857
3858
 
3859
3860
3861
3862
3863
 
3864
3865
3866
3867
3868
 
3869
3870
3871
3872
3873
 
3874
3875
3876
3877
 
3880
3881
3882
 
3883
3884
3885
3886
 
3889
3890
3891
 
3892
3893
3894
3895
3896
 
3897
3898
3899
3900
 
3901
3902
3903
3904
 
3905
3906
3907
3908
 
3909
3910
3911
3912
 
3913
3914
3915
3916
 
3918
3919
3920
 
3921
3922
3923
3924
3925
 
3926
3927
3928
3929
3930
 
3931
3932
3933
3934
 
3935
3936
3937
3938
 
3939
3940
3941
3942
 
3943
3944
3945
3946
 
3947
3948
3949
3950
 
3951
3952
3953
3954
 
3955
3956
3957
3958
 
3959
3960
3961
3962
 
3963
3964
3965
3966
 
3967
3968
3969
3970
 
3971
3972
3973
3974
 
3975
3976
3977
3978
 
3979
3980
3981
3982
 
3983
3984
3985
3986
 
3987
3988
3989
3990
 
3991
3992
3993
3994
 
3995
3996
3997
3998
 
3999
4000
4001
4002
 
4003
4004
4005
4006
 
4007
4008
4009
4010
 
4011
4012
4013
4014
 
4015
4016
4017
4018
 
4019
4020
4021
4022
 
4023
4024
4025
4026
 
4027
4028
4029
4030
 
4031
4032
4033
4034
 
4035
4036
4037
4038
 
4039
4040
4041
4042
 
4043
4044
4045
4046
 
4047
4048
4049
4050
 
4051
4052
4053
4054
 
4055
4056
4057
4058
 
4059
4060
4061
4062
 
4063
4064
4065
4066
 
4067
4068
4069
4070
 
4071
4072
4073
4074
 
4075
4076
4077
4078
 
4079
4080
4081
4082
 
4083
4084
4085
4086
 
4087
4088
4089
4090
 
4091
4092
4093
4094
 
4095
4096
4097
4098
 
4099
4100
4101
4102
 
4103
4104
4105
4106
 
4107
4108
4109
4110
 
4111
4112
4113
4114
 
4115
4116
4117
4118
 
4119
4120
4121
4122
 
4123
4124
4125
4126
 
4127
4128
4129
4130
 
4131
4132
4133
4134
 
4135
4136
4137
4138
 
4139
4140
4141
4142
 
4143
4144
4145
4146
 
4147
4148
4149
4150
 
4151
4152
4153
4154
 
4155
4156
4157
4158
4159
 
4160
4161
4162
4163
 
4164
4165
4166
4167
 
4168
4169
4170
4171
 
4172
4173
4174
4175
 
4176
4177
4178
4179
 
4180
4181
4182
4183
 
4184
4185
4186
4187
 
4188
4189
4190
4191
 
4192
4193
4194
4195
 
4196
4197
4198
4199
 
4200
4201
4202
4203
 
4204
4205
4206
4207
 
4208
4209
4210
4211
 
4212
4213
4214
4215
 
4216
4217
4218
4219
 
4220
4221
4222
4223
 
4224
4225
4226
4227
 
4228
4229
4230
4231
 
4232
4233
4234
4235
 
4236
4237
4238
4239
 
4240
4241
4242
4243
 
4244
4245
4246
4247
 
4248
4249
4250
4251
 
4252
4253
4254
4255
 
4256
4257
4258
4259
 
4260
4261
4262
4263
 
4264
4265
4266
4267
 
4268
4269
4270
4271
 
4272
4273
4274
4275
4276
 
4277
4278
4279
4280
 
4281
4282
4283
4284
4285
 
4286
4287
4288
4289
 
4290
4291
4292
4293
 
4294
4295
4296
4297
 
4298
4299
4300
4301
 
4302
4303
4304
4305
 
4306
4307
4308
4309
 
4310
4311
4312
4313
 
4314
4315
4316
4317
 
4318
4319
4320
4321
 
4353
4354
4355
 
4356
4357
4358
4359
 
4374
4375
4376
 
4377
4378
4379
4380
4381
 
4382
4383
4384
4385
 
 
 
 
 
 
 
4386
4387
4388
 
4455
4456
4457
 
4458
4459
4460
4461
 
4491
4492
4493
 
4494
4495
4496
4497
 
4579
4580
4581
 
4582
4583
4584
4585
 
4592
4593
4594
 
 
 
4595
4596
4597
4598
4599
4600
 
4603
4604
4605
 
4606
4607
4608
4609
 
4613
4614
4615
 
4616
4617
4618
4619
 
4639
4640
4641
 
4642
4643
4644
4645
 
4662
4663
4664
 
 
4665
4666
4667
4668
4669
 
4673
4674
4675
 
4676
4677
4678
4679
 
4684
4685
4686
 
 
 
 
 
4687
4688
4689
4690
4691
 
4699
4700
4701
 
4702
4703
4704
4705
 
4737
4738
4739
 
4740
4741
4742
4743
 
4864
4865
4866
 
 
4867
4868
4869
4870
4871
 
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
5215
 
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
 
5227
5228
5229
5230
 
5231
5232
5233
5234
 
 
 
 
 
5235
5236
5237
5238
5239
5240
5241
5242
 
5243
5244
5245
5246
 
5247
5248
5249
5250
 
5252
5253
5254
 
5255
5256
5257
5258
 
5259
5260
5261
5262
 
5264
5265
5266
 
5267
5268
5269
5270
 
5271
5272
5273
5274
 
5275
5276
5277
5278
 
5279
5280
5281
5282
 
5283
5284
5285
5286
5287
 
5288
5289
5290
5291
 
5292
5293
5294
5295
 
5297
5298
5299
 
5300
5301
5302
5303
 
5304
5305
5306
5307
 
5308
5309
5310
5311
 
5312
5313
5314
5315
 
5316
5317
5318
5319
 
5320
5321
5322
5323
 
5324
5325
5326
5327
 
5328
5329
5330
5331
 
5332
5333
5334
5335
 
5336
5337
5338
5339
 
5340
5341
5342
5343
 
5344
5345
5346
5347
 
5348
5349
5350
5351
 
5530
5531
5532
 
5533
5534
5535
5536
 
5537
5538
5539
5540
 
5541
5542
5543
5544
 
5545
5546
5547
5548
 
5549
5550
5551
5552
 
5553
5554
5555
5556
 
5557
5558
5559
5560
 
5561
5562
5563
5564
5565
 
5566
5567
5568
5569
5570
 
5571
5572
5573
5574
5575
 
5576
5577
5578
5579
5580
 
5581
5582
5583
5584
5585
 
5586
5587
5588
5589
5590
 
5591
5592
5593
5594
5595
 
5596
5597
5598
5599
5600
 
5601
5602
5603
5604
5605
5606
5607
5608
 
5609
5610
5611
5612
 
5613
5614
5615
5616
 
5617
5618
5619
5620
 
5621
5622
5623
5624
 
5625
5626
5627
5628
 
5629
5630
5631
5632
 
5633
5634
5635
5636
 
5637
5638
5639
5640
5641
 
5642
5643
5644
5645
 
5646
5647
5648
5649
 
5650
5651
5652
5653
 
5654
5655
5656
5657
 
5658
5659
5660
5661
 
5662
5663
5664
5665
 
5666
5667
5668
5669
5670
 
5671
5672
5673
5674
5675
 
5676
5677
5678
5679
5680
 
5681
5682
5683
5684
5685
 
5686
5687
5688
5689
5690
 
5691
5692
5693
5694
 
5695
5696
5697
5698
 
5699
5700
5701
5702
 
5703
5704
5705
5706
 
5707
5708
5709
5710
 
5711
5712
5713
5714
 
5715
5716
5717
5718
 
5719
5720
5721
5722
 
5723
5724
5725
5726
5727
 
5728
5729
5730
5731
 
5732
5733
5734
5735
 
5736
5737
5738
5739
 
5740
5741
5742
5743
5744
5745
 
 
 
5746
5747
5748
5749
5750
5751
 
5752
5753
5754
5755
5756
 
5757
5758
5759
5760
5761
 
5762
5763
5764
5765
5766
 
5767
5768
5769
5770
5771
 
5772
5773
5774
5775
5776
 
5777
5778
5779
5780
5781
 
5782
5783
5784
5785
 
5786
5787
5788
5789
 
5790
5791
5792
5793
5794
 
5795
5796
5797
5798
5799
 
5800
5801
5802
5803
5804
 
5805
5806
5807
5808
5809
 
5810
5811
5812
5813
5814
 
5815
5816
5817
5818
5819
 
5820
5821
5822
5823
5824
5825
 
5826
5827
5828
5829
 
5830
5831
5832
5833
5834
 
5835
5836
5837
5838
 
5839
5840
5841
5842
 
5843
5844
5845
5846
 
5847
5848
5849
5850
 
5851
5852
5853
5854
 
5855
5856
5857
5858
 
5863
5864
5865
 
5866
5867
5868
5869
5870
 
5871
5872
5873
5874
5875
 
5876
5877
5878
5879
5880
 
5881
5882
5883
5884
5885
 
5886
5887
5888
5889
 
5890
5891
5892
5893
5894
 
5895
5896
5897
5898
 
5899
5900
5901
5902
5903
 
5904
5905
5906
5907
 
5908
5909
5910
5911
 
5912
5913
5914
5915
 
5916
5917
5918
5919
 
5920
5921
5922
5923
 
5924
5925
5926
5927
 
5928
5929
5930
5931
 
5932
5933
5934
5935
 
5936
5937
5938
5939
 
5940
5941
5942
5943
 
5944
5945
5946
5947
 
5948
5949
5950
5951
 
5952
5953
5954
5955
5956
 
5957
5958
5959
5960
5961
 
5962
5963
5964
5965
 
5966
5967
5968
5969
5970
5971
 
5972
5973
5974
5975
 
5976
5977
5978
5979
 
5980
5981
5982
5983
5984
 
5985
5986
5987
5988
5989
5990
5991
5992
 
5993
5994
5995
5996
5997
 
5998
5999
6000
6001
 
6002
6003
6004
6005
 
6006
6007
6008
6009
 
6010
6011
6012
6013
 
6014
6015
6016
6017
 
6018
6019
6020
6021
 
6022
6023
6024
6025
 
6027
6028
6029
 
6030
6031
6032
6033
6034
6035
6036
 
6037
6038
6039
6040
6041
6042
 
6043
6044
6045
6046
6047
6048
 
6049
6050
6051
6052
 
6053
6054
6055
6056
6057
6058
 
6059
6060
6061
6062
 
6063
6064
6065
6066
 
 
 
 
 
 
 
 
 
6067
6068
6069
6070
6071
6072
6073
6074
6075
 
6076
6077
6078
6079
 
 
 
 
6080
6081
6082
 
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
 
6096
6097
6098
6099
6100
6101
6102
6103
 
6104
6105
6106
6107
 
6108
6109
6110
6111
 
6112
6113
6114
6115
 
 
 
 
 
 
 
 
 
 
 
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
 
6134
6135
6136
6137
 
6138
6139
6140
6141
6142
 
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
 
 
 
 
 
 
 
 
 
6153
6154
6155
6156
6157
 
6158
6159
6160
6161
6162
 
6163
6164
6165
6166
6167
 
6168
6169
6170
6171
 
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
 
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
 
6711
6712
6713
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
 
6754
6755
6756
 
6757
6758
6759
6760
 
6846
6847
6848
 
 
 
 
6849
6850
6851
 
7012
7013
7014
 
7015
7016
7017
7018
 
7019
7020
7021
7022
 
7023
7024
7025
7026
 
7096
7097
7098
 
 
 
 
7099
7100
7101
7102
7103
7104
 
7116
7117
7118
 
 
 
 
 
7119
7120
7121
 
7130
7131
7132
 
 
 
 
7133
7134
7135
 
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
 
7712
7713
7714
 
7715
7716
7717
7718
 
8049
8050
8051
 
8052
8053
8054
8055
 
8056
8057
8058
8059
 
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
 
8713
8714
8715
 
8716
8717
8718
8719
 
9180
9181
9182
 
9183
9184
9185
9186
 
9187
9188
9189
9190
 
9565
9566
9567
 
9568
9569
9570
9571
 
9572
9573
9574
9575
 
9601
9602
9603
 
9604
9605
9606
9607
 
9749
9750
9751
 
9752
9753
9754
9755
 
9756
9757
9758
9759
 
9760
9761
9762
9763
 
9764
9765
9766
9767
 
9768
9769
9770
9771
 
9772
9773
9774
9775
 
9776
9777
9778
9779
 
9780
9781
9782
9783
 
9784
9785
9786
9787
 
9788
9789
9790
9791
 
9792
9793
9794
9795
 
10045
10046
10047
10048
10049
10050
10051
10052
10053
10054
10055
10056
10057
10058
10059
10060
10061
10062
10063
10064
10065
10066
 
10099
10100
10101
 
10102
10103
10104
10105
 
10131
10132
10133
 
10134
10135
10136
10137
 
10143
10144
10145
 
10146
10147
10148
10149
10150
 
10151
10152
10153
10154
 
10155
10156
10157
10158
 
10159
10160
10161
10162
 
10163
10164
10165
10166
 
10167
10168
10169
10170
 
10171
10172
10173
10174
 
10175
10176
10177
10178
10179
 
10180
10181
10182
10183
 
10184
10185
10186
10187
 
10188
10189
10190
10191
 
10192
10193
10194
10195
 
10245
10246
10247
10248
10249
10250
10251
10252
10253
10254
10255
10256
10257
10258
10259
10260
10261
10262
10263
10264
10265
10266
10267
10268
10269
10270
10271
10272
10273
10274
10275
10276
10277
 
10298
10299
10300
10301
10302
10303
10304
10305
10306
10307
10308
10309
10310
 
10325
10326
10327
 
 
 
 
10328
10329
10330
10331
10332
10333
10334
10335
10336
10337
10338
 
10365
10366
10367
 
 
 
 
 
 
10368
10369
10370
10371
10372
10373
10374
10375
10376
 
10377
10378
10379
 
 
10380
10381
10382
10383
 
10384
10385
10386
10387
 
10391
10392
10393
 
10394
10395
10396
10397
10398
10399
10400
10401
10402
10403
10404
10405
10406
10407
10408
10409
10410
10411
10412
10413
 
10425
10426
10427
 
 
 
 
 
10428
10429
10430
10431
10432
10433
10434
10435
10436
10437
10438
10439
 
10506
10507
10508
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
10509
10510
10511
 
10533
10534
10535
 
 
 
 
10536
10537
10538
 
10980
10981
10982
 
 
10983
10984
10985
10986
10987
 
11100
11101
11102
11103
11104
11105
11106
11107
11108
11109
 
11502
11503
11504
 
 
 
 
 
 
 
 
11505
11506
11507
11508
11509
11510
11511
11512
11513
11514
 
11515
11516
11517
11518
11519
 
11520
11521
11522
11523
11524
11525
11526
 
11527
11528
11529
11530
11531
 
11532
11533
11534
11535
11536
 
 
11537
11538
11539
11540
11541
11542
 
11543
11544
11545
11546
11547
 
11548
11549
11550
11551
 
11552
11553
11554
11555
11556
 
11557
11558
11559
11560
11561
 
11562
11563
11564
11565
11566
 
11567
11568
11569
11570
11571
 
11572
11573
11574
11575
 
11576
11577
11578
11579
 
11592
11593
11594
11595
11596
11597
11598
11599
11600
 
11712
11713
11714
11715
11716
11717
11718
11719
11720
11721
11722
11723
 
12065
12066
12067
12068
12069
12070
12071
12072
12073
12074
12075
12076
12077
12078
12079
12080
 
12248
12249
12250
12251
12252
12253
12254
12255
12256
12257
 
12348
12349
12350
12351
12352
12353
12354
12355
12356
12357
12358
12359
12360
 
12410
12411
12412
12413
12414
12415
12416
12417
12418
12419
12420
12421
12422
 
12663
12664
12665
12666
12667
12668
12669
12670
12671
12672
12673
12674
12675
12676
12677
12678
12679
12680
12681
12682
12683
12684
12685
 
12691
12692
12693
12694
12695
12696
12697
12698
12699
12700
12701
12702
@@ -7,15 +7,15 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2011-03-01 13:49-0300\n" +"POT-Creation-Date: 2011-03-09 17:23-0300\n"  "PO-Revision-Date: 2011-02-03 16:01+0000\n"  "Last-Translator: Wagner Bruna <Unknown>\n"  "Language-Team: Italian <it@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-03-01 19:42+0000\n" -"X-Generator: Launchpad (build 12460)\n" +"X-Launchpad-Export-Date: 2011-03-10 19:21+0000\n" +"X-Generator: Launchpad (build 12559)\n"    #: TortoiseHgOverlayServer.py:50  msgid "TortoiseHg Overlay Icon Server" @@ -25,30 +25,30 @@
 msgid "Exit"  msgstr "Esci"   -#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:287 +#: tortoisehg/hgqt/about.py:34 tortoisehg/hgqt/workbench.py:287  #: tortoisehg/hgtk/gdialog.py:505  msgid "About"  msgstr "Informazioni su"   -#: tortoisehg/hgqt/about.py:60 +#: tortoisehg/hgqt/about.py:59  msgid "Copyright 2008-2011 Steve Borho and others"  msgstr ""   -#: tortoisehg/hgqt/about.py:65 tortoisehg/hgtk/about.py:42 +#: tortoisehg/hgqt/about.py:64 tortoisehg/hgtk/about.py:42  msgid "Several icons are courtesy of the TortoiseSVN project"  msgstr ""  "Alcune icone sono state cortesemente concesse dal progetto TortoiseSVN"   -#: tortoisehg/hgqt/about.py:75 +#: tortoisehg/hgqt/about.py:74  msgid "You can visit our site here"  msgstr ""   -#: tortoisehg/hgqt/about.py:84 +#: tortoisehg/hgqt/about.py:83  msgid "&License"  msgstr ""   -#: tortoisehg/hgqt/about.py:90 tortoisehg/hgqt/archive.py:106 -#: tortoisehg/hgqt/hgemail_ui.py:272 tortoisehg/hgqt/hginit.py:58 +#: tortoisehg/hgqt/about.py:89 tortoisehg/hgqt/archive.py:106 +#: tortoisehg/hgqt/hgemail_ui.py:273 tortoisehg/hgqt/hginit.py:58  #: tortoisehg/hgqt/license.py:45 tortoisehg/hgqt/postreview_ui.py:178  #: tortoisehg/hgqt/rename.py:99  msgid "&Close" @@ -64,7 +64,7 @@
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"  msgstr ""   -#: tortoisehg/hgqt/about.py:189 tortoisehg/hgtk/about.py:70 +#: tortoisehg/hgqt/about.py:159 tortoisehg/hgtk/about.py:70  msgid "A new version of TortoiseHg is ready for download!"  msgstr "Una nuova versione di TortoiseHg è disponibile per il download!"   @@ -111,7 +111,12 @@
 msgid "%s is not found in revision %d"  msgstr ""   -#: tortoisehg/hgqt/annotate.py:359 +#: tortoisehg/hgqt/annotate.py:178 tortoisehg/hgqt/fileview.py:523 +#: tortoisehg/hgtk/chunks.py:85 +msgid "File is binary.\n" +msgstr "" + +#: tortoisehg/hgqt/annotate.py:364  #, python-format  msgid "Annotate %s@%d"  msgstr "" @@ -120,10 +125,10 @@
 msgid "= Working Directory Parent ="  msgstr "= Genitore della directory di lavoro ="   -#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:73 +#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:50  #: tortoisehg/hgqt/csinfo.py:105 tortoisehg/hgqt/csinfo.py:106 -#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:573 -#: tortoisehg/hgqt/tag.py:74 tortoisehg/hgtk/bookmark.py:83 +#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:574 +#: tortoisehg/hgqt/tag.py:49 tortoisehg/hgtk/bookmark.py:83  #: tortoisehg/hgtk/csinfo.py:211 tortoisehg/hgtk/csinfo.py:212  #: tortoisehg/hgtk/cslist.py:142 tortoisehg/hgtk/tagadd.py:66  msgid "Revision:" @@ -138,8 +143,8 @@
 msgid "Destination path:"  msgstr "Percorso destinazione:"   -#: tortoisehg/hgqt/archive.py:56 tortoisehg/hgqt/clone.py:53 -#: tortoisehg/hgqt/clone.py:65 tortoisehg/hgqt/hginit.py:37 +#: tortoisehg/hgqt/archive.py:56 tortoisehg/hgqt/clone.py:56 +#: tortoisehg/hgqt/clone.py:68 tortoisehg/hgqt/hginit.py:37  #: tortoisehg/hgqt/thgimport.py:53 tortoisehg/hgtk/archive.py:69  #: tortoisehg/hgtk/clone.py:70 tortoisehg/hgtk/hginit.py:55  #: tortoisehg/hgtk/thgconfig.py:394 tortoisehg/hgtk/thgimport.py:63 @@ -192,17 +197,17 @@
 msgid "&Detail"  msgstr ""   -#: 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/archive.py:112 tortoisehg/hgqt/commit.py:525 +#: tortoisehg/hgqt/commit.py:533 tortoisehg/hgqt/commit.py:560 +#: tortoisehg/hgqt/commit.py:573 tortoisehg/hgqt/compress.py:150  #: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:169 -#: tortoisehg/hgqt/merge.py:363 tortoisehg/hgqt/merge.py:396 -#: tortoisehg/hgqt/merge.py:460 tortoisehg/hgqt/rebase.py:214 +#: tortoisehg/hgqt/merge.py:363 tortoisehg/hgqt/merge.py:397 +#: tortoisehg/hgqt/merge.py:461 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 +#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgqt/settings.py:770  #: tortoisehg/hgqt/wctxactions.py:232 tortoisehg/hgqt/wctxactions.py:245 -#: tortoisehg/hgqt/wctxactions.py:300 tortoisehg/hgtk/shellconf.py:29 +#: tortoisehg/hgqt/wctxactions.py:300 tortoisehg/hgtk/shellconf.py:28  #: tortoisehg/hgtk/thgshelve.py:163  msgid "Cancel"  msgstr "Annulla" @@ -290,11 +295,11 @@
 msgid "Backed out changeset: "  msgstr "Backout eseguito sul changeset: "   -#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:91 -#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:313 +#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:94 +#: tortoisehg/hgqt/commit.py:220 tortoisehg/hgqt/merge.py:313  #: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169 -#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:132 -#: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64 +#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:136 +#: tortoisehg/hgqt/tag.py:64 tortoisehg/hgtk/hgemail.py:64  msgid "Options"  msgstr "Opzioni"   @@ -307,7 +312,7 @@
 msgstr ""    #: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:330 -#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:895 +#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:905  #: tortoisehg/hgqt/update.py:97  msgid "Automatically resolve merge conflicts where possible"  msgstr "" @@ -316,7 +321,7 @@
 msgid "&Backout"  msgstr ""   -#: tortoisehg/hgqt/backout.py:115 tortoisehg/hgqt/clone.py:155 +#: tortoisehg/hgqt/backout.py:115 tortoisehg/hgqt/clone.py:158  #: tortoisehg/hgqt/cmdui.py:737 tortoisehg/hgqt/thgimport.py:117  #: tortoisehg/hgqt/thgstrip.py:110 tortoisehg/hgqt/update.py:129  msgid "Detail" @@ -327,7 +332,7 @@
 msgid "Backout '%s' - %s"  msgstr ""   -#: tortoisehg/hgqt/backout.py:146 tortoisehg/hgqt/commit.py:387 +#: tortoisehg/hgqt/backout.py:146 tortoisehg/hgqt/commit.py:394  #: tortoisehg/hgqt/mq.py:455 tortoisehg/hgtk/backout.py:139  #: tortoisehg/hgtk/commit.py:581  msgid "Confirm Discard Message" @@ -337,9 +342,9 @@
 msgid "Discard current backout message?"  msgstr "Sovrascrivere messaggio di backout attuale"   -#: tortoisehg/hgqt/backout.py:213 tortoisehg/hgqt/commit.py:181 -#: tortoisehg/hgqt/commit.py:917 tortoisehg/hgqt/compress.py:122 -#: tortoisehg/hgqt/repowidget.py:161 tortoisehg/hgqt/repowidget.py:235 +#: tortoisehg/hgqt/backout.py:213 tortoisehg/hgqt/commit.py:179 +#: tortoisehg/hgqt/commit.py:909 tortoisehg/hgqt/compress.py:122 +#: tortoisehg/hgqt/repowidget.py:162 tortoisehg/hgqt/repowidget.py:236  #: tortoisehg/hgqt/settings.py:367 tortoisehg/hgtk/commit.py:654  #: tortoisehg/hgtk/commit.py:951 tortoisehg/hgtk/commit.py:1015  #: tortoisehg/hgtk/commit.py:1264 tortoisehg/hgtk/gdialog.py:485 @@ -413,62 +418,78 @@
 msgstr ""    #: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135 -#: tortoisehg/hgqt/commit.py:580 tortoisehg/hgqt/commit.py:845 -#: tortoisehg/hgqt/commit.py:865 tortoisehg/hgqt/hgignore.py:232 +#: tortoisehg/hgqt/commit.py:590 tortoisehg/hgqt/commit.py:837 +#: tortoisehg/hgqt/commit.py:857 tortoisehg/hgqt/hgignore.py:232  #: tortoisehg/hgqt/hginit.py:180 tortoisehg/hgqt/status.py:382  #: tortoisehg/hgqt/wctxactions.py:119  #, python-format  msgid "%s (hint: %s)"  msgstr ""   -#: tortoisehg/hgqt/bookmark.py:54 tortoisehg/hgtk/bookmark.py:71 +#: tortoisehg/hgqt/bookmark.py:57 tortoisehg/hgtk/bookmark.py:71  msgid "Bookmark:"  msgstr "Segnalibro:"   -#: tortoisehg/hgqt/bookmark.py:61 -msgid "New name:" -msgstr "" - -#: tortoisehg/hgqt/bookmark.py:80 tortoisehg/hgqt/tag.py:113 -#: tortoisehg/hgqt/wctxactions.py:53 tortoisehg/hgqt/wctxactions.py:59 +#: tortoisehg/hgqt/bookmark.py:62 tortoisehg/hgtk/bookmark.py:86 +msgid "New Name:" +msgstr "Nuovo nome:" + +#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:560 +#: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:53 +#: tortoisehg/hgqt/wctxactions.py:59  msgid "&Add"  msgstr ""   -#: tortoisehg/hgqt/bookmark.py:83 -msgid "&Rename" -msgstr "" - -#: tortoisehg/hgqt/bookmark.py:86 tortoisehg/hgqt/tag.py:116 +#: tortoisehg/hgqt/bookmark.py:68 +msgid "Re&name" +msgstr "" + +#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:573 +#: tortoisehg/hgqt/tag.py:99  msgid "&Remove"  msgstr ""   -#: tortoisehg/hgqt/bookmark.py:109 tortoisehg/hgtk/bookmark.py:37 +#: tortoisehg/hgqt/bookmark.py:70 +msgid "&Move" +msgstr "" + +#: tortoisehg/hgqt/bookmark.py:92 tortoisehg/hgtk/bookmark.py:37  #, python-format  msgid "Bookmark - %s"  msgstr "%s - Gestione segnalibri"   -#: tortoisehg/hgqt/bookmark.py:196 tortoisehg/hgqt/bookmark.py:241 +#: tortoisehg/hgqt/bookmark.py:160 tortoisehg/hgqt/bookmark.py:214  #, python-format  msgid "A bookmark named \"%s\" already exists"  msgstr ""   -#: tortoisehg/hgqt/bookmark.py:202 +#: tortoisehg/hgqt/bookmark.py:165  #, python-format  msgid "Bookmark '%s' has been added"  msgstr ""   -#: tortoisehg/hgqt/bookmark.py:216 tortoisehg/hgqt/bookmark.py:237 +#: tortoisehg/hgqt/bookmark.py:176 +#, python-format +msgid "Bookmark named \"%s\" does not exist" +msgstr "" + +#: tortoisehg/hgqt/bookmark.py:181 +#, python-format +msgid "Bookmark '%s' has been moved" +msgstr "" + +#: tortoisehg/hgqt/bookmark.py:192 tortoisehg/hgqt/bookmark.py:210  #: tortoisehg/hgtk/bookmark.py:364  #, python-format  msgid "Bookmark '%s' does not exist"  msgstr "Il segnalibro '%s' non esiste"   -#: tortoisehg/hgqt/bookmark.py:222 +#: tortoisehg/hgqt/bookmark.py:196  #, python-format  msgid "Bookmark '%s' has been removed"  msgstr ""   -#: tortoisehg/hgqt/bookmark.py:249 +#: tortoisehg/hgqt/bookmark.py:219  #, python-format  msgid "Bookmark '%s' has been renamed to '%s'"  msgstr "" @@ -477,19 +498,19 @@
 msgid "Select branch of merge commit"  msgstr "Selezionare il ramo su cui eseguire il commit del merge"   -#: tortoisehg/hgqt/branchop.py:36 tortoisehg/hgtk/commit.py:77 +#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:77  msgid "Changes take effect on next commit"  msgstr "Le modifiche avranno effetto al prossimo commit"   -#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:60 +#: tortoisehg/hgqt/branchop.py:46 tortoisehg/hgtk/commit.py:60  msgid "No branch changes"  msgstr "Nessuna operazione sui rami"   -#: tortoisehg/hgqt/branchop.py:42 tortoisehg/hgtk/commit.py:62 +#: tortoisehg/hgqt/branchop.py:47 tortoisehg/hgtk/commit.py:62  msgid "Open a new named branch"  msgstr "Apre un nuovo ramo"   -#: tortoisehg/hgqt/branchop.py:43 +#: tortoisehg/hgqt/branchop.py:48  msgid "Close current branch"  msgstr ""   @@ -565,108 +586,108 @@
 msgid "Add or remove patches must be merged in the working directory"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128 +#: tortoisehg/hgqt/chunks.py:433 tortoisehg/hgqt/status.py:128  msgctxt "files"  msgid "All"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/status.py:132 +#: tortoisehg/hgqt/chunks.py:437 tortoisehg/hgqt/status.py:132  msgctxt "files"  msgid "None"  msgstr ""   -#: tortoisehg/hgqt/chunks.py:491 +#: tortoisehg/hgqt/chunks.py:493  #, python-format  msgid "Chunks selected: %d / %d"  msgstr ""   -#: tortoisehg/hgqt/clone.py:56 tortoisehg/hgqt/rename.py:65 +#: tortoisehg/hgqt/clone.py:59 tortoisehg/hgqt/rename.py:65  #: tortoisehg/hgqt/thgimport.py:62 tortoisehg/hgtk/thgimport.py:82  msgid "Source:"  msgstr "Sorgente:"   -#: tortoisehg/hgqt/clone.py:68 tortoisehg/hgqt/rename.py:70 +#: tortoisehg/hgqt/clone.py:71 tortoisehg/hgqt/rename.py:70  #: tortoisehg/hgtk/hginit.py:58  msgid "Destination:"  msgstr "Destinazione:"   -#: tortoisehg/hgqt/clone.py:113 tortoisehg/hgtk/clone.py:127 +#: tortoisehg/hgqt/clone.py:116 tortoisehg/hgtk/clone.py:127  msgid "Clone to revision:"  msgstr "Clona fino alla revisione:"   -#: tortoisehg/hgqt/clone.py:116 tortoisehg/hgtk/clone.py:141 +#: tortoisehg/hgqt/clone.py:119 tortoisehg/hgtk/clone.py:141  msgid "Do not update the new working directory"  msgstr "Non aggiornare la nuova directory di lavoro"   -#: tortoisehg/hgqt/clone.py:117 tortoisehg/hgtk/clone.py:142 +#: tortoisehg/hgqt/clone.py:120 tortoisehg/hgtk/clone.py:142  msgid "Use pull protocol to copy metadata"  msgstr "Usa protocollo di pull per copiare i metadati"   -#: tortoisehg/hgqt/clone.py:118 tortoisehg/hgtk/clone.py:143 +#: tortoisehg/hgqt/clone.py:121 tortoisehg/hgtk/clone.py:143  msgid "Use uncompressed transfer"  msgstr "Usa trasferimento non compresso"   -#: tortoisehg/hgqt/clone.py:119 +#: tortoisehg/hgqt/clone.py:122  msgid "Include patch queue"  msgstr ""   -#: tortoisehg/hgqt/clone.py:125 tortoisehg/hgtk/clone.py:149 +#: tortoisehg/hgqt/clone.py:128 tortoisehg/hgtk/clone.py:149  #: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179  msgid "Use proxy server"  msgstr "Usa server proxy"   -#: tortoisehg/hgqt/clone.py:131 tortoisehg/hgqt/sync.py:1368 -#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:201 +#: tortoisehg/hgqt/clone.py:134 tortoisehg/hgqt/sync.py:1368 +#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202  msgid "Remote command:"  msgstr "Comando remoto:"   -#: tortoisehg/hgqt/clone.py:134 +#: tortoisehg/hgqt/clone.py:137  msgid "Start revision:"  msgstr ""   -#: tortoisehg/hgqt/clone.py:152 +#: tortoisehg/hgqt/clone.py:155  msgid "&Clone"  msgstr ""   -#: tortoisehg/hgqt/clone.py:165 +#: tortoisehg/hgqt/clone.py:168  #, python-format  msgid "Clone - %s"  msgstr ""   -#: tortoisehg/hgqt/clone.py:225 tortoisehg/hgqt/clone.py:252 -#: tortoisehg/hgqt/clone.py:259 tortoisehg/hgtk/clone.py:37 +#: tortoisehg/hgqt/clone.py:228 tortoisehg/hgqt/clone.py:255 +#: tortoisehg/hgqt/clone.py:262 tortoisehg/hgtk/clone.py:37  msgid "TortoiseHg Clone"  msgstr "TortoiseHg Clonazione"   -#: tortoisehg/hgqt/clone.py:226 +#: tortoisehg/hgqt/clone.py:229  msgid "Error creating destination folder"  msgstr ""   -#: tortoisehg/hgqt/clone.py:227 +#: tortoisehg/hgqt/clone.py:230  msgid "Please specify a different path."  msgstr ""   -#: tortoisehg/hgqt/clone.py:253 tortoisehg/hgtk/clone.py:288 +#: tortoisehg/hgqt/clone.py:256 tortoisehg/hgtk/clone.py:288  msgid "Source path is empty"  msgstr "Percorso sorgente non specificato"   -#: tortoisehg/hgqt/clone.py:254 +#: tortoisehg/hgqt/clone.py:257  msgid "Please enter a valid source path."  msgstr ""   -#: tortoisehg/hgqt/clone.py:260 tortoisehg/hgtk/clone.py:294 +#: tortoisehg/hgqt/clone.py:263 tortoisehg/hgtk/clone.py:294  msgid "Source and destination are the same"  msgstr "Sorgente e destinazione coincidono"   -#: tortoisehg/hgqt/clone.py:261 +#: tortoisehg/hgqt/clone.py:264  msgid "Please specify different paths."  msgstr ""   -#: tortoisehg/hgqt/clone.py:322 +#: tortoisehg/hgqt/clone.py:325  msgid "Select source repository"  msgstr ""   -#: tortoisehg/hgqt/clone.py:330 +#: tortoisehg/hgqt/clone.py:334  msgid "Select destination repository"  msgstr ""   @@ -700,7 +721,7 @@
 msgid "Terminated"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:736 +#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:737  #: tortoisehg/hgtk/p4pending.py:101  msgid "Finished"  msgstr "Completato" @@ -729,212 +750,205 @@
   #: tortoisehg/hgqt/cmdui.py:766 tortoisehg/hgqt/merge.py:65  #: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/resolve.py:318 -#: tortoisehg/hgqt/settings.py:650 tortoisehg/hgtk/commit.py:323 +#: tortoisehg/hgqt/settings.py:669 tortoisehg/hgtk/commit.py:323  #: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846  msgid "Confirm Exit"  msgstr "Conferma uscita"   -#: tortoisehg/hgqt/cmdui.py:766 +#: tortoisehg/hgqt/cmdui.py:767  msgid ""  "Mercurial command is still running.\n"  "Are you sure you want to terminate?"  msgstr ""   -#: tortoisehg/hgqt/cmdui.py:810 +#: tortoisehg/hgqt/cmdui.py:811  msgid "TortoiseHg"  msgstr ""   +#: tortoisehg/hgqt/commit.py:81 +msgid "Paste &Filenames" +msgstr "" +  #: tortoisehg/hgqt/commit.py:83 -msgid "Paste &Filenames" -msgstr "" - -#: tortoisehg/hgqt/commit.py:85  msgid "App&ly Format"  msgstr ""   -#: tortoisehg/hgqt/commit.py:86 +#: tortoisehg/hgqt/commit.py:84  msgid "C&onfigure Format"  msgstr ""   -#: tortoisehg/hgqt/commit.py:213 tortoisehg/hgqt/commit.py:332 +#: tortoisehg/hgqt/commit.py:206 +msgid "Commit Dialog Toolbar" +msgstr "" + +#: tortoisehg/hgqt/commit.py:210 +msgid "Copy message" +msgstr "" + +#: tortoisehg/hgqt/commit.py:212 +msgid "Copy one of the recent commit messages" +msgstr "" + +#: tortoisehg/hgqt/commit.py:216 tortoisehg/hgqt/commit.py:330  msgid "Branch: "  msgstr "Branch: "   +#: tortoisehg/hgqt/commit.py:332 +msgid "Close Branch: " +msgstr "" +  #: tortoisehg/hgqt/commit.py:334 -msgid "Close Branch: " -msgstr "" - -#: tortoisehg/hgqt/commit.py:336  msgid "New Branch: "  msgstr ""   -#: tortoisehg/hgqt/commit.py:358 +#: tortoisehg/hgqt/commit.py:356  #, python-format  msgid "Rollback commit to revision %d"  msgstr ""   -#: tortoisehg/hgqt/commit.py:367 +#: tortoisehg/hgqt/commit.py:365  msgid "Confirm Undo"  msgstr ""   -#: tortoisehg/hgqt/commit.py:388 tortoisehg/hgqt/mq.py:456 +#: tortoisehg/hgqt/commit.py:395 tortoisehg/hgqt/mq.py:456  #: tortoisehg/hgtk/commit.py:582  msgid "Discard current commit message?"  msgstr "Sostituire il messaggio di commit attuale?"   -#: tortoisehg/hgqt/commit.py:472 +#: tortoisehg/hgqt/commit.py:480  msgid "Please enter a username"  msgstr ""   -#: tortoisehg/hgqt/commit.py:473 +#: tortoisehg/hgqt/commit.py:481  msgid "You must identify yourself to Mercurial"  msgstr ""   -#: tortoisehg/hgqt/commit.py:488 tortoisehg/hgtk/commit.py:935 +#: tortoisehg/hgqt/commit.py:496 tortoisehg/hgtk/commit.py:935  #: tortoisehg/hgtk/commit.py:1079 tortoisehg/hgtk/commit.py:1098  msgid "Nothing Commited"  msgstr "Commit non eseguito"   -#: tortoisehg/hgqt/commit.py:489 tortoisehg/hgtk/commit.py:1080 +#: tortoisehg/hgqt/commit.py:497 tortoisehg/hgtk/commit.py:1080  #: tortoisehg/hgtk/tagadd.py:225  msgid "Please enter commit message"  msgstr "Si prega di inserire un messaggio di commit"   -#: tortoisehg/hgqt/commit.py:510 tortoisehg/hgtk/commit.py:1186 +#: tortoisehg/hgqt/commit.py:518 tortoisehg/hgtk/commit.py:1186  msgid "Confirm Branch Change"  msgstr "Conferma la modifica al ramo"   -#: tortoisehg/hgqt/commit.py:511 -#, python-format -msgid "" -"Named branch \"%s\" already exists, last used in revision %d\n" -"Yes\t- Make commit restarting this named branch\n" -"No\t- Make commit without changing branch\n" -"Cancel\t- Cancel this commit" -msgstr "" - -#: tortoisehg/hgqt/commit.py:516 tortoisehg/hgqt/commit.py:523 -#: tortoisehg/hgqt/settings.py:652 tortoisehg/hgtk/commit.py:325 -#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200 -#: tortoisehg/hgtk/status.py:1320 tortoisehg/hgtk/thgconfig.py:848 -#: tortoisehg/hgtk/thgmq.py:369 -msgid "&Yes" -msgstr "&Si" - -#: tortoisehg/hgqt/commit.py:516 tortoisehg/hgqt/commit.py:523 -#: tortoisehg/hgqt/thgstrip.py:206 tortoisehg/hgtk/commit.py:325 -#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200 -#: tortoisehg/hgtk/thgstrip.py:217 -msgid "&No" -msgstr "&No" - -#: tortoisehg/hgqt/commit.py:518 tortoisehg/hgtk/commit.py:1195 +#: tortoisehg/hgqt/commit.py:519 +#, python-format +msgid "Named branch \"%s\" already exists, last used in revision %d\n" +msgstr "" + +#: tortoisehg/hgqt/commit.py:523 +msgid "Restart &Branch" +msgstr "" + +#: tortoisehg/hgqt/commit.py:524 tortoisehg/hgqt/commit.py:532 +msgid "&Commit to current branch" +msgstr "" + +#: tortoisehg/hgqt/commit.py:527 tortoisehg/hgtk/commit.py:1195  msgid "Confirm New Branch"  msgstr "Conferma nuovo ramo"   -#: tortoisehg/hgqt/commit.py:519 -#, python-format -msgid "" -"Create new named branch \"%s\" with this commit?\n" -"Yes\t- Start new branch with this commit\n" -"No\t- Make commit without branch change\n" -"Cancel\t- Cancel this commit" -msgstr "" - -#: tortoisehg/hgqt/commit.py:532 +#: tortoisehg/hgqt/commit.py:528 +#, python-format +msgid "Create new named branch \"%s\" with this commit?\n" +msgstr "" + +#: tortoisehg/hgqt/commit.py:531 +msgid "Create &Branch" +msgstr "" + +#: tortoisehg/hgqt/commit.py:542  msgid "No files checked"  msgstr ""   -#: tortoisehg/hgqt/commit.py:533 +#: tortoisehg/hgqt/commit.py:543  msgid "No modified files checkmarked for commit"  msgstr ""   -#: tortoisehg/hgqt/commit.py:548 +#: tortoisehg/hgqt/commit.py:558  msgid "Confirm Add"  msgstr ""   -#: tortoisehg/hgqt/commit.py:549 -msgid "Add checked untracked files?" -msgstr "" - -#: tortoisehg/hgqt/commit.py:550 tortoisehg/hgqt/commit.py:563 -msgid "&OK" -msgstr "" - -#: tortoisehg/hgqt/commit.py:561 +#: tortoisehg/hgqt/commit.py:559 +msgid "Add selected untracked files?" +msgstr "" + +#: tortoisehg/hgqt/commit.py:571  msgid "Confirm Remove"  msgstr ""   -#: tortoisehg/hgqt/commit.py:562 -msgid "Remove checked deleted files?" -msgstr "" - -#: tortoisehg/hgqt/commit.py:621 tortoisehg/hgtk/commit.py:429 -msgid "Recent commit messages..." -msgstr "Ultimi messaggi di commit..." - -#: tortoisehg/hgqt/commit.py:645 +#: tortoisehg/hgqt/commit.py:572 +msgid "Remove selected deleted files?" +msgstr "" + +#: tortoisehg/hgqt/commit.py:635  msgid "Set username:"  msgstr ""   -#: tortoisehg/hgqt/commit.py:670 tortoisehg/hgqt/commit.py:717 -#: tortoisehg/hgqt/commit.py:740 +#: tortoisehg/hgqt/commit.py:662 tortoisehg/hgqt/commit.py:709 +#: tortoisehg/hgqt/commit.py:732  msgid "Save in Repo"  msgstr ""   -#: tortoisehg/hgqt/commit.py:675 +#: tortoisehg/hgqt/commit.py:667  msgid "Save Global"  msgstr ""   -#: tortoisehg/hgqt/commit.py:687 +#: tortoisehg/hgqt/commit.py:679  msgid "Set Date:"  msgstr ""   -#: tortoisehg/hgqt/commit.py:691 tortoisehg/hgtk/history.py:1594 +#: tortoisehg/hgqt/commit.py:683 tortoisehg/hgtk/history.py:1594  #: tortoisehg/hgtk/synch.py:148 tortoisehg/hgtk/update.py:128  msgid "Update"  msgstr "Aggiorna"   -#: tortoisehg/hgqt/commit.py:710 +#: tortoisehg/hgqt/commit.py:702  msgid "Push After Commit:"  msgstr ""   -#: tortoisehg/hgqt/commit.py:733 +#: tortoisehg/hgqt/commit.py:725  msgid "Auto Includes:"  msgstr ""   -#: tortoisehg/hgqt/commit.py:772 +#: tortoisehg/hgqt/commit.py:764  msgid "Unable to save username"  msgstr ""   -#: tortoisehg/hgqt/commit.py:773 tortoisehg/hgqt/commit.py:796 -#: tortoisehg/hgqt/commit.py:819 tortoisehg/hgqt/sync.py:837 -#: tortoisehg/hgqt/sync.py:935 tortoisehg/hgqt/sync.py:1005 -#: tortoisehg/hgqt/sync.py:1160 +#: tortoisehg/hgqt/commit.py:765 tortoisehg/hgqt/commit.py:788 +#: tortoisehg/hgqt/commit.py:811 tortoisehg/hgqt/sync.py:847 +#: tortoisehg/hgqt/sync.py:945 tortoisehg/hgqt/sync.py:1015 +#: tortoisehg/hgqt/sync.py:1175  msgid "Iniparse must be installed."  msgstr ""   -#: tortoisehg/hgqt/commit.py:788 tortoisehg/hgqt/commit.py:811 -#: tortoisehg/hgqt/commit.py:834 tortoisehg/hgqt/settings.py:948 -#: tortoisehg/hgqt/sync.py:847 tortoisehg/hgqt/sync.py:946 -#: tortoisehg/hgqt/sync.py:1023 tortoisehg/hgqt/sync.py:1198 +#: tortoisehg/hgqt/commit.py:780 tortoisehg/hgqt/commit.py:803 +#: tortoisehg/hgqt/commit.py:826 tortoisehg/hgqt/settings.py:967 +#: tortoisehg/hgqt/sync.py:857 tortoisehg/hgqt/sync.py:956 +#: tortoisehg/hgqt/sync.py:1033 tortoisehg/hgqt/sync.py:1213  #: tortoisehg/hgtk/thgconfig.py:1654  msgid "Unable to write configuration file"  msgstr "Impossibile scrivere nel file di configurazione"   -#: tortoisehg/hgqt/commit.py:795 +#: tortoisehg/hgqt/commit.py:787  msgid "Unable to save after commit push"  msgstr ""   -#: tortoisehg/hgqt/commit.py:818 +#: tortoisehg/hgqt/commit.py:810  msgid "Unable to save auto include list"  msgstr ""   -#: tortoisehg/hgqt/commit.py:849 +#: tortoisehg/hgqt/commit.py:841  msgid "Invalid date format"  msgstr ""   -#: tortoisehg/hgqt/commit.py:869 +#: tortoisehg/hgqt/commit.py:861  msgid "No username configured"  msgstr ""   @@ -979,21 +993,21 @@
 msgstr ""    #: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:362 -#: tortoisehg/hgqt/merge.py:395 tortoisehg/hgqt/merge.py:459 -#: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751 +#: tortoisehg/hgqt/merge.py:396 tortoisehg/hgqt/merge.py:460 +#: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:770  #: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775  #: tortoisehg/hgtk/update.py:233  msgid "&Discard"  msgstr "&Abbandona"   -#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:461 +#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:462  #: tortoisehg/hgqt/rebase.py:215  msgid "Confirm Discard"  msgstr ""   -#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:461 -#: tortoisehg/hgqt/rebase.py:215 -msgid "Discard outstanding changes in working directory?" +#: tortoisehg/hgqt/compress.py:152 tortoisehg/hgqt/merge.py:463 +#: tortoisehg/hgqt/rebase.py:216 +msgid "Discard outstanding changes to working directory?"  msgstr ""    #: tortoisehg/hgqt/csinfo.py:48 tortoisehg/hgtk/csinfo.py:49 @@ -1081,81 +1095,81 @@
 msgid "Forward"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:206 tortoisehg/hgqt/manifestdialog.py:284 +#: tortoisehg/hgqt/filelistview.py:205 tortoisehg/hgqt/manifestdialog.py:284  #, python-format  msgid "Hg file log viewer - %s"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:215 +#: tortoisehg/hgqt/filelistview.py:214  msgid "Show All"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:217 +#: tortoisehg/hgqt/filelistview.py:216  msgid "Toggle display of all files and the direction they were merged"  msgstr ""   +#: tortoisehg/hgqt/filelistview.py:219 +msgid "Other" +msgstr "" +  #: tortoisehg/hgqt/filelistview.py:221 -msgid "Other" -msgstr "" - -#: tortoisehg/hgqt/filelistview.py:223  msgid "Toggle display of diffs to second (other) parent"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:231 tortoisehg/hgqt/manifestdialog.py:196 +#: tortoisehg/hgqt/filelistview.py:228 tortoisehg/hgqt/manifestdialog.py:196  msgid "File history"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:232 tortoisehg/hgqt/manifestdialog.py:197 +#: tortoisehg/hgqt/filelistview.py:229 tortoisehg/hgqt/manifestdialog.py:197  msgid "Show the history of the selected file"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:233 tortoisehg/hgqt/manifestdialog.py:198 +#: tortoisehg/hgqt/filelistview.py:230 tortoisehg/hgqt/manifestdialog.py:198  msgid "Compare file revisions"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:234 tortoisehg/hgqt/manifestdialog.py:199 +#: tortoisehg/hgqt/filelistview.py:231 tortoisehg/hgqt/manifestdialog.py:199  msgid "Compare revisions of the selected file"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:502 +#: tortoisehg/hgqt/filelistview.py:232 tortoisehg/hgqt/grep.py:502  #: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/util/menuthg.py:76  msgid "Visual Diff"  msgstr "Comparazione visuale"   -#: tortoisehg/hgqt/filelistview.py:236 tortoisehg/hgqt/manifestdialog.py:201 +#: tortoisehg/hgqt/filelistview.py:233 tortoisehg/hgqt/manifestdialog.py:201  msgid "View file changes in external diff tool"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:237 tortoisehg/hgqt/manifestdialog.py:202 +#: tortoisehg/hgqt/filelistview.py:234 tortoisehg/hgqt/manifestdialog.py:202  msgid "Visual Diff to Local"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:238 tortoisehg/hgqt/manifestdialog.py:203 +#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/manifestdialog.py:203  msgid "View changes to current in external diff tool"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:240 tortoisehg/hgqt/manifestdialog.py:205 +#: tortoisehg/hgqt/filelistview.py:237 tortoisehg/hgqt/manifestdialog.py:205  msgid "View at Revision"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:241 tortoisehg/hgqt/manifestdialog.py:206 +#: tortoisehg/hgqt/filelistview.py:238 tortoisehg/hgqt/manifestdialog.py:206  msgid "View file as it appeared at this revision"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:242 tortoisehg/hgqt/manifestdialog.py:207 +#: tortoisehg/hgqt/filelistview.py:239 tortoisehg/hgqt/manifestdialog.py:207  msgid "Edit Local"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:243 tortoisehg/hgqt/manifestdialog.py:208 +#: tortoisehg/hgqt/filelistview.py:240 tortoisehg/hgqt/manifestdialog.py:208  msgid "Edit current file in working copy"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:244 tortoisehg/hgqt/manifestdialog.py:209 +#: tortoisehg/hgqt/filelistview.py:241 tortoisehg/hgqt/manifestdialog.py:209  msgid "Revert to Revision"  msgstr ""   -#: tortoisehg/hgqt/filelistview.py:245 tortoisehg/hgqt/manifestdialog.py:210 +#: tortoisehg/hgqt/filelistview.py:242 tortoisehg/hgqt/manifestdialog.py:210  msgid "Revert file(s) to contents at this revision"  msgstr ""   @@ -1192,10 +1206,6 @@
 msgstr ""  "La dimensione del file è maggiore della dimensione massima specificata.\n"   -#: tortoisehg/hgqt/fileview.py:523 tortoisehg/hgtk/chunks.py:85 -msgid "File is binary.\n" -msgstr "" -  #: tortoisehg/hgqt/fileview.py:552 tortoisehg/hgqt/fileview.py:657  #, python-format  msgid "exec mode has been <font color='red'>%s</font>" @@ -1229,7 +1239,7 @@
 msgid "Revision has changed from:"  msgstr ""   -#: tortoisehg/hgqt/fileview.py:604 tortoisehg/hgqt/hgemail_ui.py:244 +#: tortoisehg/hgqt/fileview.py:604 tortoisehg/hgqt/hgemail_ui.py:245  #: tortoisehg/hgtk/hgemail.py:76  msgid "To:"  msgstr "A:" @@ -1279,7 +1289,7 @@
 msgstr "Ignora maiuscole/minuscole"    #: tortoisehg/hgqt/grep.py:49 tortoisehg/hgqt/qscilib.py:301 -#: tortoisehg/hgqt/qscilib.py:324 tortoisehg/hgqt/repowidget.py:173 +#: tortoisehg/hgqt/qscilib.py:324 tortoisehg/hgqt/repowidget.py:174  #: tortoisehg/hgtk/datamine.py:310  msgid "Search"  msgstr "Cerca" @@ -1355,7 +1365,7 @@
 msgid "No matches found"  msgstr ""   -#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:382 +#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:384  #, python-format  msgid "%d matches found"  msgstr "" @@ -1389,22 +1399,22 @@
 msgid "Annotate file"  msgstr ""   -#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:364 +#: tortoisehg/hgqt/grep.py:644 tortoisehg/hgtk/datamine.py:364  #: tortoisehg/hgtk/datamine.py:654  msgid "File"  msgstr "File"   -#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:652 +#: tortoisehg/hgqt/grep.py:644 tortoisehg/hgtk/datamine.py:652  msgid "Line"  msgstr "Linea"   -#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:363 +#: tortoisehg/hgqt/grep.py:644 tortoisehg/hgtk/datamine.py:363  #: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441  msgid "Rev"  msgstr "Rev"   -#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgqt/settings.py:451 -#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgqt/settings.py:590 +#: tortoisehg/hgqt/grep.py:644 tortoisehg/hgqt/settings.py:451 +#: tortoisehg/hgqt/settings.py:564 tortoisehg/hgqt/settings.py:609  #: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655  #: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502  #: tortoisehg/hgtk/history.py:695 tortoisehg/hgtk/thgconfig.py:232 @@ -1412,7 +1422,7 @@
 msgid "User"  msgstr "Utente"   -#: tortoisehg/hgqt/grep.py:647 +#: tortoisehg/hgqt/grep.py:645  msgid "Match Text"  msgstr ""   @@ -1505,44 +1515,44 @@
 msgid "% Match"  msgstr ""   -#: tortoisehg/hgqt/hgemail.py:262 +#: tortoisehg/hgqt/hgemail.py:263  msgid "Sending Email"  msgstr ""   -#: tortoisehg/hgqt/hgemail.py:438 +#: tortoisehg/hgqt/hgemail.py:439  msgid "use only one form to specify the revision"  msgstr ""   -#: tortoisehg/hgqt/hgemail.py:448 +#: tortoisehg/hgqt/hgemail.py:449  msgid "Failed to open Email dialog"  msgstr ""   -#: tortoisehg/hgqt/hgemail_ui.py:243 tortoisehg/hgqt/settings.py:457 +#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:457  #: tortoisehg/hgtk/synch.py:78 tortoisehg/hgtk/thgconfig.py:238  msgid "Email"  msgstr "Email"   -#: tortoisehg/hgqt/hgemail_ui.py:245 tortoisehg/hgtk/hgemail.py:81 +#: tortoisehg/hgqt/hgemail_ui.py:246 tortoisehg/hgtk/hgemail.py:81  msgid "Cc:"  msgstr "Cc:"   -#: tortoisehg/hgqt/hgemail_ui.py:246 tortoisehg/hgtk/hgemail.py:86 +#: tortoisehg/hgqt/hgemail_ui.py:247 tortoisehg/hgtk/hgemail.py:86  msgid "From:"  msgstr "Da:"   -#: tortoisehg/hgqt/hgemail_ui.py:247 tortoisehg/hgtk/hgemail.py:90 +#: tortoisehg/hgqt/hgemail_ui.py:248 tortoisehg/hgtk/hgemail.py:90  msgid "In-Reply-To:"  msgstr "Rispondi a:"   -#: tortoisehg/hgqt/hgemail_ui.py:248 tortoisehg/hgtk/hgemail.py:92 +#: tortoisehg/hgqt/hgemail_ui.py:249 tortoisehg/hgtk/hgemail.py:92  msgid "Message identifier to reply to, for threading"  msgstr "Identificativo del messaggio a cui rispondere. Per i thread."   -#: tortoisehg/hgqt/hgemail_ui.py:249 +#: tortoisehg/hgqt/hgemail_ui.py:250  msgid "Flag:"  msgstr ""   -#: tortoisehg/hgqt/hgemail_ui.py:250 tortoisehg/hgtk/hgemail.py:101 +#: tortoisehg/hgqt/hgemail_ui.py:251 tortoisehg/hgtk/hgemail.py:101  msgid ""  "Hg patches (as generated by export command) are compatible with most patch "  "programs. They include a header which contains the most important changeset " @@ -1552,11 +1562,11 @@
 "maggior parte dei programmi di patch. Esse includono un header che contiene "  "i più importanti metadati del changeset."   -#: tortoisehg/hgqt/hgemail_ui.py:251 tortoisehg/hgtk/hgemail.py:98 +#: tortoisehg/hgqt/hgemail_ui.py:252 tortoisehg/hgtk/hgemail.py:98  msgid "Send changesets as Hg patches"  msgstr "Invia i changeset come patch Hg"   -#: tortoisehg/hgqt/hgemail_ui.py:252 tortoisehg/hgtk/hgemail.py:109 +#: tortoisehg/hgqt/hgemail_ui.py:253 tortoisehg/hgtk/hgemail.py:109  msgid ""  "Git patches can describe binary files, copies, and permission changes, but "  "recipients may not be able to use them if they are not using git or " @@ -1566,11 +1576,11 @@
 "ma il destinatario può non essere in grado di usarli se non usa Git o "  "Mercurial."   -#: tortoisehg/hgqt/hgemail_ui.py:253 tortoisehg/hgtk/hgemail.py:106 +#: tortoisehg/hgqt/hgemail_ui.py:254 tortoisehg/hgtk/hgemail.py:106  msgid "Use extended (git) patch format"  msgstr "Usa formato esteso (git) per i patch"   -#: tortoisehg/hgqt/hgemail_ui.py:254 tortoisehg/hgtk/hgemail.py:117 +#: tortoisehg/hgqt/hgemail_ui.py:255 tortoisehg/hgtk/hgemail.py:117  msgid ""  "Stripping Mercurial header removes username and parent information. Only "  "useful if recipient is not using Mercurial (and does not like to see the " @@ -1580,11 +1590,11 @@
 "informazioni sui changeset genitori. Utile solo se il destinatario non usa "  "Mercurial (e se non vuole vedere gli header)."   -#: tortoisehg/hgqt/hgemail_ui.py:255 tortoisehg/hgtk/hgemail.py:114 +#: tortoisehg/hgqt/hgemail_ui.py:256 tortoisehg/hgtk/hgemail.py:114  msgid "Plain, do not prepend Hg header"  msgstr "Semplice, senza header Hg"   -#: tortoisehg/hgqt/hgemail_ui.py:256 tortoisehg/hgtk/hgemail.py:126 +#: tortoisehg/hgqt/hgemail_ui.py:257 tortoisehg/hgtk/hgemail.py:126  msgid ""  "Bundles store complete changesets in binary form. Upstream users can pull "  "from them. This is the safest way to send changes to recipient Mercurial " @@ -1594,35 +1604,35 @@
 "eseguire il pull dai bundle. Questo è il modo più sicuro per inviare "  "modifiche ad altri utenti Mercurial."   -#: tortoisehg/hgqt/hgemail_ui.py:257 tortoisehg/hgtk/hgemail.py:122 +#: tortoisehg/hgqt/hgemail_ui.py:258 tortoisehg/hgtk/hgemail.py:122  msgid "Send single binary bundle, not patches"  msgstr "Invia un unico bundle binario, nessuna patch"   -#: tortoisehg/hgqt/hgemail_ui.py:258 tortoisehg/hgtk/hgemail.py:137 +#: tortoisehg/hgqt/hgemail_ui.py:259 tortoisehg/hgtk/hgemail.py:137  msgid "send patches as attachments"  msgstr "Invia le patch come allegati"   -#: tortoisehg/hgqt/hgemail_ui.py:259 tortoisehg/hgtk/hgemail.py:135 +#: tortoisehg/hgqt/hgemail_ui.py:260 tortoisehg/hgtk/hgemail.py:135  msgid "attach"  msgstr "Allega"   -#: tortoisehg/hgqt/hgemail_ui.py:260 tortoisehg/hgtk/hgemail.py:140 +#: tortoisehg/hgqt/hgemail_ui.py:261 tortoisehg/hgtk/hgemail.py:140  msgid "send patches as inline attachments"  msgstr "Invia le patch come allegati in linea"   -#: tortoisehg/hgqt/hgemail_ui.py:261 tortoisehg/hgtk/hgemail.py:138 +#: tortoisehg/hgqt/hgemail_ui.py:262 tortoisehg/hgtk/hgemail.py:138  msgid "inline"  msgstr "In linea"   -#: tortoisehg/hgqt/hgemail_ui.py:262 tortoisehg/hgtk/hgemail.py:143 +#: tortoisehg/hgqt/hgemail_ui.py:263 tortoisehg/hgtk/hgemail.py:143  msgid "add diffstat output to messages"  msgstr "Aggiunge l'output diffstat ai messaggi"   -#: tortoisehg/hgqt/hgemail_ui.py:263 tortoisehg/hgtk/hgemail.py:141 +#: tortoisehg/hgqt/hgemail_ui.py:264 tortoisehg/hgtk/hgemail.py:141  msgid "diffstat"  msgstr "Diffstat"   -#: tortoisehg/hgqt/hgemail_ui.py:264 tortoisehg/hgtk/hgemail.py:232 +#: tortoisehg/hgqt/hgemail_ui.py:265 tortoisehg/hgtk/hgemail.py:232  msgid ""  "Patch series description is sent in initial summary email with [PATCH 0 of "  "N] subject. It should describe the effects of the entire patch series. " @@ -1637,33 +1647,33 @@
 "separato da virgola di etichette che saranno inserite come prefisso al "  "soggetto del messaggio."   -#: tortoisehg/hgqt/hgemail_ui.py:265 +#: tortoisehg/hgqt/hgemail_ui.py:266  msgid "Write patch series (bundle) description"  msgstr ""   -#: tortoisehg/hgqt/hgemail_ui.py:266 tortoisehg/hgtk/hgemail.py:151 +#: tortoisehg/hgqt/hgemail_ui.py:267 tortoisehg/hgtk/hgemail.py:151  msgid "Subject:"  msgstr "Oggetto:"   -#: tortoisehg/hgqt/hgemail_ui.py:267 tortoisehg/hgqt/postreview_ui.py:173 +#: tortoisehg/hgqt/hgemail_ui.py:268 tortoisehg/hgqt/postreview_ui.py:173  msgid "Changesets"  msgstr ""   -#: tortoisehg/hgqt/hgemail_ui.py:268 tortoisehg/hgqt/wctxactions.py:47 +#: tortoisehg/hgqt/hgemail_ui.py:269 tortoisehg/hgqt/wctxactions.py:47  #: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79  #: tortoisehg/hgtk/status.py:1243  msgid "Edit"  msgstr "Modifica"   -#: tortoisehg/hgqt/hgemail_ui.py:269 +#: tortoisehg/hgqt/hgemail_ui.py:270  msgid "Preview"  msgstr ""   -#: tortoisehg/hgqt/hgemail_ui.py:270 tortoisehg/hgqt/postreview_ui.py:174 +#: tortoisehg/hgqt/hgemail_ui.py:271 tortoisehg/hgqt/postreview_ui.py:174  msgid "&Settings"  msgstr ""   -#: tortoisehg/hgqt/hgemail_ui.py:271 +#: tortoisehg/hgqt/hgemail_ui.py:272  msgid "Send &Email"  msgstr ""   @@ -1681,15 +1691,16 @@
 msgstr ""    #: tortoisehg/hgqt/hgignore.py:53 tortoisehg/hgqt/qqueue.py:91 -#: tortoisehg/hgqt/quickop.py:19 tortoisehg/hgqt/webconf.py:246 -#: tortoisehg/hgqt/webconf_ui.py:78 tortoisehg/hgtk/bookmark.py:48 -#: tortoisehg/hgtk/hgignore.py:50 tortoisehg/hgtk/hgignore.py:58 -#: tortoisehg/hgtk/quickop.py:19 tortoisehg/hgtk/tagadd.py:39 +#: tortoisehg/hgqt/quickop.py:19 tortoisehg/hgqt/tag.py:186 +#: tortoisehg/hgqt/webconf.py:246 tortoisehg/hgqt/webconf_ui.py:78 +#: tortoisehg/hgtk/bookmark.py:48 tortoisehg/hgtk/hgignore.py:50 +#: tortoisehg/hgtk/hgignore.py:58 tortoisehg/hgtk/quickop.py:19 +#: tortoisehg/hgtk/tagadd.py:39  msgid "Add"  msgstr "Aggiungi"    #: tortoisehg/hgqt/hgignore.py:72 tortoisehg/hgqt/resolve.py:94 -#: tortoisehg/hgqt/settings.py:700 tortoisehg/hgtk/hgignore.py:77 +#: tortoisehg/hgqt/settings.py:719 tortoisehg/hgtk/hgignore.py:77  #: tortoisehg/hgtk/thgconfig.py:676  msgid "Edit File"  msgstr "Edita il file" @@ -1726,7 +1737,7 @@
 msgid "Unable to read repository status"  msgstr ""   -#: tortoisehg/hgqt/hgignore.py:271 tortoisehg/hgtk/hgignore.py:256 +#: tortoisehg/hgqt/hgignore.py:271 tortoisehg/hgtk/hgignore.py:261  msgid "Unable to write .hgignore file"  msgstr "Impossibile scrivere il file .hgignore"   @@ -1829,7 +1840,7 @@
 msgid "Annotate"  msgstr "Annota"   -#: tortoisehg/hgqt/manifestdialog.py:403 tortoisehg/hgqt/status.py:107 +#: tortoisehg/hgqt/manifestdialog.py:417 tortoisehg/hgqt/status.py:107  #: tortoisehg/hgtk/thgmq.py:862  msgid "Status"  msgstr "Stato" @@ -1844,8 +1855,7 @@
 msgstr ""    #: tortoisehg/hgqt/merge.py:61 -msgid "" -"To complete merging, you need to commit merged files in working directory." +msgid "To finish merging, you need to commit the working directory."  msgstr ""    #: tortoisehg/hgqt/merge.py:63 tortoisehg/hgqt/rebase.py:234 @@ -1942,109 +1952,109 @@
 msgid "Cancel merge and discard changes?"  msgstr ""   -#: tortoisehg/hgqt/merge.py:394 -msgid "Discard unfinished local changes and restart merge?" -msgstr "" - -#: tortoisehg/hgqt/merge.py:397 +#: tortoisehg/hgqt/merge.py:395 +msgid "Discard local changes and restart merge?" +msgstr "" + +#: tortoisehg/hgqt/merge.py:398  msgid "Confirm Clean Up"  msgstr ""   -#: tortoisehg/hgqt/merge.py:400 +#: tortoisehg/hgqt/merge.py:401  msgid "Canceling merge...\n"  msgstr ""   -#: tortoisehg/hgqt/merge.py:401 -msgid "(Please close any running merge tool)\n" -msgstr "" - -#: tortoisehg/hgqt/merge.py:421 +#: tortoisehg/hgqt/merge.py:402 +msgid "(Please close any running merge tools)\n" +msgstr "" + +#: tortoisehg/hgqt/merge.py:422  msgid "Merge failed"  msgstr ""   -#: tortoisehg/hgqt/merge.py:421 +#: tortoisehg/hgqt/merge.py:422  msgid "Returning to first page"  msgstr ""   -#: tortoisehg/hgqt/merge.py:477 +#: tortoisehg/hgqt/merge.py:478  msgid "Rename Patch"  msgstr ""   -#: tortoisehg/hgqt/merge.py:478 +#: tortoisehg/hgqt/merge.py:479  msgid "Input a new patch name:"  msgstr ""   -#: tortoisehg/hgqt/merge.py:486 +#: tortoisehg/hgqt/merge.py:487  #, 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:541 +#: tortoisehg/hgqt/merge.py:542  msgid "<b>Uncommitted local changes are detected</b>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:546 tortoisehg/hgtk/recovery.py:52 +#: tortoisehg/hgqt/merge.py:547 tortoisehg/hgtk/recovery.py:52  msgid "Clean"  msgstr "Ripulisci"   -#: tortoisehg/hgqt/merge.py:575 tortoisehg/hgtk/commit.py:237 +#: tortoisehg/hgqt/merge.py:576 tortoisehg/hgtk/commit.py:237  #: tortoisehg/hgtk/history.py:66 tortoisehg/hgtk/history.py:481  #: tortoisehg/hgtk/history.py:1223  msgid "Parents"  msgstr "Genitori"   -#: tortoisehg/hgqt/merge.py:579 tortoisehg/hgqt/repomodel.py:514 +#: tortoisehg/hgqt/merge.py:580 tortoisehg/hgqt/repomodel.py:514  #: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24  #: tortoisehg/hgqt/thgimport.py:87  msgid "Working Directory"  msgstr ""   -#: tortoisehg/hgqt/merge.py:617 +#: tortoisehg/hgqt/merge.py:618  msgid "Working Directory (merged)"  msgstr ""   -#: tortoisehg/hgqt/merge.py:626 +#: tortoisehg/hgqt/merge.py:627  msgid "Commit message"  msgstr ""   -#: tortoisehg/hgqt/merge.py:633 tortoisehg/hgtk/commit.py:823 +#: tortoisehg/hgqt/merge.py:634 tortoisehg/hgtk/commit.py:823  msgid "Merge "  msgstr "Merge "   -#: tortoisehg/hgqt/merge.py:656 tortoisehg/hgqt/workbench.py:231 +#: tortoisehg/hgqt/merge.py:657 tortoisehg/hgqt/workbench.py:231  msgid "&Commit"  msgstr ""   -#: tortoisehg/hgqt/merge.py:662 tortoisehg/hgqt/qscilib.py:174 +#: tortoisehg/hgqt/merge.py:663 tortoisehg/hgqt/qscilib.py:174  #: tortoisehg/hgtk/merge.py:137  msgid "Undo"  msgstr "Annulla"   -#: tortoisehg/hgqt/merge.py:672 +#: tortoisehg/hgqt/merge.py:673  msgid "Commit merged files"  msgstr ""   -#: tortoisehg/hgqt/merge.py:676 +#: tortoisehg/hgqt/merge.py:677  msgid "Committing..."  msgstr ""   -#: tortoisehg/hgqt/merge.py:677 +#: tortoisehg/hgqt/merge.py:678  msgid "Please wait while committing merged files."  msgstr ""   -#: tortoisehg/hgqt/merge.py:692 +#: tortoisehg/hgqt/merge.py:693  msgid ""  "There were <b>merge conflicts</b> that must be <a "  "href=\"resolve\"><b>resolved</b></a>"  msgstr ""   -#: tortoisehg/hgqt/merge.py:697 +#: tortoisehg/hgqt/merge.py:698  msgid "No merge conflicts, ready to commit"  msgstr ""   -#: tortoisehg/hgqt/merge.py:749 +#: tortoisehg/hgqt/merge.py:753  msgid "Merge changeset"  msgstr ""   @@ -2089,6 +2099,10 @@
 msgid "QRefresh"  msgstr "QRefresh"   +#: tortoisehg/hgqt/mq.py:201 +msgid "### patch name ###" +msgstr "" +  #: tortoisehg/hgqt/mq.py:207  msgid "TortoiseHg Patch Queue"  msgstr "" @@ -2135,40 +2149,40 @@
 msgid "QNew"  msgstr "QNew"   -#: tortoisehg/hgqt/mq.py:766 +#: tortoisehg/hgqt/mq.py:767  #, python-format  msgid "Guards: %d/%d"  msgstr ""   -#: tortoisehg/hgqt/mq.py:848 +#: tortoisehg/hgqt/mq.py:849  msgid "Patch commit messages..."  msgstr ""   -#: tortoisehg/hgqt/mq.py:874 +#: tortoisehg/hgqt/mq.py:875  msgid "Force use of git extended diff format (--git)"  msgstr ""   -#: tortoisehg/hgqt/mq.py:878 +#: tortoisehg/hgqt/mq.py:879  msgid "Force push or pop (--force)"  msgstr ""   -#: tortoisehg/hgqt/mq.py:882 +#: tortoisehg/hgqt/mq.py:883  msgid "Apply patch to its recorded parent (--exact)"  msgstr ""   -#: tortoisehg/hgqt/mq.py:886 +#: tortoisehg/hgqt/mq.py:887  msgid "Update date field with current date (--currentdate)"  msgstr ""   -#: tortoisehg/hgqt/mq.py:890 +#: tortoisehg/hgqt/mq.py:891  msgid "Specify an explicit date:"  msgstr ""   -#: tortoisehg/hgqt/mq.py:893 +#: tortoisehg/hgqt/mq.py:894  msgid "Update author field with current user (--currentuser)"  msgstr ""   -#: tortoisehg/hgqt/mq.py:897 +#: tortoisehg/hgqt/mq.py:898  msgid "Specify an explicit author:"  msgstr ""   @@ -2268,7 +2282,7 @@
 #: tortoisehg/hgqt/postreview.py:104 tortoisehg/hgqt/postreview.py:120  #: tortoisehg/hgqt/postreview.py:337 tortoisehg/hgqt/postreview.py:360  #: tortoisehg/hgqt/postreview.py:372 tortoisehg/hgqt/postreview_ui.py:162 -#: tortoisehg/hgqt/settings.py:547 +#: tortoisehg/hgqt/settings.py:560  msgid "Review Board"  msgstr ""   @@ -2423,11 +2437,10 @@
 msgstr ""    #: tortoisehg/hgqt/qdelete.py:33 -#, python-format -msgid "<b>Remove patches from queue?<ul><li>%s</ul></b>" -msgstr "" - -#: tortoisehg/hgqt/qdelete.py:37 tortoisehg/hgqt/qfold.py:43 +msgid "Remove patches from queue?" +msgstr "" + +#: tortoisehg/hgqt/qdelete.py:38 tortoisehg/hgqt/qfold.py:43  msgid "Keep patch files"  msgstr ""   @@ -2456,7 +2469,7 @@
 msgid "Patch queues:"  msgstr ""   -#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:703 +#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:722  #: tortoisehg/hgtk/thgconfig.py:680  msgid "Reload"  msgstr "Ricarica" @@ -2624,6 +2637,14 @@
 msgid "Unable to read/write config file"  msgstr ""   +#: tortoisehg/hgqt/qtlib.py:76 +msgid "Unable to create a config file" +msgstr "" + +#: tortoisehg/hgqt/qtlib.py:77 +msgid "Insufficient access rights." +msgstr "" +  #: tortoisehg/hgqt/quickbar.py:30  msgid "Goto"  msgstr "" @@ -2657,7 +2678,7 @@
 msgid "Checkmark files to remove"  msgstr ""   -#: tortoisehg/hgqt/quickop.py:22 tortoisehg/hgqt/sync.py:450 +#: tortoisehg/hgqt/quickop.py:22 tortoisehg/hgqt/sync.py:454  #: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:50  #: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40  msgid "Remove" @@ -2732,11 +2753,11 @@
 msgstr ""    #: tortoisehg/hgqt/rebase.py:232 -msgid "Rebase is incomplete, exiting is not recommended" +msgid "Exiting with an unfinished rebase is not recommended."  msgstr ""    #: tortoisehg/hgqt/rebase.py:233 -msgid "Abort is recommended before exit." +msgid "Consider aborting the rebase first."  msgstr ""    #: tortoisehg/hgqt/rebase.py:245 @@ -2885,20 +2906,20 @@
 msgid "Toggle filtering of non-matched changesets"  msgstr ""   -#: tortoisehg/hgqt/repofilter.py:189 tortoisehg/hgtk/history.py:487 +#: tortoisehg/hgqt/repofilter.py:198 tortoisehg/hgtk/history.py:487  #: tortoisehg/hgtk/logview/treeview.py:478  msgid "Branch"  msgstr "Ramo"   -#: tortoisehg/hgqt/repofilter.py:190 +#: tortoisehg/hgqt/repofilter.py:199  msgid "Display graph the named branch only"  msgstr ""   -#: tortoisehg/hgqt/repofilter.py:193 +#: tortoisehg/hgqt/repofilter.py:202  msgid "Display closed branches"  msgstr ""   -#: tortoisehg/hgqt/repofilter.py:196 +#: tortoisehg/hgqt/repofilter.py:205  msgid "Include all ancestors"  msgstr ""   @@ -2964,7 +2985,7 @@
 msgid "Clone Repository"  msgstr ""   -#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:448 +#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:452  #: tortoisehg/hgqt/workbench.py:279  msgid "Explore"  msgstr "" @@ -2973,7 +2994,7 @@
 msgid "Open the repository in Windows Explorer"  msgstr ""   -#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:449 +#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:453  #: tortoisehg/hgqt/workbench.py:282  msgid "Terminal"  msgstr "" @@ -3017,8 +3038,8 @@
 msgid "default"  msgstr ""   -#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362 -#: tortoisehg/hgqt/sync.py:195 tortoisehg/hgqt/webconf.py:266 +#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:360 +#: tortoisehg/hgqt/sync.py:199 tortoisehg/hgqt/webconf.py:266  msgid "Path"  msgstr ""   @@ -3030,17 +3051,17 @@
 msgid "Failed to add repository"  msgstr ""   -#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:582 +#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:584  #, python-format  msgid "%s is not a valid repository"  msgstr ""   -#: tortoisehg/hgqt/repoview.py:197 +#: tortoisehg/hgqt/repoview.py:193  #, python-format  msgid "Goto ancestor of %s and %s"  msgstr ""   -#: tortoisehg/hgqt/repoview.py:233 +#: tortoisehg/hgqt/repoview.py:229  #, python-format  msgid "Can't find revision '%s'"  msgstr "" @@ -3057,84 +3078,84 @@
 msgid "Reject incoming changesets"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:157 +#: tortoisehg/hgqt/repowidget.py:158  msgid "Revision details"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:165 tortoisehg/hgtk/gdialog.py:495 +#: tortoisehg/hgqt/repowidget.py:166 tortoisehg/hgtk/gdialog.py:495  #: tortoisehg/hgtk/thgconfig.py:170 tortoisehg/util/menuthg.py:52  msgid "Synchronize"  msgstr "Sincronizza"   -#: tortoisehg/hgqt/repowidget.py:169 +#: tortoisehg/hgqt/repowidget.py:170  msgid "Manifest"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:178 tortoisehg/hgtk/commit.py:227 +#: tortoisehg/hgqt/repowidget.py:179 tortoisehg/hgtk/commit.py:227  #: tortoisehg/hgtk/commit.py:309 tortoisehg/hgtk/history.py:258  #: tortoisehg/hgtk/history.py:368 tortoisehg/hgtk/thgimport.py:111  msgid "Patch Queue"  msgstr "Coda patch"   -#: tortoisehg/hgqt/repowidget.py:186 tortoisehg/hgtk/history.py:266 +#: tortoisehg/hgqt/repowidget.py:187 tortoisehg/hgtk/history.py:266  #: tortoisehg/hgtk/history.py:385  msgid "Patch Branch"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:199 +#: tortoisehg/hgqt/repowidget.py:200  #, python-format  msgid "%s <incoming>"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:483 +#: tortoisehg/hgqt/repowidget.py:486  #, python-format  msgid "%s - verify repository"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:490 +#: tortoisehg/hgqt/repowidget.py:493  #, python-format  msgid "%s - recover repository"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:506 +#: tortoisehg/hgqt/repowidget.py:509  msgid "No transaction available"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:507 +#: tortoisehg/hgqt/repowidget.py:510  msgid "There is no rollback transaction available"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:510 tortoisehg/hgtk/commit.py:1035 +#: tortoisehg/hgqt/repowidget.py:513 tortoisehg/hgtk/commit.py:1035  msgid "Undo last commit?"  msgstr "Annulla ultimo commit?"   -#: tortoisehg/hgqt/repowidget.py:511 +#: tortoisehg/hgqt/repowidget.py:514  #, python-format  msgid "Undo most recent commit (%d), preserving file changes?"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:515 +#: tortoisehg/hgqt/repowidget.py:518  msgid "Undo last transaction?"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:516 +#: tortoisehg/hgqt/repowidget.py:519  #, python-format  msgid "Rollback to revision %d (undo %s)?"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:522 +#: tortoisehg/hgqt/repowidget.py:525 tortoisehg/hgqt/run.py:466  msgid "Repository Error"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:523 +#: tortoisehg/hgqt/repowidget.py:526  msgid "Unable to determine working copy revision\n"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:527 +#: tortoisehg/hgqt/repowidget.py:530  msgid "Remove current working revision?"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:528 +#: tortoisehg/hgqt/repowidget.py:531  #, python-format  msgid ""  "Your current working revision (%d) will be removed by this rollback, leaving " @@ -3142,201 +3163,205 @@
 " Continue?"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:641 -msgid "Repository stripped, incoming preview cleared" -msgstr "" - -#: tortoisehg/hgqt/repowidget.py:646 +#: tortoisehg/hgqt/repowidget.py:648 +msgid "Repository stripped, incoming preview cleared" +msgstr "" + +#: tortoisehg/hgqt/repowidget.py:653  msgid "Repository stripped, revision set cleared"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:758 +#: tortoisehg/hgqt/repowidget.py:766  msgid "Commit tab cannot exit"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:762 +#: tortoisehg/hgqt/repowidget.py:770  msgid "Sync tab cannot exit"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:766 +#: tortoisehg/hgqt/repowidget.py:774  msgid "MQ tab cannot exit"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:770 +#: tortoisehg/hgqt/repowidget.py:778  msgid "Search tab cannot exit"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:773 +#: tortoisehg/hgqt/repowidget.py:781  msgid "Repository command still running"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:927 tortoisehg/util/menuthg.py:58 +#: tortoisehg/hgqt/repowidget.py:936 tortoisehg/util/menuthg.py:58  msgid "Update..."  msgstr "Aggiorna..."   -#: tortoisehg/hgqt/repowidget.py:930 tortoisehg/hgqt/repowidget.py:1140 +#: tortoisehg/hgqt/repowidget.py:939 tortoisehg/hgqt/repowidget.py:1149  msgid "Visual diff..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:932 +#: tortoisehg/hgqt/repowidget.py:941  msgid "Diff to local..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:934 +#: tortoisehg/hgqt/repowidget.py:943  msgid "Browse at rev..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:937 +#: tortoisehg/hgqt/repowidget.py:946  msgid "Merge with local..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:940 +#: tortoisehg/hgqt/repowidget.py:949  msgid "Tag..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:942 +#: tortoisehg/hgqt/repowidget.py:951  msgid "Bookmark..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:945 tortoisehg/hgtk/history.py:1290 +#: tortoisehg/hgqt/repowidget.py:954 tortoisehg/hgtk/history.py:1290  msgid "Backout..."  msgstr "Backout..."   -#: tortoisehg/hgqt/repowidget.py:949 tortoisehg/hgtk/history.py:1293 +#: tortoisehg/hgqt/repowidget.py:958 tortoisehg/hgtk/history.py:1293  msgid "Export"  msgstr "Esporta"   -#: tortoisehg/hgqt/repowidget.py:950 -msgid "Export patch" -msgstr "" - -#: tortoisehg/hgqt/repowidget.py:952 +#: tortoisehg/hgqt/repowidget.py:959 +msgid "Export patch..." +msgstr "" + +#: tortoisehg/hgqt/repowidget.py:961  msgid "Email patch..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:954 +#: tortoisehg/hgqt/repowidget.py:963  msgid "Archive..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:956 tortoisehg/hgqt/wctxactions.py:46 +#: tortoisehg/hgqt/repowidget.py:965 tortoisehg/hgqt/wctxactions.py:46  msgid "Copy patch"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:960 +#: tortoisehg/hgqt/repowidget.py:969  msgid "Copy hash"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:964 +#: tortoisehg/hgqt/repowidget.py:973  msgid "Transplant to local"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:968 +#: tortoisehg/hgqt/repowidget.py:977  msgid "Modify history"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:969 tortoisehg/hgqt/repowidget.py:1101 +#: tortoisehg/hgqt/repowidget.py:978 tortoisehg/hgqt/repowidget.py:1110  msgid "QGoto"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:971 +#: tortoisehg/hgqt/repowidget.py:980  msgid "Import to MQ"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:973 +#: tortoisehg/hgqt/repowidget.py:982  msgid "Finish patch"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:976 +#: tortoisehg/hgqt/repowidget.py:985  msgid "Rebase..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:979 +#: tortoisehg/hgqt/repowidget.py:988  msgid "Strip..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:982 +#: tortoisehg/hgqt/repowidget.py:991  msgid "Post to Review Board..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1037 +#: tortoisehg/hgqt/repowidget.py:1046  msgid "Unable to compress history"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1038 +#: tortoisehg/hgqt/repowidget.py:1047  msgid "Selected changeset pair not related"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1046 +#: tortoisehg/hgqt/repowidget.py:1055  msgid "Visual Diff..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1047 tortoisehg/hgqt/repowidget.py:1122 -msgid "Export Selected" -msgstr "" - -#: tortoisehg/hgqt/repowidget.py:1048 tortoisehg/hgqt/repowidget.py:1123 +#: tortoisehg/hgqt/repowidget.py:1056 tortoisehg/hgqt/repowidget.py:1131 +msgid "Export Selected..." +msgstr "" + +#: tortoisehg/hgqt/repowidget.py:1057 tortoisehg/hgqt/repowidget.py:1132  msgid "Email Selected..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1049 -msgid "Export DAG Range" -msgstr "" - -#: tortoisehg/hgqt/repowidget.py:1050 +#: tortoisehg/hgqt/repowidget.py:1058 +msgid "Export DAG Range..." +msgstr "" + +#: tortoisehg/hgqt/repowidget.py:1059  msgid "Email DAG Range..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1051 +#: tortoisehg/hgqt/repowidget.py:1060  msgid "Bisect - Good, Bad..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1052 +#: tortoisehg/hgqt/repowidget.py:1061  msgid "Bisect - Bad, Good..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1053 +#: tortoisehg/hgqt/repowidget.py:1062  msgid "Compress History..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1061 +#: tortoisehg/hgqt/repowidget.py:1070  msgid "Post Pair to Review Board..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1080 +#: tortoisehg/hgqt/repowidget.py:1089  msgid ""  "<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "  "them.<br><br>Continue?</p>"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1102 +#: tortoisehg/hgqt/repowidget.py:1111  msgid "QPush --move"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1103 +#: tortoisehg/hgqt/repowidget.py:1112  msgid "Fold patches..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1104 +#: tortoisehg/hgqt/repowidget.py:1113  msgid "Delete patches..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1105 +#: tortoisehg/hgqt/repowidget.py:1114  msgid "Reorder patches..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1131 +#: tortoisehg/hgqt/repowidget.py:1140  msgid "Post Selected to Review Board..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1139 +#: tortoisehg/hgqt/repowidget.py:1148  msgid "Pull to here..."  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1306 +#: tortoisehg/hgqt/repowidget.py:1161 +msgid "Export patch" +msgstr "" + +#: tortoisehg/hgqt/repowidget.py:1320  msgid "Unable to start"  msgstr ""   -#: tortoisehg/hgqt/repowidget.py:1307 +#: tortoisehg/hgqt/repowidget.py:1321  msgid "Previous command is still running"  msgstr ""   @@ -3460,32 +3485,36 @@
 msgstr ""    #: tortoisehg/hgqt/resolve.py:314 -msgid "Quit without finishing resolve?" +msgid "Exit without finishing resolve?"  msgstr ""    #: tortoisehg/hgqt/resolve.py:315  msgid "Unresolved conflicts remain. Are you sure?"  msgstr ""   -#: tortoisehg/hgqt/resolve.py:316 tortoisehg/hgtk/visdiff.py:532 -msgid "&Quit" -msgstr "&Esci" - -#: tortoisehg/hgqt/resolve.py:362 +#: tortoisehg/hgqt/resolve.py:316 tortoisehg/hgqt/workbench.py:190 +msgid "E&xit" +msgstr "" + +#: tortoisehg/hgqt/resolve.py:360  msgid "Ext"  msgstr ""   -#: tortoisehg/hgqt/resolve.py:362 tortoisehg/hgqt/thgimport.py:85 +#: tortoisehg/hgqt/resolve.py:360 tortoisehg/hgqt/thgimport.py:85  #: tortoisehg/hgtk/thgimport.py:110  msgid "Repository"  msgstr "Repository"   -#: tortoisehg/hgqt/resolve.py:405 +#: tortoisehg/hgqt/resolve.py:403  msgid "<default>"  msgstr ""   -#: tortoisehg/hgqt/revdetails.py:88 -msgid "Merge Toolbar" +#: tortoisehg/hgqt/revdetails.py:89 +msgid "File List Toolbar" +msgstr "" + +#: tortoisehg/hgqt/revdetails.py:182 +msgid "Update to this revision"  msgstr ""    #: tortoisehg/hgqt/revert.py:22 @@ -3675,61 +3704,61 @@
 msgid "All changesets, the same as 0:tip."  msgstr ""   -#: tortoisehg/hgqt/revset.py:121 +#: tortoisehg/hgqt/revset.py:123  msgid "Revision Set Query"  msgstr ""   -#: tortoisehg/hgqt/revset.py:132 +#: tortoisehg/hgqt/revset.py:134  msgid "all revisions converted from subversion"  msgstr ""   -#: tortoisehg/hgqt/revset.py:134 +#: tortoisehg/hgqt/revset.py:136  msgid "changeset which represents converted svn revision"  msgstr ""   -#: tortoisehg/hgqt/revset.py:145 +#: tortoisehg/hgqt/revset.py:147  msgid "Common sets"  msgstr ""   -#: tortoisehg/hgqt/revset.py:157 +#: tortoisehg/hgqt/revset.py:159  msgid "File pattern sets"  msgstr ""   -#: tortoisehg/hgqt/revset.py:169 +#: tortoisehg/hgqt/revset.py:171  msgid "Set Ancestry"  msgstr ""   -#: tortoisehg/hgqt/revset.py:181 +#: tortoisehg/hgqt/revset.py:183  msgid "Set Logic"  msgstr ""   -#: tortoisehg/hgqt/revset.py:208 +#: tortoisehg/hgqt/revset.py:210  msgid ""  "<a href=\"http://www.selenic.com/mercurial/hg.1.html#revsets\">help "  "revsets</a>"  msgstr ""   -#: tortoisehg/hgqt/revset.py:219 +#: tortoisehg/hgqt/revset.py:221  msgid "Searching..."  msgstr ""   -#: tortoisehg/hgqt/revset.py:220 tortoisehg/hgqt/revset.py:232 +#: tortoisehg/hgqt/revset.py:222 tortoisehg/hgqt/revset.py:234  msgid "Running"  msgstr "In esecuzione"   -#: tortoisehg/hgqt/revset.py:220 +#: tortoisehg/hgqt/revset.py:222  msgid "query"  msgstr ""   -#: tortoisehg/hgqt/revset.py:370 +#: tortoisehg/hgqt/revset.py:372  msgid "found revision"  msgstr ""   -#: tortoisehg/hgqt/revset.py:390 +#: tortoisehg/hgqt/revset.py:392  msgid "Parse Error: "  msgstr ""   -#: tortoisehg/hgqt/revset.py:392 +#: tortoisehg/hgqt/revset.py:394  msgid "Invalid query: "  msgstr ""   @@ -3815,34 +3844,34 @@
 msgid "Close this application?"  msgstr ""   -#: tortoisehg/hgqt/run.py:677 +#: tortoisehg/hgqt/run.py:689  msgid "annotate requires a single filename\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:731 tortoisehg/hgtk/hgtk.py:546 +#: tortoisehg/hgqt/run.py:743 tortoisehg/hgtk/hgtk.py:546  msgid "global options:"  msgstr "opzioni globali:"   -#: tortoisehg/hgqt/run.py:733 +#: tortoisehg/hgqt/run.py:745  msgid "use \"thg help\" for the full list of commands"  msgstr ""   -#: tortoisehg/hgqt/run.py:737 +#: tortoisehg/hgqt/run.py:749  msgid ""  "use \"thg help\" for the full list of commands or \"thg -v\" for details"  msgstr ""   -#: tortoisehg/hgqt/run.py:740 +#: tortoisehg/hgqt/run.py:752  #, python-format  msgid "use \"thg -v help%s\" to show aliases and global options"  msgstr ""   -#: tortoisehg/hgqt/run.py:743 +#: tortoisehg/hgqt/run.py:755  #, python-format  msgid "use \"thg -v help %s\" to show global options"  msgstr ""   -#: tortoisehg/hgqt/run.py:755 tortoisehg/hgqt/run.py:864 +#: tortoisehg/hgqt/run.py:767 tortoisehg/hgqt/run.py:876  #: tortoisehg/hgtk/hgtk.py:570 tortoisehg/hgtk/hgtk.py:679  msgid ""  "list of commands:\n" @@ -3851,7 +3880,7 @@
 "elenco comandi:\n"  "\n"   -#: tortoisehg/hgqt/run.py:763 tortoisehg/hgtk/hgtk.py:578 +#: tortoisehg/hgqt/run.py:775 tortoisehg/hgtk/hgtk.py:578  #, python-format  msgid ""  "\n" @@ -3860,28 +3889,28 @@
 "\n"  "alias: %s\n"   -#: tortoisehg/hgqt/run.py:768 tortoisehg/hgqt/run.py:833 +#: tortoisehg/hgqt/run.py:780 tortoisehg/hgqt/run.py:845  #: tortoisehg/hgtk/hgtk.py:583 tortoisehg/hgtk/hgtk.py:648  msgid "(No help text available)"  msgstr "(Nessuna guida disponibile)"   -#: tortoisehg/hgqt/run.py:776 tortoisehg/hgtk/hgtk.py:591 +#: tortoisehg/hgqt/run.py:788 tortoisehg/hgtk/hgtk.py:591  msgid "options:\n"  msgstr "opzioni:\n"   -#: tortoisehg/hgqt/run.py:800 tortoisehg/hgtk/hgtk.py:615 +#: tortoisehg/hgqt/run.py:812 tortoisehg/hgtk/hgtk.py:615  msgid "(no help text available)"  msgstr "(nessuna guida disponibile)"   -#: tortoisehg/hgqt/run.py:805 tortoisehg/hgtk/hgtk.py:620 +#: tortoisehg/hgqt/run.py:817 tortoisehg/hgtk/hgtk.py:620  msgid "no commands defined\n"  msgstr "nessun comando definito\n"   -#: tortoisehg/hgqt/run.py:857 +#: tortoisehg/hgqt/run.py:869  msgid "Thg - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"  msgstr ""   -#: tortoisehg/hgqt/run.py:862 tortoisehg/hgtk/hgtk.py:677 +#: tortoisehg/hgqt/run.py:874 tortoisehg/hgtk/hgtk.py:677  msgid ""  "basic commands:\n"  "\n" @@ -3889,404 +3918,404 @@
 "comandi di base:\n"  "\n"   -#: tortoisehg/hgqt/run.py:878 tortoisehg/hgtk/hgtk.py:693 +#: tortoisehg/hgqt/run.py:890 tortoisehg/hgtk/hgtk.py:693  #, python-format  msgid " (default: %s)"  msgstr " (default: %s)"   -#: tortoisehg/hgqt/run.py:895 tortoisehg/hgtk/hgtk.py:710 +#: tortoisehg/hgqt/run.py:907 tortoisehg/hgtk/hgtk.py:710  #, python-format  msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"  msgstr "TortoiseHg Dialogs (versione %s), Mercurial (versione %s)\n"   -#: tortoisehg/hgqt/run.py:924 tortoisehg/hgtk/hgtk.py:744 +#: tortoisehg/hgqt/run.py:936 tortoisehg/hgtk/hgtk.py:744  msgid "repository root directory or symbolic path name"  msgstr "directory radice del repository o nome del percorso simbolico"   -#: tortoisehg/hgqt/run.py:925 tortoisehg/hgtk/hgtk.py:745 +#: tortoisehg/hgqt/run.py:937 tortoisehg/hgtk/hgtk.py:745  msgid "enable additional output"  msgstr "fornisce maggiori informazioni in output"   -#: tortoisehg/hgqt/run.py:926 tortoisehg/hgtk/hgtk.py:746 +#: tortoisehg/hgqt/run.py:938 tortoisehg/hgtk/hgtk.py:746  msgid "suppress output"  msgstr "elimina output"   -#: tortoisehg/hgqt/run.py:927 tortoisehg/hgtk/hgtk.py:747 +#: tortoisehg/hgqt/run.py:939 tortoisehg/hgtk/hgtk.py:747  msgid "display help and exit"  msgstr "mostra la guida ed esce"   -#: tortoisehg/hgqt/run.py:928 tortoisehg/hgtk/hgtk.py:748 +#: tortoisehg/hgqt/run.py:940 tortoisehg/hgtk/hgtk.py:748  msgid "start debugger"  msgstr "avvia debugger"   -#: tortoisehg/hgqt/run.py:929 tortoisehg/hgtk/hgtk.py:749 +#: tortoisehg/hgqt/run.py:941 tortoisehg/hgtk/hgtk.py:749  msgid "print command execution profile"  msgstr "stampa il profiling di esecuzione del comando"   -#: tortoisehg/hgqt/run.py:930 tortoisehg/hgtk/hgtk.py:750 +#: tortoisehg/hgqt/run.py:942 tortoisehg/hgtk/hgtk.py:750  msgid "do not fork GUI process"  msgstr "non crea un nuovo processo per l'interfaccia grafica"   -#: tortoisehg/hgqt/run.py:931 tortoisehg/hgtk/hgtk.py:751 +#: tortoisehg/hgqt/run.py:943 tortoisehg/hgtk/hgtk.py:751  msgid "always fork GUI process"  msgstr "crea sempre un nuovo processo per l'interfaccia grafica"   -#: tortoisehg/hgqt/run.py:932 tortoisehg/hgtk/hgtk.py:752 +#: tortoisehg/hgqt/run.py:944 tortoisehg/hgtk/hgtk.py:752  msgid "read file list from file"  msgstr "legge la lista dei file da file"   -#: tortoisehg/hgqt/run.py:933 +#: tortoisehg/hgqt/run.py:945  msgid "read file list from file encoding utf-8"  msgstr ""   -#: tortoisehg/hgqt/run.py:937 +#: tortoisehg/hgqt/run.py:949  msgid "thg about"  msgstr ""   -#: tortoisehg/hgqt/run.py:938 +#: tortoisehg/hgqt/run.py:950  msgid "thg add [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:940 +#: tortoisehg/hgqt/run.py:952  msgid "revision to annotate"  msgstr ""   -#: tortoisehg/hgqt/run.py:941 tortoisehg/hgqt/run.py:994 +#: tortoisehg/hgqt/run.py:953 tortoisehg/hgqt/run.py:1006  msgid "open to line"  msgstr ""   -#: tortoisehg/hgqt/run.py:942 tortoisehg/hgqt/run.py:995 +#: tortoisehg/hgqt/run.py:954 tortoisehg/hgqt/run.py:1007  msgid "initial search pattern"  msgstr ""   -#: tortoisehg/hgqt/run.py:943 +#: tortoisehg/hgqt/run.py:955  msgid "thg annotate"  msgstr ""   -#: tortoisehg/hgqt/run.py:945 +#: tortoisehg/hgqt/run.py:957  msgid "revision to archive"  msgstr ""   -#: tortoisehg/hgqt/run.py:946 +#: tortoisehg/hgqt/run.py:958  msgid "thg archive"  msgstr ""   -#: tortoisehg/hgqt/run.py:949 +#: tortoisehg/hgqt/run.py:961  msgid "merge with old dirstate parent after backout"  msgstr ""   -#: tortoisehg/hgqt/run.py:950 +#: tortoisehg/hgqt/run.py:962  msgid "parent to choose when backing out merge"  msgstr ""   -#: tortoisehg/hgqt/run.py:951 +#: tortoisehg/hgqt/run.py:963  msgid "revision to backout"  msgstr ""   -#: tortoisehg/hgqt/run.py:952 +#: tortoisehg/hgqt/run.py:964  msgid "thg backout [OPTION]... [[-r] REV]"  msgstr ""   -#: tortoisehg/hgqt/run.py:953 +#: tortoisehg/hgqt/run.py:965  msgid "thg bisect"  msgstr ""   -#: tortoisehg/hgqt/run.py:957 +#: tortoisehg/hgqt/run.py:969  msgid "the clone will include an empty working copy (only a repository)"  msgstr ""   -#: tortoisehg/hgqt/run.py:960 +#: tortoisehg/hgqt/run.py:972  msgid "revision, tag or branch to check out"  msgstr ""   -#: tortoisehg/hgqt/run.py:961 +#: tortoisehg/hgqt/run.py:973  msgid "include the specified changeset"  msgstr ""   -#: tortoisehg/hgqt/run.py:963 +#: tortoisehg/hgqt/run.py:975  msgid "clone only the specified branch"  msgstr ""   -#: tortoisehg/hgqt/run.py:964 +#: tortoisehg/hgqt/run.py:976  msgid "use pull protocol to copy metadata"  msgstr "Usa il protocollo di pull per copiare i metadati"   -#: tortoisehg/hgqt/run.py:966 +#: tortoisehg/hgqt/run.py:978  msgid "use uncompressed transfer (fast over LAN)"  msgstr ""   -#: tortoisehg/hgqt/run.py:967 +#: tortoisehg/hgqt/run.py:979  msgid "thg clone [OPTION]... SOURCE [DEST]"  msgstr ""   -#: tortoisehg/hgqt/run.py:969 tortoisehg/hgtk/hgtk.py:760 +#: tortoisehg/hgqt/run.py:981 tortoisehg/hgtk/hgtk.py:760  msgid "record user as committer"  msgstr "registra l'utente come autore del commit"   -#: tortoisehg/hgqt/run.py:970 tortoisehg/hgtk/hgtk.py:761 +#: tortoisehg/hgqt/run.py:982 tortoisehg/hgtk/hgtk.py:761  msgid "record datecode as commit date"  msgstr "registra il datecode come data del commit"   -#: tortoisehg/hgqt/run.py:971 +#: tortoisehg/hgqt/run.py:983  msgid "thg commit [OPTIONS] [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:972 +#: tortoisehg/hgqt/run.py:984  msgid "thg drag_move SOURCE... DEST"  msgstr ""   -#: tortoisehg/hgqt/run.py:973 +#: tortoisehg/hgqt/run.py:985  msgid "thg drag_copy SOURCE... DEST"  msgstr ""   -#: tortoisehg/hgqt/run.py:975 +#: tortoisehg/hgqt/run.py:987  msgid "ignore case during search"  msgstr ""   -#: tortoisehg/hgqt/run.py:976 +#: tortoisehg/hgqt/run.py:988  msgid "thg grep"  msgstr ""   -#: tortoisehg/hgqt/run.py:977 +#: tortoisehg/hgqt/run.py:989  msgid "thg guess"  msgstr ""   -#: tortoisehg/hgqt/run.py:978 +#: tortoisehg/hgqt/run.py:990  msgid "thg hgignore [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:980 tortoisehg/hgtk/hgtk.py:826 +#: tortoisehg/hgqt/run.py:992 tortoisehg/hgtk/hgtk.py:826  msgid "import to the patch queue (MQ)"  msgstr "importa nella code patch (MQ)"   -#: tortoisehg/hgqt/run.py:981 +#: tortoisehg/hgqt/run.py:993  msgid "thg import [OPTION] [SOURCE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:982 +#: tortoisehg/hgqt/run.py:994  msgid "thg init [DEST]"  msgstr ""   -#: tortoisehg/hgqt/run.py:985 +#: tortoisehg/hgqt/run.py:997  msgid "a revision to send"  msgstr ""   -#: tortoisehg/hgqt/run.py:986 +#: tortoisehg/hgqt/run.py:998  msgid "thg email [REVS]"  msgstr ""   -#: tortoisehg/hgqt/run.py:989 tortoisehg/hgtk/hgtk.py:767 +#: tortoisehg/hgqt/run.py:1001 tortoisehg/hgtk/hgtk.py:767  msgid "limit number of changes displayed"  msgstr "limita il numero di modifiche mostrate"   -#: tortoisehg/hgqt/run.py:990 +#: tortoisehg/hgqt/run.py:1002  msgid "thg log [OPTIONS] [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:993 +#: tortoisehg/hgqt/run.py:1005  msgid "revision to display"  msgstr ""   -#: tortoisehg/hgqt/run.py:996 +#: tortoisehg/hgqt/run.py:1008  msgid "thg manifest [-r REV] [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:999 +#: tortoisehg/hgqt/run.py:1011  msgid "revision to merge"  msgstr ""   -#: tortoisehg/hgqt/run.py:1000 +#: tortoisehg/hgqt/run.py:1012  msgid "thg merge [[-r] REV]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1001 +#: tortoisehg/hgqt/run.py:1013  msgid "thg remove [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1002 +#: tortoisehg/hgqt/run.py:1014  msgid "thg mq"  msgstr ""   -#: tortoisehg/hgqt/run.py:1003 +#: tortoisehg/hgqt/run.py:1015  msgid "thg resolve"  msgstr ""   -#: tortoisehg/hgqt/run.py:1004 +#: tortoisehg/hgqt/run.py:1016  msgid "thg revert [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1005 +#: tortoisehg/hgqt/run.py:1017  msgid "thg forget [FILE]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1006 +#: tortoisehg/hgqt/run.py:1018  msgid "thg rename SOURCE [DEST]..."  msgstr ""   -#: tortoisehg/hgqt/run.py:1010 tortoisehg/hgtk/hgtk.py:792 +#: tortoisehg/hgqt/run.py:1022 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:1012 tortoisehg/hgtk/hgtk.py:794 +#: tortoisehg/hgqt/run.py:1024 tortoisehg/hgtk/hgtk.py:794  msgid "name of the hgweb config file (DEPRECATED)"  msgstr ""   -#: tortoisehg/hgqt/run.py:1013 +#: tortoisehg/hgqt/run.py:1025  msgid "thg serve [--web-conf FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1014 +#: tortoisehg/hgqt/run.py:1026  msgid "thg sync"  msgstr ""   -#: tortoisehg/hgqt/run.py:1016 +#: tortoisehg/hgqt/run.py:1028  msgid "show files without changes"  msgstr ""   -#: tortoisehg/hgqt/run.py:1017 +#: tortoisehg/hgqt/run.py:1029  msgid "show ignored files"  msgstr ""   -#: tortoisehg/hgqt/run.py:1018 +#: tortoisehg/hgqt/run.py:1030  msgid "thg status [OPTIONS] [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1020 tortoisehg/hgqt/run.py:1050 +#: tortoisehg/hgqt/run.py:1032 tortoisehg/hgqt/run.py:1062  msgid "discard uncommitted changes (no backup)"  msgstr ""   -#: tortoisehg/hgqt/run.py:1021 +#: tortoisehg/hgqt/run.py:1033  msgid "do not back up stripped revisions"  msgstr ""   -#: tortoisehg/hgqt/run.py:1022 +#: tortoisehg/hgqt/run.py:1034  msgid "revision to strip"  msgstr ""   -#: tortoisehg/hgqt/run.py:1023 +#: tortoisehg/hgqt/run.py:1035  msgid "thg strip [-f] [-n] [[-r] REV]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1025 +#: tortoisehg/hgqt/run.py:1037  msgid "keep original changesets"  msgstr ""   -#: tortoisehg/hgqt/run.py:1026 +#: tortoisehg/hgqt/run.py:1038  msgid "force detaching of source from its original branch"  msgstr ""   -#: tortoisehg/hgqt/run.py:1029 +#: tortoisehg/hgqt/run.py:1041  msgid "rebase from the specified changeset"  msgstr ""   -#: tortoisehg/hgqt/run.py:1031 +#: tortoisehg/hgqt/run.py:1043  msgid "rebase onto the specified changeset"  msgstr ""   -#: tortoisehg/hgqt/run.py:1032 +#: tortoisehg/hgqt/run.py:1044  msgid "thg rebase -s REV -d REV [--keep] [--detach]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1035 +#: tortoisehg/hgqt/run.py:1047  msgid "replace existing tag"  msgstr ""   -#: tortoisehg/hgqt/run.py:1036 +#: tortoisehg/hgqt/run.py:1048  msgid "make the tag local"  msgstr ""   -#: tortoisehg/hgqt/run.py:1037 +#: tortoisehg/hgqt/run.py:1049  msgid "revision to tag"  msgstr ""   -#: tortoisehg/hgqt/run.py:1038 +#: tortoisehg/hgqt/run.py:1050  msgid "remove a tag"  msgstr ""   -#: tortoisehg/hgqt/run.py:1039 +#: tortoisehg/hgqt/run.py:1051  msgid "use <text> as commit message"  msgstr ""   -#: tortoisehg/hgqt/run.py:1040 +#: tortoisehg/hgqt/run.py:1052  msgid "thg tag [-f] [-l] [-m TEXT] [-r REV] [NAME]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1041 +#: tortoisehg/hgqt/run.py:1053  msgid "thg shelve"  msgstr ""   -#: tortoisehg/hgqt/run.py:1042 +#: tortoisehg/hgqt/run.py:1054  msgid "thg rejects [FILE]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1043 +#: tortoisehg/hgqt/run.py:1055  msgid "thg test"  msgstr ""   -#: tortoisehg/hgqt/run.py:1044 +#: tortoisehg/hgqt/run.py:1056  msgid "thg help [COMMAND]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1045 +#: tortoisehg/hgqt/run.py:1057  msgid "thg purge"  msgstr ""   -#: tortoisehg/hgqt/run.py:1046 +#: tortoisehg/hgqt/run.py:1058  msgid "thg qreorder"  msgstr ""   -#: tortoisehg/hgqt/run.py:1047 +#: tortoisehg/hgqt/run.py:1059  msgid "thg qqueue"  msgstr ""   -#: tortoisehg/hgqt/run.py:1051 tortoisehg/hgtk/hgtk.py:805 +#: tortoisehg/hgqt/run.py:1063 tortoisehg/hgtk/hgtk.py:805  #: tortoisehg/hgtk/hgtk.py:820  msgid "revision to update"  msgstr "revisione da aggiornare"   -#: tortoisehg/hgqt/run.py:1052 +#: tortoisehg/hgqt/run.py:1064  msgid "thg update [-C] [[-r] REV]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1054 tortoisehg/hgqt/run.py:1057 +#: tortoisehg/hgqt/run.py:1066 tortoisehg/hgqt/run.py:1069  #: tortoisehg/hgtk/hgtk.py:779 tortoisehg/hgtk/hgtk.py:782  msgid "field to give initial focus"  msgstr "campo a cui dare inizialmente il focus"   -#: tortoisehg/hgqt/run.py:1055 +#: tortoisehg/hgqt/run.py:1067  msgid "thg userconfig"  msgstr ""   -#: tortoisehg/hgqt/run.py:1058 +#: tortoisehg/hgqt/run.py:1070  msgid "thg repoconfig"  msgstr ""   -#: tortoisehg/hgqt/run.py:1060 tortoisehg/hgtk/hgtk.py:808 +#: tortoisehg/hgqt/run.py:1072 tortoisehg/hgtk/hgtk.py:808  msgid "changeset to view in diff tool"  msgstr "changeset da mostrare nello strumento di comparazione"   -#: tortoisehg/hgqt/run.py:1061 tortoisehg/hgtk/hgtk.py:809 +#: tortoisehg/hgqt/run.py:1073 tortoisehg/hgtk/hgtk.py:809  msgid "revisions to view in diff tool"  msgstr "revisioni da mostrare nello strumento di comparazione"   -#: tortoisehg/hgqt/run.py:1062 tortoisehg/hgtk/hgtk.py:810 +#: tortoisehg/hgqt/run.py:1074 tortoisehg/hgtk/hgtk.py:810  msgid "bundle file to preview"  msgstr "file bundle da vedere in anteprima"   -#: tortoisehg/hgqt/run.py:1063 tortoisehg/hgtk/hgtk.py:811 +#: tortoisehg/hgqt/run.py:1075 tortoisehg/hgtk/hgtk.py:811  msgid "launch visual diff tool"  msgstr "lancia il tool grafico di comparazione"   -#: tortoisehg/hgqt/run.py:1065 tortoisehg/hgtk/hgtk.py:813 +#: tortoisehg/hgqt/run.py:1077 tortoisehg/hgtk/hgtk.py:813  msgid "print license"  msgstr "stampa la licenza"   -#: tortoisehg/hgqt/run.py:1066 +#: tortoisehg/hgqt/run.py:1078  msgid "thg version [OPTION]"  msgstr ""   -#: tortoisehg/hgqt/run.py:1071 +#: tortoisehg/hgqt/run.py:1083  msgid "thg shellconfig"  msgstr ""   @@ -4324,7 +4353,7 @@
 msgid "Start"  msgstr "Avvia"   -#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:642 +#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:661  #: tortoisehg/hgtk/gdialog.py:497  msgid "Settings"  msgstr "Impostazioni" @@ -4345,22 +4374,15 @@
 msgid "Three-way Merge Tool"  msgstr "Strumento di merge a tre vie"   -#: tortoisehg/hgqt/settings.py:270 tortoisehg/hgtk/thgconfig.py:46 +#: tortoisehg/hgqt/settings.py:270  msgid ""  "Graphical merge program for resolving merge conflicts. If left unspecified, "  "Mercurial will use the first applicable tool it finds on your system or use "  "its internal merge tool that leaves conflict markers in place. Chose " -"internal:merge to force conflict markers, internal:prompt to always select " +"internal:merge to force conflict markers ,internal:prompt to always select "  "local or other, or internal:dump to leave files in the working directory for "  "manual merging"  msgstr "" -"Programma grafico di fusione per risolvere i conflitti dopo un merge. Se non " -"specificato, Mercurial userà il primo applicativo che troverà nel sistema o " -"userà lo strumento interno di fusione il quale lascierà i marcatori di " -"conflitto nel file. Scegliere internal:merge per forzare i marcatori di " -"conflitto, internal:prompt per scegliere la copia locale o l'altra, oppure " -"internal:dump per lasciare i file nella directory di lavoro ed eseguire il " -"merge manualmente."    #: tortoisehg/hgqt/settings.py:276 tortoisehg/hgtk/thgconfig.py:52  msgid "Visual Diff Tool" @@ -4433,7 +4455,7 @@
 msgid "Max Diff Size"  msgstr "Dimensione massima differenze"   -#: tortoisehg/hgqt/settings.py:303 tortoisehg/hgtk/thgconfig.py:68 +#: tortoisehg/hgqt/settings.py:303  msgid ""  "The maximum size file (in KB) that TortoiseHg will show changes for in the "  "changelog, status, and commit windows. A value of zero implies no limit. " @@ -4469,7 +4491,7 @@
 msgid "Full Path Title"  msgstr "Percorso completo nei titoli"   -#: tortoisehg/hgqt/settings.py:313 tortoisehg/hgtk/thgconfig.py:82 +#: tortoisehg/hgqt/settings.py:313  msgid ""  "Show a full directory path of the repository in the dialog title instead of "  "just the root directory name. Default: False" @@ -4557,7 +4579,7 @@
 msgid "Branch Colors"  msgstr "Colori dei rami"   -#: tortoisehg/hgqt/settings.py:349 tortoisehg/hgtk/thgconfig.py:148 +#: tortoisehg/hgqt/settings.py:349  msgid ""  "Space separated list of branch names and colors of the form branch:#XXXXXX. "  "Spaces and colons in the branch name must be escaped using a backslash (\\). " @@ -4570,9 +4592,9 @@
 msgid "Hide Tags"  msgstr "Etichette da nascondere"   -#: tortoisehg/hgqt/settings.py:356 tortoisehg/hgtk/thgconfig.py:155 -msgid "" -"Space separated list of tags that will not be shown. Useful example: Specify " +#: tortoisehg/hgqt/settings.py:356 +msgid "" +"Space separated list of tags that will not be shown.Useful example: Specify "  "\"qbase qparent qtip\" to hide the standard tags inserted by the Mercurial "  "Queues Extension. Default: None (leave blank)"  msgstr "" @@ -4581,7 +4603,7 @@
 msgid "After Pull Operation"  msgstr "Operazione da eseguire dopo il pull"   -#: tortoisehg/hgqt/settings.py:362 tortoisehg/hgtk/thgconfig.py:174 +#: tortoisehg/hgqt/settings.py:362  msgid ""  "Operation which is performed directly after a successful pull. update "  "equates to pull --update, fetch equates to the fetch extension, rebase " @@ -4591,7 +4613,7 @@
 "equivale a 'pull --update', 'fetch' equivale all'estensione fetch, 'rebase' "  "equivale a 'pull --rebase'. Default: nessuna"   -#: tortoisehg/hgqt/settings.py:368 tortoisehg/hgqt/sync.py:1113 +#: tortoisehg/hgqt/settings.py:368 tortoisehg/hgqt/sync.py:1128  #: tortoisehg/hgtk/thgconfig.py:90  msgid "Username"  msgstr "Nome utente" @@ -4617,7 +4639,7 @@
 msgid "Close After Commit"  msgstr "Chiudi dopo il commit"   -#: tortoisehg/hgqt/settings.py:376 tortoisehg/hgtk/thgconfig.py:104 +#: tortoisehg/hgqt/settings.py:376  msgid "Close the commit tool after every successful commit. Default: False"  msgstr ""  "Chiude lo strumento di commit dopo ogni operazione eseguita con successo. " @@ -4640,8 +4662,8 @@
 #: tortoisehg/hgqt/settings.py:382 tortoisehg/hgtk/thgconfig.py:110  msgid ""  "Comma separated list of files that are automatically included in every " -"commit. Intended for use only as a repository setting. Default: None " -"(leave blank)" +"commit. Intended for use only as a repository setting. Default: None (leave " +"blank)"  msgstr ""    #: tortoisehg/hgqt/settings.py:385 tortoisehg/hgtk/thgconfig.py:113 @@ -4651,7 +4673,7 @@
 #: tortoisehg/hgqt/settings.py:386  msgid ""  "Comma separated list of files that are automatically unchecked when the " -"status, and commit dialogs are opened. Default: None (leave blank)" +"status, and commit dialogs are opened. Default: None (leave blank)"  msgstr ""    #: tortoisehg/hgqt/settings.py:389 tortoisehg/hgtk/thgconfig.py:117 @@ -4662,11 +4684,8 @@
 msgid ""  "Generate English commit messages even if LANGUAGE or LANG environment "  "variables are set to a non-English language. This setting is used by the " -"Merge, Tag and Backout dialogs. Default: False" -msgstr "" -"Genera i messaggi di commit in inglese anche se la variabile d'ambiente " -"LANGUAGE (o LANG) è impostata su una lingua diversa. Questa impostazione è " -"usata dalle finestre di dialog di Merge, Tag e Backout. Default: Falso" +"Merge, Tag and Backout dialogs. Default: False" +msgstr ""    #: tortoisehg/hgqt/settings.py:396 tortoisehg/hgtk/thgconfig.py:179  #: tortoisehg/util/menuthg.py:55 @@ -4680,7 +4699,7 @@
   #: tortoisehg/hgqt/settings.py:398  msgid "" -"Repository name to use in the web interface, and by TortoiseHg as a " +"Repository name to use in the web interface, and by TortoiseHg as a "  "shorthand name. Default is the working directory."  msgstr ""   @@ -4718,7 +4737,7 @@
 msgstr ""  "Elenco, separato da virgola, dei formati compressi permessi per il download"   -#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgqt/sync.py:184 +#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgqt/sync.py:188  #: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368  msgid "Port"  msgstr "Porta" @@ -4845,8 +4864,8 @@
 msgid "Optional. User name to authenticate with at the proxy server"  msgstr "Opzionale. Nome utente di autenticazione del server proxy"   -#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgqt/settings.py:553 -#: tortoisehg/hgqt/sync.py:1121 tortoisehg/hgtk/thgconfig.py:234 +#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgqt/settings.py:566 +#: tortoisehg/hgqt/sync.py:1136 tortoisehg/hgtk/thgconfig.py:234  #: tortoisehg/hgtk/thgconfig.py:370  msgid "Password"  msgstr "Password" @@ -5083,117 +5102,149 @@
 msgid "Font used to display output messages. Default: sans 8"  msgstr ""   -#: tortoisehg/hgqt/settings.py:544 tortoisehg/hgqt/settings.py:957 +#: tortoisehg/hgqt/settings.py:544 tortoisehg/hgqt/settings.py:976  #: tortoisehg/hgtk/thgconfig.py:318  msgid "Extensions"  msgstr "Estensioni"   -#: tortoisehg/hgqt/settings.py:548 +#: tortoisehg/hgqt/settings.py:547 tortoisehg/hgtk/thgconfig.py:321 +msgid "Issue Tracking" +msgstr "" + +#: tortoisehg/hgqt/settings.py:548 tortoisehg/hgtk/thgconfig.py:323 +msgid "Issue Regex" +msgstr "" + +#: tortoisehg/hgqt/settings.py:549 tortoisehg/hgtk/thgconfig.py:324 +msgid "Defines the regex to match when picking up issue numbers." +msgstr "" + +#: tortoisehg/hgqt/settings.py:550 tortoisehg/hgtk/thgconfig.py:325 +msgid "Issue Link" +msgstr "" + +#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgtk/thgconfig.py:326 +msgid "" +"Defines the command to run when an issue number is recognized. You may " +"include groups in issue.regex, and corresponding {n} tokens in issue.link " +"(where n is a non-negative integer). {0} refers to the entire string matched " +"by issue.regex, while {1} refers to the first group and so on. If no {n} " +"tokensare found in issue.link, the entire matched string is appended instead." +msgstr "" + +#: tortoisehg/hgqt/settings.py:561  msgid "Server"  msgstr ""   -#: tortoisehg/hgqt/settings.py:549 +#: tortoisehg/hgqt/settings.py:562  msgid "Path to review board example \"http://demo.reviewboard.org\""  msgstr ""   -#: tortoisehg/hgqt/settings.py:552 +#: tortoisehg/hgqt/settings.py:565  msgid "User name to authenticate with review board"  msgstr ""   -#: tortoisehg/hgqt/settings.py:554 +#: tortoisehg/hgqt/settings.py:567  msgid "Password to authenticate with review board"  msgstr ""   -#: tortoisehg/hgqt/settings.py:555 +#: tortoisehg/hgqt/settings.py:568  msgid "Server Repository ID"  msgstr ""   -#: tortoisehg/hgqt/settings.py:556 +#: tortoisehg/hgqt/settings.py:569  msgid "The default repository id for this repo on the review board server"  msgstr ""   -#: tortoisehg/hgqt/settings.py:557 +#: tortoisehg/hgqt/settings.py:570  msgid "Target Groups"  msgstr ""   -#: tortoisehg/hgqt/settings.py:558 +#: tortoisehg/hgqt/settings.py:571  msgid "A comma separated list of target groups"  msgstr ""   -#: tortoisehg/hgqt/settings.py:559 +#: tortoisehg/hgqt/settings.py:572  msgid "Target People"  msgstr ""   -#: tortoisehg/hgqt/settings.py:560 +#: tortoisehg/hgqt/settings.py:573  msgid "A comma separated list of target people"  msgstr ""   -#: tortoisehg/hgqt/settings.py:572 +#: tortoisehg/hgqt/settings.py:585  msgid "TortoiseHg Settings"  msgstr ""   -#: tortoisehg/hgqt/settings.py:577 tortoisehg/hgtk/thgconfig.py:648 +#: tortoisehg/hgqt/settings.py:590 tortoisehg/hgtk/thgconfig.py:648  msgid "Iniparse package not found"  msgstr "Pacchetto iniparse non trovato"   -#: tortoisehg/hgqt/settings.py:578 tortoisehg/hgtk/thgconfig.py:649 +#: tortoisehg/hgqt/settings.py:591 tortoisehg/hgtk/thgconfig.py:649  msgid "Can't change settings without iniparse package - view is readonly."  msgstr ""  "Le impostazioni non possono essere modificate senza il pacchetto iniparse. "  "La finestra è in sola lettura."   -#: tortoisehg/hgqt/settings.py:596 +#: tortoisehg/hgqt/settings.py:615  #, python-format  msgid "%s's global settings"  msgstr ""   -#: tortoisehg/hgqt/settings.py:609 tortoisehg/hgtk/thgconfig.py:638 +#: tortoisehg/hgqt/settings.py:628 tortoisehg/hgtk/thgconfig.py:638  msgid "No repository found"  msgstr "Nessun repository trovato"   -#: tortoisehg/hgqt/settings.py:610 tortoisehg/hgtk/thgconfig.py:639 +#: tortoisehg/hgqt/settings.py:629 tortoisehg/hgtk/thgconfig.py:639  msgid "no repo at "  msgstr "nessun repository in "   -#: tortoisehg/hgqt/settings.py:616 tortoisehg/hgtk/thgconfig.py:671 +#: tortoisehg/hgqt/settings.py:635 tortoisehg/hgtk/thgconfig.py:671  #, python-format  msgid "%s repository settings"  msgstr "Impostazioni repository %s"   -#: tortoisehg/hgqt/settings.py:643 +#: tortoisehg/hgqt/settings.py:662  msgid ""  "Restart all TortoiseHg applications for the following changes to take effect:"  msgstr ""   -#: tortoisehg/hgqt/settings.py:651 +#: tortoisehg/hgqt/settings.py:670  msgid "Apply changes before exit?"  msgstr ""   -#: tortoisehg/hgqt/settings.py:652 tortoisehg/hgtk/thgconfig.py:848 +#: tortoisehg/hgqt/settings.py:671 tortoisehg/hgtk/commit.py:325 +#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200 +#: tortoisehg/hgtk/status.py:1320 tortoisehg/hgtk/thgconfig.py:848 +#: tortoisehg/hgtk/thgmq.py:369 +msgid "&Yes" +msgstr "&Si" + +#: tortoisehg/hgqt/settings.py:671 tortoisehg/hgtk/thgconfig.py:848  msgid "&No (discard changes)"  msgstr "&No (abbandona modifiche)"   -#: tortoisehg/hgqt/settings.py:706 +#: tortoisehg/hgqt/settings.py:725  msgid "Settings File:"  msgstr ""   -#: tortoisehg/hgqt/settings.py:749 +#: tortoisehg/hgqt/settings.py:768  msgid "Confirm Save"  msgstr ""   -#: tortoisehg/hgqt/settings.py:750 -msgid "Save changes before edit?" -msgstr "" - -#: tortoisehg/hgqt/settings.py:751 tortoisehg/hgtk/thgconfig.py:775 +#: tortoisehg/hgqt/settings.py:769 +msgid "Save changes before editing?" +msgstr "" + +#: tortoisehg/hgqt/settings.py:770 tortoisehg/hgtk/thgconfig.py:775  msgid "&Save"  msgstr "&Salva"   -#: tortoisehg/hgqt/settings.py:800 tortoisehg/hgtk/thgconfig.py:822 +#: tortoisehg/hgqt/settings.py:819 tortoisehg/hgtk/thgconfig.py:822  msgid "Confirm Reload"  msgstr "Conferma ricaricamento"   -#: tortoisehg/hgqt/settings.py:801 tortoisehg/hgtk/thgconfig.py:823 +#: tortoisehg/hgqt/settings.py:820 tortoisehg/hgtk/thgconfig.py:823  msgid ""  "Unsaved changes will be lost.\n"  "Do you want to reload?" @@ -5201,11 +5252,11 @@
 "Le modifiche non salvate verranno perse.\n"  "Vuoi ricaricare?"   -#: tortoisehg/hgqt/settings.py:907 tortoisehg/hgtk/thgconfig.py:1550 +#: tortoisehg/hgqt/settings.py:926 tortoisehg/hgtk/thgconfig.py:1550  msgid "Unable to create a Mercurial.ini file"  msgstr "Impossibile creare il file Mercurial.ini"   -#: tortoisehg/hgqt/settings.py:908 +#: tortoisehg/hgqt/settings.py:927  msgid "Insufficient access rights, reverting to read-only mode."  msgstr ""   @@ -5213,32 +5264,32 @@
 msgid "Contex Menu"  msgstr ""   -#: tortoisehg/hgqt/shellconf.py:88 tortoisehg/hgtk/shellconf.py:83 +#: tortoisehg/hgqt/shellconf.py:88 tortoisehg/hgtk/shellconf.py:82  msgid "Top menu items:"  msgstr "Voci menu primo livello:"   -#: tortoisehg/hgqt/shellconf.py:94 tortoisehg/hgtk/shellconf.py:64 +#: tortoisehg/hgqt/shellconf.py:94 tortoisehg/hgtk/shellconf.py:63  msgid "Sub menu items:"  msgstr "Voci menu secondo livello:"   -#: tortoisehg/hgqt/shellconf.py:118 tortoisehg/hgtk/shellconf.py:113 +#: tortoisehg/hgqt/shellconf.py:118 tortoisehg/hgtk/shellconf.py:112  msgid "Menu Behavior"  msgstr ""   -#: tortoisehg/hgqt/shellconf.py:120 tortoisehg/hgtk/shellconf.py:121 +#: tortoisehg/hgqt/shellconf.py:120 tortoisehg/hgtk/shellconf.py:120  msgid "Hide context menu outside repositories"  msgstr ""   -#: tortoisehg/hgqt/shellconf.py:121 tortoisehg/hgtk/shellconf.py:211 +#: tortoisehg/hgqt/shellconf.py:121 tortoisehg/hgtk/shellconf.py:210  msgid ""  "Do not show menu items on unversioned folders (use shift + click to override)"  msgstr ""   -#: tortoisehg/hgqt/shellconf.py:130 tortoisehg/hgtk/shellconf.py:125 +#: tortoisehg/hgqt/shellconf.py:130 tortoisehg/hgtk/shellconf.py:124  msgid "Icons"  msgstr "Icone"   -#: tortoisehg/hgqt/shellconf.py:133 tortoisehg/hgtk/shellconf.py:130 +#: tortoisehg/hgqt/shellconf.py:133 tortoisehg/hgtk/shellconf.py:129  msgid "Overlays"  msgstr "Overlay"   @@ -5246,55 +5297,55 @@
 msgid "Enabled overlays"  msgstr ""   -#: tortoisehg/hgqt/shellconf.py:139 tortoisehg/hgtk/shellconf.py:139 +#: tortoisehg/hgqt/shellconf.py:139 tortoisehg/hgtk/shellconf.py:138  msgid "Local disks only"  msgstr "Solo su dischi locali"   -#: tortoisehg/hgqt/shellconf.py:144 tortoisehg/hgtk/shellconf.py:143 +#: tortoisehg/hgqt/shellconf.py:144 tortoisehg/hgtk/shellconf.py:142  msgid "Enabled Overlay Handlers"  msgstr ""   -#: tortoisehg/hgqt/shellconf.py:149 tortoisehg/hgtk/shellconf.py:152 +#: tortoisehg/hgqt/shellconf.py:149 tortoisehg/hgtk/shellconf.py:151  msgid "Warning: affects all Tortoises, logoff required after change"  msgstr ""   -#: tortoisehg/hgqt/shellconf.py:151 tortoisehg/hgtk/shellconf.py:160 +#: tortoisehg/hgqt/shellconf.py:151 tortoisehg/hgtk/shellconf.py:159  msgid "Added"  msgstr "Aggiunto"   -#: tortoisehg/hgqt/shellconf.py:153 tortoisehg/hgtk/shellconf.py:167 +#: tortoisehg/hgqt/shellconf.py:153 tortoisehg/hgtk/shellconf.py:166  msgid "Locked*"  msgstr "Bloccato*"   -#: tortoisehg/hgqt/shellconf.py:155 tortoisehg/hgtk/shellconf.py:174 +#: tortoisehg/hgqt/shellconf.py:155 tortoisehg/hgtk/shellconf.py:173  msgid "Ignored*"  msgstr "Ignorato*"   -#: tortoisehg/hgqt/shellconf.py:157 tortoisehg/hgtk/shellconf.py:162 +#: tortoisehg/hgqt/shellconf.py:157 tortoisehg/hgtk/shellconf.py:161  msgid "Unversioned"  msgstr "Non controllato"   -#: tortoisehg/hgqt/shellconf.py:159 tortoisehg/hgtk/shellconf.py:169 +#: tortoisehg/hgqt/shellconf.py:159 tortoisehg/hgtk/shellconf.py:168  msgid "Readonly*"  msgstr "Sola lettura*"   -#: tortoisehg/hgqt/shellconf.py:161 tortoisehg/hgtk/shellconf.py:176 +#: tortoisehg/hgqt/shellconf.py:161 tortoisehg/hgtk/shellconf.py:175  msgid "Deleted*"  msgstr "Eliminato*"   -#: tortoisehg/hgqt/shellconf.py:163 tortoisehg/hgtk/shellconf.py:192 +#: tortoisehg/hgqt/shellconf.py:163 tortoisehg/hgtk/shellconf.py:191  msgid "*: not used by TortoiseHg"  msgstr "*: non usato da TortoiseHg"   -#: tortoisehg/hgqt/shellconf.py:167 tortoisehg/hgtk/shellconf.py:196 +#: tortoisehg/hgqt/shellconf.py:167 tortoisehg/hgtk/shellconf.py:195  msgid "Taskbar"  msgstr "Taskbar"   -#: tortoisehg/hgqt/shellconf.py:171 tortoisehg/hgtk/shellconf.py:203 +#: tortoisehg/hgqt/shellconf.py:171 tortoisehg/hgtk/shellconf.py:202  msgid "Show Icon"  msgstr "Mostra icone"   -#: tortoisehg/hgqt/shellconf.py:173 tortoisehg/hgtk/shellconf.py:205 +#: tortoisehg/hgqt/shellconf.py:173 tortoisehg/hgtk/shellconf.py:204  msgid "Highlight Icon"  msgstr "Evidenzia icona"   @@ -5479,325 +5530,329 @@
 msgid "Checked count: %d"  msgstr ""   -#: tortoisehg/hgqt/status.py:518 +#: tortoisehg/hgqt/status.py:516  msgid "Stat"  msgstr "Stato"   -#: tortoisehg/hgqt/status.py:518 +#: tortoisehg/hgqt/status.py:516  msgid "M"  msgstr ""   -#: tortoisehg/hgqt/status.py:518 tortoisehg/hgtk/datamine.py:140 +#: tortoisehg/hgqt/status.py:516 tortoisehg/hgtk/datamine.py:140  msgid "Filename"  msgstr "Nome file"   -#: tortoisehg/hgqt/status.py:519 tortoisehg/hgtk/thgconfig.py:414 +#: tortoisehg/hgqt/status.py:517 tortoisehg/hgtk/thgconfig.py:414  msgid "Type"  msgstr "Tipo"   -#: tortoisehg/hgqt/status.py:519 +#: tortoisehg/hgqt/status.py:517  msgid "Size (KB)"  msgstr ""   -#: tortoisehg/hgqt/status.py:684 +#: tortoisehg/hgqt/status.py:699  msgid ", resolved merge"  msgstr ""   -#: tortoisehg/hgqt/status.py:686 +#: tortoisehg/hgqt/status.py:701  msgid ", unresolved merge"  msgstr ""   -#: tortoisehg/hgqt/status.py:698 +#: tortoisehg/hgqt/status.py:713  #, python-format  msgid "%s is modified"  msgstr ""   -#: tortoisehg/hgqt/status.py:700 +#: tortoisehg/hgqt/status.py:715  #, python-format  msgid "%s is added"  msgstr ""   -#: tortoisehg/hgqt/status.py:702 +#: tortoisehg/hgqt/status.py:717  #, python-format  msgid "%s is removed"  msgstr ""   -#: tortoisehg/hgqt/status.py:704 +#: tortoisehg/hgqt/status.py:719  #, python-format  msgid "%s is not tracked (unknown)"  msgstr ""   -#: tortoisehg/hgqt/status.py:706 +#: tortoisehg/hgqt/status.py:721  #, python-format  msgid "%s is missing!"  msgstr ""   -#: tortoisehg/hgqt/status.py:708 +#: tortoisehg/hgqt/status.py:723  #, python-format  msgid "%s is ignored"  msgstr ""   -#: tortoisehg/hgqt/status.py:710 +#: tortoisehg/hgqt/status.py:725  #, python-format  msgid "%s is not modified (clean)"  msgstr ""   -#: tortoisehg/hgqt/status.py:712 +#: tortoisehg/hgqt/status.py:727  #, python-format  msgid "%s is a dirty subrepo"  msgstr ""   -#: tortoisehg/hgqt/sync.py:84 +#: tortoisehg/hgqt/sync.py:41 +msgid "Malformed ssh URL" +msgstr "" + +#: tortoisehg/hgqt/sync.py:88  msgid "TortoiseHg Sync"  msgstr ""   -#: tortoisehg/hgqt/sync.py:102 +#: tortoisehg/hgqt/sync.py:106  msgid "Preview incoming changesets from remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:105 +#: tortoisehg/hgqt/sync.py:109  msgid "Pull incoming changesets from remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:108 +#: tortoisehg/hgqt/sync.py:112  msgid "Filter outgoing changesets to remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:111 +#: tortoisehg/hgqt/sync.py:115  msgid "Push outgoing changesets to remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:113 +#: tortoisehg/hgqt/sync.py:117  msgid "Email outgoing changesets for remote repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:118 +#: tortoisehg/hgqt/sync.py:122  msgid "Manage pending perforce changelists"  msgstr ""   -#: tortoisehg/hgqt/sync.py:125 +#: tortoisehg/hgqt/sync.py:129  msgid "Stop current operation"  msgstr ""   -#: tortoisehg/hgqt/sync.py:139 tortoisehg/hgqt/update.py:68 +#: tortoisehg/hgqt/sync.py:143 tortoisehg/hgqt/update.py:68  #: tortoisehg/hgtk/update.py:78  msgid "Target:"  msgstr "Revisione:"   -#: tortoisehg/hgqt/sync.py:151 +#: tortoisehg/hgqt/sync.py:155  msgid "<b>Remote Repository:</b>"  msgstr ""   -#: tortoisehg/hgqt/sync.py:170 +#: tortoisehg/hgqt/sync.py:174  msgid "Manage HTTPS connection security and user authentication"  msgstr ""   -#: tortoisehg/hgqt/sync.py:174 +#: tortoisehg/hgqt/sync.py:178  msgid "Hostname"  msgstr ""   -#: tortoisehg/hgqt/sync.py:200 +#: tortoisehg/hgqt/sync.py:204  msgid "Save current URL under an alias"  msgstr ""   -#: tortoisehg/hgqt/sync.py:214 +#: tortoisehg/hgqt/sync.py:218  msgid "Paths in Repository Settings:"  msgstr ""   -#: tortoisehg/hgqt/sync.py:229 +#: tortoisehg/hgqt/sync.py:233  msgid "Related Paths:"  msgstr ""   -#: tortoisehg/hgqt/sync.py:261 +#: tortoisehg/hgqt/sync.py:266  #, python-format  msgid "Preview incoming changesets from %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:262 +#: tortoisehg/hgqt/sync.py:267  #, python-format  msgid "Pull incoming changesets from %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:263 +#: tortoisehg/hgqt/sync.py:268  #, python-format  msgid "Filter outgoing changesets to %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:264 +#: tortoisehg/hgqt/sync.py:269  #, python-format  msgid "Push outgoing changesets to %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:271 +#: tortoisehg/hgqt/sync.py:276  #, python-format  msgid "rev: %d (%s)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:276 tortoisehg/hgtk/commit.py:792 +#: tortoisehg/hgqt/sync.py:281 tortoisehg/hgtk/commit.py:792  msgid "branch: "  msgstr "Ramo: "   -#: tortoisehg/hgqt/sync.py:282 +#: tortoisehg/hgqt/sync.py:287  msgid "bookmark: "  msgstr ""   -#: tortoisehg/hgqt/sync.py:332 tortoisehg/hgtk/synch.py:157 +#: tortoisehg/hgqt/sync.py:339 tortoisehg/hgtk/synch.py:157  msgid "Post Pull: "  msgstr "Dopo pull: "   -#: tortoisehg/hgqt/sync.py:476 +#: tortoisehg/hgqt/sync.py:480  msgid "Repository not local"  msgstr ""   -#: tortoisehg/hgqt/sync.py:477 +#: tortoisehg/hgqt/sync.py:481  msgid "A terminal shell cannot be opened for remote"  msgstr ""   -#: tortoisehg/hgqt/sync.py:488 tortoisehg/hgqt/workbench.py:686 +#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:688  msgid "No shell configured"  msgstr ""   -#: tortoisehg/hgqt/sync.py:489 tortoisehg/hgqt/workbench.py:687 +#: tortoisehg/hgqt/sync.py:493 tortoisehg/hgqt/workbench.py:689  msgid "A terminal shell must be configured"  msgstr ""   -#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/sync.py:1232 +#: tortoisehg/hgqt/sync.py:495 tortoisehg/hgqt/sync.py:1247  msgid "Confirm path delete"  msgstr ""   -#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/sync.py:1233 +#: tortoisehg/hgqt/sync.py:496 tortoisehg/hgqt/sync.py:1248  #, python-format  msgid "Delete %s from your repo configuration file?"  msgstr ""   -#: tortoisehg/hgqt/sync.py:570 +#: tortoisehg/hgqt/sync.py:576  msgid "No URL selected"  msgstr ""   -#: tortoisehg/hgqt/sync.py:571 +#: tortoisehg/hgqt/sync.py:577  msgid "An URL must be selected for this operation."  msgstr ""   -#: tortoisehg/hgqt/sync.py:586 +#: tortoisehg/hgqt/sync.py:592  msgid "Redundant authentication info"  msgstr ""   -#: tortoisehg/hgqt/sync.py:587 +#: tortoisehg/hgqt/sync.py:593  msgid ""  "You have authentication info configured for this host and inside this URL. "  "Remove authentication info from this URL?"  msgstr ""   -#: tortoisehg/hgqt/sync.py:606 tortoisehg/hgqt/sync.py:612 -#: tortoisehg/hgqt/sync.py:618 tortoisehg/hgqt/sync.py:624 -#: tortoisehg/hgqt/sync.py:631 +#: tortoisehg/hgqt/sync.py:612 tortoisehg/hgqt/sync.py:618 +#: tortoisehg/hgqt/sync.py:624 tortoisehg/hgqt/sync.py:630 +#: tortoisehg/hgqt/sync.py:637  msgid "sync command already running"  msgstr ""   -#: tortoisehg/hgqt/sync.py:648 +#: tortoisehg/hgqt/sync.py:655  #, python-format  msgid "Getting incoming changesets from %s..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:653 tortoisehg/hgqt/sync.py:671 +#: tortoisehg/hgqt/sync.py:660 tortoisehg/hgqt/sync.py:678  #, python-format  msgid "Found incoming changesets from %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:656 tortoisehg/hgqt/sync.py:673 +#: tortoisehg/hgqt/sync.py:663 tortoisehg/hgqt/sync.py:680  #, python-format  msgid "No incoming changesets from %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:658 tortoisehg/hgqt/sync.py:675 +#: tortoisehg/hgqt/sync.py:665 tortoisehg/hgqt/sync.py:682  #, python-format  msgid "Incoming from %s aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:684 +#: tortoisehg/hgqt/sync.py:692  #, python-format  msgid "Pull from %s completed"  msgstr ""   -#: tortoisehg/hgqt/sync.py:686 +#: tortoisehg/hgqt/sync.py:694  #, python-format  msgid "Pull from %s aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:696 tortoisehg/hgqt/update.py:304 +#: tortoisehg/hgqt/sync.py:704 tortoisehg/hgqt/update.py:304  msgid "Merge caused file conflicts"  msgstr ""   -#: tortoisehg/hgqt/sync.py:697 tortoisehg/hgqt/update.py:305 +#: tortoisehg/hgqt/sync.py:705 tortoisehg/hgqt/update.py:305  msgid "File conflicts need to be resolved"  msgstr ""   -#: tortoisehg/hgqt/sync.py:703 +#: tortoisehg/hgqt/sync.py:711  #, python-format  msgid "Pulling from %s..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:717 +#: tortoisehg/hgqt/sync.py:726  #, python-format  msgid "Finding outgoing changesets to %s..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:723 +#: tortoisehg/hgqt/sync.py:732  #, python-format  msgid "%d outgoing changesets to %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:726 +#: tortoisehg/hgqt/sync.py:735  #, python-format  msgid "No outgoing changesets to %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:728 +#: tortoisehg/hgqt/sync.py:737  #, python-format  msgid "Outgoing to %s aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:753 tortoisehg/hgtk/history.py:584 +#: tortoisehg/hgqt/sync.py:762 tortoisehg/hgtk/history.py:584  #, python-format  msgid "%s (submitted)"  msgstr "%s (inviato)"   -#: tortoisehg/hgqt/sync.py:755 tortoisehg/hgtk/history.py:586 +#: tortoisehg/hgqt/sync.py:764 tortoisehg/hgtk/history.py:586  #: tortoisehg/hgtk/history.py:592  #, python-format  msgid "%s (pending)"  msgstr "%s (in attesa)"   -#: tortoisehg/hgqt/sync.py:760 tortoisehg/hgtk/history.py:595 +#: tortoisehg/hgqt/sync.py:769 tortoisehg/hgtk/history.py:595  msgid "Unable to parse p4pending output"  msgstr "Impossibile analizzare il risultato di p4pending"   -#: tortoisehg/hgqt/sync.py:762 tortoisehg/hgtk/history.py:597 +#: tortoisehg/hgqt/sync.py:771 tortoisehg/hgtk/history.py:597  #, python-format  msgid "%d pending changelists found"  msgstr "trovate %d liste modifiche in sospeso"   -#: tortoisehg/hgqt/sync.py:764 tortoisehg/hgtk/history.py:599 +#: tortoisehg/hgqt/sync.py:773 tortoisehg/hgtk/history.py:599  msgid "No pending Perforce changelists"  msgstr "Nessuna lista modifiche in sospeso di Perforce"   -#: tortoisehg/hgqt/sync.py:766 tortoisehg/hgtk/history.py:601 +#: tortoisehg/hgqt/sync.py:775 tortoisehg/hgtk/history.py:601  msgid "Aborted p4pending"  msgstr "p4pending interrotto"   -#: tortoisehg/hgqt/sync.py:768 tortoisehg/hgtk/history.py:603 +#: tortoisehg/hgqt/sync.py:777 tortoisehg/hgtk/history.py:603  msgid "Unable to determine pending changesets"  msgstr "Impossibile determinale le liste modifiche in sospeso"   -#: tortoisehg/hgqt/sync.py:778 +#: tortoisehg/hgqt/sync.py:787  msgid "Perforce pending..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:784 tortoisehg/hgtk/history.py:2633 +#: tortoisehg/hgqt/sync.py:794 tortoisehg/hgtk/history.py:2633  msgid "Confirm Push to remote Repository"  msgstr "Coferma push su repository remoto"   -#: tortoisehg/hgqt/sync.py:785 tortoisehg/hgtk/history.py:2634 +#: tortoisehg/hgqt/sync.py:795 tortoisehg/hgtk/history.py:2634  #, python-format  msgid ""  "Push to remote repository\n" @@ -5808,159 +5863,163 @@
 "%s\n"  "?"   -#: tortoisehg/hgqt/sync.py:788 +#: tortoisehg/hgqt/sync.py:798  #, python-format  msgid "Push to %s aborted"  msgstr ""   -#: tortoisehg/hgqt/sync.py:791 +#: tortoisehg/hgqt/sync.py:801  #, python-format  msgid "Pushing to %s..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:794 +#: tortoisehg/hgqt/sync.py:804  #, python-format  msgid "Push to %s completed"  msgstr ""   -#: tortoisehg/hgqt/sync.py:796 +#: tortoisehg/hgqt/sync.py:806  #, python-format  msgid "Push to %s aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:808 +#: tortoisehg/hgqt/sync.py:818  msgid "Determining outgoing changesets to email..."  msgstr ""   -#: tortoisehg/hgqt/sync.py:812 tortoisehg/hgtk/history.py:2026 +#: tortoisehg/hgqt/sync.py:822 tortoisehg/hgtk/history.py:2026  #, python-format  msgid "%d outgoing changesets"  msgstr "%d changeset in uscita"   -#: tortoisehg/hgqt/sync.py:822 tortoisehg/hgtk/history.py:2030 +#: tortoisehg/hgqt/sync.py:832 tortoisehg/hgtk/history.py:2030  msgid "No outgoing changesets"  msgstr "Nessun changeset in uscita..."   -#: tortoisehg/hgqt/sync.py:824 +#: tortoisehg/hgqt/sync.py:834  #, python-format  msgid "Outgoing aborted, ret %d"  msgstr ""   -#: tortoisehg/hgqt/sync.py:836 +#: tortoisehg/hgqt/sync.py:846  msgid "Unable to remove URL"  msgstr ""   -#: tortoisehg/hgqt/sync.py:858 +#: tortoisehg/hgqt/sync.py:868  msgid "Post Pull Behavior"  msgstr ""   -#: tortoisehg/hgqt/sync.py:862 +#: tortoisehg/hgqt/sync.py:872  msgid "Select post-pull operation for this repository"  msgstr ""   -#: tortoisehg/hgqt/sync.py:865 +#: tortoisehg/hgqt/sync.py:875  msgid "None - simply pull changesets"  msgstr ""   -#: tortoisehg/hgqt/sync.py:866 +#: tortoisehg/hgqt/sync.py:876  msgid "Update - pull, then try to update"  msgstr ""   -#: tortoisehg/hgqt/sync.py:872 +#: tortoisehg/hgqt/sync.py:882  msgid "Fetch - use fetch (auto merge pulled changes)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:874 +#: tortoisehg/hgqt/sync.py:884  msgid "Fetch - use fetch extension (fetch is not active!)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:881 +#: tortoisehg/hgqt/sync.py:891  msgid "Rebase - rebase local commits above pulled changes"  msgstr ""   -#: tortoisehg/hgqt/sync.py:883 +#: tortoisehg/hgqt/sync.py:893  msgid "Rebase - use rebase extension (rebase is not active!)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:901 +#: tortoisehg/hgqt/sync.py:911  msgid "<a href=\"config\">Launch settings tool...</a>"  msgstr ""   -#: tortoisehg/hgqt/sync.py:934 +#: tortoisehg/hgqt/sync.py:944  msgid "Unable to save post pull operation"  msgstr ""   -#: tortoisehg/hgqt/sync.py:958 +#: tortoisehg/hgqt/sync.py:968  msgid "Save Path"  msgstr ""   -#: tortoisehg/hgqt/sync.py:968 tortoisehg/hgqt/sync.py:1276 +#: tortoisehg/hgqt/sync.py:978 tortoisehg/hgqt/sync.py:1291  #: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954  msgid "Alias"  msgstr "Alias"   -#: tortoisehg/hgqt/sync.py:971 tortoisehg/hgqt/sync.py:1276 +#: tortoisehg/hgqt/sync.py:981 tortoisehg/hgqt/sync.py:1291  #: tortoisehg/hgtk/thgconfig.py:368  msgid "URL"  msgstr "URL"   -#: tortoisehg/hgqt/sync.py:980 +#: tortoisehg/hgqt/sync.py:990  msgid "Remove authentication data from URL"  msgstr ""   -#: tortoisehg/hgqt/sync.py:982 +#: tortoisehg/hgqt/sync.py:992  msgid ""  "User authentication data should be associated with the hostname using the "  "security dialog."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1004 +#: tortoisehg/hgqt/sync.py:1014  msgid "Unable to save an URL"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1015 +#: tortoisehg/hgqt/sync.py:1025  msgid "Confirm URL replace"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1016 +#: tortoisehg/hgqt/sync.py:1026  #, python-format  msgid "%s already exists, replace URL?"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1044 +#: tortoisehg/hgqt/sync.py:1050 +msgid "Certificate Query Error" +msgstr "" + +#: tortoisehg/hgqt/sync.py:1059  msgid "Security: "  msgstr ""   -#: tortoisehg/hgqt/sync.py:1059 +#: tortoisehg/hgqt/sync.py:1074  #, python-format  msgid "<b>Host:</b> %s"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1061 +#: tortoisehg/hgqt/sync.py:1076  msgid "Secure HTTPS Connection"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1068 +#: tortoisehg/hgqt/sync.py:1083  msgid "Verify with Certificate Authority certificates (best)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1070 +#: tortoisehg/hgqt/sync.py:1085  msgid "Verify with stored host fingerprint (good)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1072 +#: tortoisehg/hgqt/sync.py:1087  msgid "No host validation, but still encrypted (bad)"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1083 +#: tortoisehg/hgqt/sync.py:1098  msgid "Query"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1102 +#: tortoisehg/hgqt/sync.py:1117  msgid "User Authentication"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1109 +#: tortoisehg/hgqt/sync.py:1124  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" @@ -5968,139 +6027,145 @@
 "foo.username = $USER."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1118 +#: tortoisehg/hgqt/sync.py:1133  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:1125 +#: tortoisehg/hgqt/sync.py:1140  msgid ""  "Mercurial keyring extension is enabled. Passwords will be stored in a "  "platform-native secure method."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1131 +#: tortoisehg/hgqt/sync.py:1146  msgid ""  "Optional. PEM encoded client certificate key file. Environment variables\n"  "are expanded in the filename."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1133 +#: tortoisehg/hgqt/sync.py:1148  msgid "User Certificate Key File"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1137 +#: tortoisehg/hgqt/sync.py:1152  msgid ""  "Optional. PEM encoded client certificate chain file. Environment variables\n"  "are expanded in the filename."  msgstr ""   -#: tortoisehg/hgqt/sync.py:1139 +#: tortoisehg/hgqt/sync.py:1154  msgid "User Certificate Chain File"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1159 +#: tortoisehg/hgqt/sync.py:1174  msgid "Unable to save authentication"  msgstr ""   -#: tortoisehg/hgqt/sync.py:1330 -msgid "Unable to create a config file" -msgstr "" - -#: tortoisehg/hgqt/sync.py:1331 -msgid "Insufficient access rights." -msgstr "" - -#: tortoisehg/hgqt/sync.py:1348 +#: tortoisehg/hgqt/sync.py:1342  msgid "Allow push of a new branch (--new-branch)"  msgstr ""   +#: tortoisehg/hgqt/sync.py:1347 +msgid "Force push or pull (override safety checks, --force)" +msgstr "" +  #: tortoisehg/hgqt/sync.py:1352 -msgid "Force push or pull (override safety checks, --force)" +msgid "Recurse into subrepositories (--subrepos)"  msgstr ""    #: tortoisehg/hgqt/sync.py:1357 -msgid "Recurse into subrepositories (--subrepos)" -msgstr "" - -#: tortoisehg/hgqt/sync.py:1362  msgid "Temporarily disable configured HTTP proxy"  msgstr ""   -#: tortoisehg/hgqt/tag.py:65 tortoisehg/hgtk/tagadd.py:57 +#: tortoisehg/hgqt/sync.py:1364 +msgid "Emit debugging output (--debug)" +msgstr "" + +#: tortoisehg/hgqt/tag.py:29 tortoisehg/hgtk/tagadd.py:31 +#, python-format +msgid "Tag - %s" +msgstr "%s - Gestione etichette" + +#: tortoisehg/hgqt/tag.py:58 tortoisehg/hgtk/tagadd.py:57  msgid "Tag:"  msgstr "Etichetta:"   -#: tortoisehg/hgqt/tag.py:90 +#: tortoisehg/hgqt/tag.py:61 +msgid "Tagged:" +msgstr "" + +#: tortoisehg/hgqt/tag.py:76  msgid "Local tag"  msgstr ""   -#: tortoisehg/hgqt/tag.py:92 +#: tortoisehg/hgqt/tag.py:78  msgid "Replace existing tag (-f/--force)"  msgstr ""   -#: tortoisehg/hgqt/tag.py:97 tortoisehg/hgtk/tagadd.py:82 +#: tortoisehg/hgqt/tag.py:83 tortoisehg/hgtk/tagadd.py:82  msgid "Use English commit message"  msgstr "Usa messaggio di commit in inglese"   -#: tortoisehg/hgqt/tag.py:102 tortoisehg/hgtk/tagadd.py:90 +#: tortoisehg/hgqt/tag.py:88 tortoisehg/hgtk/tagadd.py:90  msgid "Use custom commit message:"  msgstr "Usa messaggio di commit personalizzato"   -#: tortoisehg/hgqt/tag.py:135 tortoisehg/hgtk/tagadd.py:31 -#, python-format -msgid "Tag - %s" -msgstr "%s - Gestione etichette" - -#: tortoisehg/hgqt/tag.py:247 tortoisehg/hgtk/tagadd.py:289 -#, python-format -msgid "Tag '%s' already exist" -msgstr "L'etichetta \"%s\" esiste già" - -#: tortoisehg/hgqt/tag.py:251 tortoisehg/hgqt/tag.py:300 +#: tortoisehg/hgqt/tag.py:172 tortoisehg/hgtk/thgconfig.py:351 +msgid "local" +msgstr "local" + +#: tortoisehg/hgqt/tag.py:184 tortoisehg/hgtk/bookmark.py:49 +#: tortoisehg/hgtk/commit.py:262 tortoisehg/hgtk/status.py:124 +msgid "Move" +msgstr "Sposta" + +#: tortoisehg/hgqt/tag.py:239 +#, python-format +msgid "Tag '%s' already exists" +msgstr "" + +#: tortoisehg/hgqt/tag.py:244 tortoisehg/hgqt/tag.py:296  msgid "uncommitted merge"  msgstr ""   -#: tortoisehg/hgqt/tag.py:255 tortoisehg/hgqt/tag.py:304 +#: tortoisehg/hgqt/tag.py:248 tortoisehg/hgqt/tag.py:300  msgid "not at a branch head (use force)"  msgstr ""   -#: tortoisehg/hgqt/tag.py:259 tortoisehg/hgtk/tagadd.py:285 +#: tortoisehg/hgqt/tag.py:252 tortoisehg/hgtk/tagadd.py:285  #, python-format  msgid "Added tag %s for changeset %s"  msgstr "Inserita l'etichetta %s per il changeset %s"   -#: tortoisehg/hgqt/tag.py:272 +#: tortoisehg/hgqt/tag.py:259 +#, python-format +msgid "Tag '%s' has been moved" +msgstr "" + +#: tortoisehg/hgqt/tag.py:261  #, python-format  msgid "Tag '%s' has been added"  msgstr ""   -#: tortoisehg/hgqt/tag.py:276 tortoisehg/hgqt/tag.py:321 -msgid "Abort: " -msgstr "" - -#: tortoisehg/hgqt/tag.py:278 tortoisehg/hgqt/tag.py:323 -msgid "Error: " -msgstr "" - -#: tortoisehg/hgqt/tag.py:292 tortoisehg/hgtk/tagadd.py:303 +#: tortoisehg/hgqt/tag.py:288 tortoisehg/hgtk/tagadd.py:303  #, python-format  msgid "tag '%s' is not a local tag"  msgstr "il tag '%s' non è un tag locale"   -#: tortoisehg/hgqt/tag.py:296 tortoisehg/hgtk/tagadd.py:306 +#: tortoisehg/hgqt/tag.py:292 tortoisehg/hgtk/tagadd.py:306  #, python-format  msgid "tag '%s' is not a global tag"  msgstr "il tag '%s' non è un tag globale"   -#: tortoisehg/hgqt/tag.py:306 tortoisehg/hgtk/tagadd.py:309 +#: tortoisehg/hgqt/tag.py:303 tortoisehg/hgtk/tagadd.py:309  #, python-format  msgid "Removed tag %s"  msgstr "Rimossa l'etichetta %s"   -#: tortoisehg/hgqt/tag.py:317 +#: tortoisehg/hgqt/tag.py:308  #, python-format  msgid "Tag '%s' has been removed"  msgstr "" @@ -6225,6 +6290,12 @@
 msgid "&Yes (--force)"  msgstr "&Si (--force)"   +#: tortoisehg/hgqt/thgstrip.py:206 tortoisehg/hgtk/commit.py:325 +#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200 +#: tortoisehg/hgtk/thgstrip.py:217 +msgid "&No" +msgstr "&No" +  #: tortoisehg/hgqt/thgstrip.py:207 tortoisehg/hgtk/thgstrip.py:214  msgid "Confirm Strip"  msgstr "Conferma eliminazione revisioni" @@ -6466,53 +6537,53 @@
 msgid "cleaning up temp directory\n"  msgstr "pulizia directory temporanea\n"   -#: tortoisehg/hgqt/visdiff.py:366 tortoisehg/hgtk/visdiff.py:352 +#: tortoisehg/hgqt/visdiff.py:365 tortoisehg/hgtk/visdiff.py:352  msgid "working changes"  msgstr "modifiche in corso"   -#: tortoisehg/hgqt/visdiff.py:368 +#: tortoisehg/hgqt/visdiff.py:367  #, python-format  msgid "changeset %d:%s"  msgstr ""   -#: tortoisehg/hgqt/visdiff.py:370 +#: tortoisehg/hgqt/visdiff.py:369  #, python-format  msgid "revisions %d:%s to %d:%s"  msgstr ""   -#: tortoisehg/hgqt/visdiff.py:372 tortoisehg/hgtk/visdiff.py:357 +#: tortoisehg/hgqt/visdiff.py:371 tortoisehg/hgtk/visdiff.py:357  msgid "Visual Diffs - "  msgstr "Confronto visuale - "   -#: tortoisehg/hgqt/visdiff.py:374 tortoisehg/hgtk/visdiff.py:359 +#: tortoisehg/hgqt/visdiff.py:373 tortoisehg/hgtk/visdiff.py:359  msgid " filtered"  msgstr " filtrato"   -#: tortoisehg/hgqt/visdiff.py:387 tortoisehg/hgtk/visdiff.py:370 +#: tortoisehg/hgqt/visdiff.py:388 tortoisehg/hgtk/visdiff.py:370  msgid "Temporary files are removed when this dialog is closed"  msgstr "I file temporanei verranno rimossi alla chiusura di questa finestra"   -#: tortoisehg/hgqt/visdiff.py:404 +#: tortoisehg/hgqt/visdiff.py:406  msgid "Select Tool:"  msgstr ""   -#: tortoisehg/hgqt/visdiff.py:431 tortoisehg/hgtk/visdiff.py:424 +#: tortoisehg/hgqt/visdiff.py:430 tortoisehg/hgtk/visdiff.py:424  msgid "Dir diff to p1"  msgstr "Comparazione directory con p1"   -#: tortoisehg/hgqt/visdiff.py:433 tortoisehg/hgtk/visdiff.py:426 +#: tortoisehg/hgqt/visdiff.py:432 tortoisehg/hgtk/visdiff.py:426  msgid "Dir diff to p2"  msgstr "Comparazione directory con p2"   -#: tortoisehg/hgqt/visdiff.py:435 tortoisehg/hgtk/visdiff.py:428 +#: tortoisehg/hgqt/visdiff.py:434 tortoisehg/hgtk/visdiff.py:428  msgid "3-way dir diff"  msgstr "Comparazione directory a 3 vie"   -#: tortoisehg/hgqt/visdiff.py:438 tortoisehg/hgtk/visdiff.py:434 +#: tortoisehg/hgqt/visdiff.py:437 tortoisehg/hgtk/visdiff.py:434  msgid "Directory diff"  msgstr "Comparazione directory"   -#: tortoisehg/hgqt/visdiff.py:595 tortoisehg/hgtk/visdiff.py:631 +#: tortoisehg/hgqt/visdiff.py:605 tortoisehg/hgtk/visdiff.py:631  msgid "No repository found here"  msgstr "Nessun repository trovato qui"   @@ -6640,24 +6711,24 @@
 msgstr "&Altro"    #: tortoisehg/hgqt/wctxactions.py:243 -msgid "Revert changes to files?" -msgstr "" - -#: tortoisehg/hgqt/wctxactions.py:244 tortoisehg/hgtk/statusact.py:147 -msgid "&Yes (backup changes)" -msgstr "&Si (backup modifiche)" - -#: tortoisehg/hgqt/wctxactions.py:244 tortoisehg/hgtk/statusact.py:148 -msgid "Yes (&discard changes)" -msgstr "Si (&abbandona modifiche)" - -#: tortoisehg/hgqt/wctxactions.py:298 tortoisehg/hgtk/statusact.py:178 -msgid "Confirm Delete Unrevisioned" -msgstr "Conferma cancellazione file" - -#: tortoisehg/hgqt/wctxactions.py:299 tortoisehg/hgtk/statusact.py:179 -msgid "Delete the following unrevisioned files?" -msgstr "Eliminare i seguenti file non revisionati?" +msgid "Revert local file changes?" +msgstr "" + +#: tortoisehg/hgqt/wctxactions.py:244 +msgid "&Revert with backup" +msgstr "" + +#: tortoisehg/hgqt/wctxactions.py:244 +msgid "&Discard changes" +msgstr "" + +#: tortoisehg/hgqt/wctxactions.py:298 +msgid "Confirm Delete Unversioned" +msgstr "" + +#: tortoisehg/hgqt/wctxactions.py:299 +msgid "Delete the following unversioned files?" +msgstr ""    #: tortoisehg/hgqt/wctxactions.py:311 tortoisehg/hgtk/statusact.py:40  msgid "Copy file to" @@ -6683,7 +6754,7 @@
 msgid "Local Path:"  msgstr ""   -#: tortoisehg/hgqt/webconf.py:226 tortoisehg/hgtk/synch.py:382 +#: tortoisehg/hgqt/webconf.py:226 tortoisehg/hgtk/synch.py:383  msgid "Select Repository"  msgstr "Seleziona repository"   @@ -6775,10 +6846,6 @@
 msgid "&Settings..."  msgstr ""   -#: tortoisehg/hgqt/workbench.py:190 -msgid "E&xit" -msgstr "" -  #: tortoisehg/hgqt/workbench.py:193  msgid "Show Repository Registry"  msgstr "" @@ -6945,15 +7012,15 @@
 msgid "%s - TortoiseHg Workbench"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:560 +#: tortoisehg/hgqt/workbench.py:562  msgid "Select repository directory to open"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:581 +#: tortoisehg/hgqt/workbench.py:583  msgid "Failed to open repository"  msgstr ""   -#: tortoisehg/hgqt/workbench.py:708 +#: tortoisehg/hgqt/workbench.py:710  #, python-format  msgid "Hg file log viewer [%s] - %s"  msgstr "" @@ -7029,10 +7096,9 @@
   #: tortoisehg/hgtk/backout.py:78  msgid "" -"Commit message text for new changeset that reverses the effect of the " -"change being backed out." -msgstr "" -"Messaggio di commit per il nuovo changeset creato dall'operazione di backout." +"Commit message text for new changeset that reverses the effect of the change " +"being backed out." +msgstr ""    #: tortoisehg/hgtk/backout.py:95  msgid "Backout" @@ -7050,11 +7116,6 @@
 msgid "Failed to backout"  msgstr "Backout fallito"   -#: tortoisehg/hgtk/bookmark.py:49 tortoisehg/hgtk/commit.py:262 -#: tortoisehg/hgtk/status.py:124 -msgid "Move" -msgstr "Sposta" -  #: tortoisehg/hgtk/bookmark.py:54  msgid "Set Current"  msgstr "Imposta come corrente" @@ -7069,10 +7130,6 @@
 msgid "Old name:"  msgstr "Vecchio nome:"   -#: tortoisehg/hgtk/bookmark.py:86 -msgid "New Name:" -msgstr "Nuovo nome:" -  #: tortoisehg/hgtk/bookmark.py:92  msgid "Make new/moved bookmark current"  msgstr "Imposta come corrente il segnalibro appena creato/spostato" @@ -7434,6 +7491,10 @@
 msgid "Push after commit"  msgstr "Push dopo il commit"   +#: tortoisehg/hgtk/commit.py:429 +msgid "Recent commit messages..." +msgstr "Ultimi messaggi di commit..." +  #: tortoisehg/hgtk/commit.py:503  #, python-format  msgid "Parent: %(rev)s" @@ -7651,7 +7712,7 @@
 #: tortoisehg/hgtk/history.py:2035 tortoisehg/hgtk/history.py:2075  #: tortoisehg/hgtk/history.py:2419 tortoisehg/hgtk/history.py:2449  #: tortoisehg/hgtk/history.py:2706 tortoisehg/hgtk/history.py:2737 -#: tortoisehg/hgtk/recovery.py:178 tortoisehg/hgtk/synch.py:549 +#: tortoisehg/hgtk/recovery.py:178 tortoisehg/hgtk/synch.py:550  msgid "Cannot run now"  msgstr "Impossibile eseguire ora"   @@ -7988,11 +8049,11 @@
 msgid "Differences from Source to Dest"  msgstr "Differenze tra sorgente e destinazione"   -#: tortoisehg/hgtk/guess.py:262 +#: tortoisehg/hgtk/guess.py:263  msgid "finding source of "  msgstr "ricerca in corso del file sorgente di "   -#: tortoisehg/hgtk/guess.py:366 +#: tortoisehg/hgtk/guess.py:367  #, python-format  msgid ""  "== %s and %s have identical contents ==\n" @@ -8141,6 +8202,10 @@
 msgid "Files"  msgstr "File"   +#: tortoisehg/hgtk/hgignore.py:230 +msgid "Error while reading status" +msgstr "" +  #: tortoisehg/hgtk/hginit.py:22  msgid "TortoiseHg Init"  msgstr "TortoiseHg inizializzazione" @@ -8648,7 +8713,7 @@
 #: tortoisehg/hgtk/history.py:2076 tortoisehg/hgtk/history.py:2420  #: tortoisehg/hgtk/history.py:2450 tortoisehg/hgtk/history.py:2707  #: tortoisehg/hgtk/history.py:2738 tortoisehg/hgtk/recovery.py:179 -#: tortoisehg/hgtk/synch.py:550 +#: tortoisehg/hgtk/synch.py:551  msgid "Please try again after the previous command has completed"  msgstr "Si prega di riprovare dopo il completamento del precedente comando"   @@ -9115,11 +9180,11 @@
 msgid "Checking outgoing changesets..."  msgstr "Verifica changeset in uscita in corso..."   -#: tortoisehg/hgtk/history.py:2042 tortoisehg/hgtk/synch.py:504 +#: tortoisehg/hgtk/history.py:2042 tortoisehg/hgtk/synch.py:505  msgid "No repository selected"  msgstr "Nessun repository selezionato"   -#: tortoisehg/hgtk/history.py:2043 tortoisehg/hgtk/synch.py:505 +#: tortoisehg/hgtk/history.py:2043 tortoisehg/hgtk/synch.py:506  msgid "Select a peer repository to compare with"  msgstr "Seleziona un repository remoto da confrontare"   @@ -9500,11 +9565,11 @@
 msgid "Validate repository consistency"  msgstr "Convalida la consistenza del repository"   -#: tortoisehg/hgtk/recovery.py:110 tortoisehg/hgtk/synch.py:399 +#: tortoisehg/hgtk/recovery.py:110 tortoisehg/hgtk/synch.py:400  msgid "Cannot close now"  msgstr "Impossibile chiudere ora"   -#: tortoisehg/hgtk/recovery.py:111 tortoisehg/hgtk/synch.py:400 +#: tortoisehg/hgtk/recovery.py:111 tortoisehg/hgtk/synch.py:401  msgid "command is running"  msgstr "Comando in corso"   @@ -9536,7 +9601,7 @@
 msgid "Confirm rollback repository"  msgstr "Conferma rollback repository"   -#: tortoisehg/hgtk/recovery.py:249 tortoisehg/hgtk/synch.py:648 +#: tortoisehg/hgtk/recovery.py:249 tortoisehg/hgtk/synch.py:649  msgid "[command interrupted]"  msgstr "[comando interrotto]"   @@ -9684,47 +9749,47 @@
 msgid "hg serve [OPTION]..."  msgstr "hg serve [OPZIONI]..."   -#: tortoisehg/hgtk/shellconf.py:28 +#: tortoisehg/hgtk/shellconf.py:27  msgid "OK"  msgstr "OK"   -#: tortoisehg/hgtk/shellconf.py:30 +#: tortoisehg/hgtk/shellconf.py:29  msgid "Apply"  msgstr "Applica"   -#: tortoisehg/hgtk/shellconf.py:43 +#: tortoisehg/hgtk/shellconf.py:42  msgid "Context Menu"  msgstr "Menu contestuale"   -#: tortoisehg/hgtk/shellconf.py:48 +#: tortoisehg/hgtk/shellconf.py:47  msgid "Menu Items"  msgstr "Voci del menu"   -#: tortoisehg/hgtk/shellconf.py:105 +#: tortoisehg/hgtk/shellconf.py:104  msgid "<- Top"  msgstr "<- Primo"   -#: tortoisehg/hgtk/shellconf.py:108 +#: tortoisehg/hgtk/shellconf.py:107  msgid "Sub ->"  msgstr "Secondo ->"   -#: tortoisehg/hgtk/shellconf.py:137 +#: tortoisehg/hgtk/shellconf.py:136  msgid "Enable overlays"  msgstr "Abilita icone di overlay"   -#: tortoisehg/hgtk/shellconf.py:214 +#: tortoisehg/hgtk/shellconf.py:213  msgid "Show overlay icons in Mercurial repositories"  msgstr "Mostra le icone di overlay nei repository Mercurial"   -#: tortoisehg/hgtk/shellconf.py:217 +#: tortoisehg/hgtk/shellconf.py:216  msgid "Show overlays on local disks only"  msgstr "Mostra le icone di overlay solo sui dischi locali"   -#: tortoisehg/hgtk/shellconf.py:221 +#: tortoisehg/hgtk/shellconf.py:220  msgid "Show the taskbar icon (restart needed)"  msgstr "Mostra l'icona nella taskbar (è necessario il riavvio)"   -#: tortoisehg/hgtk/shellconf.py:224 +#: tortoisehg/hgtk/shellconf.py:223  msgid "Highlight the taskbar icon during activity"  msgstr "Evidenzia l'icona nella taskbar durante l'attività"   @@ -9980,6 +10045,22 @@
 msgid "Revert files?"  msgstr ""   +#: tortoisehg/hgtk/statusact.py:147 +msgid "&Yes (backup changes)" +msgstr "&Si (backup modifiche)" + +#: tortoisehg/hgtk/statusact.py:148 +msgid "Yes (&discard changes)" +msgstr "Si (&abbandona modifiche)" + +#: tortoisehg/hgtk/statusact.py:178 +msgid "Confirm Delete Unrevisioned" +msgstr "Conferma cancellazione file" + +#: tortoisehg/hgtk/statusact.py:179 +msgid "Delete the following unrevisioned files?" +msgstr "Eliminare i seguenti file non revisionati?" +  #: tortoisehg/hgtk/statusact.py:192  msgid "Delete Errors"  msgstr "Errori di cancellazione" @@ -10018,7 +10099,7 @@
 msgstr "Esegue il pull delle modifiche dal repository selezionato"    #: tortoisehg/hgtk/synch.py:70 -msgid "Display local changes that will be pushed to selected repository" +msgid "Display local changes that will be pushed to selected repository"  msgstr ""  "Mostra le modifiche locali che verranno inviate al repository selezionato"   @@ -10050,7 +10131,7 @@
 msgid "Advanced Options"  msgstr "Opzioni avanzate"   -#: tortoisehg/hgtk/synch.py:175 +#: tortoisehg/hgtk/synch.py:176  msgid "Run even when remote repository is unrelated."  msgstr "Esegui anche se il repository remoto non ha alcuna relazione"   @@ -10062,53 +10143,53 @@
 msgid "Target revision:"  msgstr "Revisione:"   -#: tortoisehg/hgtk/synch.py:195 +#: tortoisehg/hgtk/synch.py:196  msgid "A specific revision up to which you would like to push or pull."  msgstr ""  "Una specifica revisione fino alla quale verrà eseguito il push o il pull."   -#: tortoisehg/hgtk/synch.py:205 +#: tortoisehg/hgtk/synch.py:207  msgid "Name of hg executable on remote machine."  msgstr "Nome dell'eseguibile hg nella macchina remota."   -#: tortoisehg/hgtk/synch.py:215 +#: tortoisehg/hgtk/synch.py:216  msgid "Incoming/Outgoing"  msgstr "In entrata/In uscita"   -#: tortoisehg/hgtk/synch.py:218 +#: tortoisehg/hgtk/synch.py:219  msgid "Show patches"  msgstr "Mostra le patch"   -#: tortoisehg/hgtk/synch.py:219 +#: tortoisehg/hgtk/synch.py:220  msgid "Show newest first"  msgstr "Mostra prima le più recenti"   -#: tortoisehg/hgtk/synch.py:220 +#: tortoisehg/hgtk/synch.py:221  msgid "Show no merges"  msgstr "Nasconde i merge"   -#: tortoisehg/hgtk/synch.py:266 +#: tortoisehg/hgtk/synch.py:267  msgid "Update to branch tip"  msgstr "Aggiorna al tip del ramo"   -#: tortoisehg/hgtk/synch.py:372 +#: tortoisehg/hgtk/synch.py:373  #, python-format  msgid "unknown sort key '%s'"  msgstr "chiave di ordinamento sconosciuta '%s'"   -#: tortoisehg/hgtk/synch.py:389 +#: tortoisehg/hgtk/synch.py:390  msgid "Select Bundle"  msgstr "Seleziona bundle"   -#: tortoisehg/hgtk/synch.py:391 +#: tortoisehg/hgtk/synch.py:392  msgid "Bundle (*.hg)"  msgstr "Bundle (*.hg)"   -#: tortoisehg/hgtk/synch.py:392 +#: tortoisehg/hgtk/synch.py:393  msgid "Bundle (*)"  msgstr "Bundle (*)"   -#: tortoisehg/hgtk/synch.py:689 +#: tortoisehg/hgtk/synch.py:690  msgid "Toggle _Wordwrap"  msgstr "Inverti _Wordwrap"   @@ -10164,11 +10245,33 @@
 msgid "a tag named \"%s\" already exists"  msgstr "l'etichetta \"%s\" esiste già"   +#: tortoisehg/hgtk/tagadd.py:289 +#, python-format +msgid "Tag '%s' already exist" +msgstr "L'etichetta \"%s\" esiste già" +  #: tortoisehg/hgtk/tagadd.py:300  #, python-format  msgid "tag '%s' does not exist"  msgstr "il tag '%s' non esiste"   +#: tortoisehg/hgtk/thgconfig.py:46 +msgid "" +"Graphical merge program for resolving merge conflicts. If left unspecified, " +"Mercurial will use the first applicable tool it finds on your system or use " +"its internal merge tool that leaves conflict markers in place. Chose " +"internal:merge to force conflict markers, internal:prompt to always select " +"local or other, or internal:dump to leave files in the working directory for " +"manual merging" +msgstr "" +"Programma grafico di fusione per risolvere i conflitti dopo un merge. Se non " +"specificato, Mercurial userà il primo applicativo che troverà nel sistema o " +"userà lo strumento interno di fusione il quale lascierà i marcatori di " +"conflitto nel file. Scegliere internal:merge per forzare i marcatori di " +"conflitto, internal:prompt per scegliere la copia locale o l'altra, oppure " +"internal:dump per lasciare i file nella directory di lavoro ed eseguire il " +"merge manualmente." +  #: tortoisehg/hgtk/thgconfig.py:58  msgid "Specify the visual editor used to view files, etc"  msgstr "Specifica l'editor da usare per vedere i file, ecc." @@ -10195,6 +10298,13 @@
 "Specifica il numero di spazi in cui il tab viene espanso nelle varie "  "finestre di TortoiseHg. Default: Nessuna espansione"   +#: tortoisehg/hgtk/thgconfig.py:68 +msgid "" +"The maximum size file (in KB) that TortoiseHg will show changes for in the " +"changelog, status, and commit windows. A value of zero implies no limit. " +"Default: 1024 (1MB)" +msgstr "" +  #: tortoisehg/hgtk/thgconfig.py:71  msgid "Bottom Diffs"  msgstr "Differenze in basso" @@ -10215,10 +10325,14 @@
 #: tortoisehg/hgtk/thgconfig.py:79  msgid ""  "When running hgtk from the command line, fork a background process to run " -"graphical dialogs. Default: True" -msgstr "" -"Quando hgtk viene eseguito da riga di comando, viene generato un nuovo " -"processo in background per le finestre di dialogo. Default: Vero" +"graphical dialogs. Default: True" +msgstr "" + +#: tortoisehg/hgtk/thgconfig.py:82 +msgid "" +"Show a full directory path of the repository in the dialog title instead of " +"just the root directory name. Default: False" +msgstr ""    #: tortoisehg/hgtk/thgconfig.py:86  msgid "" @@ -10251,25 +10365,23 @@
 msgid ""  "Word wrap length of the commit message. If set, the popup menu can be used "  "to format the message and a warning will be issued if any lines are too long " -"at commit. Default: 0 (unenforced)" -msgstr "" -"Lunghezza word wrap del messaggio di commit. Se impostata, il menu " -"contestuale può essere usato per formattare il messaggio e sarà dato un " -"messaggio di avvertenza se qualsiasi linea è troppo lunga durante il commit. " -"Default: 0" +"at commit. Default: 0 (unenforced)" +msgstr "" + +#: tortoisehg/hgtk/thgconfig.py:104 +msgid "Close the commit tool after every successful commit. Default: False" +msgstr ""    #: tortoisehg/hgtk/thgconfig.py:107  msgid "" -"Attempt to push to default push target after every successful commit. " +"Attempt to push to default push target after every successful commit. "  "Default: False"  msgstr "" -"Tenta di eseguire il push sul repository remoto di default dopo ogni commit " -"eseguito con successo. Default: Falso"    #: tortoisehg/hgtk/thgconfig.py:114  msgid ""  "Comma separated list of files that are automatically unchecked when the " -"status, commit, and shelve dialogs are opened. Default: None (leave blank)" +"status, commit, and shelve dialogs are opened. Default: None (leave blank)"  msgstr ""    #: tortoisehg/hgtk/thgconfig.py:122 @@ -10279,7 +10391,23 @@
 #: tortoisehg/hgtk/thgconfig.py:123  msgid ""  "The tab on which the status and commit tools will open. 0 - TextDiff, 1 - " -"Hunk Selection, 2 - Commit Preview. Default: 0" +"Hunk Selection, 2 - Commit Preview. Default: 0" +msgstr "" + +#: tortoisehg/hgtk/thgconfig.py:148 +msgid "" +"Space separated list of branch names and colors of the form branch:#XXXXXX. " +"Spaces and colons in the branch name must beescaped using a backslash (\\). " +"Likewise some other characters can be escaped in this way, e.g. \\u0040 will " +"be decoded to the @ character, and \\n to a linefeed. Default: None (leave " +"blank)" +msgstr "" + +#: tortoisehg/hgtk/thgconfig.py:155 +msgid "" +"Space separated list of tags that will not be shown. Useful example: Specify " +"\"qbase qparent qtip\" to hide the standard tags inserted by the Mercurial " +"Queues Extension. Default: None (leave blank)"  msgstr ""    #: tortoisehg/hgtk/thgconfig.py:159 @@ -10297,11 +10425,15 @@
 #: tortoisehg/hgtk/thgconfig.py:163  msgid ""  "Adjust the display of the main toolbar in the Repository Explorer. Values: " -"small, large, or theme. Default: theme" -msgstr "" -"Imposta la visualizzazione della barra strumenti principale nella finestra " -"di esplorazione repository. Possibili valori: small, large, o theme. " -"Default: theme" +"small, large, or theme. Default: theme" +msgstr "" + +#: tortoisehg/hgtk/thgconfig.py:174 +msgid "" +"Operation which is performed directly after a successful pull. update " +"equates to pull --update, fetch equates to the fetch extension, rebase " +"equates to pull --rebase. Default: none" +msgstr ""    #: tortoisehg/hgtk/thgconfig.py:181  msgid "" @@ -10374,31 +10506,6 @@
 msgid "Font used in command output window. Default: monospace 10"  msgstr "Font usato nella finestra di output comandi. Default: monospace 10"   -#: tortoisehg/hgtk/thgconfig.py:321 -msgid "Issue Tracking" -msgstr "" - -#: tortoisehg/hgtk/thgconfig.py:323 -msgid "Issue Regex" -msgstr "" - -#: tortoisehg/hgtk/thgconfig.py:324 -msgid "Defines the regex to match when picking up issue numbers." -msgstr "" - -#: tortoisehg/hgtk/thgconfig.py:325 -msgid "Issue Link" -msgstr "" - -#: tortoisehg/hgtk/thgconfig.py:326 -msgid "" -"Defines the command to run when an issue number is recognized. You may " -"include groups in issue.regex, and corresponding {n} tokens in issue.link " -"(where n is a non-negative integer). {0} refers to the entire string matched " -"by issue.regex, while {1} refers to the first group and so on. If no {n} " -"tokensare found in issue.link, the entire matched string is appended instead." -msgstr "" -  #: tortoisehg/hgtk/thgconfig.py:333  msgid "Mandatory Issue Reference"  msgstr "" @@ -10426,10 +10533,6 @@
 msgid "https"  msgstr "https"   -#: tortoisehg/hgtk/thgconfig.py:351 -msgid "local" -msgstr "local" -  #: tortoisehg/hgtk/thgconfig.py:360  msgid "Edit remote repository path"  msgstr "Edita percorso repository remoto" @@ -10877,8 +10980,8 @@
 msgstr "<b>Alcune modifiche sono già state messe da parte</b>"    #: tortoisehg/hgtk/thgshelve.py:161 -msgid "Overwrite" -msgstr "Sovrascrivi" +msgid "Replace" +msgstr ""    #: tortoisehg/hgtk/thgshelve.py:162  msgid "Append" @@ -10997,6 +11100,10 @@
 msgid "Try &Again"  msgstr "&Riprova"   +#: tortoisehg/hgtk/visdiff.py:532 +msgid "&Quit" +msgstr "&Esci" +  #: tortoisehg/hgtk/logview/treeview.py:275  #, python-format  msgid "%(count)d of %(total)d Revisions" @@ -11395,80 +11502,78 @@
 msgid "patching file %s\n"  msgstr "applicazione patch sul file %s\n"   -#: tortoisehg/util/prej.py:190 -#, python-format -msgid "%d out of %d hunk%s FAILED -- saving rejects to file %s\n" -msgstr "" -"Applicazione di %d su %d blocchi %s FALLITA -- salvataggio blocchi rifiutati " -"nel file %s\n" - -#: tortoisehg/util/prej.py:226 +#: tortoisehg/util/prej.py:186 +#, python-format +msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" +msgstr "" + +#: tortoisehg/util/prej.py:222  #, python-format  msgid "bad hunk #%d %s (%d %d %d %d)"  msgstr "blocco errato #%d %s (%d %d %d %d)"   -#: tortoisehg/util/prej.py:235 +#: tortoisehg/util/prej.py:231  #, python-format  msgid "file %s already exists\n"  msgstr "file %s già esistente\n"   -#: tortoisehg/util/prej.py:287 +#: tortoisehg/util/prej.py:283  #, python-format  msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"  msgstr ""  "Blocco #%d applicato con successo a %d con fattore di incertezza %d (offset "  "%d linee).\n"   -#: tortoisehg/util/prej.py:294 +#: tortoisehg/util/prej.py:290  #, python-format  msgid "Hunk #%d succeeded at %d (offset %d lines).\n"  msgstr "Blocco #%d applicato con successo a %d (offset %d linee).\n"   -#: tortoisehg/util/prej.py:299 +#: tortoisehg/util/prej.py:295  #, python-format  msgid "Hunk #%d FAILED at %d\n"  msgstr "Blocco #%d FALLITO a %d\n"   -#: tortoisehg/util/prej.py:318 tortoisehg/util/prej.py:344 -#: tortoisehg/util/prej.py:376 +#: tortoisehg/util/prej.py:314 tortoisehg/util/prej.py:340 +#: tortoisehg/util/prej.py:372  #, python-format  msgid "bad hunk #%d"  msgstr "blocco errato #%d"   -#: tortoisehg/util/prej.py:363 tortoisehg/util/prej.py:405 +#: tortoisehg/util/prej.py:359 tortoisehg/util/prej.py:401  #, python-format  msgid "bad hunk #%d old text line %d"  msgstr "blocco #%d errato linea vecchio testo %d"   -#: tortoisehg/util/prej.py:550 +#: tortoisehg/util/prej.py:546  msgid "could not extract binary patch"  msgstr "impossibile estrarre la patch binaria"   -#: tortoisehg/util/prej.py:566 +#: tortoisehg/util/prej.py:562  #, python-format  msgid "binary patch is %d bytes, not %d"  msgstr "la pathc binaria è lunga %d byte, non %d"   -#: tortoisehg/util/prej.py:591 +#: tortoisehg/util/prej.py:587  #, python-format  msgid "unable to strip away %d dirs from %s"  msgstr "impossibile eliminare %d directory da %s"   -#: tortoisehg/util/prej.py:613 +#: tortoisehg/util/prej.py:609  #, python-format  msgid "unable to find %s or %s for patching"  msgstr "impossibile trovare %s o %s per applicare la patch"   -#: tortoisehg/util/prej.py:792 +#: tortoisehg/util/prej.py:788  #, python-format  msgid "malformed patch %s %s"  msgstr "patch non conforme %s %s"   -#: tortoisehg/util/prej.py:803 +#: tortoisehg/util/prej.py:799  msgid "No valid hunks found"  msgstr "Nessun blocco valido trovato"   -#: tortoisehg/util/prej.py:850 +#: tortoisehg/util/prej.py:846  #, python-format  msgid "hunk %d already applied at line %d (fuzz %d)\n"  msgstr "" @@ -11487,6 +11592,9 @@
 #~ msgid "Web"  #~ msgstr "Web"   +#~ msgid "Overwrite" +#~ msgstr "Sovrascrivi" +  #~ msgid "Add Files"  #~ msgstr "Aggiungi file"   @@ -11604,6 +11712,12 @@
 #~ msgid "[command completed successfully]\n"  #~ msgstr "[comando eseguito con successo]\n"   +#~ msgid "" +#~ "Commit message text for new changeset that reverses the effect of the " +#~ "change being backed out." +#~ msgstr "" +#~ "Messaggio di commit per il nuovo changeset creato dall'operazione di backout." +  #~ msgid "Source and dest are the same"  #~ msgstr "Sorgente e destinazione coincidono"   @@ -11951,6 +12065,16 @@
 #~ msgid "Skip Diff Window"  #~ msgstr "Salta la finestra delle differenze"   +#~ msgid "" +#~ "Word wrap length of the commit message. If set, the popup menu can be used " +#~ "to format the message and a warning will be issued if any lines are too long " +#~ "at commit. Default: 0 (unenforced)" +#~ msgstr "" +#~ "Lunghezza word wrap del messaggio di commit. Se impostata, il menu " +#~ "contestuale può essere usato per formattare il messaggio e sarà dato un " +#~ "messaggio di avvertenza se qualsiasi linea è troppo lunga durante il commit. " +#~ "Default: 0" +  #~ msgid "_difference"  #~ msgstr "_confronta"   @@ -12124,6 +12248,10 @@
 #~ msgid "Revert the following files?"  #~ msgstr "Ripristinare i seguenti file?"   +#~ msgid "Display local changes that will be pushed to selected repository" +#~ msgstr "" +#~ "Mostra le modifiche locali che verranno inviate al repository selezionato" +  #~ msgid "&local"  #~ msgstr "&locale"   @@ -12220,6 +12348,13 @@
 #~ msgid "Copyright 2009 TK Soh and others"  #~ msgstr "Copyright 2009 TK Soh ed altri"   +#~ msgid "" +#~ "When running hgtk from the command line, fork a background process to run " +#~ "graphical dialogs. Default: True" +#~ msgstr "" +#~ "Quando hgtk viene eseguito da riga di comando, viene generato un nuovo " +#~ "processo in background per le finestre di dialogo. Default: Vero" +  #~ msgid "Capture Stderr"  #~ msgstr "Cattura Stderr"   @@ -12275,6 +12410,13 @@
 #~ msgstr "Percorso completo nei titoli"    #~ msgid "" +#~ "Attempt to push to default push target after every successful commit. " +#~ "Default: False" +#~ msgstr "" +#~ "Tenta di eseguire il push sul repository remoto di default dopo ogni commit " +#~ "eseguito con successo. Default: Falso" + +#~ msgid ""  #~ "Comma separated list of files that are automatically included in every "  #~ "commit. Intended for use only as a repository setting. Default: None"  #~ msgstr "" @@ -12521,9 +12663,23 @@
 #~ msgid "Finish committing"  #~ msgstr "Commit completato"   +#, python-format +#~ msgid "%d out of %d hunk%s FAILED -- saving rejects to file %s\n" +#~ msgstr "" +#~ "Applicazione di %d su %d blocchi %s FALLITA -- salvataggio blocchi rifiutati " +#~ "nel file %s\n" +  #~ msgid "Starting P4 Changelist:"  #~ msgstr "Inizia lista modifiche P4:"   +#~ msgid "" +#~ "Adjust the display of the main toolbar in the Repository Explorer. Values: " +#~ "small, large, or theme. Default: theme" +#~ msgstr "" +#~ "Imposta la visualizzazione della barra strumenti principale nella finestra " +#~ "di esplorazione repository. Possibili valori: small, large, o theme. " +#~ "Default: theme" +  #~ msgid "Explorer extension settings"  #~ msgstr "Impostazioni estensione Explorer"   @@ -12535,3 +12691,12 @@
   #~ msgid "Finish committing and pushing"  #~ msgstr "Completamento commit e push" + +#~ msgid "" +#~ "Generate English commit messages even if LANGUAGE or LANG environment " +#~ "variables are set to a non-English language. This setting is used by the " +#~ "Merge, Tag and Backout dialogs. Default: False" +#~ msgstr "" +#~ "Genera i messaggi di commit in inglese anche se la variabile d'ambiente " +#~ "LANGUAGE (o LANG) è impostata su una lingua diversa. Questa impostazione è " +#~ "usata dalle finestre di dialog di Merge, Tag e Backout. Default: Falso"
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
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