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

Merge with stable

Changeset f2f96a8d4945…

Parents 006078c6902e…

Parents e3cd9ace4b65…

by Steve Borho

Changes to 31 files · Browse files at f2f96a8d4945 Showing diff from parent 006078c6902e e3cd9ace4b65 Diff from another changeset...

Change 1 of 1 Show Entire File .hgtags Stacked
 
43
44
45
 
 
46
47
48
49
 
43
44
45
46
47
48
 
49
50
@@ -43,7 +43,8 @@
 d7070fe8ed54ffec748ba98918f59f40c2ae4976 1.1.6  b740366bf49f2ad67ff923fa30e875acfba05892 1.1.6.1  d5840485b34265572ffb4d5bb1226b1577163115 1.1.7 +edc8ec8b18a98abada33fb312e2c5cfb8e336eb4 1.1.8 +065d9654030e19ba2c92a9c3616f37d2ab427caa 1.1.9  653ff9fb4ccf16833bab58fbc765ff8829dc1265 1.9 -edc8ec8b18a98abada33fb312e2c5cfb8e336eb4 1.1.8  6f97499d3d53aaf4cc1ec3c626191b13eb3aed58 1.9.1  dc23fbf831944fdf894cade250161131c11c9ce4 1.9.2
Change 1 of 1 Show Entire File doc/​source/​conf.py Stacked
 
51
52
53
54
 
55
56
57
 
51
52
53
 
54
55
56
57
@@ -51,7 +51,7 @@
 # The short X.Y version.  version = '2.0'  # The full version, including alpha/beta/rc tags. -release = '1.9.0' +release = '1.9.2'    # The language for content autogenerated by Sphinx. Refer to documentation  # for a list of supported languages.
Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 31 Show Entire File i18n/​tortoisehg/​da.po Stacked
 
7
8
9
10
11
12
 
 
 
13
14
15
16
17
18
 
 
19
20
21
 
145
146
147
148
 
149
150
151
 
252
253
254
255
 
256
257
258
 
388
389
390
391
392
 
393
394
395
396
397
398
 
 
 
 
 
399
400
401
 
524
525
526
527
 
 
528
529
530
 
718
719
720
721
 
722
723
724
 
729
730
731
732
 
733
734
735
 
786
787
788
789
 
790
791
792
 
1028
1029
1030
1031
1032
1033
1034
1035
 
 
 
 
 
1036
1037
1038
 
1406
1407
1408
1409
 
1410
1411
1412
1413
 
1414
1415
1416
 
1450
1451
1452
1453
 
1454
1455
1456
1457
 
1458
1459
1460
1461
 
1462
1463
1464
 
1468
1469
1470
1471
 
1472
1473
1474
1475
 
1476
1477
1478
 
1490
1491
1492
1493
 
1494
1495
1496
1497
 
1498
1499
1500
 
1886
1887
1888
 
 
 
 
 
 
 
 
 
 
 
 
1889
1890
1891
 
2486
2487
2488
2489
 
2490
2491
2492
2493
2494
 
2495
2496
2497
2498
 
2499
2500
2501
2502
2503
 
2504
2505
2506
 
2594
2595
2596
2597
2598
2599
2600
2601
 
 
 
 
 
2602
2603
2604
 
2986
2987
2988
2989
 
2990
2991
2992
2993
 
2994
2995
2996
2997
2998
 
 
2999
3000
3001
3002
3003
 
 
3004
3005
3006
3007
 
3008
3009
3010
3011
 
3012
3013
3014
3015
 
3016
3017
3018
3019
 
3020
3021
3022
3023
 
3024
3025
3026
3027
 
3028
3029
3030
3031
 
3032
3033
3034
3035
 
3036
3037
3038
3039
 
3040
3041
3042
3043
 
3044
3045
3046
3047
3048
 
3049
3050
3051
3052
 
3053
3054
3055
3056
 
3057
3058
3059
3060
 
3061
3062
3063
3064
 
3065
3066
3067
3068
 
3069
3070
3071
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
 
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
 
3199
3200
3201
3202
 
3203
3204
3205
3206
 
3207
3208
3209
3210
 
3211
3212
3213
 
3217
3218
3219
3220
 
3221
3222
3223
3224
 
3225
3226
3227
3228
 
3229
3230
3231
 
3235
3236
3237
3238
 
3239
3240
3241
3242
 
3243
3244
3245
 
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
 
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
 
3395
3396
3397
3398
 
3399
3400
3401
3402
 
3403
3404
3405
3406
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3407
3408
3409
3410
 
3411
3412
3413
 
3432
3433
3434
3435
 
3436
3437
3438
3439
3440
 
3441
3442
3443
 
3790
3791
3792
 
 
 
 
 
 
 
 
3793
3794
3795
3796
 
3797
3798
3799
3800
 
3801
3802
3803
3804
 
3805
3806
3807
3808
 
3809
3810
3811
3812
 
3813
3814
3815
3816
 
3817
3818
3819
3820
 
3821
3822
3823
3824
 
3825
3826
3827
3828
 
3829
3830
3831
3832
 
3833
3834
3835
3836
 
3837
3838
3839
3840
 
3841
3842
3843
3844
 
3845
3846
3847
3848
 
3849
3850
3851
3852
 
3853
3854
3855
3856
 
 
 
 
 
 
 
 
3857
3858
3859
3860
 
3861
3862
3863
3864
 
3865
3866
3867
3868
 
3869
3870
3871
 
5677
5678
5679
5680
 
5681
5682
5683
 
5689
5690
5691
5692
 
5693
5694
5695
 
5796
5797
5798
5799
 
5800
5801
5802
5803
 
5804
5805
5806
5807
 
5808
5809
5810
5811
 
5812
5813
5814
5815
 
5816
5817
5818
5819
 
5820
5821
5822
5823
 
5824
5825
5826
5827
 
5828
5829
5830
5831
 
5832
5833
5834
5835
 
5836
5837
5838
5839
 
5840
5841
5842
5843
 
5844
5845
5846
 
7524
7525
7526
 
 
 
 
 
 
 
 
7527
7528
7529
 
7572
7573
7574
 
 
 
7575
7576
7577
 
7
8
9
 
 
 
10
11
12
13
14
15
16
 
 
17
18
19
20
21
 
145
146
147
 
148
149
150
151
 
252
253
254
 
255
256
257
258
 
388
389
390
 
 
391
392
 
 
 
 
 
393
394
395
396
397
398
399
400
 
523
524
525
 
526
527
528
529
530
 
718
719
720
 
721
722
723
724
 
729
730
731
 
732
733
734
735
 
786
787
788
 
789
790
791
792
 
1028
1029
1030
 
 
 
 
 
1031
1032
1033
1034
1035
1036
1037
1038
 
1406
1407
1408
 
1409
1410
1411
1412
 
1413
1414
1415
1416
 
1450
1451
1452
 
1453
1454
1455
1456
 
1457
1458
1459
1460
 
1461
1462
1463
1464
 
1468
1469
1470
 
1471
1472
1473
1474
 
1475
1476
1477
1478
 
1490
1491
1492
 
1493
1494
1495
1496
 
1497
1498
1499
1500
 
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
 
2498
2499
2500
 
2501
2502
2503
2504
2505
 
2506
2507
2508
2509
 
2510
2511
2512
2513
2514
 
2515
2516
2517
2518
 
2606
2607
2608
 
 
 
 
 
2609
2610
2611
2612
2613
2614
2615
2616
 
2998
2999
3000
 
3001
3002
3003
3004
 
3005
3006
3007
3008
 
 
3009
3010
3011
3012
3013
 
 
3014
3015
3016
3017
3018
 
3019
3020
3021
3022
 
3023
3024
3025
3026
 
3027
3028
3029
3030
 
3031
3032
3033
3034
 
3035
3036
3037
3038
 
3039
3040
3041
3042
 
3043
3044
3045
3046
 
3047
3048
3049
3050
 
3051
3052
3053
3054
 
3055
3056
3057
3058
3059
 
3060
3061
3062
3063
 
3064
3065
3066
3067
 
3068
3069
3070
3071
 
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
 
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
 
3211
3212
3213
 
3214
3215
3216
3217
 
3218
3219
3220
3221
 
3222
3223
3224
3225
 
3229
3230
3231
 
3232
3233
3234
3235
 
3236
3237
3238
3239
 
3240
3241
3242
3243
 
3247
3248
3249
 
3250
3251
3252
3253
 
3254
3255
3256
3257
 
3261
3262
3263
 
3264
3265
3266
3267
 
3268
3269
3270
3271
 
3272
3273
3274
3275
 
3276
3277
3278
3279
 
3280
3281
3282
3283
 
3284
3285
3286
3287
 
3288
3289
3290
3291
 
3292
3293
3294
3295
 
3296
3297
3298
3299
 
3300
3301
3302
3303
 
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
 
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
 
3459
3460
3461
 
3462
3463
3464
3465
3466
 
3467
3468
3469
3470
 
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
 
3831
3832
3833
3834
 
3835
3836
3837
3838
 
3839
3840
3841
3842
 
3843
3844
3845
3846
 
3847
3848
3849
3850
 
3851
3852
3853
3854
 
3855
3856
3857
3858
 
3859
3860
3861
3862
 
3863
3864
3865
3866
 
3867
3868
3869
3870
 
3871
3872
3873
3874
 
3875
3876
3877
3878
 
3879
3880
3881
3882
 
3883
3884
3885
3886
 
3887
3888
3889
3890
 
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
 
3902
3903
3904
3905
 
3906
3907
3908
3909
 
3910
3911
3912
3913
 
5719
5720
5721
 
5722
5723
5724
5725
 
5731
5732
5733
 
5734
5735
5736
5737
 
5838
5839
5840
 
5841
5842
5843
5844
 
5845
5846
5847
5848
 
5849
5850
5851
5852
 
5853
5854
5855
5856
 
5857
5858
5859
5860
 
5861
5862
5863
5864
 
5865
5866
5867
5868
 
5869
5870
5871
5872
 
5873
5874
5875
5876
 
5877
5878
5879
5880
 
5881
5882
5883
5884
 
5885
5886
5887
5888
 
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
 
7622
7623
7624
7625
7626
7627
7628
7629
7630
@@ -7,15 +7,15 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: Peer Sommerlund <peer.sommerlund@gmail.com>\n" -"POT-Creation-Date: 2010-12-28 20:44+0000\n" -"PO-Revision-Date: 2011-01-02 12:27+0000\n" -"Last-Translator: Aputsiaq Janussen <aj@isit.gl>\n" +"POT-Creation-Date: 2011-01-28 22:51+0000\n" +"PO-Revision-Date: 2011-01-31 04:56+0000\n" +"Last-Translator: peso <peer.sommerlund@gmail.com>\n"  "Language-Team: Danish <da@li.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-03 05:11+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Launchpad-Export-Date: 2011-02-01 04:47+0000\n" +"X-Generator: Launchpad (build 12177)\n"    #: TortoiseHgOverlayServer.py:36  msgid "TortoiseHg Overlay Icon Server" @@ -145,7 +145,7 @@
 msgstr "Alle filer (*.*)"    #: tortoisehg\hgtk\archive.py:213 tortoisehg\hgtk\archive.py:219 -#: tortoisehg\hgtk\gtklib.py:580 tortoisehg\hgtk\thgconfig.py:574 +#: tortoisehg\hgtk\gtklib.py:594 tortoisehg\hgtk\thgconfig.py:574  #: tortoisehg\hgtk\thgconfig.py:1077  msgid "Confirm Overwrite"  msgstr "Bekræft overskrivning" @@ -252,7 +252,7 @@
 msgstr "Sæt nuværende"    #: tortoisehg\hgtk\bookmark.py:56 tortoisehg\hgtk\bookmark.py:182 -#: tortoisehg\hgtk\merge.py:178 +#: tortoisehg\hgtk\merge.py:184  msgid "unexpected type: %s"  msgstr "uventet type: %s"   @@ -388,14 +388,13 @@
   #: tortoisehg\hgtk\bugreport.py:57  msgid "" -"** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues " -"or tortoisehg-discuss@lists.sourceforge.net\n" +"** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues\n"  msgstr "" -"** Venligst rapport denne fejl til " -"http://bitbucket.org/tortoisehg/stable/issues eller tortoisehg-" -"discuss@lists.sourceforge.net\n" - -#: tortoisehg\hgtk\bugreport.py:88 +"** Venligst rapporter denne fejl på " +"http://bitbucket.org/tortoisehg/stable/issues\n" +"Bemærk at fejlrapporter skal være på engelsk\n" + +#: tortoisehg\hgtk\bugreport.py:87  msgid "Save error report to"  msgstr "Gem fejlrapport til"   @@ -524,7 +523,8 @@
 msgid "Select Source Folder"  msgstr "Vælg kilde-mappe"   -#: tortoisehg\hgtk\clone.py:117 tortoisehg\hgtk\tagadd.py:69 +#: tortoisehg\hgtk\clone.py:117 tortoisehg\hgtk\merge.py:90 +#: tortoisehg\hgtk\tagadd.py:69  msgid "Advanced options"  msgstr "Avancerede indstillinger"   @@ -718,7 +718,7 @@
 msgid "Show/Hide Patch Queue"  msgstr "vis/skjul lap-kø"   -#: tortoisehg\hgtk\commit.py:323 tortoisehg\hgtk\merge.py:190 +#: tortoisehg\hgtk\commit.py:323 tortoisehg\hgtk\merge.py:196  #: tortoisehg\hgtk\thgconfig.py:846  msgid "Confirm Exit"  msgstr "Bekræft exit" @@ -729,7 +729,7 @@
   #: tortoisehg\hgtk\commit.py:325 tortoisehg\hgtk\commit.py:1193  #: tortoisehg\hgtk\commit.py:1200 tortoisehg\hgtk\history.py:220 -#: tortoisehg\hgtk\history.py:2652 tortoisehg\hgtk\status.py:1320 +#: tortoisehg\hgtk\history.py:2646 tortoisehg\hgtk\status.py:1320  #: tortoisehg\hgtk\statusact.py:127 tortoisehg\hgtk\statusact.py:148  #: tortoisehg\hgtk\thgconfig.py:775 tortoisehg\hgtk\thgconfig.py:849  #: tortoisehg\hgtk\thgmq.py:369 tortoisehg\hgtk\update.py:239 @@ -786,7 +786,7 @@
 #: tortoisehg\hgtk\commit.py:654 tortoisehg\hgtk\commit.py:951  #: tortoisehg\hgtk\commit.py:1015 tortoisehg\hgtk\commit.py:1264  #: tortoisehg\hgtk\gdialog.py:485 tortoisehg\hgtk\history.py:279 -#: tortoisehg\hgtk\merge.py:130 tortoisehg\hgtk\thgconfig.py:89 +#: tortoisehg\hgtk\merge.py:136 tortoisehg\hgtk\thgconfig.py:89  msgid "Commit"  msgstr "Integrér"   @@ -1028,11 +1028,11 @@
 msgstr "Integrerer ændringer..."    #: tortoisehg\hgtk\commit.py:1265 tortoisehg\hgtk\history.py:613 -#: tortoisehg\hgtk\history.py:638 tortoisehg\hgtk\history.py:1786 -#: tortoisehg\hgtk\history.py:1868 tortoisehg\hgtk\history.py:1998 -#: tortoisehg\hgtk\history.py:2041 tortoisehg\hgtk\history.py:2081 -#: tortoisehg\hgtk\history.py:2425 tortoisehg\hgtk\history.py:2455 -#: tortoisehg\hgtk\history.py:2712 tortoisehg\hgtk\history.py:2743 +#: tortoisehg\hgtk\history.py:638 tortoisehg\hgtk\history.py:1780 +#: tortoisehg\hgtk\history.py:1862 tortoisehg\hgtk\history.py:1992 +#: tortoisehg\hgtk\history.py:2035 tortoisehg\hgtk\history.py:2075 +#: tortoisehg\hgtk\history.py:2419 tortoisehg\hgtk\history.py:2449 +#: tortoisehg\hgtk\history.py:2706 tortoisehg\hgtk\history.py:2737  #: tortoisehg\hgtk\recovery.py:178 tortoisehg\hgtk\synch.py:549  msgid "Cannot run now"  msgstr "Kan ikke køre nu" @@ -1406,11 +1406,11 @@
 msgid "edit failed"  msgstr "redigering fejlede"   -#: tortoisehg\hgtk\gdialog.py:682 tortoisehg\hgtk\gtklib.py:392 +#: tortoisehg\hgtk\gdialog.py:682 tortoisehg\hgtk\gtklib.py:406  msgid "No visual editor configured"  msgstr "Ingen visuel editor konfigureret"   -#: tortoisehg\hgtk\gdialog.py:683 tortoisehg\hgtk\gtklib.py:393 +#: tortoisehg\hgtk\gdialog.py:683 tortoisehg\hgtk\gtklib.py:407  msgid "Please configure a visual editor."  msgstr "Vælg en visuel editor."   @@ -1450,15 +1450,15 @@
 msgid "Invalid Revision"  msgstr "Ugyldig revision"   -#: tortoisehg\hgtk\gtklib.py:467 +#: tortoisehg\hgtk\gtklib.py:481  msgid "Save File"  msgstr "Gem fil"   -#: tortoisehg\hgtk\gtklib.py:468 +#: tortoisehg\hgtk\gtklib.py:482  msgid "All files"  msgstr "Alle filer"   -#: tortoisehg\hgtk\gtklib.py:581 +#: tortoisehg\hgtk\gtklib.py:595  msgid ""  "The file \"%s\" already exists!\n"  "\n" @@ -1468,11 +1468,11 @@
 "\n"  "Vil du overskrive den?"   -#: tortoisehg\hgtk\gtklib.py:592 +#: tortoisehg\hgtk\gtklib.py:606  msgid "Select Folder"  msgstr "Vælg mappe"   -#: tortoisehg\hgtk\gtklib.py:1081 +#: tortoisehg\hgtk\gtklib.py:1095  msgid ""  "Select language for spell checking.\n"  "\n" @@ -1490,11 +1490,11 @@
 "\n"  "eksempler: da, en, en_GB, en_US"   -#: tortoisehg\hgtk\gtklib.py:1087 +#: tortoisehg\hgtk\gtklib.py:1101  msgid "Lang \"%s\" can not be set.\n"  msgstr "Sprog \"%s\" kan ikke aktiveres.\n"   -#: tortoisehg\hgtk\gtklib.py:1100 tortoisehg\hgtk\thgconfig.py:85 +#: tortoisehg\hgtk\gtklib.py:1114 tortoisehg\hgtk\thgconfig.py:85  msgid "Spell Check Language"  msgstr "Stavekontrolsprog"   @@ -1886,6 +1886,18 @@
 msgid "abort: "  msgstr "afbrudt: "   +#: tortoisehg\hgtk\hgthread.py:198 +msgid "SSL: Server certificate verify failed" +msgstr "SSL: Kontrol af server certificate fejlede" + +#: tortoisehg\hgtk\hgthread.py:200 +msgid "SSL: unknown error %s:%s" +msgstr "SSL: ukendt fejl %s:%s" + +#: tortoisehg\hgtk\hgthread.py:202 +msgid "SSL error: %s" +msgstr "SSL fejl: %s" +  #: tortoisehg\hgtk\hgtk.py:78  msgid ""  "\n" @@ -2486,21 +2498,21 @@
 msgid "_Synchronize"  msgstr "_Synkronisér"   -#: tortoisehg\hgtk\history.py:438 tortoisehg\hgtk\history.py:1867 +#: tortoisehg\hgtk\history.py:438 tortoisehg\hgtk\history.py:1861  #: tortoisehg\hgtk\synch.py:57  msgid "Incoming"  msgstr "Indgående"   -#: tortoisehg\hgtk\history.py:440 tortoisehg\hgtk\history.py:1997 +#: tortoisehg\hgtk\history.py:440 tortoisehg\hgtk\history.py:1991  msgid "Pull"  msgstr "Træk"   -#: tortoisehg\hgtk\history.py:442 tortoisehg\hgtk\history.py:2040 +#: tortoisehg\hgtk\history.py:442 tortoisehg\hgtk\history.py:2034  #: tortoisehg\hgtk\synch.py:68  msgid "Outgoing"  msgstr "Udgående"   -#: tortoisehg\hgtk\history.py:444 tortoisehg\hgtk\history.py:2080 +#: tortoisehg\hgtk\history.py:444 tortoisehg\hgtk\history.py:2074  #: tortoisehg\hgtk\synch.py:73  msgid "Push"  msgstr "Skub" @@ -2594,11 +2606,11 @@
 msgstr "Afventende Perforce ændringslister"    #: tortoisehg\hgtk\history.py:614 tortoisehg\hgtk\history.py:639 -#: tortoisehg\hgtk\history.py:1787 tortoisehg\hgtk\history.py:1869 -#: tortoisehg\hgtk\history.py:1999 tortoisehg\hgtk\history.py:2042 -#: tortoisehg\hgtk\history.py:2082 tortoisehg\hgtk\history.py:2426 -#: tortoisehg\hgtk\history.py:2456 tortoisehg\hgtk\history.py:2713 -#: tortoisehg\hgtk\history.py:2744 tortoisehg\hgtk\recovery.py:179 +#: tortoisehg\hgtk\history.py:1781 tortoisehg\hgtk\history.py:1863 +#: tortoisehg\hgtk\history.py:1993 tortoisehg\hgtk\history.py:2036 +#: tortoisehg\hgtk\history.py:2076 tortoisehg\hgtk\history.py:2420 +#: tortoisehg\hgtk\history.py:2450 tortoisehg\hgtk\history.py:2707 +#: tortoisehg\hgtk\history.py:2738 tortoisehg\hgtk\recovery.py:179  #: tortoisehg\hgtk\synch.py:550  msgid "Please try again after the previous command has completed"  msgstr "Prøv venligst igen efter at foregående kommando er afsluttet" @@ -2986,138 +2998,138 @@
 msgid "Configure aliases and after pull behavior"  msgstr "Konfigurer aliaser og opførsel efter 'hent'"   -#: tortoisehg\hgtk\history.py:1784 +#: tortoisehg\hgtk\history.py:1778  msgid "Applying bundle..."  msgstr "Anvender bundt..."   -#: tortoisehg\hgtk\history.py:1785 +#: tortoisehg\hgtk\history.py:1779  msgid "Applying bundle"  msgstr "Anvender bundt"   -#: tortoisehg\hgtk\history.py:1830 tortoisehg\hgtk\history.py:1972 -#: tortoisehg\hgtk\history.py:2005 tortoisehg\hgtk\history.py:2619 +#: tortoisehg\hgtk\history.py:1824 tortoisehg\hgtk\history.py:1966 +#: tortoisehg\hgtk\history.py:1999 tortoisehg\hgtk\history.py:2613  msgid "No remote path specified"  msgstr "Ingen fjern-sti specificeret"   -#: tortoisehg\hgtk\history.py:1831 tortoisehg\hgtk\history.py:1973 -#: tortoisehg\hgtk\history.py:2006 tortoisehg\hgtk\history.py:2620 +#: tortoisehg\hgtk\history.py:1825 tortoisehg\hgtk\history.py:1967 +#: tortoisehg\hgtk\history.py:2000 tortoisehg\hgtk\history.py:2614  msgid "Please enter or select a remote path"  msgstr "Skriv eller vælg en fjern-sti"   -#: tortoisehg\hgtk\history.py:1858 +#: tortoisehg\hgtk\history.py:1852  msgid "%d incoming changesets"  msgstr "%d indgående ændringer"   -#: tortoisehg\hgtk\history.py:1860 +#: tortoisehg\hgtk\history.py:1854  msgid "Aborted incoming"  msgstr "Afbrød indgående"   -#: tortoisehg\hgtk\history.py:1862 +#: tortoisehg\hgtk\history.py:1856  msgid "No incoming changesets"  msgstr "Ingen indkommende ændringssæt"   -#: tortoisehg\hgtk\history.py:1866 +#: tortoisehg\hgtk\history.py:1860  msgid "Checking incoming changesets..."  msgstr "Tjeker indkommende ændringssæt..."   -#: tortoisehg\hgtk\history.py:1885 +#: tortoisehg\hgtk\history.py:1879  msgid "Accept incoming previewed changesets"  msgstr "Godkend indgående ændringer som blev forhåndsvist"   -#: tortoisehg\hgtk\history.py:1886 +#: tortoisehg\hgtk\history.py:1880  msgid "Accept"  msgstr "Godkend"   -#: tortoisehg\hgtk\history.py:1891 +#: tortoisehg\hgtk\history.py:1885  msgid "Reject incoming previewed changesets"  msgstr "Afvis indgående ændringer som blev forhåndsvist"   -#: tortoisehg\hgtk\history.py:1892 +#: tortoisehg\hgtk\history.py:1886  msgid "Reject"  msgstr "Afvis"   -#: tortoisehg\hgtk\history.py:1934 +#: tortoisehg\hgtk\history.py:1928  msgid "Bundle Preview"  msgstr "Forhåndsvisning af bundt"   -#: tortoisehg\hgtk\history.py:1939 +#: tortoisehg\hgtk\history.py:1933  msgid "Failed to preview, a bundle file unrelated to this repository"  msgstr ""  "Mislykkedes med forhåndsvisning, en bundtfil uden relation til dette depot"   -#: tortoisehg\hgtk\history.py:1944 +#: tortoisehg\hgtk\history.py:1938  msgid "Failed to preview, not a Mercurial bundle file"  msgstr "Mislykkedes med forhåndsvisning, ikke en Mercurial bundtfil"   -#: tortoisehg\hgtk\history.py:1948 +#: tortoisehg\hgtk\history.py:1942  msgid "Open Bundle"  msgstr "Åben bundt"   -#: tortoisehg\hgtk\history.py:1986 +#: tortoisehg\hgtk\history.py:1980  msgid "Finished pull with rebase"  msgstr "Afsluttede træk med rebase"   -#: tortoisehg\hgtk\history.py:1989 +#: tortoisehg\hgtk\history.py:1983  msgid "Finished pull"  msgstr "Afsluttede træk"   -#: tortoisehg\hgtk\history.py:1991 +#: tortoisehg\hgtk\history.py:1985  msgid "No changesets to pull"  msgstr "Ingen ændringssæt at trække"   -#: tortoisehg\hgtk\history.py:1993 tortoisehg\hgtk\history.py:2738 +#: tortoisehg\hgtk\history.py:1987 tortoisehg\hgtk\history.py:2732  msgid "Aborted pull"  msgstr "Afbrød træk"   -#: tortoisehg\hgtk\history.py:1996 +#: tortoisehg\hgtk\history.py:1990  msgid "Pulling changesets..."  msgstr "Trækker ændringssæt..."   -#: tortoisehg\hgtk\history.py:2032 +#: tortoisehg\hgtk\history.py:2026  msgid "%d outgoing changesets"  msgstr "%d udgående ændringer"   -#: tortoisehg\hgtk\history.py:2034 +#: tortoisehg\hgtk\history.py:2028  msgid "Aborted outgoing"  msgstr "Afbryder udgående"   -#: tortoisehg\hgtk\history.py:2036 +#: tortoisehg\hgtk\history.py:2030  msgid "No outgoing changesets"  msgstr "Ingen udgående ændringssæt"   -#: tortoisehg\hgtk\history.py:2039 +#: tortoisehg\hgtk\history.py:2033  msgid "Checking outgoing changesets..."  msgstr "Tjekker udgående ændringssæt..."   -#: tortoisehg\hgtk\history.py:2048 tortoisehg\hgtk\synch.py:504 +#: tortoisehg\hgtk\history.py:2042 tortoisehg\hgtk\synch.py:504  msgid "No repository selected"  msgstr "Intet depot valgt"   -#: tortoisehg\hgtk\history.py:2049 tortoisehg\hgtk\synch.py:505 +#: tortoisehg\hgtk\history.py:2043 tortoisehg\hgtk\synch.py:505  msgid "Select a peer repository to compare with"  msgstr "Vælg et andet depot at sammenligne med"   -#: tortoisehg\hgtk\history.py:2074 +#: tortoisehg\hgtk\history.py:2068  msgid "Finished push"  msgstr "Afsluttede skub"   -#: tortoisehg\hgtk\history.py:2076 tortoisehg\hgtk\history.py:2704 +#: tortoisehg\hgtk\history.py:2070 tortoisehg\hgtk\history.py:2698  msgid "Aborted push"  msgstr "Afbrød skub"   -#: tortoisehg\hgtk\history.py:2079 +#: tortoisehg\hgtk\history.py:2073  msgid "Pushing changesets..."  msgstr "Skubber ændringssæt..."   -#: tortoisehg\hgtk\history.py:2191 +#: tortoisehg\hgtk\history.py:2185  msgid "unknown dnd dest: %s"  msgstr "ukendt dnd mål: %s"   -#: tortoisehg\hgtk\history.py:2310 +#: tortoisehg\hgtk\history.py:2304  msgid "Confirm Revert All Files"  msgstr "Bekræft Tilbageføring af Alle Filer"   -#: tortoisehg\hgtk\history.py:2311 +#: tortoisehg\hgtk\history.py:2305  msgid ""  "Revert all files to revision %d?\n"  "This will overwrite your local changes" @@ -3125,71 +3137,71 @@
 "Tilbagefør alle filer til revision %d?\n"  "Dette vil overskrive dine lokale ændringer"   -#: tortoisehg\hgtk\history.py:2361 +#: tortoisehg\hgtk\history.py:2355  msgid "Save patches to"  msgstr "Gem lappeløsninger i"   -#: tortoisehg\hgtk\history.py:2397 +#: tortoisehg\hgtk\history.py:2391  msgid "Write bundle to"  msgstr "Skriv bundt til"   -#: tortoisehg\hgtk\history.py:2410 +#: tortoisehg\hgtk\history.py:2404  msgid "Bundling from %(base)s to %(rev)s..."  msgstr "Laver bundt fra %(base)s til %(rev)s..."   -#: tortoisehg\hgtk\history.py:2412 +#: tortoisehg\hgtk\history.py:2406  msgid "Bundling from %(base)s to tip..."  msgstr "Laver bundt fra %(base)s til spids..."   -#: tortoisehg\hgtk\history.py:2418 +#: tortoisehg\hgtk\history.py:2412  msgid "Finish bundling"  msgstr "Afslutter bundtfremstilling"   -#: tortoisehg\hgtk\history.py:2420 +#: tortoisehg\hgtk\history.py:2414  msgid "Aborted bundling"  msgstr "Afbrød bundtfremstilling"   -#: tortoisehg\hgtk\history.py:2422 +#: tortoisehg\hgtk\history.py:2416  msgid "Failed to bundle"  msgstr "Mislykkede med at lave bundt"   -#: tortoisehg\hgtk\history.py:2424 +#: tortoisehg\hgtk\history.py:2418  msgid "Bundling"  msgstr "Laver bundt"   -#: tortoisehg\hgtk\history.py:2447 +#: tortoisehg\hgtk\history.py:2441  msgid "Finish importing"  msgstr "Afslutter import"   -#: tortoisehg\hgtk\history.py:2449 +#: tortoisehg\hgtk\history.py:2443  msgid "Aborted importing"  msgstr "Afbrød import"   -#: tortoisehg\hgtk\history.py:2451 tortoisehg\hgtk\thgimport.py:188 +#: tortoisehg\hgtk\history.py:2445 tortoisehg\hgtk\thgimport.py:188  msgid "Failed to import"  msgstr "Import mislykkede"   -#: tortoisehg\hgtk\history.py:2453 +#: tortoisehg\hgtk\history.py:2447  msgid "Importing"  msgstr "Importerer"   -#: tortoisehg\hgtk\history.py:2454 +#: tortoisehg\hgtk\history.py:2448  msgid "Importing to Patch Queue..."  msgstr "Importerer til lap-kø..."   -#: tortoisehg\hgtk\history.py:2462 +#: tortoisehg\hgtk\history.py:2456  msgid "Confirm Rebase Revision"  msgstr "Bekræft rebase revision"   -#: tortoisehg\hgtk\history.py:2463 +#: tortoisehg\hgtk\history.py:2457  msgid "Rebase revision %d on top of %d?"  msgstr "Rebase revision %d efter %d?"   -#: tortoisehg\hgtk\history.py:2628 +#: tortoisehg\hgtk\history.py:2622  msgid "Confirm Forced Push to Remote Repository"  msgstr "Bekræft tvunget skub til fjern-depot"   -#: tortoisehg\hgtk\history.py:2629 +#: tortoisehg\hgtk\history.py:2623  msgid ""  "Forced push to remote repository\n"  "%s\n" @@ -3199,15 +3211,15 @@
 "%s\n"  "(opret nyt hoved i fjerndepot om nødvendigt)?"   -#: tortoisehg\hgtk\history.py:2631 tortoisehg\hgtk\history.py:2647 +#: tortoisehg\hgtk\history.py:2625 tortoisehg\hgtk\history.py:2641  msgid "Forced &Push"  msgstr "Tvunget &skub"   -#: tortoisehg\hgtk\history.py:2633 +#: tortoisehg\hgtk\history.py:2627  msgid "Confirm Push of New Branches to Remote Repository"  msgstr "Bekræft skub af nye grene til fjerndepot"   -#: tortoisehg\hgtk\history.py:2634 +#: tortoisehg\hgtk\history.py:2628  msgid ""  "Push to remote repository\n"  "%s\n" @@ -3217,15 +3229,15 @@
 "%s\n"  "(opretter om nødvendigt nye grene i fjerndepot)?"   -#: tortoisehg\hgtk\history.py:2636 tortoisehg\hgtk\history.py:2641 +#: tortoisehg\hgtk\history.py:2630 tortoisehg\hgtk\history.py:2635  msgid "&Push"  msgstr "&Skub"   -#: tortoisehg\hgtk\history.py:2639 +#: tortoisehg\hgtk\history.py:2633  msgid "Confirm Push to remote Repository"  msgstr "Bekræft skub til fjern-depot"   -#: tortoisehg\hgtk\history.py:2640 +#: tortoisehg\hgtk\history.py:2634  msgid ""  "Push to remote repository\n"  "%s\n" @@ -3235,11 +3247,11 @@
 "%s\n"  "?"   -#: tortoisehg\hgtk\history.py:2644 +#: tortoisehg\hgtk\history.py:2638  msgid "Confirm Forced Push"  msgstr "Bekræft tvuget skub"   -#: tortoisehg\hgtk\history.py:2645 +#: tortoisehg\hgtk\history.py:2639  msgid ""  "Forced push to repository\n"  "%s\n" @@ -3249,43 +3261,43 @@
 "%s\n"  "(opret nye hoveder om nødvendigt)?"   -#: tortoisehg\hgtk\history.py:2682 +#: tortoisehg\hgtk\history.py:2676  msgid "Finished push to revision %s"  msgstr "Afsluttede skub til revision %s"   -#: tortoisehg\hgtk\history.py:2690 +#: tortoisehg\hgtk\history.py:2684  msgid "Finished pushing branch %s"  msgstr "Afsluttede skub af gren %s"   -#: tortoisehg\hgtk\history.py:2707 +#: tortoisehg\hgtk\history.py:2701  msgid "Pushing branch %s..."  msgstr "Skubber gren %s..."   -#: tortoisehg\hgtk\history.py:2709 +#: tortoisehg\hgtk\history.py:2703  msgid "Pushing changesets to revision %s..."  msgstr "Skubber ændringssæt til revision %s..."   -#: tortoisehg\hgtk\history.py:2711 +#: tortoisehg\hgtk\history.py:2705  msgid "Push to %s"  msgstr "Skub til %s"   -#: tortoisehg\hgtk\history.py:2736 +#: tortoisehg\hgtk\history.py:2730  msgid "Finished pull to revision %s"  msgstr "Afsluttede træk til revision %s"   -#: tortoisehg\hgtk\history.py:2741 +#: tortoisehg\hgtk\history.py:2735  msgid "Pulling changesets to revision %s..."  msgstr "Trækker ændringssæt til revision %s..."   -#: tortoisehg\hgtk\history.py:2742 +#: tortoisehg\hgtk\history.py:2736  msgid "Pull to %s"  msgstr "Træk til %s"   -#: tortoisehg\hgtk\history.py:2755 tortoisehg\hgtk\status.py:999 +#: tortoisehg\hgtk\history.py:2749 tortoisehg\hgtk\status.py:999  msgid "Save patch to"  msgstr "Gem lap som"   -#: tortoisehg\hgtk\history.py:2905 tortoisehg\hgtk\history.py:2915 +#: tortoisehg\hgtk\history.py:2900 tortoisehg\hgtk\history.py:2910  msgid "Refresh required"  msgstr "Genopfriskning påkrævet"   @@ -3342,50 +3354,50 @@
 msgstr "Fletterevision (den der flettes ind)"    #: tortoisehg\hgtk\merge.py:84 +msgid "Current revision (local)" +msgstr "Aktuel revision (lokal)" + +#: tortoisehg\hgtk\merge.py:103 +msgid "Use merge tool:" +msgstr "Brug flet-værktøj:" + +#: tortoisehg\hgtk\merge.py:118  msgid "Discard all changes from merge target (other) revision"  msgstr "Kassér alle ændringer fra flettemål (en anden) revision"   -#: tortoisehg\hgtk\merge.py:89 -msgid "Current revision (local)" -msgstr "Aktuel revision (lokal)" - -#: tortoisehg\hgtk\merge.py:100 -msgid "Merge tools:" -msgstr "Fletteværktøj:" - -#: tortoisehg\hgtk\merge.py:129 +#: tortoisehg\hgtk\merge.py:135  msgid "Merge"  msgstr "Flet"   -#: tortoisehg\hgtk\merge.py:131 +#: tortoisehg\hgtk\merge.py:137  msgid "Undo"  msgstr "Fortryd"   -#: tortoisehg\hgtk\merge.py:159 +#: tortoisehg\hgtk\merge.py:165  msgid "Merged successfully"  msgstr "Flet fuldført"   -#: tortoisehg\hgtk\merge.py:161 +#: tortoisehg\hgtk\merge.py:167  msgid "Canceled merging"  msgstr "Flet annuleret"   -#: tortoisehg\hgtk\merge.py:163 +#: tortoisehg\hgtk\merge.py:169  msgid "Failed to merge"  msgstr "Kunne ikke flette"   -#: tortoisehg\hgtk\merge.py:170 +#: tortoisehg\hgtk\merge.py:176  msgid "Undo successfully"  msgstr "Tilbageførsel fuldført"   -#: tortoisehg\hgtk\merge.py:172 +#: tortoisehg\hgtk\merge.py:178  msgid "Canceled undo"  msgstr "Tilbageførsel annuleret"   -#: tortoisehg\hgtk\merge.py:174 +#: tortoisehg\hgtk\merge.py:180  msgid "Failed to undo"  msgstr "Kunne ikke tilbageføre"   -#: tortoisehg\hgtk\merge.py:191 +#: tortoisehg\hgtk\merge.py:197  msgid ""  "To complete merging, you need to commit merged files in working directory.\n"  "\n" @@ -3395,19 +3407,34 @@
 "\n"  "Vil du afslutte?"   -#: tortoisehg\hgtk\merge.py:204 +#: tortoisehg\hgtk\merge.py:210  msgid "Cannot merge"  msgstr "Kan ikke flette"   -#: tortoisehg\hgtk\merge.py:205 +#: tortoisehg\hgtk\merge.py:211  msgid "Uncommitted local changes"  msgstr "Ikke-opdaterede lokale ændringer"   -#: tortoisehg\hgtk\merge.py:240 +#: tortoisehg\hgtk\merge.py:215 +msgid "Confirm Discard Changes" +msgstr "Bekræft kassering af ændringer" + +#: tortoisehg\hgtk\merge.py:216 +msgid "" +"The changes from revision %s and all unmerged parents will be discarded.\n" +"\n" +"Are you sure this is what you want to do?" +msgstr "" +"Ændringerne fra revision %s og alle ikke-flettede forældre vil blive " +"kasseret.\n" +"\n" +"Er du sikker på du vil gøre dette?" + +#: tortoisehg\hgtk\merge.py:253  msgid "Confirm undo merge"  msgstr "Bekræft fortryd flet"   -#: tortoisehg\hgtk\merge.py:241 +#: tortoisehg\hgtk\merge.py:254  msgid "Clean checkout of original revision?"  msgstr "Ren opdatering til originalrevision?"   @@ -3432,12 +3459,12 @@
 msgstr "Afsluttet"    #: tortoisehg\hgtk\p4pending.py:103 tortoisehg\hgtk\quickop.py:213 -#: tortoisehg\hgtk\thgmq.py:898 tortoisehg\hgtk\thgpbranch.py:746 +#: tortoisehg\hgtk\thgmq.py:898 tortoisehg\hgtk\thgpbranch.py:749  msgid "Canceled"  msgstr "Afbrudt"    #: tortoisehg\hgtk\p4pending.py:105 tortoisehg\hgtk\quickop.py:215 -#: tortoisehg\hgtk\thgmq.py:900 tortoisehg\hgtk\thgpbranch.py:748 +#: tortoisehg\hgtk\thgmq.py:900 tortoisehg\hgtk\thgpbranch.py:751  msgid "Failed"  msgstr "Fejlet"   @@ -3790,82 +3817,97 @@
 msgstr "Sub ->"    #: tortoisehg\hgtk\shellconf.py:112 +msgid "Menu Behavior" +msgstr "" + +#: tortoisehg\hgtk\shellconf.py:120 +msgid "Hide context menu outside repositories" +msgstr "Skjul kontekst-menu udenfor depoter" + +#: tortoisehg\hgtk\shellconf.py:124  msgid "Icons"  msgstr "Ikoner"   -#: tortoisehg\hgtk\shellconf.py:117 +#: tortoisehg\hgtk\shellconf.py:129  msgid "Overlays"  msgstr "Overlays"   -#: tortoisehg\hgtk\shellconf.py:124 +#: tortoisehg\hgtk\shellconf.py:136  msgid "Enable overlays"  msgstr "Aktiver overlays"   -#: tortoisehg\hgtk\shellconf.py:126 +#: tortoisehg\hgtk\shellconf.py:138  msgid "Local disks only"  msgstr "Kun lokale diske"   -#: tortoisehg\hgtk\shellconf.py:130 +#: tortoisehg\hgtk\shellconf.py:142  msgid "Enabled Overlay Handlers"  msgstr "Slog overlægningshåndtering til"   -#: tortoisehg\hgtk\shellconf.py:139 +#: tortoisehg\hgtk\shellconf.py:151  msgid "Warning: affects all Tortoises, logoff required after change"  msgstr "Advarsel: påvirker alle Tortoise'er, logud påkrævet efter ændring"   -#: tortoisehg\hgtk\shellconf.py:147 +#: tortoisehg\hgtk\shellconf.py:159  msgid "Added"  msgstr "Tilføjet"   -#: tortoisehg\hgtk\shellconf.py:149 +#: tortoisehg\hgtk\shellconf.py:161  msgid "Unversioned"  msgstr "Ikke versioneret"   -#: tortoisehg\hgtk\shellconf.py:154 +#: tortoisehg\hgtk\shellconf.py:166  msgid "Locked*"  msgstr "Låst*"   -#: tortoisehg\hgtk\shellconf.py:156 +#: tortoisehg\hgtk\shellconf.py:168  msgid "Readonly*"  msgstr "Læs-alene*"   -#: tortoisehg\hgtk\shellconf.py:161 +#: tortoisehg\hgtk\shellconf.py:173  msgid "Ignored*"  msgstr "Ignoreret*"   -#: tortoisehg\hgtk\shellconf.py:163 +#: tortoisehg\hgtk\shellconf.py:175  msgid "Deleted*"  msgstr "Slettet*"   -#: tortoisehg\hgtk\shellconf.py:178 +#: tortoisehg\hgtk\shellconf.py:191  msgid "*: not used by TortoiseHg"  msgstr "*: bruges ikke af TortoiseHg"   -#: tortoisehg\hgtk\shellconf.py:182 +#: tortoisehg\hgtk\shellconf.py:195  msgid "Taskbar"  msgstr "Proceslinjen"   -#: tortoisehg\hgtk\shellconf.py:189 +#: tortoisehg\hgtk\shellconf.py:202  msgid "Show Icon"  msgstr "Vis ikon"   -#: tortoisehg\hgtk\shellconf.py:191 +#: tortoisehg\hgtk\shellconf.py:204  msgid "Highlight Icon"  msgstr "Fremhæv ikon"   -#: tortoisehg\hgtk\shellconf.py:197 +#: tortoisehg\hgtk\shellconf.py:210 +msgid "" +"Do not show menu items on unversioned folders (use shift + click to override)" +msgstr "" +"Vis ikke menu-linjer på ikke-versionerede foldere (brug shift+klik for at " +"tilsidesætte)" + +#: tortoisehg\hgtk\shellconf.py:213  msgid "Show overlay icons in Mercurial repositories"  msgstr "Vis overlægningsikoner i Mercurial-depoter"   -#: tortoisehg\hgtk\shellconf.py:200 +#: tortoisehg\hgtk\shellconf.py:216  msgid "Show overlays on local disks only"  msgstr "Vis overlægning på lokale diske alene"   -#: tortoisehg\hgtk\shellconf.py:204 +#: tortoisehg\hgtk\shellconf.py:220  msgid "Show the taskbar icon (restart needed)"  msgstr "Vis opgavebjælke-ikon (genstart påkrævet)"   -#: tortoisehg\hgtk\shellconf.py:207 +#: tortoisehg\hgtk\shellconf.py:223  msgid "Highlight the taskbar icon during activity"  msgstr "Fremhæv ikonet på proceslinjen ved aktivitet"   @@ -5677,7 +5719,7 @@
 msgid "Status"  msgstr "Status"   -#: tortoisehg\hgtk\thgmq.py:869 tortoisehg\hgtk\thgpbranch.py:703 +#: tortoisehg\hgtk\thgmq.py:869 tortoisehg\hgtk\thgpbranch.py:706  msgid "Enable editable cells"  msgstr "Aktivér redigérbare celler"   @@ -5689,7 +5731,7 @@
 msgid "Force"  msgstr "Tving"   -#: tortoisehg\hgtk\thgmq.py:896 tortoisehg\hgtk\thgpbranch.py:744 +#: tortoisehg\hgtk\thgmq.py:896 tortoisehg\hgtk\thgpbranch.py:747  msgid "Succeed"  msgstr "Fuldført"   @@ -5796,51 +5838,51 @@
 msgid "Patch branch finished"  msgstr "Lap-gren afsluttet."   -#: tortoisehg\hgtk\thgpbranch.py:650 +#: tortoisehg\hgtk\thgpbranch.py:653  msgid "_new"  msgstr "_ny"   -#: tortoisehg\hgtk\thgpbranch.py:652 +#: tortoisehg\hgtk\thgpbranch.py:655  msgid "_goto (update workdir)"  msgstr "_gå til (opdatér arbejdskatalog)"   -#: tortoisehg\hgtk\thgpbranch.py:654 +#: tortoisehg\hgtk\thgpbranch.py:657  msgid "_edit message"  msgstr "r_ediér besked"   -#: tortoisehg\hgtk\thgpbranch.py:655 +#: tortoisehg\hgtk\thgpbranch.py:658  msgid "_rename"  msgstr "_omdøb"   -#: tortoisehg\hgtk\thgpbranch.py:656 +#: tortoisehg\hgtk\thgpbranch.py:659  msgid "_delete"  msgstr "_slet"   -#: tortoisehg\hgtk\thgpbranch.py:657 +#: tortoisehg\hgtk\thgpbranch.py:660  msgid "_finish"  msgstr "a_fslut"   -#: tortoisehg\hgtk\thgpbranch.py:693 +#: tortoisehg\hgtk\thgpbranch.py:696  msgid "Show graph"  msgstr "Vis graf"   -#: tortoisehg\hgtk\thgpbranch.py:694 +#: tortoisehg\hgtk\thgpbranch.py:697  msgid "Show status"  msgstr "Vis status"   -#: tortoisehg\hgtk\thgpbranch.py:695 +#: tortoisehg\hgtk\thgpbranch.py:698  msgid "Show name"  msgstr "Vis navn"   -#: tortoisehg\hgtk\thgpbranch.py:696 +#: tortoisehg\hgtk\thgpbranch.py:699  msgid "Show title"  msgstr "Vis titel"   -#: tortoisehg\hgtk\thgpbranch.py:697 +#: tortoisehg\hgtk\thgpbranch.py:700  msgid "Show message"  msgstr "Vis besked"   -#: tortoisehg\hgtk\thgpbranch.py:706 +#: tortoisehg\hgtk\thgpbranch.py:709  msgid "Show internal branches"  msgstr "Vis interne grene"   @@ -7524,6 +7566,14 @@
 #~ msgid "_goto"  #~ msgstr "_gå til"   +#~ msgid "" +#~ "** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues " +#~ "or tortoisehg-discuss@lists.sourceforge.net\n" +#~ msgstr "" +#~ "** Venligst rapport denne fejl til " +#~ "http://bitbucket.org/tortoisehg/stable/issues eller tortoisehg-" +#~ "discuss@lists.sourceforge.net\n" +  #~ msgid "Unable to annotate"  #~ msgstr "Ikke i stand til at kommentere"   @@ -7572,6 +7622,9 @@
 #~ msgid "Backout Revision..."  #~ msgstr "Omgør revision..."   +#~ msgid "Merge tools:" +#~ msgstr "Fletteværktøj:" +  #~ msgid "Transp_lant to local"  #~ msgstr "Transp_lantér til lokal"  
Change 1 of 25 Show Entire File i18n/​tortoisehg/​de.po Stacked
 
7
8
9
10
 
11
12
13
14
15
16
17
18
 
 
19
20
21
 
147
148
149
150
 
151
152
153
 
257
258
259
260
 
261
262
263
 
393
394
395
396
397
398
399
400
401
402
403
 
 
 
 
404
405
406
 
529
530
531
532
 
 
533
534
535
 
723
724
725
726
 
727
728
729
 
734
735
736
737
 
738
739
740
 
791
792
793
794
 
795
796
797
 
1022
1023
1024
1025
1026
1027
1028
1029
 
 
 
 
 
1030
1031
1032
 
1400
1401
1402
1403
 
1404
1405
1406
1407
 
1408
1409
1410
 
1444
1445
1446
1447
 
1448
1449
1450
1451
 
1452
1453
1454
1455
 
1456
1457
1458
 
1462
1463
1464
1465
 
1466
1467
1468
1469
 
1470
1471
1472
 
1477
1478
1479
1480
 
1481
1482
1483
1484
 
1485
1486
1487
 
1866
1867
1868
 
 
 
 
 
 
 
 
 
 
 
 
1869
1870
1871
 
2461
2462
2463
2464
 
2465
2466
2467
2468
2469
 
2470
2471
2472
2473
 
2474
2475
2476
2477
2478
 
2479
2480
2481
 
2569
2570
2571
2572
2573
2574
2575
2576
 
 
 
 
 
2577
2578
2579
 
2961
2962
2963
2964
 
2965
2966
2967
2968
 
2969
2970
2971
2972
2973
 
 
2974
2975
2976
2977
2978
 
 
2979
2980
2981
2982
 
2983
2984
2985
 
 
 
 
 
 
 
 
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
 
 
 
 
 
 
 
 
2998
2999
 
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
 
3015
3016
3017
3018
 
3019
3020
3021
3022
 
3023
3024
3025
3026
 
3027
3028
3029
3030
 
3031
3032
3033
3034
 
3035
3036
3037
3038
 
3039
3040
3041
3042
 
3043
3044
3045
3046
 
3047
3048
3049
3050
 
3051
3052
3053
3054
 
3055
3056
3057
3058
 
3059
3060
3061
3062
 
3063
3064
3065
3066
 
3067
3068
3069
3070
 
3071
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
 
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
 
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
 
3393
3394
3395
3396
 
3397
3398
3399
3400
3401
 
3402
3403
3404
 
3750
3751
3752
 
 
 
 
 
 
 
 
3753
3754
3755
3756
 
3757
3758
3759
3760
 
3761
3762
3763
3764
 
3765
3766
3767
3768
 
3769
3770
3771
3772
 
3773
3774
3775
3776
 
3777
3778
3779
3780
 
3781
3782
3783
3784
 
3785
3786
3787
3788
 
3789
3790
3791
3792
 
3793
3794
3795
3796
 
3797
3798
3799
3800
 
3801
3802
3803
3804
 
3805
3806
3807
3808
 
3809
3810
3811
3812
 
3813
3814
3815
3816
 
 
 
 
 
 
3817
3818
3819
3820
 
3821
3822
3823
3824
 
3825
3826
3827
3828
 
3829
3830
3831
 
5586
5587
5588
5589
 
5590
5591
5592
 
5598
5599
5600
5601
 
5602
5603
5604
 
5697
5698
5699
5700
 
5701
5702
5703
5704
 
5705
5706
5707
5708
 
5709
5710
5711
5712
 
5713
5714
5715
5716
 
5717
5718
5719
5720
 
5721
5722
5723
5724
 
5725
5726
5727
5728
 
5729
5730
5731
5732
 
5733
5734
5735
5736
 
5737
5738
5739
5740
 
5741
5742
5743
5744
 
5745
5746
5747
 
7326
7327
7328
 
 
 
 
 
 
 
 
7329
7330
 
7
8
9
 
10
11
12
13
14
15
16
 
 
17
18
19
20
21
 
147
148
149
 
150
151
152
153
 
257
258
259
 
260
261
262
263
 
393
394
395
 
 
 
 
 
 
 
 
396
397
398
399
400
401
402
 
525
526
527
 
528
529
530
531
532
 
720
721
722
 
723
724
725
726
 
731
732
733
 
734
735
736
737
 
788
789
790
 
791
792
793
794
 
1019
1020
1021
 
 
 
 
 
1022
1023
1024
1025
1026
1027
1028
1029
 
1397
1398
1399
 
1400
1401
1402
1403
 
1404
1405
1406
1407
 
1441
1442
1443
 
1444
1445
1446
1447
 
1448
1449
1450
1451
 
1452
1453
1454
1455
 
1459
1460
1461
 
1462
1463
1464
1465
 
1466
1467
1468
1469
 
1474
1475
1476
 
1477
1478
1479
1480
 
1481
1482
1483
1484
 
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
 
2470
2471
2472
 
2473
2474
2475
2476
2477
 
2478
2479
2480
2481
 
2482
2483
2484
2485
2486
 
2487
2488
2489
2490
 
2578
2579
2580
 
 
 
 
 
2581
2582
2583
2584
2585
2586
2587
2588
 
2970
2971
2972
 
2973
2974
2975
2976
 
2977
2978
2979
2980
 
 
2981
2982
2983
2984
2985
 
 
2986
2987
2988
2989
2990
 
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
 
 
 
 
 
 
 
 
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
 
3016
3017
3018
3019
 
 
 
 
 
 
 
 
3020
3021
3022
 
3023
3024
3025
3026
 
3027
3028
3029
3030
 
3031
3032
3033
3034
 
3035
3036
3037
3038
 
3039
3040
3041
3042
 
3043
3044
3045
3046
 
3047
3048
3049
3050
 
3051
3052
3053
3054
 
3055
3056
3057
3058
 
3059
3060
3061
3062
 
3063
3064
3065
3066
 
3067
3068
3069
3070
 
3071
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
 
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
3258
3259
 
3260
3261
3262
3263
 
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
 
3413
3414
3415
 
3416
3417
3418
3419
3420
 
3421
3422
3423
3424
 
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
 
3784
3785
3786
3787
 
3788
3789
3790
3791
 
3792
3793
3794
3795
 
3796
3797
3798
3799
 
3800
3801
3802
3803
 
3804
3805
3806
3807
 
3808
3809
3810
3811
 
3812
3813
3814
3815
 
3816
3817
3818
3819
 
3820
3821
3822
3823
 
3824
3825
3826
3827
 
3828
3829
3830
3831
 
3832
3833
3834
3835
 
3836
3837
3838
3839
 
3840
3841
3842
3843
 
3844
3845
3846
3847
3848
3849
3850
3851
3852
 
3853
3854
3855
3856
 
3857
3858
3859
3860
 
3861
3862
3863
3864
 
5619
5620
5621
 
5622
5623
5624
5625
 
5631
5632
5633
 
5634
5635
5636
5637
 
5730
5731
5732
 
5733
5734
5735
5736
 
5737
5738
5739
5740
 
5741
5742
5743
5744
 
5745
5746
5747
5748
 
5749
5750
5751
5752
 
5753
5754
5755
5756
 
5757
5758
5759
5760
 
5761
5762
5763
5764
 
5765
5766
5767
5768
 
5769
5770
5771
5772
 
5773
5774
5775
5776
 
5777
5778
5779
5780
 
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
@@ -7,15 +7,15 @@
 msgstr ""  "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2010-12-28 20:44+0000\n" +"POT-Creation-Date: 2011-01-28 22:51+0000\n"  "PO-Revision-Date: 2011-01-09 15:38+0000\n"  "Last-Translator: Claudius Henrichs <claudius.h@gmx.de>\n"  "Language-Team: German <de@li.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-10 05:29+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Launchpad-Export-Date: 2011-01-29 05:05+0000\n" +"X-Generator: Launchpad (build 12177)\n"    #: TortoiseHgOverlayServer.py:36  msgid "TortoiseHg Overlay Icon Server" @@ -147,7 +147,7 @@
 msgstr "Alle Dateien (*.*)"    #: tortoisehg\hgtk\archive.py:213 tortoisehg\hgtk\archive.py:219 -#: tortoisehg\hgtk\gtklib.py:580 tortoisehg\hgtk\thgconfig.py:574 +#: tortoisehg\hgtk\gtklib.py:594 tortoisehg\hgtk\thgconfig.py:574  #: tortoisehg\hgtk\thgconfig.py:1077  msgid "Confirm Overwrite"  msgstr "Überschreiben bestätigen" @@ -257,7 +257,7 @@
 msgstr "Setze aktuelle"    #: tortoisehg\hgtk\bookmark.py:56 tortoisehg\hgtk\bookmark.py:182 -#: tortoisehg\hgtk\merge.py:178 +#: tortoisehg\hgtk\merge.py:184  msgid "unexpected type: %s"  msgstr "unerwarteter Typ: %s"   @@ -393,14 +393,10 @@
   #: tortoisehg\hgtk\bugreport.py:57  msgid "" -"** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues " -"or tortoisehg-discuss@lists.sourceforge.net\n" -msgstr "" -"** Bitte melden Sie diesen Fehlerbericht an " -"http://bitbucket.org/tortoisehg/stable/issues oder tortoisehg-" -"discuss@lists.sourceforge.net\n" - -#: tortoisehg\hgtk\bugreport.py:88 +"** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues\n" +msgstr "" + +#: tortoisehg\hgtk\bugreport.py:87  msgid "Save error report to"  msgstr ""   @@ -529,7 +525,8 @@
 msgid "Select Source Folder"  msgstr "Quellordner auswählen"   -#: tortoisehg\hgtk\clone.py:117 tortoisehg\hgtk\tagadd.py:69 +#: tortoisehg\hgtk\clone.py:117 tortoisehg\hgtk\merge.py:90 +#: tortoisehg\hgtk\tagadd.py:69  msgid "Advanced options"  msgstr "Erweiterte Einstellungen"   @@ -723,7 +720,7 @@
 msgid "Show/Hide Patch Queue"  msgstr ""   -#: tortoisehg\hgtk\commit.py:323 tortoisehg\hgtk\merge.py:190 +#: tortoisehg\hgtk\commit.py:323 tortoisehg\hgtk\merge.py:196  #: tortoisehg\hgtk\thgconfig.py:846  msgid "Confirm Exit"  msgstr "Beenden bestätigen" @@ -734,7 +731,7 @@
   #: tortoisehg\hgtk\commit.py:325 tortoisehg\hgtk\commit.py:1193  #: tortoisehg\hgtk\commit.py:1200 tortoisehg\hgtk\history.py:220 -#: tortoisehg\hgtk\history.py:2652 tortoisehg\hgtk\status.py:1320 +#: tortoisehg\hgtk\history.py:2646 tortoisehg\hgtk\status.py:1320  #: tortoisehg\hgtk\statusact.py:127 tortoisehg\hgtk\statusact.py:148  #: tortoisehg\hgtk\thgconfig.py:775 tortoisehg\hgtk\thgconfig.py:849  #: tortoisehg\hgtk\thgmq.py:369 tortoisehg\hgtk\update.py:239 @@ -791,7 +788,7 @@
 #: tortoisehg\hgtk\commit.py:654 tortoisehg\hgtk\commit.py:951  #: tortoisehg\hgtk\commit.py:1015 tortoisehg\hgtk\commit.py:1264  #: tortoisehg\hgtk\gdialog.py:485 tortoisehg\hgtk\history.py:279 -#: tortoisehg\hgtk\merge.py:130 tortoisehg\hgtk\thgconfig.py:89 +#: tortoisehg\hgtk\merge.py:136 tortoisehg\hgtk\thgconfig.py:89  msgid "Commit"  msgstr "Übernehmen"   @@ -1022,11 +1019,11 @@
 msgstr ""    #: tortoisehg\hgtk\commit.py:1265 tortoisehg\hgtk\history.py:613 -#: tortoisehg\hgtk\history.py:638 tortoisehg\hgtk\history.py:1786 -#: tortoisehg\hgtk\history.py:1868 tortoisehg\hgtk\history.py:1998 -#: tortoisehg\hgtk\history.py:2041 tortoisehg\hgtk\history.py:2081 -#: tortoisehg\hgtk\history.py:2425 tortoisehg\hgtk\history.py:2455 -#: tortoisehg\hgtk\history.py:2712 tortoisehg\hgtk\history.py:2743 +#: tortoisehg\hgtk\history.py:638 tortoisehg\hgtk\history.py:1780 +#: tortoisehg\hgtk\history.py:1862 tortoisehg\hgtk\history.py:1992 +#: tortoisehg\hgtk\history.py:2035 tortoisehg\hgtk\history.py:2075 +#: tortoisehg\hgtk\history.py:2419 tortoisehg\hgtk\history.py:2449 +#: tortoisehg\hgtk\history.py:2706 tortoisehg\hgtk\history.py:2737  #: tortoisehg\hgtk\recovery.py:178 tortoisehg\hgtk\synch.py:549  msgid "Cannot run now"  msgstr "Auführen jetzt nicht möglich" @@ -1400,11 +1397,11 @@
 msgid "edit failed"  msgstr "Bearbeitung fehlgeschlagen"   -#: tortoisehg\hgtk\gdialog.py:682 tortoisehg\hgtk\gtklib.py:392 +#: tortoisehg\hgtk\gdialog.py:682 tortoisehg\hgtk\gtklib.py:406  msgid "No visual editor configured"  msgstr "kein grafischer Editor konfiguriert"   -#: tortoisehg\hgtk\gdialog.py:683 tortoisehg\hgtk\gtklib.py:393 +#: tortoisehg\hgtk\gdialog.py:683 tortoisehg\hgtk\gtklib.py:407  msgid "Please configure a visual editor."  msgstr "Bitte konfigurieren Sie einen grafischen Editor"   @@ -1444,15 +1441,15 @@
 msgid "Invalid Revision"  msgstr ""   -#: tortoisehg\hgtk\gtklib.py:467 +#: tortoisehg\hgtk\gtklib.py:481  msgid "Save File"  msgstr "Datei speichern"   -#: tortoisehg\hgtk\gtklib.py:468 +#: tortoisehg\hgtk\gtklib.py:482  msgid "All files"  msgstr "Alle Dateien"   -#: tortoisehg\hgtk\gtklib.py:581 +#: tortoisehg\hgtk\gtklib.py:595  msgid ""  "The file \"%s\" already exists!\n"  "\n" @@ -1462,11 +1459,11 @@
 "\n"  "Soll sie überschreiben werden?"   -#: tortoisehg\hgtk\gtklib.py:592 +#: tortoisehg\hgtk\gtklib.py:606  msgid "Select Folder"  msgstr "Ordner auswählen"   -#: tortoisehg\hgtk\gtklib.py:1081 +#: tortoisehg\hgtk\gtklib.py:1095  msgid ""  "Select language for spell checking.\n"  "\n" @@ -1477,11 +1474,11 @@
 "examples: en, en_GB, en_US"  msgstr ""   -#: tortoisehg\hgtk\gtklib.py:1087 +#: tortoisehg\hgtk\gtklib.py:1101  msgid "Lang \"%s\" can not be set.\n"  msgstr ""   -#: tortoisehg\hgtk\gtklib.py:1100 tortoisehg\hgtk\thgconfig.py:85 +#: tortoisehg\hgtk\gtklib.py:1114 tortoisehg\hgtk\thgconfig.py:85  msgid "Spell Check Language"  msgstr ""   @@ -1866,6 +1863,18 @@
 msgid "abort: "  msgstr "abgebrochen: "   +#: tortoisehg\hgtk\hgthread.py:198 +msgid "SSL: Server certificate verify failed" +msgstr "" + +#: tortoisehg\hgtk\hgthread.py:200 +msgid "SSL: unknown error %s:%s" +msgstr "" + +#: tortoisehg\hgtk\hgthread.py:202 +msgid "SSL error: %s" +msgstr "" +  #: tortoisehg\hgtk\hgtk.py:78  msgid ""  "\n" @@ -2461,21 +2470,21 @@
 msgid "_Synchronize"  msgstr ""   -#: tortoisehg\hgtk\history.py:438 tortoisehg\hgtk\history.py:1867 +#: tortoisehg\hgtk\history.py:438 tortoisehg\hgtk\history.py:1861  #: tortoisehg\hgtk\synch.py:57  msgid "Incoming"  msgstr "Eingehend"   -#: tortoisehg\hgtk\history.py:440 tortoisehg\hgtk\history.py:1997 +#: tortoisehg\hgtk\history.py:440 tortoisehg\hgtk\history.py:1991  msgid "Pull"  msgstr ""   -#: tortoisehg\hgtk\history.py:442 tortoisehg\hgtk\history.py:2040 +#: tortoisehg\hgtk\history.py:442 tortoisehg\hgtk\history.py:2034  #: tortoisehg\hgtk\synch.py:68  msgid "Outgoing"  msgstr "Ausgehend"   -#: tortoisehg\hgtk\history.py:444 tortoisehg\hgtk\history.py:2080 +#: tortoisehg\hgtk\history.py:444 tortoisehg\hgtk\history.py:2074  #: tortoisehg\hgtk\synch.py:73  msgid "Push"  msgstr "Hochladen" @@ -2569,11 +2578,11 @@
 msgstr ""    #: tortoisehg\hgtk\history.py:614 tortoisehg\hgtk\history.py:639 -#: tortoisehg\hgtk\history.py:1787 tortoisehg\hgtk\history.py:1869 -#: tortoisehg\hgtk\history.py:1999 tortoisehg\hgtk\history.py:2042 -#: tortoisehg\hgtk\history.py:2082 tortoisehg\hgtk\history.py:2426 -#: tortoisehg\hgtk\history.py:2456 tortoisehg\hgtk\history.py:2713 -#: tortoisehg\hgtk\history.py:2744 tortoisehg\hgtk\recovery.py:179 +#: tortoisehg\hgtk\history.py:1781 tortoisehg\hgtk\history.py:1863 +#: tortoisehg\hgtk\history.py:1993 tortoisehg\hgtk\history.py:2036 +#: tortoisehg\hgtk\history.py:2076 tortoisehg\hgtk\history.py:2420 +#: tortoisehg\hgtk\history.py:2450 tortoisehg\hgtk\history.py:2707 +#: tortoisehg\hgtk\history.py:2738 tortoisehg\hgtk\recovery.py:179  #: tortoisehg\hgtk\synch.py:550  msgid "Please try again after the previous command has completed"  msgstr "" @@ -2961,138 +2970,138 @@
 msgid "Configure aliases and after pull behavior"  msgstr ""   -#: tortoisehg\hgtk\history.py:1784 +#: tortoisehg\hgtk\history.py:1778  msgid "Applying bundle..."  msgstr ""   -#: tortoisehg\hgtk\history.py:1785 +#: tortoisehg\hgtk\history.py:1779  msgid "Applying bundle"  msgstr ""   -#: tortoisehg\hgtk\history.py:1830 tortoisehg\hgtk\history.py:1972 -#: tortoisehg\hgtk\history.py:2005 tortoisehg\hgtk\history.py:2619 +#: tortoisehg\hgtk\history.py:1824 tortoisehg\hgtk\history.py:1966 +#: tortoisehg\hgtk\history.py:1999 tortoisehg\hgtk\history.py:2613  msgid "No remote path specified"  msgstr ""   -#: tortoisehg\hgtk\history.py:1831 tortoisehg\hgtk\history.py:1973 -#: tortoisehg\hgtk\history.py:2006 tortoisehg\hgtk\history.py:2620 +#: tortoisehg\hgtk\history.py:1825 tortoisehg\hgtk\history.py:1967 +#: tortoisehg\hgtk\history.py:2000 tortoisehg\hgtk\history.py:2614  msgid "Please enter or select a remote path"  msgstr ""   -#: tortoisehg\hgtk\history.py:1858 +#: tortoisehg\hgtk\history.py:1852  msgid "%d incoming changesets"  msgstr ""   +#: tortoisehg\hgtk\history.py:1854 +msgid "Aborted incoming" +msgstr "" + +#: tortoisehg\hgtk\history.py:1856 +msgid "No incoming changesets" +msgstr "" +  #: tortoisehg\hgtk\history.py:1860 -msgid "Aborted incoming" -msgstr "" - -#: tortoisehg\hgtk\history.py:1862 -msgid "No incoming changesets" -msgstr "" - -#: tortoisehg\hgtk\history.py:1866  msgid "Checking incoming changesets..."  msgstr ""   +#: tortoisehg\hgtk\history.py:1879 +msgid "Accept incoming previewed changesets" +msgstr "" + +#: tortoisehg\hgtk\history.py:1880 +msgid "Accept" +msgstr "" +  #: tortoisehg\hgtk\history.py:1885 -msgid "Accept incoming previewed changesets" +msgid "Reject incoming previewed changesets"  msgstr ""    #: tortoisehg\hgtk\history.py:1886 -msgid "Accept" -msgstr "" - -#: tortoisehg\hgtk\history.py:1891 -msgid "Reject incoming previewed changesets" -msgstr "" - -#: tortoisehg\hgtk\history.py:1892  msgid "Reject"  msgstr ""   -#: tortoisehg\hgtk\history.py:1934 +#: tortoisehg\hgtk\history.py:1928  msgid "Bundle Preview"  msgstr ""   -#: tortoisehg\hgtk\history.py:1939 +#: tortoisehg\hgtk\history.py:1933  msgid "Failed to preview, a bundle file unrelated to this repository"  msgstr ""   -#: tortoisehg\hgtk\history.py:1944 +#: tortoisehg\hgtk\history.py:1938  msgid "Failed to preview, not a Mercurial bundle file"  msgstr ""   -#: tortoisehg\hgtk\history.py:1948 +#: tortoisehg\hgtk\history.py:1942  msgid "Open Bundle"  msgstr ""   -#: tortoisehg\hgtk\history.py:1986 +#: tortoisehg\hgtk\history.py:1980  msgid "Finished pull with rebase"  msgstr ""   -#: tortoisehg\hgtk\history.py:1989 +#: tortoisehg\hgtk\history.py:1983  msgid "Finished pull"  msgstr ""   -#: tortoisehg\hgtk\history.py:1991 +#: tortoisehg\hgtk\history.py:1985  msgid "No changesets to pull"  msgstr ""   -#: tortoisehg\hgtk\history.py:1993 tortoisehg\hgtk\history.py:2738 +#: tortoisehg\hgtk\history.py:1987 tortoisehg\hgtk\history.py:2732  msgid "Aborted pull"  msgstr ""   -#: tortoisehg\hgtk\history.py:1996 +#: tortoisehg\hgtk\history.py:1990  msgid "Pulling changesets..."  msgstr ""   -#: tortoisehg\hgtk\history.py:2032 +#: tortoisehg\hgtk\history.py:2026  msgid "%d outgoing changesets"  msgstr ""   -#: tortoisehg\hgtk\history.py:2034 +#: tortoisehg\hgtk\history.py:2028  msgid "Aborted outgoing"  msgstr ""   -#: tortoisehg\hgtk\history.py:2036 +#: tortoisehg\hgtk\history.py:2030  msgid "No outgoing changesets"  msgstr ""   -#: tortoisehg\hgtk\history.py:2039 +#: tortoisehg\hgtk\history.py:2033  msgid "Checking outgoing changesets..."  msgstr ""   -#: tortoisehg\hgtk\history.py:2048 tortoisehg\hgtk\synch.py:504 +#: tortoisehg\hgtk\history.py:2042 tortoisehg\hgtk\synch.py:504  msgid "No repository selected"  msgstr "Kein Projektarchiv ausgewählt"   -#: tortoisehg\hgtk\history.py:2049 tortoisehg\hgtk\synch.py:505 +#: tortoisehg\hgtk\history.py:2043 tortoisehg\hgtk\synch.py:505  msgid "Select a peer repository to compare with"  msgstr ""  "Wählen Sie ein anderes Projektverzeichnis, mit den Verglichen werden kann"   -#: tortoisehg\hgtk\history.py:2074 +#: tortoisehg\hgtk\history.py:2068  msgid "Finished push"  msgstr ""   -#: tortoisehg\hgtk\history.py:2076 tortoisehg\hgtk\history.py:2704 +#: tortoisehg\hgtk\history.py:2070 tortoisehg\hgtk\history.py:2698  msgid "Aborted push"  msgstr ""   -#: tortoisehg\hgtk\history.py:2079 +#: tortoisehg\hgtk\history.py:2073  msgid "Pushing changesets..."  msgstr ""   -#: tortoisehg\hgtk\history.py:2191 +#: tortoisehg\hgtk\history.py:2185  msgid "unknown dnd dest: %s"  msgstr ""   -#: tortoisehg\hgtk\history.py:2310 +#: tortoisehg\hgtk\history.py:2304  msgid "Confirm Revert All Files"  msgstr ""   -#: tortoisehg\hgtk\history.py:2311 +#: tortoisehg\hgtk\history.py:2305  msgid ""  "Revert all files to revision %d?\n"  "This will overwrite your local changes" @@ -3100,155 +3109,155 @@
 "Alle Dateien auf die Revision %d zurücksetzen?\n"  "Dies wird Ihre lokalen Änderungen überschreiben."   -#: tortoisehg\hgtk\history.py:2361 +#: tortoisehg\hgtk\history.py:2355  msgid "Save patches to"  msgstr ""   -#: tortoisehg\hgtk\history.py:2397 +#: tortoisehg\hgtk\history.py:2391  msgid "Write bundle to"  msgstr "Schreibe Bündel in"   -#: tortoisehg\hgtk\history.py:2410 +#: tortoisehg\hgtk\history.py:2404  msgid "Bundling from %(base)s to %(rev)s..."  msgstr ""   +#: tortoisehg\hgtk\history.py:2406 +msgid "Bundling from %(base)s to tip..." +msgstr "" +  #: tortoisehg\hgtk\history.py:2412 -msgid "Bundling from %(base)s to tip..." +msgid "Finish bundling" +msgstr "" + +#: tortoisehg\hgtk\history.py:2414 +msgid "Aborted bundling" +msgstr "" + +#: tortoisehg\hgtk\history.py:2416 +msgid "Failed to bundle"  msgstr ""    #: tortoisehg\hgtk\history.py:2418 -msgid "Finish bundling" -msgstr "" - -#: tortoisehg\hgtk\history.py:2420 -msgid "Aborted bundling" -msgstr "" - -#: tortoisehg\hgtk\history.py:2422 -msgid "Failed to bundle" -msgstr "" - -#: tortoisehg\hgtk\history.py:2424  msgid "Bundling"  msgstr ""   +#: tortoisehg\hgtk\history.py:2441 +msgid "Finish importing" +msgstr "" + +#: tortoisehg\hgtk\history.py:2443 +msgid "Aborted importing" +msgstr "" + +#: tortoisehg\hgtk\history.py:2445 tortoisehg\hgtk\thgimport.py:188 +msgid "Failed to import" +msgstr "" +  #: tortoisehg\hgtk\history.py:2447 -msgid "Finish importing" -msgstr "" - -#: tortoisehg\hgtk\history.py:2449 -msgid "Aborted importing" -msgstr "" - -#: tortoisehg\hgtk\history.py:2451 tortoisehg\hgtk\thgimport.py:188 -msgid "Failed to import" -msgstr "" - -#: tortoisehg\hgtk\history.py:2453  msgid "Importing"  msgstr ""   -#: tortoisehg\hgtk\history.py:2454 +#: tortoisehg\hgtk\history.py:2448  msgid "Importing to Patch Queue..."  msgstr ""   -#: tortoisehg\hgtk\history.py:2462 +#: tortoisehg\hgtk\history.py:2456  msgid "Confirm Rebase Revision"  msgstr ""   -#: tortoisehg\hgtk\history.py:2463 +#: tortoisehg\hgtk\history.py:2457  msgid "Rebase revision %d on top of %d?"  msgstr ""   -#: tortoisehg\hgtk\history.py:2628 +#: tortoisehg\hgtk\history.py:2622  msgid "Confirm Forced Push to Remote Repository"  msgstr ""   -#: tortoisehg\hgtk\history.py:2629 +#: tortoisehg\hgtk\history.py:2623  msgid ""  "Forced push to remote repository\n"  "%s\n"  "(creating new heads in remote if needed)?"  msgstr ""   -#: tortoisehg\hgtk\history.py:2631 tortoisehg\hgtk\history.py:2647 +#: tortoisehg\hgtk\history.py:2625 tortoisehg\hgtk\history.py:2641  msgid "Forced &Push"  msgstr ""   +#: tortoisehg\hgtk\history.py:2627 +msgid "Confirm Push of New Branches to Remote Repository" +msgstr "" + +#: tortoisehg\hgtk\history.py:2628 +msgid "" +"Push to remote repository\n" +"%s\n" +"(creating new branches in remote if needed)?" +msgstr "" + +#: tortoisehg\hgtk\history.py:2630 tortoisehg\hgtk\history.py:2635 +msgid "&Push" +msgstr "" +  #: tortoisehg\hgtk\history.py:2633 -msgid "Confirm Push of New Branches to Remote Repository" +msgid "Confirm Push to remote Repository"  msgstr ""    #: tortoisehg\hgtk\history.py:2634  msgid ""  "Push to remote repository\n"  "%s\n" -"(creating new branches in remote if needed)?" -msgstr "" - -#: tortoisehg\hgtk\history.py:2636 tortoisehg\hgtk\history.py:2641 -msgid "&Push" +"?" +msgstr "" + +#: tortoisehg\hgtk\history.py:2638 +msgid "Confirm Forced Push"  msgstr ""    #: tortoisehg\hgtk\history.py:2639 -msgid "Confirm Push to remote Repository" -msgstr "" - -#: tortoisehg\hgtk\history.py:2640 -msgid "" -"Push to remote repository\n" -"%s\n" -"?" -msgstr "" - -#: tortoisehg\hgtk\history.py:2644 -msgid "Confirm Forced Push" -msgstr "" - -#: tortoisehg\hgtk\history.py:2645  msgid ""  "Forced push to repository\n"  "%s\n"  "(creating new heads if needed)?"  msgstr ""   -#: tortoisehg\hgtk\history.py:2682 +#: tortoisehg\hgtk\history.py:2676  msgid "Finished push to revision %s"  msgstr ""   -#: tortoisehg\hgtk\history.py:2690 +#: tortoisehg\hgtk\history.py:2684  msgid "Finished pushing branch %s"  msgstr ""   -#: tortoisehg\hgtk\history.py:2707 +#: tortoisehg\hgtk\history.py:2701  msgid "Pushing branch %s..."  msgstr ""   -#: tortoisehg\hgtk\history.py:2709 +#: tortoisehg\hgtk\history.py:2703  msgid "Pushing changesets to revision %s..."  msgstr ""   -#: tortoisehg\hgtk\history.py:2711 +#: tortoisehg\hgtk\history.py:2705  msgid "Push to %s"  msgstr ""   +#: tortoisehg\hgtk\history.py:2730 +msgid "Finished pull to revision %s" +msgstr "" + +#: tortoisehg\hgtk\history.py:2735 +msgid "Pulling changesets to revision %s..." +msgstr "" +  #: tortoisehg\hgtk\history.py:2736 -msgid "Finished pull to revision %s" -msgstr "" - -#: tortoisehg\hgtk\history.py:2741 -msgid "Pulling changesets to revision %s..." -msgstr "" - -#: tortoisehg\hgtk\history.py:2742  msgid "Pull to %s"  msgstr ""   -#: tortoisehg\hgtk\history.py:2755 tortoisehg\hgtk\status.py:999 +#: tortoisehg\hgtk\history.py:2749 tortoisehg\hgtk\status.py:999  msgid "Save patch to"  msgstr "Sichere Patch in"   -#: tortoisehg\hgtk\history.py:2905 tortoisehg\hgtk\history.py:2915 +#: tortoisehg\hgtk\history.py:2900 tortoisehg\hgtk\history.py:2910  msgid "Refresh required"  msgstr ""   @@ -3305,69 +3314,80 @@
 msgstr "Ziel zum Zusammenführen (anderes)"    #: tortoisehg\hgtk\merge.py:84 -msgid "Discard all changes from merge target (other) revision" -msgstr "" - -#: tortoisehg\hgtk\merge.py:89  msgid "Current revision (local)"  msgstr "aktuelle Revision (lokal)"   -#: tortoisehg\hgtk\merge.py:100 -msgid "Merge tools:" -msgstr "" - -#: tortoisehg\hgtk\merge.py:129 +#: tortoisehg\hgtk\merge.py:103 +msgid "Use merge tool:" +msgstr "" + +#: tortoisehg\hgtk\merge.py:118 +msgid "Discard all changes from merge target (other) revision" +msgstr "" + +#: tortoisehg\hgtk\merge.py:135  msgid "Merge"  msgstr "Zusammenführen"   -#: tortoisehg\hgtk\merge.py:131 +#: tortoisehg\hgtk\merge.py:137  msgid "Undo"  msgstr "Rückgängig"   -#: tortoisehg\hgtk\merge.py:159 +#: tortoisehg\hgtk\merge.py:165  msgid "Merged successfully"  msgstr ""   -#: tortoisehg\hgtk\merge.py:161 +#: tortoisehg\hgtk\merge.py:167  msgid "Canceled merging"  msgstr "Zusammenführung abgebrochen"   -#: tortoisehg\hgtk\merge.py:163 +#: tortoisehg\hgtk\merge.py:169  msgid "Failed to merge"  msgstr "Zusammenführung fehlgeschlagen"   -#: tortoisehg\hgtk\merge.py:170 +#: tortoisehg\hgtk\merge.py:176  msgid "Undo successfully"  msgstr ""   -#: tortoisehg\hgtk\merge.py:172 +#: tortoisehg\hgtk\merge.py:178  msgid "Canceled undo"  msgstr ""   -#: tortoisehg\hgtk\merge.py:174 +#: tortoisehg\hgtk\merge.py:180  msgid "Failed to undo"  msgstr ""   -#: tortoisehg\hgtk\merge.py:191 +#: tortoisehg\hgtk\merge.py:197  msgid ""  "To complete merging, you need to commit merged files in working directory.\n"  "\n"  "Do you want to exit?"  msgstr ""   -#: tortoisehg\hgtk\merge.py:204 +#: tortoisehg\hgtk\merge.py:210  msgid "Cannot merge"  msgstr "Zusammenführen nicht möglich"   -#: tortoisehg\hgtk\merge.py:205 +#: tortoisehg\hgtk\merge.py:211  msgid "Uncommitted local changes"  msgstr ""   -#: tortoisehg\hgtk\merge.py:240 +#: tortoisehg\hgtk\merge.py:215 +msgid "Confirm Discard Changes" +msgstr "" + +#: tortoisehg\hgtk\merge.py:216 +msgid "" +"The changes from revision %s and all unmerged parents will be discarded.\n" +"\n" +"Are you sure this is what you want to do?" +msgstr "" + +#: tortoisehg\hgtk\merge.py:253  msgid "Confirm undo merge"  msgstr "Rückgängig bestätigen"   -#: tortoisehg\hgtk\merge.py:241 +#: tortoisehg\hgtk\merge.py:254  msgid "Clean checkout of original revision?"  msgstr ""  "aktualisieren auf originale Revision und lokale Änderungen verwerfen?" @@ -3393,12 +3413,12 @@
 msgstr "Abgeschlossen"    #: tortoisehg\hgtk\p4pending.py:103 tortoisehg\hgtk\quickop.py:213 -#: tortoisehg\hgtk\thgmq.py:898 tortoisehg\hgtk\thgpbranch.py:746 +#: tortoisehg\hgtk\thgmq.py:898 tortoisehg\hgtk\thgpbranch.py:749  msgid "Canceled"  msgstr "Abgebrochen"    #: tortoisehg\hgtk\p4pending.py:105 tortoisehg\hgtk\quickop.py:215 -#: tortoisehg\hgtk\thgmq.py:900 tortoisehg\hgtk\thgpbranch.py:748 +#: tortoisehg\hgtk\thgmq.py:900 tortoisehg\hgtk\thgpbranch.py:751  msgid "Failed"  msgstr "Fehlgeschlagen"   @@ -3750,82 +3770,95 @@
 msgstr ""    #: tortoisehg\hgtk\shellconf.py:112 +msgid "Menu Behavior" +msgstr "" + +#: tortoisehg\hgtk\shellconf.py:120 +msgid "Hide context menu outside repositories" +msgstr "" + +#: tortoisehg\hgtk\shellconf.py:124  msgid "Icons"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:117 +#: tortoisehg\hgtk\shellconf.py:129  msgid "Overlays"  msgstr "Überlagerungs-Icons"   -#: tortoisehg\hgtk\shellconf.py:124 +#: tortoisehg\hgtk\shellconf.py:136  msgid "Enable overlays"  msgstr "Überlagerungs-Icons einschalten"   -#: tortoisehg\hgtk\shellconf.py:126 +#: tortoisehg\hgtk\shellconf.py:138  msgid "Local disks only"  msgstr "Nur lokale Festplatten"   -#: tortoisehg\hgtk\shellconf.py:130 +#: tortoisehg\hgtk\shellconf.py:142  msgid "Enabled Overlay Handlers"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:139 +#: tortoisehg\hgtk\shellconf.py:151  msgid "Warning: affects all Tortoises, logoff required after change"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:147 +#: tortoisehg\hgtk\shellconf.py:159  msgid "Added"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:149 +#: tortoisehg\hgtk\shellconf.py:161  msgid "Unversioned"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:154 +#: tortoisehg\hgtk\shellconf.py:166  msgid "Locked*"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:156 +#: tortoisehg\hgtk\shellconf.py:168  msgid "Readonly*"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:161 +#: tortoisehg\hgtk\shellconf.py:173  msgid "Ignored*"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:163 +#: tortoisehg\hgtk\shellconf.py:175  msgid "Deleted*"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:178 +#: tortoisehg\hgtk\shellconf.py:191  msgid "*: not used by TortoiseHg"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:182 +#: tortoisehg\hgtk\shellconf.py:195  msgid "Taskbar"  msgstr "Taskleiste"   -#: tortoisehg\hgtk\shellconf.py:189 +#: tortoisehg\hgtk\shellconf.py:202  msgid "Show Icon"  msgstr "Symbol anzeigen"   -#: tortoisehg\hgtk\shellconf.py:191 +#: tortoisehg\hgtk\shellconf.py:204  msgid "Highlight Icon"  msgstr "Icon hervorheben"   -#: tortoisehg\hgtk\shellconf.py:197 +#: tortoisehg\hgtk\shellconf.py:210 +msgid "" +"Do not show menu items on unversioned folders (use shift + click to override)" +msgstr "" + +#: tortoisehg\hgtk\shellconf.py:213  msgid "Show overlay icons in Mercurial repositories"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:200 +#: tortoisehg\hgtk\shellconf.py:216  msgid "Show overlays on local disks only"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:204 +#: tortoisehg\hgtk\shellconf.py:220  msgid "Show the taskbar icon (restart needed)"  msgstr ""   -#: tortoisehg\hgtk\shellconf.py:207 +#: tortoisehg\hgtk\shellconf.py:223  msgid "Highlight the taskbar icon during activity"  msgstr "Taskleisten-Icon bei aktivität hervorheben"   @@ -5586,7 +5619,7 @@
 msgid "Status"  msgstr ""   -#: tortoisehg\hgtk\thgmq.py:869 tortoisehg\hgtk\thgpbranch.py:703 +#: tortoisehg\hgtk\thgmq.py:869 tortoisehg\hgtk\thgpbranch.py:706  msgid "Enable editable cells"  msgstr ""   @@ -5598,7 +5631,7 @@
 msgid "Force"  msgstr ""   -#: tortoisehg\hgtk\thgmq.py:896 tortoisehg\hgtk\thgpbranch.py:744 +#: tortoisehg\hgtk\thgmq.py:896 tortoisehg\hgtk\thgpbranch.py:747  msgid "Succeed"  msgstr ""   @@ -5697,51 +5730,51 @@
 msgid "Patch branch finished"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:650 +#: tortoisehg\hgtk\thgpbranch.py:653  msgid "_new"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:652 +#: tortoisehg\hgtk\thgpbranch.py:655  msgid "_goto (update workdir)"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:654 +#: tortoisehg\hgtk\thgpbranch.py:657  msgid "_edit message"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:655 +#: tortoisehg\hgtk\thgpbranch.py:658  msgid "_rename"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:656 +#: tortoisehg\hgtk\thgpbranch.py:659  msgid "_delete"  msgstr "_löschen"   -#: tortoisehg\hgtk\thgpbranch.py:657 +#: tortoisehg\hgtk\thgpbranch.py:660  msgid "_finish"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:693 +#: tortoisehg\hgtk\thgpbranch.py:696  msgid "Show graph"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:694 +#: tortoisehg\hgtk\thgpbranch.py:697  msgid "Show status"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:695 +#: tortoisehg\hgtk\thgpbranch.py:698  msgid "Show name"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:696 +#: tortoisehg\hgtk\thgpbranch.py:699  msgid "Show title"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:697 +#: tortoisehg\hgtk\thgpbranch.py:700  msgid "Show message"  msgstr ""   -#: tortoisehg\hgtk\thgpbranch.py:706 +#: tortoisehg\hgtk\thgpbranch.py:709  msgid "Show internal branches"  msgstr ""   @@ -7326,5 +7359,13 @@
 #~ msgid "Backed out successfully"  #~ msgstr "Erfolgreich zurückgesetzt"   +#~ msgid "" +#~ "** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues " +#~ "or tortoisehg-discuss@lists.sourceforge.net\n" +#~ msgstr "" +#~ "** Bitte melden Sie diesen Fehlerbericht an " +#~ "http://bitbucket.org/tortoisehg/stable/issues oder tortoisehg-" +#~ "discuss@lists.sourceforge.net\n" +  #~ msgid "No parent file"  #~ msgstr "Keine übergeordnete Datei"
Show Entire File i18n/​tortoisehg/​en_AU.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_GB.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​et.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fa.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hu.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nb.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nn.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​oc.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sv.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​tr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
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