Commit caa4246cd8b319d99119b7dc6dd30b07eef9d1c8

Thomas de Grivel 2023-01-21T15:08:40

help2man-1.38.1

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
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
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
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
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
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
diff --git a/INSTALL b/INSTALL
index 2550dab..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,10 @@ Installation Instructions
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@ Basic Installation
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@ Installation Names
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -288,7 +351,7 @@ operates.
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
diff --git a/Makefile.in b/Makefile.in
index b26e052..121b4cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,5 @@
 # Makefile for help2man
 
-SHELL = @SHELL@
-VPATH = @srcdir@
-
 srcdir = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -15,6 +12,9 @@ datadir = @datadir@
 infodir = @infodir@
 localedir = $(datadir)/locale
 
+export SHELL = @SHELL@
+export VPATH = .:$(srcdir)
+
 DESTDIR =
 LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
 
@@ -32,6 +32,10 @@ MKINSTALLDIRS = $(srcdir)/mkinstalldirs
 target = help2man
 preload = bindtextdomain
 
+# find file in vpath
+vpath_file = $$($(PERL) -e 'print +(grep -f, map "$$_/$$ARGV[0]", \
+    map +(length) ? $$_ : ".", split ":", $$ENV{VPATH} || ".")[0]' $(1))
+
 all: $(target) man info @extra_make_all@
 
 install: all install_base @extra_make_install@
@@ -42,28 +46,28 @@ install_base:
 	$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
 
 	$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)
-	$(INSTALL_DATA) $(srcdir)/$(target).1 $(DESTDIR)$(mandir)/man1
-	$(INSTALL_DATA) $(srcdir)/$(target).info \
+	$(INSTALL_DATA) $(call vpath_file,$(target).1) $(DESTDIR)$(mandir)/man1
+	$(INSTALL_DATA) $(call vpath_file,/$(target).info) \
 	    $(DESTDIR)$(infodir)/$(target).info
 
 	if test -f $(DESTDIR)$(infodir)/dir; \
 	then \
 	    $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) \
-		$(srcdir)/$(target).info; \
+		$(DESTDIR)$(infodir)/$(target).info; \
 	fi
 
 install_preload: preload
 	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(libdir)
 
-install_l10n: man_l10n
+install_l10n: msg_l10n man_l10n
 	for lang in $(LINGUAS); \
 	do \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/$$lang/man1; \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
-	    $(INSTALL_DATA) $(srcdir)/$(target).$$lang.1 \
-		$(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \
-	    $(INSTALL_DATA) $(srcdir)/po/$$lang.gmo \
+	    $(INSTALL_DATA) $(call vpath_file,po/$$lang.gmo) \
 		$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(target).mo; \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/$$lang/man1; \
+	    $(INSTALL_DATA) $(call vpath_file,$(target).$$lang.1) \
+		$(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \
 	done
 
 uninstall:
@@ -81,7 +85,7 @@ uninstall:
 	fi
 
 clean:
-	-rm -f $(target) $(preload).so
+	-rm -f $(target) $(target).h2m $(target).*.h2m $(preload).so
 	-rm -rf localetmp
 
 mostlyclean: clean
@@ -101,29 +105,45 @@ maintainer-clean: realclean
 $(target): $(srcdir)/$(target).PL
 	$(PERL) $? @extra_extract_args@
 
+$(target).h2m: $(srcdir)/$(target).h2m.PL
+	$(PERL) $?
+
 preload: $(preload).so
 $(preload).so: $(srcdir)/$(preload).c
 	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
 
 man: $(target).1
-$(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m
-	$(MAKE) $(target)
-	./$(target) --include=$(srcdir)/$(target).h2m \
-	    --output=$@ ./$(target)
+$(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL
+	$(MAKE) $(target).h2m
+	./$(target) --include=$(target).h2m --output=$@ ./$(target)
+
+msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(LINGUAS)))
+po/%.gmo: $(srcdir)/po/%.po
+	test -d po || mkdir po
+	$(MSGFMT) -o $@ $?
+
+localetmp/%/LC_MESSAGES/$(target).mo: po/%.gmo
+	lang=$(patsubst localetmp/%/LC_MESSAGES/$(target).mo,%,$@); \
+	$(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \
+	$(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo
 
 man_l10n: $(addprefix $(target).,$(addsuffix .1,$(LINGUAS)))
-$(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).%.h2m $(srcdir)/po/%.po
+$(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL \
+    $(srcdir)/po/%.po
 	lang=$(patsubst $(target).%.1,%,$@); \
-	$(MAKE) $(target) $(preload).so po/$$lang.gmo && \
-	$(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \
-	$(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo && \
+	$(MAKE) $(preload).so localetmp/$$lang/LC_MESSAGES/$(target).mo \
+	    $(target).$$lang.h2m; \
 	LD_PRELOAD=./$(preload).so LOCALEDIR=localetmp TEXTDOMAIN=help2man \
-	    ./$(target) --include=$(srcdir)/$(target).$$lang.h2m \
+	    ./$(target) --include=$(call vpath_file,$(target).$$lang.h2m) \
 		--output=$@ ./$(target)
 
-po/%.gmo: $(srcdir)/po/%.po
-	test -d po || mkdir po
-	$(MSGFMT) -o $@ $?
+$(target).%.h2m: $(srcdir)/$(target).h2m.PL $(srcdir)/po/%.po
+	lang=$(patsubst $(target).%.h2m,%,$@); \
+	locale=$$(echo $$lang $$lang | \
+	     sed -n "/^$$lang"'\s/{s/^\S\+\s\+//p; q}' $(srcdir)/locales -); \
+	$(MAKE) localetmp/$$lang/LC_MESSAGES/$(target).mo; \
+	$(PERL) $(srcdir)/$(target).h2m.PL --locale="$$locale" \
+	    --message-dir=localetmp --output=$@
 
 info: $(target).info
 $(target).info: $(srcdir)/$(target).texi
@@ -143,11 +163,11 @@ update-po: $(srcdir)/po/$(target).pot
 	    msgmerge -U $(srcdir)/po/$$lang.po $(srcdir)/po/$(target).pot; \
 	done
 
-$(srcdir)/po/$(target).pot: $(target)
-	xgettext -L Perl -k_ -kN_ \
-	    --msgid-bugs-address="Brendan O'Dea <bug-help2man@gnu.org>" -o $@ $?
+$(srcdir)/po/$(target).pot: $(target) $(target).h2m.PL
+	xgettext -L Perl -k_ -kN_ -cTranslators: \
+	    --msgid-bugs-address="Brendan O'Dea <bug-help2man@gnu.org>" -o $@ $^
 
-.PHONY: all clean distclean preload man man_l10n info dvi install \
+.PHONY: all clean distclean preload man msg_l10n man_l10n info dvi install \
     install_base install_preload install_l10n mostlyclean realclean \
     uninstall
 
diff --git a/NEWS b/NEWS
index 5afed49..de63294 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Version 1.38		April 26, 2010
+
+  * Support ENVIRONMENT and FILES sections.
+  * Move all translated text into .po files (previously .h2m include
+    files were handled seperately).
+  * Submit package to the Translation Project (translationproject.org).
+  * Add Vietnamese translation.
+  * Add some comments for translators.
+
 Version 1.37		November 14, 2009
 
   * Update GPL to v3.
diff --git a/README b/README
index 48e0171..4f79d0f 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-		README for GNU help2man version 1.37.1
+		README for GNU help2man version 1.38.1
 
 help2man is a script to create simple man pages from the --help and
 --version output of programs.
 
   http://www.gnu.org/software/help2man/
-  ftp://ftp.gnu.org/gnu/help2man/help2man-1.37.1.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.38.1.tar.gz
 
   git://git.debian.org/users/bod/help2man.git
   http://git.debian.org/?p=users/bod/help2man.git
diff --git a/THANKS b/THANKS
index f6dc17d..53cdee7 100644
--- a/THANKS
+++ b/THANKS
@@ -1,6 +1,6 @@
 A list of people who have contributed to the development of `help2man'
-by reporting problems, suggesting various improvements or submitting
-actual code follows.
+by reporting problems, suggesting various improvements and submitting
+code or translations follows.
 
 Denis Barbier			<barbier@debian.org>
 Karl Berry			<karl@freefriends.org>
@@ -19,13 +19,16 @@ Jim Meyering			<jim@meyering.net>
 Lionel Elie Mamane		<lionel@mamane.lu>
 Dave Morrison			<dave@bnl.gov>
 Peter Moulder			<reiter@netspace.net.au>
+Daniel Nylander			<yeager@lidkoping.net>
 François Pinard			<pinard@iro.umontreal.ca>
 Richard Pixley			<rpixley@zhone.com>
+Maciej W. Rozyc			<macro@ds2.pg.gda.pl>
 Andreas Schwab			<schwab@ls5.informatik.uni-dortmund.de>
+Clytie Siddall			<clytie@riverland.net.au>
 suzukis				<suzukis@cmpt.phys.tohoku.ac.jp>
 Reuben Thomas			<rrt@sc3d.org>
 Patrick Tullmann		<tullmann@cs.utah.edu>
-Maciej W. Rozyc			<macro@ds2.pg.gda.pl>
+Sven Utcke			<sven.utcke@gmx.de>
 Tommi Vainikainen		<thv+debian@iki.fi>
 Christopher Yeoh		<cyeoh@users.sourceforge.net>
 Okuji Yoshinori			<okuji@kuicr.kyoto-u.ac.jp>
diff --git a/debian/changelog b/debian/changelog
index b5f63c0..a20f14f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+help2man (1.38.1) unstable; urgency=low
+
+  * Add support for ENVIRONMENT and FILES sections (Sven Utcke).
+  * Ensure THANKS file includes translators.
+  * Fix handling of translated --no-discard-stderr instruction.
+  * Move tranlsated .h2m contents into .po files.
+  * Update Polish translation (thanks to Jakub Bogusz).
+  * Add Vietnamese translation (thanks to Clytie Siddall).
+  * Add some comments for translators.
+
+ -- Brendan O'Dea <bod@debian.org>  Mon, 26 Apr 2010 15:59:32 +1000
+
 help2man (1.37.1) unstable; urgency=low
 
   * Fix typo in comment (Paul Eggert).
diff --git a/debian/rules b/debian/rules
index d590e5c..024b503 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ build-stamp:
 	    --infodir='$${prefix}/share/info' $(CONFARGS)
 
 	$(MAKE)
+	$(MAKE) help2man.h2m # for examples
 	touch build-stamp
 
 clean:
diff --git a/help2man.1 b/help2man.1
index beb4c40..df2207b 100644
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "December 2009" "help2man 1.37.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "April 2010" "help2man 1.38.1" "User Commands"
 .SH NAME
 help2man \- generate a simple manual page
 .SH SYNOPSIS
@@ -96,6 +96,8 @@ The section output order (for those included) is:
     SYNOPSIS
     DESCRIPTION
     OPTIONS
+    ENVIRONMENT
+    FILES
     EXAMPLES
     \fIother\fR
     AUTHOR
@@ -104,9 +106,9 @@ The section output order (for those included) is:
     SEE ALSO
 
 Any
-.B [name]
+.B [NAME]
 or
-.B [synopsis]
+.B [SYNOPSIS]
 sections appearing in the include file will replace what would have
 automatically been produced (although you can still override the
 former with
@@ -126,7 +128,7 @@ Written by Brendan O'Dea <bod@debian.org>
 .SH "REPORTING BUGS"
 Report bugs to <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 .br
 This is free software; see the source for copying conditions.  There is NO
diff --git a/help2man.PL b/help2man.PL
index dbf5aee..420fc3b 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use 5.008;
 use Config;
 use Getopt::Long;
 
-my ($program, $version) = ('help2man', '1.37.1');
+my ($program, $version) = ('help2man', '1.38.1');
 
 my %opts;
 die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n"
@@ -58,7 +58,7 @@ eval 'exec $Config{perlpath} -wS \$0 \${1+"\$@"}'
 print OUT <<'!NO!SUBS!';
 
 # Generate a short man page from --help and --version output.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -78,7 +78,7 @@ print OUT <<'!NO!SUBS!';
 # Written by Brendan O'Dea <bod@debian.org>
 # Available from ftp://ftp.gnu.org/gnu/help2man/
 
-use 5.005;
+use 5.008;
 use strict;
 use Getopt::Long;
 use Text::Tabs qw(expand);
@@ -154,7 +154,7 @@ sub N_ { $_[0] }
 my $version_info = enc_user sprintf _(<<'EOT'), $this_program, $this_version;
 GNU %s %s
 
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -378,6 +378,9 @@ $program =~ s!.*/!!;
 # No info for `info' itself.
 $opt_no_info = 1 if $program eq 'info';
 
+# Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+# upper case are manual page section headings.  The man(1) manual page in your
+# language, if available should provide the conventional translations.
 for ($include{_('NAME')})
 {
     if ($opt_name) # --name overrides --include contents.
@@ -411,6 +414,12 @@ unless ($manual)
 }
 
 # Extract usage clause(s) [if any] for SYNOPSIS.
+# Translators: "Usage" and "or" here are patterns (regular expressions) which
+# are used to match the usage synopsis in program output.  An example from cp
+# (GNU coreutils) which contains both strings:
+#  Usage: cp [OPTION]... [-T] SOURCE DEST
+#    or:  cp [OPTION]... SOURCE... DIRECTORY
+#    or:  cp [OPTION]... -t DIRECTORY SOURCE...
 my $PAT_USAGE = _('Usage');
 my $PAT_USAGE_CONT = _('or');
 if ($help_text =~ s/^($PAT_USAGE):( +(\S+))(.*)((?:\n(?: {6}\1| *($PAT_USAGE_CONT): +\S).*)*)//om)
@@ -464,9 +473,19 @@ s/^\./\x80/mg;
 s/^'/\x81/mg;
 s/\\/\x82/g;
 
-my $PAT_BUGS		= _('Report +(?:[\w-]* +)?bugs|Email +bug +reports +to');
+# Translators: patterns are used to match common program output. In the source
+# these strings are all of the form of "my $PAT_something = _('...');" and are
+# regular expressions.  If there is more than one commonly used string, you
+# may separate alternatives with "|".  Spaces in these expressions are written
+# as " +" to indicate that more than one space may be matched.  The string
+# "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+# optional word, so that either "Report bugs" or "Report _program_ bugs" will
+# be matched.
+my $PAT_BUGS		= _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports +to');
 my $PAT_AUTHOR		= _('Written +by');
 my $PAT_OPTIONS		= _('Options');
+my $PAT_ENVIRONMENT	= _('Environment');
+my $PAT_FILES		= _('Files');
 my $PAT_EXAMPLES	= _('Examples');
 my $PAT_FREE_SOFTWARE	= _('This +is +free +software');
 
@@ -487,6 +506,16 @@ while (length)
 	$sect = _('OPTIONS');
 	next;
     }
+    if (s/^($PAT_ENVIRONMENT): *\n//o)
+    {
+	$sect = _('ENVIRONMENT');
+	next;
+    }
+    if (s/^($PAT_FILES): *\n//o)
+    {
+	$sect = _('FILES');
+	next;
+    }
     elsif (s/^($PAT_EXAMPLES): *\n//o)
     {
 	$sect = _('EXAMPLES');
@@ -674,7 +703,7 @@ EOT
 
 # Section ordering.
 my @pre = (_('NAME'), _('SYNOPSIS'), _('DESCRIPTION'), _('OPTIONS'),
-    _('EXAMPLES'));
+    _('ENVIRONMENT'), _('FILES'), _('EXAMPLES'));
 
 my @post = (_('AUTHOR'), _('REPORTING BUGS'), _('COPYRIGHT'), _('SEE ALSO'));
 my $filter = join '|', @pre, @post;
@@ -721,11 +750,12 @@ sub get_option_value
 
     unless ($value)
     {
-	my $err = N_("%s: can't get `%s' info from %s");
-	$err .= N_("\nTry `--no-discard-stderr' if option outputs to stderr")
-	    if $discard_stderr;
+	my $err = N_("%s: can't get `%s' info from %s%s");
+	my $extra = $discard_stderr
+	    ? "\n" . N_("Try `--no-discard-stderr' if option outputs to stderr")
+	    : '';
 
-	kark $err, $this_program, $opt, $prog;
+	kark $err, $this_program, $opt, $prog, $extra;
     }
 
     return $value;
@@ -760,4 +790,5 @@ unless ($opts{stdout})
 
 exit 0;
 
+# DATA handle used for mtime
 __END__
diff --git a/help2man.de.1 b/help2man.de.1
index 0a40ae7..eae23ba 100644
--- a/help2man.de.1
+++ b/help2man.de.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "Dezember 2009" "help2man 1.37.1" "Benutzerkommandos"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "April 2010" "help2man 1.38.1" "Benutzerkommandos"
 .SH NAME
 help2man \- generiert eine einfache Handbuchseite
 .SH ÃœBERSICHT
@@ -97,23 +97,24 @@ ignoriert und könnte für Kommentare, RCS-Schlüsselwörter oder was
 Sie wollen benutzt werden.
 
 Die Reiehnfolge in der die Abschnitte ausgegeben werden, ist:
-The section output order is:
 
     NAME
     ÃœBERSICHT
     BESCHREIBUNG
     OPTIONEN
+    ENVIRONMENT
+    FILES
     BEISPIELE
     \fIandere\fR
     AUTOR
-    FEHLER BERICHTEN
+    FEHLERBERICHTE
     COPYRIGHT
     SIEHE AUCH
 
 Jeder
-.B [Name]
-or
-.B [Ãœbersicht]
+.B [NAME]
+oder
+.B [ÃœBERSICHT]
 -Abschnitt, der in der eingefügten Datei erscheint, wird das
 ersetzen, was automatisch generiert würde (obwohl Sie das
 weitere immer noch, wenn nötigt, mit
@@ -134,7 +135,7 @@ Geschrieben von Brendan O'Dea <bod@debian.org>
 .SH FEHLERBERICHTE
 Berichten Sie Fehler an <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 .br
 Dies ist freie Software. Lesen Sie die Quelle, um die Kopierbedingungen
diff --git a/help2man.de.h2m b/help2man.de.h2m
deleted file mode 100644
index 1aebf64..0000000
--- a/help2man.de.h2m
+++ /dev/null
@@ -1,80 +0,0 @@
-Encoding charset: UTF-8
-Language: German
-Locale: de_DE
-Translator: Chris Leick <c.leick@vollbio.de>
-
-Include-Datei für die help2man-Handbuchseite
-
---locale=de_DE.UTF-8
-
-[Name]
-help2man \- generiert eine einfache Handbuchseite
-
-[Dateien zum Einfügen]
-Zusätzliches Material kann in die generierte Ausgabe mit den
-.B \-\-include
-und
-.B \-\-opt\-include
-Optionen eingefügt werden. Das Format ist einfach:
-
-    [Abschnitt]
-    Text
-
-    /Muster/
-    Text
-
-Blöcke aus wörtlichem *roff-Text werden entweder beim Start durch
-Angabe von
-.BI [ Abschnitt ]
-(unabhängig von Groß-/Kleinschreibung) in die Ausgabe eingefügt oder
-nach einen passenden Absatz
-.BI / Muster /\fR.
-
-Muster benutzen die Syntax von regulären Perl-Ausdrücken und können
-von
-.IR i ,
-.I s
-oder
-.I m
-Bestimmungswörtern gefolgt sein (siehe
-.BR perlre (1)).
-
-Zeilen vor dem ersten Abschnitt oder Muster, die mit »\-« beginnen,
-werden als Optionen behandelt. Alles andere wird stillschweigend
-ignoriert und könnte für Kommentare, RCS-Schlüsselwörter oder was
-Sie wollen benutzt werden.
-
-Die Reiehnfolge in der die Abschnitte ausgegeben werden, ist:
-The section output order is:
-
-    NAME
-    ÃœBERSICHT
-    BESCHREIBUNG
-    OPTIONEN
-    BEISPIELE
-    \fIandere\fR
-    AUTOR
-    FEHLER BERICHTEN
-    COPYRIGHT
-    SIEHE AUCH
-
-Jeder
-.B [Name]
-or
-.B [Ãœbersicht]
--Abschnitt, der in der eingefügten Datei erscheint, wird das
-ersetzen, was automatisch generiert würde (obwohl Sie das
-weitere immer noch, wenn nötigt, mit
-.B --name
-überschreiben können.
-
-Andere Abschnitte werden der automatisch erzeugten Ausgabe für die
-oben angegebenen Standardabschnitte vorangestellt oder unter
-.I andere
-(oben) in der Reihenfolge, in der sie in der eingefügten Datei
-vorgefunden werden, eingefügt.
-
-[Verfügbarkeit]
-Die neuste Version dieser Distribution ist Online erhältlich von:
-
-    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.fi.1 b/help2man.fi.1
index 816e90a..f0c2272 100644
--- a/help2man.fi.1
+++ b/help2man.fi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "joulukuu 2009" "help2man 1.37.1" "Käyttäjän sovellukset"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "huhtikuu 2010" "help2man 1.38.1" "Käyttäjän sovellukset"
 .SH NIMI
 help2man \- luo yksinkertainen man-sivu
 .SH KUVAUS
@@ -59,12 +59,11 @@ version string
 include stderr when parsing option output
 .SH "SISÄLLYTÄ TIEDOSTOJA"
 Lisämateriaalia voi sisällyttää luotavaan tulosteeseen valitsimilla
-..B \-\-include
+.B \-\-include
 ja
-..B \-\-opt\-include .
+.BR \-\-opt\-include .
 Muoto on yksinkertainen:
 
-
     [kappale]
     teksti
 
@@ -72,20 +71,20 @@ Muoto on yksinkertainen:
     teksti
 
 Kappaleita puhdasta *roff-tekstiä lisätään tulosteeseen joko kun alkaa
-..BI [ kappale ]
+.BI [ kappale ]
 (kirjainkoko merkitsevä) tai sellaisen kappaleen jälkeen, joka täsmää
 säännölliseen lausekkeeseen
 
-..BI / hakuehto /\fR.
+.BI / hakuehto /\fR.
 
 Hakuehdoissa käytetään Perlin säännöllisten lausekkeiden syntaksia, ja
 niiden perässä voi olla
-..IR i ,
-..I s
+.IR i ,
+.I s
 tai
-..I m
+.I m
 muuntimet (katso
-..BR perlre (1)).
+.BR perlre (1)).
 
 Rivit ennen ensimmäistä kappaletta tai hakuehtoa, jotka alkavat "\-",
 käsitellään valitsimina. Kaikki muu ohitetaan, joten ne voivat olla
@@ -97,6 +96,8 @@ Kappaleiden tulostusj
     YLEISKATSAUS
     KUVAUS
     VALITSIMET
+    ENVIRONMENT
+    FILES
     ESIMERKKEJÄ
     \fImuut\fR
     TEKIJÄ
@@ -105,17 +106,17 @@ Kappaleiden tulostusj
     KATSO MYÖS
 
 Kappale
-..B [nimi]
+.B [NIMI]
 tai
-..B [yleiskatsaus]
-, joka löytyy sisällytystiedostosta, korvaa muutoin automaattisesti
+.BR [YLEISKATSAUS] ,
+joka löytyy sisällytystiedostosta, korvaa muutoin automaattisesti
 tuotettavan osan (vaikka tämänkin voi korvata
-..B --name
+.B --name
 -valitsimella tarvittaessa).
 
 Muut kappaleet aloittavat automaattisesti tuotetun tulosteen aiemmin
 mainituille vakiokappaleille, tai ne sisällytetään kohtaan
-..I muut
+.I muut
 samassa järjestyksessä kuin ne esiintyvät sisällytystiedostossa.
 .SH SAATAVUUS
 Tuorein versio tästä sovelluksesta on saatavilla verkossa osoitteesta:
@@ -126,7 +127,7 @@ Kirjoittanut Brendan O'Dea <bod@debian.org>
 .SH "VIRHEISTÄ ILMOITTAMINEN"
 Report bugs to <bug\-help2man@gnu.org>.
 .SH TEKIJÄNOIKEUDET
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 Tämä on vapaa ohjelmist; katsokaa kopiointiehdot lähdekoodista. Takuuta EI OLE;
 ei edes KAUPALLISESTI HYVÄKSYTTÄVÄSTÄ LAADUSTA tai SOPIVUUDESTA TIETTYYN
diff --git a/help2man.fi.h2m b/help2man.fi.h2m
deleted file mode 100644
index b647c7f..0000000
--- a/help2man.fi.h2m
+++ /dev/null
@@ -1,77 +0,0 @@
-Encoding charset: ISO-8859-15
-Language: Finnish
-Locale: fi_FI@euro (and also fi_FI)
-Translator: Tommi Vainikainen
-
-Suomennos help2man-ohjelman man-sivusta.
-
---locale=fi_FI@euro
-
-[nimi]
-help2man \- luo yksinkertainen man-sivu
-
-[sisällytä tiedostoja]
-Lisämateriaalia voi sisällyttää luotavaan tulosteeseen valitsimilla
-..B \-\-include
-ja
-..B \-\-opt\-include .
-Muoto on yksinkertainen:
-
-
-    [kappale]
-    teksti
-
-    /hakuehto/
-    teksti
-
-Kappaleita puhdasta *roff-tekstiä lisätään tulosteeseen joko kun alkaa
-..BI [ kappale ]
-(kirjainkoko merkitsevä) tai sellaisen kappaleen jälkeen, joka täsmää
-säännölliseen lausekkeeseen
-
-..BI / hakuehto /\fR.
-
-Hakuehdoissa käytetään Perlin säännöllisten lausekkeiden syntaksia, ja
-niiden perässä voi olla
-..IR i ,
-..I s
-tai
-..I m
-muuntimet (katso
-..BR perlre (1)).
-
-Rivit ennen ensimmäistä kappaletta tai hakuehtoa, jotka alkavat "\-",
-käsitellään valitsimina. Kaikki muu ohitetaan, joten ne voivat olla
-käyttäjän kommentteja, RCS-avainsanoja ja muuta sellaista.
-
-Kappaleiden tulostusjärjestys on:
-
-    NIMI
-    YLEISKATSAUS
-    KUVAUS
-    VALITSIMET
-    ESIMERKKEJÄ
-    \fImuut\fR
-    TEKIJÄ
-    VIRHEISTÄ ILMOITTAMINEN
-    TEKIJÄNOIKEUDET
-    KATSO MYÖS
-
-Kappale
-..B [nimi]
-tai
-..B [yleiskatsaus]
-, joka löytyy sisällytystiedostosta, korvaa muutoin automaattisesti
-tuotettavan osan (vaikka tämänkin voi korvata
-..B --name
--valitsimella tarvittaessa).
-
-Muut kappaleet aloittavat automaattisesti tuotetun tulosteen aiemmin
-mainituille vakiokappaleille, tai ne sisällytetään kohtaan
-..I muut
-samassa järjestyksessä kuin ne esiintyvät sisällytystiedostossa.
-
-[saatavuus]
-Tuorein versio tästä sovelluksesta on saatavilla verkossa osoitteesta:
-
-    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.fr.1 b/help2man.fr.1
index 7fb0a86..bfc64b6 100644
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "décembre 2009" "help2man 1.37.1" "Commandes"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "avril 2010" "help2man 1.38.1" "Commandes"
 .SH NOM
 help2man \- génère une page de manuel sommaire
 .SH SYNOPSIS
@@ -98,6 +98,8 @@ L'ordre des sections produites est\ :
     SYNOPSIS
     DESCRIPTION
     OPTIONS
+    ENVIRONMENT
+    FILES
     EXEMPLES
     \fIautres\fR
     AUTEUR
@@ -106,9 +108,9 @@ L'ordre des sections produites est\ :
     VOIR AUSSI
 
 Toute section
-.B [nom]
+.B [NOM]
 ou
-.B [synopsis]
+.B [SYNOPSIS]
 apparaissant dans le fichier inclus va remplacer celle qui aurait êté
 générée automatiquement (mais vous pouvez encore remplacer la première
 avec
@@ -131,7 +133,7 @@ La derni
 .SH "SIGNALER DES BOGUES"
 Report bugs to <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 .br
 Ce logiciel est libre\ ; voir les sources pour les conditions de
diff --git a/help2man.fr.h2m b/help2man.fr.h2m
deleted file mode 100644
index 4f90c5b..0000000
--- a/help2man.fr.h2m
+++ /dev/null
@@ -1,82 +0,0 @@
-Encoding charset: ISO-8859-15
-Language: French
-Locale: fr_FR@euro (and also fr_FR)
-Translator: Denis Barbier <barbier@linuxfr.org>
-
-Traduction française du fichier inclus pour générer la page
-de manuel de help2man
-
---locale=fr_FR@euro
-
-[nom]
-help2man \- génère une page de manuel sommaire
-
-[fichiers inclus]
-On peut ajouter un supplément de texte aux indications fournies par le
-programme grâce aux options
-.B \-\-include
-et
-.BR \-\-opt\-include .
-Le format est simple\ :
-
-    [section]
-    texte
-
-    /motif/
-    texte
-
-Les blocs de texte (au format *roff) sont insérés tels quels dans la
-sortie, soit au début de la zone désignée par
-.BI [ section ]
-(balise insensible à la casse), soit après un paragraphe correspondant à
-.BI / motif /\fR.
-
-Les motifs obéissent à la syntaxe des expressions rationnelles de Perl
-et peuvent être suivis des modificateurs
-.IR i ,
-.I s
-ou
-.I m
-(voir
-.BR perlre (1)).
-
-Les lignes précédant la première section (ou le premier motif) et
-commençant par «\ \-\ » sont traitées comme des options. Tout le
-reste est ignoré sans aucun avertissement, et peut être utilisé pour
-des commentaires, des mots clés RCS ou d'autres éléments.
-
-L'ordre des sections produites est\ :
-
-    NOM
-    SYNOPSIS
-    DESCRIPTION
-    OPTIONS
-    EXEMPLES
-    \fIautres\fR
-    AUTEUR
-    SIGNALER DES BOGUES
-    COPYRIGHT
-    VOIR AUSSI
-
-Toute section
-.B [nom]
-ou
-.B [synopsis]
-apparaissant dans le fichier inclus va remplacer celle qui aurait êté
-générée automatiquement (mais vous pouvez encore remplacer la première
-avec
-.B --name
-si nécessaire).
-
-Le texte supplémentaire aux autres sections usuelles (celles
-apparaissant dans cette liste) est inséré avant la sortie générée
-automatiquement pour elles.
-Les sections non usuelles sont insérées à la place marquée
-.I autres
-dans la liste ci-dessus, dans l'ordre dans lequel ces sections
-apparaissent dans le fichier inclus.
-
-[disponibilité]
-La dernière version de cette distribution est disponible en ligne sur\ :
-
-    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.h2m b/help2man.h2m
deleted file mode 100644
index 86a228f..0000000
--- a/help2man.h2m
+++ /dev/null
@@ -1,71 +0,0 @@
-Include file for help2man man page
-
---locale=C
-
-[name]
-help2man \- generate a simple manual page
-
-[include files]
-Additional material may be included in the generated output with the
-.B \-\-include
-and
-.B \-\-opt\-include
-options.  The format is simple:
-
-    [section]
-    text
-
-    /pattern/
-    text
-
-Blocks of verbatim *roff text are inserted into the output either at
-the start of the given
-.BI [ section ]
-(case insensitive), or after a paragraph matching
-.BI / pattern /\fR.
-
-Patterns use the Perl regular expression syntax and may be followed by
-the
-.IR i ,
-.I s
-or
-.I m
-modifiers (see
-.BR perlre (1)).
-
-Lines before the first section or pattern which begin with `\-' are
-processed as options.  Anything else is silently ignored and may be
-used for comments, RCS keywords and the like.
-
-The section output order (for those included) is:
-
-    NAME
-    SYNOPSIS
-    DESCRIPTION
-    OPTIONS
-    EXAMPLES
-    \fIother\fR
-    AUTHOR
-    REPORTING BUGS
-    COPYRIGHT
-    SEE ALSO
-
-Any
-.B [name]
-or
-.B [synopsis]
-sections appearing in the include file will replace what would have
-automatically been produced (although you can still override the
-former with
-.B --name
-if required).
-
-Other sections are prepended to the automatically produced output for
-the standard sections given above, or included at
-.I other
-(above) in the order they were encountered in the include file.
-
-[availability]
-The latest version of this distribution is available on-line from:
-
-    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.h2m.PL b/help2man.h2m.PL
new file mode 100755
index 0000000..ed7818a
--- /dev/null
+++ b/help2man.h2m.PL
@@ -0,0 +1,176 @@
+#!/usr/bin/perl
+
+#
+# Self extracting help2man.h2m script.
+#
+#   -q, --quiet            Suppress extraction message
+#   -s, --stdout           Extract to stdout
+#   -o, --output=FILE      Extract to FILE
+#   -l, --locale=STRING    Output file for locale STRING
+#   -m, --message-dir=DIR  Directory for message catalogs
+#
+
+use 5.008;
+use Config;
+use Getopt::Long;
+use POSIX qw(setlocale LC_ALL);
+
+my %opts;
+die "Usage: $0 [--quiet] [--stdout|--output=FILE] [--locale=STRING] ",
+    "[--message-dir=DIR]\n" unless GetOptions \%opts,
+	qw(quiet stdout output=s locale=s message-dir=s) and !@ARGV;
+
+my $DOMAIN = 'help2man';
+my $target = $0;
+if ($opts{stdout})
+{
+    *OUT = *STDOUT;
+    $opts{quiet} = 1;
+}
+else
+{
+    if ($opts{output})
+    {
+	$target = $opts{output};
+    }
+    else
+    {
+	$target =~ s!.*/!!;
+	$target =~ s/\.PL$// or die "$0: can't determine target name\n";
+	if ($opts{locale})
+	{
+	    $target =~ s/(\.[^.]*)$/.$opts{locale}$1/
+	      or $target =~ s/$/.$opts{locale}/;
+	}
+    }
+
+    unlink $target       or die "$0: can't unlink $target ($!)\n" if -e $target;
+    open OUT, ">$target" or die "$0: can't create $target ($!)\n";
+}
+
+my $msg = "Extracting $target";
+$msg .= ' (with locale substitutions)' if $opts{locale};
+print $msg, "\n" unless $opts{quiet};
+
+sub _;
+if ($opts{locale})
+{
+    delete @ENV{qw(LANGUAGE LC_MESSAGES LANG)};
+    setlocale LC_ALL, $ENV{LC_ALL} = $opts{locale};
+
+    require Locale::gettext;
+    require I18N::Langinfo;
+    require Encode;
+    my $gettext = Locale::gettext->domain($DOMAIN);
+    $gettext->dir($opts{'message-dir'}) if $opts{'message-dir'};
+    my $encoding = I18N::Langinfo::langinfo(I18N::Langinfo::CODESET());
+    *_ = sub { Encode::encode($encoding, $gettext->get($_[0])) }
+}
+else
+{
+    *_ = sub { $_[0] }
+}
+
+print OUT _('Include file for help2man man page'), "\n";
+print OUT "\n";
+print OUT '--locale=', $opts{locale} || 'C', "\n";
+print OUT "\n";
+
+print OUT '[', _('NAME'), "]\n";
+print OUT _('help2man \- generate a simple manual page'), "\n";
+print OUT "\n";
+
+print OUT '[', _('INCLUDE FILES'), "]\n";
+print OUT _(<<'EOT');
+Additional material may be included in the generated output with the
+.B \-\-include
+and
+.B \-\-opt\-include
+options.  The format is simple:
+
+    [section]
+    text
+
+    /pattern/
+    text
+EOT
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Blocks of verbatim *roff text are inserted into the output either at
+the start of the given
+.BI [ section ]
+(case insensitive), or after a paragraph matching
+.BI / pattern /\fR.
+EOT
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Patterns use the Perl regular expression syntax and may be followed by
+the
+.IR i ,
+.I s
+or
+.I m
+modifiers (see
+.BR perlre (1)).
+EOT
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Lines before the first section or pattern which begin with `\-' are
+processed as options.  Anything else is silently ignored and may be
+used for comments, RCS keywords and the like.
+EOT
+print OUT "\n";
+
+print OUT _('The section output order (for those included) is:'), "\n";
+print OUT "\n";
+print OUT '    ', _('NAME'), "\n";
+print OUT '    ', _('SYNOPSIS'), "\n";
+print OUT '    ', _('DESCRIPTION'), "\n";
+print OUT '    ', _('OPTIONS'), "\n";
+print OUT '    ', _('ENVIRONMENT'), "\n";
+print OUT '    ', _('FILES'), "\n";
+print OUT '    ', _('EXAMPLES'), "\n";
+print OUT '    \fI', _('other'), "\\fR\n";
+print OUT '    ', _('AUTHOR'), "\n";
+print OUT '    ', _('REPORTING BUGS'), "\n";
+print OUT '    ', _('COPYRIGHT'), "\n";
+print OUT '    ', _('SEE ALSO'), "\n";
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Any
+.B [NAME]
+or
+.B [SYNOPSIS]
+sections appearing in the include file will replace what would have
+automatically been produced (although you can still override the
+former with
+.B --name
+if required).
+EOT
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Other sections are prepended to the automatically produced output for
+the standard sections given above, or included at
+.I other
+(above) in the order they were encountered in the include file.
+EOT
+print OUT "\n";
+
+print OUT '[', _('AVAILABILITY'), "]\n";
+print OUT _('The latest version of this distribution is available on-line from:'), "\n";
+print OUT "\n";
+print OUT "    ftp://ftp.gnu.org/gnu/help2man/\n";
+
+# Fix output file permissions
+unless ($opts{stdout})
+{
+    close OUT;
+    chmod 0444, $target or warn "$0: can't change mode of $target ($!)\n";
+}
+
+exit 0;
diff --git a/help2man.info b/help2man.info
index 0abff3b..ab0738b 100644
--- a/help2man.info
+++ b/help2man.info
@@ -9,8 +9,8 @@ END-INFO-DIR-ENTRY
    This file documents the GNU `help2man' command which produces simple
 manual pages from the `--help' and `--version' output of other commands.
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free
-Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
+Free Software Foundation, Inc.
 
    Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -267,6 +267,8 @@ used for comments, RCS keywords and the like.
      SYNOPSIS
      DESCRIPTION
      OPTIONS
+     ENVIRONMENT
+     FILES
      EXAMPLES
      _other_
      AUTHOR
@@ -393,15 +395,15 @@ The latest version of this distribution is available on-line from:
 
 
 Tag Table:
-Node: Top1125
-Node: Overview1832
-Node: Invoking help2man2539
-Node: --help recommendations4890
-Node: Including text8308
-Node: Makefile usage9991
-Node: Localised man pages10930
-Ref: Localised man pages-Footnote-112841
-Node: Reports12991
-Node: Availability13449
+Node: Top1131
+Node: Overview1838
+Node: Invoking help2man2545
+Node: --help recommendations4896
+Node: Including text8314
+Node: Makefile usage10025
+Node: Localised man pages10964
+Ref: Localised man pages-Footnote-112875
+Node: Reports13025
+Node: Availability13483
 
 End Tag Table
diff --git a/help2man.pl.1 b/help2man.pl.1
index c753c2e..456683d 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,69 +1,70 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "grudzie? 2009" "help2man 1.37.1" "Polecenia u¿ytkownika"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "kwiecie? 2010" "help2man 1.38.1" "Polecenia u¿ytkownika"
 .SH NAZWA
 help2man \- generowanie prostej strony podrêcznika
+.SH SK£ADNIA
+.B help2man
+[\fIOPCJA\fR]... \fIPROGRAM\fR
 .SH OPIS
-`help2man' generates a man page out of `\-\-help' and `\-\-version' output.
-.PP
-Usage: help2man [OPTION]... EXECUTABLE
+`help2man' generuje stronê podrêcznika z wyj¶cia `\-\-help' i `\-\-version'.
 .TP
-\fB\-n\fR, \fB\-\-name\fR=\fISTRING\fR
-description for the NAME paragraph
+\fB\-n\fR, \fB\-\-name\fR=\fI£AÑCUCH\fR
+opis akapitu NAZWA
 .TP
-\fB\-s\fR, \fB\-\-section\fR=\fISECTION\fR
-section number for manual page (1, 6, 8)
+\fB\-s\fR, \fB\-\-section\fR=\fISEKCJA\fR
+numer sekcji dla strony podrêcznika (1, 6, 8)
 .TP
-\fB\-m\fR, \fB\-\-manual\fR=\fITEXT\fR
-name of manual (User Commands, ...)
+\fB\-m\fR, \fB\-\-manual\fR=\fITEKST\fR
+nazwa podrêcznika (Polecenia u¿ytkownika, ...)
 .TP
-\fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
-source of program (FSF, Debian, ...)
+\fB\-S\fR, \fB\-\-source\fR=\fITEKST\fR
+pochodzenie programu (FSF, Debian, ...)
 .TP
-\fB\-L\fR, \fB\-\-locale\fR=\fISTRING\fR
-select locale (default "C")
+\fB\-L\fR, \fB\-\-locale\fR=\fI£AÑCUCH\fR
+ustawienie lokalizacji (domy¶lnie "C")
 .TP
-\fB\-i\fR, \fB\-\-include\fR=\fIFILE\fR
-include material from `FILE'
+\fB\-i\fR, \fB\-\-include\fR=\fIPLIK\fR
+do³±czenie materia³u z `PLIKU'
 .TP
-\fB\-I\fR, \fB\-\-opt\-include\fR=\fIFILE\fR
-include material from `FILE' if it exists
+\fB\-I\fR, \fB\-\-opt\-include\fR=\fIPLIK\fR
+do³±czenie materia³u z `PLIKU', je¶li takowy istnieje
 .TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-send output to `FILE'
+\fB\-o\fR, \fB\-\-output\fR=\fIPLIK\fR
+zapisanie wyj¶cia do `PLIKU'
 .TP
-\fB\-p\fR, \fB\-\-info\-page\fR=\fITEXT\fR
-name of Texinfo manual
+\fB\-p\fR, \fB\-\-info\-page\fR=\fITEKST\fR
+nazwa podrêcznika Texinfo
 .TP
 \fB\-N\fR, \fB\-\-no\-info\fR
-suppress pointer to Texinfo manual
+pominiêcie wskazania do podrêcznika Texinfo
 .TP
 \fB\-\-help\fR
-print this help, then exit
+wy¶wietlenie tego opisu i zakoñczenie pracy
 .TP
 \fB\-\-version\fR
-print version number, then exit
+wy¶wietlenie numeru wersji i zakoñczenie pracy
 .PP
-EXECUTABLE should accept `\-\-help' and `\-\-version' options and produce output on
-stdout although alternatives may be specified using:
+PROGRAM powinien przyjmowaæ opcje `\-\-help' i `\-\-version', aczkolwiek mo¿na
+podaæ alternatywne nazwy opcji przy pomocy:
 .TP
-\fB\-h\fR, \fB\-\-help\-option\fR=\fISTRING\fR
-help option string
+\fB\-h\fR, \fB\-\-help\-option\fR=\fI£AÑCUCH\fR
+³añcuch opcji pomocy
 .TP
-\fB\-v\fR, \fB\-\-version\-option\fR=\fISTRING\fR
-version option string
+\fB\-v\fR, \fB\-\-version\-option\fR=\fI£AÑCUCH\fR
+³añcuch opcji wersji
 .TP
-\fB\-\-version\-string\fR=\fISTRING\fR
-version string
+\fB\-\-version\-string\fR=\fI£AÑCUCH\fR
+³añcuch wersji
 .TP
 \fB\-\-no\-discard\-stderr\fR
-include stderr when parsing option output
+do³±czenie stderr przy analizie wyj¶cia
 .SH "DO£¡CZANE PLIKI"
 Do generowanego pliku mo¿na do³±czyæ dodatkowy materia³ przy pomocy
 opcji
 .B \-\-include
 i
-.B \-\-opt\-include
-. Format jest prosty:
+.BR \-\-opt\-include .
+Format jest prosty:
 
     [sekcja]
     tekst
@@ -96,6 +97,8 @@ Kolejno
     SK£ADNIA
     OPIS
     OPCJE
+    ¦RODOWISKO
+    PLIKI
     PRZYK£ADY
     \fIinne\fR
     AUTOR
@@ -124,9 +127,9 @@ Najnowsza wersja tego oprogramowania jest dost
 .SH AUTOR
 Program napisa³ Brendan O'Dea <bod@debian.org>
 .SH "ZG£ASZANIE B£ÊDÓW"
-Report bugs to <bug\-help2man@gnu.org>.
+B³êdy prosimy zg³aszaæ na adres <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 .br
 Ten program jest darmowy; warunki kopiowania s± opisane w ¼ród³ach.
diff --git a/help2man.pl.h2m b/help2man.pl.h2m
deleted file mode 100644
index df17f10..0000000
--- a/help2man.pl.h2m
+++ /dev/null
@@ -1,77 +0,0 @@
-Encoding charset: ISO-8859-2
-Language: Polish
-Locale: pl_PL
-Translator: Jakub Bogusz <qboosh@pld-linux.org>
-
-Include file for Polish help2man man page
-
---locale=pl_PL
-
-[nazwa]
-help2man \- generowanie prostej strony podrêcznika
-
-[do³±czane pliki]
-Do generowanego pliku mo¿na do³±czyæ dodatkowy materia³ przy pomocy
-opcji
-.B \-\-include
-i
-.B \-\-opt\-include
-. Format jest prosty:
-
-    [sekcja]
-    tekst
-
-    /wzorzec/
-    tekst
-
-Bloki sformatowanego tekstu *roff s± wstawiane do wyj¶cia na pocz±tku
-podanej
-.BI [ sekcji ]
-(bez rozró¿niania wielko¶ci liter) lub po akapicie pasuj±cym do
-.BI / wzorca /\fR.
-
-Wzorce zapisuje siê przy u¿yciu sk³adni perlowych wyra¿eñ regularnych
-i mo¿na je zakoñczyæ modyfikatorami
-.IR i ,
-.I s
-lub
-.I m
-(patrz
-.BR perlre (1)).
-
-Linie przed pierwsz± sekcj± lub wzorzec zaczynaj±cy siê od `\-' s±
-przetwarzane jako opcje. Ca³a reszta jest po cichu ignorowana i mo¿e
-byæ u¿ywana jako komentarze, s³owa kluczowe RCS itp.
-
-Kolejno¶æ sekcji na wyj¶ciu to:
-
-    NAZWA
-    SK£ADNIA
-    OPIS
-    OPCJE
-    PRZYK£ADY
-    \fIinne\fR
-    AUTOR
-    ZG£ASZANIE B£ÊDÓW
-    COPYRIGHT
-    ZOBACZ TAK¯E
-
-Ka¿da sekcja
-.B [nazwa]
-lib
-.B [sk³adnia]
-wystêpuj±ca w pliku do³±czanym zastêpuje to, co zosta³oby automatycznie
-wyprodukowane (aczkolwiek mo¿na w razie potrzeby obej¶æ to zachowanie przez
-.B --name
-).
-
-Inne sekcje s± do³±czane do automatycznie generowanego wyj¶cia
-w przypadku standardowych, wy¿ej wymienionych sekcji lub w³±czane
-w miejscu
-.I inne
-(jak wy¿ej) w kolejno¶ci, w jakiej wyst±pi³y w do³±czanym pliku.
-
-[dostêpno¶æ]
-Najnowsza wersja tego oprogramowania jest dostêpna pod:
-
-    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.pt_BR.1 b/help2man.pt_BR.1
index 407df49..3f088cc 100644
--- a/help2man.pt_BR.1
+++ b/help2man.pt_BR.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "dezembro 2009" "help2man 1.37.1" "Comandos de usuário"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "abril 2010" "help2man 1.38.1" "Comandos de usuário"
 .SH NOME
 help2man \- gera uma página de manual simples
 .SH DESCRIÇÃO
@@ -96,6 +96,8 @@ A ordem da saída das seções é:
     SINOPSE
     DESCRIÇÃO
     OPÇÕES
+    ENVIRONMENT
+    FILES
     EXEMPLOS
     \fIoutra\fR
     AUTOR
@@ -124,7 +126,7 @@ A última versão desta distribuição está disponível on-line em:
 .SH "RELATANDO PROBLEMAS"
 Report bugs to <bug\-help2man@gnu.org>.
 .SH "DIREITOS AUTORAIS"
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/help2man.pt_BR.h2m b/help2man.pt_BR.h2m
deleted file mode 100644
index 0252726..0000000
--- a/help2man.pt_BR.h2m
+++ /dev/null
@@ -1,77 +0,0 @@
-Encoding charset: UTF-8
-Language: Brazilian Portuguese
-Locale: pt_BR
-Translator: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>
-
-Arquivo de inclusão para a página de manual do help2man
-
---locale=pt_BR.UTF-8
-
-[nome]
-help2man \- gera uma página de manual simples
-
-[arquivos inclusos]
-Materiais adicionais podem ser incluídos na saída gerada com as opções
-.B \-\-include
-e
-.B \-\-opt\-include
-.  O formato é simples:
-
-    [seção]
-    texto
-
-    /padrão/
-    texto
-
-Blocos de texto *roff literais são inseridos na saída ou no início de
-uma dada
-.BI [ seção ]
-(indiferente à maiusculização), ou após um parágrafo que coincida com o
-.BI / padrão /\fR.
-
-Os padrões usam a sintaxe Perl de expressão regular e podem ser seguidos
-pelos modificadores
-.IR i ,
-.I s
-ou
-.I m
-(veja
-.BR perlre (1)).
-
-As linhas antes da primeira seção ou de um padrão que comece com
-"\-" são processados como opções. Qualquer outra coisa é ignorada
-silenciosamente e pode ser usada para comentários, palavras-chaves
-RCS e coisas do tipo.
-
-A ordem da saída das seções é:
-
-    NOME
-    SINOPSE
-    DESCRIÇÃO
-    OPÇÕES
-    EXEMPLOS
-    \fIoutra\fR
-    AUTOR
-    RELATANDO PROBLEMAS
-    DIREITOS AUTORAIS
-    VEJA TAMBÉM
-
-Quaisquer seções
-.B [nome]
-ou
-.B [sinopse]
-que apareçam no arquivo de inclusão substituirá o que seria
-produzido automaticamente (embora você ainda possa sobrepor
-o primeiro com
-.B --name
-se necessário).
-
-Outras seções são acrescentadas antes da saída produzida automaticamente
-para as seções padrões citadas acima ou inclusas na posição
-.I outra
-(acima) na ordem em que elas forem encontradas no arquivo de inclusão.
-
-[disponibilidade]
-A última versão desta distribuição está disponível on-line em:
-
-    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.sv.1 b/help2man.sv.1
index db692bb..a56e447 100644
--- a/help2man.sv.1
+++ b/help2man.sv.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "december 2009" "help2man 1.37.1" "Användarkommandon"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "april 2010" "help2man 1.38.1" "Användarkommandon"
 .SH NAMN
 help2man \- generera en enkel manualsida
 .SH BESKRIVNING
@@ -94,6 +94,8 @@ Ordning p
     SYNOPSIS
     BESKRIVNING
     FLAGGOR
+    ENVIRONMENT
+    FILES
     EXEMPEL
     \fIövrigt\fR
     UPPHOVSMAN
@@ -124,7 +126,7 @@ Skrivet av Brendan O'Dea <bod@debian.org>
 .SH "RAPPORTERA FEL"
 Report bugs to <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 .br
 Det här är fri programvara; se källkoden för kopieringsvillkor.  Det finns INGEN
diff --git a/help2man.sv.h2m b/help2man.sv.h2m
deleted file mode 100644
index d2bdf98..0000000
--- a/help2man.sv.h2m
+++ /dev/null
@@ -1,75 +0,0 @@
-Encoding charset: ISO-8859-15
-Language: Swedish
-Locale: sv_SE
-Translator: Daniel Nylander <po@danielnylander.se>
-
-Include file for Swedish help2man man page
-
---locale=sv_SE.ISO-8859-15
-
-[namn]
-help2man \- generera en enkel manualsida
-
-[inkludera filer]
-Ytterligare material kan inkluderas i den genererade utskriften med flaggorna
-.B \-\-include
-och
-.B \-\-opt\-include
-Formatet är enkelt:
-
-    [sektion]
-    text
-
-    /mönster/
-    text
-
-Block av *roff-text infogas ord för ord i utskriften antingen vid
-början av angiven
-.BI [ section ]
-(okänslig för skiftläge), eller efter en paragraf som matchar
-.BI / mönster /\fR.
-
-Mönster använder Perls syntax för reguljära uttryck och kan efterföljas av modifierarna
-.IR i ,
-.I s
-eller
-.I m
-(se
-.BR perlre (1)).
-
-Rader före den första sektionen eller mönstret som börjar med "\-"
-behandlas som flaggor.  Allt annat ignoreras tyst och kan användas
-för kommentarer, RCS-nyckelord och liknande.
-
-Ordning på sektionsutskriften är:
-
-    NAMN
-    SYNOPSIS
-    BESKRIVNING
-    FLAGGOR
-    EXEMPEL
-    \fIövrigt\fR
-    UPPHOVSMAN
-    RAPPORTERA FEL
-    COPYRIGHT
-    SE OCKSÅ
-
-Alla sektioner
-.B [namn]
-eller
-.B [synopsis]
-som visas i inkluderingsfilen kommer att ersätta vad som skulle
-automatiskt bli producerat (även om du fortfarande kan åsidosätta
-de senare med
-.B --name
-om det krävs).
-
-Andra sektioner läggs till i början av den automatiskt producerade utskriften
-för standardsektionerna angivna ovan, eller inkluderas vid
-.I övrigt
-(ovan) i den ordning de påträffades i inkluderingsfilen.
-
-[tillgänglighet]
-Senaste versionen av den här utgåvan finns tillgänglig online från:
-
-    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.texi b/help2man.texi
index 1d06988..d0aa7c3 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -14,7 +14,7 @@ This file documents the GNU @command{help2man} command which produces
 simple manual pages from the @samp{--help} and @samp{--version} output
 of other commands.
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -321,6 +321,8 @@ NAME
 SYNOPSIS
 DESCRIPTION
 OPTIONS
+ENVIRONMENT
+FILES
 EXAMPLES
 @emph{other}
 AUTHOR
diff --git a/help2man.vi.1 b/help2man.vi.1
new file mode 100644
index 0000000..e883876
--- /dev/null
+++ b/help2man.vi.1
@@ -0,0 +1,154 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "Tháng tÆ° 2010" "help2man 1.38.1" "Lệnh ngÆ°á»i dùng"
+.SH TÊN
+help2man \- tạo một trang hướng dẫn đơn giản
+.SH "TÓM TẮT"
+.B help2man
+[\fITÙY_CHỌN\fR]... \fIBẢN_THá»°C_HIỆN_ÄƯỢC\fR
+.SH "MÔ TẢ"
+« help2man » tạo má»™t trang hÆ°á»›ng dẫn dá»±a vào kết xuất của tuỳ chá»n
+`\-\-help' (trợ giúp) và `\-\-version' (phiên bản).
+.TP
+\fB\-n\fR, \fB\-\-name\fR=\fICHUá»–I\fR
+mô tả cho đoạn văn TÊN (NAME)
+.TP
+\fB\-s\fR, \fB\-\-section\fR=\fIPHẦN\fR
+số thứ tự phần cho trang hướng dẫn (1, 6, 8)
+.TP
+\fB\-m\fR, \fB\-\-manual\fR=\fITÊN\fR
+tên của trang hướng dẫn (User Commands, ...)
+.TP
+\fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
+nguồn của chương trình (FSF, Debian, ...)
+.TP
+\fB\-L\fR, \fB\-\-locale\fR=\fICHUá»–I\fR
+chá»n miá»n địa phÆ°Æ¡ng (mặc định "C";
+đối với tiếng Việt thì là « vi_VN.UTF\-8 »)
+.TP
+\fB\-i\fR, \fB\-\-include\fR=\fITỆP\fR
+bao gồm dữ liệu từ tập tin này
+.TP
+\fB\-I\fR, \fB\-\-opt\-include\fR=\fITỆP\fR
+bao gồm dữ liệu từ tập tin này nếu có
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fITỆP\fR
+gửi kết xuất cho tập tin này
+.TP
+\fB\-p\fR, \fB\-\-info\-page\fR=\fITÊN\fR
+tên của trang hướng dẫn loại Texinfo
+.TP
+\fB\-N\fR, \fB\-\-no\-info\fR
+thu hồi cái chỉ tới trang hướng dẫn Texinfo
+.TP
+\fB\-\-help\fR
+hiển thị trợ giúp này, sau đó thoát
+.TP
+\fB\-\-version\fR
+hiển thị số thứ tự phiên bản, sau đó thoát
+.PP
+BẢN_THá»°C_HIỆN_ÄƯỢC nên chấp nhận hai tuỳ chá»n `\-\-help' và `\-\-version'
+thì xuất qua đầu ra tiêu chuẩn (stdout) dù cÅ©ng có thể ghi rõ thêm tuỳ chá»n:
+.TP
+\fB\-h\fR, \fB\-\-help\-option\fR=\fICHUá»–I\fR
+chuá»—i là tuỳ chá»n trợ giúp
+.TP
+\fB\-v\fR, \fB\-\-version\-option\fR=\fICHUá»–I\fR
+chuá»—i là tuỳ chá»n phiên bản
+.TP
+\fB\-\-version\-string\fR=\fICHUá»–I\fR
+chuỗi phiên bản
+.TP
+\fB\-\-no\-discard\-stderr\fR
+bao gồm đầu lỗi tiêu chuẩn
+khi phân tích cú pháp của kết xuất tuỳ chá»n
+.SH "TỆP BAO GỒM"
+CÅ©ng có thể bao gồm dữ liệu bổ sung trong kết xuất, dùng tuỳ chá»n
+.B \-\-include
+và
+.B \-\-opt\-include
+Có một định dạng đơn giản:
+
+    [phần]
+    chuá»—i
+
+    /mẫu/
+    chuá»—i
+
+Khối văn bản định dạng *roff đúng nguyên văn được chèn vào kết xuất
+hoặc ở đầu của phần
+.BI [ phần ]
+(không phân biệt chữ hoa/thÆ°á»ng),
+hoặc đẳng sau một đoạn văn tương ứng với mẫu
+.BI / mẫu /\fR.
+
+Mẫu chấp nhận cú pháp của biểu thức chính quy Perl,
+và cũng cho phép dấu sửa đổi
+.IR i ,
+.I s
+hay
+.I m
+(xem
+.BR perlre (1)).
+
+Dòng nào đẳng trước phần đầu tiên hoặc mẫu bắt đầu với « \- » thì được xử
+lý dÆ°á»›i dạng tuỳ chá»n. Dữ liệu khác (nếu có) bị bá» qua mà không xuất chi
+tiết, và có thể được sử dụng làm ghi chú, từ khoá RCS v.v.
+
+Thứ tự xuất phần (đã bao gồm):
+
+    TÊN
+    TÓM TẮT
+    MÔ TẢ
+    TÙY CHỌN
+    MÔI TRƯỜNG
+    TỆP
+    Và DỤ
+    \fIkhác\fR
+    TÃC GIẢ
+    THÔNG BÃO Lá»–I
+    BẢN QUYỀN
+    XEM THÊM
+
+Bắt cứ phần
+.B [NAME]
+hoặc
+.B [SYNOPSIS]
+nào xuất hiện trong tập tin bao gồm thì thay thế kết xuất tự động tạo
+(dù bạn vẫn còn có dịp ghi đè lên phần [NAME] bằng:
+.B --name
+nếu cần).
+
+NAME: TÊN
+SYNOPSIS: TÓM TẮT
+
+Các phần khác được thêm vào đầu của kết xuất tự động tạo
+cho những phần tiêu chuẩn đưa ra trên, hoặc được bao gồm tại
+.I other
+(bên trên) theo thứ tự gặp trong tập tin bao gồm.
+.SH "TÃNH SẴN SÀNG"
+Phiên bản mới nhất của bản phân phối này có sẵn sàng trực tuyến từ :
+
+    ftp://ftp.gnu.org/gnu/help2man/
+.SH "TÃC GIẢ"
+Viết bởi Brendan O'Dea <bod@debian.org>
+.SH "THÔNG BÃO Lá»–I"
+Thông báo lỗi nào cho <bug\-help2man@gnu.org>.
+.PP
+Tác quyá»n © năm 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
+của Tổ chức Phần má»m Tá»± do.
+Äây là phần má»m tá»± do; hãy xem mã nguồn để biết vá» Ä‘iá»u kiện sao chép.
+KHÔNG có sự đảm bảo nào; THẬM CHà KHÔNG CÓ KHẢ NĂNG THƯƠNG MẠI
+HAY CHO MỘT MỤC ÄÃCH RIÊNG NÀO ÄÓ.
+.SH "XEM THÊM"
+Tài liệu hÆ°á»›ng dẫn đầy đủ vá»
+.B help2man
+được bảo tồn dưới dạng một sổ tay Texinfo.
+Nếu chương trình
+.B info
+và
+.B help2man
+được cài đặt đúng ở địa chỉ của bạn thì câu lệnh
+.IP
+.B info help2man
+.PP
+nên cho phép bạn truy cập đến sổ tay hoàn toàn.
diff --git a/locales b/locales
new file mode 100644
index 0000000..a424017
--- /dev/null
+++ b/locales
@@ -0,0 +1,7 @@
+de	de_DE.UTF-8
+fi	fi_FI@euro
+fr	fr_FR@euro
+pl	pl_PL
+pt_BR	pt_BR.UTF-8
+sv	sv_SE.ISO-8859-15
+vi	vi_VN.UTF-8
diff --git a/po/de.gmo b/po/de.gmo
index 13cab52..bd1c2c2 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index d648b2c..a4da3b5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.36.4\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
 "PO-Revision-Date: 2009-09-14 22:12+GMT\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -16,12 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help2man:48
+#: help2man:69
 #, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -30,7 +31,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "Dies ist freie Software. Lesen Sie die Quelle, um die Kopierbedingungen\n"
 "zu erhalten. Es gibt KEINE Gewährleistung, nicht einmal für\n"
@@ -38,7 +40,7 @@ msgstr ""
 "\n"
 "Geschrieben von Brendan O'Dea <bod@debian.org>\n"
 
-#: help2man:59
+#: help2man:80
 #, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -100,108 +102,141 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <bug-help2man@gnu.org>.\n"
 
-#: help2man:138
+#: help2man:161
 #, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr "%s: »%s« kann nicht geöffnet werden (%s)"
 
-#: help2man:199
+#: help2man:222
 #, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: Keine gültigen Informationen in »%s« gefunden"
 
-#: help2man:222
+#: help2man:245
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr "%s: %s kann nicht entfernt werden (%s)"
 
-#: help2man:226
+#: help2man:249
 #, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr "%s: %s kann nicht erzeugt werden (%s)"
 
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings.  The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
 msgid "NAME"
 msgstr "NAME"
 
-#: help2man:277
+#: help2man:303
 #, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr "%s \\- Handbuchseite für %s %s"
 
-#: help2man:291
+#: help2man:317
 msgid "System Administration Utilities"
 msgstr "Systemadministrator-Werkzeuge"
 
-#: help2man:292
+#: help2man:318
 msgid "Games"
 msgstr "Spiele"
 
-#: help2man:293
+#: help2man:319
 msgid "User Commands"
 msgstr "Benutzerkommandos"
 
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output.  An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or:  cp [OPTION]... SOURCE... DIRECTORY
+#. or:  cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
 msgid "Usage"
 msgstr "Aufruf"
 
-#: help2man:299
+#: help2man:331
 msgid "or"
 msgstr "oder"
 
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
 msgid "SYNOPSIS"
 msgstr "ÃœBERSICHT"
 
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
-#: help2man:351
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions.  If there is more than one commonly used string, you
+#. may separate alternatives with "|".  Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched.  The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
 msgstr "Fehlerberichte|Fehler bitte|Fehlermeldungen|Berichten Sie Fehler"
 
-#: help2man:352
+#: help2man:392
 msgid "Written +by"
 msgstr "Geschrieben +von"
 
-#: help2man:353
+#: help2man:393
 msgid "Options"
 msgstr "Optionen"
 
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
 msgid "Examples"
 msgstr "Beispiele"
 
-#: help2man:355
+#: help2man:397
 msgid "This +is +free +software"
 msgstr "Dies +ist +freie +Software"
 
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
 msgid "OPTIONS"
 msgstr "OPTIONEN"
 
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
 
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
 msgid "REPORTING BUGS"
 msgstr "FEHLERBERICHTE"
 
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
 msgid "AUTHOR"
 msgstr "AUTOR"
 
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
-#: help2man:539
+#: help2man:591
 #, perl-format
 msgid ""
 "The full documentation for\n"
@@ -229,18 +264,151 @@ msgstr ""
 ".PP\n"
 "Zugriff auf das komplette Handbuch geben.\n"
 
-#: help2man:591
+#: help2man:643
 #, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: Fehler beim Schreiben nach %s (%s)"
 
-#: help2man:608
+#: help2man:660
 #, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: Es wurde keine »%s«-Information von %s erhalten"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: Es wurde keine »%s«-Information von %s erhalten%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Include-Datei für die help2man-Handbuchseite"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- generiert eine einfache Handbuchseite"
 
-#: help2man:609
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "DATEIEN ZUM EINFÃœGEN"
+
+#: help2man.h2m.PL:85
 msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options.  The format is simple:\n"
+"\n"
+"    [section]\n"
+"    text\n"
 "\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+"    /pattern/\n"
+"    text\n"
 msgstr ""
+"Zusätzliches Material kann in die generierte Ausgabe mit den\n"
+".B \\-\\-include\n"
+"und\n"
+".B \\-\\-opt\\-include\n"
+"Optionen eingefügt werden. Das Format ist einfach:\n"
+"\n"
+"    [Abschnitt]\n"
+"    Text\n"
+"\n"
+"    /Muster/\n"
+"    Text\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Blöcke aus wörtlichem *roff-Text werden entweder beim Start durch\n"
+"Angabe von\n"
+".BI [ Abschnitt ]\n"
+"(unabhängig von Groß-/Kleinschreibung) in die Ausgabe eingefügt oder\n"
+"nach einen passenden Absatz\n"
+".BI / Muster /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Muster benutzen die Syntax von regulären Perl-Ausdrücken und können\n"
+"von\n"
+".IR i ,\n"
+".I s\n"
+"oder\n"
+".I m\n"
+"Bestimmungswörtern gefolgt sein (siehe\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options.  Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+"Zeilen vor dem ersten Abschnitt oder Muster, die mit »\\-« beginnen,\n"
+"werden als Optionen behandelt. Alles andere wird stillschweigend\n"
+"ignoriert und könnte für Kommentare, RCS-Schlüsselwörter oder was\n"
+"Sie wollen benutzt werden.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Die Reiehnfolge in der die Abschnitte ausgegeben werden, ist:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "andere"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Jeder\n"
+".B [NAME]\n"
+"oder\n"
+".B [ÃœBERSICHT]\n"
+"-Abschnitt, der in der eingefügten Datei erscheint, wird das\n"
+"ersetzen, was automatisch generiert würde (obwohl Sie das\n"
+"weitere immer noch, wenn nötigt, mit\n"
+".B --name\n"
+"überschreiben können.\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Andere Abschnitte werden der automatisch erzeugten Ausgabe für die\n"
+"oben angegebenen Standardabschnitte vorangestellt oder unter\n"
+".I andere\n"
+"(oben) in der Reihenfolge, in der sie in der eingefügten Datei\n"
+"vorgefunden werden, eingefügt.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "VERFÃœGBARKEIT"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Die neuste Version dieser Distribution ist Online erhältlich von:"
diff --git a/po/fi.gmo b/po/fi.gmo
index 2fc1665..61d1fb2 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index fed25f0..a58b466 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man-1.35.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
 "PO-Revision-Date: 2005-09-17 12:21+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -12,12 +12,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: help2man:48
+#: help2man:69
 #, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -26,7 +27,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright © 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright © 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "Tämä on vapaa ohjelmist; katsokaa kopiointiehdot lähdekoodista. Takuuta EI "
 "OLE;\n"
@@ -35,7 +37,7 @@ msgstr ""
 "\n"
 "Kirjoittanut Brendan O'Dea <bod@debian.org>\n"
 
-#: help2man:59
+#: help2man:80
 #, fuzzy, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -93,109 +95,142 @@ msgstr ""
 "Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen\n"
 "<bug-help2man@gnu.org>.\n"
 
-#: help2man:138
+#: help2man:161
 #, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr "%s: ei voitu avata tiedostoa \"%s\" (%s)"
 
-#: help2man:199
+#: help2man:222
 #, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: kelvollista tietoa ei löytynyt ohjelmasta \"%s\""
 
-#: help2man:222
+#: help2man:245
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr "%s: ei voi unlinkata/poistaa tiedostoa %s (%s)"
 
-#: help2man:226
+#: help2man:249
 #, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr "%s: ei voitu luoda tiedostoa %s (%s)"
 
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings.  The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
 msgid "NAME"
 msgstr "NIMI"
 
-#: help2man:277
+#: help2man:303
 #, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr "%s \\- manuaalisivu %s %s"
 
-#: help2man:291
+#: help2man:317
 msgid "System Administration Utilities"
 msgstr "Järjestelmähallinnan sovellukset"
 
-#: help2man:292
+#: help2man:318
 msgid "Games"
 msgstr "Pelit"
 
-#: help2man:293
+#: help2man:319
 msgid "User Commands"
 msgstr "Käyttäjän sovellukset"
 
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output.  An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or:  cp [OPTION]... SOURCE... DIRECTORY
+#. or:  cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
 msgid "Usage"
 msgstr "Käyttö"
 
-#: help2man:299
+#: help2man:331
 msgid "or"
 msgstr "tai"
 
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
 msgid "SYNOPSIS"
 msgstr "YLEISKATSAUS"
 
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
 msgid "DESCRIPTION"
 msgstr "KUVAUS"
 
-#: help2man:351
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions.  If there is more than one commonly used string, you
+#. may separate alternatives with "|".  Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched.  The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
 #, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
 msgstr "Ilmoita +(ohjelmisto)?vioista|Lähetä +raportit +(ohjelmisto)?vioista"
 
-#: help2man:352
+#: help2man:392
 msgid "Written +by"
 msgstr "Kirjoittan(ut|eet)"
 
-#: help2man:353
+#: help2man:393
 msgid "Options"
 msgstr "Valitsimet"
 
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
 msgid "Examples"
 msgstr "Esimerkit"
 
-#: help2man:355
+#: help2man:397
 msgid "This +is +free +software"
 msgstr "Tämä +on +vapaa +ohjelmisto"
 
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
 msgid "OPTIONS"
 msgstr "VALITSIMET"
 
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
 msgid "EXAMPLES"
 msgstr "ESIMERKKEJÄ"
 
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
 msgid "COPYRIGHT"
 msgstr "TEKIJÄNOIKEUDET"
 
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
 msgid "REPORTING BUGS"
 msgstr "VIRHEISTÄ ILMOITTAMINEN"
 
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
 msgid "AUTHOR"
 msgstr "TEKIJÄ"
 
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
 msgid "SEE ALSO"
 msgstr "KATSO MYÖS"
 
-#: help2man:539
+#: help2man:591
 #, perl-format
 msgid ""
 "The full documentation for\n"
@@ -222,18 +257,148 @@ msgstr ""
 ".PP\n"
 "pitäisi antaa täydellinen manuaali luettavaksi.\n"
 
-#: help2man:591
+#: help2man:643
 #, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: virhe kirjoitettaessa tiedostoon %s (%s)"
 
-#: help2man:608
+#: help2man:660
 #, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: ei saatu \"%s\"-tietoa ohjelmalta %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: ei saatu \"%s\"-tietoa ohjelmalta %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Suomennos help2man-ohjelman man-sivusta"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- luo yksinkertainen man-sivu"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "SISÄLLYTÄ TIEDOSTOJA"
+
+#: help2man.h2m.PL:85
+msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options.  The format is simple:\n"
+"\n"
+"    [section]\n"
+"    text\n"
+"\n"
+"    /pattern/\n"
+"    text\n"
+msgstr ""
+"Lisämateriaalia voi sisällyttää luotavaan tulosteeseen valitsimilla\n"
+".B \\-\\-include\n"
+"ja\n"
+".BR \\-\\-opt\\-include .\n"
+"Muoto on yksinkertainen:\n"
+"\n"
+"    [kappale]\n"
+"    teksti\n"
+"\n"
+"    /hakuehto/\n"
+"    teksti\n"
 
-#: help2man:609
+#: help2man.h2m.PL:100
 msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Kappaleita puhdasta *roff-tekstiä lisätään tulosteeseen joko kun alkaa\n"
+".BI [ kappale ]\n"
+"(kirjainkoko merkitsevä) tai sellaisen kappaleen jälkeen, joka täsmää\n"
+"säännölliseen lausekkeeseen\n"
 "\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+".BI / hakuehto /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Hakuehdoissa käytetään Perlin säännöllisten lausekkeiden syntaksia, ja\n"
+"niiden perässä voi olla\n"
+".IR i ,\n"
+".I s\n"
+"tai\n"
+".I m\n"
+"muuntimet (katso\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options.  Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
 msgstr ""
+"Rivit ennen ensimmäistä kappaletta tai hakuehtoa, jotka alkavat \"\\-\",\n"
+"käsitellään valitsimina. Kaikki muu ohitetaan, joten ne voivat olla\n"
+"käyttäjän kommentteja, RCS-avainsanoja ja muuta sellaista.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Kappaleiden tulostusjärjestys on:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "muut"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Kappale\n"
+".B [NIMI]\n"
+"tai\n"
+".BR [YLEISKATSAUS] ,\n"
+"joka löytyy sisällytystiedostosta, korvaa muutoin automaattisesti\n"
+"tuotettavan osan (vaikka tämänkin voi korvata\n"
+".B --name\n"
+"-valitsimella tarvittaessa).\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Muut kappaleet aloittavat automaattisesti tuotetun tulosteen aiemmin\n"
+"mainituille vakiokappaleille, tai ne sisällytetään kohtaan\n"
+".I muut\n"
+"samassa järjestyksessä kuin ne esiintyvät sisällytystiedostossa.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "SAATAVUUS"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Tuorein versio tästä sovelluksesta on saatavilla verkossa osoitteesta:"
diff --git a/po/fr.gmo b/po/fr.gmo
index 0a12806..24d3044 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index d93327c..957f3d7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.36.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
 "PO-Revision-Date: 2005-11-01 21:13+0100\n"
 "Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -14,12 +14,13 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help2man:48
+#: help2man:69
 #, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -28,7 +29,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "Ce logiciel est libre ; voir les sources pour les conditions de\n"
 "reproduction. AUCUNE garantie n'est donnée, pas même la garantie\n"
@@ -36,7 +38,7 @@ msgstr ""
 "\n"
 "Écrit par Brendan O'Dea <bod@debian.org>\n"
 
-#: help2man:59
+#: help2man:80
 #, fuzzy, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -98,49 +100,52 @@ msgstr ""
 "\n"
 "Signaler les bogues à <bug-help2man@gnu.org>.\n"
 
-#: help2man:138
+#: help2man:161
 #, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr "%s: impossible d'ouvrir « %s » (%s)"
 
-#: help2man:199
+#: help2man:222
 #, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: aucune information valable trouvée dans « %s »"
 
-#: help2man:222
+#: help2man:245
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr "%s: impossible d'effacer %s (%s)"
 
-#: help2man:226
+#: help2man:249
 #, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr "%s: impossible de créer « %s » (%s)"
 
 #  Title of the NAME section in generated localized manual pages
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings.  The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
 msgid "NAME"
 msgstr "NOM"
 
 #  Manual page title
-#: help2man:277
+#: help2man:303
 #, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr "%s \\- page de manuel de %s %s"
 
 #  Name of a common manual section
-#: help2man:291
+#: help2man:317
 msgid "System Administration Utilities"
 msgstr "Utilitaires d'administration système"
 
 #  Name of a common manual section
-#: help2man:292
+#: help2man:318
 msgid "Games"
 msgstr "Jeux"
 
 #  Name of a common manual section
-#: help2man:293
+#: help2man:319
 msgid "User Commands"
 msgstr "Commandes"
 
@@ -151,93 +156,123 @@ msgstr "Commandes"
 #    2. All French manual pages contain "Usage" when displaying their
 #       synopsis
 #  For these reasons, "Usage" has been kept.
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output.  An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or:  cp [OPTION]... SOURCE... DIRECTORY
+#. or:  cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
 msgid "Usage"
 msgstr "Usage"
 
 #  This string is a delimiter used when parsing 'PROGRAM --help' output,
 #  when several synopsis commands are displayed.  See for instance
 #  'cp --help".
-#: help2man:299
+#: help2man:331
 msgid "or"
 msgstr "\\s*ou"
 
 #  Title of the SYNOPSIS section in generated localized manual pages
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
 #  Title of the DESCRIPTION section in generated localized manual pages
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
 #  When a string matches this regular expression, it is put into a
 #  BUGS section.
-#: help2man:351
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions.  If there is more than one commonly used string, you
+#. may separate alternatives with "|".  Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched.  The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
 #, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
 msgstr ""
 "Signaler +les +bogues|Rapporter +les +bogues|Rapporter +toutes +anomalies|"
 "Envoyer +les +rapports +de +bogue +à"
 
 #  When a string matches this regular expression, it is put into an
 #  AUTHOR section.
-#: help2man:352
+#: help2man:392
 msgid "Written +by"
 msgstr "Écrit +par"
 
 #  When a string matches this regular expression, it is put into an
 #  OPTIONS section.
-#: help2man:353
+#: help2man:393
 msgid "Options"
 msgstr "Options"
 
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
 #  When a string matches this regular expression, it is put into an
 #  EXAMPLE section.
-#: help2man:354
+#: help2man:396
 msgid "Examples"
 msgstr "Exemples"
 
 #  When a string matches this regular expression, the paragraph is
 #  reformatted so that copyright notice appears on a single line.
-#: help2man:355
+#: help2man:397
 msgid "This +is +free +software"
 msgstr "Ce +logiciel +est +libre"
 
 #  Title of the OPTIONS section in generated localized manual pages
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
 #  Title of the EXAMPLES section in generated localized manual pages
-#: help2man:376 help2man:561
+#: help2man:428 help2man:613 help2man.h2m.PL:135
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
 
 #  Title of the COPYRIGHT section in generated localized manual pages
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 #  Title of the BUGS section in generated localized manual pages
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
 msgid "REPORTING BUGS"
 msgstr "SIGNALER DES BOGUES"
 
 #  Title of the AUTHOR section in generated localized manual pages
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #  Title of the SEE ALSO section in generated localized manual pages
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #  Paragraph added into localized manual pages to point to info
 #  documentation.
-#: help2man:539
+#: help2man:591
 #, perl-format
 msgid ""
 "The full documentation for\n"
@@ -265,18 +300,156 @@ msgstr ""
 ".PP\n"
 "devrait vous donner accès au manuel complet (en anglais).\n"
 
-#: help2man:591
+#: help2man:643
 #, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: erreur d'écriture sur %s (%s)"
 
-#: help2man:608
+#: help2man:660
 #, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: impossible de récupérer l'information « %s » de %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: impossible de récupérer l'information « %s » de %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr ""
+"Traduction française du fichier inclus pour générer la page\n"
+"de manuel de help2man"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- génère une page de manuel sommaire"
 
-#: help2man:609
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "FICHIERS INCLUS"
+
+#: help2man.h2m.PL:85
 msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options.  The format is simple:\n"
+"\n"
+"    [section]\n"
+"    text\n"
 "\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+"    /pattern/\n"
+"    text\n"
+msgstr ""
+"On peut ajouter un supplément de texte aux indications fournies par le\n"
+"programme grâce aux options\n"
+".B \\-\\-include\n"
+"et\n"
+".BR \\-\\-opt\\-include .\n"
+"Le format est simple\\ :\n"
+"\n"
+"    [section]\n"
+"    texte\n"
+"\n"
+"    /motif/\n"
+"    texte\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Les blocs de texte (au format *roff) sont insérés tels quels dans la\n"
+"sortie, soit au début de la zone désignée par\n"
+".BI [ section ]\n"
+"(balise insensible à la casse), soit après un paragraphe correspondant à\n"
+".BI / motif /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Les motifs obéissent à la syntaxe des expressions rationnelles de Perl\n"
+"et peuvent être suivis des modificateurs\n"
+".IR i ,\n"
+".I s\n"
+"ou\n"
+".I m\n"
+"(voir\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options.  Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+"Les lignes précédant la première section (ou le premier motif) et\n"
+"commençant par «\\ \\-\\ » sont traitées comme des options. Tout le\n"
+"reste est ignoré sans aucun avertissement, et peut être utilisé pour\n"
+"des commentaires, des mots clés RCS ou d'autres éléments.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "L'ordre des sections produites est\\ :"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "autres"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Toute section\n"
+".B [NOM]\n"
+"ou\n"
+".B [SYNOPSIS]\n"
+"apparaissant dans le fichier inclus va remplacer celle qui aurait êté\n"
+"générée automatiquement (mais vous pouvez encore remplacer la première\n"
+"avec\n"
+".B --name\n"
+"si nécessaire).\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Le texte supplémentaire aux autres sections usuelles (celles\n"
+"apparaissant dans cette liste) est inséré avant la sortie générée\n"
+"automatiquement pour elles.\n"
+"Les sections non usuelles sont insérées à la place marquée\n"
+".I autres\n"
+"dans la liste ci-dessus, dans l'ordre dans lequel ces sections\n"
+"apparaissent dans le fichier inclus.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "DISPONIBILITÉ"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
 msgstr ""
+"La dernière version de cette distribution est disponible en ligne sur\\ :"
diff --git a/po/help2man.pot b/po/help2man.pot
index 3fb6662..2a48c35 100644
--- a/po/help2man.pot
+++ b/po/help2man.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,12 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help2man:48
+#: help2man:69
 #, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -29,7 +30,7 @@ msgid ""
 "Written by Brendan O'Dea <bod@debian.org>\n"
 msgstr ""
 
-#: help2man:59
+#: help2man:80
 #, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -61,108 +62,141 @@ msgid ""
 "Report bugs to <bug-help2man@gnu.org>.\n"
 msgstr ""
 
-#: help2man:138
+#: help2man:161
 #, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr ""
 
-#: help2man:199
+#: help2man:222
 #, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr ""
 
-#: help2man:222
+#: help2man:245
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr ""
 
-#: help2man:226
+#: help2man:249
 #, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr ""
 
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings.  The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
 msgid "NAME"
 msgstr ""
 
-#: help2man:277
+#: help2man:303
 #, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr ""
 
-#: help2man:291
+#: help2man:317
 msgid "System Administration Utilities"
 msgstr ""
 
-#: help2man:292
+#: help2man:318
 msgid "Games"
 msgstr ""
 
-#: help2man:293
+#: help2man:319
 msgid "User Commands"
 msgstr ""
 
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output.  An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or:  cp [OPTION]... SOURCE... DIRECTORY
+#. or:  cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
 msgid "Usage"
 msgstr ""
 
-#: help2man:299
+#: help2man:331
 msgid "or"
 msgstr ""
 
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
 msgid "SYNOPSIS"
 msgstr ""
 
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
 msgid "DESCRIPTION"
 msgstr ""
 
-#: help2man:351
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions.  If there is more than one commonly used string, you
+#. may separate alternatives with "|".  Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched.  The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
 msgstr ""
 
-#: help2man:352
+#: help2man:392
 msgid "Written +by"
 msgstr ""
 
-#: help2man:353
+#: help2man:393
 msgid "Options"
 msgstr ""
 
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
 msgid "Examples"
 msgstr ""
 
-#: help2man:355
+#: help2man:397
 msgid "This +is +free +software"
 msgstr ""
 
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
 msgid "OPTIONS"
 msgstr ""
 
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
 msgid "EXAMPLES"
 msgstr ""
 
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
 msgid "COPYRIGHT"
 msgstr ""
 
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
 msgid "REPORTING BUGS"
 msgstr ""
 
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
 msgid "AUTHOR"
 msgstr ""
 
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
 msgid "SEE ALSO"
 msgstr ""
 
-#: help2man:539
+#: help2man:591
 #, perl-format
 msgid ""
 "The full documentation for\n"
@@ -178,18 +212,108 @@ msgid ""
 "should give you access to the complete manual.\n"
 msgstr ""
 
-#: help2man:591
+#: help2man:643
 #, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr ""
 
-#: help2man:608
+#: help2man:660
 #, perl-format
-msgid "%s: can't get `%s' info from %s"
+msgid "%s: can't get `%s' info from %s%s"
 msgstr ""
 
-#: help2man:609
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr ""
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr ""
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr ""
+
+#: help2man.h2m.PL:85
 msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options.  The format is simple:\n"
 "\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+"    [section]\n"
+"    text\n"
+"\n"
+"    /pattern/\n"
+"    text\n"
+msgstr ""
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options.  Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr ""
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr ""
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr ""
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
 msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
index 28ec213..00668c5 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 97e527d..87e5e18 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,26 +1,27 @@
 # Polish translation for help2man.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation
+# Copyright (C) 2003, 2004, 2005, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the help2man package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2005.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: help2man 1.36.1\n"
+"Project-Id-Version: help2man 1.38.1-pre1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
-"PO-Revision-Date: 2005-10-19 19:40+0200\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
+"PO-Revision-Date: 2010-04-13 22:06+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help2man:48
+#: help2man:69
 #, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -29,7 +30,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "Ten program jest darmowy; warunki kopiowania s± opisane w ¼ród³ach.\n"
 "Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji PRZYDATNO¦CI\n"
@@ -37,8 +39,8 @@ msgstr ""
 "\n"
 "Program napisa³ Brendan O'Dea <bod@debian.org>\n"
 
-#: help2man:59
-#, fuzzy, perl-format
+#: help2man:80
+#, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
 "\n"
@@ -91,113 +93,147 @@ msgstr ""
 "\n"
 " -h, --help-option=£AÑCUCH     ³añcuch opcji pomocy\n"
 " -v, --version-option=£AÑCUCH  ³añcuch opcji wersji\n"
+" --version-string=£AÑCUCH      ³añcuch wersji\n"
+" --no-discard-stderr           do³±czenie stderr przy analizie wyj¶cia\n"
 "\n"
-"B³êdy proszê zg³aszaæ na adres <bug-help2man@gnu.org>.\n"
+"B³êdy prosimy zg³aszaæ na adres <bug-help2man@gnu.org>.\n"
 
-#: help2man:138
+#: help2man:161
 #, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr "%s: nie mo¿na otworzyæ `%s' (%s)"
 
-#: help2man:199
+#: help2man:222
 #, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: nie znaleziono poprawnej informacji w `%s'"
 
-#: help2man:222
+#: help2man:245
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr "%s: nie mo¿na usun±æ %s (%s)"
 
-#: help2man:226
+#: help2man:249
 #, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr "%s: nie mo¿na utworzyæ %s (%s)"
 
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings.  The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
 msgid "NAME"
 msgstr "NAZWA"
 
-#: help2man:277
+#: help2man:303
 #, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr "%s \\- strona podrêcznika dla %s %s"
 
-#: help2man:291
+#: help2man:317
 msgid "System Administration Utilities"
 msgstr "Narzêdzia administracyjne"
 
-#: help2man:292
+#: help2man:318
 msgid "Games"
 msgstr "Gry"
 
-#: help2man:293
+#: help2man:319
 msgid "User Commands"
 msgstr "Polecenia u¿ytkownika"
 
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output.  An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or:  cp [OPTION]... SOURCE... DIRECTORY
+#. or:  cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
 msgid "Usage"
 msgstr "Sk³adnia|U¿ycie"
 
-#: help2man:299
+#: help2man:331
 msgid "or"
 msgstr "lub|albo"
 
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
 msgid "SYNOPSIS"
 msgstr "SK£ADNIA"
 
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: help2man:351
-#, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions.  If there is more than one commonly used string, you
+#. may separate alternatives with "|".  Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched.  The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
 msgstr ""
 "B³êdy +(proszê|prosimy) +zg³aszaæ +na +adres|Raporty +o +b³êdach +wysy³aj +do"
 
-#: help2man:352
+#: help2man:392
 msgid "Written +by"
 msgstr "Napisany +przez|Program +napisa(³a?|li)"
 
-#: help2man:353
+#: help2man:393
 msgid "Options"
 msgstr "Opcje"
 
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr "¦rodowisko"
+
+#: help2man:395
+msgid "Files"
+msgstr "Pliki"
+
+#: help2man:396
 msgid "Examples"
 msgstr "Przyk³ady"
 
-#: help2man:355
+#: help2man:397
 msgid "This +is +free +software"
 msgstr "Ten +program +jest +darmowy"
 
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
 msgid "OPTIONS"
 msgstr "OPCJE"
 
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr "¦RODOWISKO"
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr "PLIKI"
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
 msgid "EXAMPLES"
 msgstr "PRZYK£ADY"
 
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
 msgid "REPORTING BUGS"
 msgstr "ZG£ASZANIE B£ÊDÓW"
 
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
 msgid "AUTHOR"
 msgstr "AUTOR"
 
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAK¯E"
 
-#: help2man:539
+#: help2man:591
 #, perl-format
 msgid ""
 "The full documentation for\n"
@@ -224,18 +260,150 @@ msgstr ""
 ".PP\n"
 "powinno udostêpniæ kompletny podrêcznik.\n"
 
-#: help2man:591
+#: help2man:643
 #, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: b³±d zapisu do %s (%s)"
 
-#: help2man:608
+#: help2man:660
 #, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: nie mo¿na uzyskaæ informacji `%s' z %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: nie mo¿na uzyskaæ informacji `%s' z %s%s"
 
-#: help2man:609
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+"Opcja `--no-discard-stderr' pomo¿e, je¶li program wypisuje opis na stderr"
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Plik do³±czany do strony podrêcznika help2man"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- generowanie prostej strony podrêcznika"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "DO£¡CZANE PLIKI"
+
+#: help2man.h2m.PL:85
 msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options.  The format is simple:\n"
 "\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+"    [section]\n"
+"    text\n"
+"\n"
+"    /pattern/\n"
+"    text\n"
 msgstr ""
+"Do generowanego pliku mo¿na do³±czyæ dodatkowy materia³ przy pomocy\n"
+"opcji\n"
+".B \\-\\-include\n"
+"i\n"
+".BR \\-\\-opt\\-include .\n"
+"Format jest prosty:\n"
+"\n"
+"    [sekcja]\n"
+"    tekst\n"
+"\n"
+"    /wzorzec/\n"
+"    tekst\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Bloki sformatowanego tekstu *roff s± wstawiane do wyj¶cia na pocz±tku\n"
+"podanej\n"
+".BI [ sekcji ]\n"
+"(bez rozró¿niania wielko¶ci liter) lub po akapicie pasuj±cym do\n"
+".BI / wzorca /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Wzorce zapisuje siê przy u¿yciu sk³adni perlowych wyra¿eñ regularnych\n"
+"i mo¿na je zakoñczyæ modyfikatorami\n"
+".IR i ,\n"
+".I s\n"
+"lub\n"
+".I m\n"
+"(patrz\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options.  Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+"Linie przed pierwsz± sekcj± lub wzorzec zaczynaj±cy siê od `\\-' s±\n"
+"przetwarzane jako opcje. Ca³a reszta jest po cichu ignorowana i mo¿e\n"
+"byæ u¿ywana jako komentarze, s³owa kluczowe RCS itp.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Kolejno¶æ sekcji na wyj¶ciu to:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "inne"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Ka¿da sekcja\n"
+".B [nazwa]\n"
+"lib\n"
+".B [sk³adnia]\n"
+"wystêpuj±ca w pliku do³±czanym zastêpuje to, co zosta³oby automatycznie\n"
+"wyprodukowane (aczkolwiek mo¿na w razie potrzeby obej¶æ to zachowanie przez\n"
+".B --name\n"
+").\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Inne sekcje s± do³±czane do automatycznie generowanego wyj¶cia\n"
+"w przypadku standardowych, wy¿ej wymienionych sekcji lub w³±czane\n"
+"w miejscu\n"
+".I inne\n"
+"(jak wy¿ej) w kolejno¶ci, w jakiej wyst±pi³y w do³±czanym pliku.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "DOSTÊPNO¦Æ"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Najnowsza wersja tego oprogramowania jest dostêpna pod:"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 38b98a3..aef3d9c 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index edff41b..63d30fc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.36.4\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
 "PO-Revision-Date: 2009-08-31 14:13-0300\n"
 "Last-Translator: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>\n"
 "Language-Team: Brazilian Portugues <ldp-br@bazar2.conectiva.com.br>\n"
@@ -16,12 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: help2man:48
+#: help2man:69
 #, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -29,7 +30,7 @@ msgid ""
 "Written by Brendan O'Dea <bod@debian.org>\n"
 msgstr ""
 
-#: help2man:59
+#: help2man:80
 #, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -61,111 +62,144 @@ msgid ""
 "Report bugs to <bug-help2man@gnu.org>.\n"
 msgstr ""
 
-#: help2man:138
+#: help2man:161
 #, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr "%s: não é possível abrir \"%s\" (%s)"
 
-#: help2man:199
+#: help2man:222
 #, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: não foi encontrada uma informação válida em \"%s\""
 
-#: help2man:222
+#: help2man:245
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr "%s: não é possível excluir %s (%s)"
 
-#: help2man:226
+#: help2man:249
 #, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr "%s: não é possível criar %s (%s)"
 
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings.  The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
 msgid "NAME"
 msgstr "NOME"
 
-#: help2man:277
+#: help2man:303
 #, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr "%s \\- página de manual para %s %s"
 
-#: help2man:291
+#: help2man:317
 msgid "System Administration Utilities"
 msgstr "Utilitários administrativos do sistema"
 
-#: help2man:292
+#: help2man:318
 msgid "Games"
 msgstr "Jogos"
 
-#: help2man:293
+#: help2man:319
 msgid "User Commands"
 msgstr "Comandos de usuário"
 
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output.  An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or:  cp [OPTION]... SOURCE... DIRECTORY
+#. or:  cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
 msgid "Usage"
 msgstr "Uso"
 
-#: help2man:299
+#: help2man:331
 msgid "or"
 msgstr "ou"
 
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
 msgid "SYNOPSIS"
 msgstr "SINOPSE"
 
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
 msgid "DESCRIPTION"
 msgstr "DESCRIÇÃO"
 
-#: help2man:351
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions.  If there is more than one commonly used string, you
+#. may separate alternatives with "|".  Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched.  The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
 #, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
 msgstr ""
 "Relate +problemas|Relate +bugs|Relate +defeitos|Envie +relatório +problemas|"
 "Envie +relatório +bugs|Envie +relatório +defeitos"
 
-#: help2man:352
+#: help2man:392
 msgid "Written +by"
 msgstr "Escrito +por"
 
-#: help2man:353
+#: help2man:393
 msgid "Options"
 msgstr "Opções"
 
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
 msgid "Examples"
 msgstr "Exemplos"
 
-#: help2man:355
+#: help2man:397
 msgid "This +is +free +software"
 msgstr ""
 
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
 msgid "OPTIONS"
 msgstr "OPÇÕES"
 
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
 msgid "EXAMPLES"
 msgstr "EXEMPLOS"
 
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
 msgid "COPYRIGHT"
 msgstr "DIREITOS AUTORAIS"
 
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
 msgid "REPORTING BUGS"
 msgstr "RELATANDO PROBLEMAS"
 
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
 msgid "AUTHOR"
 msgstr "AUTOR"
 
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
 
-#: help2man:539
+#: help2man:591
 #, perl-format
 msgid ""
 "The full documentation for\n"
@@ -181,18 +215,149 @@ msgid ""
 "should give you access to the complete manual.\n"
 msgstr ""
 
-#: help2man:591
+#: help2man:643
 #, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: erro ao escrever em %s (%s)"
 
-#: help2man:608
+#: help2man:660
 #, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: não é possível obter informações \"%s\" do programa %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: não é possível obter informações \"%s\" do programa %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Arquivo de inclusão para a página de manual do help2man"
 
-#: help2man:609
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- gera uma página de manual simples"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "ARQUIVOS INCLUSOS"
+
+#: help2man.h2m.PL:85
 msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options.  The format is simple:\n"
+"\n"
+"    [section]\n"
+"    text\n"
+"\n"
+"    /pattern/\n"
+"    text\n"
+msgstr ""
+"Materiais adicionais podem ser incluídos na saída gerada com as opções\n"
+".B \\-\\-include\n"
+"e\n"
+".B \\-\\-opt\\-include\n"
+".  O formato é simples:\n"
+"\n"
+"    [seção]\n"
+"    texto\n"
 "\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+"    /padrão/\n"
+"    texto\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Blocos de texto *roff literais são inseridos na saída ou no início de\n"
+"uma dada\n"
+".BI [ seção ]\n"
+"(indiferente à maiusculização), ou após um parágrafo que coincida com o\n"
+".BI / padrão /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Os padrões usam a sintaxe Perl de expressão regular e podem ser seguidos\n"
+"pelos modificadores\n"
+".IR i ,\n"
+".I s\n"
+"ou\n"
+".I m\n"
+"(veja\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options.  Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
 msgstr ""
+"As linhas antes da primeira seção ou de um padrão que comece com\n"
+"\"\\-\" são processados como opções. Qualquer outra coisa é ignorada\n"
+"silenciosamente e pode ser usada para comentários, palavras-chaves\n"
+"RCS e coisas do tipo.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "A ordem da saída das seções é:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "outra"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Quaisquer seções\n"
+".B [nome]\n"
+"ou\n"
+".B [sinopse]\n"
+"que apareçam no arquivo de inclusão substituirá o que seria\n"
+"produzido automaticamente (embora você ainda possa sobrepor\n"
+"o primeiro com\n"
+".B --name\n"
+"se necessário).\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Outras seções são acrescentadas antes da saída produzida automaticamente\n"
+"para as seções padrões citadas acima ou inclusas na posição\n"
+".I outra\n"
+"(acima) na ordem em que elas forem encontradas no arquivo de inclusão.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "DISPONIBILIDADE"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "A última versão desta distribuição está disponível on-line em:"
diff --git a/po/sv.gmo b/po/sv.gmo
index 409d79d..cd68bc0 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 7931e4c..c7536e4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.36.3\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
 "PO-Revision-Date: 2006-01-23 20:33+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -15,12 +15,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help2man:48
+#: help2man:69
 #, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -29,7 +30,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
 "Free Software Foundation, Inc.\n"
 "Det här är fri programvara; se källkoden för kopieringsvillkor.  Det finns "
 "INGEN\n"
@@ -37,7 +39,7 @@ msgstr ""
 "\n"
 "Skrivet av Brendan O'Dea <bod@debian.org>\n"
 
-#: help2man:59
+#: help2man:80
 #, fuzzy, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -94,109 +96,142 @@ msgstr ""
 "Rapportera fel till <bug-help2man@gnu.org>.\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
 
-#: help2man:138
+#: help2man:161
 #, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr "%s: kan inte öppna \"%s\" (%s)"
 
-#: help2man:199
+#: help2man:222
 #, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: ingen giltig information funnen i \"%s\""
 
-#: help2man:222
+#: help2man:245
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr "%s: kan inte avlänka %s (%s)"
 
-#: help2man:226
+#: help2man:249
 #, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr "%s: kan inte skapa %s (%s)"
 
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings.  The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
 msgid "NAME"
 msgstr "NAMN"
 
-#: help2man:277
+#: help2man:303
 #, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr "%s \\- manualsida för %s %s"
 
-#: help2man:291
+#: help2man:317
 msgid "System Administration Utilities"
 msgstr "Systemadministrationsverktyg"
 
-#: help2man:292
+#: help2man:318
 msgid "Games"
 msgstr "Spel"
 
-#: help2man:293
+#: help2man:319
 msgid "User Commands"
 msgstr "Användarkommandon"
 
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output.  An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or:  cp [OPTION]... SOURCE... DIRECTORY
+#. or:  cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
 msgid "Usage"
 msgstr "Användning"
 
-#: help2man:299
+#: help2man:331
 msgid "or"
 msgstr "eller"
 
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
 msgid "DESCRIPTION"
 msgstr "BESKRIVNING"
 
-#: help2man:351
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions.  If there is more than one commonly used string, you
+#. may separate alternatives with "|".  Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched.  The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
 #, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
 msgstr "Rapportera +fel|E-post +fel +rapport +till"
 
-#: help2man:352
+#: help2man:392
 msgid "Written +by"
 msgstr "Skrivet +av"
 
-#: help2man:353
+#: help2man:393
 msgid "Options"
 msgstr "Alternativ"
 
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
 msgid "Examples"
 msgstr "Exempel"
 
-#: help2man:355
+#: help2man:397
 msgid "This +is +free +software"
 msgstr "Det +här +är +fri +programvara"
 
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
 msgid "OPTIONS"
 msgstr "FLAGGOR"
 
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
 msgid "EXAMPLES"
 msgstr "EXEMPEL"
 
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
 msgid "REPORTING BUGS"
 msgstr "RAPPORTERA FEL"
 
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
 msgid "AUTHOR"
 msgstr "UPPHOVSMAN"
 
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
 msgid "SEE ALSO"
 msgstr "SE OCKSÃ…"
 
-#: help2man:539
+#: help2man:591
 #, perl-format
 msgid ""
 "The full documentation for\n"
@@ -224,18 +259,150 @@ msgstr ""
 ".PP\n"
 "bör ge dig tillgång till den kompletta manualen.\n"
 
-#: help2man:591
+#: help2man:643
 #, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: fel vid skrivning till %s (%s)"
 
-#: help2man:608
+#: help2man:660
 #, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: kan inte få \"%s\" info från %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: kan inte få \"%s\" info från %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr ""
 
-#: help2man:609
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- generera en enkel manualsida"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "INKLUDERA FILER"
+
+#: help2man.h2m.PL:85
 msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options.  The format is simple:\n"
+"\n"
+"    [section]\n"
+"    text\n"
+"\n"
+"    /pattern/\n"
+"    text\n"
+msgstr ""
+"Ytterligare material kan inkluderas i den genererade utskriften med "
+"flaggorna\n"
+".B \\-\\-include\n"
+"och\n"
+".B \\-\\-opt\\-include\n"
+"Formatet är enkelt:\n"
+"\n"
+"    [sektion]\n"
+"    text\n"
 "\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+"    /mönster/\n"
+"    text\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Block av *roff-text infogas ord för ord i utskriften antingen vid\n"
+"början av angiven\n"
+".BI [ section ]\n"
+"(okänslig för skiftläge), eller efter en paragraf som matchar\n"
+".BI / mönster /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Mönster använder Perls syntax för reguljära uttryck och kan efterföljas av "
+"modifierarna\n"
+".IR i ,\n"
+".I s\n"
+"eller\n"
+".I m\n"
+"(se\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options.  Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
 msgstr ""
+"Rader före den första sektionen eller mönstret som börjar med \"\\-\"\n"
+"behandlas som flaggor.  Allt annat ignoreras tyst och kan användas\n"
+"för kommentarer, RCS-nyckelord och liknande.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Ordning på sektionsutskriften är:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "övrigt"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Alla sektioner\n"
+".B [namn]\n"
+"eller\n"
+".B [synopsis]\n"
+"som visas i inkluderingsfilen kommer att ersätta vad som skulle\n"
+"automatiskt bli producerat (även om du fortfarande kan åsidosätta\n"
+"de senare med\n"
+".B --name\n"
+"om det krävs).\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Andra sektioner läggs till i början av den automatiskt producerade "
+"utskriften\n"
+"för standardsektionerna angivna ovan, eller inkluderas vid\n"
+".I övrigt\n"
+"(ovan) i den ordning de påträffades i inkluderingsfilen.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "TILLGÄNGLIGHET"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Senaste versionen av den här utgåvan finns tillgänglig online från:"
diff --git a/po/vi.gmo b/po/vi.gmo
new file mode 100644
index 0000000..65b3b99
Binary files /dev/null and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 0000000..36822d5
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,418 @@
+# Vietnamese translation for Help2Man.
+# Copyright © 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the help2man package.
+# Clytie Siddall <clytie@riverland.net.au>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: help2man 1.38.1-pre1\n"
+"Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
+"PO-Revision-Date: 2010-04-13 20:28+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
+
+#: help2man:69
+#, perl-format
+msgid ""
+"GNU %s %s\n"
+"\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
+"Free Software Foundation, Inc.\n"
+"This is free software; see the source for copying conditions.  There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"\n"
+"Written by Brendan O'Dea <bod@debian.org>\n"
+msgstr ""
+"GNU %s %s\n"
+"\n"
+"Tác quyá»n © năm 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
+"của Tổ chức Phần má»m Tá»± do.\n"
+"Äây là phần má»m tá»± do; hãy xem mã nguồn để biết vá» Ä‘iá»u kiện sao chép.\n"
+"KHÔNG có sự đảm bảo nào; THẬM CHà KHÔNG CÓ KHẢ NĂNG THƯƠNG MẠI\n"
+"HAY CHO MỘT MỤC ÄÃCH RIÊNG NÀO ÄÓ.\n"
+"\n"
+"Viết bởi Brendan O'Dea <bod@debian.org>\n"
+
+#: help2man:80
+#, perl-format
+msgid ""
+"`%s' generates a man page out of `--help' and `--version' output.\n"
+"\n"
+"Usage: %s [OPTION]... EXECUTABLE\n"
+"\n"
+" -n, --name=STRING       description for the NAME paragraph\n"
+" -s, --section=SECTION   section number for manual page (1, 6, 8)\n"
+" -m, --manual=TEXT       name of manual (User Commands, ...)\n"
+" -S, --source=TEXT       source of program (FSF, Debian, ...)\n"
+" -L, --locale=STRING     select locale (default \"C\")\n"
+" -i, --include=FILE      include material from `FILE'\n"
+" -I, --opt-include=FILE  include material from `FILE' if it exists\n"
+" -o, --output=FILE       send output to `FILE'\n"
+" -p, --info-page=TEXT    name of Texinfo manual\n"
+" -N, --no-info           suppress pointer to Texinfo manual\n"
+"     --help              print this help, then exit\n"
+"     --version           print version number, then exit\n"
+"\n"
+"EXECUTABLE should accept `--help' and `--version' options and produce output "
+"on\n"
+"stdout although alternatives may be specified using:\n"
+"\n"
+" -h, --help-option=STRING     help option string\n"
+" -v, --version-option=STRING  version option string\n"
+" --version-string=STRING      version string\n"
+" --no-discard-stderr          include stderr when parsing option output\n"
+"\n"
+"Report bugs to <bug-help2man@gnu.org>.\n"
+msgstr ""
+"« %s » tạo má»™t trang hÆ°á»›ng dẫn dá»±a vào kết xuất của tuỳ chá»n\n"
+"`--help' (trợ giúp) và `--version' (phiên bản).\n"
+"\n"
+"Sá»­ dụng: %s [TÙY_CHỌN]... BẢN_THá»°C_HIỆN_ÄƯỢC\n"
+"\n"
+" -n, --name=CHUỖI       mô tả cho đoạn văn TÊN (NAME)\n"
+" -s, --section=PHẦN     số thứ tự phần cho trang hướng dẫn (1, 6, 8)\n"
+" -m, --manual=TÊN       tên của trang hướng dẫn (User Commands, ...)\n"
+" -S, --source=TEXT      nguồn của chương trình (FSF, Debian, ...)\n"
+" -L, --locale=CHUá»–I     chá»n miá»n địa phÆ°Æ¡ng (mặc định \"C\";\n"
+"                        đối với tiếng Việt thì là « vi_VN.UTF-8 »)\n"
+" -i, --include=TỆP      bao gồm dữ liệu từ tập tin này\n"
+" -I, --opt-include=TỆP  bao gồm dữ liệu từ tập tin này nếu có\n"
+" -o, --output=TỆP       gửi kết xuất cho tập tin này\n"
+" -p, --info-page=TÊN    tên của trang hướng dẫn loại Texinfo\n"
+" -N, --no-info          thu hồi cái chỉ tới trang hướng dẫn Texinfo\n"
+"     --help             hiển thị trợ giúp này, sau đó thoát\n"
+"     --version          hiển thị số thứ tự phiên bản, sau đó thoát\n"
+"\n"
+"BẢN_THá»°C_HIỆN_ÄƯỢC nên chấp nhận hai tuỳ chá»n `--help' và `--version'\n"
+"thì xuất qua đầu ra tiêu chuẩn (stdout) dù cũng có thể ghi rõ thêm tuỳ "
+"chá»n:\n"
+"\n"
+" -h, --help-option=CHUá»–I     chuá»—i là tuỳ chá»n trợ giúp\n"
+" -v, --version-option=CHUá»–I  chuá»—i là tuỳ chá»n phiên bản\n"
+" --version-string=CHUỖI      chuỗi phiên bản\n"
+" --no-discard-stderr         bao gồm đầu lỗi tiêu chuẩn\n"
+"                             khi phân tích cú pháp của kết xuất tuỳ chá»n\n"
+"\n"
+"Thông báo lỗi nào cho <bug-help2man@gnu.org>.\n"
+
+#: help2man:161
+#, perl-format
+msgid "%s: can't open `%s' (%s)"
+msgstr "%s: không thể mở « %s » (%s)"
+
+#: help2man:222
+#, perl-format
+msgid "%s: no valid information found in `%s'"
+msgstr "%s: không tìm thấy thông tin hợp lệ trong « %s »"
+
+#: help2man:245
+#, perl-format
+msgid "%s: can't unlink %s (%s)"
+msgstr "%s: không thể bỠliên kết %s (%s)"
+
+#: help2man:249
+#, perl-format
+msgid "%s: can't create %s (%s)"
+msgstr "%s: không thể tạo %s (%s)"
+
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings.  The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
+msgid "NAME"
+msgstr "TÊN"
+
+#: help2man:303
+#, perl-format
+msgid "%s \\- manual page for %s %s"
+msgstr "%s \\- trang hướng dẫn cho %s %s"
+
+#: help2man:317
+msgid "System Administration Utilities"
+msgstr "Tiện ích quản lý hệ thống"
+
+#: help2man:318
+msgid "Games"
+msgstr "Trò chơi"
+
+#: help2man:319
+msgid "User Commands"
+msgstr "Lệnh ngÆ°á»i dùng"
+
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output.  An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or:  cp [OPTION]... SOURCE... DIRECTORY
+#. or:  cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
+msgid "Usage"
+msgstr "Sử dụng"
+
+#: help2man:331
+msgid "or"
+msgstr "hoặc"
+
+#: help2man:362 help2man:612 help2man.h2m.PL:130
+msgid "SYNOPSIS"
+msgstr "TÓM TẮT"
+
+#: help2man:366 help2man:612 help2man.h2m.PL:131
+msgid "DESCRIPTION"
+msgstr "MÔ TẢ"
+
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions.  If there is more than one commonly used string, you
+#. may separate alternatives with "|".  Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched.  The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
+msgstr "Thông +báo +lỗi|Gửi thư +thông +báo +lỗi +cho"
+
+#: help2man:392
+msgid "Written +by"
+msgstr "Viết +bởi"
+
+#: help2man:393
+msgid "Options"
+msgstr "Tuỳ +chá»n"
+
+#: help2man:394
+msgid "Environment"
+msgstr "Môi +trÆ°á»ng"
+
+#: help2man:395
+msgid "Files"
+msgstr "Tập +tin"
+
+#: help2man:396
+msgid "Examples"
+msgstr "Ví +dụ"
+
+#: help2man:397
+msgid "This +is +free +software"
+msgstr "Äây +là +phần +má»m +tá»± +do"
+
+#: help2man:413 help2man:612 help2man.h2m.PL:132
+msgid "OPTIONS"
+msgstr "TÙY CHỌN"
+
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr "MÔI TRƯỜNG"
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr "TỆP"
+
+# type: =head1
+#: help2man:428 help2man:613 help2man.h2m.PL:135
+msgid "EXAMPLES"
+msgstr "Và DỤ"
+
+#: help2man:435 help2man:615 help2man.h2m.PL:139
+msgid "COPYRIGHT"
+msgstr "BẢN QUYỀN"
+
+#: help2man:441 help2man:615 help2man.h2m.PL:138
+msgid "REPORTING BUGS"
+msgstr "THÔNG BÃO Lá»–I"
+
+#: help2man:447 help2man:615 help2man.h2m.PL:137
+msgid "AUTHOR"
+msgstr "TÃC GIẢ"
+
+#: help2man:587 help2man:615 help2man.h2m.PL:140
+msgid "SEE ALSO"
+msgstr "XEM THÊM"
+
+#: help2man:591
+#, perl-format
+msgid ""
+"The full documentation for\n"
+".B %s\n"
+"is maintained as a Texinfo manual.  If the\n"
+".B info\n"
+"and\n"
+".B %s\n"
+"programs are properly installed at your site, the command\n"
+".IP\n"
+".B info %s\n"
+".PP\n"
+"should give you access to the complete manual.\n"
+msgstr ""
+"Tài liệu hÆ°á»›ng dẫn đầy đủ vá»\n"
+".B %s\n"
+"được bảo tồn dưới dạng một sổ tay Texinfo.\n"
+"Nếu chương trình\n"
+".B info\n"
+"và\n"
+".B %s\n"
+"được cài đặt đúng ở địa chỉ của bạn thì câu lệnh\n"
+".IP\n"
+".B info %s\n"
+".PP\n"
+"nên cho phép bạn truy cập đến sổ tay hoàn toàn.\n"
+
+#: help2man:643
+#, perl-format
+msgid "%s: error writing to %s (%s)"
+msgstr "%s:  lỗi ghi nhớ vào %s (%s)"
+
+#: help2man:660
+#, perl-format
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: không thể lấy thông tin « %s » từ %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+"Nếu tuỳ chá»n xuất qua đầu lá»—i tiêu chuẩn thì thá»­ lập cỠ« --no-discard-stderr "
+"»"
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Bao gồm tập tin cho trang hướng dẫn vỠhelp2man"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- tạo một trang hướng dẫn đơn giản"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "TỆP BAO GỒM"
+
+#: help2man.h2m.PL:85
+msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options.  The format is simple:\n"
+"\n"
+"    [section]\n"
+"    text\n"
+"\n"
+"    /pattern/\n"
+"    text\n"
+msgstr ""
+"CÅ©ng có thể bao gồm dữ liệu bổ sung trong kết xuất, dùng tuỳ chá»n\n"
+".B \\-\\-include\n"
+"và\n"
+".B \\-\\-opt\\-include\n"
+"Có một định dạng đơn giản:\n"
+"\n"
+"    [phần]\n"
+"    chuá»—i\n"
+"\n"
+"    /mẫu/\n"
+"    chuá»—i\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Khối văn bản định dạng *roff đúng nguyên văn được chèn vào kết xuất\n"
+"hoặc ở đầu của phần\n"
+".BI [ phần ]\n"
+"(không phân biệt chữ hoa/thÆ°á»ng),\n"
+"hoặc đẳng sau một đoạn văn tương ứng với mẫu\n"
+".BI / mẫu /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Mẫu chấp nhận cú pháp của biểu thức chính quy Perl,\n"
+"và cũng cho phép dấu sửa đổi\n"
+".IR i ,\n"
+".I s\n"
+"hay\n"
+".I m\n"
+"(xem\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options.  Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+"Dòng nào đẳng trước phần đầu tiên hoặc mẫu bắt đầu với « \\- » thì được xử\n"
+"lý dÆ°á»›i dạng tuỳ chá»n. Dữ liệu khác (nếu có) bị bá» qua mà không xuất chi\n"
+"tiết, và có thể được sử dụng làm ghi chú, từ khoá RCS v.v.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Thứ tự xuất phần (đã bao gồm):"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "khác"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Bắt cứ phần\n"
+".B [NAME]\n"
+"hoặc\n"
+".B [SYNOPSIS]\n"
+"nào xuất hiện trong tập tin bao gồm thì thay thế kết xuất tự động tạo\n"
+"(dù bạn vẫn còn có dịp ghi đè lên phần [NAME] bằng:\n"
+".B --name\n"
+"nếu cần).\n"
+"\n"
+"NAME: TÊN\n"
+"SYNOPSIS: TÓM TẮT\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Các phần khác được thêm vào đầu của kết xuất tự động tạo\n"
+"cho những phần tiêu chuẩn đưa ra trên, hoặc được bao gồm tại\n"
+".I other\n"
+"(bên trên) theo thứ tự gặp trong tập tin bao gồm.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "TÃNH SẴN SÀNG"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Phiên bản mới nhất của bản phân phối này có sẵn sàng trực tuyến từ :"