Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge with stable

Changeset 441c8397f498

Parents d8330c535c22

Parents b5c317e3927b

by Steve Borho

Changes to 15 files · Browse files at 441c8397f498 Showing diff from parent d8330c535c22 b5c317e3927b Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
325
326
327
328
 
 
 
 
 
 
 
329
330
331
 
325
326
327
 
328
329
330
331
332
333
334
335
336
337
@@ -325,7 +325,13 @@
  self.set_default_size(defx, defy)   if self._setting_wasmax:   self.maximize() - self.move(self._setting_winpos[0], self._setting_winpos[1]) + + # Restore position if it is still on screen + screen = self.get_screen() + w, h = screen.get_width(), screen.get_height() + x, y = self._setting_winpos + if x >= 0 and x < w and y >= 0 and y < h: + self.move(x, y)     vbox = gtk.VBox(False, 0)   self.add(vbox)
Change 1 of 4 Show Entire File hggtk/​synch.py Stacked
 
33
34
35
 
36
37
38
 
294
295
296
297
 
 
 
 
 
 
298
299
300
 
521
522
523
524
 
525
526
527
 
528
529
530
 
599
600
601
602
 
603
604
605
 
33
34
35
36
37
38
39
 
295
296
297
 
298
299
300
301
302
303
304
305
306
 
527
528
529
 
530
531
532
533
534
535
536
537
 
606
607
608
 
609
610
611
612
@@ -33,6 +33,7 @@
  self.fromlog = fromlog   self.notify_func = None   self.last_drop_time = None + self.lastcmd = []     self.saved_stdout = sys.stdout   self.saved_stderr = sys.stderr @@ -294,7 +295,12 @@
  except hglib.RepoError:   return   tip = len(repo) - if self.origchangecount == tip or self.fromlog: + if ' '.join(self.lastcmd[:2]) == 'pull --rebase': + # if last operation was a rebase, do not show 'viewpulled' + # and reset our remembered tip changeset + self.origchangecount = tip + self.viewpulled.hide() + elif self.origchangecount == tip or self.fromlog:   self.viewpulled.hide()   else:   self.buttonhbox.show() @@ -521,10 +527,11 @@
  remote_path = path     cmdline = cmd[:] - cmdline += ['--verbose', '--repository', self.root] + cmdline += ['--verbose']   if proxy_host and not use_proxy:   cmdline += ["--config", "http_proxy.host="]   cmdline += [remote_path] + self.lastcmd = cmdline     # show command to be executed   self.write("", False) @@ -599,7 +606,7 @@
  self.stop_button.set_sensitive(False)   if self.hgthread.return_code() is None:   self.write_err(_('[command interrupted]')) - if self.notify_func: + if self.notify_func and self.lastcmd[0] == 'pull':   self.notify_func(self.notify_args)   return False # Stop polling this function  
 
7
8
9
10
 
11
12
13
14
15
16
17
 
18
19
20
 
21
22
23
 
33
34
35
36
 
37
38
39
40
 
41
42
43
44
 
45
46
47
 
65
66
67
68
 
69
70
71
 
205
206
207
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
208
209
210
 
227
228
229
230
 
231
232
233
234
 
235
236
237
238
 
239
240
241
242
 
243
244
245
246
 
247
248
249
250
 
251
252
253
254
 
255
256
257
258
 
259
260
261
262
 
263
264
265
266
 
267
268
269
270
 
271
272
273
274
 
275
276
277
278
 
279
280
281
282
 
283
284
285
286
 
287
288
289
290
 
291
292
293
294
 
295
296
297
298
 
299
300
301
302
 
303
304
305
 
335
336
337
338
 
339
340
341
 
383
384
385
386
 
387
388
389
390
 
391
392
393
394
 
395
396
397
398
 
399
400
401
402
 
403
404
405
406
 
407
408
409
410
 
411
412
413
414
415
 
 
416
417
418
419
 
420
421
422
423
 
424
425
426
427
 
428
429
430
431
 
432
433
434
435
436
 
 
437
438
439
440
 
441
442
443
444
 
445
446
447
448
 
449
450
451
452
 
453
454
455
456
 
457
458
459
460
 
461
462
463
464
 
465
466
467
468
 
469
470
471
472
 
473
474
475
476
 
477
478
479
480
481
 
 
482
483
484
485
 
486
487
488
489
 
490
491
492
493
 
494
495
496
497
498
 
 
499
500
501
502
 
503
504
505
506
 
507
508
509
510
 
511
512
513
514
 
515
516
517
518
 
519
520
521
522
 
523
524
525
526
527
528
529
 
530
531
532
533
 
534
535
536
537
 
538
539
540
541
 
542
543
544
545
 
546
547
548
549
 
550
551
552
553
 
554
555
556
557
 
558
559
560
561
562
563
564
 
565
566
567
568
569
570
571
 
572
573
574
575
576
577
578
 
579
580
581
582
 
583
584
585
586
587
588
589
 
590
591
592
593
 
594
595
596
597
598
599
 
600
601
602
603
 
604
605
606
607
 
608
609
610
611
 
612
613
614
615
 
616
617
618
619
 
620
621
622
623
624
 
625
626
627
628
 
629
630
631
632
 
633
634
635
636
 
637
638
639
 
642
643
644
645
 
646
647
648
 
658
659
660
661
 
662
663
664
 
670
671
672
673
674
 
 
675
676
677
678
 
679
680
681
 
687
688
689
690
 
691
692
693
694
 
695
696
697
698
 
699
700
701
702
 
703
704
705
706
 
707
708
709
710
 
711
712
713
714
 
715
716
717
718
719
720
 
721
722
723
724
725
726
 
727
728
729
730
 
731
732
733
734
 
735
736
737
738
 
739
740
741
742
 
743
744
745
746
 
747
748
749
750
 
751
752
753
754
 
755
756
757
758
 
759
760
761
762
 
763
764
765
766
 
767
768
769
770
 
771
772
773
774
 
775
776
777
778
 
779
780
781
782
 
783
784
785
786
 
787
788
789
790
 
791
792
793
 
819
820
821
822
 
823
824
825
826
 
827
828
829
 
843
844
845
846
 
847
848
849
 
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
 
1191
1192
1193
1194
 
1195
1196
1197
1198
 
1199
1200
1201
1202
 
1203
1204
1205
1206
 
1207
1208
1209
1210
 
1211
1212
1213
1214
 
1215
1216
1217
1218
 
1219
1220
1221
1222
 
1223
1224
1225
1226
 
1227
1228
1229
1230
 
1231
1232
1233
1234
 
1235
1236
1237
1238
 
1239
1240
1241
1242
 
1243
1244
1245
1246
 
1247
1248
1249
 
1373
1374
1375
 
 
 
 
1376
1377
1378
1379
 
1380
1381
1382
1383
 
1384
1385
1386
1387
 
1388
1389
1390
1391
 
1392
1393
1394
1395
 
1396
1397
1398
1399
 
1400
1401
1402
1403
 
1404
1405
1406
1407
 
1408
1409
1410
1411
 
1412
1413
1414
1415
 
1416
1417
1418
1419
 
1420
1421
1422
1423
 
1424
1425
1426
1427
 
1428
1429
1430
1431
 
1432
1433
1434
1435
 
1436
1437
1438
1439
 
1440
1441
1442
1443
 
1444
1445
1446
1447
 
1448
1449
1450
1451
 
1452
1453
1454
1455
 
1456
1457
1458
1459
 
1460
1461
1462
1463
 
1464
1465
1466
1467
 
1468
1469
1470
1471
 
1472
1473
1474
1475
 
1476
1477
1478
1479
 
1480
1481
1482
1483
 
1484
1485
1486
1487
 
1488
1489
1490
1491
 
1492
1493
1494
1495
 
1496
1497
1498
1499
 
1500
1501
1502
1503
 
1504
1505
1506
1507
 
1508
1509
1510
1511
 
1512
1513
1514
1515
 
1516
1517
1518
1519
 
1520
1521
1522
1523
 
1524
1525
1526
1527
 
1528
1529
1530
1531
 
1532
1533
1534
 
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
 
1715
1716
1717
1718
 
1719
1720
1721
1722
 
 
1723
1724
1725
1726
 
1727
1728
1729
1730
1731
1732
1733
 
1734
1735
1736
 
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
 
1888
1889
1890
1891
 
1892
1893
1894
 
1924
1925
1926
1927
 
1928
1929
1930
1931
 
1932
1933
1934
 
1952
1953
1954
1955
 
1956
1957
1958
1959
 
1960
1961
1962
1963
 
1964
1965
1966
 
1988
1989
1990
1991
 
1992
1993
1994
 
2229
2230
2231
2232
 
2233
2234
2235
2236
 
2237
2238
2239
2240
 
2241
2242
2243
2244
 
2245
2246
2247
2248
 
2249
2250
2251
2252
 
2253
2254
2255
2256
 
2257
2258
2259
2260
 
2261
2262
2263
2264
2265
2266
 
2267
2268
2269
2270
 
2271
2272
2273
2274
 
2275
2276
2277
2278
 
2279
2280
2281
2282
 
2283
2284
2285
2286
 
2287
2288
2289
2290
 
2291
2292
2293
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
 
2319
2320
2321
2322
 
2323
2324
2325
2326
 
2327
2328
2329
2330
 
2331
2332
2333
2334
2335
2336
2337
2338
 
 
 
 
 
2339
2340
2341
2342
 
2343
2344
2345
2346
2347
2348
2349
 
2350
2351
2352
2353
 
2354
2355
2356
2357
 
2358
2359
2360
2361
 
2362
2363
2364
2365
 
2366
2367
2368
2369
 
2370
2371
2372
2373
 
2374
2375
2376
2377
 
2378
2379
2380
2381
 
2382
2383
2384
2385
 
2386
2387
2388
2389
 
2390
2391
2392
2393
 
2394
2395
2396
2397
 
2398
2399
2400
2401
 
2402
2403
2404
2405
 
2406
2407
2408
2409
 
2410
2411
2412
2413
 
2414
2415
2416
2417
 
2418
2419
2420
2421
 
2422
2423
2424
2425
 
2426
2427
2428
2429
 
2430
2431
2432
2433
 
2434
2435
2436
2437
 
2438
2439
2440
2441
 
2442
2443
2444
2445
 
2446
2447
2448
2449
 
2450
2451
2452
2453
 
2454
2455
2456
2457
 
2458
2459
2460
2461
 
2462
2463
2464
2465
 
2466
2467
2468
2469
 
2470
2471
2472
2473
 
2474
2475
2476
2477
 
2478
2479
2480
2481
 
2482
2483
2484
2485
 
2486
2487
2488
2489
 
2490
2491
2492
2493
 
2494
2495
2496
 
 
 
 
 
 
 
 
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
 
2510
2511
2512
2513
 
2514
2515
2516
 
2664
2665
2666
2667
2668
2669
2670
 
 
 
 
 
 
2671
2672
2673
2674
 
2675
2676
2677
2678
 
2679
2680
2681
2682
 
2683
2684
2685
2686
2687
2688
2689
 
2690
2691
2692
2693
 
2694
2695
2696
2697
 
2698
2699
2700
2701
 
2702
2703
2704
2705
2706
2707
 
2708
2709
2710
2711
 
2712
2713
2714
2715
2716
2717
 
2718
2719
2720
2721
 
2722
2723
2724
2725
2726
2727
2728
 
2729
2730
2731
2732
 
2733
2734
2735
2736
2737
2738
 
2739
2740
2741
2742
 
2743
2744
2745
2746
 
2747
2748
2749
2750
 
2751
2752
2753
2754
2755
2756
 
2757
2758
2759
2760
 
2761
2762
2763
2764
2765
2766
2767
 
2768
2769
2770
2771
 
2772
2773
2774
2775
2776
2777
2778
 
2779
2780
2781
2782
 
2783
2784
2785
2786
2787
2788
2789
 
2790
2791
2792
2793
 
2794
2795
2796
2797
2798
2799
 
2800
2801
2802
2803
 
2804
2805
2806
2807
2808
2809
 
2810
2811
2812
2813
 
2814
2815
2816
2817
2818
2819
 
2820
2821
2822
2823
 
2824
2825
2826
2827
2828
2829
2830
 
2831
2832
2833
2834
 
2835
2836
2837
2838
2839
2840
 
2841
2842
2843
2844
 
2845
2846
2847
2848
 
2849
2850
2851
2852
 
2853
2854
2855
2856
 
2857
2858
2859
2860
 
2861
2862
2863
2864
 
2865
2866
2867
2868
 
2869
2870
2871
2872
 
2873
2874
2875
2876
 
2877
2878
2879
2880
 
2881
2882
2883
2884
 
2885
2886
2887
2888
2889
2890
 
2891
2892
2893
2894
 
2895
2896
2897
2898
2899
2900
 
2901
2902
2903
2904
 
2905
2906
2907
2908
 
2909
2910
2911
2912
 
2913
2914
2915
2916
 
2917
2918
2919
2920
 
2921
2922
2923
 
2927
2928
2929
2930
 
2931
2932
2933
2934
 
2935
2936
2937
 
2940
2941
2942
2943
 
2944
2945
2946
2947
 
2948
2949
2950
2951
 
2952
2953
2954
2955
 
2956
2957
2958
2959
2960
 
2961
2962
2963
2964
 
2965
2966
2967
2968
2969
 
2970
2971
2972
2973
 
2974
2975
2976
2977
 
2978
2979
2980
2981
 
2982
2983
2984
2985
 
2986
2987
2988
2989
 
2990
2991
2992
2993
 
2994
2995
2996
2997
 
2998
2999
3000
3001
 
3002
3003
3004
3005
 
3006
3007
3008
3009
 
3010
3011
3012
3013
 
3014
3015
3016
3017
 
3018
3019
3020
 
3024
3025
3026
3027
 
3028
3029
3030
3031
 
3032
3033
3034
3035
 
3036
3037
3038
3039
 
3040
3041
3042
3043
 
3044
3045
3046
3047
 
3048
3049
3050
3051
 
3052
3053
3054
3055
 
3056
3057
3058
3059
 
3060
3061
3062
3063
 
3064
3065
3066
3067
 
3068
3069
3070
3071
 
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
3141
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
 
3366
3367
3368
3369
 
3370
3371
3372
3373
 
3374
3375
3376
 
7
8
9
 
10
11
12
13
14
15
16
 
17
18
19
 
20
21
22
23
 
33
34
35
 
36
37
38
39
 
40
41
42
43
 
44
45
46
47
 
65
66
67
 
68
69
70
71
 
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
 
251
252
253
 
254
255
256
257
 
258
259
260
261
 
262
263
264
265
 
266
267
268
269
 
270
271
272
273
 
274
275
276
277
 
278
279
280
281
 
282
283
284
285
 
286
287
288
289
 
290
291
292
293
 
294
295
296
297
 
298
299
300
301
 
302
303
304
305
 
306
307
308
309
 
310
311
312
313
 
314
315
316
317
 
318
319
320
321
 
322
323
324
325
 
326
327
328
329
 
359
360
361
 
362
363
364
365
 
407
408
409
 
410
411
412
413
 
414
415
416
417
 
418
419
420
421
 
422
423
424
425
 
426
427
428
429
 
430
431
432
433
 
434
435
436
437
 
 
438
439
440
441
442
 
443
444
445
446
 
447
448
449
450
 
451
452
453
454
 
455
456
457
458
 
 
459
460
461
462
463
 
464
465
466
467
 
468
469
470
471
 
472
473
474
475
 
476
477
478
479
 
480
481
482
483
 
484
485
486
487
 
488
489
490
491
 
492
493
494
495
 
496
497
498
499
 
500
501
502
503
 
 
504
505
506
507
508
 
509
510
511
512
 
513
514
515
516
 
517
518
519
520
 
 
521
522
523
524
525
 
526
527
528
529
 
530
531
532
533
 
534
535
536
537
 
538
539
540
541
 
542
543
544
545
 
546
547
548
549
550
551
552
 
553
554
555
556
 
557
558
559
560
 
561
562
563
564
 
565
566
567
568
 
569
570
571
572
 
573
574
575
576
 
577
578
579
580
 
581
582
583
584
585
586
587
 
588
589
590
591
592
593
594
 
595
596
597
598
599
600
601
 
602
603
604
605
 
606
607
608
609
610
611
612
 
613
614
615
616
 
617
618
619
620
621
622
 
623
624
625
626
 
627
628
629
630
 
631
632
633
634
 
635
636
637
638
 
639
640
641
642
 
643
644
645
646
647
 
648
649
650
651
 
652
653
654
655
 
656
657
658
659
 
660
661
662
663
 
666
667
668
 
669
670
671
672
 
682
683
684
 
685
686
687
688
 
694
695
696
 
 
697
698
699
700
701
 
702
703
704
705
 
711
712
713
 
714
715
716
717
 
718
719
720
721
 
722
723
724
725
 
726
727
728
729
 
730
731
732
733
 
734
735
736
737
 
738
739
740
741
742
743
 
744
745
746
747
748
749
 
750
751
752
753
 
754
755
756
757
 
758
759
760
761
 
762
763
764
765
 
766
767
768
769
 
770
771
772
773
 
774
775
776
777
 
778
779
780
781
 
782
783
784
785
 
786
787
788
789
 
790
791
792
793
 
794
795
796
797
 
798
799
800
801
 
802
803
804
805
 
806
807
808
809
 
810
811
812
813
 
814
815
816
817
 
843
844
845
 
846
847
848
849
 
850
851
852
853
 
867
868
869
 
870
871
872
873
 
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
 
1215
1216
1217
 
1218
1219
1220
1221
 
1222
1223
1224
1225
 
1226
1227
1228
1229
 
1230
1231
1232
1233
 
1234
1235
1236
1237
 
1238
1239
1240
1241
 
1242
1243
1244
1245
 
1246
1247
1248
1249
 
1250
1251
1252
1253
 
1254
1255
1256
1257
 
1258
1259
1260
1261
 
1262
1263
1264
1265
 
1266
1267
1268
1269
 
1270
1271
1272
1273
 
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
 
1407
1408
1409
1410
 
1411
1412
1413
1414
 
1415
1416
1417
1418
 
1419
1420
1421
1422
 
1423
1424
1425
1426
 
1427
1428
1429
1430
 
1431
1432
1433
1434
 
1435
1436
1437
1438
 
1439
1440
1441
1442
 
1443
1444
1445
1446
 
1447
1448
1449
1450
 
1451
1452
1453
1454
 
1455
1456
1457
1458
 
1459
1460
1461
1462
 
1463
1464
1465
1466
 
1467
1468
1469
1470
 
1471
1472
1473
1474
 
1475
1476
1477
1478
 
1479
1480
1481
1482
 
1483
1484
1485
1486
 
1487
1488
1489
1490
 
1491
1492
1493
1494
 
1495
1496
1497
1498
 
1499
1500
1501
1502
 
1503
1504
1505
1506
 
1507
1508
1509
1510
 
1511
1512
1513
1514
 
1515
1516
1517
1518
 
1519
1520
1521
1522
 
1523
1524
1525
1526
 
1527
1528
1529
1530
 
1531
1532
1533
1534
 
1535
1536
1537
1538
 
1539
1540
1541
1542
 
1543
1544
1545
1546
 
1547
1548
1549
1550
 
1551
1552
1553
1554
 
1555
1556
1557
1558
 
1559
1560
1561
1562
 
1645
1646
1647
 
 
 
 
1648
1649
1650
 
1739
1740
1741
 
1742
1743
1744
1745
 
1746
1747
1748
1749
1750
 
1751
1752
1753
1754
1755
1756
1757
 
1758
1759
1760
1761
 
1873
1874
1875
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1876
1877
1878
 
1889
1890
1891
 
1892
1893
1894
1895
 
1925
1926
1927
 
1928
1929
1930
1931
 
1932
1933
1934
1935
 
1953
1954
1955
 
1956
1957
1958
1959
 
1960
1961
1962
1963
 
1964
1965
1966
1967
 
1989
1990
1991
 
1992
1993
1994
1995
 
2230
2231
2232
 
2233
2234
2235
2236
 
2237
2238
2239
2240
 
2241
2242
2243
2244
 
2245
2246
2247
2248
 
2249
2250
2251
2252
 
2253
2254
2255
2256
 
2257
2258
2259
2260
 
2261
2262
2263
2264
2265
2266
 
2267
2268
2269
2270
 
2271
2272
2273
2274
 
2275
2276
2277
2278
 
2279
2280
2281
2282
 
2283
2284
2285
2286
 
2287
2288
2289
2290
 
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2316
2317
2318
 
2319
2320
2321
2322
 
2323
2324
2325
2326
 
2327
2328
2329
2330
 
2331
2332
2333
2334
 
 
 
 
 
2335
2336
2337
2338
2339
2340
2341
2342
 
2343
2344
2345
2346
2347
2348
2349
 
2350
2351
2352
2353
 
2354
2355
2356
2357
 
2358
2359
2360
2361
 
2362
2363
2364
2365
 
2366
2367
2368
2369
 
2370
2371
2372
2373
 
2374
2375
2376
2377
 
2378
2379
2380
2381
 
2382
2383
2384
2385
 
2386
2387
2388
2389
 
2390
2391
2392
2393
 
2394
2395
2396
2397
 
2398
2399
2400
2401
 
2402
2403
2404
2405
 
2406
2407
2408
2409
 
2410
2411
2412
2413
 
2414
2415
2416
2417
 
2418
2419
2420
2421
 
2422
2423
2424
2425
 
2426
2427
2428
2429
 
2430
2431
2432
2433
 
2434
2435
2436
2437
 
2438
2439
2440
2441
 
2442
2443
2444
2445
 
2446
2447
2448
2449
 
2450
2451
2452
2453
 
2454
2455
2456
2457
 
2458
2459
2460
2461
 
2462
2463
2464
2465
 
2466
2467
2468
2469
 
2470
2471
2472
2473
 
2474
2475
2476
2477
 
2478
2479
2480
2481
 
2482
2483
2484
2485
 
2486
2487
2488
2489
 
2490
2491
2492
2493
 
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
 
 
 
 
 
 
 
 
2507
2508
2509
 
2510
2511
2512
2513
 
2514
2515
2516
2517
 
2665
2666
2667
 
 
 
 
2668
2669
2670
2671
2672
2673
2674
2675
2676
 
2677
2678
2679
2680
 
2681
2682
2683
2684
 
2685
2686
2687
2688
2689
2690
2691
 
2692
2693
2694
2695
 
2696
2697
2698
2699
 
2700
2701
2702
2703
 
2704
2705
2706
2707
2708
2709
 
2710
2711
2712
2713
 
2714
2715
2716
2717
2718
2719
 
2720
2721
2722
2723
 
2724
2725
2726
2727
2728
2729
2730
 
2731
2732
2733
2734
 
2735
2736
2737
2738
2739
2740
 
2741
2742
2743
2744
 
2745
2746
2747
2748
 
2749
2750
2751
2752
 
2753
2754
2755
2756
2757
2758
 
2759
2760
2761
2762
 
2763
2764
2765
2766
2767
2768
2769
 
2770
2771
2772
2773
 
2774
2775
2776
2777
2778
2779
2780
 
2781
2782
2783
2784
 
2785
2786
2787
2788
2789
2790
2791
 
2792
2793
2794
2795
 
2796
2797
2798
2799
2800
2801
 
2802
2803
2804
2805
 
2806
2807
2808
2809
2810
2811
 
2812
2813
2814
2815
 
2816
2817
2818
2819
2820
2821
 
2822
2823
2824
2825
 
2826
2827
2828
2829
2830
2831
2832
 
2833
2834
2835
2836
 
2837
2838
2839
2840
2841
2842
 
2843
2844
2845
2846
 
2847
2848
2849
2850
 
2851
2852
2853
2854
 
2855
2856
2857
2858
 
2859
2860
2861
2862
 
2863
2864
2865
2866
 
2867
2868
2869
2870
 
2871
2872
2873
2874
 
2875
2876
2877
2878
 
2879
2880
2881
2882
 
2883
2884
2885
2886
 
2887
2888
2889
2890
2891
2892
 
2893
2894
2895
2896
 
2897
2898
2899
2900
2901
2902
 
2903
2904
2905
2906
 
2907
2908
2909
2910
 
2911
2912
2913
2914
 
2915
2916
2917
2918
 
2919
2920
2921
2922
 
2923
2924
2925
2926
 
2930
2931
2932
 
2933
2934
2935
2936
 
2937
2938
2939
2940
 
2943
2944
2945
 
2946
2947
2948
2949
 
2950
2951
2952
2953
 
2954
2955
2956
2957
 
2958
2959
2960
2961
2962
 
2963
2964
2965
2966
 
2967
2968
2969
2970
2971
 
2972
2973
2974
2975
 
2976
2977
2978
2979
 
2980
2981
2982
2983
 
2984
2985
2986
2987
 
2988
2989
2990
2991
 
2992
2993
2994
2995
 
2996
2997
2998
2999
 
3000
3001
3002
3003
 
3004
3005
3006
3007
 
3008
3009
3010
3011
 
3012
3013
3014
3015
 
3016
3017
3018
3019
 
3020
3021
3022
3023
 
3027
3028
3029
 
3030
3031
3032
3033
 
3034
3035
3036
3037
 
3038
3039
3040
3041
 
3042
3043
3044
3045
 
3046
3047
3048
3049
 
3050
3051
3052
3053
 
3054
3055
3056
3057
 
3058
3059
3060
3061
 
3062
3063
3064
3065
 
3066
3067
3068
3069
 
3070
3071
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
3141
 
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
 
3369
3370
3371
 
3372
3373
3374
3375
 
3376
3377
3378
3379
@@ -7,17 +7,17 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-06-15 05:36+0000\n" +"POT-Creation-Date: 2009-06-23 04:45+0000\n"  "PO-Revision-Date: 2009-02-27 11:13+0000\n"  "Last-Translator: Martin Kolařík <Unknown>\n"  "Language-Team: Czech <cs@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: 2009-06-23 03:52+0000\n" +"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"  "X-Generator: Launchpad (build Unknown)\n"   -#: hggtk\changeset.py:145 +#: hggtk\changeset.py:147  msgid "changeset:"  msgstr "sada změny:"   @@ -33,15 +33,15 @@
 msgid " and "  msgstr " a "   -#: hggtk\hgshelve.py:520 hggtk\hgshelve.py:571 +#: hggtk\hgshelve.py:525 hggtk\hgshelve.py:576  msgid "restoring %r to %r\n"  msgstr "%r se obnovuje do %r\n"   -#: hggtk\hgshelve.py:598 +#: hggtk\hgshelve.py:603  msgid "hg shelve [OPTION]... [FILE]..."  msgstr "hg shelve [OPTION]... [FILE]..."   -#: hggtk\hgshelve.py:605 +#: hggtk\hgshelve.py:610  msgid "hg unshelve [OPTION]... [FILE]..."  msgstr "hg unshelve [OPTION]... [FILE]..."   @@ -65,7 +65,7 @@
 msgid "invalid arguments"  msgstr "neplatné parametry"   -#: hggtk\hgtk.py:601 +#: hggtk\hgtk.py:602  msgid "limit number of changes displayed"  msgstr "omezit počet zobrazených změn"   @@ -205,6 +205,30 @@
 msgid "Backout"  msgstr ""   +#: hggtk\backout.py:95 hggtk\merge.py:104 +msgid "rev" +msgstr "" + +#: hggtk\backout.py:96 hggtk\merge.py:105 +msgid "summary" +msgstr "" + +#: hggtk\backout.py:97 hggtk\merge.py:106 +msgid "user" +msgstr "" + +#: hggtk\backout.py:98 hggtk\merge.py:107 +msgid "date" +msgstr "" + +#: hggtk\backout.py:101 hggtk\merge.py:111 +msgid "branch" +msgstr "" + +#: hggtk\backout.py:103 hggtk\merge.py:113 +msgid "tags" +msgstr "" +  #: hggtk\bugreport.py:23  msgid "TortoiseHg Bug Report"  msgstr "" @@ -227,79 +251,79 @@
 msgid "[All Files]"  msgstr ""   -#: hggtk\changeset.py:147 +#: hggtk\changeset.py:149  msgid "branch:"  msgstr ""   -#: hggtk\changeset.py:148 +#: hggtk\changeset.py:150  msgid "user/date:"  msgstr ""   -#: hggtk\changeset.py:156 +#: hggtk\changeset.py:158  msgid "parent:"  msgstr ""   -#: hggtk\changeset.py:169 +#: hggtk\changeset.py:171  msgid "child:"  msgstr ""   -#: hggtk\changeset.py:175 +#: hggtk\changeset.py:177  msgid "tags:"  msgstr ""   -#: hggtk\changeset.py:195 +#: hggtk\changeset.py:197  msgid " %s is larger than the specified max diff size"  msgstr ""   -#: hggtk\changeset.py:290 +#: hggtk\changeset.py:292  msgid "_visual diff"  msgstr ""   -#: hggtk\changeset.py:291 +#: hggtk\changeset.py:293  msgid "diff to _local"  msgstr ""   -#: hggtk\changeset.py:292 +#: hggtk\changeset.py:294  msgid "_view at revision"  msgstr ""   -#: hggtk\changeset.py:293 +#: hggtk\changeset.py:295  msgid "_save at revision"  msgstr ""   -#: hggtk\changeset.py:295 hggtk\datamine.py:117 +#: hggtk\changeset.py:297 hggtk\datamine.py:117  msgid "_file history"  msgstr ""   -#: hggtk\changeset.py:296 hggtk\datamine.py:116 +#: hggtk\changeset.py:298 hggtk\datamine.py:116  msgid "_annotate file"  msgstr ""   -#: hggtk\changeset.py:298 +#: hggtk\changeset.py:300  msgid "_revert file contents"  msgstr ""   -#: hggtk\changeset.py:356 +#: hggtk\changeset.py:358  msgid "Stat"  msgstr ""   -#: hggtk\changeset.py:358 hggtk\hgignore.py:109 +#: hggtk\changeset.py:360 hggtk\hgignore.py:109  msgid "Files"  msgstr ""   -#: hggtk\changeset.py:480 +#: hggtk\changeset.py:482  msgid "Save file to"  msgstr ""   -#: hggtk\changeset.py:545 +#: hggtk\changeset.py:547  msgid "Confirm revert file to old revision"  msgstr ""   -#: hggtk\changeset.py:546 +#: hggtk\changeset.py:548  msgid "Revert %s to contents at revision %d?"  msgstr ""   -#: hggtk\changeset.py:558 hggtk\synch.py:649 +#: hggtk\changeset.py:560 hggtk\synch.py:635  msgid "Toggle _Wordwrap"  msgstr ""   @@ -335,7 +359,7 @@
 msgid "use uncompressed transfer"  msgstr ""   -#: hggtk\clone.py:130 hggtk\synch.py:148 +#: hggtk\clone.py:130 hggtk\synch.py:149  msgid "use proxy server"  msgstr ""   @@ -383,257 +407,257 @@
 msgid "Clone error"  msgstr ""   -#: hggtk\commit.py:32 +#: hggtk\commit.py:33  msgid "Branch Operations"  msgstr ""   -#: hggtk\commit.py:36 +#: hggtk\commit.py:37  msgid "Changes take effect on next commit"  msgstr ""   -#: hggtk\commit.py:37 +#: hggtk\commit.py:38  msgid "No branch changes"  msgstr ""   -#: hggtk\commit.py:39 +#: hggtk\commit.py:40  msgid "Open a new named branch"  msgstr ""   -#: hggtk\commit.py:41 +#: hggtk\commit.py:42  msgid "Close current named branch"  msgstr ""   -#: hggtk\commit.py:153 +#: hggtk\commit.py:154  msgid "_Undo"  msgstr ""   -#: hggtk\commit.py:154 +#: hggtk\commit.py:155  msgid "undo recent commit"  msgstr ""   -#: hggtk\commit.py:155 hggtk\commit.py:363 hggtk\commit.py:372 -#: hggtk\commit.py:380 hggtk\commit.py:381 +#: hggtk\commit.py:156 hggtk\commit.py:364 hggtk\commit.py:373 +#: hggtk\commit.py:381 hggtk\commit.py:382  msgid "_Commit"  msgstr ""   -#: hggtk\commit.py:156 hggtk\commit.py:382 +#: hggtk\commit.py:157 hggtk\commit.py:383  msgid "commit"  msgstr ""   -#: hggtk\commit.py:168 +#: hggtk\commit.py:169  msgid "Confirm Discard Message"  msgstr ""   -#: hggtk\commit.py:169 +#: hggtk\commit.py:170  msgid "Discard current commit message?"  msgstr ""   -#: hggtk\commit.py:229 +#: hggtk\commit.py:230  msgid "Recent Commit Messages..."  msgstr ""   -#: hggtk\commit.py:268 hggtk\commit.py:269 hggtk\commit.py:270 -#: hggtk\commit.py:273 +#: hggtk\commit.py:269 hggtk\commit.py:270 hggtk\commit.py:271 +#: hggtk\commit.py:274  msgid "_commit"  msgstr ""   -#: hggtk\commit.py:291 +#: hggtk\commit.py:292  msgid "Confirm Exit"  msgstr ""   -#: hggtk\commit.py:292 +#: hggtk\commit.py:293  msgid "Save commit message at exit?"  msgstr ""   -#: hggtk\commit.py:319 +#: hggtk\commit.py:320  msgid "new branch: "  msgstr ""   -#: hggtk\commit.py:321 +#: hggtk\commit.py:322  msgid "close branch: "  msgstr ""   -#: hggtk\commit.py:323 +#: hggtk\commit.py:324  msgid "branch: "  msgstr ""   -#: hggtk\commit.py:333 hggtk\status.py:204 +#: hggtk\commit.py:334 hggtk\status.py:204  msgid "Re_vert"  msgstr ""   -#: hggtk\commit.py:334 hggtk\status.py:206 hggtk\thgconfig.py:742 +#: hggtk\commit.py:335 hggtk\status.py:206 hggtk\thgconfig.py:744  msgid "_Add"  msgstr ""   -#: hggtk\commit.py:335 hggtk\status.py:211 hggtk\thgconfig.py:752 +#: hggtk\commit.py:336 hggtk\status.py:211 hggtk\thgconfig.py:754  msgid "_Remove"  msgstr ""   -#: hggtk\commit.py:336 hggtk\status.py:208 +#: hggtk\commit.py:337 hggtk\status.py:208  msgid "Move"  msgstr ""   -#: hggtk\commit.py:347 +#: hggtk\commit.py:348  msgid "merge"  msgstr ""   -#: hggtk\commit.py:365 hggtk\commit.py:366 hggtk\commit.py:373 -#: hggtk\commit.py:374 +#: hggtk\commit.py:366 hggtk\commit.py:367 hggtk\commit.py:374 +#: hggtk\commit.py:375  msgid "QNew"  msgstr ""   -#: hggtk\commit.py:369 hggtk\commit.py:370 +#: hggtk\commit.py:370 hggtk\commit.py:371  msgid "QRefresh"  msgstr ""   -#: hggtk\commit.py:405 hggtk\commit.py:550 +#: hggtk\commit.py:406 hggtk\commit.py:561  msgid "Nothing Commited"  msgstr ""   -#: hggtk\commit.py:406 +#: hggtk\commit.py:407  msgid "No committable files selected"  msgstr ""   -#: hggtk\commit.py:423 hggtk\commit.py:472 hggtk\merge.py:83 -#: hggtk\thgconfig.py:463 +#: hggtk\commit.py:424 hggtk\commit.py:479 hggtk\merge.py:83 +#: hggtk\thgconfig.py:465  msgid "Commit"  msgstr ""   -#: hggtk\commit.py:424 +#: hggtk\commit.py:425  msgid "Unable to create "  msgstr ""   -#: hggtk\commit.py:473 +#: hggtk\commit.py:480  msgid "Unable to apply patch"  msgstr ""   -#: hggtk\commit.py:511 +#: hggtk\commit.py:518  msgid "Confirm Undo commit"  msgstr ""   -#: hggtk\commit.py:512 +#: hggtk\commit.py:519  msgid "Undo last commit"  msgstr ""   -#: hggtk\commit.py:518 hggtk\commit.py:529 +#: hggtk\commit.py:525 hggtk\commit.py:540  msgid "Undo commit"  msgstr ""   -#: hggtk\commit.py:519 +#: hggtk\commit.py:526  msgid ""  "Unable to undo!\n"  "\n"  "Tip revision differs from last commit."  msgstr ""   -#: hggtk\commit.py:530 +#: hggtk\commit.py:541  msgid "Errors during rollback!"  msgstr ""   -#: hggtk\commit.py:537 +#: hggtk\commit.py:548  msgid "Confirm Add/Remove"  msgstr ""   -#: hggtk\commit.py:538 +#: hggtk\commit.py:549  msgid "Add/Remove the following files?"  msgstr ""   -#: hggtk\commit.py:551 hggtk\tagadd.py:174 +#: hggtk\commit.py:562 hggtk\tagadd.py:174  msgid "Please enter commit message"  msgstr ""   -#: hggtk\commit.py:559 +#: hggtk\commit.py:570  msgid "Error"  msgstr ""   -#: hggtk\commit.py:560 +#: hggtk\commit.py:571  msgid "Message format configuration error"  msgstr ""   -#: hggtk\commit.py:569 hggtk\commit.py:577 hggtk\commit.py:589 +#: hggtk\commit.py:580 hggtk\commit.py:588 hggtk\commit.py:600  msgid "Confirm Commit"  msgstr ""   -#: hggtk\commit.py:570 +#: hggtk\commit.py:581  msgid ""  "The summary line length of %i is greater than %i.\n"  "\n"  "Ignore format policy and continue commit?"  msgstr ""   -#: hggtk\commit.py:578 +#: hggtk\commit.py:589  msgid ""  "The summary line is not followed by a blank line.\n"  "\n"  "Ignore format policy and continue commit?"  msgstr ""   -#: hggtk\commit.py:590 +#: hggtk\commit.py:601  msgid ""  "The following lines are over the %i-character limit: %s.\n"  "\n"  "Ignore format policy and continue commit?"  msgstr ""   -#: hggtk\commit.py:604 +#: hggtk\commit.py:615  msgid "Commit: Invalid username"  msgstr ""   -#: hggtk\commit.py:605 +#: hggtk\commit.py:616  msgid ""  "Your username has not been configured.\n"  "\n"  "Please configure your username and try again"  msgstr ""   -#: hggtk\commit.py:627 +#: hggtk\commit.py:638  msgid "Confirm Override Branch"  msgstr ""   -#: hggtk\commit.py:628 +#: hggtk\commit.py:639  msgid ""  "A branch named \"%s\" already exists,\n"  "override?"  msgstr ""   -#: hggtk\commit.py:633 +#: hggtk\commit.py:644  msgid "Confirm New Branch"  msgstr ""   -#: hggtk\commit.py:634 +#: hggtk\commit.py:645  msgid "Create new named branch \"%s\"?"  msgstr ""   -#: hggtk\commit.py:704 +#: hggtk\commit.py:715  msgid "Paste _Filenames"  msgstr ""   -#: hggtk\commit.py:705 +#: hggtk\commit.py:716  msgid "App_ly Format"  msgstr ""   -#: hggtk\commit.py:706 +#: hggtk\commit.py:717  msgid "C_onfigure Format"  msgstr ""   -#: hggtk\commit.py:732 hggtk\hgemail.py:307 hggtk\hgemail.py:312 +#: hggtk\commit.py:743 hggtk\hgemail.py:307 hggtk\hgemail.py:312  #: hggtk\hgemail.py:321  msgid "Info required"  msgstr ""   -#: hggtk\commit.py:733 +#: hggtk\commit.py:744  msgid "Message format needs to be configured"  msgstr ""   -#: hggtk\commit.py:745 hggtk\commit.py:750 +#: hggtk\commit.py:756 hggtk\commit.py:761  msgid "Warning"  msgstr ""   -#: hggtk\commit.py:746 +#: hggtk\commit.py:757  msgid "The summary line length of %i is greater than %i"  msgstr ""   -#: hggtk\commit.py:751 +#: hggtk\commit.py:762  msgid "The summary line is not followed by a blank line"  msgstr ""   @@ -642,7 +666,7 @@
 msgstr ""    #: hggtk\datamine.py:44 hggtk\hgcmd.py:37 hggtk\recovery.py:43 -#: hggtk\serve.py:61 hggtk\synch.py:59 +#: hggtk\serve.py:61 hggtk\synch.py:60  msgid "Stop"  msgstr ""   @@ -658,7 +682,7 @@
 msgid "Open new search tab"  msgstr ""   -#: hggtk\datamine.py:61 hggtk\thgconfig.py:943 +#: hggtk\datamine.py:61 hggtk\thgconfig.py:947  msgid "Invalid path"  msgstr ""   @@ -670,12 +694,12 @@
 msgid "Filename"  msgstr ""   -#: hggtk\datamine.py:107 hggtk\datamine.py:524 hggtk\logview\treeview.py:423 -#: hggtk\thgconfig.py:158 hggtk\thgconfig.py:231 +#: hggtk\datamine.py:107 hggtk\datamine.py:525 hggtk\logview\treeview.py:423 +#: hggtk\thgconfig.py:160 hggtk\thgconfig.py:233  msgid "User"  msgstr ""   -#: hggtk\datamine.py:115 hggtk\datamine.py:124 +#: hggtk\datamine.py:115 hggtk\datamine.py:124 hggtk\history.py:391  msgid "di_splay change"  msgstr ""   @@ -687,107 +711,107 @@
 msgid "_annotate parent"  msgstr ""   -#: hggtk\datamine.py:215 +#: hggtk\datamine.py:216  msgid "Search"  msgstr ""   -#: hggtk\datamine.py:216 hggtk\hgignore.py:49 +#: hggtk\datamine.py:217 hggtk\hgignore.py:49  msgid "Regexp:"  msgstr ""   -#: hggtk\datamine.py:218 +#: hggtk\datamine.py:219  msgid "Includes:"  msgstr ""   -#: hggtk\datamine.py:220 +#: hggtk\datamine.py:221  msgid "Excludes:"  msgstr ""   -#: hggtk\datamine.py:223 +#: hggtk\datamine.py:224  msgid "Start this search"  msgstr ""   -#: hggtk\datamine.py:224 +#: hggtk\datamine.py:225  msgid "Regular expression search pattern"  msgstr ""   -#: hggtk\datamine.py:225 +#: hggtk\datamine.py:226  msgid ""  "Comma separated list of inclusion patterns. By default, the entire "  "repository is searched."  msgstr ""   -#: hggtk\datamine.py:228 +#: hggtk\datamine.py:229  msgid ""  "Comma separated list of exclusion patterns. Exclusion patterns are applied "  "after inclusion patterns."  msgstr ""   -#: hggtk\datamine.py:234 +#: hggtk\datamine.py:235  msgid "Follow copies and renames"  msgstr ""   -#: hggtk\datamine.py:235 +#: hggtk\datamine.py:236  msgid "Ignore case"  msgstr ""   -#: hggtk\datamine.py:236 +#: hggtk\datamine.py:237  msgid "Show line numbers"  msgstr ""   -#: hggtk\datamine.py:237 +#: hggtk\datamine.py:238  msgid "Show all matching revisions"  msgstr ""   -#: hggtk\datamine.py:265 hggtk\datamine.py:522 hggtk\logview\treeview.py:372 +#: hggtk\datamine.py:266 hggtk\datamine.py:523 hggtk\logview\treeview.py:372  msgid "Rev"  msgstr ""   -#: hggtk\datamine.py:266 hggtk\datamine.py:523 +#: hggtk\datamine.py:267 hggtk\datamine.py:524  msgid "File"  msgstr ""   -#: hggtk\datamine.py:267 +#: hggtk\datamine.py:268  msgid "Matches"  msgstr ""   -#: hggtk\datamine.py:289 +#: hggtk\datamine.py:290  msgid "Search %d"  msgstr ""   -#: hggtk\datamine.py:331 +#: hggtk\datamine.py:332  msgid "No regular expression given"  msgstr ""   -#: hggtk\datamine.py:332 +#: hggtk\datamine.py:333  msgid "You must provide a search expression"  msgstr ""   -#: hggtk\datamine.py:360 +#: hggtk\datamine.py:361  msgid "Search \"%s\""  msgstr ""   -#: hggtk\datamine.py:472 +#: hggtk\datamine.py:473  msgid "File is unrevisioned"  msgstr ""   -#: hggtk\datamine.py:473 +#: hggtk\datamine.py:474  msgid "Unable to annotate "  msgstr ""   -#: hggtk\datamine.py:493 +#: hggtk\datamine.py:494  msgid "Follow"  msgstr ""   -#: hggtk\datamine.py:521 +#: hggtk\datamine.py:522  msgid "Line"  msgstr ""   -#: hggtk\datamine.py:525 hggtk\guess.py:100 +#: hggtk\datamine.py:526 hggtk\guess.py:100  msgid "Source"  msgstr ""   -#: hggtk\datamine.py:617 +#: hggtk\datamine.py:618  msgid "Follow Rename:"  msgstr ""   @@ -819,11 +843,11 @@
 msgid "edit failed"  msgstr ""   -#: hggtk\gdialog.py:500 hggtk\thgconfig.py:541 +#: hggtk\gdialog.py:500 hggtk\thgconfig.py:543  msgid "No visual editor configured"  msgstr ""   -#: hggtk\gdialog.py:501 hggtk\thgconfig.py:542 +#: hggtk\gdialog.py:501 hggtk\thgconfig.py:544  msgid "Please configure a visual editor."  msgstr ""   @@ -843,7 +867,7 @@
 msgid "All files"  msgstr ""   -#: hggtk\gtklib.py:240 +#: hggtk\gtklib.py:254  msgid "Select Folder"  msgstr ""   @@ -1110,27 +1134,27 @@
 msgid "Create"  msgstr ""   -#: hggtk\hginit.py:121 +#: hggtk\hginit.py:116  msgid "Destination path is empty"  msgstr ""   -#: hggtk\hginit.py:122 +#: hggtk\hginit.py:117  msgid "Please enter the directory path"  msgstr ""   -#: hggtk\hginit.py:136 +#: hggtk\hginit.py:131  msgid "Unable to create new repository"  msgstr ""   -#: hggtk\hginit.py:140 hggtk\hginit.py:145 +#: hggtk\hginit.py:135 hggtk\hginit.py:140  msgid "Error when creating repository"  msgstr ""   -#: hggtk\hginit.py:162 +#: hggtk\hginit.py:157  msgid "New repository created"  msgstr ""   -#: hggtk\hginit.py:163 +#: hggtk\hginit.py:158  msgid "in directory %s"  msgstr ""   @@ -1191,59 +1215,59 @@
 msgid "applying patch\n"  msgstr ""   -#: hggtk\hgshelve.py:509 +#: hggtk\hgshelve.py:514  msgid "saving patch to shelve\n"  msgstr ""   -#: hggtk\hgshelve.py:522 +#: hggtk\hgshelve.py:527  msgid "removing shelve file\n"  msgstr ""   -#: hggtk\hgshelve.py:531 +#: hggtk\hgshelve.py:536  msgid "removing backup for %r : %r\n"  msgstr ""   -#: hggtk\hgshelve.py:556 +#: hggtk\hgshelve.py:561  msgid "applying shelved patch\n"  msgstr ""   -#: hggtk\hgshelve.py:569 +#: hggtk\hgshelve.py:574  msgid "restoring backup files\n"  msgstr ""   -#: hggtk\hgshelve.py:576 +#: hggtk\hgshelve.py:581  msgid "removing backup files\n"  msgstr ""   -#: hggtk\hgshelve.py:582 +#: hggtk\hgshelve.py:587  msgid "removing shelved patches\n"  msgstr ""   -#: hggtk\hgshelve.py:584 +#: hggtk\hgshelve.py:589  msgid "unshelve completed\n"  msgstr ""   -#: hggtk\hgshelve.py:586 +#: hggtk\hgshelve.py:591  msgid "nothing to unshelve\n"  msgstr ""   -#: hggtk\hgshelve.py:592 +#: hggtk\hgshelve.py:597  msgid "mark new/missing files as added/removed before shelving"  msgstr ""   -#: hggtk\hgshelve.py:594 +#: hggtk\hgshelve.py:599  msgid "overwrite existing shelve data"  msgstr ""   -#: hggtk\hgshelve.py:596 +#: hggtk\hgshelve.py:601  msgid "append to existing shelve data"  msgstr ""   -#: hggtk\hgshelve.py:601 +#: hggtk\hgshelve.py:606  msgid "inspect shelved changes only"  msgstr ""   -#: hggtk\hgshelve.py:603 +#: hggtk\hgshelve.py:608  msgid "proceed even if patches do not unshelve cleanly"  msgstr ""   @@ -1373,162 +1397,166 @@
 msgstr ""    #: hggtk\hgtk.py:586 +msgid "do not fork GUI process" +msgstr "" + +#: hggtk\hgtk.py:587  msgid "read file list from file"  msgstr ""   -#: hggtk\hgtk.py:590 +#: hggtk\hgtk.py:591  msgid "hgtk about"  msgstr ""   -#: hggtk\hgtk.py:591 +#: hggtk\hgtk.py:592  msgid "hgtk add [FILE]..."  msgstr ""   -#: hggtk\hgtk.py:592 +#: hggtk\hgtk.py:593  msgid "hgtk clone SOURCE [DEST]"  msgstr ""   -#: hggtk\hgtk.py:594 +#: hggtk\hgtk.py:595  msgid "record user as committer"  msgstr ""   -#: hggtk\hgtk.py:595 +#: hggtk\hgtk.py:596  msgid "record datecode as commit date"  msgstr ""   -#: hggtk\hgtk.py:596 +#: hggtk\hgtk.py:597  msgid "hgtk commit [OPTIONS] [FILE]..."  msgstr ""   -#: hggtk\hgtk.py:597 +#: hggtk\hgtk.py:598  msgid "hgtk datamine"  msgstr ""   -#: hggtk\hgtk.py:598 +#: hggtk\hgtk.py:599  msgid "hgtk hgignore [FILE]"  msgstr ""   -#: hggtk\hgtk.py:599 +#: hggtk\hgtk.py:600  msgid "hgtk init [DEST]"  msgstr ""   -#: hggtk\hgtk.py:602 +#: hggtk\hgtk.py:603  msgid "hgtk log [OPTIONS] [FILE]"  msgstr ""   -#: hggtk\hgtk.py:604 hggtk\hgtk.py:631 +#: hggtk\hgtk.py:605 hggtk\hgtk.py:632  msgid "revision to update"  msgstr ""   -#: hggtk\hgtk.py:605 +#: hggtk\hgtk.py:606  msgid "hgtk merge"  msgstr ""   -#: hggtk\hgtk.py:606 +#: hggtk\hgtk.py:607  msgid "hgtk recovery"  msgstr ""   -#: hggtk\hgtk.py:607 +#: hggtk\hgtk.py:608  msgid "hgtk shelve"  msgstr ""   -#: hggtk\hgtk.py:608 +#: hggtk\hgtk.py:609  msgid "hgtk synch"  msgstr ""   -#: hggtk\hgtk.py:610 +#: hggtk\hgtk.py:611  msgid "revisions to compare"  msgstr ""   -#: hggtk\hgtk.py:611 +#: hggtk\hgtk.py:612  msgid "hgtk status [FILE]..."  msgstr ""   -#: hggtk\hgtk.py:612 +#: hggtk\hgtk.py:613  msgid "hgtk userconfig"  msgstr ""   -#: hggtk\hgtk.py:613 +#: hggtk\hgtk.py:614  msgid "hgtk repoconfig"  msgstr ""   -#: hggtk\hgtk.py:614 +#: hggtk\hgtk.py:615  msgid "hgtk guess"  msgstr ""   -#: hggtk\hgtk.py:615 +#: hggtk\hgtk.py:616  msgid "hgtk remove [FILE]..."  msgstr ""   -#: hggtk\hgtk.py:616 +#: hggtk\hgtk.py:617  msgid "hgtk rename SOURCE [DEST]"  msgstr ""   -#: hggtk\hgtk.py:617 +#: hggtk\hgtk.py:618  msgid "hgtk revert [FILE]..."  msgstr ""   -#: hggtk\hgtk.py:620 +#: hggtk\hgtk.py:621  msgid "name of the webdir config file"  msgstr ""   -#: hggtk\hgtk.py:621 +#: hggtk\hgtk.py:622  msgid "hgtk serve [OPTION]..."  msgstr ""   -#: hggtk\hgtk.py:623 +#: hggtk\hgtk.py:624  msgid "wait until the second ticks over"  msgstr ""   -#: hggtk\hgtk.py:624 +#: hggtk\hgtk.py:625  msgid "notify the shell for path(s) given"  msgstr ""   -#: hggtk\hgtk.py:625 +#: hggtk\hgtk.py:626  msgid "remove the status cache"  msgstr ""   -#: hggtk\hgtk.py:626 +#: hggtk\hgtk.py:627  msgid "show the contents of the status cache (no update)"  msgstr ""   -#: hggtk\hgtk.py:628 +#: hggtk\hgtk.py:629  msgid "udpate all repos in current dir"  msgstr ""   -#: hggtk\hgtk.py:629 +#: hggtk\hgtk.py:630  msgid "hgtk thgstatus [OPTION]"  msgstr ""   -#: hggtk\hgtk.py:634 +#: hggtk\hgtk.py:635  msgid "changeset to view in diff tool"  msgstr ""   -#: hggtk\hgtk.py:635 +#: hggtk\hgtk.py:636  msgid "revisions to view in diff tool"  msgstr ""   -#: hggtk\hgtk.py:636 +#: hggtk\hgtk.py:637  msgid "launch visual diff tool"  msgstr ""   -#: hggtk\hgtk.py:638 +#: hggtk\hgtk.py:639  msgid "print license"  msgstr ""   -#: hggtk\hgtk.py:639 +#: hggtk\hgtk.py:640  msgid "hgtk version [OPTION]"  msgstr ""   -#: hggtk\hgtk.py:641 +#: hggtk\hgtk.py:642  msgid "show the command options"  msgstr ""   -#: hggtk\hgtk.py:642 +#: hggtk\hgtk.py:643  msgid "[-o] CMD"  msgstr ""   -#: hggtk\hgtk.py:643 +#: hggtk\hgtk.py:644  msgid "hgtk help [COMMAND]"  msgstr ""   @@ -1617,10 +1645,6 @@
 msgstr ""    #: hggtk\history.py:390 -msgid "di_splay" -msgstr "" - -#: hggtk\history.py:391  msgid "visualize change"  msgstr ""   @@ -1715,22 +1739,23 @@
 msgid "Write bundle to"  msgstr ""   -#: hggtk\history.py:660 hggtk\status.py:1051 +#: hggtk\history.py:660 hggtk\status.py:1045  msgid "Save patch to"  msgstr ""   -#: hggtk\history.py:667 hggtk\thgconfig.py:366 hggtk\thgconfig.py:668 +#: hggtk\history.py:667 hggtk\history.py:696 hggtk\thgconfig.py:368 +#: hggtk\thgconfig.py:670  msgid "Confirm Overwrite"  msgstr ""   -#: hggtk\history.py:668 +#: hggtk\history.py:668 hggtk\history.py:697  msgid ""  "The file \"%s\" already exists!\n"  "\n"  "Do you want to overwrite it?"  msgstr ""   -#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:450 +#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:452  msgid "Apply"  msgstr ""   @@ -1848,30 +1873,6 @@
 msgid "Merge"  msgstr ""   -#: hggtk\merge.py:104 -msgid "rev" -msgstr "" - -#: hggtk\merge.py:105 -msgid "summary" -msgstr "" - -#: hggtk\merge.py:106 -msgid "user" -msgstr "" - -#: hggtk\merge.py:107 -msgid "date" -msgstr "" - -#: hggtk\merge.py:111 -msgid "branch" -msgstr "" - -#: hggtk\merge.py:113 -msgid "tags" -msgstr "" -  #: hggtk\merge.py:116  msgid "Not a head revision!"  msgstr "" @@ -1888,7 +1889,7 @@
 msgid "TortoiseHg Recovery - "  msgstr ""   -#: hggtk\recovery.py:43 hggtk\synch.py:59 +#: hggtk\recovery.py:43 hggtk\synch.py:60  msgid "Stop the hg operation"  msgstr ""   @@ -1924,11 +1925,11 @@
 msgid "Validate repository consistency"  msgstr ""   -#: hggtk\recovery.py:99 hggtk\synch.py:381 +#: hggtk\recovery.py:99 hggtk\synch.py:367  msgid "Cannot close now"  msgstr ""   -#: hggtk\recovery.py:100 hggtk\synch.py:382 +#: hggtk\recovery.py:100 hggtk\synch.py:368  msgid "command is running"  msgstr ""   @@ -1952,15 +1953,15 @@
 msgid "Rollback repository '%s' ?"  msgstr ""   -#: hggtk\recovery.py:159 hggtk\synch.py:521 +#: hggtk\recovery.py:159 hggtk\synch.py:507  msgid "Cannot run now"  msgstr ""   -#: hggtk\recovery.py:160 hggtk\synch.py:522 +#: hggtk\recovery.py:160 hggtk\synch.py:508  msgid "Please try again after the previous command is completed"  msgstr ""   -#: hggtk\recovery.py:222 hggtk\synch.py:615 +#: hggtk\recovery.py:222 hggtk\synch.py:601  msgid "[command interrupted]"  msgstr ""   @@ -1988,7 +1989,7 @@
 msgid "Launch browser to view repository"  msgstr ""   -#: hggtk\serve.py:69 hggtk\synch.py:92 +#: hggtk\serve.py:69 hggtk\synch.py:93  msgid "Configure"  msgstr ""   @@ -2229,288 +2230,288 @@
 msgid "Copy file to"  msgstr ""   -#: hggtk\status.py:797 hggtk\status.py:1183 +#: hggtk\status.py:790 hggtk\status.py:1178  msgid "Nothing Removed"  msgstr ""   -#: hggtk\status.py:798 +#: hggtk\status.py:791  msgid "Remove is not enabled when multiple revisions are specified."  msgstr ""   -#: hggtk\status.py:815 +#: hggtk\status.py:808  msgid "Move is not enabled when multiple revisions are specified."  msgstr ""   -#: hggtk\status.py:815 hggtk\status.py:1207 hggtk\status.py:1215 +#: hggtk\status.py:808 hggtk\status.py:1196 hggtk\status.py:1204  msgid "Nothing Moved"  msgstr ""   -#: hggtk\status.py:833 +#: hggtk\status.py:826  msgid "Copy is not enabled when multiple revisions are specified."  msgstr ""   -#: hggtk\status.py:833 +#: hggtk\status.py:826  msgid "Nothing Copied"  msgstr ""   -#: hggtk\status.py:853 +#: hggtk\status.py:846  msgid "===== Diff to first parent =====\n"  msgstr ""   -#: hggtk\status.py:862 +#: hggtk\status.py:855  msgid ""  "\n"  "===== Diff to second parent =====\n"  msgstr ""   -#: hggtk\status.py:917 +#: hggtk\status.py:910  msgid "File is larger than the specified max size.\n"  msgstr ""   -#: hggtk\status.py:918 +#: hggtk\status.py:911  msgid "Hunk selection is disabled for this file.\n"  msgstr ""   -#: hggtk\status.py:1086 hggtk\status.py:1107 +#: hggtk\status.py:1081 hggtk\status.py:1102  msgid "Nothing Reverted"  msgstr ""   -#: hggtk\status.py:1087 +#: hggtk\status.py:1082  msgid "No revertable files selected"  msgstr ""   -#: hggtk\status.py:1108 +#: hggtk\status.py:1103  msgid "Revert not allowed when viewing revision range."  msgstr ""   -#: hggtk\status.py:1123 hggtk\status.py:1140 +#: hggtk\status.py:1118 hggtk\status.py:1135  msgid "Confirm Revert"  msgstr ""   -#: hggtk\status.py:1124 +#: hggtk\status.py:1119  msgid "Revert files to revision %s?"  msgstr ""   +#: hggtk\status.py:1121 +msgid "Which parent to revert to?" +msgstr "" + +#: hggtk\status.py:1122 +msgid "Revert file(s) to local or other parent?" +msgstr "" + +#: hggtk\status.py:1123 +msgid "&local" +msgstr "" + +#: hggtk\status.py:1123 +msgid "&other" +msgstr "" + +#: hggtk\status.py:1123 hggtk\status.py:1124 +msgid "l" +msgstr "" +  #: hggtk\status.py:1126 -msgid "Which parent to revert to?" -msgstr "" - -#: hggtk\status.py:1127 -msgid "Revert file(s) to local or other parent?" -msgstr "" - -#: hggtk\status.py:1128 -msgid "&local" -msgstr "" - -#: hggtk\status.py:1128 -msgid "&other" -msgstr "" - -#: hggtk\status.py:1128 hggtk\status.py:1129 -msgid "l" -msgstr "" - -#: hggtk\status.py:1131  msgid "o"  msgstr ""   -#: hggtk\status.py:1141 +#: hggtk\status.py:1136  msgid "Revert the following files?"  msgstr ""   -#: hggtk\status.py:1153 +#: hggtk\status.py:1148  msgid "Nothing Added"  msgstr ""   -#: hggtk\status.py:1154 +#: hggtk\status.py:1149  msgid "No addable files selected"  msgstr ""   -#: hggtk\status.py:1184 +#: hggtk\status.py:1179  msgid "No removable files selected"  msgstr ""   -#: hggtk\status.py:1191 -msgid "Move files to diretory..." -msgstr "" - -#: hggtk\status.py:1208 +#: hggtk\status.py:1187 +msgid "Move files to directory..." +msgstr "" + +#: hggtk\status.py:1197  msgid "Cannot move outside repo!"  msgstr ""   -#: hggtk\status.py:1215 +#: hggtk\status.py:1204  msgid ""  "No movable files selected\n"  "\n"  "Note: only clean files can be moved."  msgstr ""   -#: hggtk\status.py:1223 +#: hggtk\status.py:1212  msgid "Confirm Delete Unrevisioned"  msgstr ""   -#: hggtk\status.py:1224 +#: hggtk\status.py:1213  msgid "Delete the following unrevisioned files?"  msgstr ""   -#: hggtk\status.py:1237 +#: hggtk\status.py:1226  msgid "Delete Errors"  msgstr ""   -#: hggtk\synch.py:51 +#: hggtk\synch.py:52  msgid "TortoiseHg Synchronize - "  msgstr ""   -#: hggtk\synch.py:63 +#: hggtk\synch.py:64  msgid "Incoming"  msgstr ""   -#: hggtk\synch.py:65 +#: hggtk\synch.py:66  msgid "Display changes that can be pulled from selected repository"  msgstr ""   -#: hggtk\synch.py:68 +#: hggtk\synch.py:69  msgid " Pull "  msgstr ""   -#: hggtk\synch.py:70 +#: hggtk\synch.py:71  msgid "Pull changes from selected repository"  msgstr ""   -#: hggtk\synch.py:74 +#: hggtk\synch.py:75  msgid "Outgoing"  msgstr ""   -#: hggtk\synch.py:76 +#: hggtk\synch.py:77  msgid "Display local changes that will be pushed to selected repository"  msgstr ""   -#: hggtk\synch.py:79 +#: hggtk\synch.py:80  msgid "Push"  msgstr ""   -#: hggtk\synch.py:81 +#: hggtk\synch.py:82  msgid "Push local changes to selected repository"  msgstr ""   -#: hggtk\synch.py:84 hggtk\thgconfig.py:479 +#: hggtk\synch.py:85 hggtk\thgconfig.py:481  msgid "Email"  msgstr ""   -#: hggtk\synch.py:86 +#: hggtk\synch.py:87  msgid "Email local outgoing changes to one or more recipients"  msgstr ""   -#: hggtk\synch.py:94 +#: hggtk\synch.py:95  msgid "Configure peer repository paths"  msgstr ""   -#: hggtk\synch.py:105 +#: hggtk\synch.py:106  msgid "Repo:"  msgstr ""   -#: hggtk\synch.py:110 +#: hggtk\synch.py:111  msgid "Bundle:"  msgstr ""   -#: hggtk\synch.py:154 +#: hggtk\synch.py:155  msgid "Post pull operation"  msgstr ""   -#: hggtk\synch.py:156 +#: hggtk\synch.py:157  msgid "Nothing"  msgstr ""   -#: hggtk\synch.py:157 hggtk\update.py:80 +#: hggtk\synch.py:158 hggtk\update.py:80  msgid "Update"  msgstr ""   -#: hggtk\synch.py:158 +#: hggtk\synch.py:159  msgid "Fetch"  msgstr ""   -#: hggtk\synch.py:159 +#: hggtk\synch.py:160  msgid "Rebase"  msgstr ""   -#: hggtk\synch.py:167 +#: hggtk\synch.py:168  msgid "Advanced Options"  msgstr ""   -#: hggtk\synch.py:189 +#: hggtk\synch.py:190  msgid "Force pull or push"  msgstr ""   -#: hggtk\synch.py:190 +#: hggtk\synch.py:191  msgid "Run even when remote repository is unrelated."  msgstr ""   -#: hggtk\synch.py:194 +#: hggtk\synch.py:195  msgid "Target Revision:"  msgstr ""   -#: hggtk\synch.py:198 +#: hggtk\synch.py:199  msgid "A specific revision up to which you would like to push or pull."  msgstr ""   -#: hggtk\synch.py:202 +#: hggtk\synch.py:203  msgid "Remote Command:"  msgstr ""   -#: hggtk\synch.py:206 +#: hggtk\synch.py:207  msgid "Name of hg executable on remote machine."  msgstr ""   -#: hggtk\synch.py:214 +#: hggtk\synch.py:215  msgid "Incoming/Outgoing"  msgstr ""   -#: hggtk\synch.py:217 +#: hggtk\synch.py:218  msgid "Show Patches"  msgstr ""   -#: hggtk\synch.py:218 +#: hggtk\synch.py:219  msgid "Show Newest First"  msgstr ""   -#: hggtk\synch.py:219 +#: hggtk\synch.py:220  msgid "Show No Merges"  msgstr ""   -#: hggtk\synch.py:242 +#: hggtk\synch.py:243  msgid "View pulled revisions"  msgstr ""   -#: hggtk\synch.py:244 +#: hggtk\synch.py:245  msgid "Update to branch tip"  msgstr ""   -#: hggtk\synch.py:339 +#: hggtk\synch.py:340  msgid "unknown sort key '%s'"  msgstr ""   -#: hggtk\synch.py:347 +#: hggtk\synch.py:350  msgid "Select Repository"  msgstr ""   +#: hggtk\synch.py:358 +msgid "Select Bundle" +msgstr "" + +#: hggtk\synch.py:359 +msgid "Bundle (*.hg)" +msgstr "" +  #: hggtk\synch.py:360 -msgid "Select Bundle" -msgstr "" - -#: hggtk\synch.py:367 -msgid "Bundle (*.hg)" -msgstr "" - -#: hggtk\synch.py:371  msgid "Bundle (*)"  msgstr ""   -#: hggtk\synch.py:480 +#: hggtk\synch.py:466  msgid "No repository selected"  msgstr ""   -#: hggtk\synch.py:481 +#: hggtk\synch.py:467  msgid "Select a peer repository to compare with"  msgstr ""   @@ -2664,260 +2665,262 @@
 "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." -msgstr "" - -#: hggtk\thgconfig.py:32 +"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 "" + +#: hggtk\thgconfig.py:34  msgid "Visual Diff Command"  msgstr ""   -#: hggtk\thgconfig.py:33 +#: hggtk\thgconfig.py:35  msgid "Specify visual diff tool; must be an extdiff command"  msgstr ""   -#: hggtk\thgconfig.py:34 +#: hggtk\thgconfig.py:36  msgid "Skip Diff Window"  msgstr ""   -#: hggtk\thgconfig.py:35 +#: hggtk\thgconfig.py:37  msgid ""  "Bypass the builtin visual diff dialog and directly use your visual diff "  "tool's directory diff feature. Only enable this feature if you know your "  "diff tool has a valid extdiff configuration. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:39 +#: hggtk\thgconfig.py:41  msgid "Visual Editor"  msgstr ""   -#: hggtk\thgconfig.py:40 +#: hggtk\thgconfig.py:42  msgid "Specify the visual editor used to view files, etc"  msgstr ""   -#: hggtk\thgconfig.py:41 +#: hggtk\thgconfig.py:43  msgid "CLI Editor"  msgstr ""   -#: hggtk\thgconfig.py:42 +#: hggtk\thgconfig.py:44  msgid ""  "The editor to use during a commit and other instances where Mercurial needs "  "multiline input from the user. Only used by command line interface commands."  msgstr ""   -#: hggtk\thgconfig.py:45 +#: hggtk\thgconfig.py:47  msgid "Tab Width"  msgstr ""   -#: hggtk\thgconfig.py:46 +#: hggtk\thgconfig.py:48  msgid ""  "Specify the number of spaces that tabs expand to in various TortoiseHG "  "windows. Default: Not expanded"  msgstr ""   -#: hggtk\thgconfig.py:49 +#: hggtk\thgconfig.py:51  msgid "Max Diff Size"  msgstr ""   -#: hggtk\thgconfig.py:50 +#: hggtk\thgconfig.py:52  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 ""   -#: hggtk\thgconfig.py:53 +#: hggtk\thgconfig.py:55  msgid "Bottom Diffs"  msgstr ""   -#: hggtk\thgconfig.py:54 +#: hggtk\thgconfig.py:56  msgid ""  "Show the diff panel below the file list in status, shelve, and commit "  "dialogs. Default: False (show diffs to right of file list)"  msgstr ""   -#: hggtk\thgconfig.py:59 +#: hggtk\thgconfig.py:61  msgid "Username"  msgstr ""   -#: hggtk\thgconfig.py:60 +#: hggtk\thgconfig.py:62  msgid "Name associated with commits"  msgstr ""   -#: hggtk\thgconfig.py:61 +#: hggtk\thgconfig.py:63  msgid "External Commit Tool"  msgstr ""   -#: hggtk\thgconfig.py:62 +#: hggtk\thgconfig.py:64  msgid ""  "Select commit tool launched by TortoiseHg. (Qct is no longer distributed as "  "part of TortoiseHG.) Default: None (use the builtin tool)"  msgstr ""   -#: hggtk\thgconfig.py:65 +#: hggtk\thgconfig.py:67  msgid "Summary Line Length"  msgstr ""   -#: hggtk\thgconfig.py:66 +#: hggtk\thgconfig.py:68  msgid ""  "Maximum length of the commit message summary line. If set, TortoiseHG will "  "issue a warning if the summary line is too long or not separated by a blank "  "line. Default: 0 (unenforced)"  msgstr ""   -#: hggtk\thgconfig.py:70 +#: hggtk\thgconfig.py:72  msgid "Message Line Length"  msgstr ""   -#: hggtk\thgconfig.py:71 +#: hggtk\thgconfig.py:73  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 ""   -#: hggtk\thgconfig.py:78 +#: hggtk\thgconfig.py:80  msgid "Author Coloring"  msgstr ""   -#: hggtk\thgconfig.py:79 +#: hggtk\thgconfig.py:81  msgid ""  "Color changesets by author name. If not enabled, the changes are colored "  "green for merge, red for non-trivial parents, black for normal. Default: "  "False"  msgstr ""   -#: hggtk\thgconfig.py:83 +#: hggtk\thgconfig.py:85  msgid "Long Summary"  msgstr ""   -#: hggtk\thgconfig.py:84 +#: hggtk\thgconfig.py:86  msgid ""  "If true, concatenate multiple lines of changeset summary until they reach 80 "  "characters. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:87 +#: hggtk\thgconfig.py:89  msgid "Log Batch Size"  msgstr ""   -#: hggtk\thgconfig.py:88 +#: hggtk\thgconfig.py:90  msgid ""  "The number of revisions to read and display in the changelog viewer in a "  "single batch. Default: 500"  msgstr ""   -#: hggtk\thgconfig.py:91 +#: hggtk\thgconfig.py:93  msgid "Copy Hash"  msgstr ""   -#: hggtk\thgconfig.py:92 +#: hggtk\thgconfig.py:94  msgid ""  "Allow the changelog viewer to copy the changeset hash of the currently "  "selected changeset into the clipboard. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:97 +#: hggtk\thgconfig.py:99  msgid "After pull operation"  msgstr ""   -#: hggtk\thgconfig.py:99 +#: hggtk\thgconfig.py:101  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 ""   -#: hggtk\thgconfig.py:104 +#: hggtk\thgconfig.py:106  msgid "Name"  msgstr ""   -#: hggtk\thgconfig.py:105 +#: hggtk\thgconfig.py:107  msgid ""  "Repository name to use in the web interface. Default is the working "  "directory."  msgstr ""   -#: hggtk\thgconfig.py:107 hggtk\thgconfig.py:776 +#: hggtk\thgconfig.py:109 hggtk\thgconfig.py:778  msgid "Description"  msgstr ""   -#: hggtk\thgconfig.py:108 +#: hggtk\thgconfig.py:110  msgid "Textual description of the repository's purpose or contents."  msgstr ""   -#: hggtk\thgconfig.py:110 +#: hggtk\thgconfig.py:112  msgid "Contact"  msgstr ""   -#: hggtk\thgconfig.py:111 +#: hggtk\thgconfig.py:113  msgid "Name or email address of the person in charge of the repository."  msgstr ""   -#: hggtk\thgconfig.py:113 +#: hggtk\thgconfig.py:115  msgid "Style"  msgstr ""   -#: hggtk\thgconfig.py:115 +#: hggtk\thgconfig.py:117  msgid "Which template map style to use"  msgstr ""   -#: hggtk\thgconfig.py:116 +#: hggtk\thgconfig.py:118  msgid "Archive Formats"  msgstr ""   -#: hggtk\thgconfig.py:117 +#: hggtk\thgconfig.py:119  msgid "Comma separated list of archive formats allowed for downloading"  msgstr ""   -#: hggtk\thgconfig.py:119 +#: hggtk\thgconfig.py:121  msgid "Port to listen on"  msgstr ""   -#: hggtk\thgconfig.py:119 hggtk\thgconfig.py:229 +#: hggtk\thgconfig.py:121 hggtk\thgconfig.py:231  msgid "Port"  msgstr ""   -#: hggtk\thgconfig.py:120 +#: hggtk\thgconfig.py:122  msgid "Push Requires SSL"  msgstr ""   -#: hggtk\thgconfig.py:121 +#: hggtk\thgconfig.py:123  msgid ""  "Whether to require that inbound pushes be transported over SSL to prevent "  "password sniffing."  msgstr ""   -#: hggtk\thgconfig.py:123 +#: hggtk\thgconfig.py:125  msgid "Stripes"  msgstr ""   -#: hggtk\thgconfig.py:124 +#: hggtk\thgconfig.py:126  msgid ""  "How many lines a \"zebra stripe\" should span in multiline output. Default "  "is 1; set to 0 to disable."  msgstr ""   -#: hggtk\thgconfig.py:126 +#: hggtk\thgconfig.py:128  msgid "Max Files"  msgstr ""   -#: hggtk\thgconfig.py:127 +#: hggtk\thgconfig.py:129  msgid "Maximum number of files to list per changeset."  msgstr ""   -#: hggtk\thgconfig.py:128 +#: hggtk\thgconfig.py:130  msgid "Max Changes"  msgstr ""   -#: hggtk\thgconfig.py:129 +#: hggtk\thgconfig.py:131  msgid "Maximum number of changes to list on the changelog."  msgstr ""   -#: hggtk\thgconfig.py:130 +#: hggtk\thgconfig.py:132  msgid "Allow Push"  msgstr ""   -#: hggtk\thgconfig.py:131 +#: hggtk\thgconfig.py:133  msgid ""  "Whether to allow pushing to the repository. If empty or not set, push is not "  "allowed. If the special value \"*\", any remote user can push, including " @@ -2927,11 +2930,11 @@
 "examined after the deny_push list."  msgstr ""   -#: hggtk\thgconfig.py:138 +#: hggtk\thgconfig.py:140  msgid "Deny Push"  msgstr ""   -#: hggtk\thgconfig.py:139 +#: hggtk\thgconfig.py:141  msgid ""  "Whether to deny pushing to the repository. If empty or not set, push is not "  "denied. If the special value \"*\", all remote users are denied push. " @@ -2940,81 +2943,81 @@
 "The contents of the deny_push list are examined before the allow_push list."  msgstr ""   -#: hggtk\thgconfig.py:145 +#: hggtk\thgconfig.py:147  msgid "Encoding"  msgstr ""   -#: hggtk\thgconfig.py:146 +#: hggtk\thgconfig.py:148  msgid "Character encoding name"  msgstr ""   -#: hggtk\thgconfig.py:149 hggtk\thgconfig.py:230 +#: hggtk\thgconfig.py:151 hggtk\thgconfig.py:232  msgid "Host"  msgstr ""   -#: hggtk\thgconfig.py:150 +#: hggtk\thgconfig.py:152  msgid ""  "Host name and (optional) port of proxy server, for example \"myproxy:8000\""  msgstr ""   -#: hggtk\thgconfig.py:152 +#: hggtk\thgconfig.py:154  msgid "Bypass List"  msgstr ""   -#: hggtk\thgconfig.py:153 +#: hggtk\thgconfig.py:155  msgid ""  "Optional. Comma-separated list of host names that should bypass the proxy"  msgstr ""   -#: hggtk\thgconfig.py:155 hggtk\thgconfig.py:231 +#: hggtk\thgconfig.py:157 hggtk\thgconfig.py:233  msgid "Password"  msgstr ""   -#: hggtk\thgconfig.py:156 +#: hggtk\thgconfig.py:158  msgid "Optional. Password to authenticate with at the proxy server"  msgstr ""   -#: hggtk\thgconfig.py:159 +#: hggtk\thgconfig.py:161  msgid "Optional. User name to authenticate with at the proxy server"  msgstr ""   -#: hggtk\thgconfig.py:163 +#: hggtk\thgconfig.py:165  msgid "From"  msgstr ""   -#: hggtk\thgconfig.py:164 +#: hggtk\thgconfig.py:166  msgid "Email address to use in the \"From\" header and for the SMTP envelope"  msgstr ""   -#: hggtk\thgconfig.py:165 +#: hggtk\thgconfig.py:167  msgid "To"  msgstr ""   -#: hggtk\thgconfig.py:166 +#: hggtk\thgconfig.py:168  msgid "Comma-separated list of recipient email addresses"  msgstr ""   -#: hggtk\thgconfig.py:167 +#: hggtk\thgconfig.py:169  msgid "Cc"  msgstr ""   -#: hggtk\thgconfig.py:168 +#: hggtk\thgconfig.py:170  msgid "Comma-separated list of carbon copy recipient email addresses"  msgstr ""   -#: hggtk\thgconfig.py:170 +#: hggtk\thgconfig.py:172  msgid "Bcc"  msgstr ""   -#: hggtk\thgconfig.py:171 +#: hggtk\thgconfig.py:173  msgid "Comma-separated list of blind carbon copy recipient email addresses"  msgstr ""   -#: hggtk\thgconfig.py:173 +#: hggtk\thgconfig.py:175  msgid "method"  msgstr ""   -#: hggtk\thgconfig.py:174 +#: hggtk\thgconfig.py:176  msgid ""  "Optional. Method to use to send email messages. If value is \"smtp\" "  "(default), use SMTP (configured below). Otherwise, use as name of program " @@ -3024,231 +3027,231 @@
 "messages."  msgstr ""   -#: hggtk\thgconfig.py:179 +#: hggtk\thgconfig.py:181  msgid "Host name of mail server"  msgstr ""   -#: hggtk\thgconfig.py:179 +#: hggtk\thgconfig.py:181  msgid "SMTP Host"  msgstr ""   -#: hggtk\thgconfig.py:180 +#: hggtk\thgconfig.py:182  msgid "SMTP Port"  msgstr ""   -#: hggtk\thgconfig.py:181 +#: hggtk\thgconfig.py:183  msgid "Port to connect to on mail server. Default: 25"  msgstr ""   -#: hggtk\thgconfig.py:183 +#: hggtk\thgconfig.py:185  msgid "SMTP TLS"  msgstr ""   -#: hggtk\thgconfig.py:184 +#: hggtk\thgconfig.py:186  msgid "Connect to mail server using TLS. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:186 +#: hggtk\thgconfig.py:188  msgid "SMTP Username"  msgstr ""   -#: hggtk\thgconfig.py:187 +#: hggtk\thgconfig.py:189  msgid "Username to authenticate to mail server with"  msgstr ""   -#: hggtk\thgconfig.py:188 +#: hggtk\thgconfig.py:190  msgid "SMTP Password"  msgstr ""   -#: hggtk\thgconfig.py:189 +#: hggtk\thgconfig.py:191  msgid "Password to authenticate to mail server with"  msgstr ""   -#: hggtk\thgconfig.py:190 +#: hggtk\thgconfig.py:192  msgid "Local Hostname"  msgstr ""   -#: hggtk\thgconfig.py:191 +#: hggtk\thgconfig.py:193  msgid "Hostname the sender can use to identify itself to the mail server."  msgstr ""   -#: hggtk\thgconfig.py:194 +#: hggtk\thgconfig.py:196  msgid "Git Format"  msgstr ""   -#: hggtk\thgconfig.py:195 +#: hggtk\thgconfig.py:197  msgid "Use git extended diff header format. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:197 +#: hggtk\thgconfig.py:199  msgid "No Dates"  msgstr ""   -#: hggtk\thgconfig.py:198 +#: hggtk\thgconfig.py:200  msgid "Do not include modification dates in diff headers. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:200 +#: hggtk\thgconfig.py:202  msgid "Show Function"  msgstr ""   -#: hggtk\thgconfig.py:201 +#: hggtk\thgconfig.py:203  msgid "Show which function each change is in. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:203 +#: hggtk\thgconfig.py:205  msgid "Ignore White Space"  msgstr ""   -#: hggtk\thgconfig.py:204 +#: hggtk\thgconfig.py:206  msgid "Ignore white space when comparing lines. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:206 +#: hggtk\thgconfig.py:208  msgid "Ignore WS Amount"  msgstr ""   -#: hggtk\thgconfig.py:207 +#: hggtk\thgconfig.py:209  msgid "Ignore changes in the amount of white space. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:209 +#: hggtk\thgconfig.py:211  msgid "Ignore Blank Lines"  msgstr ""   -#: hggtk\thgconfig.py:210 +#: hggtk\thgconfig.py:212  msgid "Ignore changes whose lines are all blank. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:223 +#: hggtk\thgconfig.py:225  msgid "Edit remote repository path"  msgstr ""   -#: hggtk\thgconfig.py:229 +#: hggtk\thgconfig.py:231  msgid "URL"  msgstr ""   -#: hggtk\thgconfig.py:230 +#: hggtk\thgconfig.py:232  msgid "Folder"  msgstr ""   -#: hggtk\thgconfig.py:232 hggtk\thgconfig.py:729 +#: hggtk\thgconfig.py:234 hggtk\thgconfig.py:731  msgid "Alias"  msgstr ""   -#: hggtk\thgconfig.py:367 hggtk\thgconfig.py:669 +#: hggtk\thgconfig.py:369 hggtk\thgconfig.py:671  msgid "Overwrite existing '%s' path?"  msgstr ""   -#: hggtk\thgconfig.py:421 +#: hggtk\thgconfig.py:423  msgid "No repository found"  msgstr ""   -#: hggtk\thgconfig.py:422 +#: hggtk\thgconfig.py:424  msgid "no repo at "  msgstr ""   -#: hggtk\thgconfig.py:430 +#: hggtk\thgconfig.py:432  msgid "User global settings"  msgstr ""   -#: hggtk\thgconfig.py:432 +#: hggtk\thgconfig.py:434  msgid "%s repository settings"  msgstr ""   -#: hggtk\thgconfig.py:437 +#: hggtk\thgconfig.py:439  msgid "Edit File"  msgstr ""   -#: hggtk\thgconfig.py:466 +#: hggtk\thgconfig.py:468  msgid "Changelog"  msgstr ""   -#: hggtk\thgconfig.py:469 +#: hggtk\thgconfig.py:471  msgid "Sync"  msgstr ""   -#: hggtk\thgconfig.py:473 +#: hggtk\thgconfig.py:475  msgid "Web"  msgstr ""   -#: hggtk\thgconfig.py:476 +#: hggtk\thgconfig.py:478  msgid "Proxy"  msgstr ""   -#: hggtk\thgconfig.py:482 +#: hggtk\thgconfig.py:484  msgid "Diff"  msgstr ""   -#: hggtk\thgconfig.py:495 +#: hggtk\thgconfig.py:497  msgid "Unapplied changes"  msgstr ""   -#: hggtk\thgconfig.py:496 +#: hggtk\thgconfig.py:498  msgid "Lose changes and switch files?."  msgstr ""   -#: hggtk\thgconfig.py:507 +#: hggtk\thgconfig.py:509  msgid "TortoiseHg Configure Repository - "  msgstr ""   -#: hggtk\thgconfig.py:511 +#: hggtk\thgconfig.py:513  msgid "TortoiseHg Configure User-Global Settings"  msgstr ""   -#: hggtk\thgconfig.py:555 +#: hggtk\thgconfig.py:557  msgid "Confirm quit without saving?"  msgstr ""   -#: hggtk\thgconfig.py:556 +#: hggtk\thgconfig.py:558  msgid "Yes to abandon changes, No to continue"  msgstr ""   -#: hggtk\thgconfig.py:644 +#: hggtk\thgconfig.py:646  msgid "No Repository Found"  msgstr ""   -#: hggtk\thgconfig.py:645 +#: hggtk\thgconfig.py:647  msgid "Path testing cannot work without a repository"  msgstr ""   -#: hggtk\thgconfig.py:711 +#: hggtk\thgconfig.py:713  msgid "Remote repository paths"  msgstr ""   -#: hggtk\thgconfig.py:733 +#: hggtk\thgconfig.py:735  msgid "Repository Path"  msgstr ""   -#: hggtk\thgconfig.py:747 +#: hggtk\thgconfig.py:749  msgid "_Edit"  msgstr ""   -#: hggtk\thgconfig.py:757 +#: hggtk\thgconfig.py:759  msgid "_Test"  msgstr ""   -#: hggtk\thgconfig.py:762 +#: hggtk\thgconfig.py:764  msgid "Set as _default"  msgstr ""   -#: hggtk\thgconfig.py:859 +#: hggtk\thgconfig.py:863  msgid "Suggested"  msgstr ""   -#: hggtk\thgconfig.py:869 +#: hggtk\thgconfig.py:873  msgid "History"  msgstr ""   -#: hggtk\thgconfig.py:907 +#: hggtk\thgconfig.py:911  msgid "# Generated by tortoisehg-config\n"  msgstr ""   -#: hggtk\thgconfig.py:944 +#: hggtk\thgconfig.py:948  msgid "Skipped saving path with no alias"  msgstr ""   -#: hggtk\thgconfig.py:972 +#: hggtk\thgconfig.py:976  msgid "Unable to write configuration file"  msgstr ""   @@ -3366,11 +3369,11 @@
 msgid "There are no file changes to view"  msgstr ""   -#: hggtk\visdiff.py:241 +#: hggtk\visdiff.py:242  msgid "Tool launch failure"  msgstr ""   -#: hggtk\visdiff.py:242 +#: hggtk\visdiff.py:243  msgid "%s : %s"  msgstr ""  
 
14
15
16
17
 
18
19
20
 
14
15
16
 
17
18
19
20
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n" +"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"  "X-Generator: Launchpad (build Unknown)\n"    #: hggtk\about.py:52
Show Entire File i18n/​tortoisehg-de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
 
14
15
16
17
 
18
19
20
 
14
15
16
 
17
18
19
20
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n" +"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"  "X-Generator: Launchpad (build Unknown)\n"    #: hggtk\about.py:52
Show Entire File i18n/​tortoisehg-fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
 
14
15
16
17
 
18
19
20
 
14
15
16
 
17
18
19
20
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n" +"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"  "X-Generator: Launchpad (build Unknown)\n"    #: hggtk\about.py:52
 
14
15
16
17
 
18
19
20
 
14
15
16
 
17
18
19
20
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n" +"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"  "X-Generator: Launchpad (build Unknown)\n"    #: hggtk\about.py:52
Show Entire File i18n/​tortoisehg-pl.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
 
39
40
41
42
 
43
44
45
46
 
47
48
49
50
 
51
52
53
54
 
55
56
57
 
83
84
85
86
 
87
88
89
 
111
112
113
114
 
115
116
117
118
 
119
120
121
122
123
 
 
124
125
126
127
 
128
129
130
131
 
132
133
134
135
 
136
137
138
139
 
140
141
142
143
 
144
145
146
147
 
148
149
150
151
 
152
153
154
155
 
156
157
158
159
 
160
161
162
163
164
 
 
165
166
167
168
 
169
170
171
172
 
173
174
175
176
177
 
 
178
179
180
181
 
182
183
184
185
 
186
187
188
189
 
190
191
192
193
 
194
195
196
197
 
198
199
200
 
204
205
206
207
 
208
209
210
211
 
212
213
214
215
 
216
217
218
219
 
220
221
222
 
226
227
228
229
 
230
231
232
 
234
235
236
237
 
238
239
240
241
 
242
243
244
 
248
249
250
251
 
252
253
254
 
264
265
266
267
 
268
269
270
 
276
277
278
279
280
 
 
281
282
283
284
 
285
286
287
288
 
289
290
291
292
 
293
294
295
296
 
297
298
299
300
 
301
302
303
304
 
305
306
307
308
 
309
310
311
312
 
313
314
315
 
317
318
319
320
 
321
322
323
 
325
326
327
328
 
329
330
331
332
 
333
334
335
336
 
337
338
339
340
 
341
342
343
344
 
345
346
347
348
 
349
350
351
352
 
353
354
355
356
 
357
358
359
360
 
361
362
363
364
 
365
366
367
368
 
369
370
371
372
 
373
374
375
376
 
377
378
379
380
 
381
382
383
384
 
385
386
387
388
 
389
390
391
392
 
393
394
395
 
409
410
411
412
 
413
414
415
416
 
417
418
419
 
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
 
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
 
941
942
943
944
 
945
946
947
948
 
949
950
951
952
 
953
954
955
956
 
957
958
959
960
 
961
962
963
964
 
965
966
967
968
 
969
970
971
972
 
973
974
975
976
 
977
978
979
980
 
981
982
983
984
 
985
986
987
988
 
989
990
991
992
 
993
994
995
996
 
997
998
999
1000
 
1001
1002
1003
1004
 
1005
1006
1007
1008
 
1009
1010
1011
1012
 
1013
1014
1015
1016
 
1017
1018
1019
1020
 
1021
1022
1023
1024
 
1025
1026
1027
1028
 
1029
1030
1031
1032
 
1033
1034
1035
1036
 
1037
1038
1039
1040
 
1041
1042
1043
1044
 
1045
1046
1047
1048
 
1049
1050
1051
1052
 
1053
1054
1055
1056
 
1057
1058
1059
1060
 
1061
1062
1063
1064
 
1065
1066
1067
1068
 
1069
1070
1071
1072
 
1073
1074
1075
 
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
 
1194
1195
1196
1197
 
1198
1199
1200
1201
 
1202
1203
1204
 
1260
1261
1262
1263
 
1264
1265
1266
 
1268
1269
1270
1271
 
1272
1273
1274
1275
 
1276
1277
1278
1279
 
1280
1281
1282
1283
 
1284
1285
1286
 
1308
1309
1310
1311
 
1312
1313
1314
 
1669
1670
1671
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1672
1673
1674
 
1689
1690
1691
1692
 
1693
1694
1695
1696
 
1697
1698
1699
1700
 
1701
1702
1703
1704
 
1705
1706
1707
1708
 
1709
1710
1711
1712
 
1713
1714
1715
1716
 
1717
1718
1719
1720
 
1721
1722
1723
1724
 
1725
1726
1727
1728
 
1729
1730
1731
1732
 
1733
1734
1735
1736
 
1737
1738
1739
1740
 
1741
1742
1743
1744
 
1745
1746
1747
1748
 
1749
1750
1751
1752
 
1753
1754
1755
 
1777
1778
1779
1780
 
1781
1782
1783
1784
 
1785
1786
1787
1788
 
1789
1790
1791
1792
 
1793
1794
1795
1796
 
1797
1798
1799
1800
 
1801
1802
1803
1804
1805
 
 
1806
1807
1808
1809
 
1810
1811
1812
1813
 
1814
1815
1816
1817
 
1818
1819
1820
1821
 
1822
1823
1824
1825
 
1826
1827
1828
1829
 
1830
1831
1832
1833
 
1834
1835
1836
1837
 
1838
1839
1840
1841
 
1842
1843
1844
1845
 
1846
1847
1848
1849
 
1850
1851
1852
1853
 
1854
1855
1856
 
1860
1861
1862
1863
 
1864
1865
1866
 
1870
1871
1872
1873
 
1874
1875
1876
 
1880
1881
1882
1883
 
1884
1885
1886
1887
 
1888
1889
1890
1891
 
1892
1893
1894
1895
 
1896
1897
1898
1899
 
1900
1901
1902
1903
 
1904
1905
1906
1907
 
1908
1909
1910
1911
 
1912
1913
1914
1915
 
1916
1917
1918
 
1940
1941
1942
1943
 
1944
1945
1946
 
1997
1998
1999
2000
 
2001
2002
2003
 
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
 
2084
2085
2086
2087
 
2088
2089
2090
 
2124
2125
2126
2127
 
 
2128
2129
2130
2131
 
2132
2133
2134
 
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
 
2286
2287
2288
2289
 
2290
2291
2292
 
2454
2455
2456
2457
 
2458
2459
2460
2461
 
2462
2463
2464
2465
2466
 
2467
2468
2469
2470
 
2471
2472
2473
2474
 
2475
2476
2477
2478
2479
 
2480
2481
2482
2483
 
2484
2485
2486
2487
 
2488
2489
2490
 
2492
2493
2494
2495
 
2496
2497
2498
2499
 
2500
2501
2502
2503
 
2504
2505
2506
2507
 
2508
2509
2510
2511
 
2512
2513
2514
2515
 
2516
2517
2518
2519
 
2520
2521
2522
2523
 
2524
2525
2526
2527
 
2528
2529
2530
2531
 
2532
2533
2534
2535
 
2536
2537
2538
2539
 
2540
2541
2542
2543
 
2544
2545
2546
2547
 
2548
2549
2550
2551
 
2552
2553
2554
2555
 
2556
2557
2558
2559
 
2560
2561
2562
2563
2564
2565
2566
2567
 
 
 
 
 
2568
2569
2570
2571
 
2572
2573
2574
 
2578
2579
2580
2581
 
2582
2583
2584
2585
 
2586
2587
2588
2589
 
2590
2591
2592
2593
 
2594
2595
2596
2597
 
2598
2599
2600
2601
 
2602
2603
2604
2605
 
2606
2607
2608
2609
 
2610
2611
2612
2613
 
2614
2615
2616
2617
 
2618
2619
2620
2621
2622
 
2623
2624
2625
2626
 
2627
2628
2629
2630
 
2631
2632
2633
2634
 
2635
2636
2637
2638
 
2639
2640
2641
2642
 
2643
2644
2645
2646
 
2647
2648
2649
2650
 
2651
2652
2653
2654
 
2655
2656
2657
2658
 
2659
2660
2661
2662
 
2663
2664
2665
2666
 
2667
2668
2669
2670
 
2671
2672
2673
2674
 
2675
2676
2677
2678
 
2679
2680
2681
2682
 
2683
2684
2685
2686
 
2687
2688
2689
2690
 
2691
2692
2693
2694
 
2695
2696
2697
2698
 
2699
2700
2701
2702
 
2703
2704
2705
2706
 
2707
2708
2709
2710
 
2711
2712
2713
2714
 
2715
2716
2717
2718
 
2719
2720
2721
2722
 
2723
2724
2725
2726
 
2727
2728
2729
2730
 
2731
2732
2733
2734
 
2735
2736
2737
2738
 
2739
2740
2741
2742
 
2743
2744
2745
2746
 
2747
2748
2749
 
2909
2910
2911
2912
 
 
 
2913
2914
2915
 
2916
2917
2918
2919
 
2920
2921
2922
2923
2924
 
2925
2926
2927
2928
 
2929
2930
2931
2932
2933
2934
2935
 
2936
2937
2938
2939
 
2940
2941
2942
2943
 
2944
2945
2946
2947
 
2948
2949
2950
2951
2952
2953
 
2954
2955
2956
2957
 
2958
2959
2960
2961
2962
2963
 
2964
2965
2966
2967
 
2968
2969
2970
 
2974
2975
2976
2977
 
2978
2979
2980
2981
 
2982
2983
2984
 
2987
2988
2989
2990
 
2991
2992
2993
2994
 
2995
2996
2997
2998
 
2999
3000
3001
3002
 
3003
3004
3005
 
3008
3009
3010
3011
 
3012
3013
3014
3015
 
3016
3017
3018
3019
3020
3021
3022
 
3023
3024
3025
3026
 
3027
3028
3029
3030
3031
3032
3033
 
3034
3035
3036
3037
 
3038
3039
3040
3041
3042
3043
3044
 
3045
3046
3047
3048
 
3049
3050
3051
 
3053
3054
3055
3056
 
3057
3058
3059
3060
 
3061
3062
3063
 
3065
3066
3067
3068
 
3069
3070
3071
3072
 
3073
3074
3075
 
3078
3079
3080
3081
 
3082
3083
3084
3085
 
3086
3087
3088
3089
3090
3091
3092
 
3093
3094
3095
3096
 
3097
3098
3099
 
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
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
 
3193
3194
3195
3196
 
3197
3198
3199
3200
 
3201
3202
3203
 
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
 
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
 
3368
3369
3370
3371
 
3372
3373
3374
3375
 
3376
3377
3378
3379
 
3380
3381
3382
3383
 
3384
3385
3386
3387
 
3388
3389
3390
3391
 
3392
3393
3394
3395
3396
 
3397
3398
3399
3400
 
3401
3402
3403
3404
 
3405
3406
3407
3408
 
3409
3410
3411
3412
 
3413
3414
3415
3416
 
3417
3418
3419
3420
 
3421
3422
3423
3424
 
3425
3426
3427
3428
 
3429
3430
3431
3432
 
3433
3434
3435
3436
 
3437
3438
3439
3440
 
3441
3442
3443
3444
 
3445
3446
3447
3448
 
3449
3450
3451
3452
 
3453
3454
3455
3456
 
3457
3458
3459
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
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
 
3521
3522
3523
3524
 
3525
3526
3527
 
3587
3588
3589
3590
 
3591
3592
3593
3594
 
3595
3596
3597
 
7
8
9
 
10
11
12
13
14
15
16
 
17
18
19
20
 
39
40
41
 
42
43
44
45
 
46
47
48
49
 
50
51
52
53
 
54
55
56
57
 
83
84
85
 
86
87
88
89
 
111
112
113
 
114
115
116
117
 
118
119
120
121
 
 
122
123
124
125
126
 
127
128
129
130
 
131
132
133
134
 
135
136
137
138
 
139
140
141
142
 
143
144
145
146
 
147
148
149
150
 
151
152
153
154
 
155
156
157
158
 
159
160
161
162
 
 
163
164
165
166
167
 
168
169
170
171
 
172
173
174
175
 
 
176
177
178
179
180
 
181
182
183
184
 
185
186
187
188
 
189
190
191
192
 
193
194
195
196
 
197
198
199
200
 
204
205
206
 
207
208
209
210
 
211
212
213
214
 
215
216
217
218
 
219
220
221
222
 
226
227
228
 
229
230
231
232
 
234
235
236
 
237
238
239
240
 
241
242
243
244
 
248
249
250
 
251
252
253
254
 
264
265
266
 
267
268
269
270
 
276
277
278
 
 
279
280
281
282
283
 
284
285
286
287
 
288
289
290
291
 
292
293
294
295
 
296
297
298
299
 
300
301
302
303
 
304
305
306
307
 
308
309
310
311
 
312
313
314
315
 
317
318
319
 
320
321
322
323
 
325
326
327
 
328
329
330
331
 
332
333
334
335
 
336
337
338
339
 
340
341
342
343
 
344
345
346
347
 
348
349
350
351
 
352
353
354
355
 
356
357
358
359
 
360
361
362
363
 
364
365
366
367
 
368
369
370
371
 
372
373
374
375
 
376
377
378
379
 
380
381
382
383
 
384
385
386
387
 
388
389
390
391
 
392
393
394
395
 
409
410
411
 
412
413
414
415
 
416
417
418
419
 
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
 
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
 
941
942
943
 
944
945
946
947
 
948
949
950
951
 
952
953
954
955
 
956
957
958
959
 
960
961
962
963
 
964
965
966
967
 
968
969
970
971
 
972
973
974
975
 
976
977
978
979
 
980
981
982
983
 
984
985
986
987
 
988
989
990
991
 
992
993
994
995
 
996
997
998
999
 
1000
1001
1002
1003
 
1004
1005
1006
1007
 
1008
1009
1010
1011
 
1012
1013
1014
1015
 
1016
1017
1018
1019
 
1020
1021
1022
1023
 
1024
1025
1026
1027
 
1028
1029
1030
1031
 
1032
1033
1034
1035
 
1036
1037
1038
1039
 
1040
1041
1042
1043
 
1044
1045
1046
1047
 
1048
1049
1050
1051
 
1052
1053
1054
1055
 
1056
1057
1058
1059
 
1060
1061
1062
1063
 
1064
1065
1066
1067
 
1068
1069
1070
1071
 
1072
1073
1074
1075
 
1133
1134
1135
 
 
 
 
1136
1137
1138
 
1190
1191
1192
 
1193
1194
1195
1196
 
1197
1198
1199
1200
 
1256
1257
1258
 
1259
1260
1261
1262
 
1264
1265
1266
 
1267
1268
1269
1270
 
1271
1272
1273
1274
 
1275
1276
1277
1278
 
1279
1280
1281
1282
 
1304
1305
1306
 
1307
1308
1309
1310
 
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
 
1709
1710
1711
 
1712
1713
1714
1715
 
1716
1717
1718
1719
 
1720
1721
1722
1723
 
1724
1725
1726
1727
 
1728
1729
1730
1731
 
1732
1733
1734
1735
 
1736
1737
1738
1739
 
1740
1741
1742
1743
 
1744
1745
1746
1747
 
1748
1749
1750
1751
 
1752
1753
1754
1755
 
1756
1757
1758
1759
 
1760
1761
1762
1763
 
1764
1765
1766
1767
 
1768
1769
1770
1771
 
1772
1773
1774
1775
 
1797
1798
1799
 
1800
1801
1802
1803
 
1804
1805
1806
1807
 
1808
1809
1810
1811
 
1812
1813
1814
1815
 
1816
1817
1818
1819
 
1820
1821
1822
1823
 
 
1824
1825
1826
1827
1828
 
1829
1830
1831
1832
 
1833
1834
1835
1836
 
1837
1838
1839
1840
 
1841
1842
1843
1844
 
1845
1846
1847
1848
 
1849
1850
1851
1852
 
1853
1854
1855
1856
 
1857
1858
1859
1860
 
1861
1862
1863
1864
 
1865
1866
1867
1868
 
1869
1870
1871
1872
 
1873
1874
1875
1876
 
1880
1881
1882
 
1883
1884
1885
1886
 
1890
1891
1892
 
1893
1894
1895
1896
 
1900
1901
1902
 
1903
1904
1905
1906
 
1907
1908
1909
1910
 
1911
1912
1913
1914
 
1915
1916
1917
1918
 
1919
1920
1921
1922
 
1923
1924
1925
1926
 
1927
1928
1929
1930
 
1931
1932
1933
1934
 
1935
1936
1937
1938
 
1960
1961
1962
 
1963
1964
1965
1966
 
2017
2018
2019
 
2020
2021
2022
2023
 
2044
2045
2046
 
2047
2048
2049
2050
2051
2052
2053
2054
 
2055
2056
2057
2058
 
2059
2060
2061
2062
 
2063
2064
2065
2066
 
2067
2068
2069
2070
 
2071
2072
2073
2074
 
2075
2076
2077
2078
 
2079
2080
2081
2082
 
2108
2109
2110
 
2111
2112
2113
2114
 
2148
2149
2150
 
2151
2152
2153
2154
2155
 
2156
2157
2158
2159
 
2227
2228
2229
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2230
2231
2232
 
2287
2288
2289
 
2290
2291
2292
2293
 
2455
2456
2457
 
2458
2459
2460
2461
 
2462
2463
2464
2465
2466
 
2467
2468
2469
2470
 
2471
2472
2473
2474
 
2475
2476
2477
2478
2479
 
2480
2481
2482
2483
 
2484
2485
2486
2487
 
2488
2489
2490
2491
 
2493
2494
2495
 
2496
2497
2498
2499
 
2500
2501
2502
2503
 
2504
2505
2506
2507
 
2508
2509
2510
2511
 
2512
2513
2514
2515
 
2516
2517
2518
2519
 
2520
2521
2522
2523
 
2524
2525
2526
2527
 
2528
2529
2530
2531
 
2532
2533
2534
2535
 
2536
2537
2538
2539
 
2540
2541
2542
2543
 
2544
2545
2546
2547
 
2548
2549
2550
2551
 
2552
2553
2554
2555
 
2556
2557
2558
2559
 
2560
2561
2562
2563
 
 
 
 
 
2564
2565
2566
2567
2568
2569
2570
2571
 
2572
2573
2574
2575
 
2579
2580
2581
 
2582
2583
2584
2585
 
2586
2587
2588
2589
 
2590
2591
2592
2593
 
2594
2595
2596
2597
 
2598
2599
2600
2601
 
2602
2603
2604
2605
 
2606
2607
2608
2609
 
2610
2611
2612
2613
 
2614
2615
2616
2617
 
2618
2619
2620
2621
2622
 
2623
2624
2625
2626
 
2627
2628
2629
2630
 
2631
2632
2633
2634
 
2635
2636
2637
2638
 
2639
2640
2641
2642
 
2643
2644
2645
2646
 
2647
2648
2649
2650
 
2651
2652
2653
2654
 
2655
2656
2657
2658
 
2659
2660
2661
2662
 
2663
2664
2665
2666
 
2667
2668
2669
2670
 
2671
2672
2673
2674
 
2675
2676
2677
2678
 
2679
2680
2681
2682
 
2683
2684
2685
2686
 
2687
2688
2689
2690
 
2691
2692
2693
2694
 
2695
2696
2697
2698
 
2699
2700
2701
2702
 
2703
2704
2705
2706
 
2707
2708
2709
2710
 
2711
2712
2713
2714
 
2715
2716
2717
2718
 
2719
2720
2721
2722
 
2723
2724
2725
2726
 
2727
2728
2729
2730
 
2731
2732
2733
2734
 
2735
2736
2737
2738
 
2739
2740
2741
2742
 
2743
2744
2745
2746
 
2747
2748
2749
2750
 
2910
2911
2912
 
2913
2914
2915
2916
2917
 
2918
2919
2920
2921
 
2922
2923
2924
2925
2926
 
2927
2928
2929
2930
 
2931
2932
2933
2934
2935
2936
2937
 
2938
2939
2940
2941
 
2942
2943
2944
2945
 
2946
2947
2948
2949
 
2950
2951
2952
2953
2954
2955
 
2956
2957
2958
2959
 
2960
2961
2962
2963
2964
2965
 
2966
2967
2968
2969
 
2970
2971
2972
2973
 
2977
2978
2979
 
2980
2981
2982
2983
 
2984
2985
2986
2987
 
2990
2991
2992
 
2993
2994
2995
2996
 
2997
2998
2999
3000
 
3001
3002
3003
3004
 
3005
3006
3007
3008
 
3011
3012
3013
 
3014
3015
3016
3017
 
3018
3019
3020
3021
3022
3023
3024
 
3025
3026
3027
3028
 
3029
3030
3031
3032
3033
3034
3035
 
3036
3037
3038
3039
 
3040
3041
3042
3043
3044
3045
3046
 
3047
3048
3049
3050
 
3051
3052
3053
3054
 
3056
3057
3058
 
3059
3060
3061
3062
 
3063
3064
3065
3066
 
3068
3069
3070
 
3071
3072
3073
3074
 
3075
3076
3077
3078
 
3081
3082
3083
 
3084
3085
3086
3087
 
3088
3089
3090
3091
3092
3093
3094
 
3095
3096
3097
3098
 
3099
3100
3101
3102
 
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
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
 
3196
3197
3198
 
3199
3200
3201
3202
 
3203
3204
3205
3206
 
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
 
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
3368
3369
 
3370
3371
3372
3373
 
3374
3375
3376
3377
 
3378
3379
3380
3381
 
3382
3383
3384
3385
 
3386
3387
3388
3389
 
3390
3391
3392
3393
 
3394
3395
3396
3397
3398
 
3399
3400
3401
3402
 
3403
3404
3405
3406
 
3407
3408
3409
3410
 
3411
3412
3413
3414
 
3415
3416
3417
3418
 
3419
3420
3421
3422
 
3423
3424
3425
3426
 
3427
3428
3429
3430
 
3431
3432
3433
3434
 
3435
3436
3437
3438
 
3439
3440
3441
3442
 
3443
3444
3445
3446
 
3447
3448
3449
3450
 
3451
3452
3453
3454
 
3455
3456
3457
3458
 
3459
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
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
3521
3522
 
3523
3524
3525
3526
 
3527
3528
3529
3530
 
3590
3591
3592
 
3593
3594
3595
3596
 
3597
3598
3599
3600
@@ -7,14 +7,14 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-06-15 05:36+0000\n" +"POT-Creation-Date: 2009-06-23 04:45+0000\n"  "PO-Revision-Date: 2009-06-16 15:10+0000\n"  "Last-Translator: lloco73 <Unknown>\n"  "Language-Team: Portuguese <pt@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: 2009-06-23 03:52+0000\n" +"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"  "X-Generator: Launchpad (build Unknown)\n"    #: hggtk\about.py:52 @@ -39,19 +39,19 @@
 msgid "TortoiseHg Bug Report"  msgstr "Relatório de erro do TortoiseHg"   -#: hggtk\changeset.py:145 +#: hggtk\changeset.py:147  msgid "changeset:"  msgstr "changeset:"   -#: hggtk\changeset.py:295 hggtk\datamine.py:117 +#: hggtk\changeset.py:297 hggtk\datamine.py:117  msgid "_file history"  msgstr "histórico do _ficheiro"   -#: hggtk\changeset.py:296 hggtk\datamine.py:116 +#: hggtk\changeset.py:298 hggtk\datamine.py:116  msgid "_annotate file"  msgstr "_anotar ficheiro"   -#: hggtk\changeset.py:358 hggtk\hgignore.py:109 +#: hggtk\changeset.py:360 hggtk\hgignore.py:109  msgid "Files"  msgstr "Ficheiros"   @@ -83,7 +83,7 @@
 msgid "use uncompressed transfer"  msgstr "usar transferência sem compressão"   -#: hggtk\clone.py:130 hggtk\synch.py:148 +#: hggtk\clone.py:130 hggtk\synch.py:149  msgid "use proxy server"  msgstr "usar servidor proxy"   @@ -111,90 +111,90 @@
 msgid "Clone error"  msgstr "Erro ao clonar"   -#: hggtk\commit.py:153 +#: hggtk\commit.py:154  msgid "_Undo"  msgstr "An_ular"   -#: hggtk\commit.py:154 +#: hggtk\commit.py:155  msgid "undo recent commit"  msgstr "anular commit recente"   -#: hggtk\commit.py:155 hggtk\commit.py:363 hggtk\commit.py:372 -#: hggtk\commit.py:380 hggtk\commit.py:381 +#: hggtk\commit.py:156 hggtk\commit.py:364 hggtk\commit.py:373 +#: hggtk\commit.py:381 hggtk\commit.py:382  msgid "_Commit"  msgstr "_Enviar"   -#: hggtk\commit.py:156 hggtk\commit.py:382 +#: hggtk\commit.py:157 hggtk\commit.py:383  msgid "commit"  msgstr "enviar"   -#: hggtk\commit.py:169 +#: hggtk\commit.py:170  msgid "Discard current commit message?"  msgstr "Ignorar a mensagem de commit actual?"   -#: hggtk\commit.py:229 +#: hggtk\commit.py:230  msgid "Recent Commit Messages..."  msgstr "Mensagens de Commit recentes..."   -#: hggtk\commit.py:292 +#: hggtk\commit.py:293  msgid "Save commit message at exit?"  msgstr "Guardar mensagem de envio ao sair?"   -#: hggtk\commit.py:333 hggtk\status.py:204 +#: hggtk\commit.py:334 hggtk\status.py:204  msgid "Re_vert"  msgstr "Re_verter"   -#: hggtk\commit.py:334 hggtk\status.py:206 hggtk\thgconfig.py:742 +#: hggtk\commit.py:335 hggtk\status.py:206 hggtk\thgconfig.py:744  msgid "_Add"  msgstr "_Adicionar"   -#: hggtk\commit.py:335 hggtk\status.py:211 hggtk\thgconfig.py:752 +#: hggtk\commit.py:336 hggtk\status.py:211 hggtk\thgconfig.py:754  msgid "_Remove"  msgstr "_Remover"   -#: hggtk\commit.py:336 hggtk\status.py:208 +#: hggtk\commit.py:337 hggtk\status.py:208  msgid "Move"  msgstr "Mover"   -#: hggtk\commit.py:347 +#: hggtk\commit.py:348  msgid "merge"  msgstr "juntar"   -#: hggtk\commit.py:365 hggtk\commit.py:366 hggtk\commit.py:373 -#: hggtk\commit.py:374 +#: hggtk\commit.py:366 hggtk\commit.py:367 hggtk\commit.py:374 +#: hggtk\commit.py:375  msgid "QNew"  msgstr "QNew"   -#: hggtk\commit.py:369 hggtk\commit.py:370 +#: hggtk\commit.py:370 hggtk\commit.py:371  msgid "QRefresh"  msgstr "QRefresh"   -#: hggtk\commit.py:405 hggtk\commit.py:550 +#: hggtk\commit.py:406 hggtk\commit.py:561  msgid "Nothing Commited"  msgstr "Nada enviado"   -#: hggtk\commit.py:423 hggtk\commit.py:472 hggtk\merge.py:83 -#: hggtk\thgconfig.py:463 +#: hggtk\commit.py:424 hggtk\commit.py:479 hggtk\merge.py:83 +#: hggtk\thgconfig.py:465  msgid "Commit"  msgstr "Enviar"   -#: hggtk\commit.py:424 +#: hggtk\commit.py:425  msgid "Unable to create "  msgstr "Impossível criar "   -#: hggtk\commit.py:473 +#: hggtk\commit.py:480  msgid "Unable to apply patch"  msgstr "Impossível aplicar patch"   -#: hggtk\commit.py:512 +#: hggtk\commit.py:519  msgid "Undo last commit"  msgstr "Anumar o último commit"   -#: hggtk\commit.py:518 hggtk\commit.py:529 +#: hggtk\commit.py:525 hggtk\commit.py:540  msgid "Undo commit"  msgstr "Anular commit"   -#: hggtk\commit.py:519 +#: hggtk\commit.py:526  msgid ""  "Unable to undo!\n"  "\n" @@ -204,19 +204,19 @@
 "\n"  "A revisão Tip é diferente do último commit!"   -#: hggtk\commit.py:530 +#: hggtk\commit.py:541  msgid "Errors during rollback!"  msgstr "Erro durante rollback!"   -#: hggtk\commit.py:551 hggtk\tagadd.py:174 +#: hggtk\commit.py:562 hggtk\tagadd.py:174  msgid "Please enter commit message"  msgstr "Escreva a mensagem de commit"   -#: hggtk\commit.py:604 +#: hggtk\commit.py:615  msgid "Commit: Invalid username"  msgstr "Commit: nome de utilizador inválido"   -#: hggtk\commit.py:605 +#: hggtk\commit.py:616  msgid ""  "Your username has not been configured.\n"  "\n" @@ -226,7 +226,7 @@
 "\n"  "Configure o seu nome de utilizador e tente novamente"   -#: hggtk\commit.py:628 +#: hggtk\commit.py:639  msgid ""  "A branch named \"%s\" already exists,\n"  "override?" @@ -234,11 +234,11 @@
 "Já existe um ramo com o nome \"%s\" ,\n"  "sobrepor?"   -#: hggtk\commit.py:634 +#: hggtk\commit.py:645  msgid "Create new named branch \"%s\"?"  msgstr "Criar um novo ramo com o nome \"%s\"?"   -#: hggtk\commit.py:732 hggtk\hgemail.py:307 hggtk\hgemail.py:312 +#: hggtk\commit.py:743 hggtk\hgemail.py:307 hggtk\hgemail.py:312  #: hggtk\hgemail.py:321  msgid "Info required"  msgstr "Info necessária" @@ -248,7 +248,7 @@
 msgstr "DataMining"    #: hggtk\datamine.py:44 hggtk\hgcmd.py:37 hggtk\recovery.py:43 -#: hggtk\serve.py:61 hggtk\synch.py:59 +#: hggtk\serve.py:61 hggtk\synch.py:60  msgid "Stop"  msgstr "Parar"   @@ -264,7 +264,7 @@
 msgid "Open new search tab"  msgstr "Abrir novo separador de pesquisa"   -#: hggtk\datamine.py:61 hggtk\thgconfig.py:943 +#: hggtk\datamine.py:61 hggtk\thgconfig.py:947  msgid "Invalid path"  msgstr "Caminho inválido"   @@ -276,40 +276,40 @@
 msgid "Filename"  msgstr "Nome do ficheiro"   -#: hggtk\datamine.py:107 hggtk\datamine.py:524 hggtk\logview\treeview.py:423 -#: hggtk\thgconfig.py:158 hggtk\thgconfig.py:231 +#: hggtk\datamine.py:107 hggtk\datamine.py:525 hggtk\logview\treeview.py:423 +#: hggtk\thgconfig.py:160 hggtk\thgconfig.py:233  msgid "User"  msgstr "Utilizador"   -#: hggtk\datamine.py:115 hggtk\datamine.py:124 +#: hggtk\datamine.py:115 hggtk\datamine.py:124 hggtk\history.py:391  msgid "di_splay change"  msgstr "mudar di_splay"   -#: hggtk\datamine.py:215 +#: hggtk\datamine.py:216  msgid "Search"  msgstr "Pesquisar"   -#: hggtk\datamine.py:216 hggtk\hgignore.py:49 +#: hggtk\datamine.py:217 hggtk\hgignore.py:49  msgid "Regexp:"  msgstr "Expressão regular:"   -#: hggtk\datamine.py:218 +#: hggtk\datamine.py:219  msgid "Includes:"  msgstr "Inclui:"   -#: hggtk\datamine.py:220 +#: hggtk\datamine.py:221  msgid "Excludes:"  msgstr "Exclui:"   -#: hggtk\datamine.py:223 +#: hggtk\datamine.py:224  msgid "Start this search"  msgstr "Iniciar esta pesquisa"   -#: hggtk\datamine.py:224 +#: hggtk\datamine.py:225  msgid "Regular expression search pattern"  msgstr "Padrão de pesquisa de padrão regular"   -#: hggtk\datamine.py:225 +#: hggtk\datamine.py:226  msgid ""  "Comma separated list of inclusion patterns. By default, the entire "  "repository is searched." @@ -317,7 +317,7 @@
 "Lista separada por vírgulas de padrões incluídos. Por pré-definição, a "  "totalidade do repositório é pesquisada."   -#: hggtk\datamine.py:228 +#: hggtk\datamine.py:229  msgid ""  "Comma separated list of exclusion patterns. Exclusion patterns are applied "  "after inclusion patterns." @@ -325,71 +325,71 @@
 "Lista separada por vírgulas de padrões excluídos. Padrões de exclusão são "  "aplicados após os padrões de inclusão."   -#: hggtk\datamine.py:234 +#: hggtk\datamine.py:235  msgid "Follow copies and renames"  msgstr "Seguir cópias e renomeações"   -#: hggtk\datamine.py:235 +#: hggtk\datamine.py:236  msgid "Ignore case"  msgstr "Ignorar a capitalização"   -#: hggtk\datamine.py:236 +#: hggtk\datamine.py:237  msgid "Show line numbers"  msgstr "Mostrar o número das linhas"   -#: hggtk\datamine.py:237 +#: hggtk\datamine.py:238  msgid "Show all matching revisions"  msgstr "Mostra todas as revisões que correspondem"   -#: hggtk\datamine.py:265 hggtk\datamine.py:522 hggtk\logview\treeview.py:372 +#: hggtk\datamine.py:266 hggtk\datamine.py:523 hggtk\logview\treeview.py:372  msgid "Rev"  msgstr "Rev"   -#: hggtk\datamine.py:266 hggtk\datamine.py:523 +#: hggtk\datamine.py:267 hggtk\datamine.py:524  msgid "File"  msgstr "Ficheiro"   -#: hggtk\datamine.py:267 +#: hggtk\datamine.py:268  msgid "Matches"  msgstr "Correspondências"   -#: hggtk\datamine.py:289 +#: hggtk\datamine.py:290  msgid "Search %d"  msgstr "Pesquisar %d"   -#: hggtk\datamine.py:331 +#: hggtk\datamine.py:332  msgid "No regular expression given"  msgstr "Nenhuma expressão regular dada"   -#: hggtk\datamine.py:332 +#: hggtk\datamine.py:333  msgid "You must provide a search expression"  msgstr "Tem de fornecer uma expressão para pesquisar"   -#: hggtk\datamine.py:360 +#: hggtk\datamine.py:361  msgid "Search \"%s\""  msgstr "Pesquisar \"%s\""   -#: hggtk\datamine.py:472 +#: hggtk\datamine.py:473  msgid "File is unrevisioned"  msgstr "O ficheiro não tem revisão"   -#: hggtk\datamine.py:473 +#: hggtk\datamine.py:474  msgid "Unable to annotate "  msgstr "Impossível anotar "   -#: hggtk\datamine.py:493 +#: hggtk\datamine.py:494  msgid "Follow"  msgstr "Seguir"   -#: hggtk\datamine.py:521 +#: hggtk\datamine.py:522  msgid "Line"  msgstr "Linha"   -#: hggtk\datamine.py:525 hggtk\guess.py:100 +#: hggtk\datamine.py:526 hggtk\guess.py:100  msgid "Source"  msgstr "Fonte"   -#: hggtk\datamine.py:617 +#: hggtk\datamine.py:618  msgid "Follow Rename:"  msgstr "Seguir renomeação:"   @@ -409,11 +409,11 @@
 msgid "edit failed"  msgstr "editar falhou"   -#: hggtk\gdialog.py:500 hggtk\thgconfig.py:541 +#: hggtk\gdialog.py:500 hggtk\thgconfig.py:543  msgid "No visual editor configured"  msgstr "Nenhum editor visual configurado"   -#: hggtk\gdialog.py:501 hggtk\thgconfig.py:542 +#: hggtk\gdialog.py:501 hggtk\thgconfig.py:544  msgid "Please configure a visual editor."  msgstr "Por favor configure um editor visual"   @@ -653,27 +653,27 @@
 msgid "Create"  msgstr "Criar"   -#: hggtk\hginit.py:121 +#: hggtk\hginit.py:116  msgid "Destination path is empty"  msgstr "O caminho de destino está vazio"   -#: hggtk\hginit.py:122 +#: hggtk\hginit.py:117  msgid "Please enter the directory path"  msgstr "Escreva o caminho da directoria"   -#: hggtk\hginit.py:136 +#: hggtk\hginit.py:131  msgid "Unable to create new repository"  msgstr "Não foi possível criar o novo repositório"   -#: hggtk\hginit.py:140 hggtk\hginit.py:145 +#: hggtk\hginit.py:135 hggtk\hginit.py:140  msgid "Error when creating repository"  msgstr "Erro ao criar o repositório"   -#: hggtk\hginit.py:162 +#: hggtk\hginit.py:157  msgid "New repository created"  msgstr "Criado novo repositório"   -#: hggtk\hginit.py:163 +#: hggtk\hginit.py:158  msgid "in directory %s"  msgstr "na directoria %s"   @@ -744,68 +744,68 @@
 msgid "applying patch\n"  msgstr "a aplicar patch\n"   -#: hggtk\hgshelve.py:509 +#: hggtk\hgshelve.py:514  msgid "saving patch to shelve\n"  msgstr "a guardar patch no arquivo\n"   -#: hggtk\hgshelve.py:520 hggtk\hgshelve.py:571 +#: hggtk\hgshelve.py:525 hggtk\hgshelve.py:576  msgid "restoring %r to %r\n"  msgstr "a restaurar %r para %r\n"   -#: hggtk\hgshelve.py:522 +#: hggtk\hgshelve.py:527  msgid "removing shelve file\n"  msgstr "a remover o ficheiro de arquivo\n"   -#: hggtk\hgshelve.py:531 +#: hggtk\hgshelve.py:536  msgid "removing backup for %r : %r\n"  msgstr "a remover backup para %r: %r\n"   -#: hggtk\hgshelve.py:556 +#: hggtk\hgshelve.py:561  msgid "applying shelved patch\n"  msgstr "a aplicar patch arquivada\n"   -#: hggtk\hgshelve.py:569 +#: hggtk\hgshelve.py:574  msgid "restoring backup files\n"  msgstr "a restaurar ficheiros de backup\n"   -#: hggtk\hgshelve.py:576 +#: hggtk\hgshelve.py:581  msgid "removing backup files\n"  msgstr "a remover ficheiros de backup\n"   -#: hggtk\hgshelve.py:582 +#: hggtk\hgshelve.py:587  msgid "removing shelved patches\n"  msgstr "a remover patches arquivadas\n"   -#: hggtk\hgshelve.py:584 +#: hggtk\hgshelve.py:589  msgid "unshelve completed\n"  msgstr "desarquivar finalizado\n"   -#: hggtk\hgshelve.py:586 +#: hggtk\hgshelve.py:591  msgid "nothing to unshelve\n"  msgstr "nada para desarquivar\n"   -#: hggtk\hgshelve.py:592 +#: hggtk\hgshelve.py:597  msgid "mark new/missing files as added/removed before shelving"  msgstr ""  "marcar ficheiros novos/perdidos como adicionados/removidos antes de arquivar"   -#: hggtk\hgshelve.py:594 +#: hggtk\hgshelve.py:599  msgid "overwrite existing shelve data"  msgstr "sobrescrever os dados do arquivo existentes"   -#: hggtk\hgshelve.py:596 +#: hggtk\hgshelve.py:601  msgid "append to existing shelve data"  msgstr "anexar ao arquivo de dados existente"   -#: hggtk\hgshelve.py:598 +#: hggtk\hgshelve.py:603  msgid "hg shelve [OPTION]... [FILE]..."  msgstr "hg shelve [OPTION]... [FILE]..."   -#: hggtk\hgshelve.py:601 +#: hggtk\hgshelve.py:606  msgid "inspect shelved changes only"  msgstr "inpeccionar apenas as alterações do arquivo"   -#: hggtk\hgshelve.py:605 +#: hggtk\hgshelve.py:610  msgid "hg unshelve [OPTION]... [FILE]..."  msgstr "hg unshelve [OPTION]... [FILE]..."   @@ -941,135 +941,135 @@
 msgid "display help and exit"  msgstr "mostrar ajuda e sair"   -#: hggtk\hgtk.py:586 +#: hggtk\hgtk.py:587  msgid "read file list from file"  msgstr "ler lista do ficheiro apartir do ficheiro"   -#: hggtk\hgtk.py:590 +#: hggtk\hgtk.py:591  msgid "hgtk about"  msgstr "sobre o hgtk"   -#: hggtk\hgtk.py:591 +#: hggtk\hgtk.py:592  msgid "hgtk add [FILE]..."  msgstr "hgtk adicionar [FILE]..."   -#: hggtk\hgtk.py:592 +#: hggtk\hgtk.py:593  msgid "hgtk clone SOURCE [DEST]"  msgstr "hgtk clone FONTE [DEST]"   -#: hggtk\hgtk.py:594 +#: hggtk\hgtk.py:595  msgid "record user as committer"  msgstr "guardar utilizador como commiter"   -#: hggtk\hgtk.py:595 +#: hggtk\hgtk.py:596  msgid "record datecode as commit date"  msgstr "guardar datecode como data de commit"   -#: hggtk\hgtk.py:596 +#: hggtk\hgtk.py:597  msgid "hgtk commit [OPTIONS] [FILE]..."  msgstr "hgtk cometer [OPTIONS] [FILE]..."   -#: hggtk\hgtk.py:597 +#: hggtk\hgtk.py:598  msgid "hgtk datamine"  msgstr "hgtk datamine"   -#: hggtk\hgtk.py:598 +#: hggtk\hgtk.py:599  msgid "hgtk hgignore [FILE]"  msgstr "hgtk hgignore [FICHEIRO]"   -#: hggtk\hgtk.py:599 +#: hggtk\hgtk.py:600  msgid "hgtk init [DEST]"  msgstr "hgtk init [DEST]"   -#: hggtk\hgtk.py:601 +#: hggtk\hgtk.py:602  msgid "limit number of changes displayed"  msgstr "limitar números de alterações a mostrar"   -#: hggtk\hgtk.py:602 +#: hggtk\hgtk.py:603  msgid "hgtk log [OPTIONS] [FILE]"  msgstr "hgtk registo [OPTIONS] [FILE]"   -#: hggtk\hgtk.py:605 +#: hggtk\hgtk.py:606  msgid "hgtk merge"  msgstr "hgtk merge"   -#: hggtk\hgtk.py:606 +#: hggtk\hgtk.py:607  msgid "hgtk recovery"  msgstr "hgtk recuperar"   -#: hggtk\hgtk.py:607 +#: hggtk\hgtk.py:608  msgid "hgtk shelve"  msgstr "hgtk arquivar"   -#: hggtk\hgtk.py:608 +#: hggtk\hgtk.py:609  msgid "hgtk synch"  msgstr "hgtk sincro"   -#: hggtk\hgtk.py:611 +#: hggtk\hgtk.py:612  msgid "hgtk status [FILE]..."  msgstr "hgtk estado [FILE]..."   -#: hggtk\hgtk.py:612 +#: hggtk\hgtk.py:613  msgid "hgtk userconfig"  msgstr "hgtk userconfig"   -#: hggtk\hgtk.py:613 +#: hggtk\hgtk.py:614  msgid "hgtk repoconfig"  msgstr "hgtk repoconfig"   -#: hggtk\hgtk.py:614 +#: hggtk\hgtk.py:615  msgid "hgtk guess"  msgstr "hgtk guess"   -#: hggtk\hgtk.py:615 +#: hggtk\hgtk.py:616  msgid "hgtk remove [FILE]..."  msgstr "hgtk remover [FILE]..."   -#: hggtk\hgtk.py:616 +#: hggtk\hgtk.py:617  msgid "hgtk rename SOURCE [DEST]"  msgstr "hgtk renomear SOURCE [DEST]"   -#: hggtk\hgtk.py:617 +#: hggtk\hgtk.py:618  msgid "hgtk revert [FILE]..."  msgstr "hgtk reverter [FILE]..."   -#: hggtk\hgtk.py:620 +#: hggtk\hgtk.py:621  msgid "name of the webdir config file"  msgstr "nome do ficheiro de configuração webdir"   -#: hggtk\hgtk.py:621 +#: hggtk\hgtk.py:622  msgid "hgtk serve [OPTION]..."  msgstr "hgtk serve [OPTION]..."   -#: hggtk\hgtk.py:634 +#: hggtk\hgtk.py:635  msgid "changeset to view in diff tool"  msgstr "changeset para ver na ferramenta de diff"   -#: hggtk\hgtk.py:635 +#: hggtk\hgtk.py:636  msgid "revisions to view in diff tool"  msgstr "revisões para ver na ferramenta de diff"   -#: hggtk\hgtk.py:636 +#: hggtk\hgtk.py:637  msgid "launch visual diff tool"  msgstr "iniciar a ferramenta de diff visual"   -#: hggtk\hgtk.py:638 +#: hggtk\hgtk.py:639  msgid "print license"  msgstr "imprimir licença"   -#: hggtk\hgtk.py:639 +#: hggtk\hgtk.py:640  msgid "hgtk version [OPTION]"  msgstr "hgtk versão [OPTION]"   -#: hggtk\hgtk.py:641 +#: hggtk\hgtk.py:642  msgid "show the command options"  msgstr "mostrar as opções dos comandos"   -#: hggtk\hgtk.py:642 +#: hggtk\hgtk.py:643  msgid "[-o] CMD"  msgstr "[-o] CMD"   -#: hggtk\hgtk.py:643 +#: hggtk\hgtk.py:644  msgid "hgtk help [COMMAND]"  msgstr "hgtk help [COMMAND]"   @@ -1133,10 +1133,6 @@
 msgid "Custom Filter"  msgstr "Filtro Personalizado"   -#: hggtk\history.py:390 -msgid "di_splay" -msgstr "mo_strar" -  #: hggtk\history.py:393  msgid "_update"  msgstr "act_ualizar" @@ -1194,11 +1190,11 @@
 msgid "Remove revision %d and all descendants?"  msgstr "Remover a revisão %d e todos os seus descendentes?"   -#: hggtk\history.py:660 hggtk\status.py:1051 +#: hggtk\history.py:660 hggtk\status.py:1045  msgid "Save patch to"  msgstr "Guardar patch em"   -#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:450 +#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:452  msgid "Apply"  msgstr "Aplicar"   @@ -1260,7 +1256,7 @@
 msgid "TortoiseHg Recovery - "  msgstr "Recuperação do TortoiseHg - "   -#: hggtk\recovery.py:43 hggtk\synch.py:59 +#: hggtk\recovery.py:43 hggtk\synch.py:60  msgid "Stop the hg operation"  msgstr "Parar a operação do hg"   @@ -1268,19 +1264,19 @@
 msgid "Validate repository consistency"  msgstr "Validar consistência do repositório"   -#: hggtk\recovery.py:99 hggtk\synch.py:381 +#: hggtk\recovery.py:99 hggtk\synch.py:367  msgid "Cannot close now"  msgstr "Não é possível fechar agora"   -#: hggtk\recovery.py:100 hggtk\synch.py:382 +#: hggtk\recovery.py:100 hggtk\synch.py:368  msgid "command is running"  msgstr "o comando está em execução"   -#: hggtk\recovery.py:159 hggtk\synch.py:521 +#: hggtk\recovery.py:159 hggtk\synch.py:507  msgid "Cannot run now"  msgstr "Não é possível executar agora"   -#: hggtk\recovery.py:222 hggtk\synch.py:615 +#: hggtk\recovery.py:222 hggtk\synch.py:601  msgid "[command interrupted]"  msgstr "[comando interrompido]"   @@ -1308,7 +1304,7 @@
 msgid "Launch browser to view repository"  msgstr "Iniciar navegador para ver o repositório"   -#: hggtk\serve.py:69 hggtk\synch.py:92 +#: hggtk\serve.py:69 hggtk\synch.py:93  msgid "Configure"  msgstr "Configurar"   @@ -1669,6 +1665,30 @@
 "change being backed out."  msgstr ""   +#: hggtk\backout.py:95 hggtk\merge.py:104 +msgid "rev" +msgstr "rev" + +#: hggtk\backout.py:96 hggtk\merge.py:105 +msgid "summary" +msgstr "sumário" + +#: hggtk\backout.py:97 hggtk\merge.py:106 +msgid "user" +msgstr "utilizador" + +#: hggtk\backout.py:98 hggtk\merge.py:107 +msgid "date" +msgstr "data" + +#: hggtk\backout.py:101 hggtk\merge.py:111 +msgid "branch" +msgstr "ramo" + +#: hggtk\backout.py:103 hggtk\merge.py:113 +msgid "tags" +msgstr "etiquetas" +  #: hggtk\bugreport.py:48  msgid ""  "** Please report this bug to tortoisehg-discuss@lists.sourceforge.net or " @@ -1689,67 +1709,67 @@
 msgid "[All Files]"  msgstr "[Todos os Ficheiros]"   -#: hggtk\changeset.py:147 +#: hggtk\changeset.py:149  msgid "branch:"  msgstr "ramo:"   -#: hggtk\changeset.py:148 +#: hggtk\changeset.py:150  msgid "user/date:"  msgstr "utilizador/data:"   -#: hggtk\changeset.py:156 +#: hggtk\changeset.py:158  msgid "parent:"  msgstr "parent:"   -#: hggtk\changeset.py:169 +#: hggtk\changeset.py:171  msgid "child:"  msgstr "child:"   -#: hggtk\changeset.py:175 +#: hggtk\changeset.py:177  msgid "tags:"  msgstr "etiquetas:"   -#: hggtk\changeset.py:195 +#: hggtk\changeset.py:197  msgid " %s is larger than the specified max diff size"  msgstr " %s é maior que o tamanho máx. de diff especificado"   -#: hggtk\changeset.py:290 +#: hggtk\changeset.py:292  msgid "_visual diff"  msgstr "diff _visual"   -#: hggtk\changeset.py:291 +#: hggtk\changeset.py:293  msgid "diff to _local"  msgstr "diff para _local"   -#: hggtk\changeset.py:292 +#: hggtk\changeset.py:294  msgid "_view at revision"  msgstr "_ver na revisão"   -#: hggtk\changeset.py:293 +#: hggtk\changeset.py:295  msgid "_save at revision"  msgstr "guardar _na revisão"   -#: hggtk\changeset.py:298 +#: hggtk\changeset.py:300  msgid "_revert file contents"  msgstr "_reverter conteúdo dos ficheiros"   -#: hggtk\changeset.py:356 +#: hggtk\changeset.py:358  msgid "Stat"  msgstr "Estat"   -#: hggtk\changeset.py:480 +#: hggtk\changeset.py:482  msgid "Save file to"  msgstr "Guardar ficheiro em"   -#: hggtk\changeset.py:545 +#: hggtk\changeset.py:547  msgid "Confirm revert file to old revision"  msgstr "Confirmar reversão do ficheiro para a revisão anterior"   -#: hggtk\changeset.py:546 +#: hggtk\changeset.py:548  msgid "Revert %s to contents at revision %d?"  msgstr "Reverter %s para o conteúdo da revisão %d?"   -#: hggtk\changeset.py:558 hggtk\synch.py:649 +#: hggtk\changeset.py:560 hggtk\synch.py:635  msgid "Toggle _Wordwrap"  msgstr "Trocar _Wordwrap"   @@ -1777,80 +1797,80 @@
 msgid "Please enter a valid source path"  msgstr "Escreva um caminho válido"   -#: hggtk\commit.py:32 +#: hggtk\commit.py:33  msgid "Branch Operations"  msgstr "Operações Branch"   -#: hggtk\commit.py:36 +#: hggtk\commit.py:37  msgid "Changes take effect on next commit"  msgstr "As alterações terão efeito no próximo commit"   -#: hggtk\commit.py:37 +#: hggtk\commit.py:38  msgid "No branch changes"  msgstr "Sem alterações no ramo"   -#: hggtk\commit.py:39 +#: hggtk\commit.py:40  msgid "Open a new named branch"  msgstr "Abrir um novo ramo"   -#: hggtk\commit.py:41 +#: hggtk\commit.py:42  msgid "Close current named branch"  msgstr "Fechar o ramo actual"   -#: hggtk\commit.py:168 +#: hggtk\commit.py:169  msgid "Confirm Discard Message"  msgstr "Confirmar rejeição da mensagem"   -#: hggtk\commit.py:268 hggtk\commit.py:269 hggtk\commit.py:270 -#: hggtk\commit.py:273 +#: hggtk\commit.py:269 hggtk\commit.py:270 hggtk\commit.py:271 +#: hggtk\commit.py:274  msgid "_commit"  msgstr "_enviar"   -#: hggtk\commit.py:291 +#: hggtk\commit.py:292  msgid "Confirm Exit"  msgstr "Confirmar saída"   -#: hggtk\commit.py:319 +#: hggtk\commit.py:320  msgid "new branch: "  msgstr "novo ramo: "   -#: hggtk\commit.py:321 +#: hggtk\commit.py:322  msgid "close branch: "  msgstr "fechar ramo: "   -#: hggtk\commit.py:323 +#: hggtk\commit.py:324  msgid "branch: "  msgstr "ramo: "   -#: hggtk\commit.py:406 +#: hggtk\commit.py:407  msgid "No committable files selected"  msgstr "Nenhum ficheiro seleccionado para fazer commit"   -#: hggtk\commit.py:511 +#: hggtk\commit.py:518  msgid "Confirm Undo commit"  msgstr "Confirmar anular envio"   -#: hggtk\commit.py:537 +#: hggtk\commit.py:548  msgid "Confirm Add/Remove"  msgstr "Confirmar Adicionar/Remover"   -#: hggtk\commit.py:538 +#: hggtk\commit.py:549  msgid "Add/Remove the following files?"  msgstr "Adicionar/Remover os seguintes ficheiros?"   -#: hggtk\commit.py:559 +#: hggtk\commit.py:570  msgid "Error"  msgstr "Erro"   -#: hggtk\commit.py:560 +#: hggtk\commit.py:571  msgid "Message format configuration error"  msgstr "Erro de configuração do formato da mensagem"   -#: hggtk\commit.py:569 hggtk\commit.py:577 hggtk\commit.py:589 +#: hggtk\commit.py:580 hggtk\commit.py:588 hggtk\commit.py:600  msgid "Confirm Commit"  msgstr "Confirmar envio"   -#: hggtk\commit.py:570 +#: hggtk\commit.py:581  msgid ""  "The summary line length of %i is greater than %i.\n"  "\n" @@ -1860,7 +1880,7 @@
 "\n"  "Ignorar o formato da política e continuar o commit?"   -#: hggtk\commit.py:578 +#: hggtk\commit.py:589  msgid ""  "The summary line is not followed by a blank line.\n"  "\n" @@ -1870,7 +1890,7 @@
 "\n"  "Ignorar o formato da política e continuar o commit?"   -#: hggtk\commit.py:590 +#: hggtk\commit.py:601  msgid ""  "The following lines are over the %i-character limit: %s.\n"  "\n" @@ -1880,39 +1900,39 @@
 "\n"  "Ignorar o formato da política e continuar o commit?"   -#: hggtk\commit.py:627 +#: hggtk\commit.py:638  msgid "Confirm Override Branch"  msgstr "Confirmar sobrescrita do ramo"   -#: hggtk\commit.py:633 +#: hggtk\commit.py:644  msgid "Confirm New Branch"  msgstr "Confirmar novo Branch"   -#: hggtk\commit.py:704 +#: hggtk\commit.py:715  msgid "Paste _Filenames"  msgstr "Colar _Filenames"   -#: hggtk\commit.py:705 +#: hggtk\commit.py:716  msgid "App_ly Format"  msgstr "Formato App_ly"   -#: hggtk\commit.py:706 +#: hggtk\commit.py:717  msgid "C_onfigure Format"  msgstr "C_onfigurar formato"   -#: hggtk\commit.py:733 +#: hggtk\commit.py:744  msgid "Message format needs to be configured"  msgstr "A mensagem de formato necessita ser configurada"   -#: hggtk\commit.py:745 hggtk\commit.py:750 +#: hggtk\commit.py:756 hggtk\commit.py:761  msgid "Warning"  msgstr "Aviso"   -#: hggtk\commit.py:746 +#: hggtk\commit.py:757  msgid "The summary line length of %i is greater than %i"  msgstr "O comprimento da linha de sumário de %i é maior que %i"   -#: hggtk\commit.py:751 +#: hggtk\commit.py:762  msgid "The summary line is not followed by a blank line"  msgstr "A linha do sumário não é seguida por uma linha em branco"   @@ -1940,7 +1960,7 @@
 msgid "All files"  msgstr "Todos os ficheiros"   -#: hggtk\gtklib.py:240 +#: hggtk\gtklib.py:254  msgid "Select Folder"  msgstr "Seleccione pasta"   @@ -1997,7 +2017,7 @@
 msgid "Destination:"  msgstr "Destino:"   -#: hggtk\hgshelve.py:603 +#: hggtk\hgshelve.py:608  msgid "proceed even if patches do not unshelve cleanly"  msgstr "continuar mesmo que os patches não façam unshelve limpo"   @@ -2024,35 +2044,39 @@
 msgid "start debugger"  msgstr "iniciar debugger"   -#: hggtk\hgtk.py:604 hggtk\hgtk.py:631 +#: hggtk\hgtk.py:586 +msgid "do not fork GUI process" +msgstr "" + +#: hggtk\hgtk.py:605 hggtk\hgtk.py:632  msgid "revision to update"  msgstr "revisão para actualizar"   -#: hggtk\hgtk.py:610 +#: hggtk\hgtk.py:611  msgid "revisions to compare"  msgstr "revisões para comparar"   -#: hggtk\hgtk.py:623 +#: hggtk\hgtk.py:624  msgid "wait until the second ticks over"  msgstr "aguarde até o segundo passar"   -#: hggtk\hgtk.py:624 +#: hggtk\hgtk.py:625  msgid "notify the shell for path(s) given"  msgstr "notificar a shell para o(s) caminho(s) dado(s)"   -#: hggtk\hgtk.py:625 +#: hggtk\hgtk.py:626  msgid "remove the status cache"  msgstr "remover a cache de estado"   -#: hggtk\hgtk.py:626 +#: hggtk\hgtk.py:627  msgid "show the contents of the status cache (no update)"  msgstr "mostrar o conteúdo do estado da cache (sem actualizar)"   -#: hggtk\hgtk.py:628 +#: hggtk\hgtk.py:629  msgid "udpate all repos in current dir"  msgstr "actualizar todos os repos no dir actual"   -#: hggtk\hgtk.py:629 +#: hggtk\hgtk.py:630  msgid "hgtk thgstatus [OPTION]"  msgstr "hgtk thgstatus [OPTION]"   @@ -2084,7 +2108,7 @@
 msgid "Show Working Parents"  msgstr "Mostrar parents funcionais"   -#: hggtk\history.py:391 +#: hggtk\history.py:390  msgid "visualize change"  msgstr "visualizar alteração"   @@ -2124,11 +2148,12 @@
 msgid "Write bundle to"  msgstr "Escrever bundle para"   -#: hggtk\history.py:667 hggtk\thgconfig.py:366 hggtk\thgconfig.py:668 +#: hggtk\history.py:667 hggtk\history.py:696 hggtk\thgconfig.py:368 +#: hggtk\thgconfig.py:670  msgid "Confirm Overwrite"  msgstr "Confirmar sobrescrita"   -#: hggtk\history.py:668 +#: hggtk\history.py:668 hggtk\history.py:697  msgid ""  "The file \"%s\" already exists!\n"  "\n" @@ -2202,30 +2227,6 @@
 msgid "Merge"  msgstr "Juntar"   -#: hggtk\merge.py:104 -msgid "rev" -msgstr "rev" - -#: hggtk\merge.py:105 -msgid "summary" -msgstr "sumário" - -#: hggtk\merge.py:106 -msgid "user" -msgstr "utilizador" - -#: hggtk\merge.py:107 -msgid "date" -msgstr "data" - -#: hggtk\merge.py:111 -msgid "branch" -msgstr "ramo" - -#: hggtk\merge.py:113 -msgid "tags" -msgstr "etiquetas" -  #: hggtk\merge.py:116  msgid "Not a head revision!"  msgstr "Não é uma revisão head!" @@ -2286,7 +2287,7 @@
 msgid "Rollback repository '%s' ?"  msgstr "Voltar atrás com o repositório '%s' ?"   -#: hggtk\recovery.py:160 hggtk\synch.py:522 +#: hggtk\recovery.py:160 hggtk\synch.py:508  msgid "Please try again after the previous command is completed"  msgstr "Tente de novo após o comando antrior terminar"   @@ -2454,37 +2455,37 @@
 msgid "Copy file to"  msgstr "Copiar ficheiro para"   -#: hggtk\status.py:797 hggtk\status.py:1183 +#: hggtk\status.py:790 hggtk\status.py:1178  msgid "Nothing Removed"  msgstr "Nada removido"   -#: hggtk\status.py:798 +#: hggtk\status.py:791  msgid "Remove is not enabled when multiple revisions are specified."  msgstr ""  "A remoção não está activada quando estão especificadas múltiplas revisões."   -#: hggtk\status.py:815 +#: hggtk\status.py:808  msgid "Move is not enabled when multiple revisions are specified."  msgstr "Mover não está activado quando são especificadas múltiplas revisões."   -#: hggtk\status.py:815 hggtk\status.py:1207 hggtk\status.py:1215 +#: hggtk\status.py:808 hggtk\status.py:1196 hggtk\status.py:1204  msgid "Nothing Moved"  msgstr "Nada movido"   -#: hggtk\status.py:833 +#: hggtk\status.py:826  msgid "Copy is not enabled when multiple revisions are specified."  msgstr ""  "Copiar não está activado quando são especificadas múltiplas revisões."   -#: hggtk\status.py:833 +#: hggtk\status.py:826  msgid "Nothing Copied"  msgstr "Nada copiado"   -#: hggtk\status.py:853 +#: hggtk\status.py:846  msgid "===== Diff to first parent =====\n"  msgstr "===== Diff para o primeiro parent =====\n"   -#: hggtk\status.py:862 +#: hggtk\status.py:855  msgid ""  "\n"  "===== Diff to second parent =====\n" @@ -2492,83 +2493,83 @@
 "\n"  "===== Diff para o segundo parent =====\n"   -#: hggtk\status.py:917 +#: hggtk\status.py:910  msgid "File is larger than the specified max size.\n"  msgstr "O ficheiro é maior que o tamanho máximo especificado.\n"   -#: hggtk\status.py:918 +#: hggtk\status.py:911  msgid "Hunk selection is disabled for this file.\n"  msgstr "A selecção dos pedaços está desactivada para este ficheiro.\n"   -#: hggtk\status.py:1086 hggtk\status.py:1107 +#: hggtk\status.py:1081 hggtk\status.py:1102  msgid "Nothing Reverted"  msgstr "Nada revertido"   -#: hggtk\status.py:1087 +#: hggtk\status.py:1082  msgid "No revertable files selected"  msgstr "Nenhum ficheiro reversível seleccionado"   -#: hggtk\status.py:1108 +#: hggtk\status.py:1103  msgid "Revert not allowed when viewing revision range."  msgstr "Reversão não permitida quando visiona o intervalo da revisão."   -#: hggtk\status.py:1123 hggtk\status.py:1140 +#: hggtk\status.py:1118 hggtk\status.py:1135  msgid "Confirm Revert"  msgstr "Confirmar reversão"   -#: hggtk\status.py:1124 +#: hggtk\status.py:1119  msgid "Revert files to revision %s?"  msgstr "Reverter ficheiros para a revisão %s?"   -#: hggtk\status.py:1126 +#: hggtk\status.py:1121  msgid "Which parent to revert to?"  msgstr "Para que parente reverter?"   -#: hggtk\status.py:1127 +#: hggtk\status.py:1122  msgid "Revert file(s) to local or other parent?"  msgstr "Reverter ficheiro(s) para local ou outro parente?"   -#: hggtk\status.py:1128 +#: hggtk\status.py:1123  msgid "&local"  msgstr "&local"   -#: hggtk\status.py:1128 +#: hggtk\status.py:1123  msgid "&other"  msgstr "&outro"   -#: hggtk\status.py:1128 hggtk\status.py:1129 +#: hggtk\status.py:1123 hggtk\status.py:1124  msgid "l"  msgstr "l"   -#: hggtk\status.py:1131 +#: hggtk\status.py:1126  msgid "o"  msgstr "o"   -#: hggtk\status.py:1141 +#: hggtk\status.py:1136  msgid "Revert the following files?"  msgstr "reverter os seguintes ficheiros?"   -#: hggtk\status.py:1153 +#: hggtk\status.py:1148  msgid "Nothing Added"  msgstr "Nada adicionado"   -#: hggtk\status.py:1154 +#: hggtk\status.py:1149  msgid "No addable files selected"  msgstr "Nenhum ficheiro para adicionar seleccionado"   -#: hggtk\status.py:1184 +#: hggtk\status.py:1179  msgid "No removable files selected"  msgstr "Nenhum ficheiro para remover seleccionado"   -#: hggtk\status.py:1191 -msgid "Move files to diretory..." -msgstr "Mover ficheiros para a directoria..." - -#: hggtk\status.py:1208 +#: hggtk\status.py:1187 +msgid "Move files to directory..." +msgstr "" + +#: hggtk\status.py:1197  msgid "Cannot move outside repo!"  msgstr "Não é possível mover para fora do repo!"   -#: hggtk\status.py:1215 +#: hggtk\status.py:1204  msgid ""  "No movable files selected\n"  "\n" @@ -2578,172 +2579,172 @@
 "\n"  "Nota: apenas ficheiros limpos podem ser movidos."   -#: hggtk\status.py:1223 +#: hggtk\status.py:1212  msgid "Confirm Delete Unrevisioned"  msgstr "Confirmar eliminação sem revisão"   -#: hggtk\status.py:1224 +#: hggtk\status.py:1213  msgid "Delete the following unrevisioned files?"  msgstr "Eliminar os seguintes ficheiros sem revisão?"   -#: hggtk\status.py:1237 +#: hggtk\status.py:1226  msgid "Delete Errors"  msgstr "Eliminar erros"   -#: hggtk\synch.py:51 +#: hggtk\synch.py:52  msgid "TortoiseHg Synchronize - "  msgstr "Sincronizar do TortoiseHg - "   -#: hggtk\synch.py:63 +#: hggtk\synch.py:64  msgid "Incoming"  msgstr "A receber"   -#: hggtk\synch.py:65 +#: hggtk\synch.py:66  msgid "Display changes that can be pulled from selected repository"  msgstr "Mostrar alterações que podem ser puxados do repositório seleccionado"   -#: hggtk\synch.py:68 +#: hggtk\synch.py:69  msgid " Pull "  msgstr " Pull "   -#: hggtk\synch.py:70 +#: hggtk\synch.py:71  msgid "Pull changes from selected repository"  msgstr "Puxar alterações do repositório seleccionado"   -#: hggtk\synch.py:74 +#: hggtk\synch.py:75  msgid "Outgoing"  msgstr "Envio"   -#: hggtk\synch.py:76 +#: hggtk\synch.py:77  msgid "Display local changes that will be pushed to selected repository"  msgstr ""  "Mostrar alterações locais que serão enviadas para o repositório local"   -#: hggtk\synch.py:79 +#: hggtk\synch.py:80  msgid "Push"  msgstr "Push"   -#: hggtk\synch.py:81 +#: hggtk\synch.py:82  msgid "Push local changes to selected repository"  msgstr "Enviar alterações locais para o repositório seleccionado"   -#: hggtk\synch.py:84 hggtk\thgconfig.py:479 +#: hggtk\synch.py:85 hggtk\thgconfig.py:481  msgid "Email"  msgstr "Correio electrónico"   -#: hggtk\synch.py:86 +#: hggtk\synch.py:87  msgid "Email local outgoing changes to one or more recipients"  msgstr "Enviar correio electrónico com as alterações a vários destinatários"   -#: hggtk\synch.py:94 +#: hggtk\synch.py:95  msgid "Configure peer repository paths"  msgstr "Configure os caminhos do repositório dos pares"   -#: hggtk\synch.py:105 +#: hggtk\synch.py:106  msgid "Repo:"  msgstr "Repo:"   -#: hggtk\synch.py:110 +#: hggtk\synch.py:111  msgid "Bundle:"  msgstr "Bundle:"   -#: hggtk\synch.py:154 +#: hggtk\synch.py:155  msgid "Post pull operation"  msgstr ""   -#: hggtk\synch.py:156 +#: hggtk\synch.py:157  msgid "Nothing"  msgstr "Nada"   -#: hggtk\synch.py:157 hggtk\update.py:80 +#: hggtk\synch.py:158 hggtk\update.py:80  msgid "Update"  msgstr "Actualizar"   -#: hggtk\synch.py:158 +#: hggtk\synch.py:159  msgid "Fetch"  msgstr "Fetch"   -#: hggtk\synch.py:159 +#: hggtk\synch.py:160  msgid "Rebase"  msgstr "Rebase"   -#: hggtk\synch.py:167 +#: hggtk\synch.py:168  msgid "Advanced Options"  msgstr "Opções avançadas"   -#: hggtk\synch.py:189 +#: hggtk\synch.py:190  msgid "Force pull or push"  msgstr "Forçar puxar/empurrar"   -#: hggtk\synch.py:190 +#: hggtk\synch.py:191  msgid "Run even when remote repository is unrelated."  msgstr "Correr mesmo quando o repositório remoto não está relacionado."   -#: hggtk\synch.py:194 +#: hggtk\synch.py:195  msgid "Target Revision:"  msgstr "Revisão de destino:"   -#: hggtk\synch.py:198 +#: hggtk\synch.py:199  msgid "A specific revision up to which you would like to push or pull."  msgstr "Uma revisão específica para a qual deseja puxar ou enviar."   -#: hggtk\synch.py:202 +#: hggtk\synch.py:203  msgid "Remote Command:"  msgstr "Comando remoto:"   -#: hggtk\synch.py:206 +#: hggtk\synch.py:207  msgid "Name of hg executable on remote machine."  msgstr "Nome do executável hg na máquina remota."   -#: hggtk\synch.py:214 +#: hggtk\synch.py:215  msgid "Incoming/Outgoing"  msgstr "A receber/A enviar"   -#: hggtk\synch.py:217 +#: hggtk\synch.py:218  msgid "Show Patches"  msgstr "Mostrar patches"   -#: hggtk\synch.py:218 +#: hggtk\synch.py:219  msgid "Show Newest First"  msgstr "Mostrar primeiro os recentes"   -#: hggtk\synch.py:219 +#: hggtk\synch.py:220  msgid "Show No Merges"  msgstr "Não mostrar merges"   -#: hggtk\synch.py:242 +#: hggtk\synch.py:243  msgid "View pulled revisions"  msgstr "Ver revisões puxadas"   -#: hggtk\synch.py:244 +#: hggtk\synch.py:245  msgid "Update to branch tip"  msgstr "Actualizar para ramo tip"   -#: hggtk\synch.py:339 +#: hggtk\synch.py:340  msgid "unknown sort key '%s'"  msgstr "ordenar chave '%s' desconhecida"   -#: hggtk\synch.py:347 +#: hggtk\synch.py:350  msgid "Select Repository"  msgstr "Seleccione repositório"   -#: hggtk\synch.py:360 +#: hggtk\synch.py:358  msgid "Select Bundle"  msgstr "Seleccione bundle"   -#: hggtk\synch.py:367 +#: hggtk\synch.py:359  msgid "Bundle (*.hg)"  msgstr "Bundle (*.hg)"   -#: hggtk\synch.py:371 +#: hggtk\synch.py:360  msgid "Bundle (*)"  msgstr "Bundle (*)"   -#: hggtk\synch.py:480 +#: hggtk\synch.py:466  msgid "No repository selected"  msgstr "Nenhum repositório seleccionado"   -#: hggtk\synch.py:481 +#: hggtk\synch.py:467  msgid "Select a peer repository to compare with"  msgstr "Seleccione um repositório do par para poder comparar com"   @@ -2909,62 +2910,64 @@
 "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: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 ""   -#: hggtk\thgconfig.py:32 +#: hggtk\thgconfig.py:34  msgid "Visual Diff Command"  msgstr "Comando de Diff visual"   -#: hggtk\thgconfig.py:33 +#: hggtk\thgconfig.py:35  msgid "Specify visual diff tool; must be an extdiff command"  msgstr ""  "Especifique a ferramenta de diff visual; tem de ser um comando extdiff"   -#: hggtk\thgconfig.py:34 +#: hggtk\thgconfig.py:36  msgid "Skip Diff Window"  msgstr "Saltar janela Diff"   -#: hggtk\thgconfig.py:35 +#: hggtk\thgconfig.py:37  msgid ""  "Bypass the builtin visual diff dialog and directly use your visual diff "  "tool's directory diff feature. Only enable this feature if you know your "  "diff tool has a valid extdiff configuration. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:39 +#: hggtk\thgconfig.py:41  msgid "Visual Editor"  msgstr "Editor visual"   -#: hggtk\thgconfig.py:40 +#: hggtk\thgconfig.py:42  msgid "Specify the visual editor used to view files, etc"  msgstr "Especifique o editor visual para ver ficheiros, etc"   -#: hggtk\thgconfig.py:41 +#: hggtk\thgconfig.py:43  msgid "CLI Editor"  msgstr "Editor CLI"   -#: hggtk\thgconfig.py:42 +#: hggtk\thgconfig.py:44  msgid ""  "The editor to use during a commit and other instances where Mercurial needs "  "multiline input from the user. Only used by command line interface commands."  msgstr ""   -#: hggtk\thgconfig.py:45 +#: hggtk\thgconfig.py:47  msgid "Tab Width"  msgstr "Largura do Separador"   -#: hggtk\thgconfig.py:46 +#: hggtk\thgconfig.py:48  msgid ""  "Specify the number of spaces that tabs expand to in various TortoiseHG "  "windows. Default: Not expanded"  msgstr ""   -#: hggtk\thgconfig.py:49 +#: hggtk\thgconfig.py:51  msgid "Max Diff Size"  msgstr "Tamanho máx, do diff"   -#: hggtk\thgconfig.py:50 +#: hggtk\thgconfig.py:52  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. " @@ -2974,11 +2977,11 @@
 "alterações no registo de alterações, estado e janelas de commit. Um valor de "  "zero implica nenhum limite. Pré-definição: 1024 (1MB)"   -#: hggtk\thgconfig.py:53 +#: hggtk\thgconfig.py:55  msgid "Bottom Diffs"  msgstr "Diffs do fundo"   -#: hggtk\thgconfig.py:54 +#: hggtk\thgconfig.py:56  msgid ""  "Show the diff panel below the file list in status, shelve, and commit "  "dialogs. Default: False (show diffs to right of file list)" @@ -2987,19 +2990,19 @@
 "diálogos de commit.. Pré-definição: False (mostra os diffs à direita da "  "lista de ficheiros)"   -#: hggtk\thgconfig.py:59 +#: hggtk\thgconfig.py:61  msgid "Username"  msgstr "Nome de utilizador"   -#: hggtk\thgconfig.py:60 +#: hggtk\thgconfig.py:62  msgid "Name associated with commits"  msgstr "Nome associado aos commits"   -#: hggtk\thgconfig.py:61 +#: hggtk\thgconfig.py:63  msgid "External Commit Tool"  msgstr "Ferramenta externa de commit"   -#: hggtk\thgconfig.py:62 +#: hggtk\thgconfig.py:64  msgid ""  "Select commit tool launched by TortoiseHg. (Qct is no longer distributed as "  "part of TortoiseHG.) Default: None (use the builtin tool)" @@ -3008,44 +3011,44 @@
 "distribuido como parte do TortoiseHG). Pré-definição: None (use a ferramenta "  "incluída)"   -#: hggtk\thgconfig.py:65 +#: hggtk\thgconfig.py:67  msgid "Summary Line Length"  msgstr "Tamanho da linha do sumário"   -#: hggtk\thgconfig.py:66 +#: hggtk\thgconfig.py:68  msgid ""  "Maximum length of the commit message summary line. If set, TortoiseHG will "  "issue a warning if the summary line is too long or not separated by a blank "  "line. Default: 0 (unenforced)"  msgstr ""   -#: hggtk\thgconfig.py:70 +#: hggtk\thgconfig.py:72  msgid "Message Line Length"  msgstr "Tamanho da linha da mensagem"   -#: hggtk\thgconfig.py:71 +#: hggtk\thgconfig.py:73  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 ""   -#: hggtk\thgconfig.py:78 +#: hggtk\thgconfig.py:80  msgid "Author Coloring"  msgstr "Coloração do autor"   -#: hggtk\thgconfig.py:79 +#: hggtk\thgconfig.py:81  msgid ""  "Color changesets by author name. If not enabled, the changes are colored "  "green for merge, red for non-trivial parents, black for normal. Default: "  "False"  msgstr ""   -#: hggtk\thgconfig.py:83 +#: hggtk\thgconfig.py:85  msgid "Long Summary"  msgstr "Sumário longo"   -#: hggtk\thgconfig.py:84 +#: hggtk\thgconfig.py:86  msgid ""  "If true, concatenate multiple lines of changeset summary until they reach 80 "  "characters. Default: False" @@ -3053,11 +3056,11 @@
 "Se verdadeiro, concatenar múltiplas linhas do sumário do changeset até "  "atingir 80 caracteres. Pré-definição: False"   -#: hggtk\thgconfig.py:87 +#: hggtk\thgconfig.py:89  msgid "Log Batch Size"  msgstr "Tamanho do registo Batch"   -#: hggtk\thgconfig.py:88 +#: hggtk\thgconfig.py:90  msgid ""  "The number of revisions to read and display in the changelog viewer in a "  "single batch. Default: 500" @@ -3065,11 +3068,11 @@
 "O número de revisões para ler e mostrar no visionador de alteração de "  "registo de uma única vez. Pré-definição: 500"   -#: hggtk\thgconfig.py:91 +#: hggtk\thgconfig.py:93  msgid "Copy Hash"  msgstr "Copiar Hash"   -#: hggtk\thgconfig.py:92 +#: hggtk\thgconfig.py:94  msgid ""  "Allow the changelog viewer to copy the changeset hash of the currently "  "selected changeset into the clipboard. Default: False" @@ -3078,22 +3081,22 @@
 "visualizador de registo do changeset actualmente seleccionado para o "  "clipboard. Pré-definição: false"   -#: hggtk\thgconfig.py:97 +#: hggtk\thgconfig.py:99  msgid "After pull operation"  msgstr "Após a operação de puxar"   -#: hggtk\thgconfig.py:99 +#: hggtk\thgconfig.py:101  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 ""   -#: hggtk\thgconfig.py:104 +#: hggtk\thgconfig.py:106  msgid "Name"  msgstr "Nome"   -#: hggtk\thgconfig.py:105 +#: hggtk\thgconfig.py:107  msgid ""  "Repository name to use in the web interface. Default is the working "  "directory." @@ -3101,89 +3104,89 @@
 "Nome do repositório a usar na interface web. A pré-definição é a directoria "  "de trabalho."   -#: hggtk\thgconfig.py:107 hggtk\thgconfig.py:776 +#: hggtk\thgconfig.py:109 hggtk\thgconfig.py:778  msgid "Description"  msgstr "Descrição"   -#: hggtk\thgconfig.py:108 +#: hggtk\thgconfig.py:110  msgid "Textual description of the repository's purpose or contents."  msgstr "Descrição visual do destino ou conteúdo do repositório."   -#: hggtk\thgconfig.py:110 +#: hggtk\thgconfig.py:112  msgid "Contact"  msgstr "Contacto"   -#: hggtk\thgconfig.py:111 +#: hggtk\thgconfig.py:113  msgid "Name or email address of the person in charge of the repository."  msgstr "Nome ou endereço de correio da pessoa responsável pelo repositório."   -#: hggtk\thgconfig.py:113 +#: hggtk\thgconfig.py:115  msgid "Style"  msgstr "Estilo"   -#: hggtk\thgconfig.py:115 +#: hggtk\thgconfig.py:117  msgid "Which template map style to use"  msgstr "Que estilo de mapa usar"   -#: hggtk\thgconfig.py:116 +#: hggtk\thgconfig.py:118  msgid "Archive Formats"  msgstr "Formatos de arquivo"   -#: hggtk\thgconfig.py:117 +#: hggtk\thgconfig.py:119  msgid "Comma separated list of archive formats allowed for downloading"  msgstr ""  "Lista de formatos de arquivos separados por vírgulas permitidos para "  "transferir"   -#: hggtk\thgconfig.py:119 +#: hggtk\thgconfig.py:121  msgid "Port to listen on"  msgstr "Porta em escuta"   -#: hggtk\thgconfig.py:119 hggtk\thgconfig.py:229 +#: hggtk\thgconfig.py:121 hggtk\thgconfig.py:231  msgid "Port"  msgstr "Porta"   -#: hggtk\thgconfig.py:120 +#: hggtk\thgconfig.py:122  msgid "Push Requires SSL"  msgstr "Push necessita de SSL"   -#: hggtk\thgconfig.py:121 +#: hggtk\thgconfig.py:123  msgid ""  "Whether to require that inbound pushes be transported over SSL to prevent "  "password sniffing."  msgstr ""   -#: hggtk\thgconfig.py:123 +#: hggtk\thgconfig.py:125  msgid "Stripes"  msgstr "Riscas"   -#: hggtk\thgconfig.py:124 +#: hggtk\thgconfig.py:126  msgid ""  "How many lines a \"zebra stripe\" should span in multiline output. Default "  "is 1; set to 0 to disable."  msgstr ""   -#: hggtk\thgconfig.py:126 +#: hggtk\thgconfig.py:128  msgid "Max Files"  msgstr "Máx. de ficheiros"   -#: hggtk\thgconfig.py:127 +#: hggtk\thgconfig.py:129  msgid "Maximum number of files to list per changeset."  msgstr "Número máximo de ficheiros a mostrar por changeset."   -#: hggtk\thgconfig.py:128 +#: hggtk\thgconfig.py:130  msgid "Max Changes"  msgstr "Máx. de alterações"   -#: hggtk\thgconfig.py:129 +#: hggtk\thgconfig.py:131  msgid "Maximum number of changes to list on the changelog."  msgstr "Número máximo de alterações a mostrar por changelog."   -#: hggtk\thgconfig.py:130 +#: hggtk\thgconfig.py:132  msgid "Allow Push"  msgstr "Permitir Push"   -#: hggtk\thgconfig.py:131 +#: hggtk\thgconfig.py:133  msgid ""  "Whether to allow pushing to the repository. If empty or not set, push is not "  "allowed. If the special value \"*\", any remote user can push, including " @@ -3193,11 +3196,11 @@
 "examined after the deny_push list."  msgstr ""   -#: hggtk\thgconfig.py:138 +#: hggtk\thgconfig.py:140  msgid "Deny Push"  msgstr "Negar Push"   -#: hggtk\thgconfig.py:139 +#: hggtk\thgconfig.py:141  msgid ""  "Whether to deny pushing to the repository. If empty or not set, push is not "  "denied. If the special value \"*\", all remote users are denied push. " @@ -3206,86 +3209,86 @@
 "The contents of the deny_push list are examined before the allow_push list."  msgstr ""   -#: hggtk\thgconfig.py:145 +#: hggtk\thgconfig.py:147  msgid "Encoding"  msgstr "Codificação"   -#: hggtk\thgconfig.py:146 +#: hggtk\thgconfig.py:148  msgid "Character encoding name"  msgstr "nome da codificação de caracteres"   -#: hggtk\thgconfig.py:149 hggtk\thgconfig.py:230 +#: hggtk\thgconfig.py:151 hggtk\thgconfig.py:232  msgid "Host"  msgstr "Servidor"   -#: hggtk\thgconfig.py:150 +#: hggtk\thgconfig.py:152  msgid ""  "Host name and (optional) port of proxy server, for example \"myproxy:8000\""  msgstr ""  "Nome do servidor e porta do servidor proxy (opcional) \"myproxy:8000\""   -#: hggtk\thgconfig.py:152 +#: hggtk\thgconfig.py:154  msgid "Bypass List"  msgstr "Lista de bypass"   -#: hggtk\thgconfig.py:153 +#: hggtk\thgconfig.py:155  msgid ""  "Optional. Comma-separated list of host names that should bypass the proxy"  msgstr ""  "Opcional. Lista de nomes de servidores separados por vírgulas que podem "  "fazer bypass ao proxy"   -#: hggtk\thgconfig.py:155 hggtk\thgconfig.py:231 +#: hggtk\thgconfig.py:157 hggtk\thgconfig.py:233  msgid "Password"  msgstr "Senha"   -#: hggtk\thgconfig.py:156 +#: hggtk\thgconfig.py:158  msgid "Optional. Password to authenticate with at the proxy server"  msgstr "Opcional. Senha de autenticação no servidor proxy"   -#: hggtk\thgconfig.py:159 +#: hggtk\thgconfig.py:161  msgid "Optional. User name to authenticate with at the proxy server"  msgstr "Opcional. Nome de utilizador para autenticação no servidor proxy"   -#: hggtk\thgconfig.py:163 +#: hggtk\thgconfig.py:165  msgid "From"  msgstr "De"   -#: hggtk\thgconfig.py:164 +#: hggtk\thgconfig.py:166  msgid "Email address to use in the \"From\" header and for the SMTP envelope"  msgstr "Endereço de correio a usar no cabeçalho \"De\" e envelope SMTP"   -#: hggtk\thgconfig.py:165 +#: hggtk\thgconfig.py:167  msgid "To"  msgstr "Para"   -#: hggtk\thgconfig.py:166 +#: hggtk\thgconfig.py:168  msgid "Comma-separated list of recipient email addresses"  msgstr "Lista de destinatários de correio electrónico separados por vírgulas"   -#: hggtk\thgconfig.py:167 +#: hggtk\thgconfig.py:169  msgid "Cc"  msgstr "Cc"   -#: hggtk\thgconfig.py:168 +#: hggtk\thgconfig.py:170  msgid "Comma-separated list of carbon copy recipient email addresses"  msgstr ""  "Lista de destinatários Cc de correio electrónico separados por vírgulas"   -#: hggtk\thgconfig.py:170 +#: hggtk\thgconfig.py:172  msgid "Bcc"  msgstr "Bcc"   -#: hggtk\thgconfig.py:171 +#: hggtk\thgconfig.py:173  msgid "Comma-separated list of blind carbon copy recipient email addresses"  msgstr ""  "Lista de destinatários Bcc de correio electrónico separados por vírgulas"   -#: hggtk\thgconfig.py:173 +#: hggtk\thgconfig.py:175  msgid "method"  msgstr "método"   -#: hggtk\thgconfig.py:174 +#: hggtk\thgconfig.py:176  msgid ""  "Optional. Method to use to send email messages. If value is \"smtp\" "  "(default), use SMTP (configured below). Otherwise, use as name of program " @@ -3295,233 +3298,233 @@
 "messages."  msgstr ""   -#: hggtk\thgconfig.py:179 +#: hggtk\thgconfig.py:181  msgid "Host name of mail server"  msgstr "Nome do servidor de correio"   -#: hggtk\thgconfig.py:179 +#: hggtk\thgconfig.py:181  msgid "SMTP Host"  msgstr "Servidor SMTP"   -#: hggtk\thgconfig.py:180 +#: hggtk\thgconfig.py:182  msgid "SMTP Port"  msgstr "SMTP Port"   -#: hggtk\thgconfig.py:181 +#: hggtk\thgconfig.py:183  msgid "Port to connect to on mail server. Default: 25"  msgstr "Porta de ligação ao servidor de correio. Pré-definido: 25"   -#: hggtk\thgconfig.py:183 +#: hggtk\thgconfig.py:185  msgid "SMTP TLS"  msgstr "SMTP TLS"   -#: hggtk\thgconfig.py:184 +#: hggtk\thgconfig.py:186  msgid "Connect to mail server using TLS. Default: False"  msgstr "Ligar ao servidor de correio usando TLS. Pré-definido: Falso"   -#: hggtk\thgconfig.py:186 +#: hggtk\thgconfig.py:188  msgid "SMTP Username"  msgstr "Nome de utilizador SMTP"   -#: hggtk\thgconfig.py:187 +#: hggtk\thgconfig.py:189  msgid "Username to authenticate to mail server with"  msgstr "Nome de utilizador para autenticar no servidor de correio"   -#: hggtk\thgconfig.py:188 +#: hggtk\thgconfig.py:190  msgid "SMTP Password"  msgstr "Senha SMTP"   -#: hggtk\thgconfig.py:189 +#: hggtk\thgconfig.py:191  msgid "Password to authenticate to mail server with"  msgstr "Senha para autenticar no servidor de correio"   -#: hggtk\thgconfig.py:190 +#: hggtk\thgconfig.py:192  msgid "Local Hostname"  msgstr "Servidor local"   -#: hggtk\thgconfig.py:191 +#: hggtk\thgconfig.py:193  msgid "Hostname the sender can use to identify itself to the mail server."  msgstr ""   -#: hggtk\thgconfig.py:194 +#: hggtk\thgconfig.py:196  msgid "Git Format"  msgstr "Formato Git"   -#: hggtk\thgconfig.py:195 +#: hggtk\thgconfig.py:197  msgid "Use git extended diff header format. Default: False"  msgstr "Usar formato git extended diff header. Pré-definição: False"   -#: hggtk\thgconfig.py:197 +#: hggtk\thgconfig.py:199  msgid "No Dates"  msgstr "Sem datas"   -#: hggtk\thgconfig.py:198 +#: hggtk\thgconfig.py:200  msgid "Do not include modification dates in diff headers. Default: False"  msgstr ""  "Não incluir as datas de modificação nos cabeçalhos diff. Pré-definição: False"   -#: hggtk\thgconfig.py:200 +#: hggtk\thgconfig.py:202  msgid "Show Function"  msgstr "Mostrar função"   -#: hggtk\thgconfig.py:201 +#: hggtk\thgconfig.py:203  msgid "Show which function each change is in. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:203 +#: hggtk\thgconfig.py:205  msgid "Ignore White Space"  msgstr "Ignorar espaço em branco"   -#: hggtk\thgconfig.py:204 +#: hggtk\thgconfig.py:206  msgid "Ignore white space when comparing lines. Default: False"  msgstr "Ignorar espaços em branco ao comparar linhas. Pré-definido: False"   -#: hggtk\thgconfig.py:206 +#: hggtk\thgconfig.py:208  msgid "Ignore WS Amount"  msgstr "Ignorar quantidade WS"   -#: hggtk\thgconfig.py:207 +#: hggtk\thgconfig.py:209  msgid "Ignore changes in the amount of white space. Default: False"  msgstr ""   -#: hggtk\thgconfig.py:209 +#: hggtk\thgconfig.py:211  msgid "Ignore Blank Lines"  msgstr "Ignorar linhas em branco"   -#: hggtk\thgconfig.py:210 +#: hggtk\thgconfig.py:212  msgid "Ignore changes whose lines are all blank. Default: False"  msgstr ""  "Ignorar alterações em que as linhas estão todas vazias. Pré-definido: False"   -#: hggtk\thgconfig.py:223 +#: hggtk\thgconfig.py:225  msgid "Edit remote repository path"  msgstr "Editar caminho do repositório remoto"   -#: hggtk\thgconfig.py:229 +#: hggtk\thgconfig.py:231  msgid "URL"  msgstr "URL"   -#: hggtk\thgconfig.py:230 +#: hggtk\thgconfig.py:232  msgid "Folder"  msgstr "Pasta"   -#: hggtk\thgconfig.py:232 hggtk\thgconfig.py:729 +#: hggtk\thgconfig.py:234 hggtk\thgconfig.py:731  msgid "Alias"  msgstr "Alcunha"   -#: hggtk\thgconfig.py:367 hggtk\thgconfig.py:669 +#: hggtk\thgconfig.py:369 hggtk\thgconfig.py:671  msgid "Overwrite existing '%s' path?"  msgstr "Sobrescrever o caminho '%s' existente?"   -#: hggtk\thgconfig.py:421 +#: hggtk\thgconfig.py:423  msgid "No repository found"  msgstr "Nenhum repositório encontrado"   -#: hggtk\thgconfig.py:422 +#: hggtk\thgconfig.py:424  msgid "no repo at "  msgstr "nenhum repo em "   -#: hggtk\thgconfig.py:430 +#: hggtk\thgconfig.py:432  msgid "User global settings"  msgstr "Definições de utilizador globais"   -#: hggtk\thgconfig.py:432 +#: hggtk\thgconfig.py:434  msgid "%s repository settings"  msgstr "definições do repositório %s"   -#: hggtk\thgconfig.py:437 +#: hggtk\thgconfig.py:439  msgid "Edit File"  msgstr "Editar ficheiro"   -#: hggtk\thgconfig.py:466 +#: hggtk\thgconfig.py:468  msgid "Changelog"  msgstr "Registo de alterações"   -#: hggtk\thgconfig.py:469 +#: hggtk\thgconfig.py:471  msgid "Sync"  msgstr ""   -#: hggtk\thgconfig.py:473 +#: hggtk\thgconfig.py:475  msgid "Web"  msgstr "Web"   -#: hggtk\thgconfig.py:476 +#: hggtk\thgconfig.py:478  msgid "Proxy"  msgstr "Proxy"   -#: hggtk\thgconfig.py:482 +#: hggtk\thgconfig.py:484  msgid "Diff"  msgstr "Diff"   -#: hggtk\thgconfig.py:495 +#: hggtk\thgconfig.py:497  msgid "Unapplied changes"  msgstr "Alterações não aplicadas"   -#: hggtk\thgconfig.py:496 +#: hggtk\thgconfig.py:498  msgid "Lose changes and switch files?."  msgstr "perder alterações e trocar ficheiros?"   -#: hggtk\thgconfig.py:507 +#: hggtk\thgconfig.py:509  msgid "TortoiseHg Configure Repository - "  msgstr "Configuração de repositório TortoiseHg - "   -#: hggtk\thgconfig.py:511 +#: hggtk\thgconfig.py:513  msgid "TortoiseHg Configure User-Global Settings"  msgstr "Configuração do utilizador TortoiseHg - Definições globais"   -#: hggtk\thgconfig.py:555 +#: hggtk\thgconfig.py:557  msgid "Confirm quit without saving?"  msgstr "Confirmar sair sem guardar?"   -#: hggtk\thgconfig.py:556 +#: hggtk\thgconfig.py:558  msgid "Yes to abandon changes, No to continue"  msgstr "Sim para abandonar alterações, Não para continuar"   -#: hggtk\thgconfig.py:644 +#: hggtk\thgconfig.py:646  msgid "No Repository Found"  msgstr "Nenhum repositório encontrado"   -#: hggtk\thgconfig.py:645 +#: hggtk\thgconfig.py:647  msgid "Path testing cannot work without a repository"  msgstr "O teste do caminho não funciona sem um repositório"   -#: hggtk\thgconfig.py:711 +#: hggtk\thgconfig.py:713  msgid "Remote repository paths"  msgstr "Caminho do repositório remoto"   -#: hggtk\thgconfig.py:733 +#: hggtk\thgconfig.py:735  msgid "Repository Path"  msgstr "Caminho do repositório"   -#: hggtk\thgconfig.py:747 +#: hggtk\thgconfig.py:749  msgid "_Edit"  msgstr "_Editar"   -#: hggtk\thgconfig.py:757 +#: hggtk\thgconfig.py:759  msgid "_Test"  msgstr "_Testar"   -#: hggtk\thgconfig.py:762 +#: hggtk\thgconfig.py:764  msgid "Set as _default"  msgstr "Aplicar como pré-_definido"   -#: hggtk\thgconfig.py:859 +#: hggtk\thgconfig.py:863  msgid "Suggested"  msgstr "Sugerido"   -#: hggtk\thgconfig.py:869 +#: hggtk\thgconfig.py:873  msgid "History"  msgstr "Histórico"   -#: hggtk\thgconfig.py:907 +#: hggtk\thgconfig.py:911  msgid "# Generated by tortoisehg-config\n"  msgstr "# Gerado pelo tortoisehg-config\n"   -#: hggtk\thgconfig.py:944 +#: hggtk\thgconfig.py:948  msgid "Skipped saving path with no alias"  msgstr "Saltar a guarda do caminho sem nenhuma alcunha"   -#: hggtk\thgconfig.py:972 +#: hggtk\thgconfig.py:976  msgid "Unable to write configuration file"  msgstr "Não foi possível escrever o ficheiro de configuração"   @@ -3587,11 +3590,11 @@
 msgid "Visual Diffs"  msgstr "Diffs visuais"   -#: hggtk\visdiff.py:241 +#: hggtk\visdiff.py:242  msgid "Tool launch failure"  msgstr "Falha ao lançar a ferramenta"   -#: hggtk\visdiff.py:242 +#: hggtk\visdiff.py:243  msgid "%s : %s"  msgstr "%s : %s"  
 
14
15
16
17
 
18
19
20
 
14
15
16
 
17
18
19
20
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n" +"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"  "X-Generator: Launchpad (build Unknown)\n"    #: hggtk\about.py:52
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-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