Cleaning code: moved some help strings used both in toolbars and menus in a...

Cleaning code: moved some help strings used both in toolbars and menus in a single file help_common_strings.h, in order to avoid slightly different help strings for the same command, and avoid some not needed  translations.

demos/interf_u/image.emp

+PCBNEW-LibModule-V1
+$INDEX
+LOGO
+$EndINDEX
+#
+# LOGO
+# pixmap w = 229, h = 270
+#
+$MODULE LOGO
+Po 0 0 0 15 00000000 00000000 ~~
+T0 0 4800 600 600 0 120 N I 21 "G***"
+T1 0 -4800 600 600 0 120 N I 21 "LOGO"
+DP 0 0 0 0 5 1 21
+Dl -3783 4516
+Dl -3766 -4466
+Dl 3850 -4483
+Dl -3800 -4500
+Dl -3783 4516
+DP 0 0 0 0 390 1 21
+Dl 1632 4131
+Dl 1638 4131
+Dl 1780 4126
+Dl 1890 4102
+Dl 2002 4043
+Dl 2149 3930
+Dl 2363 3747
+Dl 2609 3558
+Dl 2925 3367
+Dl 2953 3353
+Dl 3208 3199
+Dl 3374 3049
+Dl 3430 2920
+Dl 3427 2889
+Dl 3408 2899
+Dl 3352 2984
+Dl 3273 3033
+Dl 3265 3034
+Dl 3196 3087
+Dl 3127 3137
+Dl 2968 3224
+Dl 2766 3322
+Dl 2565 3409
+Dl 2409 3464
+Dl 2322 3492
+Dl 2250 3532
+Dl 2193 3578
+Dl 2046 3649
+Dl 1874 3708
+Dl 1736 3733
+Dl 1669 3729
+Dl 1582 3691
+Dl 1484 3578
+Dl 1479 3570
+Dl 1408 3458
+Dl 1371 3333
+Dl 1360 3154
+Dl 1369 2883
+Dl 1374 2686
+Dl 1361 2510
+Dl 1318 2351
+Dl 1286 2218
+Dl 1266 2017
+Dl 1257 1890
+Dl 1233 1816
+Dl 1230 1815
+Dl 1208 1871
+Dl 1199 2043
+Dl 1199 2110
+Dl 1190 2365
+Dl 1158 2536
+Dl 1091 2664
+Dl 977 2790
+Dl 920 2843
+Dl 516 3128
+Dl 70 3289
+Dl -404 3323
+Dl -637 3292
+Dl -853 3202
+Dl -1017 3037
+Dl -1126 2886
+Dl -999 2829
+Dl -983 2821
+Dl -843 2712
+Dl -822 2563
+Dl -822 2562
+Dl -856 2472
+Dl -936 2370
+Dl -1082 2234
+Dl -1316 2041
+Dl -1493 1900
+Dl -1665 1757
+Dl -1767 1658
+Dl -1816 1577
+Dl -1831 1491
+Dl -1832 1376
+Dl -1818 1157
+Dl -1783 920
+Dl -1783 919
+Dl -1720 715
+Dl -1617 463
+Dl -1494 206
+Dl -1372 -10
+Dl -1272 -144
+Dl -1237 -179
+Dl -1193 -249
+Dl -1222 -335
+Dl -1248 -399
+Dl -1243 -481
+Dl -1185 -620
+Dl -1093 -804
+Dl -979 -1005
+Dl -973 -1016
+Dl -889 -1183
+Dl -877 -1295
+Dl -885 -1396
+Dl -865 -1410
+Dl -865 -2009
+Dl -930 -2105
+Dl -953 -2213
+Dl -966 -2390
+Dl -966 -2426
+Dl -943 -2572
+Dl -861 -2701
+Dl -786 -2787
+Dl -733 -2833
+Dl -692 -2808
+Dl -592 -2724
+Dl -547 -2679
+Dl -450 -2495
+Dl -476 -2314
+Dl -523 -2224
+Dl -543 -2349
+Dl -559 -2417
+Dl -638 -2554
+Dl -744 -2596
+Dl -848 -2525
+Dl -897 -2373
+Dl -832 -2172
+Dl -798 -2106
+Dl -784 -2031
+Dl -794 -2018
+Dl -865 -2009
+Dl -865 -1410
+Dl -838 -1429
+Dl -731 -1345
+Dl -637 -1263
+Dl -471 -1159
+Dl -412 -1136
+Dl -412 -1333
+Dl -483 -1366
+Dl -484 -1369
+Dl -453 -1399
+Dl -412 -1380
+Dl -412 -1473
+Dl -617 -1494
+Dl -737 -1573
+Dl -743 -1597
+Dl -719 -1723
+Dl -644 -1899
+Dl -626 -1935
+Dl -600 -2011
+Dl -580 -2047
+Dl -496 -2136
+Dl -472 -2157
+Dl -369 -2218
+Dl -221 -2228
+Dl -123 -2221
+Dl -125 -2209
+Dl -133 -2208
+Dl -197 -2165
+Dl -133 -2116
+Dl -123 -2113
+Dl -33 -2118
+Dl -18 -2168
+Dl -24 -2193
+Dl 49 -2183
+Dl 233 -2099
+Dl 245 -2094
+Dl 391 -2027
+Dl 478 -1999
+Dl 495 -1996
+Dl 495 -2037
+Dl 423 -2065
+Dl 467 -2158
+Dl 520 -2276
+Dl 512 -2442
+Dl 434 -2577
+Dl 303 -2633
+Dl 230 -2607
+Dl 138 -2490
+Dl 98 -2320
+Dl 97 -2183
+Dl 31 -2262
+Dl -55 -2423
+Dl -45 -2589
+Dl 74 -2708
+Dl 142 -2741
+Dl 313 -2816
+Dl 412 -2842
+Dl 473 -2829
+Dl 484 -2822
+Dl 533 -2739
+Dl 536 -2719
+Dl 596 -2627
+Dl 644 -2561
+Dl 685 -2383
+Dl 659 -2182
+Dl 614 -2083
+Dl 532 -2040
+Dl 495 -2037
+Dl 495 -1996
+Dl 506 -1993
+Dl 604 -1935
+Dl 656 -1882
+Dl 640 -1827
+Dl 614 -1805
+Dl 569 -1828
+Dl 561 -1839
+Dl 511 -1850
+Dl 413 -1805
+Dl 236 -1690
+Dl 89 -1608
+Dl -108 -1528
+Dl -159 -1513
+Dl -412 -1473
+Dl -412 -1380
+Dl -383 -1366
+Dl -381 -1363
+Dl -412 -1333
+Dl -412 -1136
+Dl -399 -1131
+Dl -220 -1110
+Dl -22 -1170
+Dl 232 -1318
+Dl 324 -1377
+Dl 514 -1477
+Dl 628 -1491
+Dl 684 -1425
+Dl 697 -1388
+Dl 760 -1249
+Dl 850 -1065
+Dl 884 -995
+Dl 985 -757
+Dl 1053 -548
+Dl 1117 -358
+Dl 1203 -199
+Dl 1383 97
+Dl 1511 450
+Dl 1536 567
+Dl 1577 892
+Dl 1589 1224
+Dl 1567 1496
+Dl 1556 1560
+Dl 1545 1685
+Dl 1569 1735
+Dl 1579 1744
+Dl 1583 1813
+Dl 1535 1967
+Dl 1534 1970
+Dl 1486 2117
+Dl 1481 2211
+Dl 1516 2321
+Dl 1522 2335
+Dl 1658 2502
+Dl 1859 2582
+Dl 2077 2554
+Dl 2078 2554
+Dl 2201 2473
+Dl 2339 2346
+Dl 2453 2214
+Dl 2499 2120
+Dl 2526 2030
+Dl 2595 1887
+Dl 2618 1845
+Dl 2736 1510
+Dl 2760 1129
+Dl 2690 686
+Dl 2526 166
+Dl 2419 -91
+Dl 2285 -326
+Dl 2107 -549
+Dl 2084 -575
+Dl 1788 -972
+Dl 1513 -1466
+Dl 1410 -1707
+Dl 1349 -1962
+Dl 1333 -2269
+Dl 1331 -2416
+Dl 1285 -2920
+Dl 1171 -3320
+Dl 982 -3631
+Dl 710 -3865
+Dl 349 -4036
+Dl 179 -4082
+Dl -197 -4100
+Dl -546 -4006
+Dl -639 -3959
+Dl -881 -3774
+Dl -1056 -3508
+Dl -1150 -3316
+Dl -1150 -1281
+Dl -1262 -1095
+Dl -1314 -1016
+Dl -1453 -826
+Dl -1612 -629
+Dl -1622 -616
+Dl -1775 -422
+Dl -1887 -238
+Dl -1983 -19
+Dl -2086 281
+Dl -2109 349
+Dl -2204 591
+Dl -2300 793
+Dl -2310 812
+Dl -2400 976
+Dl -2460 1087
+Dl -2484 1146
+Dl -2519 1309
+Dl -2527 1476
+Dl -2503 1579
+Dl -2486 1643
+Dl -2536 1765
+Dl -2631 1904
+Dl -2761 1977
+Dl -2975 2009
+Dl -2990 2010
+Dl -3154 2034
+Dl -3249 2066
+Dl -3294 2122
+Dl -3338 2308
+Dl -3323 2604
+Dl -3321 2625
+Dl -3304 2811
+Dl -3316 2944
+Dl -3361 3099
+Dl -3407 3256
+Dl -3427 3451
+Dl -3365 3565
+Dl -3216 3619
+Dl -3085 3647
+Dl -2900 3701
+Dl -2717 3757
+Dl -2500 3813
+Dl -2192 3895
+Dl -1716 4063
+Dl -1618 4091
+Dl -1618 3724
+Dl -1877 3667
+Dl -2040 3621
+Dl -2194 3587
+Dl -2223 3583
+Dl -2405 3553
+Dl -2631 3514
+Dl -2857 3472
+Dl -3038 3437
+Dl -3132 3416
+Dl -3176 3385
+Dl -3212 3269
+Dl -3178 3139
+Dl -3169 3121
+Dl -3143 2964
+Dl -3148 2711
+Dl -3185 2390
+Dl -3188 2367
+Dl -3179 2222
+Dl -3088 2153
+Dl -2893 2138
+Dl -2693 2117
+Dl -2509 2005
+Dl -2421 1802
+Dl -2395 1718
+Dl -2299 1601
+Dl -2175 1580
+Dl -2092 1629
+Dl -1936 1793
+Dl -1734 2069
+Dl -1482 2464
+Dl -1128 3045
+Dl -1150 3247
+Dl -1168 3355
+Dl -1249 3572
+Dl -1367 3700
+Dl -1418 3719
+Dl -1618 3724
+Dl -1618 4091
+Dl -1549 4111
+Dl -1325 4130
+Dl -1156 4095
+Dl -1096 4057
+Dl -973 3961
+Dl -901 3905
+Dl -829 3866
+Dl -823 3866
+Dl -748 3819
+Dl -729 3806
+Dl -585 3769
+Dl -337 3745
+Dl -7 3736
+Dl 382 3744
+Dl 652 3757
+Dl 868 3774
+Dl 998 3797
+Dl 1067 3833
+Dl 1100 3885
+Dl 1142 3947
+Dl 1256 4047
+Dl 1334 4094
+Dl 1450 4125
+Dl 1632 4131
+DP 0 0 0 0 5 1 21
+Dl 3387 2800
+Dl 3383 2766
+Dl 3346 2733
+Dl 3350 2766
+Dl 3387 2800
+DP 0 0 0 0 5 1 21
+Dl 3283 2733
+Dl 3300 2716
+Dl 3283 2700
+Dl 3266 2716
+Dl 3283 2733
+DP 0 0 0 0 5 1 21
+Dl 3216 2700
+Dl 3233 2683
+Dl 3216 2666
+Dl 3200 2683
+Dl 3216 2700
+DP 0 0 0 0 9 1 21
+Dl 3129 2633
+Dl 3119 2613
+Dl 3050 2533
+Dl 2990 2474
+Dl 2937 2433
+Dl 2946 2453
+Dl 3016 2533
+Dl 3076 2591
+Dl 3129 2633
+DP 0 0 0 0 5 1 21
+Dl 2920 2400
+Dl 2916 2366
+Dl 2879 2333
+Dl 2883 2366
+Dl 2920 2400
+DP 0 0 0 0 7 1 21
+Dl 2812 2179
+Dl 2823 2175
+Dl 2825 2161
+Dl 2823 2025
+Dl 2814 2012
+Dl 2809 2100
+Dl 2812 2179
+$EndMODULE LOGO
+$EndLIBRARY

demos/interf_u/image.lib

+EESchema-LIBRARY Version 2.3
+#
+# LOGO
+# pixmap size w = 229, h = 270
+#
+DEF LOGO G 0 40 Y Y 1 F N
+F0 "#G" 0 -420 60 H I C CNN
+F1 "LOGO" 0 420 60 H I C CNN
+DRAW
+P 5 0 0 1 -378 -451 -376 446 385 448 -380 450 -378 -451 F
+P 390 0 0 1 163 -413 163 -413 178 -412 189 -410 200 -404 214 -393 236 -374 260 -355 292 -336 295 -335 320 -319 337 -304 343 -292 342 -288 340 -289 335 -298 327 -303 326 -303 319 -308 312 -313 296 -322 276 -332 256 -340 240 -346 232 -349 225 -353 219 -357 204 -364 187 -370 173 -373 166 -372 158 -369 148 -357 147 -357 140 -345 137 -333 136 -315 136 -288 137 -268 136 -251 131 -235 128 -221 126 -201 125 -189 123 -181 123 -181 120 -187 120 -204 119 -211 119 -236 115 -253 109 -266 97 -279 92 -284 51 -312 7 -328 -40 -332 -63 -329 -85 -320 -101 -303 -112 -288 -99 -282 -98 -282 -84 -271 -82 -256 -82 -256 -85 -247 -93 -237 -108 -223 -131 -204 -149 -190 -166 -175 -176 -165 -181 -157 -183 -149 -183 -137 -181 -115 -178 -92 -178 -91 -172 -71 -161 -46 -149 -20 -137 1 -127 14 -123 17 -119 24 -122 33 -124 39 -124 48 -118 62 -109 80 -97 100 -97 101 -88 118 -87 129 -88 139 -86 141 -86 200 -93 210 -95 221 -96 239 -96 242 -94 257 -86 270 -78 278 -73 283 -69 280 -59 272 -54 267 -45 249 -47 231 -52 222 -54 234 -55 241 -63 255 -74 259 -84 252 -89 237 -83 217 -79 210 -78 203 -79 201 -86 200 -86 141 -83 142 -73 134 -63 126 -47 115 -41 113 -41 133 -48 136 -48 136 -45 139 -41 138 -41 147 -61 149 -73 157 -74 159 -71 172 -64 189 -62 193 -60 201 -58 204 -49 213 -47 215 -36 221 -22 222 -12 222 -12 220 -13 220 -19 216 -13 211 -12 211 -3 211 -1 216 -2 219 4 218 23 209 24 209 39 202 47 199 49 199 49 203 42 206 46 215 52 227 51 244 43 257 30 263 23 260 13 249 9 232 9 218 3 226 -5 242 -4 258 7 270 14 274 31 281 41 284 47 282 48 282 53 273 53 271 59 262 64 256 68 238 65 218 61 208 53 204 49 203 49 199 50 199 60 193 65 188 64 182 61 180 56 182 56 183 51 185 41 180 23 169 8 160 -10 152 -15 151 -41 147 -41 138 -38 136 -38 136 -41 133 -41 113 -39 113 -22 111 -2 117 23 131 32 137 51 147 62 149 68 142 69 138 76 124 85 106 88 99 98 75 105 54 111 35 120 19 138 -9 151 -45 153 -56 157 -89 158 -122 156 -149 155 -156 154 -168 156 -173 157 -174 158 -181 153 -196 153 -197 148 -211 148 -221 151 -232 152 -233 165 -250 185 -258 207 -255 207 -255 220 -247 233 -234 245 -221 249 -212 252 -203 259 -188 261 -184 273 -151 276 -112 269 -68 252 -16 241 9 228 32 210 54 208 57 178 97 151 146 141 170 134 196 133 226 133 241 128 292 117 332 98 363 71 386 34 403 17 408 -19 410 -54 400 -63 395 -88 377 -105 350 -114 331 -114 128 -126 109 -131 101 -145 82 -161 62 -162 61 -177 42 -188 23 -198 1 -208 -28 -210 -34 -220 -59 -229 -79 -231 -81 -240 -97 -246 -108 -248 -114 -251 -130 -252 -147 -250 -157 -248 -164 -253 -176 -263 -190 -276 -197 -297 -200 -299 -201 -315 -203 -324 -206 -329 -212 -333 -230 -332 -260 -332 -262 -330 -281 -331 -294 -336 -309 -340 -325 -342 -345 -336 -356 -321 -361 -308 -364 -289 -370 -271 -375 -249 -381 -219 -389 -171 -406 -161 -409 -161 -372 -187 -366 -204 -362 -219 -358 -222 -358 -240 -355 -263 -351 -285 -347 -303 -343 -313 -341 -317 -338 -321 -326 -317 -313 -316 -312 -314 -296 -314 -271 -318 -239 -318 -236 -317 -222 -308 -215 -289 -213 -269 -211 -250 -200 -242 -180 -239 -171 -229 -160 -217 -158 -209 -162 -193 -179 -173 -206 -148 -246 -112 -304 -115 -324 -116 -335 -124 -357 -136 -370 -141 -371 -161 -372 -161 -409 -154 -411 -132 -413 -115 -409 -109 -405 -97 -396 -90 -390 -82 -386 -82 -386 -74 -381 -72 -380 -58 -376 -33 -374 0 -373 38 -374 65 -375 86 -377 99 -379 106 -383 110 -388 114 -394 125 -404 133 -409 145 -412 163 -413 F
+P 5 0 0 1 338 -280 338 -276 334 -273 335 -276 338 -280 F
+P 5 0 0 1 328 -273 330 -271 328 -270 326 -271 328 -273 F
+P 5 0 0 1 321 -270 323 -268 321 -266 320 -268 321 -270 F
+P 9 0 0 1 312 -263 311 -261 305 -253 299 -247 293 -243 294 -245 301 -253 307 -259 312 -263 F
+P 5 0 0 1 292 -240 291 -236 287 -233 288 -236 292 -240 F
+P 7 0 0 1 281 -217 282 -217 282 -216 282 -202 281 -201 280 -210 281 -217 F
+ENDDRAW
+ENDDEF

demos/interf_u/interf_u.brd

-PCBNEW-BOARD Version 1 date 02/05/2010 21:27:40
+PCBNEW-BOARD Version 1 date 30/06/2010 12:54:50
 
-# Created by Pcbnew(2010-04-21 BZR 2353)-unstable
+# Created by Pcbnew(2010-06-21 BZR 2404)-unstable
 
 $GENERAL
 LayerCount 2
@@ -8,19 +8,19 @@ Ly 1FFF8001
 EnabledLayers 1FFF8001
 Links 200
 NoConn 0
-Di 29439 12974 77910 55660
+Di 29439 12974 77910 78010
 Ndraw 24
 Ntrack 782
 Nzone 0
 BoardThickness 630
-Nmodule 24
+Nmodule 25
 Nnets 111
 $EndGENERAL
 
 $SHEETDESCR
 Sheet A4 11700 8267
 Title "Demo"
-Date "2 may 2010"
+Date "30 jun 2010"
 Rev "2.C"
 Comp "Kicad"
 Comment1 ""
@@ -626,6 +626,454 @@ AddNet "N-000126"
 AddNet "N-000127"
 AddNet "VCC"
 $EndNCLASS
+$MODULE G***
+Po 66000 72750 0 15 00000000 4C2B2261 ~~
+Li G***
+Sc 4C2B2261
+AR 
+Op 0 0 0
+T0 0 4800 600 600 0 120 N I 21 N"G***"
+T1 0 -4800 600 600 0 120 N I 21 N"LOGO"
+DP 0 0 0 0 5 1 21
+Dl -3783 4516
+Dl -3766 -4466
+Dl 3850 -4483
+Dl -3800 -4500
+Dl -3783 4516
+DP 0 0 0 0 390 1 21
+Dl 1632 4131
+Dl 1638 4131
+Dl 1780 4126
+Dl 1890 4102
+Dl 2002 4043
+Dl 2149 3930
+Dl 2363 3747
+Dl 2609 3558
+Dl 2925 3367
+Dl 2953 3353
+Dl 3208 3199
+Dl 3374 3049
+Dl 3430 2920
+Dl 3427 2889
+Dl 3408 2899
+Dl 3352 2984
+Dl 3273 3033
+Dl 3265 3034
+Dl 3196 3087
+Dl 3127 3137
+Dl 2968 3224
+Dl 2766 3322
+Dl 2565 3409
+Dl 2409 3464
+Dl 2322 3492
+Dl 2250 3532
+Dl 2193 3578
+Dl 2046 3649
+Dl 1874 3708
+Dl 1736 3733
+Dl 1669 3729
+Dl 1582 3691
+Dl 1484 3578
+Dl 1479 3570
+Dl 1408 3458
+Dl 1371 3333
+Dl 1360 3154
+Dl 1369 2883
+Dl 1374 2686
+Dl 1361 2510
+Dl 1318 2351
+Dl 1286 2218
+Dl 1266 2017
+Dl 1257 1890
+Dl 1233 1816
+Dl 1230 1815
+Dl 1208 1871
+Dl 1199 2043
+Dl 1199 2110
+Dl 1190 2365
+Dl 1158 2536
+Dl 1091 2664
+Dl 977 2790
+Dl 920 2843
+Dl 516 3128
+Dl 70 3289
+Dl -404 3323
+Dl -637 3292
+Dl -853 3202
+Dl -1017 3037
+Dl -1126 2886
+Dl -999 2829
+Dl -983 2821
+Dl -843 2712
+Dl -822 2563
+Dl -822 2562
+Dl -856 2472
+Dl -936 2370
+Dl -1082 2234
+Dl -1316 2041
+Dl -1493 1900
+Dl -1665 1757
+Dl -1767 1658
+Dl -1816 1577
+Dl -1831 1491
+Dl -1832 1376
+Dl -1818 1157
+Dl -1783 920
+Dl -1783 919
+Dl -1720 715
+Dl -1617 463
+Dl -1494 206
+Dl -1372 -10
+Dl -1272 -144
+Dl -1237 -179
+Dl -1193 -249
+Dl -1222 -335
+Dl -1248 -399
+Dl -1243 -481
+Dl -1185 -620
+Dl -1093 -804
+Dl -979 -1005
+Dl -973 -1016
+Dl -889 -1183
+Dl -877 -1295
+Dl -885 -1396
+Dl -865 -1410
+Dl -865 -2009
+Dl -930 -2105
+Dl -953 -2213
+Dl -966 -2390
+Dl -966 -2426
+Dl -943 -2572
+Dl -861 -2701
+Dl -786 -2787
+Dl -733 -2833
+Dl -692 -2808
+Dl -592 -2724
+Dl -547 -2679
+Dl -450 -2495
+Dl -476 -2314
+Dl -523 -2224
+Dl -543 -2349
+Dl -559 -2417
+Dl -638 -2554
+Dl -744 -2596
+Dl -848 -2525
+Dl -897 -2373
+Dl -832 -2172
+Dl -798 -2106
+Dl -784 -2031
+Dl -794 -2018
+Dl -865 -2009
+Dl -865 -1410
+Dl -838 -1429
+Dl -731 -1345
+Dl -637 -1263
+Dl -471 -1159
+Dl -412 -1136
+Dl -412 -1333
+Dl -483 -1366
+Dl -484 -1369
+Dl -453 -1399
+Dl -412 -1380
+Dl -412 -1473
+Dl -617 -1494
+Dl -737 -1573
+Dl -743 -1597
+Dl -719 -1723
+Dl -644 -1899
+Dl -626 -1935
+Dl -600 -2011
+Dl -580 -2047
+Dl -496 -2136
+Dl -472 -2157
+Dl -369 -2218
+Dl -221 -2228
+Dl -123 -2221
+Dl -125 -2209
+Dl -133 -2208
+Dl -197 -2165
+Dl -133 -2116
+Dl -123 -2113
+Dl -33 -2118
+Dl -18 -2168
+Dl -24 -2193
+Dl 49 -2183
+Dl 233 -2099
+Dl 245 -2094
+Dl 391 -2027
+Dl 478 -1999
+Dl 495 -1996
+Dl 495 -2037
+Dl 423 -2065
+Dl 467 -2158
+Dl 520 -2276
+Dl 512 -2442
+Dl 434 -2577
+Dl 303 -2633
+Dl 230 -2607
+Dl 138 -2490
+Dl 98 -2320
+Dl 97 -2183
+Dl 31 -2262
+Dl -55 -2423
+Dl -45 -2589
+Dl 74 -2708
+Dl 142 -2741
+Dl 313 -2816
+Dl 412 -2842
+Dl 473 -2829
+Dl 484 -2822
+Dl 533 -2739
+Dl 536 -2719
+Dl 596 -2627
+Dl 644 -2561
+Dl 685 -2383
+Dl 659 -2182
+Dl 614 -2083
+Dl 532 -2040
+Dl 495 -2037
+Dl 495 -1996
+Dl 506 -1993
+Dl 604 -1935
+Dl 656 -1882
+Dl 640 -1827
+Dl 614 -1805
+Dl 569 -1828
+Dl 561 -1839
+Dl 511 -1850
+Dl 413 -1805
+Dl 236 -1690
+Dl 89 -1608
+Dl -108 -1528
+Dl -159 -1513
+Dl -412 -1473
+Dl -412 -1380
+Dl -383 -1366
+Dl -381 -1363
+Dl -412 -1333
+Dl -412 -1136
+Dl -399 -1131
+Dl -220 -1110
+Dl -22 -1170
+Dl 232 -1318
+Dl 324 -1377
+Dl 514 -1477
+Dl 628 -1491
+Dl 684 -1425
+Dl 697 -1388
+Dl 760 -1249
+Dl 850 -1065
+Dl 884 -995
+Dl 985 -757
+Dl 1053 -548
+Dl 1117 -358
+Dl 1203 -199
+Dl 1383 97
+Dl 1511 450
+Dl 1536 567
+Dl 1577 892
+Dl 1589 1224
+Dl 1567 1496
+Dl 1556 1560
+Dl 1545 1685
+Dl 1569 1735
+Dl 1579 1744
+Dl 1583 1813
+Dl 1535 1967
+Dl 1534 1970
+Dl 1486 2117
+Dl 1481 2211
+Dl 1516 2321
+Dl 1522 2335
+Dl 1658 2502
+Dl 1859 2582
+Dl 2077 2554
+Dl 2078 2554
+Dl 2201 2473
+Dl 2339 2346
+Dl 2453 2214
+Dl 2499 2120
+Dl 2526 2030
+Dl 2595 1887
+Dl 2618 1845
+Dl 2736 1510
+Dl 2760 1129
+Dl 2690 686
+Dl 2526 166
+Dl 2419 -91
+Dl 2285 -326
+Dl 2107 -549
+Dl 2084 -575
+Dl 1788 -972
+Dl 1513 -1466
+Dl 1410 -1707
+Dl 1349 -1962
+Dl 1333 -2269
+Dl 1331 -2416
+Dl 1285 -2920
+Dl 1171 -3320
+Dl 982 -3631
+Dl 710 -3865
+Dl 349 -4036
+Dl 179 -4082
+Dl -197 -4100
+Dl -546 -4006
+Dl -639 -3959
+Dl -881 -3774
+Dl -1056 -3508
+Dl -1150 -3316
+Dl -1150 -1281
+Dl -1262 -1095
+Dl -1314 -1016
+Dl -1453 -826
+Dl -1612 -629
+Dl -1622 -616
+Dl -1775 -422
+Dl -1887 -238
+Dl -1983 -19
+Dl -2086 281
+Dl -2109 349
+Dl -2204 591
+Dl -2300 793
+Dl -2310 812
+Dl -2400 976
+Dl -2460 1087
+Dl -2484 1146
+Dl -2519 1309
+Dl -2527 1476
+Dl -2503 1579
+Dl -2486 1643
+Dl -2536 1765
+Dl -2631 1904
+Dl -2761 1977
+Dl -2975 2009
+Dl -2990 2010
+Dl -3154 2034
+Dl -3249 2066
+Dl -3294 2122
+Dl -3338 2308
+Dl -3323 2604
+Dl -3321 2625
+Dl -3304 2811
+Dl -3316 2944
+Dl -3361 3099
+Dl -3407 3256
+Dl -3427 3451
+Dl -3365 3565
+Dl -3216 3619
+Dl -3085 3647
+Dl -2900 3701
+Dl -2717 3757
+Dl -2500 3813
+Dl -2192 3895
+Dl -1716 4063
+Dl -1618 4091
+Dl -1618 3724
+Dl -1877 3667
+Dl -2040 3621
+Dl -2194 3587
+Dl -2223 3583
+Dl -2405 3553
+Dl -2631 3514
+Dl -2857 3472
+Dl -3038 3437
+Dl -3132 3416
+Dl -3176 3385
+Dl -3212 3269
+Dl -3178 3139
+Dl -3169 3121
+Dl -3143 2964
+Dl -3148 2711
+Dl -3185 2390
+Dl -3188 2367
+Dl -3179 2222
+Dl -3088 2153
+Dl -2893 2138
+Dl -2693 2117
+Dl -2509 2005
+Dl -2421 1802
+Dl -2395 1718
+Dl -2299 1601
+Dl -2175 1580
+Dl -2092 1629
+Dl -1936 1793
+Dl -1734 2069
+Dl -1482 2464
+Dl -1128 3045
+Dl -1150 3247
+Dl -1168 3355
+Dl -1249 3572
+Dl -1367 3700
+Dl -1418 3719
+Dl -1618 3724
+Dl -1618 4091
+Dl -1549 4111
+Dl -1325 4130
+Dl -1156 4095
+Dl -1096 4057
+Dl -973 3961
+Dl -901 3905
+Dl -829 3866
+Dl -823 3866
+Dl -748 3819
+Dl -729 3806
+Dl -585 3769
+Dl -337 3745
+Dl -7 3736
+Dl 382 3744
+Dl 652 3757
+Dl 868 3774
+Dl 998 3797
+Dl 1067 3833
+Dl 1100 3885
+Dl 1142 3947
+Dl 1256 4047
+Dl 1334 4094
+Dl 1450 4125
+Dl 1632 4131
+DP 0 0 0 0 5 1 21
+Dl 3387 2800
+Dl 3383 2766
+Dl 3346 2733
+Dl 3350 2766
+Dl 3387 2800
+DP 0 0 0 0 5 1 21
+Dl 3283 2733
+Dl 3300 2716
+Dl 3283 2700
+Dl 3266 2716
+Dl 3283 2733
+DP 0 0 0 0 5 1 21
+Dl 3216 2700
+Dl 3233 2683
+Dl 3216 2666
+Dl 3200 2683
+Dl 3216 2700
+DP 0 0 0 0 9 1 21
+Dl 3129 2633
+Dl 3119 2613
+Dl 3050 2533
+Dl 2990 2474
+Dl 2937 2433
+Dl 2946 2453
+Dl 3016 2533
+Dl 3076 2591
+Dl 3129 2633
+DP 0 0 0 0 5 1 21
+Dl 2920 2400
+Dl 2916 2366
+Dl 2879 2333
+Dl 2883 2366
+Dl 2920 2400
+DP 0 0 0 0 7 1 21
+Dl 2812 2179
+Dl 2823 2175
+Dl 2825 2161
+Dl 2823 2025
+Dl 2814 2012
+Dl 2809 2100
+Dl 2812 2179
+$EndMODULE  G***
 $MODULE PGA120
 Po 60500 32000 1800 15 429C886F 322D32FA ~~
 Li PGA120
@@ -3985,18 +4433,18 @@ Po 0 29500 13000 32500 16000 50
 De 28 0 0 0 0
 $EndDRAWSEGMENT
 $TRACK
-Po 0 48500 35500 49000 35000 170 -1
-De 0 0 1 0 800
 Po 0 49000 35000 54500 35000 170 -1
 De 0 0 1 0 400
+Po 0 48500 35500 49000 35000 170 -1
+De 0 0 1 0 800
+Po 0 70000 37800 69250 37050 170 -1
+De 0 0 2 0 800
 Po 0 66500 35000 67250 35000 170 -1
 De 0 0 2 0 800
 Po 0 69250 37000 69250 37050 170 -1
 De 0 0 2 0 0
 Po 0 69250 37000 67250 35000 170 -1
 De 0 0 2 0 0
-Po 0 70000 37800 69250 37050 170 -1
-De 0 0 2 0 800
 Po 0 68500 27500 69550 28550 170 -1
 De 0 0 3 0 0
 Po 0 71000 28550 71000 28620 170 -1
@@ -4007,20 +4455,20 @@ Po 0 66000 27500 68500 27500 170 -1
 De 0 0 3 0 0
 Po 0 65500 28000 66000 27500 170 -1
 De 0 0 3 0 800
+Po 0 66000 28500 69000 28500 170 -1
+De 0 0 4 0 0
+Po 0 69500 29000 70000 29000 170 -1
+De 0 0 4 0 0
 Po 0 69000 28500 69500 29000 170 -1
 De 0 0 4 0 0
 Po 0 70000 29000 70000 29100 170 -1
 De 0 0 4 0 400
 Po 0 65500 29000 66000 28500 170 -1
 De 0 0 4 0 800
-Po 0 66000 28500 69000 28500 170 -1
-De 0 0 4 0 0
-Po 0 69500 29000 70000 29000 170 -1
-De 0 0 4 0 0
-Po 0 70000 30000 70000 30150 170 -1
-De 0 0 5 0 400
 Po 0 66500 30000 70000 30000 170 -1
 De 0 0 5 0 800
+Po 0 70000 30000 70000 30150 170 -1
+De 0 0 5 0 400
 Po 0 65500 31000 66000 31500 170 -1
 De 0 0 6 0 800
 Po 0 67800 31300 70000 31300 170 -1
@@ -4045,26 +4493,20 @@ Po 0 70000 33400 70000 33450 170 -1
 De 0 0 8 0 400
 Po 0 68950 33000 69350 33400 170 -1
 De 0 0 8 0 0
+Po 0 66000 33500 68500 33500 170 -1
+De 0 0 9 0 0
 Po 0 69500 34500 70000 34500 170 -1
 De 0 0 9 0 400
 Po 0 68500 33500 69500 34500 170 -1
 De 0 0 9 0 0
 Po 0 65500 33000 66000 33500 170 -1
 De 0 0 9 0 800
-Po 0 66000 33500 68500 33500 170 -1
-De 0 0 9 0 0
 Po 0 66500 34000 68500 34000 170 -1
 De 0 0 10 0 800
 Po 0 68500 34000 70000 35500 170 -1
 De 0 0 10 0 0
 Po 0 70000 35500 70000 35600 170 -1
 De 0 0 10 0 400
-Po 0 64500 33000 65000 32500 170 -1
-De 0 0 11 0 800
-Po 0 69000 32500 69500 33000 170 -1
-De 15 0 11 0 0
-Po 0 68500 32500 69000 32500 170 -1
-De 15 0 11 0 0
 Po 0 69500 33000 69500 36000 170 -1
 De 15 0 11 0 0
 Po 0 69500 36000 70000 36500 170 -1
@@ -4075,6 +4517,12 @@ Po 0 70000 36500 70000 36700 170 -1
 De 15 0 11 0 400
 Po 0 65000 32500 68500 32500 170 -1
 De 0 0 11 0 0
+Po 0 64500 33000 65000 32500 170 -1
+De 0 0 11 0 800
+Po 0 69000 32500 69500 33000 170 -1
+De 15 0 11 0 0
+Po 0 68500 32500 69000 32500 170 -1
+De 15 0 11 0 0
 Po 0 66750 35500 70000 38750 170 -1
 De 0 0 12 0 0
 Po 0 70000 38750 70000 38850 170 -1
@@ -4087,12 +4535,6 @@ Po 0 66250 35500 66750 35500 170 -1
 De 0 0 12 0 0
 Po 0 65500 34000 66000 34500 170 -1
 De 0 0 12 0 800
-Po 0 57000 37500 57000 40000 170 -1
-De 15 0 13 0 0
-Po 0 55125 40500 55000 40625 170 -1
-De 15 0 13 0 0
-Po 0 56500 40500 55125 40500 170 -1
-De 15 0 13 0 0
 Po 0 57000 40000 56500 40500 170 -1
 De 15 0 13 0 0
 Po 0 57500 37000 57000 37500 170 -1
@@ -4101,6 +4543,12 @@ Po 0 57500 36000 57500 37000 170 -1
 De 15 0 13 0 C00
 Po 0 55000 40625 55000 41000 170 -1
 De 15 0 13 0 400
+Po 0 57000 37500 57000 40000 170 -1
+De 15 0 13 0 0
+Po 0 55125 40500 55000 40625 170 -1
+De 15 0 13 0 0
+Po 0 56500 40500 55125 40500 170 -1
+De 15 0 13 0 0
 Po 3 63500 22500 63500 22500 450 -1
 De 15 1 14 0 0
 Po 0 42500 23000 42500 23500 170 -1
@@ -4149,36 +4597,36 @@ Po 0 62500 38000 62500 44500 170 -1
 De 15 0 17 0 800
 Po 0 62500 44500 62000 45000 170 -1
 De 15 0 17 0 0
-Po 0 63000 37500 63000 45500 170 -1
-De 15 0 18 0 400
 Po 0 62500 37000 63000 37500 170 -1
 De 15 0 18 0 800
-Po 0 63500 37000 64000 37500 170 -1
-De 15 0 19 0 800
+Po 0 63000 37500 63000 45500 170 -1
+De 15 0 18 0 400
 Po 0 64000 37500 64000 45500 170 -1
 De 15 0 19 0 400
+Po 0 63500 37000 64000 37500 170 -1
+De 15 0 19 0 800
 Po 0 64500 38000 64500 43750 170 -1
 De 15 0 20 0 800
 Po 0 65000 44250 65000 45500 170 -1
 De 15 0 20 0 400
 Po 0 64500 43750 65000 44250 170 -1
 De 15 0 20 0 0
+Po 0 65000 43500 66000 44500 170 -1
+De 15 0 21 0 0
 Po 0 66000 44500 66000 45500 170 -1
 De 15 0 21 0 400
 Po 0 65000 37500 65000 43500 170 -1
 De 15 0 21 0 0
 Po 0 64500 37000 65000 37500 170 -1
 De 15 0 21 0 800
-Po 0 65000 43500 66000 44500 170 -1
-De 15 0 21 0 0
+Po 0 66000 36500 66000 43750 170 -1
+De 15 0 22 0 0
 Po 0 66000 43750 67000 44750 170 -1
 De 15 0 22 0 0
 Po 0 67000 44750 67000 45500 170 -1
 De 15 0 22 0 400
 Po 0 65500 36000 66000 36500 170 -1
 De 15 0 22 0 800
-Po 0 66000 36500 66000 43750 170 -1
-De 15 0 22 0 0
 Po 0 57500 48000 58000 48500 170 -1
 De 15 0 23 0 400
 Po 0 53500 47000 57000 47000 170 -1
@@ -4227,14 +4675,14 @@ Po 0 49000 42000 59000 42000 170 -1
 De 0 0 25 0 0
 Po 3 49000 42000 49000 42000 450 -1
 De 15 1 25 0 0
+Po 0 68900 29000 69550 29650 170 -1
+De 0 0 26 0 0
 Po 0 66500 29000 68900 29000 170 -1
 De 0 0 26 0 800
 Po 0 69550 29650 71000 29650 170 -1
 De 0 0 26 0 0
 Po 0 71000 29620 71000 29650 170 -1
 De 0 0 26 0 800
-Po 0 68900 29000 69550 29650 170 -1
-De 0 0 26 0 0
 Po 0 66000 30500 69400 30500 170 -1
 De 0 0 27 0 0
 Po 0 69600 30700 71000 30700 170 -1
@@ -4245,12 +4693,6 @@ Po 0 65500 30000 66000 30500 170 -1
 De 0 0 27 0 800
 Po 0 71000 30700 71000 30720 170 -1
 De 0 0 27 0 400
-Po 0 55000 35500 55000 31500 170 -1
-De 15 0 28 0 0
-Po 0 57000 25500 56500 25000 170 -1
-De 15 0 28 0 0
-Po 0 56500 37000 56000 36500 170 -1
-De 15 0 28 0 800
 Po 0 56500 25000 56500 16000 170 -1
 De 15 0 28 0 400
 Po 0 56000 35500 55000 35500 170 -1
@@ -4261,16 +4703,16 @@ Po 0 55000 31500 57000 31500 170 -1
 De 15 0 28 0 0
 Po 0 56000 36500 56000 35500 170 -1
 De 15 0 28 0 0
+Po 0 55000 35500 55000 31500 170 -1
+De 15 0 28 0 0
+Po 0 57000 25500 56500 25000 170 -1
+De 15 0 28 0 0
+Po 0 56500 37000 56000 36500 170 -1
+De 15 0 28 0 800
 Po 0 66500 31000 67500 30000 170 -1
 De 15 0 29 0 800
 Po 0 67500 30000 67500 16000 170 -1
 De 15 0 29 0 400
-Po 0 64500 22000 43000 22000 170 -1
-De 0 0 30 0 0
-Po 3 43000 22000 43000 22000 450 -1
-De 15 1 30 0 0
-Po 3 64500 22000 64500 22000 450 -1
-De 15 1 30 0 0
 Po 0 43500 29500 43500 29000 170 -1
 De 15 0 30 0 800
 Po 0 43000 22000 43000 28500 170 -1
@@ -4279,6 +4721,12 @@ Po 0 43500 29000 43000 28500 170 -1
 De 15 0 30 0 0
 Po 0 64500 26000 64500 22000 170 -1
 De 15 0 30 0 800
+Po 0 64500 22000 43000 22000 170 -1
+De 0 0 30 0 0
+Po 3 43000 22000 43000 22000 450 -1
+De 15 1 30 0 0
+Po 3 64500 22000 64500 22000 450 -1
+De 15 1 30 0 0
 Po 0 42000 28500 42000 26500 170 -1
 De 15 0 31 0 0
 Po 3 42000 26500 42000 26500 450 -1
@@ -4291,12 +4739,6 @@ Po 0 42500 29000 42000 28500 170 -1
 De 15 0 31 0 0
 Po 0 55500 27000 55000 26500 170 -1
 De 0 0 31 0 800
-Po 0 41500 25000 41500 23500 170 -1
-De 15 0 32 0 400
-Po 0 63000 27500 64000 27500 170 -1
-De 15 0 32 0 0
-Po 3 64000 25000 64000 25000 450 -1
-De 15 1 32 0 0
 Po 0 62500 28000 63000 27500 170 -1
 De 15 0 32 0 800
 Po 0 64000 27500 64000 25000 170 -1
@@ -4305,6 +4747,12 @@ Po 3 41500 25000 41500 25000 450 -1
 De 15 1 32 0 0
 Po 0 64000 25000 41500 25000 170 -1
 De 0 0 32 0 0
+Po 0 41500 25000 41500 23500 170 -1
+De 15 0 32 0 400
+Po 0 63000 27500 64000 27500 170 -1
+De 15 0 32 0 0
+Po 3 64000 25000 64000 25000 450 -1
+De 15 1 32 0 0
 Po 3 53000 27000 53000 27000 600 -1
 De 15 1 33 0 0
 Po 3 39500 26500 39500 26500 450 -1
@@ -4323,14 +4771,14 @@ Po 0 55500 29000 55000 28500 170 -1
 De 15 0 33 0 800
 Po 0 40000 27000 39500 26500 170 -1
 De 0 0 33 0 0
+Po 0 35500 30500 35500 29500 170 -1
+De 0 0 34 0 400
 Po 0 56000 31500 36500 31500 170 -1
 De 0 0 34 0 0
 Po 0 36500 31500 35500 30500 170 -1
 De 0 0 34 0 0
 Po 0 56500 31000 56000 31500 170 -1
 De 0 0 34 0 800
-Po 0 35500 30500 35500 29500 170 -1
-De 0 0 34 0 400
 Po 0 36500 27000 36500 26500 170 -1
 De 0 0 35 0 0
 Po 0 37500 28000 36500 27000 170 -1
@@ -4341,10 +4789,10 @@ Po 0 54500 28000 37500 28000 170 -1
 De 0 0 35 0 800
 Po 0 36500 26500 36500 23500 170 -1
 De 15 0 35 0 400
-Po 0 54500 29000 35000 29000 170 -1
-De 0 0 36 0 800
 Po 0 35000 29000 34500 29500 170 -1
 De 0 0 36 0 400
+Po 0 54500 29000 35000 29000 170 -1
+De 0 0 36 0 800
 Po 3 52500 25500 52500 25500 600 300
 De 15 1 37 0 0
 Po 0 33750 25500 33500 25250 170 -1
@@ -4359,12 +4807,6 @@ Po 0 52500 25500 33750 25500 170 -1
 De 0 0 37 0 0
 Po 0 33500 23500 33500 25250 170 -1
 De 0 0 37 0 800
-Po 0 62000 18500 62000 27500 170 -1
-De 15 0 38 0 0
-Po 3 33000 18500 33000 18500 450 -1
-De 15 1 38 0 0
-Po 0 33500 29000 33500 29500 170 -1
-De 15 0 38 0 400
 Po 0 33000 18500 33000 28500 170 -1
 De 15 0 38 0 0
 Po 0 62000 18500 33000 18500 170 -1
@@ -4375,6 +4817,12 @@ Po 0 33000 28500 33500 29000 170 -1
 De 15 0 38 0 0
 Po 3 62000 18500 62000 18500 450 -1
 De 15 1 38 0 0
+Po 0 62000 18500 62000 27500 170 -1
+De 15 0 38 0 0
+Po 3 33000 18500 33000 18500 450 -1
+De 15 1 38 0 0
+Po 0 33500 29000 33500 29500 170 -1
+De 15 0 38 0 400
 Po 0 42000 30000 41500 29500 170 -1
 De 0 0 39 0 400
 Po 0 56500 29000 56000 29500 170 -1
@@ -4385,16 +4833,16 @@ Po 0 51000 29500 50500 30000 170 -1
 De 0 0 39 0 0
 Po 0 56000 29500 51000 29500 170 -1
 De 0 0 39 0 0
+Po 0 55000 28500 40000 28500 170 -1
+De 0 0 40 0 0
+Po 0 40500 29000 40000 28500 170 -1
+De 15 0 40 0 0
 Po 3 40000 28500 40000 28500 450 -1
 De 15 1 40 0 0
 Po 0 40500 29500 40500 29000 170 -1
 De 15 0 40 0 800
 Po 0 55500 28000 55000 28500 170 -1
 De 0 0 40 0 800
-Po 0 55000 28500 40000 28500 170 -1
-De 0 0 40 0 0
-Po 0 40500 29000 40000 28500 170 -1
-De 15 0 40 0 0
 Po 0 40500 30500 39500 29500 170 -1
 De 0 0 41 0 400
 Po 0 54500 30000 51500 30000 170 -1
@@ -4403,12 +4851,6 @@ Po 0 51500 30000 51000 30500 170 -1
 De 0 0 41 0 0
 Po 0 51000 30500 40500 30500 170 -1
 De 0 0 41 0 0
-Po 0 67000 27500 66500 28000 170 -1
-De 15 0 42 0 400
-Po 0 67000 24500 67000 27500 170 -1
-De 15 0 42 0 0
-Po 3 38000 24500 38000 24500 450 -1
-De 15 1 42 0 0
 Po 3 67000 24500 67000 24500 450 -1
 De 15 1 42 0 0
 Po 0 38500 29500 38500 29000 170 -1
@@ -4419,6 +4861,12 @@ Po 0 38500 29000 38000 28500 170 -1
 De 15 0 42 0 0
 Po 0 38000 28500 38000 24500 170 -1
 De 15 0 42 0 0
+Po 0 67000 27500 66500 28000 170 -1
+De 15 0 42 0 400
+Po 0 67000 24500 67000 27500 170 -1
+De 15 0 42 0 0
+Po 3 38000 24500 38000 24500 450 -1
+De 15 1 42 0 0
 Po 0 55000 30500 52000 30500 170 -1
 De 0 0 43 0 0
 Po 0 52000 30500 51500 31000 170 -1
@@ -4431,12 +4879,6 @@ Po 0 37500 30000 37500 29500 170 -1
 De 0 0 43 0 400
 Po 0 55500 31000 55000 30500 170 -1
 De 0 0 43 0 800
-Po 0 56500 27000 56000 26500 170 -1
-De 15 0 44 0 800
-Po 0 36000 20500 36000 28500 170 -1
-De 15 0 44 0 0
-Po 0 56000 20500 36000 20500 170 -1
-De 0 0 44 0 0
 Po 0 56000 26500 56000 20500 170 -1
 De 15 0 44 0 0
 Po 3 56000 20500 56000 20500 450 -1
@@ -4447,6 +4889,12 @@ Po 0 36500 29500 36500 29000 170 -1
 De 15 0 44 0 800
 Po 0 36500 29000 36000 28500 170 -1
 De 15 0 44 0 0
+Po 0 56500 27000 56000 26500 170 -1
+De 15 0 44 0 800
+Po 0 36000 20500 36000 28500 170 -1
+De 15 0 44 0 0
+Po 0 56000 20500 36000 20500 170 -1
+De 0 0 44 0 0
 Po 0 54500 32000 38000 32000 170 -1
 De 0 0 45 0 800
 Po 0 37500 28500 37500 23500 170 -1
@@ -4457,22 +4905,22 @@ Po 3 38000 32000 38000 32000 450 -1
 De 15 1 45 0 0
 Po 0 38000 32000 38000 29000 170 -1
 De 15 0 45 0 0
+Po 0 57500 26000 57500 24000 170 -1
+De 15 0 46 0 800
 Po 0 39000 24000 38500 23500 170 -1
 De 0 0 46 0 400
 Po 0 57500 24000 39000 24000 170 -1
 De 0 0 46 0 0
 Po 3 57500 24000 57500 24000 450 -1
 De 15 1 46 0 0
-Po 0 57500 26000 57500 24000 170 -1
-De 15 0 46 0 800
+Po 0 37500 45000 47750 45000 170 -1
+De 0 0 47 0 0
 Po 0 48000 44750 48000 44000 170 -1
 De 0 0 47 0 400
 Po 0 47750 45000 48000 44750 170 -1
 De 0 0 47 0 0
 Po 0 37000 45500 37500 45000 170 -1
 De 0 0 47 0 800
-Po 0 37500 45000 47750 45000 170 -1
-De 0 0 47 0 0
 Po 0 44500 29000 44000 28500 170 -1
 De 15 0 48 0 0
 Po 3 44000 27500 44000 27500 450 -1
@@ -4485,12 +4933,6 @@ Po 0 59500 28000 59000 27500 170 -1
 De 0 0 48 0 800
 Po 0 44500 29500 44500 29000 170 -1
 De 15 0 48 0 800
-Po 0 53500 25500 53000 26000 170 -1
-De 0 0 49 0 0
-Po 0 45000 26000 45000 28500 170 -1
-De 15 0 49 0 0
-Po 0 58500 26000 58000 25500 170 -1
-De 0 0 49 0 800
 Po 0 45500 29000 45000 28500 170 -1
 De 15 0 49 0 0
 Po 3 45000 26000 45000 26000 450 -1
@@ -4501,6 +4943,12 @@ Po 0 58000 25500 53500 25500 170 -1
 De 0 0 49 0 0
 Po 0 53000 26000 45000 26000 170 -1
 De 0 0 49 0 0
+Po 0 53500 25500 53000 26000 170 -1
+De 0 0 49 0 0
+Po 0 45000 26000 45000 28500 170 -1
+De 15 0 49 0 0
+Po 0 58500 26000 58000 25500 170 -1
+De 0 0 49 0 800
 Po 3 58000 21000 58000 21000 450 -1
 De 15 1 50 0 0
 Po 0 59000 26500 59000 22000 170 -1
@@ -4535,16 +4983,16 @@ Po 0 60500 26000 60500 17500 170 -1
 De 15 0 52 0 800
 Po 0 60500 17500 46500 17500 170 -1
 De 0 0 52 0 0
+Po 0 45500 19000 61500 19000 170 -1
+De 0 0 53 0 0
+Po 0 61500 26000 61500 19000 170 -1
+De 15 0 53 0 800
 Po 0 45500 23500 45500 19000 170 -1
 De 15 0 53 0 800
 Po 3 61500 19000 61500 19000 450 -1
 De 15 1 53 0 0
 Po 3 45500 19000 45500 19000 450 -1
 De 15 1 53 0 0
-Po 0 45500 19000 61500 19000 170 -1
-De 0 0 53 0 0
-Po 0 61500 26000 61500 19000 170 -1
-De 15 0 53 0 800
 Po 0 44500 21500 62500 21500 170 -1
 De 0 0 54 0 0
 Po 3 62500 21500 62500 21500 450 -1
@@ -4555,16 +5003,16 @@ Po 3 44500 21500 44500 21500 450 -1
 De 15 1 54 0 0
 Po 0 44500 23500 44500 21500 170 -1
 De 15 0 54 0 800
+Po 3 61000 23000 61000 23000 450 -1
+De 15 1 55 0 0
+Po 0 61000 26500 61000 23000 170 -1
+De 15 0 55 0 0
 Po 0 61500 27000 61000 26500 170 -1
 De 15 0 55 0 800
 Po 0 44000 23000 43500 23500 170 -1
 De 0 0 55 0 400
 Po 0 61000 23000 44000 23000 170 -1
 De 0 0 55 0 0
-Po 3 61000 23000 61000 23000 450 -1
-De 15 1 55 0 0
-Po 0 61000 26500 61000 23000 170 -1
-De 15 0 55 0 0
 Po 0 63000 18000 40500 18000 170 -1
 De 0 0 56 0 0
 Po 3 63000 18000 63000 18000 450 -1
@@ -4937,16 +5385,16 @@ Po 0 65000 49500 63000 51500 170 -1
 De 15 0 76 0 0
 Po 0 63000 51500 63000 54000 170 -1
 De 15 0 76 0 400
+Po 0 64000 54000 64000 52500 170 -1
+De 15 0 77 0 800
+Po 0 65500 52000 66000 51500 170 -1
+De 15 0 77 0 0
 Po 0 64500 52000 65500 52000 170 -1
 De 15 0 77 0 0
 Po 0 66000 51500 66000 48500 170 -1
 De 15 0 77 0 400
 Po 0 64000 52500 64500 52000 170 -1
 De 15 0 77 0 0
-Po 0 64000 54000 64000 52500 170 -1
-De 15 0 77 0 800
-Po 0 65500 52000 66000 51500 170 -1
-De 15 0 77 0 0
 Po 0 52000 52000 53000 51000 170 -1
 De 15 0 78 0 0
 Po 0 52000 54000 52000 52000 170 -1
@@ -4955,18 +5403,18 @@ Po 3 52000 52000 52000 52000 450 -1
 De 15 1 78 0 0
 Po 0 53000 51000 53000 48500 170 -1
 De 15 0 78 0 400
-Po 0 53000 54000 53000 52000 170 -1
-De 0 0 79 0 800
-Po 0 53000 52000 53500 51500 170 -1
-De 15 0 79 0 0
-Po 0 53500 51500 53500 48000 170 -1
-De 15 0 79 0 0
 Po 0 53500 48000 52500 48000 170 -1
 De 15 0 79 0 0
 Po 3 53000 52000 53000 52000 450 -1
 De 15 1 79 0 0
 Po 0 52500 48000 52000 48500 170 -1
 De 15 0 79 0 400
+Po 0 53000 54000 53000 52000 170 -1
+De 0 0 79 0 800
+Po 0 53000 52000 53500 51500 170 -1
+De 15 0 79 0 0
+Po 0 53500 51500 53500 48000 170 -1
+De 15 0 79 0 0
 Po 0 57000 41000 57500 40500 170 -1
 De 0 0 80 0 800
 Po 3 62000 41000 62000 41000 450 -1
@@ -4993,18 +5441,18 @@ Po 0 57500 40500 58500 40500 170 -1
 De 0 0 80 0 0
 Po 0 58500 40500 59000 41000 170 -1
 De 0 0 80 0 0
-Po 0 64000 54000 64000 50000 170 -1
-De 0 0 81 0 800
-Po 0 63500 49500 55500 49500 170 -1
-De 0 0 81 0 0
-Po 0 64000 50000 63500 49500 170 -1
-De 0 0 81 0 0
 Po 0 55500 49500 55000 49000 170 -1
 De 0 0 81 0 0
 Po 0 55000 49000 55000 48500 170 -1
 De 0 0 81 0 400
 Po 0 55000 48500 54000 48500 170 -1
 De 0 0 81 0 C00
+Po 0 64000 54000 64000 50000 170 -1
+De 0 0 81 0 800
+Po 0 63500 49500 55500 49500 170 -1
+De 0 0 81 0 0
+Po 0 64000 50000 63500 49500 170 -1
+De 0 0 81 0 0
 Po 0 53125 44500 53000 44375 170 -1
 De 0 0 82 0 0
 Po 0 53000 44375 53000 44000 170 -1
@@ -5045,52 +5493,52 @@ Po 0 57500 40000 58750 40000 170 -1
 De 0 0 84 0 0
 Po 0 66000 40125 66000 37125 170 -1
 De 0 0 84 0 0
-Po 0 44000 45500 44000 44000 170 -1
-De 15 0 85 0 C00
 Po 0 44000 44000 44000 42000 170 -1
 De 15 0 85 0 C00
+Po 0 44000 45500 44000 44000 170 -1
+De 15 0 85 0 C00
+Po 0 43000 44000 43500 44500 170 -1
+De 15 0 86 0 800
+Po 0 43000 44000 43000 42000 170 -1
+De 15 0 86 0 C00
 Po 0 44000 47000 44000 48500 170 -1
 De 15 0 86 0 400
 Po 0 43500 44500 43500 46500 170 -1
 De 15 0 86 0 0
 Po 0 43500 46500 44000 47000 170 -1
 De 15 0 86 0 0
-Po 0 43000 44000 43500 44500 170 -1
-De 15 0 86 0 800
-Po 0 43000 44000 43000 42000 170 -1
-De 15 0 86 0 C00
 Po 0 38000 42000 38000 44000 170 -1
 De 15 0 87 0 C00
 Po 0 38000 44000 38000 45500 170 -1
 De 15 0 87 0 C00
+Po 0 37500 46500 38000 47000 170 -1
+De 15 0 88 0 0
+Po 0 37000 44000 37000 42000 170 -1
+De 15 0 88 0 C00
 Po 0 37000 44000 37500 44500 170 -1
 De 15 0 88 0 800
 Po 0 38000 47000 38000 48500 170 -1
 De 15 0 88 0 400
 Po 0 37500 44500 37500 46500 170 -1
 De 15 0 88 0 0
-Po 0 37500 46500 38000 47000 170 -1
-De 15 0 88 0 0
-Po 0 37000 44000 37000 42000 170 -1
-De 15 0 88 0 C00
-Po 0 40000 44000 40000 42000 170 -1
-De 15 0 89 0 C00
 Po 0 40000 45500 40000 44000 170 -1
 De 15 0 89 0 C00
+Po 0 40000 44000 40000 42000 170 -1
+De 15 0 89 0 C00
 Po 0 42000 45500 42000 44000 170 -1
 De 15 0 90 0 C00
 Po 0 42000 44000 42000 42000 170 -1
 De 15 0 90 0 C00
+Po 0 40000 47000 40000 48500 170 -1
+De 15 0 91 0 400
+Po 0 39000 44000 39000 42000 170 -1
+De 15 0 91 0 C00
 Po 0 39000 44000 39500 44500 170 -1
 De 15 0 91 0 800
 Po 0 39500 46500 40000 47000 170 -1
 De 15 0 91 0 0
 Po 0 39500 44500 39500 46500 170 -1
 De 15 0 91 0 0
-Po 0 40000 47000 40000 48500 170 -1
-De 15 0 91 0 400
-Po 0 39000 44000 39000 42000 170 -1
-De 15 0 91 0 C00
 Po 0 41000 44000 41000 42000 170 -1
 De 15 0 92 0 C00
 Po 0 42000 47000 42000 48500 170 -1
@@ -5101,14 +5549,14 @@ Po 0 41000 44000 41500 44500 170 -1
 De 15 0 92 0 800
 Po 0 41500 46500 42000 47000 170 -1
 De 15 0 92 0 0
+Po 0 55500 45000 55000 45500 170 -1
+De 15 0 93 0 400
 Po 0 56500 45000 55500 45000 170 -1
 De 15 0 93 0 0
 Po 0 57000 44500 56500 45000 170 -1
 De 15 0 93 0 0
 Po 0 57000 44000 57000 44500 170 -1
 De 15 0 93 0 800
-Po 0 55500 45000 55000 45500 170 -1
-De 15 0 93 0 400
 Po 0 55500 36375 55500 36000 170 -1
 De 15 0 94 0 400
 Po 0 55375 36500 55500 36375 170 -1
@@ -5149,12 +5597,6 @@ Po 0 65500 26000 66000 26500 170 -1
 De 0 0 97 0 800
 Po 0 66000 26500 68500 26500 170 -1
 De 0 0 97 0 0
-Po 0 61500 17000 35500 17000 170 -1
-De 0 0 98 0 0
-Po 3 66500 17500 66500 17500 450 -1
-De 15 1 98 0 0
-Po 0 35500 23500 35500 17000 170 -1
-De 15 0 98 0 800
 Po 3 35500 17000 35500 17000 450 -1
 De 15 1 98 0 0
 Po 0 62000 17500 61500 17000 170 -1
@@ -5163,6 +5605,12 @@ Po 0 66500 26000 66500 17500 170 -1
 De 15 0 98 0 800
 Po 0 66500 17500 62000 17500 170 -1
 De 0 0 98 0 0
+Po 0 61500 17000 35500 17000 170 -1
+De 0 0 98 0 0
+Po 3 66500 17500 66500 17500 450 -1
+De 15 1 98 0 0
+Po 0 35500 23500 35500 17000 170 -1
+De 15 0 98 0 800
 Po 0 56000 41375 56125 41500 170 -1
 De 0 0 99 0 0
 Po 0 58000 41375 58000 41000 170 -1
@@ -5379,18 +5827,18 @@ Po 0 61500 14500 63500 14500 170 -1
 De 15 0 100 0 400
 Po 0 59500 17000 59500 20000 170 -1
 De 15 0 100 0 400
-Po 0 46000 38500 46500 38000 170 -1
-De 0 0 101 0 800
-Po 0 44500 38500 43500 38500 170 -1
-De 0 0 101 0 800
-Po 0 46000 38500 44500 38500 170 -1
-De 0 0 101 0 C00
 Po 0 48000 38000 48500 38500 170 -1
 De 0 0 101 0 400
 Po 0 43500 38500 43000 38000 170 -1
 De 0 0 101 0 400
 Po 0 46500 38000 48000 38000 170 -1
 De 0 0 101 0 0
+Po 0 46000 38500 46500 38000 170 -1
+De 0 0 101 0 800
+Po 0 44500 38500 43500 38500 170 -1
+De 0 0 101 0 800
+Po 0 46000 38500 44500 38500 170 -1
+De 0 0 101 0 C00
 Po 0 44500 35500 43500 35500 170 -1
 De 0 0 102 0 800
 Po 0 51000 36000 54500 36000 170 -1
@@ -5405,10 +5853,10 @@ Po 0 46000 35500 44500 35500 170 -1
 De 0 0 102 0 C00
 Po 0 46750 36250 50750 36250 170 -1
 De 0 0 102 0 0
-Po 0 59500 16000 60500 15000 170 -1
-De 15 0 103 0 800
 Po 0 60500 15000 60500 14500 170 -1
 De 15 0 103 0 400
+Po 0 59500 16000 60500 15000 170 -1
+De 15 0 103 0 800
 Po 0 64500 16000 64500 14500 170 -1
 De 15 0 104 0 C00
 Po 0 34500 22000 34500 23500 170 -1
@@ -5558,7 +6006,7 @@ ZLayer 0
 ZAux 6 E
 ZClearance 200 T
 ZMinThickness 100
-ZOptions 0 32 F 200 200
+ZOptions 0 32 S 200 200
 ZCorner 74750 51750 0
 ZCorner 74750 13250 0
 ZCorner 32750 13250 0

demos/interf_u/interf_u.pro

-update=16/05/2010 14:21:37
+update=30/06/2010 12:54:53
 version=1
 last_client=pcbnew
 [common]
 NetDir=
+[general]
+version=1
+RootSch=interf_u.sch
+BoardNm=interf_u.brd
+[cvpcb]
+version=1
+NetITyp=0
+NetIExt=.net
+PkgIExt=.pkg
+NetType=0
+[cvpcb/libraries]
+EquName1=devcms
 [eeschema]
 version=1
 LibDir=
@@ -33,9 +45,11 @@ offY_E=0
 RptD_X=0
 RptD_Y=100
 RptLab=1
-PenMin=20
 SimCmd=
 UseNetN=0
+LabSize=60
+PrintMonochrome=1
+ShowSheetReferenceAndTitleBlock=1
 [eeschema/libraries]
 LibName1=power
 LibName2=device
@@ -48,18 +62,7 @@ LibName8=adc-dac
 LibName9=memory
 LibName10=xilinx
 LibName11=special
-[general]
-version=1
-RootSch=interf_u.sch
-BoardNm=interf_u.brd
-[cvpcb]
-version=1
-NetITyp=0
-NetIExt=.net
-PkgIExt=.pkg
-NetType=0
-[cvpcb/libraries]
-EquName1=devcms
+LibName12=image
 [pcbnew]
 version=1
 PadDrlX=430

demos/interf_u/interf_u.sch

-EESchema Schematic File Version 2  date 28/04/2010 09:06:34
+EESchema Schematic File Version 2  date 30/06/2010 12:55:05
 LIBS:power
 LIBS:device
 LIBS:conn
@@ -10,13 +10,14 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:image
 LIBS:interf_u-cache
 EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
 Sheet 1 1
 Title "INTERFACE UNIVERSEL"
-Date "28 apr 2010"
+Date "30 jun 2010"
 Rev "2B"
 Comp "KICAD"
 Comment1 "Comment 1"
@@ -24,6 +25,15 @@ Comment2 "Comment 2"
 Comment3 "Comment 3"
 Comment4 "Comment 4"
 $EndDescr
+$Comp
+L LOGO #G?
+U 1 1 4C2B218C
+P 11350 10550
+F 0 "#G?" H 11350 10130 60  0001 C CNN
+F 1 "LOGO" H 11350 10970 60  0001 C CNN
+	1    11350 10550
+	1    0    0    -1  
+$EndComp
 Wire Bus Line
 	3900 2450 3850 2450
 Wire Wire Line
@@ -43,21 +53,13 @@ Wire Wire Line
 Wire Wire Line
 	3150 2250 3650 2250
 Wire Wire Line
-	4450 9300 3800 9300
-Wire Wire Line
-	3800 9300 3250 9300
-Wire Wire Line
-	3250 9300 2600 9300
+	4450 9300 2600 9300
 Wire Wire Line
 	2600 9300 2600 9350
 Wire Wire Line
 	2600 8900 2600 8850
 Wire Wire Line
-	4450 8900 3800 8900
-Wire Wire Line
-	3800 8900 3250 8900
-Wire Wire Line
-	3250 8900 2600 8900
+	4450 8900 2600 8900
 Connection ~ 3250 8900
 Connection ~ 3800 8900
 Connection ~ 3800 9300
@@ -187,11 +189,7 @@ Wire Wire Line
 Wire Wire Line
 	10050 3300 10100 3300
 Wire Wire Line
-	10050 3000 10050 3100
-Wire Wire Line
-	10050 3100 10050 3200
-Wire Wire Line
-	10050 3200 10050 3300
+	10050 3000 10050 3300
 Wire Wire Line
 	10100 3100 10050 3100
 Wire Wire Line
@@ -199,13 +197,9 @@ Wire Wire Line
 Connection ~ 10050 3100
 Connection ~ 10050 3200
 Wire Wire Line
-	13550 4400 13550 4150
+	13550 4400 13550 3700
 Wire Wire Line
-	13550 4150 13550 3700
-Wire Wire Line
-	14350 4400 14350 4150
-Wire Wire Line
-	14350 4150 14350 3700
+	14350 4400 14350 3700
 Connection ~ 13550 4150
 Connection ~ 14350 4150
 Connection ~ 14350 3700
@@ -224,9 +218,7 @@ Wire Wire Line
 Wire Wire Line
 	8450 1850 9000 1850
 Wire Wire Line
-	8450 1950 8500 1950
-Wire Wire Line
-	8500 1950 9000 1950
+	8450 1950 9000 1950
 Wire Wire Line
 	8450 2150 9000 2150
 Wire Wire Line
@@ -237,9 +229,7 @@ Connection ~ 8500 1950
 Wire Wire Line
 	3950 4000 4500 4000
 Wire Wire Line
-	4550 2350 4550 2450
-Wire Wire Line
-	4550 2450 4550 2550
+	4550 2350 4550 2550
 Connection ~ 4550 2450
 Wire Wire Line
 	3950 4100 4500 4100
@@ -459,23 +449,9 @@ Wire Wire Line
 Wire Wire Line
 	14700 7500 14750 7500
 Wire Wire Line
-	14700 7500 14700 7300
-Wire Wire Line
-	14700 7300 14700 7100
-Wire Wire Line
-	14700 7100 14700 6900
-Wire Wire Line
-	14700 6900 14700 6700
-Wire Wire Line
-	14700 6700 14700 6500
+	14700 7500 14700 6100
 Wire Wire Line
-	14700 6500 14700 6300
-Wire Wire Line
-	14700 6300 14700 6100
-Wire Wire Line
-	14650 6100 14700 6100
-Wire Wire Line
-	14700 6100 14750 6100
+	14650 6100 14750 6100
 Wire Wire Line
 	14750 6300 14700 6300
 Wire Wire Line
@@ -532,21 +508,7 @@ Wire Wire Line
 Wire Wire Line
 	1200 6900 1300 6900
 Wire Wire Line
-	1200 7700 1200 7600
-Wire Wire Line
-	1200 7600 1200 7500
-Wire Wire Line
-	1200 7500 1200 7400
-Wire Wire Line
-	1200 7400 1200 7300
-Wire Wire Line
-	1200 7300 1200 7200
-Wire Wire Line
-	1200 7200 1200 7100
-Wire Wire Line
-	1200 7100 1200 7000
-Wire Wire Line
-	1200 7000 1200 6900
+	1200 7700 1200 6900
 Wire Wire Line
 	1300 7000 1200 7000
 Wire Wire Line
@@ -573,9 +535,7 @@ Wire Wire Line
 Wire Wire Line
 	3350 6800 3350 6900
 Wire Wire Line
-	3350 6800 3150 6800
-Wire Wire Line
-	3150 6800 2450 6800
+	3350 6800 2450 6800
 Wire Wire Line
 	2450 6800 2450 6900
 Wire Wire Line
@@ -583,9 +543,7 @@ Wire Wire Line
 Wire Wire Line
 	3150 7950 3150 6800
 Wire Wire Line
-	3900 7000 2950 7000
-Wire Wire Line
-	2950 7000 2600 7000
+	3900 7000 2600 7000
 Wire Wire Line
 	2600 7000 2600 7100
 Wire Wire Line
@@ -597,9 +555,7 @@ Wire Wire Line
 Wire Wire Line
 	3050 6900 2500 6900
 Wire Wire Line
-	3050 7950 3050 7700
-Wire Wire Line
-	3050 7700 3050 6900
+	3050 7950 3050 6900
 Wire Wire Line
 	3900 7600 3400 7600
 Wire Wire Line
@@ -607,17 +563,13 @@ Wire Wire Line
 Wire Wire Line
 	3400 7700 3050 7700
 Wire Wire Line
-	2100 7300 2750 7300
-Wire Wire Line
-	2750 7300 3250 7300
+	2100 7300 3250 7300
 Wire Wire Line
 	3250 7300 3250 7100
 Wire Wire Line
 	3250 7100 3900 7100
 Wire Wire Line
-	2100 7600 2450 7600
-Wire Wire Line
-	2450 7600 3300 7600
+	2100 7600 3300 7600
 Wire Wire Line
 	3300 7600 3300 7300
 Wire Wire Line
@@ -637,9 +589,7 @@ Wire Wire Line
 Wire Wire Line
 	3900 7500 2850 7500
 Wire Wire Line
-	3900 7400 2650 7400
-Wire Wire Line
-	2650 7400 2100 7400
+	3900 7400 2100 7400
 Connection ~ 2450 7600
 Connection ~ 2550 7500
 Connection ~ 2650 7400
@@ -651,13 +601,9 @@ Wire Wire Line
 Wire Wire Line
 	2850 7200 2100 7200
 Wire Wire Line
-	2850 7950 2850 7500
-Wire Wire Line
-	2850 7500 2850 7200
+	2850 7950 2850 7200
 Wire Wire Line
-	2550 7950 2550 7500
-Wire Wire Line
-	2550 7500 2550 7150
+	2550 7950 2550 7150
 Wire Wire Line
 	2550 7150 2900 7150
 Wire Wire Line
@@ -673,85 +619,19 @@ Wire Wire Line
 Wire Wire Line
 	14250 4150 14350 4150
 Wire Bus Line
-	3750 2350 3750 2250
-Wire Bus Line
-	3750 2250 3750 2150
-Wire Bus Line
-	3750 2150 3750 2050
-Wire Bus Line
-	3750 2050 3750 1950
-Wire Bus Line
-	3750 1950 3750 1850
-Wire Bus Line
-	3750 1850 3750 1750
-Wire Bus Line
-	3750 1750 3750 1650
-Wire Bus Line
-	3750 3450 3750 3550
-Wire Bus Line
-	3750 3550 3750 3650
-Wire Bus Line
-	3750 3650 3750 3750
-Wire Bus Line
-	3750 3750 3750 3850
-Wire Bus Line
-	3750 3850 3750 3950
-Wire Bus Line
-	3750 3950 3750 4050
-Wire Bus Line
-	3750 4050 3750 4150
-Wire Bus Line
-	3750 4150 3750 4250
-Wire Bus Line
-	3750 4250 3750 4350
-Wire Bus Line
-	3750 4350 3750 4450
+	3750 2350 3750 1650
 Wire Bus Line
-	3750 4450 3750 4550
-Wire Bus Line
-	3750 4550 3750 5350
+	3750 3450 3750 5350
 Wire Bus Line
 	3300 5350 3750 5350
 Wire Bus Line
-	3300 6650 3300 6550
-Wire Bus Line
-	3300 6550 3300 6450
-Wire Bus Line
-	3300 6450 3300 6350
-Wire Bus Line
-	3300 6350 3300 6250
-Wire Bus Line
-	3300 6250 3300 6150
-Wire Bus Line
-	3300 6150 3300 6050
-Wire Bus Line
-	3300 6050 3300 5950
-Wire Bus Line
-	3300 5950 3300 5350
-Wire Bus Line
-	3900 3700 3900 3600
+	3300 6650 3300 5350
 Wire Bus Line
-	3900 3600 3900 3500
-Wire Bus Line
-	3900 3500 3900 3400
-Wire Bus Line
-	3900 3400 3900 3300
-Wire Bus Line
-	3900 3300 3900 3200
-Wire Bus Line
-	3900 3200 3900 3100
-Wire Bus Line
-	3900 3100 3900 3000
-Wire Bus Line
-	3900 3000 3900 2450
-Wire Wire Line
-	13700 3700 13550 3700
-Wire Wire Line
-	13550 3700 12300 3700
+	3900 3700 3900 2450
 Wire Wire Line
-	14200 3700 14350 3700
+	13700 3700 12300 3700
 Wire Wire Line
-	14350 3700 14650 3700
+	14200 3700 14650 3700
 Wire Wire Line
 	15200 3700 15150 3700
 Wire Wire Line
@@ -1663,6 +1543,8 @@ P 11200 5700
 F 0 "U9" H 11200 8450 70  0000 C CNN
 F 1 "4003APG120" H 11200 2950 70  0000 C CNN
 F 2 "PGA120" H 11200 2850 60  0000 C CNN
+F 4 "50$" H 11200 5700 60  0001 C CNN "price"
+F 5 "test" H 11200 5700 60  0001 C CNN "Field5"
 	1    11200 5700
 	1    0    0    -1  
 $EndComp

eeschema/annotate.cpp

@@ -340,6 +340,7 @@ void AnnotateComponents( WinEDA_SchematicFrame* parent,
 
     /* Final control (just in case ... )*/
     parent->CheckAnnotate( NULL, !annotateSchematic );
+    parent->OnModify( );
     parent->DrawPanel->Refresh( true );
 }
 

eeschema/help_common_strings.h

+/**
+ * @file help_common_strings.h
+ * strings common to toolbars and menubar
+ */
+
+/**
+ * These strings are used in menus and tools, that do the same command
+ * But they are internatinalized, and therefore must be created
+ * at run time, on the fly.
+ * So they cannot be static.
+ *
+ * Therefore they are defined by #define, used inside menu constructors
+ */
+
+// Common to schematic editor and component editor
+#define HELP_UNDO _( "Undo last edition" )
+#define HELP_REDO _( "Redo the last undo command" )
+
+#define HELP_ZOOM_IN     _( "Zoom in" )
+#define HELP_ZOOM_OUT    _( "Zoom out" )
+#define HELP_ZOOM_FIT    _( "Fit the schematic sheet on the screen" )
+#define HELP_ZOOM_REDRAW _( "Redraw the schematic view" )
+
+#define HELP_DELETE_ITEMS         _( "Delete items" )
+
+// Schematic editor:
+#define HELP_FIND _( "Find components and texts" )
+
+#define HELP_PLACE_COMPONENTS     _( "Place a component" )
+#define HELP_PLACE_POWERPORT      _( "Place a power port" )
+#define HELP_PLACE_WIRE           _( "Place a wire" )
+#define HELP_PLACE_BUS            _( "Place a bus" )
+#define HELP_PLACE_WIRE2BUS_ENTRY _( "Place a wire to bus entry" )
+#define HELP_PLACE_BUS2BUS_ENTRY  _( "Place a bus to bus entry" )
+#define HELP_PLACE_NC_FLAG        _( "Place a no connect flag" )
+
+#define HELP_PLACE_NETLABEL _( "Place a net name (local label)" )
+#define HELP_PLACE_GLOBALLABEL \
+    _(\
+        "Place a global label.\nWarning: all global labels with the same name are connected in whole hierarchy" )
+#define HELP_PLACE_HIER_LABEL \
+    _( "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" )
+
+#define HELP_PLACE_JUNCTION     _( "Place a junction" )
+#define HELP_PLACE_SHEET        _( "Create a hierarchical sheet" )
+#define HELP_IMPORT_PINSHEET    _( \
+        "Place a pin sheet, imported from the corresponding hierarchical label in sheet" )
+#define HELP_PLACE_PINSHEET     _( "Place a hierarchical pin to sheet" )
+#define HELP_PLACE_GRAPHICLINES _( "Place graphic lines or polygons" )
+#define HELP_PLACE_GRAPHICTEXTS _( "Place graphic text (comment)" )
+
+
+// Component editor:
+#define HELP_ADD_PIN _( "Add pins to the component" )
+#define HELP_ADD_BODYTEXT _( "Add graphic texts to the component body" )
+#define HELP_ADD_BODYRECT _( "Add graphic rectangles to the component body" )
+#define HELP_ADD_BODYCIRCLE _( "Add circles to the component body" )
+#define HELP_ADD_BODYARC _( "Add arcs to the component body" )
+#define HELP_ADD_BODYPOLYGON _( "Add lines and polygons to the component body" )
+
+

eeschema/menubar.cpp

@@ -17,6 +17,8 @@
 #include "eeschema_id.h"
 #include "hotkeys.h"
 
+#include "help_common_strings.h"
+
 /**
  * @brief Create or update the menubar for the schematic frame
  */
@@ -156,7 +158,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     text  = AddHotkeyName( _( "Undo" ), s_Schematic_Hokeys_Descr, HK_UNDO);
 
     item = new wxMenuItem( editMenu, wxID_UNDO, text,
-                           _( "Undo last edition" ), wxITEM_NORMAL );
+                           HELP_UNDO, wxITEM_NORMAL );
     item->SetBitmap( undo_xpm );
     editMenu->Append( item );
 
@@ -164,7 +166,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     text  = AddHotkeyName( _( "Redo" ), s_Schematic_Hokeys_Descr, HK_REDO);
 
     item = new wxMenuItem( editMenu, wxID_REDO, text,
-                           _( "Redo the last undo command" ), wxITEM_NORMAL );
+                           HELP_REDO, wxITEM_NORMAL );
     item->SetBitmap( redo_xpm );
     editMenu->Append( item );
 
@@ -173,7 +175,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
 
     /* Delete */
     item = new wxMenuItem( editMenu, ID_SCHEMATIC_DELETE_ITEM_BUTT,
-                           _( "Delete" ), _( "Delete items" ), wxITEM_NORMAL );
+                           _( "Delete" ), HELP_DELETE_ITEMS, wxITEM_NORMAL );
     item->SetBitmap( delete_body_xpm );
     editMenu->Append( item );
 
@@ -183,7 +185,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     /* Find */
     text = AddHotkeyName( _( "&Find" ), s_Schematic_Hokeys_Descr, HK_FIND_ITEM );
     item = new wxMenuItem( editMenu, ID_FIND_ITEMS, text,
-                           _( "Find components and texts" ), wxITEM_NORMAL );
+                           HELP_FIND, wxITEM_NORMAL );
     item->SetBitmap( find_xpm );
     editMenu->Append( item );
 
@@ -217,14 +219,14 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
      */
     /* Zoom in */
     text  =_( "Zoom In" );
-    item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, _( "Zoom In" ),
+    item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN,
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_in_xpm );
     viewMenu->Append( item );
 
     /* Zoom out */
     text = _( "Zoom Out" );
-    item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, _( "Zoom Out" ),
+    item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT,
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_out_xpm );
     viewMenu->Append( item );
@@ -234,8 +236,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
                           HK_ZOOM_AUTO );
 
     item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text,
-                           _( "Fit the schematic sheet on the screen" ),
-                           wxITEM_NORMAL );
+                           HELP_ZOOM_FIT, wxITEM_NORMAL );
     item->SetBitmap( zoom_auto_xpm );
     viewMenu->Append( item );
 
@@ -246,8 +247,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
                           HK_ZOOM_REDRAW );
 
     item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text,
-                           _( "Redraw the schematic view" ),
-                           wxITEM_NORMAL );
+                           HELP_ZOOM_REDRAW, wxITEM_NORMAL );
     item->SetBitmap( zoom_redraw_xpm );
     viewMenu->Append( item );
 
@@ -261,51 +261,51 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
 
     /* Component */
     item = new wxMenuItem( placeMenu, ID_COMPONENT_BUTT, _( "&Component" ),
-                           _( "Place the component" ), wxITEM_NORMAL );
+                           HELP_PLACE_COMPONENTS, wxITEM_NORMAL );
     item->SetBitmap( add_component_xpm );
     placeMenu->Append( item );
 
     /* Power port */
     item = new wxMenuItem( placeMenu, ID_PLACE_POWER_BUTT, _( "&Power port" ),
-                           _( "Place the power port" ), wxITEM_NORMAL );
+                           HELP_PLACE_POWERPORT, wxITEM_NORMAL );
     item->SetBitmap( add_power_xpm );
     placeMenu->Append( item );
 
     /* Wire */
     item = new wxMenuItem( placeMenu, ID_WIRE_BUTT, _( "&Wire" ),
-                           _( "Place the wire" ), wxITEM_NORMAL );
+                           HELP_PLACE_WIRE, wxITEM_NORMAL );
     item->SetBitmap( add_line_xpm );
     placeMenu->Append( item );
 
     /* Bus */
     item = new wxMenuItem( placeMenu, ID_BUS_BUTT,  _( "&Bus" ),
-                           _( "Place bus" ), wxITEM_NORMAL );
+                           HELP_PLACE_BUS, wxITEM_NORMAL );
     item->SetBitmap( add_bus_xpm );
     placeMenu->Append( item );
 
     /* Wire to Bus */
     item = new wxMenuItem( placeMenu, ID_WIRETOBUS_ENTRY_BUTT,
                            _( "W&ire to bus entry" ),
-                           _( "Place a wire to bus entry" ), wxITEM_NORMAL );
+                           HELP_PLACE_WIRE2BUS_ENTRY, wxITEM_NORMAL );
     item->SetBitmap( add_line2bus_xpm );
     placeMenu->Append( item );
 
     /* Bus to Bus */
     item = new wxMenuItem( placeMenu, ID_BUSTOBUS_ENTRY_BUTT,
                            _( "B&us to bus entry" ),
-                           _( "Place a bus to bus entry" ), wxITEM_NORMAL );
+                           HELP_PLACE_BUS2BUS_ENTRY, wxITEM_NORMAL );
     item->SetBitmap( add_bus2bus_xpm );
     placeMenu->Append( item );
 
     /* No connect flag */
     item = new wxMenuItem( placeMenu, ID_NOCONN_BUTT,  _( "No connect flag" ),
-                           _( "Place a no connect flag" ), wxITEM_NORMAL );
+                           HELP_PLACE_NC_FLAG, wxITEM_NORMAL );
     item->SetBitmap( noconn_button );
     placeMenu->Append( item );
 
     /* Net name */
     item = new wxMenuItem( placeMenu, ID_LABEL_BUTT, _( "Label" ),
-                           _( "Place net name" ), wxITEM_NORMAL  );
+                           HELP_PLACE_NETLABEL, wxITEM_NORMAL  );
     item->SetBitmap( add_line_label_xpm );
     placeMenu->Append( item );
 
@@ -318,7 +318,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
 
     /* Junction */
     item = new wxMenuItem( placeMenu, ID_JUNCTION_BUTT, _( "Junction" ),
-                           _( "Place junction" ), wxITEM_NORMAL );
+                           HELP_PLACE_JUNCTION, wxITEM_NORMAL );
     item->SetBitmap( add_junction_xpm );
     placeMenu->Append( item );
 
@@ -328,31 +328,28 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     /* Hierarchical label */
     item = new wxMenuItem( placeMenu, ID_HIERLABEL_BUTT,
                            _( "Hierarchical label" ),
-                           _( "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ),
-                           wxITEM_NORMAL );
+                           HELP_PLACE_HIER_LABEL, wxITEM_NORMAL );
     item->SetBitmap( add_hierarchical_label_xpm );
     placeMenu->Append( item );
 
     /* Hierarchical sheet */
     item = new wxMenuItem( placeMenu, ID_SHEET_SYMBOL_BUTT,
                            _( "Hierarchical sheet" ),
-                           _( "Create a hierarchical sheet" ), wxITEM_NORMAL );
+                           HELP_PLACE_SHEET, wxITEM_NORMAL );
     item->SetBitmap( add_hierarchical_subsheet_xpm );
     placeMenu->Append( item );
 
     /* Import hierarchical sheet */
     item = new wxMenuItem( placeMenu, ID_IMPORT_HLABEL_BUTT,
                            _( "Import Hierarchical Label" ),
-                           _( "Place a pin sheet created by importing a hierarchical label from sheet" ),
-                           wxITEM_NORMAL );
+                           HELP_IMPORT_PINSHEET, wxITEM_NORMAL );
     item->SetBitmap( import_hierarchical_label_xpm );
     placeMenu->Append( item );
 
     /* Add hierarchical Pin to Sheet */
     item = new wxMenuItem( placeMenu, ID_SHEET_LABEL_BUTT,
                            _( "Add Hierarchical Pin to Sheet" ),
-                           _( "Place a hierarchical pin to sheet" ),
-                           wxITEM_NORMAL );
+                           HELP_PLACE_PINSHEET, wxITEM_NORMAL );
     item->SetBitmap( add_hierar_pin_xpm );
     placeMenu->Append( item );
 
@@ -362,16 +359,14 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     /* Graphic line or polygon */
     item = new wxMenuItem( placeMenu, ID_LINE_COMMENT_BUTT,
                            _( "Graphic line or polygon" ),
-                           _( "Place graphic lines or polygons" ),
-                           wxITEM_NORMAL );
+                           HELP_PLACE_GRAPHICLINES, wxITEM_NORMAL );
     item->SetBitmap( add_dashed_line_xpm );
     placeMenu->Append( item );
 
     /* Graphic text */
     item = new wxMenuItem( placeMenu, ID_TEXT_COMMENT_BUTT,
                            _( "Graphic text" ),
-                           _( "Place graphic text for comment" ),
-                           wxITEM_NORMAL );
+                           HELP_PLACE_GRAPHICTEXTS, wxITEM_NORMAL );
     item->SetBitmap( add_text_xpm );
     placeMenu->Append( item );
 

eeschema/menubar_libedit.cpp

@@ -14,6 +14,8 @@
 #include "eeschema_id.h"
 #include "hotkeys.h"
 
+#include "help_common_strings.h"
+
 /**
  * @brief Create or update the menubar for the Component Editor frame
  */
@@ -92,7 +94,7 @@ void WinEDA_LibeditFrame::ReCreateMenuBar()
 
     /* Delete */
     item = new wxMenuItem( editMenu, ID_LIBEDIT_DELETE_ITEM_BUTT,
-                           _( "Delete" ), _( "Delete items" ), wxITEM_NORMAL );
+                           _( "Delete" ), HELP_DELETE_ITEMS, wxITEM_NORMAL );
     item->SetBitmap( delete_body_xpm );
     editMenu->Append( item );
 
@@ -114,14 +116,14 @@ void WinEDA_LibeditFrame::ReCreateMenuBar()
      */
     /* Zoom in */
     text  =_( "Zoom In" );
-    item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, _( "Zoom In" ),
+    item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN,
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_in_xpm );
     viewMenu->Append( item );
 
     /* Zoom out */
     text = _( "Zoom Out" );
-    item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, _( "Zoom Out" ),
+    item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT,
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_out_xpm );
     viewMenu->Append( item );
@@ -131,8 +133,7 @@ void WinEDA_LibeditFrame::ReCreateMenuBar()
                           HK_ZOOM_AUTO );
 
     item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text,
-                           _( "Fit the schematic sheet on the screen" ),
-                           wxITEM_NORMAL );
+                           HELP_ZOOM_FIT, wxITEM_NORMAL );
     item->SetBitmap( zoom_auto_xpm );
     viewMenu->Append( item );
 
@@ -143,8 +144,7 @@ void WinEDA_LibeditFrame::ReCreateMenuBar()
                           HK_ZOOM_REDRAW );
 
     item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text,
-                           _( "Redraw the schematic view" ),
-                           wxITEM_NORMAL );
+                           HELP_ZOOM_REDRAW, wxITEM_NORMAL );
     item->SetBitmap( zoom_redraw_xpm );
     viewMenu->Append( item );
 
@@ -156,30 +156,28 @@ void WinEDA_LibeditFrame::ReCreateMenuBar()
 
     /* Pin */
     item = new wxMenuItem( placeMenu, ID_LIBEDIT_PIN_BUTT, _( "&Pin" ),
-                           _( "Add pins to the component" ), wxITEM_NORMAL );
+                           HELP_ADD_PIN, wxITEM_NORMAL );
     item->SetBitmap( pin_xpm );
     placeMenu->Append( item );
 
     /* Graphic text */
     item = new wxMenuItem( placeMenu, ID_LIBEDIT_BODY_TEXT_BUTT,
                            _( "Graphic text" ),
-                           _( "Add graphic texts to the component body" ),
-                           wxITEM_NORMAL );
+                           HELP_ADD_BODYTEXT, wxITEM_NORMAL );
     item->SetBitmap( add_text_xpm );
     placeMenu->Append( item );
 
     /* Graphic rectangle */
     item = new wxMenuItem( placeMenu, ID_LIBEDIT_BODY_RECT_BUTT,
                            _( "Rectangle" ),
-                           _( "Add graphic rectangles to the component body" ),
-                           wxITEM_NORMAL );
+                           HELP_ADD_BODYRECT, wxITEM_NORMAL );
     item->SetBitmap( add_rectangle_xpm );
     placeMenu->Append( item );
 
     /* Graphic Circle */
     item = new wxMenuItem( placeMenu, ID_LIBEDIT_BODY_CIRCLE_BUTT,
                            _( "Circle" ),
-                           _( "Add circles to the component body" ),
+                           HELP_ADD_BODYCIRCLE,
                            wxITEM_NORMAL );
     item->SetBitmap( add_circle_xpm );
     placeMenu->Append( item );
@@ -187,16 +185,14 @@ void WinEDA_LibeditFrame::ReCreateMenuBar()
     /* Graphic Arc */
     item = new wxMenuItem( placeMenu, ID_LIBEDIT_BODY_ARC_BUTT,
                            _( "Arc" ),
-                           _( "Add arcs to the component body" ),
-                           wxITEM_NORMAL );
+                           HELP_ADD_BODYARC, wxITEM_NORMAL );
     item->SetBitmap( add_arc_xpm );
     placeMenu->Append( item );
 
     /* Graphic line or polygon */
     item = new wxMenuItem( placeMenu, ID_LIBEDIT_BODY_LINE_BUTT,
                            _( "Line or Polygon" ),
-                           _( "Add lines and polygons to the component body" ),
-                           wxITEM_NORMAL );
+                           HELP_ADD_BODYPOLYGON, wxITEM_NORMAL );
     item->SetBitmap( add_polygon_xpm );
     placeMenu->Append( item );
 

eeschema/tool_lib.cpp

@@ -13,6 +13,8 @@
 #include "protos.h"
 #include "libeditframe.h"
 
+#include "help_common_strings.h"
+
 #ifdef __UNIX__
 #define LISTBOX_WIDTH 140
 #else
@@ -40,27 +42,27 @@ void WinEDA_LibeditFrame::ReCreateVToolbar()
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_LIBEDIT_PIN_BUTT, wxEmptyString,
                          wxBitmap( pin_xpm ),
-                         _( "Add pin" ), wxITEM_CHECK  );
+                         HELP_ADD_PIN, wxITEM_CHECK  );
 
     m_VToolBar->AddTool( ID_LIBEDIT_BODY_TEXT_BUTT, wxEmptyString,
                          wxBitmap( add_text_xpm ),
-                         _( "Add graphic text" ), wxITEM_CHECK  );
+                         HELP_ADD_BODYTEXT, wxITEM_CHECK  );
 
     m_VToolBar->AddTool( ID_LIBEDIT_BODY_RECT_BUTT, wxEmptyString,
                          wxBitmap( add_rectangle_xpm ),
-                         _( "Add rectangle" ), wxITEM_CHECK );
+                         HELP_ADD_BODYRECT, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_LIBEDIT_BODY_CIRCLE_BUTT, wxEmptyString,
                          wxBitmap( add_circle_xpm ),
-                         _( "Add circle" ), wxITEM_CHECK  );
+                         HELP_ADD_BODYCIRCLE, wxITEM_CHECK  );
 
     m_VToolBar->AddTool( ID_LIBEDIT_BODY_ARC_BUTT, wxEmptyString,
                          wxBitmap( add_arc_xpm ),
-                         _( "Add arc" ), wxITEM_CHECK  );
+                         HELP_ADD_BODYARC, wxITEM_CHECK  );
 
     m_VToolBar->AddTool( ID_LIBEDIT_BODY_LINE_BUTT, wxEmptyString,
                          wxBitmap( add_polygon_xpm ),
-                         _( "Add lines and polygons" ), wxITEM_CHECK  );
+                         HELP_ADD_BODYPOLYGON, wxITEM_CHECK  );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_LIBEDIT_ANCHOR_ITEM_BUTT, wxEmptyString,
@@ -79,7 +81,7 @@ void WinEDA_LibeditFrame::ReCreateVToolbar()
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_LIBEDIT_DELETE_ITEM_BUTT, wxEmptyString,
                          wxBitmap( delete_body_xpm ),
-                         _( "Delete items" ), wxITEM_CHECK  );
+                         HELP_DELETE_ITEMS, wxITEM_CHECK  );
 
     m_VToolBar->Realize();
 }
@@ -156,20 +158,20 @@ void WinEDA_LibeditFrame::ReCreateHToolbar()
                          _( "Test for duplicate pins and off grid pins" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Zoom in" ), s_Libedit_Hokeys_Descr, HK_ZOOM_IN, false );
+    msg = AddHotkeyName( HELP_ZOOM_IN, s_Libedit_Hokeys_Descr, HK_ZOOM_IN, false );
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, wxBitmap( zoom_in_xpm ),
                          msg );
 
-    msg = AddHotkeyName( _( "Zoom out" ), s_Libedit_Hokeys_Descr, HK_ZOOM_OUT, false );
+    msg = AddHotkeyName( HELP_ZOOM_OUT, s_Libedit_Hokeys_Descr, HK_ZOOM_OUT, false );
     m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, wxBitmap( zoom_out_xpm ),
                          msg );
 
-    msg = AddHotkeyName( _( "Redraw view" ), s_Libedit_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_ZOOM_REDRAW, s_Libedit_Hokeys_Descr,
                          HK_ZOOM_REDRAW, false );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString,
                          wxBitmap( zoom_redraw_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Zoom auto" ), s_Libedit_Hokeys_Descr, HK_ZOOM_AUTO, false );
+    msg = AddHotkeyName( HELP_ZOOM_FIT, s_Libedit_Hokeys_Descr, HK_ZOOM_AUTO, false );
     m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString,
                          wxBitmap( zoom_auto_xpm ), msg );
 

eeschema/tool_sch.cpp

@@ -14,6 +14,8 @@
 #include "hotkeys.h"
 #include "eeschema_id.h"
 
+#include "help_common_strings.h"
+
 
 /* Create  the main Horizontal Toolbar for the schematic editor
  */
@@ -65,12 +67,12 @@ void WinEDA_SchematicFrame::ReCreateHToolbar()
                          _( "Paste" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Undo last edition" ), s_Schematic_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_UNDO, s_Schematic_Hokeys_Descr,
                          HK_UNDO, false );
     m_HToolBar->AddTool( wxID_UNDO, wxEmptyString,
                          wxBitmap( undo_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Redo the last undo command" ),
+    msg = AddHotkeyName( HELP_REDO,
                          s_Schematic_Hokeys_Descr, HK_REDO, false );
     m_HToolBar->AddTool( wxID_REDO, wxEmptyString,
                          wxBitmap( redo_xpm ), msg );
@@ -87,27 +89,27 @@ void WinEDA_SchematicFrame::ReCreateHToolbar()
                          _( "Run pcbnew" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Zoom in" ), s_Schematic_Hokeys_Descr, HK_ZOOM_IN, false );
+    msg = AddHotkeyName( HELP_ZOOM_IN, s_Schematic_Hokeys_Descr, HK_ZOOM_IN, false );
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, wxBitmap( zoom_in_xpm ),
                          msg );
 
-    msg = AddHotkeyName( _( "Zoom out" ), s_Schematic_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_ZOOM_OUT, s_Schematic_Hokeys_Descr,
                          HK_ZOOM_OUT, false );
     m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, wxBitmap( zoom_out_xpm ),
                          msg );
 
-    msg = AddHotkeyName( _( "Redraw view" ), s_Schematic_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_ZOOM_REDRAW, s_Schematic_Hokeys_Descr,
                          HK_ZOOM_REDRAW, false );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString,
                          wxBitmap( zoom_redraw_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Zoom auto" ), s_Schematic_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_ZOOM_FIT, s_Schematic_Hokeys_Descr,
                          HK_ZOOM_AUTO, false );
     m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ),
                          msg );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Find components and texts" ), s_Schematic_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_FIND, s_Schematic_Hokeys_Descr,
                          HK_FIND_ITEM, false );
     m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, wxBitmap( find_xpm ),
                          msg );
@@ -157,79 +159,77 @@ void WinEDA_SchematicFrame::ReCreateVToolbar()
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_COMPONENT_BUTT, wxEmptyString,
                          wxBitmap( add_component_xpm ),
-                         _( "Place a component" ), wxITEM_CHECK );
+                         HELP_PLACE_COMPONENTS, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_PLACE_POWER_BUTT, wxEmptyString,
                          wxBitmap( add_power_xpm ),
-                         _( "Place a power port" ), wxITEM_CHECK );
+                         HELP_PLACE_POWERPORT, wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_WIRE_BUTT, wxEmptyString,
                          wxBitmap( add_line_xpm ),
-                         _( "Place a wire" ), wxITEM_CHECK );
+                         HELP_PLACE_WIRE, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_BUS_BUTT, wxEmptyString,
                          wxBitmap( add_bus_xpm ),
-                         _( "Place a bus" ), wxITEM_CHECK );
+                         HELP_PLACE_BUS, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_WIRETOBUS_ENTRY_BUTT, wxEmptyString,
                          wxBitmap( add_line2bus_xpm ),
-                         _( "Place a wire to bus entry" ), wxITEM_CHECK );
+                         HELP_PLACE_WIRE2BUS_ENTRY, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_BUSTOBUS_ENTRY_BUTT, wxEmptyString,
                          wxBitmap( add_bus2bus_xpm ),
-                         _( "Place a bus to bus entry" ), wxITEM_CHECK );
+                         HELP_PLACE_BUS2BUS_ENTRY, wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_NOCONN_BUTT, wxEmptyString,
                          wxBitmap( noconn_button ),
-                         _( "Place no connect flag" ), wxITEM_CHECK );
+                         HELP_PLACE_NC_FLAG, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_LABEL_BUTT, wxEmptyString,
                          wxBitmap( add_line_label_xpm ),
-                         _( "Place net name" ), wxITEM_CHECK );
+                         HELP_PLACE_NETLABEL, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_GLABEL_BUTT, wxEmptyString,
                          wxBitmap( add_glabel_xpm ),
-                         _( "Place a global label.\nWarning: all global labels with the same name are connected in whole hierarchy" ),
+                         HELP_PLACE_GLOBALLABEL,
                          wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_JUNCTION_BUTT, wxEmptyString,
                          wxBitmap( add_junction_xpm ),
-                         _( "Place a junction" ), wxITEM_CHECK );
+                         HELP_PLACE_JUNCTION, wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_HIERLABEL_BUTT, wxEmptyString,
                          wxBitmap( add_hierarchical_label_xpm ),
-                         _( "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ),
-                         wxITEM_CHECK );
+                         HELP_PLACE_HIER_LABEL, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_SHEET_SYMBOL_BUTT, wxEmptyString,
                          wxBitmap( add_hierarchical_subsheet_xpm ),
-                         _( "Place hierarchical sheet" ), wxITEM_CHECK );
+                         HELP_PLACE_SHEET, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_IMPORT_HLABEL_BUTT, wxEmptyString,
                          wxBitmap( import_hierarchical_label_xpm ),
-                         _( "Place a pin sheet, imported from the corresponding hierarchical label in sheet" ),
-                         wxITEM_CHECK );
+                         HELP_IMPORT_PINSHEET, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_SHEET_LABEL_BUTT, wxEmptyString,
                          wxBitmap( add_hierar_pin_xpm ),
-                         _( "Place hierarchical pin to sheet" ), wxITEM_CHECK );
+                         HELP_PLACE_PINSHEET, wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_LINE_COMMENT_BUTT, wxEmptyString,
                          wxBitmap( add_dashed_line_xpm ),
-                         _( "Place graphic line or polygon" ), wxITEM_CHECK );
+                         HELP_PLACE_GRAPHICLINES, wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_TEXT_COMMENT_BUTT, wxEmptyString,
                          wxBitmap( add_text_xpm ),
-                         _( "Place graphic text (comment)" ), wxITEM_CHECK );
+                         HELP_PLACE_GRAPHICTEXTS, wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_SCHEMATIC_DELETE_ITEM_BUTT, wxEmptyString,
                          wxBitmap( delete_body_xpm ),
-                         _( "Delete items" ), wxITEM_CHECK );
+                         HELP_DELETE_ITEMS, wxITEM_CHECK );
 
     m_VToolBar->Realize();
     SetToolbars();

pcbnew/help_common_strings.h

+/**
+ * @file help_common_strings.h
+ * strings common to toolbars and menubar
+ */
+
+/**
+ * These strings are used in menus and tools, that do the same command
+ * But they are internatinalized, and therefore must be created
+ * at run time, on the fly.
+ * So they cannot be static.
+ *
+ * Therefore they are defined by #define, used inside menu constructors
+ */
+
+#define HELP_UNDO _( "Undo last edition" )
+#define HELP_REDO _( "Redo the last undo command" )
+#define HELP_FIND _( "Find components and text in current loaded board" )
+
+#define HELP_ZOOM_IN     _( "Zoom in" )
+#define HELP_ZOOM_OUT    _( "Zoom out" )
+#define HELP_ZOOM_FIT    _( "Zoom to fit the board on the screen" )
+#define HELP_ZOOM_REDRAW _( "Redraw the screen of the board" )
+
+#define HELP_SHOW_HIDE_LAYERMANAGER _( "Show/hide the layers manager toolbar" )

pcbnew/menubar_pcbframe.cpp

@@ -12,6 +12,8 @@
 #include "hotkeys.h"
 #include "pcbnew_id.h"
 
+#include "help_common_strings.h"
+
 /**
  * PCBNew mainframe menubar
  */
@@ -249,14 +251,14 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
     /* Undo */
     text  = AddHotkeyName( _( "Undo" ), s_Pcbnew_Editor_Hokeys_Descr, HK_UNDO );
     item = new wxMenuItem( editMenu, wxID_UNDO, text,
-                           _( "Undo last edition" ), wxITEM_NORMAL );
+                           HELP_UNDO, wxITEM_NORMAL );
     item->SetBitmap( undo_xpm );
     editMenu->Append( item );
 
     /* Redo */
     text  = AddHotkeyName( _( "Redo" ), s_Pcbnew_Editor_Hokeys_Descr, HK_REDO );
     item = new wxMenuItem( editMenu, wxID_REDO, text,
-                           _( "Redo the last undo command" ), wxITEM_NORMAL );
+                           HELP_REDO, wxITEM_NORMAL );
     item->SetBitmap( redo_xpm );
     editMenu->Append( item );
 
@@ -265,8 +267,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Find */
     text = AddHotkeyName( _( "&Find" ), s_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM );
-    item = new wxMenuItem( editMenu, ID_FIND_ITEMS, text,
-                           _( "Find components and text in current loaded board" ) );
+    item = new wxMenuItem( editMenu, ID_FIND_ITEMS, text, HELP_FIND );
     item->SetBitmap( find_xpm );
     editMenu->Append( item );
 
@@ -313,14 +314,14 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
      */
     /* Zoom in */
     text = _( "Zoom In" );
-    item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, _( "Zoom In" ),
+    item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN,
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_in_xpm );
     viewMenu->Append( item );
 
     /* Zoom out */
-    text = _( "Zoom out" );
-    item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, _( "Zoom Out" ),
+    text = _( "Zoom Out" );
+    item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT,
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_out_xpm );
     viewMenu->Append( item );
@@ -330,8 +331,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
                           HK_ZOOM_AUTO );
 
     item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text,
-                           _( "Zoom to fit the board on the screen" ),
-                           wxITEM_NORMAL );
+                           HELP_ZOOM_FIT, wxITEM_NORMAL );
     item->SetBitmap( zoom_auto_xpm );
     viewMenu->Append( item );
 
@@ -342,7 +342,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
                           HK_ZOOM_REDRAW );
 
     item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text,
-                           _( "Redraw the screen of the board" ),
+                           HELP_ZOOM_REDRAW,
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_redraw_xpm );
     viewMenu->Append( item );
@@ -381,7 +381,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
     */
     item = new wxMenuItem( configmenu, ID_MENU_PCB_SHOW_HIDE_LAYERS_MANAGER_DIALOG,
                            _( "Hide &Layers Manager" ),
-                           _( "Show/hide the layers manager toolbar" ) );
+                           HELP_SHOW_HIDE_LAYERMANAGER );
     item->SetBitmap( layers_manager_xpm );
     configmenu->Append( item );
 

pcbnew/tool_pcb.cpp

@@ -25,6 +25,8 @@
 
 #include "hotkeys.h"
 
+#include "help_common_strings.h"
+
 #define SEL_LAYER_HELP _( \
         "Show active layer selections\nand select layer pair for route and place via" )
 
@@ -213,9 +215,9 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
 
     m_HToolBar->AddSeparator();
     m_HToolBar->AddTool( wxID_UNDO, wxEmptyString, wxBitmap( undo_xpm ),
-                         _( "Undo last edition" ) );
+                         HELP_UNDO );
     m_HToolBar->AddTool( wxID_REDO, wxEmptyString, wxBitmap( redo_xpm ),
-                         _( "Redo the last undo command" ) );
+                         HELP_REDO );
 
     m_HToolBar->AddSeparator();
     m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, wxBitmap( print_button ),
@@ -224,28 +226,28 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
                          _( "Plot (HPGL, PostScript, or GERBER format)" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Zoom in" ), s_Board_Editor_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_ZOOM_IN, s_Board_Editor_Hokeys_Descr,
                          HK_ZOOM_IN, false );
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, wxBitmap( zoom_in_xpm ),
                          msg );
 
-    msg = AddHotkeyName( _( "Zoom out" ), s_Board_Editor_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_ZOOM_OUT, s_Board_Editor_Hokeys_Descr,
                          HK_ZOOM_OUT, false );
     m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString,
                          wxBitmap( zoom_out_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Redraw view" ), s_Board_Editor_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_ZOOM_REDRAW, s_Board_Editor_Hokeys_Descr,
                          HK_ZOOM_REDRAW, false );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString,
                          wxBitmap( zoom_redraw_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Zoom auto" ), s_Board_Editor_Hokeys_Descr,
+    msg = AddHotkeyName( HELP_ZOOM_FIT, s_Board_Editor_Hokeys_Descr,
                          HK_ZOOM_AUTO, false );
     m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString,
                          wxBitmap( zoom_auto_xpm ), msg );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Find components and texts" ),
+    msg = AddHotkeyName( HELP_FIND, // Find components and texts
                          s_Board_Editor_Hokeys_Descr,
                          HK_FIND_ITEM, false );
     m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, wxBitmap( find_xpm ),
@@ -278,7 +280,7 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
     m_HToolBar->AddSeparator();
     m_HToolBar->AddTool( ID_TOOLBARH_PCB_FREEROUTE_ACCESS, wxEmptyString,
                          wxBitmap( web_support_xpm ),
-                         _( "Fast access to theWeb Based FreeROUTE advanced router" ) );
+                         _( "Fast access to the Web Based FreeROUTE advanced router" ) );
 
     // after adding the buttons to the toolbar, must call Realize() to reflect
     // the changes
@@ -373,8 +375,7 @@ void WinEDA_PcbFrame::ReCreateOptToolbar()
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
                                     wxEmptyString,
                                     wxBitmap( layers_manager_xpm ),
-                                    _(
-                                    "Show/hide the layers manager toolbar" ),
+                                    HELP_SHOW_HIDE_LAYERMANAGER,
                                     wxITEM_CHECK );
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1,
                                wxEmptyString,