File: ChangeLog

package info (click to toggle)
glabels 3.4.1-6
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 17,888 kB
  • sloc: ansic: 41,314; xml: 10,328; sh: 4,172; makefile: 834
file content (29171 lines) | stat: -rw-r--r-- 814,645 bytes parent folder | download | duplicates (5)
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
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
8154
8155
8156
8157
8158
8159
8160
8161
8162
8163
8164
8165
8166
8167
8168
8169
8170
8171
8172
8173
8174
8175
8176
8177
8178
8179
8180
8181
8182
8183
8184
8185
8186
8187
8188
8189
8190
8191
8192
8193
8194
8195
8196
8197
8198
8199
8200
8201
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
8212
8213
8214
8215
8216
8217
8218
8219
8220
8221
8222
8223
8224
8225
8226
8227
8228
8229
8230
8231
8232
8233
8234
8235
8236
8237
8238
8239
8240
8241
8242
8243
8244
8245
8246
8247
8248
8249
8250
8251
8252
8253
8254
8255
8256
8257
8258
8259
8260
8261
8262
8263
8264
8265
8266
8267
8268
8269
8270
8271
8272
8273
8274
8275
8276
8277
8278
8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
8299
8300
8301
8302
8303
8304
8305
8306
8307
8308
8309
8310
8311
8312
8313
8314
8315
8316
8317
8318
8319
8320
8321
8322
8323
8324
8325
8326
8327
8328
8329
8330
8331
8332
8333
8334
8335
8336
8337
8338
8339
8340
8341
8342
8343
8344
8345
8346
8347
8348
8349
8350
8351
8352
8353
8354
8355
8356
8357
8358
8359
8360
8361
8362
8363
8364
8365
8366
8367
8368
8369
8370
8371
8372
8373
8374
8375
8376
8377
8378
8379
8380
8381
8382
8383
8384
8385
8386
8387
8388
8389
8390
8391
8392
8393
8394
8395
8396
8397
8398
8399
8400
8401
8402
8403
8404
8405
8406
8407
8408
8409
8410
8411
8412
8413
8414
8415
8416
8417
8418
8419
8420
8421
8422
8423
8424
8425
8426
8427
8428
8429
8430
8431
8432
8433
8434
8435
8436
8437
8438
8439
8440
8441
8442
8443
8444
8445
8446
8447
8448
8449
8450
8451
8452
8453
8454
8455
8456
8457
8458
8459
8460
8461
8462
8463
8464
8465
8466
8467
8468
8469
8470
8471
8472
8473
8474
8475
8476
8477
8478
8479
8480
8481
8482
8483
8484
8485
8486
8487
8488
8489
8490
8491
8492
8493
8494
8495
8496
8497
8498
8499
8500
8501
8502
8503
8504
8505
8506
8507
8508
8509
8510
8511
8512
8513
8514
8515
8516
8517
8518
8519
8520
8521
8522
8523
8524
8525
8526
8527
8528
8529
8530
8531
8532
8533
8534
8535
8536
8537
8538
8539
8540
8541
8542
8543
8544
8545
8546
8547
8548
8549
8550
8551
8552
8553
8554
8555
8556
8557
8558
8559
8560
8561
8562
8563
8564
8565
8566
8567
8568
8569
8570
8571
8572
8573
8574
8575
8576
8577
8578
8579
8580
8581
8582
8583
8584
8585
8586
8587
8588
8589
8590
8591
8592
8593
8594
8595
8596
8597
8598
8599
8600
8601
8602
8603
8604
8605
8606
8607
8608
8609
8610
8611
8612
8613
8614
8615
8616
8617
8618
8619
8620
8621
8622
8623
8624
8625
8626
8627
8628
8629
8630
8631
8632
8633
8634
8635
8636
8637
8638
8639
8640
8641
8642
8643
8644
8645
8646
8647
8648
8649
8650
8651
8652
8653
8654
8655
8656
8657
8658
8659
8660
8661
8662
8663
8664
8665
8666
8667
8668
8669
8670
8671
8672
8673
8674
8675
8676
8677
8678
8679
8680
8681
8682
8683
8684
8685
8686
8687
8688
8689
8690
8691
8692
8693
8694
8695
8696
8697
8698
8699
8700
8701
8702
8703
8704
8705
8706
8707
8708
8709
8710
8711
8712
8713
8714
8715
8716
8717
8718
8719
8720
8721
8722
8723
8724
8725
8726
8727
8728
8729
8730
8731
8732
8733
8734
8735
8736
8737
8738
8739
8740
8741
8742
8743
8744
8745
8746
8747
8748
8749
8750
8751
8752
8753
8754
8755
8756
8757
8758
8759
8760
8761
8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776
8777
8778
8779
8780
8781
8782
8783
8784
8785
8786
8787
8788
8789
8790
8791
8792
8793
8794
8795
8796
8797
8798
8799
8800
8801
8802
8803
8804
8805
8806
8807
8808
8809
8810
8811
8812
8813
8814
8815
8816
8817
8818
8819
8820
8821
8822
8823
8824
8825
8826
8827
8828
8829
8830
8831
8832
8833
8834
8835
8836
8837
8838
8839
8840
8841
8842
8843
8844
8845
8846
8847
8848
8849
8850
8851
8852
8853
8854
8855
8856
8857
8858
8859
8860
8861
8862
8863
8864
8865
8866
8867
8868
8869
8870
8871
8872
8873
8874
8875
8876
8877
8878
8879
8880
8881
8882
8883
8884
8885
8886
8887
8888
8889
8890
8891
8892
8893
8894
8895
8896
8897
8898
8899
8900
8901
8902
8903
8904
8905
8906
8907
8908
8909
8910
8911
8912
8913
8914
8915
8916
8917
8918
8919
8920
8921
8922
8923
8924
8925
8926
8927
8928
8929
8930
8931
8932
8933
8934
8935
8936
8937
8938
8939
8940
8941
8942
8943
8944
8945
8946
8947
8948
8949
8950
8951
8952
8953
8954
8955
8956
8957
8958
8959
8960
8961
8962
8963
8964
8965
8966
8967
8968
8969
8970
8971
8972
8973
8974
8975
8976
8977
8978
8979
8980
8981
8982
8983
8984
8985
8986
8987
8988
8989
8990
8991
8992
8993
8994
8995
8996
8997
8998
8999
9000
9001
9002
9003
9004
9005
9006
9007
9008
9009
9010
9011
9012
9013
9014
9015
9016
9017
9018
9019
9020
9021
9022
9023
9024
9025
9026
9027
9028
9029
9030
9031
9032
9033
9034
9035
9036
9037
9038
9039
9040
9041
9042
9043
9044
9045
9046
9047
9048
9049
9050
9051
9052
9053
9054
9055
9056
9057
9058
9059
9060
9061
9062
9063
9064
9065
9066
9067
9068
9069
9070
9071
9072
9073
9074
9075
9076
9077
9078
9079
9080
9081
9082
9083
9084
9085
9086
9087
9088
9089
9090
9091
9092
9093
9094
9095
9096
9097
9098
9099
9100
9101
9102
9103
9104
9105
9106
9107
9108
9109
9110
9111
9112
9113
9114
9115
9116
9117
9118
9119
9120
9121
9122
9123
9124
9125
9126
9127
9128
9129
9130
9131
9132
9133
9134
9135
9136
9137
9138
9139
9140
9141
9142
9143
9144
9145
9146
9147
9148
9149
9150
9151
9152
9153
9154
9155
9156
9157
9158
9159
9160
9161
9162
9163
9164
9165
9166
9167
9168
9169
9170
9171
9172
9173
9174
9175
9176
9177
9178
9179
9180
9181
9182
9183
9184
9185
9186
9187
9188
9189
9190
9191
9192
9193
9194
9195
9196
9197
9198
9199
9200
9201
9202
9203
9204
9205
9206
9207
9208
9209
9210
9211
9212
9213
9214
9215
9216
9217
9218
9219
9220
9221
9222
9223
9224
9225
9226
9227
9228
9229
9230
9231
9232
9233
9234
9235
9236
9237
9238
9239
9240
9241
9242
9243
9244
9245
9246
9247
9248
9249
9250
9251
9252
9253
9254
9255
9256
9257
9258
9259
9260
9261
9262
9263
9264
9265
9266
9267
9268
9269
9270
9271
9272
9273
9274
9275
9276
9277
9278
9279
9280
9281
9282
9283
9284
9285
9286
9287
9288
9289
9290
9291
9292
9293
9294
9295
9296
9297
9298
9299
9300
9301
9302
9303
9304
9305
9306
9307
9308
9309
9310
9311
9312
9313
9314
9315
9316
9317
9318
9319
9320
9321
9322
9323
9324
9325
9326
9327
9328
9329
9330
9331
9332
9333
9334
9335
9336
9337
9338
9339
9340
9341
9342
9343
9344
9345
9346
9347
9348
9349
9350
9351
9352
9353
9354
9355
9356
9357
9358
9359
9360
9361
9362
9363
9364
9365
9366
9367
9368
9369
9370
9371
9372
9373
9374
9375
9376
9377
9378
9379
9380
9381
9382
9383
9384
9385
9386
9387
9388
9389
9390
9391
9392
9393
9394
9395
9396
9397
9398
9399
9400
9401
9402
9403
9404
9405
9406
9407
9408
9409
9410
9411
9412
9413
9414
9415
9416
9417
9418
9419
9420
9421
9422
9423
9424
9425
9426
9427
9428
9429
9430
9431
9432
9433
9434
9435
9436
9437
9438
9439
9440
9441
9442
9443
9444
9445
9446
9447
9448
9449
9450
9451
9452
9453
9454
9455
9456
9457
9458
9459
9460
9461
9462
9463
9464
9465
9466
9467
9468
9469
9470
9471
9472
9473
9474
9475
9476
9477
9478
9479
9480
9481
9482
9483
9484
9485
9486
9487
9488
9489
9490
9491
9492
9493
9494
9495
9496
9497
9498
9499
9500
9501
9502
9503
9504
9505
9506
9507
9508
9509
9510
9511
9512
9513
9514
9515
9516
9517
9518
9519
9520
9521
9522
9523
9524
9525
9526
9527
9528
9529
9530
9531
9532
9533
9534
9535
9536
9537
9538
9539
9540
9541
9542
9543
9544
9545
9546
9547
9548
9549
9550
9551
9552
9553
9554
9555
9556
9557
9558
9559
9560
9561
9562
9563
9564
9565
9566
9567
9568
9569
9570
9571
9572
9573
9574
9575
9576
9577
9578
9579
9580
9581
9582
9583
9584
9585
9586
9587
9588
9589
9590
9591
9592
9593
9594
9595
9596
9597
9598
9599
9600
9601
9602
9603
9604
9605
9606
9607
9608
9609
9610
9611
9612
9613
9614
9615
9616
9617
9618
9619
9620
9621
9622
9623
9624
9625
9626
9627
9628
9629
9630
9631
9632
9633
9634
9635
9636
9637
9638
9639
9640
9641
9642
9643
9644
9645
9646
9647
9648
9649
9650
9651
9652
9653
9654
9655
9656
9657
9658
9659
9660
9661
9662
9663
9664
9665
9666
9667
9668
9669
9670
9671
9672
9673
9674
9675
9676
9677
9678
9679
9680
9681
9682
9683
9684
9685
9686
9687
9688
9689
9690
9691
9692
9693
9694
9695
9696
9697
9698
9699
9700
9701
9702
9703
9704
9705
9706
9707
9708
9709
9710
9711
9712
9713
9714
9715
9716
9717
9718
9719
9720
9721
9722
9723
9724
9725
9726
9727
9728
9729
9730
9731
9732
9733
9734
9735
9736
9737
9738
9739
9740
9741
9742
9743
9744
9745
9746
9747
9748
9749
9750
9751
9752
9753
9754
9755
9756
9757
9758
9759
9760
9761
9762
9763
9764
9765
9766
9767
9768
9769
9770
9771
9772
9773
9774
9775
9776
9777
9778
9779
9780
9781
9782
9783
9784
9785
9786
9787
9788
9789
9790
9791
9792
9793
9794
9795
9796
9797
9798
9799
9800
9801
9802
9803
9804
9805
9806
9807
9808
9809
9810
9811
9812
9813
9814
9815
9816
9817
9818
9819
9820
9821
9822
9823
9824
9825
9826
9827
9828
9829
9830
9831
9832
9833
9834
9835
9836
9837
9838
9839
9840
9841
9842
9843
9844
9845
9846
9847
9848
9849
9850
9851
9852
9853
9854
9855
9856
9857
9858
9859
9860
9861
9862
9863
9864
9865
9866
9867
9868
9869
9870
9871
9872
9873
9874
9875
9876
9877
9878
9879
9880
9881
9882
9883
9884
9885
9886
9887
9888
9889
9890
9891
9892
9893
9894
9895
9896
9897
9898
9899
9900
9901
9902
9903
9904
9905
9906
9907
9908
9909
9910
9911
9912
9913
9914
9915
9916
9917
9918
9919
9920
9921
9922
9923
9924
9925
9926
9927
9928
9929
9930
9931
9932
9933
9934
9935
9936
9937
9938
9939
9940
9941
9942
9943
9944
9945
9946
9947
9948
9949
9950
9951
9952
9953
9954
9955
9956
9957
9958
9959
9960
9961
9962
9963
9964
9965
9966
9967
9968
9969
9970
9971
9972
9973
9974
9975
9976
9977
9978
9979
9980
9981
9982
9983
9984
9985
9986
9987
9988
9989
9990
9991
9992
9993
9994
9995
9996
9997
9998
9999
10000
10001
10002
10003
10004
10005
10006
10007
10008
10009
10010
10011
10012
10013
10014
10015
10016
10017
10018
10019
10020
10021
10022
10023
10024
10025
10026
10027
10028
10029
10030
10031
10032
10033
10034
10035
10036
10037
10038
10039
10040
10041
10042
10043
10044
10045
10046
10047
10048
10049
10050
10051
10052
10053
10054
10055
10056
10057
10058
10059
10060
10061
10062
10063
10064
10065
10066
10067
10068
10069
10070
10071
10072
10073
10074
10075
10076
10077
10078
10079
10080
10081
10082
10083
10084
10085
10086
10087
10088
10089
10090
10091
10092
10093
10094
10095
10096
10097
10098
10099
10100
10101
10102
10103
10104
10105
10106
10107
10108
10109
10110
10111
10112
10113
10114
10115
10116
10117
10118
10119
10120
10121
10122
10123
10124
10125
10126
10127
10128
10129
10130
10131
10132
10133
10134
10135
10136
10137
10138
10139
10140
10141
10142
10143
10144
10145
10146
10147
10148
10149
10150
10151
10152
10153
10154
10155
10156
10157
10158
10159
10160
10161
10162
10163
10164
10165
10166
10167
10168
10169
10170
10171
10172
10173
10174
10175
10176
10177
10178
10179
10180
10181
10182
10183
10184
10185
10186
10187
10188
10189
10190
10191
10192
10193
10194
10195
10196
10197
10198
10199
10200
10201
10202
10203
10204
10205
10206
10207
10208
10209
10210
10211
10212
10213
10214
10215
10216
10217
10218
10219
10220
10221
10222
10223
10224
10225
10226
10227
10228
10229
10230
10231
10232
10233
10234
10235
10236
10237
10238
10239
10240
10241
10242
10243
10244
10245
10246
10247
10248
10249
10250
10251
10252
10253
10254
10255
10256
10257
10258
10259
10260
10261
10262
10263
10264
10265
10266
10267
10268
10269
10270
10271
10272
10273
10274
10275
10276
10277
10278
10279
10280
10281
10282
10283
10284
10285
10286
10287
10288
10289
10290
10291
10292
10293
10294
10295
10296
10297
10298
10299
10300
10301
10302
10303
10304
10305
10306
10307
10308
10309
10310
10311
10312
10313
10314
10315
10316
10317
10318
10319
10320
10321
10322
10323
10324
10325
10326
10327
10328
10329
10330
10331
10332
10333
10334
10335
10336
10337
10338
10339
10340
10341
10342
10343
10344
10345
10346
10347
10348
10349
10350
10351
10352
10353
10354
10355
10356
10357
10358
10359
10360
10361
10362
10363
10364
10365
10366
10367
10368
10369
10370
10371
10372
10373
10374
10375
10376
10377
10378
10379
10380
10381
10382
10383
10384
10385
10386
10387
10388
10389
10390
10391
10392
10393
10394
10395
10396
10397
10398
10399
10400
10401
10402
10403
10404
10405
10406
10407
10408
10409
10410
10411
10412
10413
10414
10415
10416
10417
10418
10419
10420
10421
10422
10423
10424
10425
10426
10427
10428
10429
10430
10431
10432
10433
10434
10435
10436
10437
10438
10439
10440
10441
10442
10443
10444
10445
10446
10447
10448
10449
10450
10451
10452
10453
10454
10455
10456
10457
10458
10459
10460
10461
10462
10463
10464
10465
10466
10467
10468
10469
10470
10471
10472
10473
10474
10475
10476
10477
10478
10479
10480
10481
10482
10483
10484
10485
10486
10487
10488
10489
10490
10491
10492
10493
10494
10495
10496
10497
10498
10499
10500
10501
10502
10503
10504
10505
10506
10507
10508
10509
10510
10511
10512
10513
10514
10515
10516
10517
10518
10519
10520
10521
10522
10523
10524
10525
10526
10527
10528
10529
10530
10531
10532
10533
10534
10535
10536
10537
10538
10539
10540
10541
10542
10543
10544
10545
10546
10547
10548
10549
10550
10551
10552
10553
10554
10555
10556
10557
10558
10559
10560
10561
10562
10563
10564
10565
10566
10567
10568
10569
10570
10571
10572
10573
10574
10575
10576
10577
10578
10579
10580
10581
10582
10583
10584
10585
10586
10587
10588
10589
10590
10591
10592
10593
10594
10595
10596
10597
10598
10599
10600
10601
10602
10603
10604
10605
10606
10607
10608
10609
10610
10611
10612
10613
10614
10615
10616
10617
10618
10619
10620
10621
10622
10623
10624
10625
10626
10627
10628
10629
10630
10631
10632
10633
10634
10635
10636
10637
10638
10639
10640
10641
10642
10643
10644
10645
10646
10647
10648
10649
10650
10651
10652
10653
10654
10655
10656
10657
10658
10659
10660
10661
10662
10663
10664
10665
10666
10667
10668
10669
10670
10671
10672
10673
10674
10675
10676
10677
10678
10679
10680
10681
10682
10683
10684
10685
10686
10687
10688
10689
10690
10691
10692
10693
10694
10695
10696
10697
10698
10699
10700
10701
10702
10703
10704
10705
10706
10707
10708
10709
10710
10711
10712
10713
10714
10715
10716
10717
10718
10719
10720
10721
10722
10723
10724
10725
10726
10727
10728
10729
10730
10731
10732
10733
10734
10735
10736
10737
10738
10739
10740
10741
10742
10743
10744
10745
10746
10747
10748
10749
10750
10751
10752
10753
10754
10755
10756
10757
10758
10759
10760
10761
10762
10763
10764
10765
10766
10767
10768
10769
10770
10771
10772
10773
10774
10775
10776
10777
10778
10779
10780
10781
10782
10783
10784
10785
10786
10787
10788
10789
10790
10791
10792
10793
10794
10795
10796
10797
10798
10799
10800
10801
10802
10803
10804
10805
10806
10807
10808
10809
10810
10811
10812
10813
10814
10815
10816
10817
10818
10819
10820
10821
10822
10823
10824
10825
10826
10827
10828
10829
10830
10831
10832
10833
10834
10835
10836
10837
10838
10839
10840
10841
10842
10843
10844
10845
10846
10847
10848
10849
10850
10851
10852
10853
10854
10855
10856
10857
10858
10859
10860
10861
10862
10863
10864
10865
10866
10867
10868
10869
10870
10871
10872
10873
10874
10875
10876
10877
10878
10879
10880
10881
10882
10883
10884
10885
10886
10887
10888
10889
10890
10891
10892
10893
10894
10895
10896
10897
10898
10899
10900
10901
10902
10903
10904
10905
10906
10907
10908
10909
10910
10911
10912
10913
10914
10915
10916
10917
10918
10919
10920
10921
10922
10923
10924
10925
10926
10927
10928
10929
10930
10931
10932
10933
10934
10935
10936
10937
10938
10939
10940
10941
10942
10943
10944
10945
10946
10947
10948
10949
10950
10951
10952
10953
10954
10955
10956
10957
10958
10959
10960
10961
10962
10963
10964
10965
10966
10967
10968
10969
10970
10971
10972
10973
10974
10975
10976
10977
10978
10979
10980
10981
10982
10983
10984
10985
10986
10987
10988
10989
10990
10991
10992
10993
10994
10995
10996
10997
10998
10999
11000
11001
11002
11003
11004
11005
11006
11007
11008
11009
11010
11011
11012
11013
11014
11015
11016
11017
11018
11019
11020
11021
11022
11023
11024
11025
11026
11027
11028
11029
11030
11031
11032
11033
11034
11035
11036
11037
11038
11039
11040
11041
11042
11043
11044
11045
11046
11047
11048
11049
11050
11051
11052
11053
11054
11055
11056
11057
11058
11059
11060
11061
11062
11063
11064
11065
11066
11067
11068
11069
11070
11071
11072
11073
11074
11075
11076
11077
11078
11079
11080
11081
11082
11083
11084
11085
11086
11087
11088
11089
11090
11091
11092
11093
11094
11095
11096
11097
11098
11099
11100
11101
11102
11103
11104
11105
11106
11107
11108
11109
11110
11111
11112
11113
11114
11115
11116
11117
11118
11119
11120
11121
11122
11123
11124
11125
11126
11127
11128
11129
11130
11131
11132
11133
11134
11135
11136
11137
11138
11139
11140
11141
11142
11143
11144
11145
11146
11147
11148
11149
11150
11151
11152
11153
11154
11155
11156
11157
11158
11159
11160
11161
11162
11163
11164
11165
11166
11167
11168
11169
11170
11171
11172
11173
11174
11175
11176
11177
11178
11179
11180
11181
11182
11183
11184
11185
11186
11187
11188
11189
11190
11191
11192
11193
11194
11195
11196
11197
11198
11199
11200
11201
11202
11203
11204
11205
11206
11207
11208
11209
11210
11211
11212
11213
11214
11215
11216
11217
11218
11219
11220
11221
11222
11223
11224
11225
11226
11227
11228
11229
11230
11231
11232
11233
11234
11235
11236
11237
11238
11239
11240
11241
11242
11243
11244
11245
11246
11247
11248
11249
11250
11251
11252
11253
11254
11255
11256
11257
11258
11259
11260
11261
11262
11263
11264
11265
11266
11267
11268
11269
11270
11271
11272
11273
11274
11275
11276
11277
11278
11279
11280
11281
11282
11283
11284
11285
11286
11287
11288
11289
11290
11291
11292
11293
11294
11295
11296
11297
11298
11299
11300
11301
11302
11303
11304
11305
11306
11307
11308
11309
11310
11311
11312
11313
11314
11315
11316
11317
11318
11319
11320
11321
11322
11323
11324
11325
11326
11327
11328
11329
11330
11331
11332
11333
11334
11335
11336
11337
11338
11339
11340
11341
11342
11343
11344
11345
11346
11347
11348
11349
11350
11351
11352
11353
11354
11355
11356
11357
11358
11359
11360
11361
11362
11363
11364
11365
11366
11367
11368
11369
11370
11371
11372
11373
11374
11375
11376
11377
11378
11379
11380
11381
11382
11383
11384
11385
11386
11387
11388
11389
11390
11391
11392
11393
11394
11395
11396
11397
11398
11399
11400
11401
11402
11403
11404
11405
11406
11407
11408
11409
11410
11411
11412
11413
11414
11415
11416
11417
11418
11419
11420
11421
11422
11423
11424
11425
11426
11427
11428
11429
11430
11431
11432
11433
11434
11435
11436
11437
11438
11439
11440
11441
11442
11443
11444
11445
11446
11447
11448
11449
11450
11451
11452
11453
11454
11455
11456
11457
11458
11459
11460
11461
11462
11463
11464
11465
11466
11467
11468
11469
11470
11471
11472
11473
11474
11475
11476
11477
11478
11479
11480
11481
11482
11483
11484
11485
11486
11487
11488
11489
11490
11491
11492
11493
11494
11495
11496
11497
11498
11499
11500
11501
11502
11503
11504
11505
11506
11507
11508
11509
11510
11511
11512
11513
11514
11515
11516
11517
11518
11519
11520
11521
11522
11523
11524
11525
11526
11527
11528
11529
11530
11531
11532
11533
11534
11535
11536
11537
11538
11539
11540
11541
11542
11543
11544
11545
11546
11547
11548
11549
11550
11551
11552
11553
11554
11555
11556
11557
11558
11559
11560
11561
11562
11563
11564
11565
11566
11567
11568
11569
11570
11571
11572
11573
11574
11575
11576
11577
11578
11579
11580
11581
11582
11583
11584
11585
11586
11587
11588
11589
11590
11591
11592
11593
11594
11595
11596
11597
11598
11599
11600
11601
11602
11603
11604
11605
11606
11607
11608
11609
11610
11611
11612
11613
11614
11615
11616
11617
11618
11619
11620
11621
11622
11623
11624
11625
11626
11627
11628
11629
11630
11631
11632
11633
11634
11635
11636
11637
11638
11639
11640
11641
11642
11643
11644
11645
11646
11647
11648
11649
11650
11651
11652
11653
11654
11655
11656
11657
11658
11659
11660
11661
11662
11663
11664
11665
11666
11667
11668
11669
11670
11671
11672
11673
11674
11675
11676
11677
11678
11679
11680
11681
11682
11683
11684
11685
11686
11687
11688
11689
11690
11691
11692
11693
11694
11695
11696
11697
11698
11699
11700
11701
11702
11703
11704
11705
11706
11707
11708
11709
11710
11711
11712
11713
11714
11715
11716
11717
11718
11719
11720
11721
11722
11723
11724
11725
11726
11727
11728
11729
11730
11731
11732
11733
11734
11735
11736
11737
11738
11739
11740
11741
11742
11743
11744
11745
11746
11747
11748
11749
11750
11751
11752
11753
11754
11755
11756
11757
11758
11759
11760
11761
11762
11763
11764
11765
11766
11767
11768
11769
11770
11771
11772
11773
11774
11775
11776
11777
11778
11779
11780
11781
11782
11783
11784
11785
11786
11787
11788
11789
11790
11791
11792
11793
11794
11795
11796
11797
11798
11799
11800
11801
11802
11803
11804
11805
11806
11807
11808
11809
11810
11811
11812
11813
11814
11815
11816
11817
11818
11819
11820
11821
11822
11823
11824
11825
11826
11827
11828
11829
11830
11831
11832
11833
11834
11835
11836
11837
11838
11839
11840
11841
11842
11843
11844
11845
11846
11847
11848
11849
11850
11851
11852
11853
11854
11855
11856
11857
11858
11859
11860
11861
11862
11863
11864
11865
11866
11867
11868
11869
11870
11871
11872
11873
11874
11875
11876
11877
11878
11879
11880
11881
11882
11883
11884
11885
11886
11887
11888
11889
11890
11891
11892
11893
11894
11895
11896
11897
11898
11899
11900
11901
11902
11903
11904
11905
11906
11907
11908
11909
11910
11911
11912
11913
11914
11915
11916
11917
11918
11919
11920
11921
11922
11923
11924
11925
11926
11927
11928
11929
11930
11931
11932
11933
11934
11935
11936
11937
11938
11939
11940
11941
11942
11943
11944
11945
11946
11947
11948
11949
11950
11951
11952
11953
11954
11955
11956
11957
11958
11959
11960
11961
11962
11963
11964
11965
11966
11967
11968
11969
11970
11971
11972
11973
11974
11975
11976
11977
11978
11979
11980
11981
11982
11983
11984
11985
11986
11987
11988
11989
11990
11991
11992
11993
11994
11995
11996
11997
11998
11999
12000
12001
12002
12003
12004
12005
12006
12007
12008
12009
12010
12011
12012
12013
12014
12015
12016
12017
12018
12019
12020
12021
12022
12023
12024
12025
12026
12027
12028
12029
12030
12031
12032
12033
12034
12035
12036
12037
12038
12039
12040
12041
12042
12043
12044
12045
12046
12047
12048
12049
12050
12051
12052
12053
12054
12055
12056
12057
12058
12059
12060
12061
12062
12063
12064
12065
12066
12067
12068
12069
12070
12071
12072
12073
12074
12075
12076
12077
12078
12079
12080
12081
12082
12083
12084
12085
12086
12087
12088
12089
12090
12091
12092
12093
12094
12095
12096
12097
12098
12099
12100
12101
12102
12103
12104
12105
12106
12107
12108
12109
12110
12111
12112
12113
12114
12115
12116
12117
12118
12119
12120
12121
12122
12123
12124
12125
12126
12127
12128
12129
12130
12131
12132
12133
12134
12135
12136
12137
12138
12139
12140
12141
12142
12143
12144
12145
12146
12147
12148
12149
12150
12151
12152
12153
12154
12155
12156
12157
12158
12159
12160
12161
12162
12163
12164
12165
12166
12167
12168
12169
12170
12171
12172
12173
12174
12175
12176
12177
12178
12179
12180
12181
12182
12183
12184
12185
12186
12187
12188
12189
12190
12191
12192
12193
12194
12195
12196
12197
12198
12199
12200
12201
12202
12203
12204
12205
12206
12207
12208
12209
12210
12211
12212
12213
12214
12215
12216
12217
12218
12219
12220
12221
12222
12223
12224
12225
12226
12227
12228
12229
12230
12231
12232
12233
12234
12235
12236
12237
12238
12239
12240
12241
12242
12243
12244
12245
12246
12247
12248
12249
12250
12251
12252
12253
12254
12255
12256
12257
12258
12259
12260
12261
12262
12263
12264
12265
12266
12267
12268
12269
12270
12271
12272
12273
12274
12275
12276
12277
12278
12279
12280
12281
12282
12283
12284
12285
12286
12287
12288
12289
12290
12291
12292
12293
12294
12295
12296
12297
12298
12299
12300
12301
12302
12303
12304
12305
12306
12307
12308
12309
12310
12311
12312
12313
12314
12315
12316
12317
12318
12319
12320
12321
12322
12323
12324
12325
12326
12327
12328
12329
12330
12331
12332
12333
12334
12335
12336
12337
12338
12339
12340
12341
12342
12343
12344
12345
12346
12347
12348
12349
12350
12351
12352
12353
12354
12355
12356
12357
12358
12359
12360
12361
12362
12363
12364
12365
12366
12367
12368
12369
12370
12371
12372
12373
12374
12375
12376
12377
12378
12379
12380
12381
12382
12383
12384
12385
12386
12387
12388
12389
12390
12391
12392
12393
12394
12395
12396
12397
12398
12399
12400
12401
12402
12403
12404
12405
12406
12407
12408
12409
12410
12411
12412
12413
12414
12415
12416
12417
12418
12419
12420
12421
12422
12423
12424
12425
12426
12427
12428
12429
12430
12431
12432
12433
12434
12435
12436
12437
12438
12439
12440
12441
12442
12443
12444
12445
12446
12447
12448
12449
12450
12451
12452
12453
12454
12455
12456
12457
12458
12459
12460
12461
12462
12463
12464
12465
12466
12467
12468
12469
12470
12471
12472
12473
12474
12475
12476
12477
12478
12479
12480
12481
12482
12483
12484
12485
12486
12487
12488
12489
12490
12491
12492
12493
12494
12495
12496
12497
12498
12499
12500
12501
12502
12503
12504
12505
12506
12507
12508
12509
12510
12511
12512
12513
12514
12515
12516
12517
12518
12519
12520
12521
12522
12523
12524
12525
12526
12527
12528
12529
12530
12531
12532
12533
12534
12535
12536
12537
12538
12539
12540
12541
12542
12543
12544
12545
12546
12547
12548
12549
12550
12551
12552
12553
12554
12555
12556
12557
12558
12559
12560
12561
12562
12563
12564
12565
12566
12567
12568
12569
12570
12571
12572
12573
12574
12575
12576
12577
12578
12579
12580
12581
12582
12583
12584
12585
12586
12587
12588
12589
12590
12591
12592
12593
12594
12595
12596
12597
12598
12599
12600
12601
12602
12603
12604
12605
12606
12607
12608
12609
12610
12611
12612
12613
12614
12615
12616
12617
12618
12619
12620
12621
12622
12623
12624
12625
12626
12627
12628
12629
12630
12631
12632
12633
12634
12635
12636
12637
12638
12639
12640
12641
12642
12643
12644
12645
12646
12647
12648
12649
12650
12651
12652
12653
12654
12655
12656
12657
12658
12659
12660
12661
12662
12663
12664
12665
12666
12667
12668
12669
12670
12671
12672
12673
12674
12675
12676
12677
12678
12679
12680
12681
12682
12683
12684
12685
12686
12687
12688
12689
12690
12691
12692
12693
12694
12695
12696
12697
12698
12699
12700
12701
12702
12703
12704
12705
12706
12707
12708
12709
12710
12711
12712
12713
12714
12715
12716
12717
12718
12719
12720
12721
12722
12723
12724
12725
12726
12727
12728
12729
12730
12731
12732
12733
12734
12735
12736
12737
12738
12739
12740
12741
12742
12743
12744
12745
12746
12747
12748
12749
12750
12751
12752
12753
12754
12755
12756
12757
12758
12759
12760
12761
12762
12763
12764
12765
12766
12767
12768
12769
12770
12771
12772
12773
12774
12775
12776
12777
12778
12779
12780
12781
12782
12783
12784
12785
12786
12787
12788
12789
12790
12791
12792
12793
12794
12795
12796
12797
12798
12799
12800
12801
12802
12803
12804
12805
12806
12807
12808
12809
12810
12811
12812
12813
12814
12815
12816
12817
12818
12819
12820
12821
12822
12823
12824
12825
12826
12827
12828
12829
12830
12831
12832
12833
12834
12835
12836
12837
12838
12839
12840
12841
12842
12843
12844
12845
12846
12847
12848
12849
12850
12851
12852
12853
12854
12855
12856
12857
12858
12859
12860
12861
12862
12863
12864
12865
12866
12867
12868
12869
12870
12871
12872
12873
12874
12875
12876
12877
12878
12879
12880
12881
12882
12883
12884
12885
12886
12887
12888
12889
12890
12891
12892
12893
12894
12895
12896
12897
12898
12899
12900
12901
12902
12903
12904
12905
12906
12907
12908
12909
12910
12911
12912
12913
12914
12915
12916
12917
12918
12919
12920
12921
12922
12923
12924
12925
12926
12927
12928
12929
12930
12931
12932
12933
12934
12935
12936
12937
12938
12939
12940
12941
12942
12943
12944
12945
12946
12947
12948
12949
12950
12951
12952
12953
12954
12955
12956
12957
12958
12959
12960
12961
12962
12963
12964
12965
12966
12967
12968
12969
12970
12971
12972
12973
12974
12975
12976
12977
12978
12979
12980
12981
12982
12983
12984
12985
12986
12987
12988
12989
12990
12991
12992
12993
12994
12995
12996
12997
12998
12999
13000
13001
13002
13003
13004
13005
13006
13007
13008
13009
13010
13011
13012
13013
13014
13015
13016
13017
13018
13019
13020
13021
13022
13023
13024
13025
13026
13027
13028
13029
13030
13031
13032
13033
13034
13035
13036
13037
13038
13039
13040
13041
13042
13043
13044
13045
13046
13047
13048
13049
13050
13051
13052
13053
13054
13055
13056
13057
13058
13059
13060
13061
13062
13063
13064
13065
13066
13067
13068
13069
13070
13071
13072
13073
13074
13075
13076
13077
13078
13079
13080
13081
13082
13083
13084
13085
13086
13087
13088
13089
13090
13091
13092
13093
13094
13095
13096
13097
13098
13099
13100
13101
13102
13103
13104
13105
13106
13107
13108
13109
13110
13111
13112
13113
13114
13115
13116
13117
13118
13119
13120
13121
13122
13123
13124
13125
13126
13127
13128
13129
13130
13131
13132
13133
13134
13135
13136
13137
13138
13139
13140
13141
13142
13143
13144
13145
13146
13147
13148
13149
13150
13151
13152
13153
13154
13155
13156
13157
13158
13159
13160
13161
13162
13163
13164
13165
13166
13167
13168
13169
13170
13171
13172
13173
13174
13175
13176
13177
13178
13179
13180
13181
13182
13183
13184
13185
13186
13187
13188
13189
13190
13191
13192
13193
13194
13195
13196
13197
13198
13199
13200
13201
13202
13203
13204
13205
13206
13207
13208
13209
13210
13211
13212
13213
13214
13215
13216
13217
13218
13219
13220
13221
13222
13223
13224
13225
13226
13227
13228
13229
13230
13231
13232
13233
13234
13235
13236
13237
13238
13239
13240
13241
13242
13243
13244
13245
13246
13247
13248
13249
13250
13251
13252
13253
13254
13255
13256
13257
13258
13259
13260
13261
13262
13263
13264
13265
13266
13267
13268
13269
13270
13271
13272
13273
13274
13275
13276
13277
13278
13279
13280
13281
13282
13283
13284
13285
13286
13287
13288
13289
13290
13291
13292
13293
13294
13295
13296
13297
13298
13299
13300
13301
13302
13303
13304
13305
13306
13307
13308
13309
13310
13311
13312
13313
13314
13315
13316
13317
13318
13319
13320
13321
13322
13323
13324
13325
13326
13327
13328
13329
13330
13331
13332
13333
13334
13335
13336
13337
13338
13339
13340
13341
13342
13343
13344
13345
13346
13347
13348
13349
13350
13351
13352
13353
13354
13355
13356
13357
13358
13359
13360
13361
13362
13363
13364
13365
13366
13367
13368
13369
13370
13371
13372
13373
13374
13375
13376
13377
13378
13379
13380
13381
13382
13383
13384
13385
13386
13387
13388
13389
13390
13391
13392
13393
13394
13395
13396
13397
13398
13399
13400
13401
13402
13403
13404
13405
13406
13407
13408
13409
13410
13411
13412
13413
13414
13415
13416
13417
13418
13419
13420
13421
13422
13423
13424
13425
13426
13427
13428
13429
13430
13431
13432
13433
13434
13435
13436
13437
13438
13439
13440
13441
13442
13443
13444
13445
13446
13447
13448
13449
13450
13451
13452
13453
13454
13455
13456
13457
13458
13459
13460
13461
13462
13463
13464
13465
13466
13467
13468
13469
13470
13471
13472
13473
13474
13475
13476
13477
13478
13479
13480
13481
13482
13483
13484
13485
13486
13487
13488
13489
13490
13491
13492
13493
13494
13495
13496
13497
13498
13499
13500
13501
13502
13503
13504
13505
13506
13507
13508
13509
13510
13511
13512
13513
13514
13515
13516
13517
13518
13519
13520
13521
13522
13523
13524
13525
13526
13527
13528
13529
13530
13531
13532
13533
13534
13535
13536
13537
13538
13539
13540
13541
13542
13543
13544
13545
13546
13547
13548
13549
13550
13551
13552
13553
13554
13555
13556
13557
13558
13559
13560
13561
13562
13563
13564
13565
13566
13567
13568
13569
13570
13571
13572
13573
13574
13575
13576
13577
13578
13579
13580
13581
13582
13583
13584
13585
13586
13587
13588
13589
13590
13591
13592
13593
13594
13595
13596
13597
13598
13599
13600
13601
13602
13603
13604
13605
13606
13607
13608
13609
13610
13611
13612
13613
13614
13615
13616
13617
13618
13619
13620
13621
13622
13623
13624
13625
13626
13627
13628
13629
13630
13631
13632
13633
13634
13635
13636
13637
13638
13639
13640
13641
13642
13643
13644
13645
13646
13647
13648
13649
13650
13651
13652
13653
13654
13655
13656
13657
13658
13659
13660
13661
13662
13663
13664
13665
13666
13667
13668
13669
13670
13671
13672
13673
13674
13675
13676
13677
13678
13679
13680
13681
13682
13683
13684
13685
13686
13687
13688
13689
13690
13691
13692
13693
13694
13695
13696
13697
13698
13699
13700
13701
13702
13703
13704
13705
13706
13707
13708
13709
13710
13711
13712
13713
13714
13715
13716
13717
13718
13719
13720
13721
13722
13723
13724
13725
13726
13727
13728
13729
13730
13731
13732
13733
13734
13735
13736
13737
13738
13739
13740
13741
13742
13743
13744
13745
13746
13747
13748
13749
13750
13751
13752
13753
13754
13755
13756
13757
13758
13759
13760
13761
13762
13763
13764
13765
13766
13767
13768
13769
13770
13771
13772
13773
13774
13775
13776
13777
13778
13779
13780
13781
13782
13783
13784
13785
13786
13787
13788
13789
13790
13791
13792
13793
13794
13795
13796
13797
13798
13799
13800
13801
13802
13803
13804
13805
13806
13807
13808
13809
13810
13811
13812
13813
13814
13815
13816
13817
13818
13819
13820
13821
13822
13823
13824
13825
13826
13827
13828
13829
13830
13831
13832
13833
13834
13835
13836
13837
13838
13839
13840
13841
13842
13843
13844
13845
13846
13847
13848
13849
13850
13851
13852
13853
13854
13855
13856
13857
13858
13859
13860
13861
13862
13863
13864
13865
13866
13867
13868
13869
13870
13871
13872
13873
13874
13875
13876
13877
13878
13879
13880
13881
13882
13883
13884
13885
13886
13887
13888
13889
13890
13891
13892
13893
13894
13895
13896
13897
13898
13899
13900
13901
13902
13903
13904
13905
13906
13907
13908
13909
13910
13911
13912
13913
13914
13915
13916
13917
13918
13919
13920
13921
13922
13923
13924
13925
13926
13927
13928
13929
13930
13931
13932
13933
13934
13935
13936
13937
13938
13939
13940
13941
13942
13943
13944
13945
13946
13947
13948
13949
13950
13951
13952
13953
13954
13955
13956
13957
13958
13959
13960
13961
13962
13963
13964
13965
13966
13967
13968
13969
13970
13971
13972
13973
13974
13975
13976
13977
13978
13979
13980
13981
13982
13983
13984
13985
13986
13987
13988
13989
13990
13991
13992
13993
13994
13995
13996
13997
13998
13999
14000
14001
14002
14003
14004
14005
14006
14007
14008
14009
14010
14011
14012
14013
14014
14015
14016
14017
14018
14019
14020
14021
14022
14023
14024
14025
14026
14027
14028
14029
14030
14031
14032
14033
14034
14035
14036
14037
14038
14039
14040
14041
14042
14043
14044
14045
14046
14047
14048
14049
14050
14051
14052
14053
14054
14055
14056
14057
14058
14059
14060
14061
14062
14063
14064
14065
14066
14067
14068
14069
14070
14071
14072
14073
14074
14075
14076
14077
14078
14079
14080
14081
14082
14083
14084
14085
14086
14087
14088
14089
14090
14091
14092
14093
14094
14095
14096
14097
14098
14099
14100
14101
14102
14103
14104
14105
14106
14107
14108
14109
14110
14111
14112
14113
14114
14115
14116
14117
14118
14119
14120
14121
14122
14123
14124
14125
14126
14127
14128
14129
14130
14131
14132
14133
14134
14135
14136
14137
14138
14139
14140
14141
14142
14143
14144
14145
14146
14147
14148
14149
14150
14151
14152
14153
14154
14155
14156
14157
14158
14159
14160
14161
14162
14163
14164
14165
14166
14167
14168
14169
14170
14171
14172
14173
14174
14175
14176
14177
14178
14179
14180
14181
14182
14183
14184
14185
14186
14187
14188
14189
14190
14191
14192
14193
14194
14195
14196
14197
14198
14199
14200
14201
14202
14203
14204
14205
14206
14207
14208
14209
14210
14211
14212
14213
14214
14215
14216
14217
14218
14219
14220
14221
14222
14223
14224
14225
14226
14227
14228
14229
14230
14231
14232
14233
14234
14235
14236
14237
14238
14239
14240
14241
14242
14243
14244
14245
14246
14247
14248
14249
14250
14251
14252
14253
14254
14255
14256
14257
14258
14259
14260
14261
14262
14263
14264
14265
14266
14267
14268
14269
14270
14271
14272
14273
14274
14275
14276
14277
14278
14279
14280
14281
14282
14283
14284
14285
14286
14287
14288
14289
14290
14291
14292
14293
14294
14295
14296
14297
14298
14299
14300
14301
14302
14303
14304
14305
14306
14307
14308
14309
14310
14311
14312
14313
14314
14315
14316
14317
14318
14319
14320
14321
14322
14323
14324
14325
14326
14327
14328
14329
14330
14331
14332
14333
14334
14335
14336
14337
14338
14339
14340
14341
14342
14343
14344
14345
14346
14347
14348
14349
14350
14351
14352
14353
14354
14355
14356
14357
14358
14359
14360
14361
14362
14363
14364
14365
14366
14367
14368
14369
14370
14371
14372
14373
14374
14375
14376
14377
14378
14379
14380
14381
14382
14383
14384
14385
14386
14387
14388
14389
14390
14391
14392
14393
14394
14395
14396
14397
14398
14399
14400
14401
14402
14403
14404
14405
14406
14407
14408
14409
14410
14411
14412
14413
14414
14415
14416
14417
14418
14419
14420
14421
14422
14423
14424
14425
14426
14427
14428
14429
14430
14431
14432
14433
14434
14435
14436
14437
14438
14439
14440
14441
14442
14443
14444
14445
14446
14447
14448
14449
14450
14451
14452
14453
14454
14455
14456
14457
14458
14459
14460
14461
14462
14463
14464
14465
14466
14467
14468
14469
14470
14471
14472
14473
14474
14475
14476
14477
14478
14479
14480
14481
14482
14483
14484
14485
14486
14487
14488
14489
14490
14491
14492
14493
14494
14495
14496
14497
14498
14499
14500
14501
14502
14503
14504
14505
14506
14507
14508
14509
14510
14511
14512
14513
14514
14515
14516
14517
14518
14519
14520
14521
14522
14523
14524
14525
14526
14527
14528
14529
14530
14531
14532
14533
14534
14535
14536
14537
14538
14539
14540
14541
14542
14543
14544
14545
14546
14547
14548
14549
14550
14551
14552
14553
14554
14555
14556
14557
14558
14559
14560
14561
14562
14563
14564
14565
14566
14567
14568
14569
14570
14571
14572
14573
14574
14575
14576
14577
14578
14579
14580
14581
14582
14583
14584
14585
14586
14587
14588
14589
14590
14591
14592
14593
14594
14595
14596
14597
14598
14599
14600
14601
14602
14603
14604
14605
14606
14607
14608
14609
14610
14611
14612
14613
14614
14615
14616
14617
14618
14619
14620
14621
14622
14623
14624
14625
14626
14627
14628
14629
14630
14631
14632
14633
14634
14635
14636
14637
14638
14639
14640
14641
14642
14643
14644
14645
14646
14647
14648
14649
14650
14651
14652
14653
14654
14655
14656
14657
14658
14659
14660
14661
14662
14663
14664
14665
14666
14667
14668
14669
14670
14671
14672
14673
14674
14675
14676
14677
14678
14679
14680
14681
14682
14683
14684
14685
14686
14687
14688
14689
14690
14691
14692
14693
14694
14695
14696
14697
14698
14699
14700
14701
14702
14703
14704
14705
14706
14707
14708
14709
14710
14711
14712
14713
14714
14715
14716
14717
14718
14719
14720
14721
14722
14723
14724
14725
14726
14727
14728
14729
14730
14731
14732
14733
14734
14735
14736
14737
14738
14739
14740
14741
14742
14743
14744
14745
14746
14747
14748
14749
14750
14751
14752
14753
14754
14755
14756
14757
14758
14759
14760
14761
14762
14763
14764
14765
14766
14767
14768
14769
14770
14771
14772
14773
14774
14775
14776
14777
14778
14779
14780
14781
14782
14783
14784
14785
14786
14787
14788
14789
14790
14791
14792
14793
14794
14795
14796
14797
14798
14799
14800
14801
14802
14803
14804
14805
14806
14807
14808
14809
14810
14811
14812
14813
14814
14815
14816
14817
14818
14819
14820
14821
14822
14823
14824
14825
14826
14827
14828
14829
14830
14831
14832
14833
14834
14835
14836
14837
14838
14839
14840
14841
14842
14843
14844
14845
14846
14847
14848
14849
14850
14851
14852
14853
14854
14855
14856
14857
14858
14859
14860
14861
14862
14863
14864
14865
14866
14867
14868
14869
14870
14871
14872
14873
14874
14875
14876
14877
14878
14879
14880
14881
14882
14883
14884
14885
14886
14887
14888
14889
14890
14891
14892
14893
14894
14895
14896
14897
14898
14899
14900
14901
14902
14903
14904
14905
14906
14907
14908
14909
14910
14911
14912
14913
14914
14915
14916
14917
14918
14919
14920
14921
14922
14923
14924
14925
14926
14927
14928
14929
14930
14931
14932
14933
14934
14935
14936
14937
14938
14939
14940
14941
14942
14943
14944
14945
14946
14947
14948
14949
14950
14951
14952
14953
14954
14955
14956
14957
14958
14959
14960
14961
14962
14963
14964
14965
14966
14967
14968
14969
14970
14971
14972
14973
14974
14975
14976
14977
14978
14979
14980
14981
14982
14983
14984
14985
14986
14987
14988
14989
14990
14991
14992
14993
14994
14995
14996
14997
14998
14999
15000
15001
15002
15003
15004
15005
15006
15007
15008
15009
15010
15011
15012
15013
15014
15015
15016
15017
15018
15019
15020
15021
15022
15023
15024
15025
15026
15027
15028
15029
15030
15031
15032
15033
15034
15035
15036
15037
15038
15039
15040
15041
15042
15043
15044
15045
15046
15047
15048
15049
15050
15051
15052
15053
15054
15055
15056
15057
15058
15059
15060
15061
15062
15063
15064
15065
15066
15067
15068
15069
15070
15071
15072
15073
15074
15075
15076
15077
15078
15079
15080
15081
15082
15083
15084
15085
15086
15087
15088
15089
15090
15091
15092
15093
15094
15095
15096
15097
15098
15099
15100
15101
15102
15103
15104
15105
15106
15107
15108
15109
15110
15111
15112
15113
15114
15115
15116
15117
15118
15119
15120
15121
15122
15123
15124
15125
15126
15127
15128
15129
15130
15131
15132
15133
15134
15135
15136
15137
15138
15139
15140
15141
15142
15143
15144
15145
15146
15147
15148
15149
15150
15151
15152
15153
15154
15155
15156
15157
15158
15159
15160
15161
15162
15163
15164
15165
15166
15167
15168
15169
15170
15171
15172
15173
15174
15175
15176
15177
15178
15179
15180
15181
15182
15183
15184
15185
15186
15187
15188
15189
15190
15191
15192
15193
15194
15195
15196
15197
15198
15199
15200
15201
15202
15203
15204
15205
15206
15207
15208
15209
15210
15211
15212
15213
15214
15215
15216
15217
15218
15219
15220
15221
15222
15223
15224
15225
15226
15227
15228
15229
15230
15231
15232
15233
15234
15235
15236
15237
15238
15239
15240
15241
15242
15243
15244
15245
15246
15247
15248
15249
15250
15251
15252
15253
15254
15255
15256
15257
15258
15259
15260
15261
15262
15263
15264
15265
15266
15267
15268
15269
15270
15271
15272
15273
15274
15275
15276
15277
15278
15279
15280
15281
15282
15283
15284
15285
15286
15287
15288
15289
15290
15291
15292
15293
15294
15295
15296
15297
15298
15299
15300
15301
15302
15303
15304
15305
15306
15307
15308
15309
15310
15311
15312
15313
15314
15315
15316
15317
15318
15319
15320
15321
15322
15323
15324
15325
15326
15327
15328
15329
15330
15331
15332
15333
15334
15335
15336
15337
15338
15339
15340
15341
15342
15343
15344
15345
15346
15347
15348
15349
15350
15351
15352
15353
15354
15355
15356
15357
15358
15359
15360
15361
15362
15363
15364
15365
15366
15367
15368
15369
15370
15371
15372
15373
15374
15375
15376
15377
15378
15379
15380
15381
15382
15383
15384
15385
15386
15387
15388
15389
15390
15391
15392
15393
15394
15395
15396
15397
15398
15399
15400
15401
15402
15403
15404
15405
15406
15407
15408
15409
15410
15411
15412
15413
15414
15415
15416
15417
15418
15419
15420
15421
15422
15423
15424
15425
15426
15427
15428
15429
15430
15431
15432
15433
15434
15435
15436
15437
15438
15439
15440
15441
15442
15443
15444
15445
15446
15447
15448
15449
15450
15451
15452
15453
15454
15455
15456
15457
15458
15459
15460
15461
15462
15463
15464
15465
15466
15467
15468
15469
15470
15471
15472
15473
15474
15475
15476
15477
15478
15479
15480
15481
15482
15483
15484
15485
15486
15487
15488
15489
15490
15491
15492
15493
15494
15495
15496
15497
15498
15499
15500
15501
15502
15503
15504
15505
15506
15507
15508
15509
15510
15511
15512
15513
15514
15515
15516
15517
15518
15519
15520
15521
15522
15523
15524
15525
15526
15527
15528
15529
15530
15531
15532
15533
15534
15535
15536
15537
15538
15539
15540
15541
15542
15543
15544
15545
15546
15547
15548
15549
15550
15551
15552
15553
15554
15555
15556
15557
15558
15559
15560
15561
15562
15563
15564
15565
15566
15567
15568
15569
15570
15571
15572
15573
15574
15575
15576
15577
15578
15579
15580
15581
15582
15583
15584
15585
15586
15587
15588
15589
15590
15591
15592
15593
15594
15595
15596
15597
15598
15599
15600
15601
15602
15603
15604
15605
15606
15607
15608
15609
15610
15611
15612
15613
15614
15615
15616
15617
15618
15619
15620
15621
15622
15623
15624
15625
15626
15627
15628
15629
15630
15631
15632
15633
15634
15635
15636
15637
15638
15639
15640
15641
15642
15643
15644
15645
15646
15647
15648
15649
15650
15651
15652
15653
15654
15655
15656
15657
15658
15659
15660
15661
15662
15663
15664
15665
15666
15667
15668
15669
15670
15671
15672
15673
15674
15675
15676
15677
15678
15679
15680
15681
15682
15683
15684
15685
15686
15687
15688
15689
15690
15691
15692
15693
15694
15695
15696
15697
15698
15699
15700
15701
15702
15703
15704
15705
15706
15707
15708
15709
15710
15711
15712
15713
15714
15715
15716
15717
15718
15719
15720
15721
15722
15723
15724
15725
15726
15727
15728
15729
15730
15731
15732
15733
15734
15735
15736
15737
15738
15739
15740
15741
15742
15743
15744
15745
15746
15747
15748
15749
15750
15751
15752
15753
15754
15755
15756
15757
15758
15759
15760
15761
15762
15763
15764
15765
15766
15767
15768
15769
15770
15771
15772
15773
15774
15775
15776
15777
15778
15779
15780
15781
15782
15783
15784
15785
15786
15787
15788
15789
15790
15791
15792
15793
15794
15795
15796
15797
15798
15799
15800
15801
15802
15803
15804
15805
15806
15807
15808
15809
15810
15811
15812
15813
15814
15815
15816
15817
15818
15819
15820
15821
15822
15823
15824
15825
15826
15827
15828
15829
15830
15831
15832
15833
15834
15835
15836
15837
15838
15839
15840
15841
15842
15843
15844
15845
15846
15847
15848
15849
15850
15851
15852
15853
15854
15855
15856
15857
15858
15859
15860
15861
15862
15863
15864
15865
15866
15867
15868
15869
15870
15871
15872
15873
15874
15875
15876
15877
15878
15879
15880
15881
15882
15883
15884
15885
15886
15887
15888
15889
15890
15891
15892
15893
15894
15895
15896
15897
15898
15899
15900
15901
15902
15903
15904
15905
15906
15907
15908
15909
15910
15911
15912
15913
15914
15915
15916
15917
15918
15919
15920
15921
15922
15923
15924
15925
15926
15927
15928
15929
15930
15931
15932
15933
15934
15935
15936
15937
15938
15939
15940
15941
15942
15943
15944
15945
15946
15947
15948
15949
15950
15951
15952
15953
15954
15955
15956
15957
15958
15959
15960
15961
15962
15963
15964
15965
15966
15967
15968
15969
15970
15971
15972
15973
15974
15975
15976
15977
15978
15979
15980
15981
15982
15983
15984
15985
15986
15987
15988
15989
15990
15991
15992
15993
15994
15995
15996
15997
15998
15999
16000
16001
16002
16003
16004
16005
16006
16007
16008
16009
16010
16011
16012
16013
16014
16015
16016
16017
16018
16019
16020
16021
16022
16023
16024
16025
16026
16027
16028
16029
16030
16031
16032
16033
16034
16035
16036
16037
16038
16039
16040
16041
16042
16043
16044
16045
16046
16047
16048
16049
16050
16051
16052
16053
16054
16055
16056
16057
16058
16059
16060
16061
16062
16063
16064
16065
16066
16067
16068
16069
16070
16071
16072
16073
16074
16075
16076
16077
16078
16079
16080
16081
16082
16083
16084
16085
16086
16087
16088
16089
16090
16091
16092
16093
16094
16095
16096
16097
16098
16099
16100
16101
16102
16103
16104
16105
16106
16107
16108
16109
16110
16111
16112
16113
16114
16115
16116
16117
16118
16119
16120
16121
16122
16123
16124
16125
16126
16127
16128
16129
16130
16131
16132
16133
16134
16135
16136
16137
16138
16139
16140
16141
16142
16143
16144
16145
16146
16147
16148
16149
16150
16151
16152
16153
16154
16155
16156
16157
16158
16159
16160
16161
16162
16163
16164
16165
16166
16167
16168
16169
16170
16171
16172
16173
16174
16175
16176
16177
16178
16179
16180
16181
16182
16183
16184
16185
16186
16187
16188
16189
16190
16191
16192
16193
16194
16195
16196
16197
16198
16199
16200
16201
16202
16203
16204
16205
16206
16207
16208
16209
16210
16211
16212
16213
16214
16215
16216
16217
16218
16219
16220
16221
16222
16223
16224
16225
16226
16227
16228
16229
16230
16231
16232
16233
16234
16235
16236
16237
16238
16239
16240
16241
16242
16243
16244
16245
16246
16247
16248
16249
16250
16251
16252
16253
16254
16255
16256
16257
16258
16259
16260
16261
16262
16263
16264
16265
16266
16267
16268
16269
16270
16271
16272
16273
16274
16275
16276
16277
16278
16279
16280
16281
16282
16283
16284
16285
16286
16287
16288
16289
16290
16291
16292
16293
16294
16295
16296
16297
16298
16299
16300
16301
16302
16303
16304
16305
16306
16307
16308
16309
16310
16311
16312
16313
16314
16315
16316
16317
16318
16319
16320
16321
16322
16323
16324
16325
16326
16327
16328
16329
16330
16331
16332
16333
16334
16335
16336
16337
16338
16339
16340
16341
16342
16343
16344
16345
16346
16347
16348
16349
16350
16351
16352
16353
16354
16355
16356
16357
16358
16359
16360
16361
16362
16363
16364
16365
16366
16367
16368
16369
16370
16371
16372
16373
16374
16375
16376
16377
16378
16379
16380
16381
16382
16383
16384
16385
16386
16387
16388
16389
16390
16391
16392
16393
16394
16395
16396
16397
16398
16399
16400
16401
16402
16403
16404
16405
16406
16407
16408
16409
16410
16411
16412
16413
16414
16415
16416
16417
16418
16419
16420
16421
16422
16423
16424
16425
16426
16427
16428
16429
16430
16431
16432
16433
16434
16435
16436
16437
16438
16439
16440
16441
16442
16443
16444
16445
16446
16447
16448
16449
16450
16451
16452
16453
16454
16455
16456
16457
16458
16459
16460
16461
16462
16463
16464
16465
16466
16467
16468
16469
16470
16471
16472
16473
16474
16475
16476
16477
16478
16479
16480
16481
16482
16483
16484
16485
16486
16487
16488
16489
16490
16491
16492
16493
16494
16495
16496
16497
16498
16499
16500
16501
16502
16503
16504
16505
16506
16507
16508
16509
16510
16511
16512
16513
16514
16515
16516
16517
16518
16519
16520
16521
16522
16523
16524
16525
16526
16527
16528
16529
16530
16531
16532
16533
16534
16535
16536
16537
16538
16539
16540
16541
16542
16543
16544
16545
16546
16547
16548
16549
16550
16551
16552
16553
16554
16555
16556
16557
16558
16559
16560
16561
16562
16563
16564
16565
16566
16567
16568
16569
16570
16571
16572
16573
16574
16575
16576
16577
16578
16579
16580
16581
16582
16583
16584
16585
16586
16587
16588
16589
16590
16591
16592
16593
16594
16595
16596
16597
16598
16599
16600
16601
16602
16603
16604
16605
16606
16607
16608
16609
16610
16611
16612
16613
16614
16615
16616
16617
16618
16619
16620
16621
16622
16623
16624
16625
16626
16627
16628
16629
16630
16631
16632
16633
16634
16635
16636
16637
16638
16639
16640
16641
16642
16643
16644
16645
16646
16647
16648
16649
16650
16651
16652
16653
16654
16655
16656
16657
16658
16659
16660
16661
16662
16663
16664
16665
16666
16667
16668
16669
16670
16671
16672
16673
16674
16675
16676
16677
16678
16679
16680
16681
16682
16683
16684
16685
16686
16687
16688
16689
16690
16691
16692
16693
16694
16695
16696
16697
16698
16699
16700
16701
16702
16703
16704
16705
16706
16707
16708
16709
16710
16711
16712
16713
16714
16715
16716
16717
16718
16719
16720
16721
16722
16723
16724
16725
16726
16727
16728
16729
16730
16731
16732
16733
16734
16735
16736
16737
16738
16739
16740
16741
16742
16743
16744
16745
16746
16747
16748
16749
16750
16751
16752
16753
16754
16755
16756
16757
16758
16759
16760
16761
16762
16763
16764
16765
16766
16767
16768
16769
16770
16771
16772
16773
16774
16775
16776
16777
16778
16779
16780
16781
16782
16783
16784
16785
16786
16787
16788
16789
16790
16791
16792
16793
16794
16795
16796
16797
16798
16799
16800
16801
16802
16803
16804
16805
16806
16807
16808
16809
16810
16811
16812
16813
16814
16815
16816
16817
16818
16819
16820
16821
16822
16823
16824
16825
16826
16827
16828
16829
16830
16831
16832
16833
16834
16835
16836
16837
16838
16839
16840
16841
16842
16843
16844
16845
16846
16847
16848
16849
16850
16851
16852
16853
16854
16855
16856
16857
16858
16859
16860
16861
16862
16863
16864
16865
16866
16867
16868
16869
16870
16871
16872
16873
16874
16875
16876
16877
16878
16879
16880
16881
16882
16883
16884
16885
16886
16887
16888
16889
16890
16891
16892
16893
16894
16895
16896
16897
16898
16899
16900
16901
16902
16903
16904
16905
16906
16907
16908
16909
16910
16911
16912
16913
16914
16915
16916
16917
16918
16919
16920
16921
16922
16923
16924
16925
16926
16927
16928
16929
16930
16931
16932
16933
16934
16935
16936
16937
16938
16939
16940
16941
16942
16943
16944
16945
16946
16947
16948
16949
16950
16951
16952
16953
16954
16955
16956
16957
16958
16959
16960
16961
16962
16963
16964
16965
16966
16967
16968
16969
16970
16971
16972
16973
16974
16975
16976
16977
16978
16979
16980
16981
16982
16983
16984
16985
16986
16987
16988
16989
16990
16991
16992
16993
16994
16995
16996
16997
16998
16999
17000
17001
17002
17003
17004
17005
17006
17007
17008
17009
17010
17011
17012
17013
17014
17015
17016
17017
17018
17019
17020
17021
17022
17023
17024
17025
17026
17027
17028
17029
17030
17031
17032
17033
17034
17035
17036
17037
17038
17039
17040
17041
17042
17043
17044
17045
17046
17047
17048
17049
17050
17051
17052
17053
17054
17055
17056
17057
17058
17059
17060
17061
17062
17063
17064
17065
17066
17067
17068
17069
17070
17071
17072
17073
17074
17075
17076
17077
17078
17079
17080
17081
17082
17083
17084
17085
17086
17087
17088
17089
17090
17091
17092
17093
17094
17095
17096
17097
17098
17099
17100
17101
17102
17103
17104
17105
17106
17107
17108
17109
17110
17111
17112
17113
17114
17115
17116
17117
17118
17119
17120
17121
17122
17123
17124
17125
17126
17127
17128
17129
17130
17131
17132
17133
17134
17135
17136
17137
17138
17139
17140
17141
17142
17143
17144
17145
17146
17147
17148
17149
17150
17151
17152
17153
17154
17155
17156
17157
17158
17159
17160
17161
17162
17163
17164
17165
17166
17167
17168
17169
17170
17171
17172
17173
17174
17175
17176
17177
17178
17179
17180
17181
17182
17183
17184
17185
17186
17187
17188
17189
17190
17191
17192
17193
17194
17195
17196
17197
17198
17199
17200
17201
17202
17203
17204
17205
17206
17207
17208
17209
17210
17211
17212
17213
17214
17215
17216
17217
17218
17219
17220
17221
17222
17223
17224
17225
17226
17227
17228
17229
17230
17231
17232
17233
17234
17235
17236
17237
17238
17239
17240
17241
17242
17243
17244
17245
17246
17247
17248
17249
17250
17251
17252
17253
17254
17255
17256
17257
17258
17259
17260
17261
17262
17263
17264
17265
17266
17267
17268
17269
17270
17271
17272
17273
17274
17275
17276
17277
17278
17279
17280
17281
17282
17283
17284
17285
17286
17287
17288
17289
17290
17291
17292
17293
17294
17295
17296
17297
17298
17299
17300
17301
17302
17303
17304
17305
17306
17307
17308
17309
17310
17311
17312
17313
17314
17315
17316
17317
17318
17319
17320
17321
17322
17323
17324
17325
17326
17327
17328
17329
17330
17331
17332
17333
17334
17335
17336
17337
17338
17339
17340
17341
17342
17343
17344
17345
17346
17347
17348
17349
17350
17351
17352
17353
17354
17355
17356
17357
17358
17359
17360
17361
17362
17363
17364
17365
17366
17367
17368
17369
17370
17371
17372
17373
17374
17375
17376
17377
17378
17379
17380
17381
17382
17383
17384
17385
17386
17387
17388
17389
17390
17391
17392
17393
17394
17395
17396
17397
17398
17399
17400
17401
17402
17403
17404
17405
17406
17407
17408
17409
17410
17411
17412
17413
17414
17415
17416
17417
17418
17419
17420
17421
17422
17423
17424
17425
17426
17427
17428
17429
17430
17431
17432
17433
17434
17435
17436
17437
17438
17439
17440
17441
17442
17443
17444
17445
17446
17447
17448
17449
17450
17451
17452
17453
17454
17455
17456
17457
17458
17459
17460
17461
17462
17463
17464
17465
17466
17467
17468
17469
17470
17471
17472
17473
17474
17475
17476
17477
17478
17479
17480
17481
17482
17483
17484
17485
17486
17487
17488
17489
17490
17491
17492
17493
17494
17495
17496
17497
17498
17499
17500
17501
17502
17503
17504
17505
17506
17507
17508
17509
17510
17511
17512
17513
17514
17515
17516
17517
17518
17519
17520
17521
17522
17523
17524
17525
17526
17527
17528
17529
17530
17531
17532
17533
17534
17535
17536
17537
17538
17539
17540
17541
17542
17543
17544
17545
17546
17547
17548
17549
17550
17551
17552
17553
17554
17555
17556
17557
17558
17559
17560
17561
17562
17563
17564
17565
17566
17567
17568
17569
17570
17571
17572
17573
17574
17575
17576
17577
17578
17579
17580
17581
17582
17583
17584
17585
17586
17587
17588
17589
17590
17591
17592
17593
17594
17595
17596
17597
17598
17599
17600
17601
17602
17603
17604
17605
17606
17607
17608
17609
17610
17611
17612
17613
17614
17615
17616
17617
17618
17619
17620
17621
17622
17623
17624
17625
17626
17627
17628
17629
17630
17631
17632
17633
17634
17635
17636
17637
17638
17639
17640
17641
17642
17643
17644
17645
17646
17647
17648
17649
17650
17651
17652
17653
17654
17655
17656
17657
17658
17659
17660
17661
17662
17663
17664
17665
17666
17667
17668
17669
17670
17671
17672
17673
17674
17675
17676
17677
17678
17679
17680
17681
17682
17683
17684
17685
17686
17687
17688
17689
17690
17691
17692
17693
17694
17695
17696
17697
17698
17699
17700
17701
17702
17703
17704
17705
17706
17707
17708
17709
17710
17711
17712
17713
17714
17715
17716
17717
17718
17719
17720
17721
17722
17723
17724
17725
17726
17727
17728
17729
17730
17731
17732
17733
17734
17735
17736
17737
17738
17739
17740
17741
17742
17743
17744
17745
17746
17747
17748
17749
17750
17751
17752
17753
17754
17755
17756
17757
17758
17759
17760
17761
17762
17763
17764
17765
17766
17767
17768
17769
17770
17771
17772
17773
17774
17775
17776
17777
17778
17779
17780
17781
17782
17783
17784
17785
17786
17787
17788
17789
17790
17791
17792
17793
17794
17795
17796
17797
17798
17799
17800
17801
17802
17803
17804
17805
17806
17807
17808
17809
17810
17811
17812
17813
17814
17815
17816
17817
17818
17819
17820
17821
17822
17823
17824
17825
17826
17827
17828
17829
17830
17831
17832
17833
17834
17835
17836
17837
17838
17839
17840
17841
17842
17843
17844
17845
17846
17847
17848
17849
17850
17851
17852
17853
17854
17855
17856
17857
17858
17859
17860
17861
17862
17863
17864
17865
17866
17867
17868
17869
17870
17871
17872
17873
17874
17875
17876
17877
17878
17879
17880
17881
17882
17883
17884
17885
17886
17887
17888
17889
17890
17891
17892
17893
17894
17895
17896
17897
17898
17899
17900
17901
17902
17903
17904
17905
17906
17907
17908
17909
17910
17911
17912
17913
17914
17915
17916
17917
17918
17919
17920
17921
17922
17923
17924
17925
17926
17927
17928
17929
17930
17931
17932
17933
17934
17935
17936
17937
17938
17939
17940
17941
17942
17943
17944
17945
17946
17947
17948
17949
17950
17951
17952
17953
17954
17955
17956
17957
17958
17959
17960
17961
17962
17963
17964
17965
17966
17967
17968
17969
17970
17971
17972
17973
17974
17975
17976
17977
17978
17979
17980
17981
17982
17983
17984
17985
17986
17987
17988
17989
17990
17991
17992
17993
17994
17995
17996
17997
17998
17999
18000
18001
18002
18003
18004
18005
18006
18007
18008
18009
18010
18011
18012
18013
18014
18015
18016
18017
18018
18019
18020
18021
18022
18023
18024
18025
18026
18027
18028
18029
18030
18031
18032
18033
18034
18035
18036
18037
18038
18039
18040
18041
18042
18043
18044
18045
18046
18047
18048
18049
18050
18051
18052
18053
18054
18055
18056
18057
18058
18059
18060
18061
18062
18063
18064
18065
18066
18067
18068
18069
18070
18071
18072
18073
18074
18075
18076
18077
18078
18079
18080
18081
18082
18083
18084
18085
18086
18087
18088
18089
18090
18091
18092
18093
18094
18095
18096
18097
18098
18099
18100
18101
18102
18103
18104
18105
18106
18107
18108
18109
18110
18111
18112
18113
18114
18115
18116
18117
18118
18119
18120
18121
18122
18123
18124
18125
18126
18127
18128
18129
18130
18131
18132
18133
18134
18135
18136
18137
18138
18139
18140
18141
18142
18143
18144
18145
18146
18147
18148
18149
18150
18151
18152
18153
18154
18155
18156
18157
18158
18159
18160
18161
18162
18163
18164
18165
18166
18167
18168
18169
18170
18171
18172
18173
18174
18175
18176
18177
18178
18179
18180
18181
18182
18183
18184
18185
18186
18187
18188
18189
18190
18191
18192
18193
18194
18195
18196
18197
18198
18199
18200
18201
18202
18203
18204
18205
18206
18207
18208
18209
18210
18211
18212
18213
18214
18215
18216
18217
18218
18219
18220
18221
18222
18223
18224
18225
18226
18227
18228
18229
18230
18231
18232
18233
18234
18235
18236
18237
18238
18239
18240
18241
18242
18243
18244
18245
18246
18247
18248
18249
18250
18251
18252
18253
18254
18255
18256
18257
18258
18259
18260
18261
18262
18263
18264
18265
18266
18267
18268
18269
18270
18271
18272
18273
18274
18275
18276
18277
18278
18279
18280
18281
18282
18283
18284
18285
18286
18287
18288
18289
18290
18291
18292
18293
18294
18295
18296
18297
18298
18299
18300
18301
18302
18303
18304
18305
18306
18307
18308
18309
18310
18311
18312
18313
18314
18315
18316
18317
18318
18319
18320
18321
18322
18323
18324
18325
18326
18327
18328
18329
18330
18331
18332
18333
18334
18335
18336
18337
18338
18339
18340
18341
18342
18343
18344
18345
18346
18347
18348
18349
18350
18351
18352
18353
18354
18355
18356
18357
18358
18359
18360
18361
18362
18363
18364
18365
18366
18367
18368
18369
18370
18371
18372
18373
18374
18375
18376
18377
18378
18379
18380
18381
18382
18383
18384
18385
18386
18387
18388
18389
18390
18391
18392
18393
18394
18395
18396
18397
18398
18399
18400
18401
18402
18403
18404
18405
18406
18407
18408
18409
18410
18411
18412
18413
18414
18415
18416
18417
18418
18419
18420
18421
18422
18423
18424
18425
18426
18427
18428
18429
18430
18431
18432
18433
18434
18435
18436
18437
18438
18439
18440
18441
18442
18443
18444
18445
18446
18447
18448
18449
18450
18451
18452
18453
18454
18455
18456
18457
18458
18459
18460
18461
18462
18463
18464
18465
18466
18467
18468
18469
18470
18471
18472
18473
18474
18475
18476
18477
18478
18479
18480
18481
18482
18483
18484
18485
18486
18487
18488
18489
18490
18491
18492
18493
18494
18495
18496
18497
18498
18499
18500
18501
18502
18503
18504
18505
18506
18507
18508
18509
18510
18511
18512
18513
18514
18515
18516
18517
18518
18519
18520
18521
18522
18523
18524
18525
18526
18527
18528
18529
18530
18531
18532
18533
18534
18535
18536
18537
18538
18539
18540
18541
18542
18543
18544
18545
18546
18547
18548
18549
18550
18551
18552
18553
18554
18555
18556
18557
18558
18559
18560
18561
18562
18563
18564
18565
18566
18567
18568
18569
18570
18571
18572
18573
18574
18575
18576
18577
18578
18579
18580
18581
18582
18583
18584
18585
18586
18587
18588
18589
18590
18591
18592
18593
18594
18595
18596
18597
18598
18599
18600
18601
18602
18603
18604
18605
18606
18607
18608
18609
18610
18611
18612
18613
18614
18615
18616
18617
18618
18619
18620
18621
18622
18623
18624
18625
18626
18627
18628
18629
18630
18631
18632
18633
18634
18635
18636
18637
18638
18639
18640
18641
18642
18643
18644
18645
18646
18647
18648
18649
18650
18651
18652
18653
18654
18655
18656
18657
18658
18659
18660
18661
18662
18663
18664
18665
18666
18667
18668
18669
18670
18671
18672
18673
18674
18675
18676
18677
18678
18679
18680
18681
18682
18683
18684
18685
18686
18687
18688
18689
18690
18691
18692
18693
18694
18695
18696
18697
18698
18699
18700
18701
18702
18703
18704
18705
18706
18707
18708
18709
18710
18711
18712
18713
18714
18715
18716
18717
18718
18719
18720
18721
18722
18723
18724
18725
18726
18727
18728
18729
18730
18731
18732
18733
18734
18735
18736
18737
18738
18739
18740
18741
18742
18743
18744
18745
18746
18747
18748
18749
18750
18751
18752
18753
18754
18755
18756
18757
18758
18759
18760
18761
18762
18763
18764
18765
18766
18767
18768
18769
18770
18771
18772
18773
18774
18775
18776
18777
18778
18779
18780
18781
18782
18783
18784
18785
18786
18787
18788
18789
18790
18791
18792
18793
18794
18795
18796
18797
18798
18799
18800
18801
18802
18803
18804
18805
18806
18807
18808
18809
18810
18811
18812
18813
18814
18815
18816
18817
18818
18819
18820
18821
18822
18823
18824
18825
18826
18827
18828
18829
18830
18831
18832
18833
18834
18835
18836
18837
18838
18839
18840
18841
18842
18843
18844
18845
18846
18847
18848
18849
18850
18851
18852
18853
18854
18855
18856
18857
18858
18859
18860
18861
18862
18863
18864
18865
18866
18867
18868
18869
18870
18871
18872
18873
18874
18875
18876
18877
18878
18879
18880
18881
18882
18883
18884
18885
18886
18887
18888
18889
18890
18891
18892
18893
18894
18895
18896
18897
18898
18899
18900
18901
18902
18903
18904
18905
18906
18907
18908
18909
18910
18911
18912
18913
18914
18915
18916
18917
18918
18919
18920
18921
18922
18923
18924
18925
18926
18927
18928
18929
18930
18931
18932
18933
18934
18935
18936
18937
18938
18939
18940
18941
18942
18943
18944
18945
18946
18947
18948
18949
18950
18951
18952
18953
18954
18955
18956
18957
18958
18959
18960
18961
18962
18963
18964
18965
18966
18967
18968
18969
18970
18971
18972
18973
18974
18975
18976
18977
18978
18979
18980
18981
18982
18983
18984
18985
18986
18987
18988
18989
18990
18991
18992
18993
18994
18995
18996
18997
18998
18999
19000
19001
19002
19003
19004
19005
19006
19007
19008
19009
19010
19011
19012
19013
19014
19015
19016
19017
19018
19019
19020
19021
19022
19023
19024
19025
19026
19027
19028
19029
19030
19031
19032
19033
19034
19035
19036
19037
19038
19039
19040
19041
19042
19043
19044
19045
19046
19047
19048
19049
19050
19051
19052
19053
19054
19055
19056
19057
19058
19059
19060
19061
19062
19063
19064
19065
19066
19067
19068
19069
19070
19071
19072
19073
19074
19075
19076
19077
19078
19079
19080
19081
19082
19083
19084
19085
19086
19087
19088
19089
19090
19091
19092
19093
19094
19095
19096
19097
19098
19099
19100
19101
19102
19103
19104
19105
19106
19107
19108
19109
19110
19111
19112
19113
19114
19115
19116
19117
19118
19119
19120
19121
19122
19123
19124
19125
19126
19127
19128
19129
19130
19131
19132
19133
19134
19135
19136
19137
19138
19139
19140
19141
19142
19143
19144
19145
19146
19147
19148
19149
19150
19151
19152
19153
19154
19155
19156
19157
19158
19159
19160
19161
19162
19163
19164
19165
19166
19167
19168
19169
19170
19171
19172
19173
19174
19175
19176
19177
19178
19179
19180
19181
19182
19183
19184
19185
19186
19187
19188
19189
19190
19191
19192
19193
19194
19195
19196
19197
19198
19199
19200
19201
19202
19203
19204
19205
19206
19207
19208
19209
19210
19211
19212
19213
19214
19215
19216
19217
19218
19219
19220
19221
19222
19223
19224
19225
19226
19227
19228
19229
19230
19231
19232
19233
19234
19235
19236
19237
19238
19239
19240
19241
19242
19243
19244
19245
19246
19247
19248
19249
19250
19251
19252
19253
19254
19255
19256
19257
19258
19259
19260
19261
19262
19263
19264
19265
19266
19267
19268
19269
19270
19271
19272
19273
19274
19275
19276
19277
19278
19279
19280
19281
19282
19283
19284
19285
19286
19287
19288
19289
19290
19291
19292
19293
19294
19295
19296
19297
19298
19299
19300
19301
19302
19303
19304
19305
19306
19307
19308
19309
19310
19311
19312
19313
19314
19315
19316
19317
19318
19319
19320
19321
19322
19323
19324
19325
19326
19327
19328
19329
19330
19331
19332
19333
19334
19335
19336
19337
19338
19339
19340
19341
19342
19343
19344
19345
19346
19347
19348
19349
19350
19351
19352
19353
19354
19355
19356
19357
19358
19359
19360
19361
19362
19363
19364
19365
19366
19367
19368
19369
19370
19371
19372
19373
19374
19375
19376
19377
19378
19379
19380
19381
19382
19383
19384
19385
19386
19387
19388
19389
19390
19391
19392
19393
19394
19395
19396
19397
19398
19399
19400
19401
19402
19403
19404
19405
19406
19407
19408
19409
19410
19411
19412
19413
19414
19415
19416
19417
19418
19419
19420
19421
19422
19423
19424
19425
19426
19427
19428
19429
19430
19431
19432
19433
19434
19435
19436
19437
19438
19439
19440
19441
19442
19443
19444
19445
19446
19447
19448
19449
19450
19451
19452
19453
19454
19455
19456
19457
19458
19459
19460
19461
19462
19463
19464
19465
19466
19467
19468
19469
19470
19471
19472
19473
19474
19475
19476
19477
19478
19479
19480
19481
19482
19483
19484
19485
19486
19487
19488
19489
19490
19491
19492
19493
19494
19495
19496
19497
19498
19499
19500
19501
19502
19503
19504
19505
19506
19507
19508
19509
19510
19511
19512
19513
19514
19515
19516
19517
19518
19519
19520
19521
19522
19523
19524
19525
19526
19527
19528
19529
19530
19531
19532
19533
19534
19535
19536
19537
19538
19539
19540
19541
19542
19543
19544
19545
19546
19547
19548
19549
19550
19551
19552
19553
19554
19555
19556
19557
19558
19559
19560
19561
19562
19563
19564
19565
19566
19567
19568
19569
19570
19571
19572
19573
19574
19575
19576
19577
19578
19579
19580
19581
19582
19583
19584
19585
19586
19587
19588
19589
19590
19591
19592
19593
19594
19595
19596
19597
19598
19599
19600
19601
19602
19603
19604
19605
19606
19607
19608
19609
19610
19611
19612
19613
19614
19615
19616
19617
19618
19619
19620
19621
19622
19623
19624
19625
19626
19627
19628
19629
19630
19631
19632
19633
19634
19635
19636
19637
19638
19639
19640
19641
19642
19643
19644
19645
19646
19647
19648
19649
19650
19651
19652
19653
19654
19655
19656
19657
19658
19659
19660
19661
19662
19663
19664
19665
19666
19667
19668
19669
19670
19671
19672
19673
19674
19675
19676
19677
19678
19679
19680
19681
19682
19683
19684
19685
19686
19687
19688
19689
19690
19691
19692
19693
19694
19695
19696
19697
19698
19699
19700
19701
19702
19703
19704
19705
19706
19707
19708
19709
19710
19711
19712
19713
19714
19715
19716
19717
19718
19719
19720
19721
19722
19723
19724
19725
19726
19727
19728
19729
19730
19731
19732
19733
19734
19735
19736
19737
19738
19739
19740
19741
19742
19743
19744
19745
19746
19747
19748
19749
19750
19751
19752
19753
19754
19755
19756
19757
19758
19759
19760
19761
19762
19763
19764
19765
19766
19767
19768
19769
19770
19771
19772
19773
19774
19775
19776
19777
19778
19779
19780
19781
19782
19783
19784
19785
19786
19787
19788
19789
19790
19791
19792
19793
19794
19795
19796
19797
19798
19799
19800
19801
19802
19803
19804
19805
19806
19807
19808
19809
19810
19811
19812
19813
19814
19815
19816
19817
19818
19819
19820
19821
19822
19823
19824
19825
19826
19827
19828
19829
19830
19831
19832
19833
19834
19835
19836
19837
19838
19839
19840
19841
19842
19843
19844
19845
19846
19847
19848
19849
19850
19851
19852
19853
19854
19855
19856
19857
19858
19859
19860
19861
19862
19863
19864
19865
19866
19867
19868
19869
19870
19871
19872
19873
19874
19875
19876
19877
19878
19879
19880
19881
19882
19883
19884
19885
19886
19887
19888
19889
19890
19891
19892
19893
19894
19895
19896
19897
19898
19899
19900
19901
19902
19903
19904
19905
19906
19907
19908
19909
19910
19911
19912
19913
19914
19915
19916
19917
19918
19919
19920
19921
19922
19923
19924
19925
19926
19927
19928
19929
19930
19931
19932
19933
19934
19935
19936
19937
19938
19939
19940
19941
19942
19943
19944
19945
19946
19947
19948
19949
19950
19951
19952
19953
19954
19955
19956
19957
19958
19959
19960
19961
19962
19963
19964
19965
19966
19967
19968
19969
19970
19971
19972
19973
19974
19975
19976
19977
19978
19979
19980
19981
19982
19983
19984
19985
19986
19987
19988
19989
19990
19991
19992
19993
19994
19995
19996
19997
19998
19999
20000
20001
20002
20003
20004
20005
20006
20007
20008
20009
20010
20011
20012
20013
20014
20015
20016
20017
20018
20019
20020
20021
20022
20023
20024
20025
20026
20027
20028
20029
20030
20031
20032
20033
20034
20035
20036
20037
20038
20039
20040
20041
20042
20043
20044
20045
20046
20047
20048
20049
20050
20051
20052
20053
20054
20055
20056
20057
20058
20059
20060
20061
20062
20063
20064
20065
20066
20067
20068
20069
20070
20071
20072
20073
20074
20075
20076
20077
20078
20079
20080
20081
20082
20083
20084
20085
20086
20087
20088
20089
20090
20091
20092
20093
20094
20095
20096
20097
20098
20099
20100
20101
20102
20103
20104
20105
20106
20107
20108
20109
20110
20111
20112
20113
20114
20115
20116
20117
20118
20119
20120
20121
20122
20123
20124
20125
20126
20127
20128
20129
20130
20131
20132
20133
20134
20135
20136
20137
20138
20139
20140
20141
20142
20143
20144
20145
20146
20147
20148
20149
20150
20151
20152
20153
20154
20155
20156
20157
20158
20159
20160
20161
20162
20163
20164
20165
20166
20167
20168
20169
20170
20171
20172
20173
20174
20175
20176
20177
20178
20179
20180
20181
20182
20183
20184
20185
20186
20187
20188
20189
20190
20191
20192
20193
20194
20195
20196
20197
20198
20199
20200
20201
20202
20203
20204
20205
20206
20207
20208
20209
20210
20211
20212
20213
20214
20215
20216
20217
20218
20219
20220
20221
20222
20223
20224
20225
20226
20227
20228
20229
20230
20231
20232
20233
20234
20235
20236
20237
20238
20239
20240
20241
20242
20243
20244
20245
20246
20247
20248
20249
20250
20251
20252
20253
20254
20255
20256
20257
20258
20259
20260
20261
20262
20263
20264
20265
20266
20267
20268
20269
20270
20271
20272
20273
20274
20275
20276
20277
20278
20279
20280
20281
20282
20283
20284
20285
20286
20287
20288
20289
20290
20291
20292
20293
20294
20295
20296
20297
20298
20299
20300
20301
20302
20303
20304
20305
20306
20307
20308
20309
20310
20311
20312
20313
20314
20315
20316
20317
20318
20319
20320
20321
20322
20323
20324
20325
20326
20327
20328
20329
20330
20331
20332
20333
20334
20335
20336
20337
20338
20339
20340
20341
20342
20343
20344
20345
20346
20347
20348
20349
20350
20351
20352
20353
20354
20355
20356
20357
20358
20359
20360
20361
20362
20363
20364
20365
20366
20367
20368
20369
20370
20371
20372
20373
20374
20375
20376
20377
20378
20379
20380
20381
20382
20383
20384
20385
20386
20387
20388
20389
20390
20391
20392
20393
20394
20395
20396
20397
20398
20399
20400
20401
20402
20403
20404
20405
20406
20407
20408
20409
20410
20411
20412
20413
20414
20415
20416
20417
20418
20419
20420
20421
20422
20423
20424
20425
20426
20427
20428
20429
20430
20431
20432
20433
20434
20435
20436
20437
20438
20439
20440
20441
20442
20443
20444
20445
20446
20447
20448
20449
20450
20451
20452
20453
20454
20455
20456
20457
20458
20459
20460
20461
20462
20463
20464
20465
20466
20467
20468
20469
20470
20471
20472
20473
20474
20475
20476
20477
20478
20479
20480
20481
20482
20483
20484
20485
20486
20487
20488
20489
20490
20491
20492
20493
20494
20495
20496
20497
20498
20499
20500
20501
20502
20503
20504
20505
20506
20507
20508
20509
20510
20511
20512
20513
20514
20515
20516
20517
20518
20519
20520
20521
20522
20523
20524
20525
20526
20527
20528
20529
20530
20531
20532
20533
20534
20535
20536
20537
20538
20539
20540
20541
20542
20543
20544
20545
20546
20547
20548
20549
20550
20551
20552
20553
20554
20555
20556
20557
20558
20559
20560
20561
20562
20563
20564
20565
20566
20567
20568
20569
20570
20571
20572
20573
20574
20575
20576
20577
20578
20579
20580
20581
20582
20583
20584
20585
20586
20587
20588
20589
20590
20591
20592
20593
20594
20595
20596
20597
20598
20599
20600
20601
20602
20603
20604
20605
20606
20607
20608
20609
20610
20611
20612
20613
20614
20615
20616
20617
20618
20619
20620
20621
20622
20623
20624
20625
20626
20627
20628
20629
20630
20631
20632
20633
20634
20635
20636
20637
20638
20639
20640
20641
20642
20643
20644
20645
20646
20647
20648
20649
20650
20651
20652
20653
20654
20655
20656
20657
20658
20659
20660
20661
20662
20663
20664
20665
20666
20667
20668
20669
20670
20671
20672
20673
20674
20675
20676
20677
20678
20679
20680
20681
20682
20683
20684
20685
20686
20687
20688
20689
20690
20691
20692
20693
20694
20695
20696
20697
20698
20699
20700
20701
20702
20703
20704
20705
20706
20707
20708
20709
20710
20711
20712
20713
20714
20715
20716
20717
20718
20719
20720
20721
20722
20723
20724
20725
20726
20727
20728
20729
20730
20731
20732
20733
20734
20735
20736
20737
20738
20739
20740
20741
20742
20743
20744
20745
20746
20747
20748
20749
20750
20751
20752
20753
20754
20755
20756
20757
20758
20759
20760
20761
20762
20763
20764
20765
20766
20767
20768
20769
20770
20771
20772
20773
20774
20775
20776
20777
20778
20779
20780
20781
20782
20783
20784
20785
20786
20787
20788
20789
20790
20791
20792
20793
20794
20795
20796
20797
20798
20799
20800
20801
20802
20803
20804
20805
20806
20807
20808
20809
20810
20811
20812
20813
20814
20815
20816
20817
20818
20819
20820
20821
20822
20823
20824
20825
20826
20827
20828
20829
20830
20831
20832
20833
20834
20835
20836
20837
20838
20839
20840
20841
20842
20843
20844
20845
20846
20847
20848
20849
20850
20851
20852
20853
20854
20855
20856
20857
20858
20859
20860
20861
20862
20863
20864
20865
20866
20867
20868
20869
20870
20871
20872
20873
20874
20875
20876
20877
20878
20879
20880
20881
20882
20883
20884
20885
20886
20887
20888
20889
20890
20891
20892
20893
20894
20895
20896
20897
20898
20899
20900
20901
20902
20903
20904
20905
20906
20907
20908
20909
20910
20911
20912
20913
20914
20915
20916
20917
20918
20919
20920
20921
20922
20923
20924
20925
20926
20927
20928
20929
20930
20931
20932
20933
20934
20935
20936
20937
20938
20939
20940
20941
20942
20943
20944
20945
20946
20947
20948
20949
20950
20951
20952
20953
20954
20955
20956
20957
20958
20959
20960
20961
20962
20963
20964
20965
20966
20967
20968
20969
20970
20971
20972
20973
20974
20975
20976
20977
20978
20979
20980
20981
20982
20983
20984
20985
20986
20987
20988
20989
20990
20991
20992
20993
20994
20995
20996
20997
20998
20999
21000
21001
21002
21003
21004
21005
21006
21007
21008
21009
21010
21011
21012
21013
21014
21015
21016
21017
21018
21019
21020
21021
21022
21023
21024
21025
21026
21027
21028
21029
21030
21031
21032
21033
21034
21035
21036
21037
21038
21039
21040
21041
21042
21043
21044
21045
21046
21047
21048
21049
21050
21051
21052
21053
21054
21055
21056
21057
21058
21059
21060
21061
21062
21063
21064
21065
21066
21067
21068
21069
21070
21071
21072
21073
21074
21075
21076
21077
21078
21079
21080
21081
21082
21083
21084
21085
21086
21087
21088
21089
21090
21091
21092
21093
21094
21095
21096
21097
21098
21099
21100
21101
21102
21103
21104
21105
21106
21107
21108
21109
21110
21111
21112
21113
21114
21115
21116
21117
21118
21119
21120
21121
21122
21123
21124
21125
21126
21127
21128
21129
21130
21131
21132
21133
21134
21135
21136
21137
21138
21139
21140
21141
21142
21143
21144
21145
21146
21147
21148
21149
21150
21151
21152
21153
21154
21155
21156
21157
21158
21159
21160
21161
21162
21163
21164
21165
21166
21167
21168
21169
21170
21171
21172
21173
21174
21175
21176
21177
21178
21179
21180
21181
21182
21183
21184
21185
21186
21187
21188
21189
21190
21191
21192
21193
21194
21195
21196
21197
21198
21199
21200
21201
21202
21203
21204
21205
21206
21207
21208
21209
21210
21211
21212
21213
21214
21215
21216
21217
21218
21219
21220
21221
21222
21223
21224
21225
21226
21227
21228
21229
21230
21231
21232
21233
21234
21235
21236
21237
21238
21239
21240
21241
21242
21243
21244
21245
21246
21247
21248
21249
21250
21251
21252
21253
21254
21255
21256
21257
21258
21259
21260
21261
21262
21263
21264
21265
21266
21267
21268
21269
21270
21271
21272
21273
21274
21275
21276
21277
21278
21279
21280
21281
21282
21283
21284
21285
21286
21287
21288
21289
21290
21291
21292
21293
21294
21295
21296
21297
21298
21299
21300
21301
21302
21303
21304
21305
21306
21307
21308
21309
21310
21311
21312
21313
21314
21315
21316
21317
21318
21319
21320
21321
21322
21323
21324
21325
21326
21327
21328
21329
21330
21331
21332
21333
21334
21335
21336
21337
21338
21339
21340
21341
21342
21343
21344
21345
21346
21347
21348
21349
21350
21351
21352
21353
21354
21355
21356
21357
21358
21359
21360
21361
21362
21363
21364
21365
21366
21367
21368
21369
21370
21371
21372
21373
21374
21375
21376
21377
21378
21379
21380
21381
21382
21383
21384
21385
21386
21387
21388
21389
21390
21391
21392
21393
21394
21395
21396
21397
21398
21399
21400
21401
21402
21403
21404
21405
21406
21407
21408
21409
21410
21411
21412
21413
21414
21415
21416
21417
21418
21419
21420
21421
21422
21423
21424
21425
21426
21427
21428
21429
21430
21431
21432
21433
21434
21435
21436
21437
21438
21439
21440
21441
21442
21443
21444
21445
21446
21447
21448
21449
21450
21451
21452
21453
21454
21455
21456
21457
21458
21459
21460
21461
21462
21463
21464
21465
21466
21467
21468
21469
21470
21471
21472
21473
21474
21475
21476
21477
21478
21479
21480
21481
21482
21483
21484
21485
21486
21487
21488
21489
21490
21491
21492
21493
21494
21495
21496
21497
21498
21499
21500
21501
21502
21503
21504
21505
21506
21507
21508
21509
21510
21511
21512
21513
21514
21515
21516
21517
21518
21519
21520
21521
21522
21523
21524
21525
21526
21527
21528
21529
21530
21531
21532
21533
21534
21535
21536
21537
21538
21539
21540
21541
21542
21543
21544
21545
21546
21547
21548
21549
21550
21551
21552
21553
21554
21555
21556
21557
21558
21559
21560
21561
21562
21563
21564
21565
21566
21567
21568
21569
21570
21571
21572
21573
21574
21575
21576
21577
21578
21579
21580
21581
21582
21583
21584
21585
21586
21587
21588
21589
21590
21591
21592
21593
21594
21595
21596
21597
21598
21599
21600
21601
21602
21603
21604
21605
21606
21607
21608
21609
21610
21611
21612
21613
21614
21615
21616
21617
21618
21619
21620
21621
21622
21623
21624
21625
21626
21627
21628
21629
21630
21631
21632
21633
21634
21635
21636
21637
21638
21639
21640
21641
21642
21643
21644
21645
21646
21647
21648
21649
21650
21651
21652
21653
21654
21655
21656
21657
21658
21659
21660
21661
21662
21663
21664
21665
21666
21667
21668
21669
21670
21671
21672
21673
21674
21675
21676
21677
21678
21679
21680
21681
21682
21683
21684
21685
21686
21687
21688
21689
21690
21691
21692
21693
21694
21695
21696
21697
21698
21699
21700
21701
21702
21703
21704
21705
21706
21707
21708
21709
21710
21711
21712
21713
21714
21715
21716
21717
21718
21719
21720
21721
21722
21723
21724
21725
21726
21727
21728
21729
21730
21731
21732
21733
21734
21735
21736
21737
21738
21739
21740
21741
21742
21743
21744
21745
21746
21747
21748
21749
21750
21751
21752
21753
21754
21755
21756
21757
21758
21759
21760
21761
21762
21763
21764
21765
21766
21767
21768
21769
21770
21771
21772
21773
21774
21775
21776
21777
21778
21779
21780
21781
21782
21783
21784
21785
21786
21787
21788
21789
21790
21791
21792
21793
21794
21795
21796
21797
21798
21799
21800
21801
21802
21803
21804
21805
21806
21807
21808
21809
21810
21811
21812
21813
21814
21815
21816
21817
21818
21819
21820
21821
21822
21823
21824
21825
21826
21827
21828
21829
21830
21831
21832
21833
21834
21835
21836
21837
21838
21839
21840
21841
21842
21843
21844
21845
21846
21847
21848
21849
21850
21851
21852
21853
21854
21855
21856
21857
21858
21859
21860
21861
21862
21863
21864
21865
21866
21867
21868
21869
21870
21871
21872
21873
21874
21875
21876
21877
21878
21879
21880
21881
21882
21883
21884
21885
21886
21887
21888
21889
21890
21891
21892
21893
21894
21895
21896
21897
21898
21899
21900
21901
21902
21903
21904
21905
21906
21907
21908
21909
21910
21911
21912
21913
21914
21915
21916
21917
21918
21919
21920
21921
21922
21923
21924
21925
21926
21927
21928
21929
21930
21931
21932
21933
21934
21935
21936
21937
21938
21939
21940
21941
21942
21943
21944
21945
21946
21947
21948
21949
21950
21951
21952
21953
21954
21955
21956
21957
21958
21959
21960
21961
21962
21963
21964
21965
21966
21967
21968
21969
21970
21971
21972
21973
21974
21975
21976
21977
21978
21979
21980
21981
21982
21983
21984
21985
21986
21987
21988
21989
21990
21991
21992
21993
21994
21995
21996
21997
21998
21999
22000
22001
22002
22003
22004
22005
22006
22007
22008
22009
22010
22011
22012
22013
22014
22015
22016
22017
22018
22019
22020
22021
22022
22023
22024
22025
22026
22027
22028
22029
22030
22031
22032
22033
22034
22035
22036
22037
22038
22039
22040
22041
22042
22043
22044
22045
22046
22047
22048
22049
22050
22051
22052
22053
22054
22055
22056
22057
22058
22059
22060
22061
22062
22063
22064
22065
22066
22067
22068
22069
22070
22071
22072
22073
22074
22075
22076
22077
22078
22079
22080
22081
22082
22083
22084
22085
22086
22087
22088
22089
22090
22091
22092
22093
22094
22095
22096
22097
22098
22099
22100
22101
22102
22103
22104
22105
22106
22107
22108
22109
22110
22111
22112
22113
22114
22115
22116
22117
22118
22119
22120
22121
22122
22123
22124
22125
22126
22127
22128
22129
22130
22131
22132
22133
22134
22135
22136
22137
22138
22139
22140
22141
22142
22143
22144
22145
22146
22147
22148
22149
22150
22151
22152
22153
22154
22155
22156
22157
22158
22159
22160
22161
22162
22163
22164
22165
22166
22167
22168
22169
22170
22171
22172
22173
22174
22175
22176
22177
22178
22179
22180
22181
22182
22183
22184
22185
22186
22187
22188
22189
22190
22191
22192
22193
22194
22195
22196
22197
22198
22199
22200
22201
22202
22203
22204
22205
22206
22207
22208
22209
22210
22211
22212
22213
22214
22215
22216
22217
22218
22219
22220
22221
22222
22223
22224
22225
22226
22227
22228
22229
22230
22231
22232
22233
22234
22235
22236
22237
22238
22239
22240
22241
22242
22243
22244
22245
22246
22247
22248
22249
22250
22251
22252
22253
22254
22255
22256
22257
22258
22259
22260
22261
22262
22263
22264
22265
22266
22267
22268
22269
22270
22271
22272
22273
22274
22275
22276
22277
22278
22279
22280
22281
22282
22283
22284
22285
22286
22287
22288
22289
22290
22291
22292
22293
22294
22295
22296
22297
22298
22299
22300
22301
22302
22303
22304
22305
22306
22307
22308
22309
22310
22311
22312
22313
22314
22315
22316
22317
22318
22319
22320
22321
22322
22323
22324
22325
22326
22327
22328
22329
22330
22331
22332
22333
22334
22335
22336
22337
22338
22339
22340
22341
22342
22343
22344
22345
22346
22347
22348
22349
22350
22351
22352
22353
22354
22355
22356
22357
22358
22359
22360
22361
22362
22363
22364
22365
22366
22367
22368
22369
22370
22371
22372
22373
22374
22375
22376
22377
22378
22379
22380
22381
22382
22383
22384
22385
22386
22387
22388
22389
22390
22391
22392
22393
22394
22395
22396
22397
22398
22399
22400
22401
22402
22403
22404
22405
22406
22407
22408
22409
22410
22411
22412
22413
22414
22415
22416
22417
22418
22419
22420
22421
22422
22423
22424
22425
22426
22427
22428
22429
22430
22431
22432
22433
22434
22435
22436
22437
22438
22439
22440
22441
22442
22443
22444
22445
22446
22447
22448
22449
22450
22451
22452
22453
22454
22455
22456
22457
22458
22459
22460
22461
22462
22463
22464
22465
22466
22467
22468
22469
22470
22471
22472
22473
22474
22475
22476
22477
22478
22479
22480
22481
22482
22483
22484
22485
22486
22487
22488
22489
22490
22491
22492
22493
22494
22495
22496
22497
22498
22499
22500
22501
22502
22503
22504
22505
22506
22507
22508
22509
22510
22511
22512
22513
22514
22515
22516
22517
22518
22519
22520
22521
22522
22523
22524
22525
22526
22527
22528
22529
22530
22531
22532
22533
22534
22535
22536
22537
22538
22539
22540
22541
22542
22543
22544
22545
22546
22547
22548
22549
22550
22551
22552
22553
22554
22555
22556
22557
22558
22559
22560
22561
22562
22563
22564
22565
22566
22567
22568
22569
22570
22571
22572
22573
22574
22575
22576
22577
22578
22579
22580
22581
22582
22583
22584
22585
22586
22587
22588
22589
22590
22591
22592
22593
22594
22595
22596
22597
22598
22599
22600
22601
22602
22603
22604
22605
22606
22607
22608
22609
22610
22611
22612
22613
22614
22615
22616
22617
22618
22619
22620
22621
22622
22623
22624
22625
22626
22627
22628
22629
22630
22631
22632
22633
22634
22635
22636
22637
22638
22639
22640
22641
22642
22643
22644
22645
22646
22647
22648
22649
22650
22651
22652
22653
22654
22655
22656
22657
22658
22659
22660
22661
22662
22663
22664
22665
22666
22667
22668
22669
22670
22671
22672
22673
22674
22675
22676
22677
22678
22679
22680
22681
22682
22683
22684
22685
22686
22687
22688
22689
22690
22691
22692
22693
22694
22695
22696
22697
22698
22699
22700
22701
22702
22703
22704
22705
22706
22707
22708
22709
22710
22711
22712
22713
22714
22715
22716
22717
22718
22719
22720
22721
22722
22723
22724
22725
22726
22727
22728
22729
22730
22731
22732
22733
22734
22735
22736
22737
22738
22739
22740
22741
22742
22743
22744
22745
22746
22747
22748
22749
22750
22751
22752
22753
22754
22755
22756
22757
22758
22759
22760
22761
22762
22763
22764
22765
22766
22767
22768
22769
22770
22771
22772
22773
22774
22775
22776
22777
22778
22779
22780
22781
22782
22783
22784
22785
22786
22787
22788
22789
22790
22791
22792
22793
22794
22795
22796
22797
22798
22799
22800
22801
22802
22803
22804
22805
22806
22807
22808
22809
22810
22811
22812
22813
22814
22815
22816
22817
22818
22819
22820
22821
22822
22823
22824
22825
22826
22827
22828
22829
22830
22831
22832
22833
22834
22835
22836
22837
22838
22839
22840
22841
22842
22843
22844
22845
22846
22847
22848
22849
22850
22851
22852
22853
22854
22855
22856
22857
22858
22859
22860
22861
22862
22863
22864
22865
22866
22867
22868
22869
22870
22871
22872
22873
22874
22875
22876
22877
22878
22879
22880
22881
22882
22883
22884
22885
22886
22887
22888
22889
22890
22891
22892
22893
22894
22895
22896
22897
22898
22899
22900
22901
22902
22903
22904
22905
22906
22907
22908
22909
22910
22911
22912
22913
22914
22915
22916
22917
22918
22919
22920
22921
22922
22923
22924
22925
22926
22927
22928
22929
22930
22931
22932
22933
22934
22935
22936
22937
22938
22939
22940
22941
22942
22943
22944
22945
22946
22947
22948
22949
22950
22951
22952
22953
22954
22955
22956
22957
22958
22959
22960
22961
22962
22963
22964
22965
22966
22967
22968
22969
22970
22971
22972
22973
22974
22975
22976
22977
22978
22979
22980
22981
22982
22983
22984
22985
22986
22987
22988
22989
22990
22991
22992
22993
22994
22995
22996
22997
22998
22999
23000
23001
23002
23003
23004
23005
23006
23007
23008
23009
23010
23011
23012
23013
23014
23015
23016
23017
23018
23019
23020
23021
23022
23023
23024
23025
23026
23027
23028
23029
23030
23031
23032
23033
23034
23035
23036
23037
23038
23039
23040
23041
23042
23043
23044
23045
23046
23047
23048
23049
23050
23051
23052
23053
23054
23055
23056
23057
23058
23059
23060
23061
23062
23063
23064
23065
23066
23067
23068
23069
23070
23071
23072
23073
23074
23075
23076
23077
23078
23079
23080
23081
23082
23083
23084
23085
23086
23087
23088
23089
23090
23091
23092
23093
23094
23095
23096
23097
23098
23099
23100
23101
23102
23103
23104
23105
23106
23107
23108
23109
23110
23111
23112
23113
23114
23115
23116
23117
23118
23119
23120
23121
23122
23123
23124
23125
23126
23127
23128
23129
23130
23131
23132
23133
23134
23135
23136
23137
23138
23139
23140
23141
23142
23143
23144
23145
23146
23147
23148
23149
23150
23151
23152
23153
23154
23155
23156
23157
23158
23159
23160
23161
23162
23163
23164
23165
23166
23167
23168
23169
23170
23171
23172
23173
23174
23175
23176
23177
23178
23179
23180
23181
23182
23183
23184
23185
23186
23187
23188
23189
23190
23191
23192
23193
23194
23195
23196
23197
23198
23199
23200
23201
23202
23203
23204
23205
23206
23207
23208
23209
23210
23211
23212
23213
23214
23215
23216
23217
23218
23219
23220
23221
23222
23223
23224
23225
23226
23227
23228
23229
23230
23231
23232
23233
23234
23235
23236
23237
23238
23239
23240
23241
23242
23243
23244
23245
23246
23247
23248
23249
23250
23251
23252
23253
23254
23255
23256
23257
23258
23259
23260
23261
23262
23263
23264
23265
23266
23267
23268
23269
23270
23271
23272
23273
23274
23275
23276
23277
23278
23279
23280
23281
23282
23283
23284
23285
23286
23287
23288
23289
23290
23291
23292
23293
23294
23295
23296
23297
23298
23299
23300
23301
23302
23303
23304
23305
23306
23307
23308
23309
23310
23311
23312
23313
23314
23315
23316
23317
23318
23319
23320
23321
23322
23323
23324
23325
23326
23327
23328
23329
23330
23331
23332
23333
23334
23335
23336
23337
23338
23339
23340
23341
23342
23343
23344
23345
23346
23347
23348
23349
23350
23351
23352
23353
23354
23355
23356
23357
23358
23359
23360
23361
23362
23363
23364
23365
23366
23367
23368
23369
23370
23371
23372
23373
23374
23375
23376
23377
23378
23379
23380
23381
23382
23383
23384
23385
23386
23387
23388
23389
23390
23391
23392
23393
23394
23395
23396
23397
23398
23399
23400
23401
23402
23403
23404
23405
23406
23407
23408
23409
23410
23411
23412
23413
23414
23415
23416
23417
23418
23419
23420
23421
23422
23423
23424
23425
23426
23427
23428
23429
23430
23431
23432
23433
23434
23435
23436
23437
23438
23439
23440
23441
23442
23443
23444
23445
23446
23447
23448
23449
23450
23451
23452
23453
23454
23455
23456
23457
23458
23459
23460
23461
23462
23463
23464
23465
23466
23467
23468
23469
23470
23471
23472
23473
23474
23475
23476
23477
23478
23479
23480
23481
23482
23483
23484
23485
23486
23487
23488
23489
23490
23491
23492
23493
23494
23495
23496
23497
23498
23499
23500
23501
23502
23503
23504
23505
23506
23507
23508
23509
23510
23511
23512
23513
23514
23515
23516
23517
23518
23519
23520
23521
23522
23523
23524
23525
23526
23527
23528
23529
23530
23531
23532
23533
23534
23535
23536
23537
23538
23539
23540
23541
23542
23543
23544
23545
23546
23547
23548
23549
23550
23551
23552
23553
23554
23555
23556
23557
23558
23559
23560
23561
23562
23563
23564
23565
23566
23567
23568
23569
23570
23571
23572
23573
23574
23575
23576
23577
23578
23579
23580
23581
23582
23583
23584
23585
23586
23587
23588
23589
23590
23591
23592
23593
23594
23595
23596
23597
23598
23599
23600
23601
23602
23603
23604
23605
23606
23607
23608
23609
23610
23611
23612
23613
23614
23615
23616
23617
23618
23619
23620
23621
23622
23623
23624
23625
23626
23627
23628
23629
23630
23631
23632
23633
23634
23635
23636
23637
23638
23639
23640
23641
23642
23643
23644
23645
23646
23647
23648
23649
23650
23651
23652
23653
23654
23655
23656
23657
23658
23659
23660
23661
23662
23663
23664
23665
23666
23667
23668
23669
23670
23671
23672
23673
23674
23675
23676
23677
23678
23679
23680
23681
23682
23683
23684
23685
23686
23687
23688
23689
23690
23691
23692
23693
23694
23695
23696
23697
23698
23699
23700
23701
23702
23703
23704
23705
23706
23707
23708
23709
23710
23711
23712
23713
23714
23715
23716
23717
23718
23719
23720
23721
23722
23723
23724
23725
23726
23727
23728
23729
23730
23731
23732
23733
23734
23735
23736
23737
23738
23739
23740
23741
23742
23743
23744
23745
23746
23747
23748
23749
23750
23751
23752
23753
23754
23755
23756
23757
23758
23759
23760
23761
23762
23763
23764
23765
23766
23767
23768
23769
23770
23771
23772
23773
23774
23775
23776
23777
23778
23779
23780
23781
23782
23783
23784
23785
23786
23787
23788
23789
23790
23791
23792
23793
23794
23795
23796
23797
23798
23799
23800
23801
23802
23803
23804
23805
23806
23807
23808
23809
23810
23811
23812
23813
23814
23815
23816
23817
23818
23819
23820
23821
23822
23823
23824
23825
23826
23827
23828
23829
23830
23831
23832
23833
23834
23835
23836
23837
23838
23839
23840
23841
23842
23843
23844
23845
23846
23847
23848
23849
23850
23851
23852
23853
23854
23855
23856
23857
23858
23859
23860
23861
23862
23863
23864
23865
23866
23867
23868
23869
23870
23871
23872
23873
23874
23875
23876
23877
23878
23879
23880
23881
23882
23883
23884
23885
23886
23887
23888
23889
23890
23891
23892
23893
23894
23895
23896
23897
23898
23899
23900
23901
23902
23903
23904
23905
23906
23907
23908
23909
23910
23911
23912
23913
23914
23915
23916
23917
23918
23919
23920
23921
23922
23923
23924
23925
23926
23927
23928
23929
23930
23931
23932
23933
23934
23935
23936
23937
23938
23939
23940
23941
23942
23943
23944
23945
23946
23947
23948
23949
23950
23951
23952
23953
23954
23955
23956
23957
23958
23959
23960
23961
23962
23963
23964
23965
23966
23967
23968
23969
23970
23971
23972
23973
23974
23975
23976
23977
23978
23979
23980
23981
23982
23983
23984
23985
23986
23987
23988
23989
23990
23991
23992
23993
23994
23995
23996
23997
23998
23999
24000
24001
24002
24003
24004
24005
24006
24007
24008
24009
24010
24011
24012
24013
24014
24015
24016
24017
24018
24019
24020
24021
24022
24023
24024
24025
24026
24027
24028
24029
24030
24031
24032
24033
24034
24035
24036
24037
24038
24039
24040
24041
24042
24043
24044
24045
24046
24047
24048
24049
24050
24051
24052
24053
24054
24055
24056
24057
24058
24059
24060
24061
24062
24063
24064
24065
24066
24067
24068
24069
24070
24071
24072
24073
24074
24075
24076
24077
24078
24079
24080
24081
24082
24083
24084
24085
24086
24087
24088
24089
24090
24091
24092
24093
24094
24095
24096
24097
24098
24099
24100
24101
24102
24103
24104
24105
24106
24107
24108
24109
24110
24111
24112
24113
24114
24115
24116
24117
24118
24119
24120
24121
24122
24123
24124
24125
24126
24127
24128
24129
24130
24131
24132
24133
24134
24135
24136
24137
24138
24139
24140
24141
24142
24143
24144
24145
24146
24147
24148
24149
24150
24151
24152
24153
24154
24155
24156
24157
24158
24159
24160
24161
24162
24163
24164
24165
24166
24167
24168
24169
24170
24171
24172
24173
24174
24175
24176
24177
24178
24179
24180
24181
24182
24183
24184
24185
24186
24187
24188
24189
24190
24191
24192
24193
24194
24195
24196
24197
24198
24199
24200
24201
24202
24203
24204
24205
24206
24207
24208
24209
24210
24211
24212
24213
24214
24215
24216
24217
24218
24219
24220
24221
24222
24223
24224
24225
24226
24227
24228
24229
24230
24231
24232
24233
24234
24235
24236
24237
24238
24239
24240
24241
24242
24243
24244
24245
24246
24247
24248
24249
24250
24251
24252
24253
24254
24255
24256
24257
24258
24259
24260
24261
24262
24263
24264
24265
24266
24267
24268
24269
24270
24271
24272
24273
24274
24275
24276
24277
24278
24279
24280
24281
24282
24283
24284
24285
24286
24287
24288
24289
24290
24291
24292
24293
24294
24295
24296
24297
24298
24299
24300
24301
24302
24303
24304
24305
24306
24307
24308
24309
24310
24311
24312
24313
24314
24315
24316
24317
24318
24319
24320
24321
24322
24323
24324
24325
24326
24327
24328
24329
24330
24331
24332
24333
24334
24335
24336
24337
24338
24339
24340
24341
24342
24343
24344
24345
24346
24347
24348
24349
24350
24351
24352
24353
24354
24355
24356
24357
24358
24359
24360
24361
24362
24363
24364
24365
24366
24367
24368
24369
24370
24371
24372
24373
24374
24375
24376
24377
24378
24379
24380
24381
24382
24383
24384
24385
24386
24387
24388
24389
24390
24391
24392
24393
24394
24395
24396
24397
24398
24399
24400
24401
24402
24403
24404
24405
24406
24407
24408
24409
24410
24411
24412
24413
24414
24415
24416
24417
24418
24419
24420
24421
24422
24423
24424
24425
24426
24427
24428
24429
24430
24431
24432
24433
24434
24435
24436
24437
24438
24439
24440
24441
24442
24443
24444
24445
24446
24447
24448
24449
24450
24451
24452
24453
24454
24455
24456
24457
24458
24459
24460
24461
24462
24463
24464
24465
24466
24467
24468
24469
24470
24471
24472
24473
24474
24475
24476
24477
24478
24479
24480
24481
24482
24483
24484
24485
24486
24487
24488
24489
24490
24491
24492
24493
24494
24495
24496
24497
24498
24499
24500
24501
24502
24503
24504
24505
24506
24507
24508
24509
24510
24511
24512
24513
24514
24515
24516
24517
24518
24519
24520
24521
24522
24523
24524
24525
24526
24527
24528
24529
24530
24531
24532
24533
24534
24535
24536
24537
24538
24539
24540
24541
24542
24543
24544
24545
24546
24547
24548
24549
24550
24551
24552
24553
24554
24555
24556
24557
24558
24559
24560
24561
24562
24563
24564
24565
24566
24567
24568
24569
24570
24571
24572
24573
24574
24575
24576
24577
24578
24579
24580
24581
24582
24583
24584
24585
24586
24587
24588
24589
24590
24591
24592
24593
24594
24595
24596
24597
24598
24599
24600
24601
24602
24603
24604
24605
24606
24607
24608
24609
24610
24611
24612
24613
24614
24615
24616
24617
24618
24619
24620
24621
24622
24623
24624
24625
24626
24627
24628
24629
24630
24631
24632
24633
24634
24635
24636
24637
24638
24639
24640
24641
24642
24643
24644
24645
24646
24647
24648
24649
24650
24651
24652
24653
24654
24655
24656
24657
24658
24659
24660
24661
24662
24663
24664
24665
24666
24667
24668
24669
24670
24671
24672
24673
24674
24675
24676
24677
24678
24679
24680
24681
24682
24683
24684
24685
24686
24687
24688
24689
24690
24691
24692
24693
24694
24695
24696
24697
24698
24699
24700
24701
24702
24703
24704
24705
24706
24707
24708
24709
24710
24711
24712
24713
24714
24715
24716
24717
24718
24719
24720
24721
24722
24723
24724
24725
24726
24727
24728
24729
24730
24731
24732
24733
24734
24735
24736
24737
24738
24739
24740
24741
24742
24743
24744
24745
24746
24747
24748
24749
24750
24751
24752
24753
24754
24755
24756
24757
24758
24759
24760
24761
24762
24763
24764
24765
24766
24767
24768
24769
24770
24771
24772
24773
24774
24775
24776
24777
24778
24779
24780
24781
24782
24783
24784
24785
24786
24787
24788
24789
24790
24791
24792
24793
24794
24795
24796
24797
24798
24799
24800
24801
24802
24803
24804
24805
24806
24807
24808
24809
24810
24811
24812
24813
24814
24815
24816
24817
24818
24819
24820
24821
24822
24823
24824
24825
24826
24827
24828
24829
24830
24831
24832
24833
24834
24835
24836
24837
24838
24839
24840
24841
24842
24843
24844
24845
24846
24847
24848
24849
24850
24851
24852
24853
24854
24855
24856
24857
24858
24859
24860
24861
24862
24863
24864
24865
24866
24867
24868
24869
24870
24871
24872
24873
24874
24875
24876
24877
24878
24879
24880
24881
24882
24883
24884
24885
24886
24887
24888
24889
24890
24891
24892
24893
24894
24895
24896
24897
24898
24899
24900
24901
24902
24903
24904
24905
24906
24907
24908
24909
24910
24911
24912
24913
24914
24915
24916
24917
24918
24919
24920
24921
24922
24923
24924
24925
24926
24927
24928
24929
24930
24931
24932
24933
24934
24935
24936
24937
24938
24939
24940
24941
24942
24943
24944
24945
24946
24947
24948
24949
24950
24951
24952
24953
24954
24955
24956
24957
24958
24959
24960
24961
24962
24963
24964
24965
24966
24967
24968
24969
24970
24971
24972
24973
24974
24975
24976
24977
24978
24979
24980
24981
24982
24983
24984
24985
24986
24987
24988
24989
24990
24991
24992
24993
24994
24995
24996
24997
24998
24999
25000
25001
25002
25003
25004
25005
25006
25007
25008
25009
25010
25011
25012
25013
25014
25015
25016
25017
25018
25019
25020
25021
25022
25023
25024
25025
25026
25027
25028
25029
25030
25031
25032
25033
25034
25035
25036
25037
25038
25039
25040
25041
25042
25043
25044
25045
25046
25047
25048
25049
25050
25051
25052
25053
25054
25055
25056
25057
25058
25059
25060
25061
25062
25063
25064
25065
25066
25067
25068
25069
25070
25071
25072
25073
25074
25075
25076
25077
25078
25079
25080
25081
25082
25083
25084
25085
25086
25087
25088
25089
25090
25091
25092
25093
25094
25095
25096
25097
25098
25099
25100
25101
25102
25103
25104
25105
25106
25107
25108
25109
25110
25111
25112
25113
25114
25115
25116
25117
25118
25119
25120
25121
25122
25123
25124
25125
25126
25127
25128
25129
25130
25131
25132
25133
25134
25135
25136
25137
25138
25139
25140
25141
25142
25143
25144
25145
25146
25147
25148
25149
25150
25151
25152
25153
25154
25155
25156
25157
25158
25159
25160
25161
25162
25163
25164
25165
25166
25167
25168
25169
25170
25171
25172
25173
25174
25175
25176
25177
25178
25179
25180
25181
25182
25183
25184
25185
25186
25187
25188
25189
25190
25191
25192
25193
25194
25195
25196
25197
25198
25199
25200
25201
25202
25203
25204
25205
25206
25207
25208
25209
25210
25211
25212
25213
25214
25215
25216
25217
25218
25219
25220
25221
25222
25223
25224
25225
25226
25227
25228
25229
25230
25231
25232
25233
25234
25235
25236
25237
25238
25239
25240
25241
25242
25243
25244
25245
25246
25247
25248
25249
25250
25251
25252
25253
25254
25255
25256
25257
25258
25259
25260
25261
25262
25263
25264
25265
25266
25267
25268
25269
25270
25271
25272
25273
25274
25275
25276
25277
25278
25279
25280
25281
25282
25283
25284
25285
25286
25287
25288
25289
25290
25291
25292
25293
25294
25295
25296
25297
25298
25299
25300
25301
25302
25303
25304
25305
25306
25307
25308
25309
25310
25311
25312
25313
25314
25315
25316
25317
25318
25319
25320
25321
25322
25323
25324
25325
25326
25327
25328
25329
25330
25331
25332
25333
25334
25335
25336
25337
25338
25339
25340
25341
25342
25343
25344
25345
25346
25347
25348
25349
25350
25351
25352
25353
25354
25355
25356
25357
25358
25359
25360
25361
25362
25363
25364
25365
25366
25367
25368
25369
25370
25371
25372
25373
25374
25375
25376
25377
25378
25379
25380
25381
25382
25383
25384
25385
25386
25387
25388
25389
25390
25391
25392
25393
25394
25395
25396
25397
25398
25399
25400
25401
25402
25403
25404
25405
25406
25407
25408
25409
25410
25411
25412
25413
25414
25415
25416
25417
25418
25419
25420
25421
25422
25423
25424
25425
25426
25427
25428
25429
25430
25431
25432
25433
25434
25435
25436
25437
25438
25439
25440
25441
25442
25443
25444
25445
25446
25447
25448
25449
25450
25451
25452
25453
25454
25455
25456
25457
25458
25459
25460
25461
25462
25463
25464
25465
25466
25467
25468
25469
25470
25471
25472
25473
25474
25475
25476
25477
25478
25479
25480
25481
25482
25483
25484
25485
25486
25487
25488
25489
25490
25491
25492
25493
25494
25495
25496
25497
25498
25499
25500
25501
25502
25503
25504
25505
25506
25507
25508
25509
25510
25511
25512
25513
25514
25515
25516
25517
25518
25519
25520
25521
25522
25523
25524
25525
25526
25527
25528
25529
25530
25531
25532
25533
25534
25535
25536
25537
25538
25539
25540
25541
25542
25543
25544
25545
25546
25547
25548
25549
25550
25551
25552
25553
25554
25555
25556
25557
25558
25559
25560
25561
25562
25563
25564
25565
25566
25567
25568
25569
25570
25571
25572
25573
25574
25575
25576
25577
25578
25579
25580
25581
25582
25583
25584
25585
25586
25587
25588
25589
25590
25591
25592
25593
25594
25595
25596
25597
25598
25599
25600
25601
25602
25603
25604
25605
25606
25607
25608
25609
25610
25611
25612
25613
25614
25615
25616
25617
25618
25619
25620
25621
25622
25623
25624
25625
25626
25627
25628
25629
25630
25631
25632
25633
25634
25635
25636
25637
25638
25639
25640
25641
25642
25643
25644
25645
25646
25647
25648
25649
25650
25651
25652
25653
25654
25655
25656
25657
25658
25659
25660
25661
25662
25663
25664
25665
25666
25667
25668
25669
25670
25671
25672
25673
25674
25675
25676
25677
25678
25679
25680
25681
25682
25683
25684
25685
25686
25687
25688
25689
25690
25691
25692
25693
25694
25695
25696
25697
25698
25699
25700
25701
25702
25703
25704
25705
25706
25707
25708
25709
25710
25711
25712
25713
25714
25715
25716
25717
25718
25719
25720
25721
25722
25723
25724
25725
25726
25727
25728
25729
25730
25731
25732
25733
25734
25735
25736
25737
25738
25739
25740
25741
25742
25743
25744
25745
25746
25747
25748
25749
25750
25751
25752
25753
25754
25755
25756
25757
25758
25759
25760
25761
25762
25763
25764
25765
25766
25767
25768
25769
25770
25771
25772
25773
25774
25775
25776
25777
25778
25779
25780
25781
25782
25783
25784
25785
25786
25787
25788
25789
25790
25791
25792
25793
25794
25795
25796
25797
25798
25799
25800
25801
25802
25803
25804
25805
25806
25807
25808
25809
25810
25811
25812
25813
25814
25815
25816
25817
25818
25819
25820
25821
25822
25823
25824
25825
25826
25827
25828
25829
25830
25831
25832
25833
25834
25835
25836
25837
25838
25839
25840
25841
25842
25843
25844
25845
25846
25847
25848
25849
25850
25851
25852
25853
25854
25855
25856
25857
25858
25859
25860
25861
25862
25863
25864
25865
25866
25867
25868
25869
25870
25871
25872
25873
25874
25875
25876
25877
25878
25879
25880
25881
25882
25883
25884
25885
25886
25887
25888
25889
25890
25891
25892
25893
25894
25895
25896
25897
25898
25899
25900
25901
25902
25903
25904
25905
25906
25907
25908
25909
25910
25911
25912
25913
25914
25915
25916
25917
25918
25919
25920
25921
25922
25923
25924
25925
25926
25927
25928
25929
25930
25931
25932
25933
25934
25935
25936
25937
25938
25939
25940
25941
25942
25943
25944
25945
25946
25947
25948
25949
25950
25951
25952
25953
25954
25955
25956
25957
25958
25959
25960
25961
25962
25963
25964
25965
25966
25967
25968
25969
25970
25971
25972
25973
25974
25975
25976
25977
25978
25979
25980
25981
25982
25983
25984
25985
25986
25987
25988
25989
25990
25991
25992
25993
25994
25995
25996
25997
25998
25999
26000
26001
26002
26003
26004
26005
26006
26007
26008
26009
26010
26011
26012
26013
26014
26015
26016
26017
26018
26019
26020
26021
26022
26023
26024
26025
26026
26027
26028
26029
26030
26031
26032
26033
26034
26035
26036
26037
26038
26039
26040
26041
26042
26043
26044
26045
26046
26047
26048
26049
26050
26051
26052
26053
26054
26055
26056
26057
26058
26059
26060
26061
26062
26063
26064
26065
26066
26067
26068
26069
26070
26071
26072
26073
26074
26075
26076
26077
26078
26079
26080
26081
26082
26083
26084
26085
26086
26087
26088
26089
26090
26091
26092
26093
26094
26095
26096
26097
26098
26099
26100
26101
26102
26103
26104
26105
26106
26107
26108
26109
26110
26111
26112
26113
26114
26115
26116
26117
26118
26119
26120
26121
26122
26123
26124
26125
26126
26127
26128
26129
26130
26131
26132
26133
26134
26135
26136
26137
26138
26139
26140
26141
26142
26143
26144
26145
26146
26147
26148
26149
26150
26151
26152
26153
26154
26155
26156
26157
26158
26159
26160
26161
26162
26163
26164
26165
26166
26167
26168
26169
26170
26171
26172
26173
26174
26175
26176
26177
26178
26179
26180
26181
26182
26183
26184
26185
26186
26187
26188
26189
26190
26191
26192
26193
26194
26195
26196
26197
26198
26199
26200
26201
26202
26203
26204
26205
26206
26207
26208
26209
26210
26211
26212
26213
26214
26215
26216
26217
26218
26219
26220
26221
26222
26223
26224
26225
26226
26227
26228
26229
26230
26231
26232
26233
26234
26235
26236
26237
26238
26239
26240
26241
26242
26243
26244
26245
26246
26247
26248
26249
26250
26251
26252
26253
26254
26255
26256
26257
26258
26259
26260
26261
26262
26263
26264
26265
26266
26267
26268
26269
26270
26271
26272
26273
26274
26275
26276
26277
26278
26279
26280
26281
26282
26283
26284
26285
26286
26287
26288
26289
26290
26291
26292
26293
26294
26295
26296
26297
26298
26299
26300
26301
26302
26303
26304
26305
26306
26307
26308
26309
26310
26311
26312
26313
26314
26315
26316
26317
26318
26319
26320
26321
26322
26323
26324
26325
26326
26327
26328
26329
26330
26331
26332
26333
26334
26335
26336
26337
26338
26339
26340
26341
26342
26343
26344
26345
26346
26347
26348
26349
26350
26351
26352
26353
26354
26355
26356
26357
26358
26359
26360
26361
26362
26363
26364
26365
26366
26367
26368
26369
26370
26371
26372
26373
26374
26375
26376
26377
26378
26379
26380
26381
26382
26383
26384
26385
26386
26387
26388
26389
26390
26391
26392
26393
26394
26395
26396
26397
26398
26399
26400
26401
26402
26403
26404
26405
26406
26407
26408
26409
26410
26411
26412
26413
26414
26415
26416
26417
26418
26419
26420
26421
26422
26423
26424
26425
26426
26427
26428
26429
26430
26431
26432
26433
26434
26435
26436
26437
26438
26439
26440
26441
26442
26443
26444
26445
26446
26447
26448
26449
26450
26451
26452
26453
26454
26455
26456
26457
26458
26459
26460
26461
26462
26463
26464
26465
26466
26467
26468
26469
26470
26471
26472
26473
26474
26475
26476
26477
26478
26479
26480
26481
26482
26483
26484
26485
26486
26487
26488
26489
26490
26491
26492
26493
26494
26495
26496
26497
26498
26499
26500
26501
26502
26503
26504
26505
26506
26507
26508
26509
26510
26511
26512
26513
26514
26515
26516
26517
26518
26519
26520
26521
26522
26523
26524
26525
26526
26527
26528
26529
26530
26531
26532
26533
26534
26535
26536
26537
26538
26539
26540
26541
26542
26543
26544
26545
26546
26547
26548
26549
26550
26551
26552
26553
26554
26555
26556
26557
26558
26559
26560
26561
26562
26563
26564
26565
26566
26567
26568
26569
26570
26571
26572
26573
26574
26575
26576
26577
26578
26579
26580
26581
26582
26583
26584
26585
26586
26587
26588
26589
26590
26591
26592
26593
26594
26595
26596
26597
26598
26599
26600
26601
26602
26603
26604
26605
26606
26607
26608
26609
26610
26611
26612
26613
26614
26615
26616
26617
26618
26619
26620
26621
26622
26623
26624
26625
26626
26627
26628
26629
26630
26631
26632
26633
26634
26635
26636
26637
26638
26639
26640
26641
26642
26643
26644
26645
26646
26647
26648
26649
26650
26651
26652
26653
26654
26655
26656
26657
26658
26659
26660
26661
26662
26663
26664
26665
26666
26667
26668
26669
26670
26671
26672
26673
26674
26675
26676
26677
26678
26679
26680
26681
26682
26683
26684
26685
26686
26687
26688
26689
26690
26691
26692
26693
26694
26695
26696
26697
26698
26699
26700
26701
26702
26703
26704
26705
26706
26707
26708
26709
26710
26711
26712
26713
26714
26715
26716
26717
26718
26719
26720
26721
26722
26723
26724
26725
26726
26727
26728
26729
26730
26731
26732
26733
26734
26735
26736
26737
26738
26739
26740
26741
26742
26743
26744
26745
26746
26747
26748
26749
26750
26751
26752
26753
26754
26755
26756
26757
26758
26759
26760
26761
26762
26763
26764
26765
26766
26767
26768
26769
26770
26771
26772
26773
26774
26775
26776
26777
26778
26779
26780
26781
26782
26783
26784
26785
26786
26787
26788
26789
26790
26791
26792
26793
26794
26795
26796
26797
26798
26799
26800
26801
26802
26803
26804
26805
26806
26807
26808
26809
26810
26811
26812
26813
26814
26815
26816
26817
26818
26819
26820
26821
26822
26823
26824
26825
26826
26827
26828
26829
26830
26831
26832
26833
26834
26835
26836
26837
26838
26839
26840
26841
26842
26843
26844
26845
26846
26847
26848
26849
26850
26851
26852
26853
26854
26855
26856
26857
26858
26859
26860
26861
26862
26863
26864
26865
26866
26867
26868
26869
26870
26871
26872
26873
26874
26875
26876
26877
26878
26879
26880
26881
26882
26883
26884
26885
26886
26887
26888
26889
26890
26891
26892
26893
26894
26895
26896
26897
26898
26899
26900
26901
26902
26903
26904
26905
26906
26907
26908
26909
26910
26911
26912
26913
26914
26915
26916
26917
26918
26919
26920
26921
26922
26923
26924
26925
26926
26927
26928
26929
26930
26931
26932
26933
26934
26935
26936
26937
26938
26939
26940
26941
26942
26943
26944
26945
26946
26947
26948
26949
26950
26951
26952
26953
26954
26955
26956
26957
26958
26959
26960
26961
26962
26963
26964
26965
26966
26967
26968
26969
26970
26971
26972
26973
26974
26975
26976
26977
26978
26979
26980
26981
26982
26983
26984
26985
26986
26987
26988
26989
26990
26991
26992
26993
26994
26995
26996
26997
26998
26999
27000
27001
27002
27003
27004
27005
27006
27007
27008
27009
27010
27011
27012
27013
27014
27015
27016
27017
27018
27019
27020
27021
27022
27023
27024
27025
27026
27027
27028
27029
27030
27031
27032
27033
27034
27035
27036
27037
27038
27039
27040
27041
27042
27043
27044
27045
27046
27047
27048
27049
27050
27051
27052
27053
27054
27055
27056
27057
27058
27059
27060
27061
27062
27063
27064
27065
27066
27067
27068
27069
27070
27071
27072
27073
27074
27075
27076
27077
27078
27079
27080
27081
27082
27083
27084
27085
27086
27087
27088
27089
27090
27091
27092
27093
27094
27095
27096
27097
27098
27099
27100
27101
27102
27103
27104
27105
27106
27107
27108
27109
27110
27111
27112
27113
27114
27115
27116
27117
27118
27119
27120
27121
27122
27123
27124
27125
27126
27127
27128
27129
27130
27131
27132
27133
27134
27135
27136
27137
27138
27139
27140
27141
27142
27143
27144
27145
27146
27147
27148
27149
27150
27151
27152
27153
27154
27155
27156
27157
27158
27159
27160
27161
27162
27163
27164
27165
27166
27167
27168
27169
27170
27171
27172
27173
27174
27175
27176
27177
27178
27179
27180
27181
27182
27183
27184
27185
27186
27187
27188
27189
27190
27191
27192
27193
27194
27195
27196
27197
27198
27199
27200
27201
27202
27203
27204
27205
27206
27207
27208
27209
27210
27211
27212
27213
27214
27215
27216
27217
27218
27219
27220
27221
27222
27223
27224
27225
27226
27227
27228
27229
27230
27231
27232
27233
27234
27235
27236
27237
27238
27239
27240
27241
27242
27243
27244
27245
27246
27247
27248
27249
27250
27251
27252
27253
27254
27255
27256
27257
27258
27259
27260
27261
27262
27263
27264
27265
27266
27267
27268
27269
27270
27271
27272
27273
27274
27275
27276
27277
27278
27279
27280
27281
27282
27283
27284
27285
27286
27287
27288
27289
27290
27291
27292
27293
27294
27295
27296
27297
27298
27299
27300
27301
27302
27303
27304
27305
27306
27307
27308
27309
27310
27311
27312
27313
27314
27315
27316
27317
27318
27319
27320
27321
27322
27323
27324
27325
27326
27327
27328
27329
27330
27331
27332
27333
27334
27335
27336
27337
27338
27339
27340
27341
27342
27343
27344
27345
27346
27347
27348
27349
27350
27351
27352
27353
27354
27355
27356
27357
27358
27359
27360
27361
27362
27363
27364
27365
27366
27367
27368
27369
27370
27371
27372
27373
27374
27375
27376
27377
27378
27379
27380
27381
27382
27383
27384
27385
27386
27387
27388
27389
27390
27391
27392
27393
27394
27395
27396
27397
27398
27399
27400
27401
27402
27403
27404
27405
27406
27407
27408
27409
27410
27411
27412
27413
27414
27415
27416
27417
27418
27419
27420
27421
27422
27423
27424
27425
27426
27427
27428
27429
27430
27431
27432
27433
27434
27435
27436
27437
27438
27439
27440
27441
27442
27443
27444
27445
27446
27447
27448
27449
27450
27451
27452
27453
27454
27455
27456
27457
27458
27459
27460
27461
27462
27463
27464
27465
27466
27467
27468
27469
27470
27471
27472
27473
27474
27475
27476
27477
27478
27479
27480
27481
27482
27483
27484
27485
27486
27487
27488
27489
27490
27491
27492
27493
27494
27495
27496
27497
27498
27499
27500
27501
27502
27503
27504
27505
27506
27507
27508
27509
27510
27511
27512
27513
27514
27515
27516
27517
27518
27519
27520
27521
27522
27523
27524
27525
27526
27527
27528
27529
27530
27531
27532
27533
27534
27535
27536
27537
27538
27539
27540
27541
27542
27543
27544
27545
27546
27547
27548
27549
27550
27551
27552
27553
27554
27555
27556
27557
27558
27559
27560
27561
27562
27563
27564
27565
27566
27567
27568
27569
27570
27571
27572
27573
27574
27575
27576
27577
27578
27579
27580
27581
27582
27583
27584
27585
27586
27587
27588
27589
27590
27591
27592
27593
27594
27595
27596
27597
27598
27599
27600
27601
27602
27603
27604
27605
27606
27607
27608
27609
27610
27611
27612
27613
27614
27615
27616
27617
27618
27619
27620
27621
27622
27623
27624
27625
27626
27627
27628
27629
27630
27631
27632
27633
27634
27635
27636
27637
27638
27639
27640
27641
27642
27643
27644
27645
27646
27647
27648
27649
27650
27651
27652
27653
27654
27655
27656
27657
27658
27659
27660
27661
27662
27663
27664
27665
27666
27667
27668
27669
27670
27671
27672
27673
27674
27675
27676
27677
27678
27679
27680
27681
27682
27683
27684
27685
27686
27687
27688
27689
27690
27691
27692
27693
27694
27695
27696
27697
27698
27699
27700
27701
27702
27703
27704
27705
27706
27707
27708
27709
27710
27711
27712
27713
27714
27715
27716
27717
27718
27719
27720
27721
27722
27723
27724
27725
27726
27727
27728
27729
27730
27731
27732
27733
27734
27735
27736
27737
27738
27739
27740
27741
27742
27743
27744
27745
27746
27747
27748
27749
27750
27751
27752
27753
27754
27755
27756
27757
27758
27759
27760
27761
27762
27763
27764
27765
27766
27767
27768
27769
27770
27771
27772
27773
27774
27775
27776
27777
27778
27779
27780
27781
27782
27783
27784
27785
27786
27787
27788
27789
27790
27791
27792
27793
27794
27795
27796
27797
27798
27799
27800
27801
27802
27803
27804
27805
27806
27807
27808
27809
27810
27811
27812
27813
27814
27815
27816
27817
27818
27819
27820
27821
27822
27823
27824
27825
27826
27827
27828
27829
27830
27831
27832
27833
27834
27835
27836
27837
27838
27839
27840
27841
27842
27843
27844
27845
27846
27847
27848
27849
27850
27851
27852
27853
27854
27855
27856
27857
27858
27859
27860
27861
27862
27863
27864
27865
27866
27867
27868
27869
27870
27871
27872
27873
27874
27875
27876
27877
27878
27879
27880
27881
27882
27883
27884
27885
27886
27887
27888
27889
27890
27891
27892
27893
27894
27895
27896
27897
27898
27899
27900
27901
27902
27903
27904
27905
27906
27907
27908
27909
27910
27911
27912
27913
27914
27915
27916
27917
27918
27919
27920
27921
27922
27923
27924
27925
27926
27927
27928
27929
27930
27931
27932
27933
27934
27935
27936
27937
27938
27939
27940
27941
27942
27943
27944
27945
27946
27947
27948
27949
27950
27951
27952
27953
27954
27955
27956
27957
27958
27959
27960
27961
27962
27963
27964
27965
27966
27967
27968
27969
27970
27971
27972
27973
27974
27975
27976
27977
27978
27979
27980
27981
27982
27983
27984
27985
27986
27987
27988
27989
27990
27991
27992
27993
27994
27995
27996
27997
27998
27999
28000
28001
28002
28003
28004
28005
28006
28007
28008
28009
28010
28011
28012
28013
28014
28015
28016
28017
28018
28019
28020
28021
28022
28023
28024
28025
28026
28027
28028
28029
28030
28031
28032
28033
28034
28035
28036
28037
28038
28039
28040
28041
28042
28043
28044
28045
28046
28047
28048
28049
28050
28051
28052
28053
28054
28055
28056
28057
28058
28059
28060
28061
28062
28063
28064
28065
28066
28067
28068
28069
28070
28071
28072
28073
28074
28075
28076
28077
28078
28079
28080
28081
28082
28083
28084
28085
28086
28087
28088
28089
28090
28091
28092
28093
28094
28095
28096
28097
28098
28099
28100
28101
28102
28103
28104
28105
28106
28107
28108
28109
28110
28111
28112
28113
28114
28115
28116
28117
28118
28119
28120
28121
28122
28123
28124
28125
28126
28127
28128
28129
28130
28131
28132
28133
28134
28135
28136
28137
28138
28139
28140
28141
28142
28143
28144
28145
28146
28147
28148
28149
28150
28151
28152
28153
28154
28155
28156
28157
28158
28159
28160
28161
28162
28163
28164
28165
28166
28167
28168
28169
28170
28171
28172
28173
28174
28175
28176
28177
28178
28179
28180
28181
28182
28183
28184
28185
28186
28187
28188
28189
28190
28191
28192
28193
28194
28195
28196
28197
28198
28199
28200
28201
28202
28203
28204
28205
28206
28207
28208
28209
28210
28211
28212
28213
28214
28215
28216
28217
28218
28219
28220
28221
28222
28223
28224
28225
28226
28227
28228
28229
28230
28231
28232
28233
28234
28235
28236
28237
28238
28239
28240
28241
28242
28243
28244
28245
28246
28247
28248
28249
28250
28251
28252
28253
28254
28255
28256
28257
28258
28259
28260
28261
28262
28263
28264
28265
28266
28267
28268
28269
28270
28271
28272
28273
28274
28275
28276
28277
28278
28279
28280
28281
28282
28283
28284
28285
28286
28287
28288
28289
28290
28291
28292
28293
28294
28295
28296
28297
28298
28299
28300
28301
28302
28303
28304
28305
28306
28307
28308
28309
28310
28311
28312
28313
28314
28315
28316
28317
28318
28319
28320
28321
28322
28323
28324
28325
28326
28327
28328
28329
28330
28331
28332
28333
28334
28335
28336
28337
28338
28339
28340
28341
28342
28343
28344
28345
28346
28347
28348
28349
28350
28351
28352
28353
28354
28355
28356
28357
28358
28359
28360
28361
28362
28363
28364
28365
28366
28367
28368
28369
28370
28371
28372
28373
28374
28375
28376
28377
28378
28379
28380
28381
28382
28383
28384
28385
28386
28387
28388
28389
28390
28391
28392
28393
28394
28395
28396
28397
28398
28399
28400
28401
28402
28403
28404
28405
28406
28407
28408
28409
28410
28411
28412
28413
28414
28415
28416
28417
28418
28419
28420
28421
28422
28423
28424
28425
28426
28427
28428
28429
28430
28431
28432
28433
28434
28435
28436
28437
28438
28439
28440
28441
28442
28443
28444
28445
28446
28447
28448
28449
28450
28451
28452
28453
28454
28455
28456
28457
28458
28459
28460
28461
28462
28463
28464
28465
28466
28467
28468
28469
28470
28471
28472
28473
28474
28475
28476
28477
28478
28479
28480
28481
28482
28483
28484
28485
28486
28487
28488
28489
28490
28491
28492
28493
28494
28495
28496
28497
28498
28499
28500
28501
28502
28503
28504
28505
28506
28507
28508
28509
28510
28511
28512
28513
28514
28515
28516
28517
28518
28519
28520
28521
28522
28523
28524
28525
28526
28527
28528
28529
28530
28531
28532
28533
28534
28535
28536
28537
28538
28539
28540
28541
28542
28543
28544
28545
28546
28547
28548
28549
28550
28551
28552
28553
28554
28555
28556
28557
28558
28559
28560
28561
28562
28563
28564
28565
28566
28567
28568
28569
28570
28571
28572
28573
28574
28575
28576
28577
28578
28579
28580
28581
28582
28583
28584
28585
28586
28587
28588
28589
28590
28591
28592
28593
28594
28595
28596
28597
28598
28599
28600
28601
28602
28603
28604
28605
28606
28607
28608
28609
28610
28611
28612
28613
28614
28615
28616
28617
28618
28619
28620
28621
28622
28623
28624
28625
28626
28627
28628
28629
28630
28631
28632
28633
28634
28635
28636
28637
28638
28639
28640
28641
28642
28643
28644
28645
28646
28647
28648
28649
28650
28651
28652
28653
28654
28655
28656
28657
28658
28659
28660
28661
28662
28663
28664
28665
28666
28667
28668
28669
28670
28671
28672
28673
28674
28675
28676
28677
28678
28679
28680
28681
28682
28683
28684
28685
28686
28687
28688
28689
28690
28691
28692
28693
28694
28695
28696
28697
28698
28699
28700
28701
28702
28703
28704
28705
28706
28707
28708
28709
28710
28711
28712
28713
28714
28715
28716
28717
28718
28719
28720
28721
28722
28723
28724
28725
28726
28727
28728
28729
28730
28731
28732
28733
28734
28735
28736
28737
28738
28739
28740
28741
28742
28743
28744
28745
28746
28747
28748
28749
28750
28751
28752
28753
28754
28755
28756
28757
28758
28759
28760
28761
28762
28763
28764
28765
28766
28767
28768
28769
28770
28771
28772
28773
28774
28775
28776
28777
28778
28779
28780
28781
28782
28783
28784
28785
28786
28787
28788
28789
28790
28791
28792
28793
28794
28795
28796
28797
28798
28799
28800
28801
28802
28803
28804
28805
28806
28807
28808
28809
28810
28811
28812
28813
28814
28815
28816
28817
28818
28819
28820
28821
28822
28823
28824
28825
28826
28827
28828
28829
28830
28831
28832
28833
28834
28835
28836
28837
28838
28839
28840
28841
28842
28843
28844
28845
28846
28847
28848
28849
28850
28851
28852
28853
28854
28855
28856
28857
28858
28859
28860
28861
28862
28863
28864
28865
28866
28867
28868
28869
28870
28871
28872
28873
28874
28875
28876
28877
28878
28879
28880
28881
28882
28883
28884
28885
28886
28887
28888
28889
28890
28891
28892
28893
28894
28895
28896
28897
28898
28899
28900
28901
28902
28903
28904
28905
28906
28907
28908
28909
28910
28911
28912
28913
28914
28915
28916
28917
28918
28919
28920
28921
28922
28923
28924
28925
28926
28927
28928
28929
28930
28931
28932
28933
28934
28935
28936
28937
28938
28939
28940
28941
28942
28943
28944
28945
28946
28947
28948
28949
28950
28951
28952
28953
28954
28955
28956
28957
28958
28959
28960
28961
28962
28963
28964
28965
28966
28967
28968
28969
28970
28971
28972
28973
28974
28975
28976
28977
28978
28979
28980
28981
28982
28983
28984
28985
28986
28987
28988
28989
28990
28991
28992
28993
28994
28995
28996
28997
28998
28999
29000
29001
29002
29003
29004
29005
29006
29007
29008
29009
29010
29011
29012
29013
29014
29015
29016
29017
29018
29019
29020
29021
29022
29023
29024
29025
29026
29027
29028
29029
29030
29031
29032
29033
29034
29035
29036
29037
29038
29039
29040
29041
29042
29043
29044
29045
29046
29047
29048
29049
29050
29051
29052
29053
29054
29055
29056
29057
29058
29059
29060
29061
29062
29063
29064
29065
29066
29067
29068
29069
29070
29071
29072
29073
29074
29075
29076
29077
29078
29079
29080
29081
29082
29083
29084
29085
29086
29087
29088
29089
29090
29091
29092
29093
29094
29095
29096
29097
29098
29099
29100
29101
29102
29103
29104
29105
29106
29107
29108
29109
29110
29111
29112
29113
29114
29115
29116
29117
29118
29119
29120
29121
29122
29123
29124
29125
29126
29127
29128
29129
29130
29131
29132
29133
29134
29135
29136
29137
29138
29139
29140
29141
29142
29143
29144
29145
29146
29147
29148
29149
29150
29151
29152
29153
29154
29155
29156
29157
29158
29159
29160
29161
29162
29163
29164
29165
29166
29167
29168
29169
29170
29171
commit 836c82cf5c45644a8ab44f5aed5acf27898f454d
Author: Jim Evins <evins@snaught.com>
Date:   2018-04-27

    Reconcile with newer translations in master.

M	po/eo.po
M	po/fi.po

commit 88c59e9042b8609101418c1528734aeb2ba8f16e
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-22

    Reconcile with newer translations in master.

M	po/da.po
M	po/es.po
M	po/fr.po
M	po/hu.po
M	po/pt_BR.po
M	po/sr.po
M	po/sr@latin.po

commit cb9b03d0d2ed1e48b6335ffdd723e75632efb412
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2018-04-22

    Update German translation

M	po/de.po

commit d0b9785ef32e27bccd03cf2abe58d6b3f6faf56c
Author: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	2018-04-18

    Update Latvian translation

M	po/lv.po

commit 4c405f41ce2409e0e5e7aed22ecbc2b3b756953f
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:	2018-04-16

    Update Swedish translation

M	po/sv.po

commit 6ec9bda994d8966f057aa0c6248c1d31418fb529
Author: Marek Černocký <marek@manet.cz>
Date:	2018-04-15

    Updated Czech translation

M	po/cs.po

commit 24cff272f90e82dd226578538082f5fe5dc0a693
Author: Marek Černocký <marek@manet.cz>
Date:	2016-06-09

    Add online-templates.xml for translation

M	po/POTFILES.in

commit 3064517ab07c74d6998c9522d8078dae82392dba
Author: Marek Černocký <marek@manet.cz>
Date:	2016-09-16

    Add hisago-templates.xml for translations

M	po/POTFILES.in

commit 17239150d67e62b103e1c07dbb34f9444c0e6a35
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-14

    Fixed cut&paste error in page size of Dymo 11356.

M	templates/dymo-other-templates.xml

commit e5ff4a232836ac0dd60a23194498b2f5f3aa53ae
Author: killermoehre <killermoehre@gmx.net>
Date:	2018-02-05

    add definition for Dymo 11356 Small Name Badge labels

    - remove whitespaces on line ending and empty lines
    - add definition for Dymo 11356 Small Name Badge labels
    - added template credit.

M	AUTHORS
M	templates/dymo-other-templates.xml

commit f33b030339f9cfe1c263debf3af6f3528c06ca62
Author: Chris Mayo <aklhfex@gmail.com>
Date:	2018-01-24

    Remove deprecated Application category from desktop file

M	data/desktop/glabels-3.0.desktop.in

commit 809b6de1ebebcd2df3a85b45928e089332d51db6
Author: Clemens Fries <githubert@xenoworld.de>
Date:	2017-09-18

    Fix out of bounds read when label is empty

M	src/text-node.c

commit 056f8fc9c0dffc86b04bc5dcc133265a36324be5
Author: Clemens Fries <githubert@xenoworld.de>
Date:	2017-09-18

    Prevent crash when using combo search on “Select Product”

    GtkSelectionMode can also be GTK_SELECTION_BROWSE, which does not
    guarantee that a selection is available. Checking the return value
    of gtk_tree_selection_get_selected() seems to provides a clearer
    picture.

M	src/media-select.c

commit 5ad39b9b63258cbe851b60332bf22833d3957bd5
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-14

    Fixed typo.  Numbers in template files should be in the C locale.

M	templates/online-templates.xml

commit ef9686762bb6b0a1b490c2f6c8ea87b3ee963691
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-14

    Added new template file to templates/Makefile.am and po/POTFILES.in

M	po/POTFILES.in
M	templates/Makefile.am

commit 87c2635baa981bbee935972b743e93ca94f3c30c
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-14

    Added Felga Etichette labels for laser printers templates

    Template file provided by Jean-Marie Auffray

M	AUTHORS
A	templates/felga-templates.xml
M	templates/vendors.xml

commit 549c2fb13a05c7f28710804b010f5652bb2b9533
Author: Marek Černocký <marek@manet.cz>
Date:	2016-09-16

    Hisago templates

M	templates/Makefile.am
A	templates/hisago-templates.xml
M	templates/vendors.xml

commit 685c35db069396c89edfa9145fa14418f0f39782
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-06-18

    Fixed typo

M	templates/online-templates.xml

commit 7d1064aae86b8accf3869fdb5172504320914a74
Author: Marek Černocký <marek@manet.cz>
Date:	2016-06-10

    Fix descriptions

M	templates/online-templates.xml

commit 5aaca871c6c7fc6a921924aee5b4641587c9c518
Author: Marek Černocký <marek@manet.cz>
Date:	2016-06-09

    Templates for Online Labels vendor

M	templates/Makefile.am
M	templates/misc-us-templates.xml
A	templates/online-templates.xml

commit 03f0eb410dd8711573a1150a1528ab4c93cc2c98
Author: Jim Evins <evins@snaught.com>
Date:	2018-03-31

    Fix portability issue due to signedness of char.

M	src/merge-text.c

commit 44de146c6b35e1c7b7354b13eb9f34eef58419a1
Author: Andika Triwidada <atriwidada@gnome.org>
Date:	2018-02-18

    Update Indonesian translation

M	po/id.po

commit 8b9c34a0fc745cd11e31cf4390be211ce2033f35
Author: Andika Triwidada <atriwidada@gnome.org>
Date:	2018-02-11

    Update Indonesian translation

M	po/id.po

commit 0016899b9ac2e91cdde7e7ef225020757809bed8
Author: Marek Cernocky <marek_cernocky@conel.cz>
Date:	2017-08-01

    Fixed typo

M	templates/avery-iso-templates.xml

commit fcb79a2c6fa5b8d0dbe4b8e9f5d6983af8aa0f13
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2017-07-24

    Update German translation

M	po/de.po

commit 5d036452d6ae6ffe5f8c764a779c95a2d180e801
Author: David Griffith <dave@661.org>
Date:	2017-07-15

    Added Avery 89100 family Binder Spine Inserts

M	AUTHORS
M	templates/avery-us-templates.xml

commit 992ada07544cebce3bb353ba83f0644be52c5937
Author: Matthias Mailänder <Mailaender@users.noreply.github.com>
Date:	2016-09-17

    Fix screenshot URL.

M	data/appdata/glabels-3.appdata.xml.in

commit c3146edcaf251f953435718991346b5e7977a06e
Author: Jim Evins <evins@snaught.com>
Date:	2017-07-15

    Added Avery-L6043 and Herma-10001 product templates.

    Glabels issue # 25.  Provided by Johnny A. Solbu (solbu).

M	AUTHORS
M	templates/avery-iso-templates.xml
M	templates/herma-iso-templates.xml

commit cd5bf70e223765a5a2c524fdc9a51ab06f43c2c7
Author: Jim Evins <evins@snaught.com>
Date:	2017-07-15

    Completely disable word-wrap of text objects when auto_shrink
    is enabled.

    Fixes glabels issue #29.

M	src/label-text.c

commit 20ba816250e79129d773936d68acb4bc61fcdd9a
Author: Cédric Valmary <cvalmary@yahoo.fr>
Date:	2016-10-24

    Add Occitan translation

M	po/LINGUAS
A	po/oc.po

commit e8cbdc86e4f3d91060825b5ae483dffc98089a40
Author: Tiago Santos <tiagofsantos81@sapo.pt>
Date:	2016-09-04

    Updated Portuguese translation

M	po/pt.po

commit 45c97672abe07c5193d57c9a295768024e6b7278
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	2016-08-22

    Updated Serbian translation

M	po/sr.po
M	po/sr@latin.po

commit eaab6b15e35389cfb2ce8e1256d7ca4be10a6954
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-08-10

    Updated Slovak translation

M	po/sk.po

commit 685fc60af3e2f8b34ac3ece48e7a24aeda759b72
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2016-07-17

    Add Language headers to po files

    Future versions of gettext will fail if this header is missing.

M	po/ar.po
M	po/ca.po
M	po/ca@valencia.po
M	po/eo.po
M	po/es.po
M	po/it.po
M	po/ko.po
M	po/sl.po
M	po/sr@latin.po
M	po/zh_CN.po
M	po/zh_HK.po
M	po/zh_TW.po

commit 5a68e9ea31630170de7ac9ef08c985e89274d959
Author: Tiago Santos <tiagofsantos81@sapo.pt>
Date:	2016-07-04

    Updated Portuguese translation

M	po/pt.po

commit 94696c4583ccadd49e843187cafebf791e82d414
Author: Andika Triwidada <atriwidada@gnome.org>
Date:	2016-07-04

    Updated Indonesian translation

M	po/id.po

commit 4ee89d913ade530ad70ebe0aa09540e420d14b9d
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-07-03

    Updated Slovak translation

M	po/sk.po

commit f5202431517ce26bae5288b7ae6d70b54e5df07d
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-07-02

    Updated Slovak translation

M	po/sk.po

commit 818cb6cd70e6c3f9ed68bb431973fc1699090398
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-07-01

    Updated Slovak translation

M	po/sk.po

commit 0b46b9c106cadc61ce08db7d2d43f4e7076eea58
Author: Claude Paroz <claude@2xlibre.net>
Date:	2016-05-10

    Updated French translation

    Thanks Mathieu Stumpf for the initial translation.

M	help/fr/fr.po
M	po/fr.po

commit f23c43bbeb9074e283ca72d745af7122c21798f4
Author: Balázs Meskó <meskobalazs@gmail.com>
Date:	2016-04-29

    Updated Hungarian translation

M	po/hu.po

commit 0cb43dc87be96bbf5cce06f4b31624183193a64f
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-04-28

    Updated Slovak translation

M	po/sk.po

commit c001d7c2ffd4142d72f26820bfd71dd3533780de
Author: Clemens Fries <githubert@xenoworld.de>
Date:	2016-04-27

    Prevent crash when providing an invalid file on the command line

M	src/window.c

commit d277ea8a3f2e30e41b45363f152b283a1e4579d3
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-04-26

    Updated Slovak translation

M	po/sk.po

commit d9a8f3f69745079b449b939caf651095ee24a604
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-04-26

    Updated Slovak translation

M	po/sk.po

commit 0b5d2091ef018840bc0e352a09bbabd67cc0e76c
Author: Jim Evins <evins@snaught.com>
Date:	2016-04-24

    Added missing function prototype to header.

M	src/prefs-model.h

commit e57db9c16130658be12e57f81f41215de4e9d50d
Author: Jim Evins <evins@snaught.com>
Date:	2016-04-23

    Some final preparation for 3.4.0.

M	AUTHORS
M	NEWS
M	README
M	configure.ac

commit f09166de12e7a3113d234a2fccf30ec1358a4171
Author: Rafael Fontenelle <rafaelff@gnome.org>
Date:	2016-04-13

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit 151c7ccd501b4c5ea55da1394b5393d5f156e657
Author: Marek Černocký <marek@manet.cz>
Date:	2016-04-13

    Updated Czech translation

M	help/cs/cs.po
M	po/cs.po

commit c13334665d39fbd09e83d53fbbd4a084da8e0501
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-04-12

    Updated German doc translation

M	help/de/de.po

commit d8be24be28be70bd1ea4581cbfd7de105dd60014
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-04-12

    Fixed logical issue in German translation

M	po/de.po

commit 8b7724075ffd2e852617866a000f2eb0451bfee9
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2016-04-12

    Updated Spanish translation

M	help/es/es.po

commit d7f901a7a2bc9bb24403bed9184762a9952c5b04
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2016-04-12

    Updated Spanish translation

M	po/es.po

commit 6bc5aa0a09356039c4c36122ab0a92103562b386
Author: Rafael Fontenelle <rafaelff@gnome.org>
Date:	2016-04-12

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit e85cda0e27d7ec23ab733d43b9e91c0861bb38c6
Author: Jim Evins <evins@snaught.com>
Date:	2016-04-11

    Updated manual page for the new Label properties dialog.

M	help/C/labelprop.page

commit ea0cef41ce6e18ae99a329b85080623f74ca64b2
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:	2016-04-11

    Updated Swedish translation

M	po/sv.po

commit 05d49201e0b5549f0b556ee416c7671ac0711c47
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-04-11

    Updated German translation

M	po/de.po

commit 26dbf498143e1a98146dff0cf5ce79565a127fd1
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-04-11

    Added SheetLabels templates

M	templates/sheetlabels-us-templates.xml

commit 212cffd51f6eee69186f195098d6299ae6d261a7
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:	2016-04-11

    Updated Swedish translation

M	po/sv.po

commit ed52a7ae4585751c659506805b6064208b32dbed
Author: Jim Evins <evins@snaught.com>
Date:	2016-03-31

    Use pre-2.44 GObject boilerplate in new glLabelPropertiesDialog.

    Maintains compatability with older or less bleeding-edge
    distributions.

M	src/label-properties-dialog.c
M	src/label-properties-dialog.h

commit dbd7de13a3c6d3d62d7f9cd245d3674d5410c88b
Author: Balázs Meskó <meskobalazs@gmail.com>
Date:	2016-03-31

    Updated Hungarian translation

M	po/hu.po

commit cfb648be19b9fc82afeea91f9b9271f9e7d3b00d
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-03-30

    Added a few SheetLabels templates

M	templates/sheetlabels-us-templates.xml

commit e30a5855354169b942c27d332f346cc8a61ae7c5
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-03-30

    Updated German translation

M	po/de.po

commit 966a54971c015dacb123abab77ed5989f42c546f
Author: Marek Černocký <marek@manet.cz>
Date:	2016-03-30

    Updated Czech translation

M	po/cs.po

commit b132259e00150627c23cbcb9ffdf8bff19e041bc
Author: Jim Evins <evins@snaught.com>
Date:	2016-03-29

    Added Datamatrix with GS1 input mode barcode type to zint backend.

M	src/bc-backends.c
M	src/bc-zint.c

commit d0282fa9043f5e5e1c5cd00ff8a4ec0eab29df98
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	2016-03-24

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit 18b14950c2d929cdda40617bfef2da0aeadcbb16
Author: GHPS <GHPS@users.noreply.github.com>
Date:	2016-03-07

    Unified description, fixed English translation, added filing-category

M	templates/zweckform-iso-templates.xml

commit c34d782e781f37a7b5086c35ec78ca40700267b2
Author: Marek Černocký <marek@manet.cz>
Date:	2016-03-12

    Updated Czech translation

M	po/cs.po

commit 53362e5dbc67b05e7318de5240cadfdcdbd8f508
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-03-08

    Updated German translation

M	po/de.po

commit e4f6a47abcab7fed87f198f3c62b6da4f1d5a311
Author: Balázs Úr <urbalazs@gmail.com>
Date:	2016-03-06

    Updated Hungarian translation

M	po/hu.po

commit ae4aad4994a8a355680c873923b84dd8231aba8d
Author: Jim Evins <evins@snaught.com>
Date:	2016-03-06

    Added translation context for "Select Product" (Bug #763003).

M	src/new-label-dialog.c

commit 3c195d74dc71d4facc7c32a49f0219e368db5f0c
Author: Balázs Úr <urbalazs@gmail.com>
Date:	2016-03-06

    Updated Hungarian translation

M	po/hu.po

commit 4c4e9491e19bd0f0e102371913b96010d84126c3
Author: GHPS <GHPS@users.noreply.github.com>
Date:	2016-03-03

    Update to new Dymo labels, pt -> mm (Dymo official dimensions),
    file sorted

M	templates/dymo-other-templates.xml

commit 0526c761afa92ee7c008985b1234f1be4e70c8dc
Author: GHPS <GHPS@users.noreply.github.com>
Date:	2016-03-03

    New categories for name badges (name-badge) and filing.

M	templates/categories.xml

commit fd29a33c46d4cd344a2e7b7c5864a88531d71e09
Author: Balázs Úr <urbalazs@gmail.com>
Date:	2016-03-04

    Updated Hungarian translation

M	po/hu.po

commit c7470d41b65c4d26846cf5ac2aa04189af690f93
Author: Jim Evins <evins@snaught.com>
Date:	2016-03-03

    Removed laste vestiges of windowing system or dbus dependencies
    from glabels-batch.

M	src/font-history-model.c
M	src/font-history-model.h
M	src/font-history.c
M	src/font-history.h
M	src/glabels-batch.c
M	src/prefs-model.c
M	src/prefs.c
M	src/prefs.h
M	src/template-history-model.c
M	src/template-history-model.h
M	src/template-history.c
M	src/template-history.h

commit 138ff1b448ed1fe75e674d5006130652c289a8e1
Author: Marek Černocký <marek@manet.cz>
Date:	2016-03-03

    Fixes for Begalabel templates

M	po/POTFILES.in
M	templates/Makefile.am
M	templates/begalabel-templates.xml

commit 193f0e3c97a102220585990d65a2a2a58971fd6b
Author: Marek Černocký <marek@manet.cz>
Date:	2016-03-03

    Add new Begalabel templates

A	templates/begalabel-templates.xml
M	templates/vendors.xml

commit 13e6059ad706c4b9c839f598df7a0a3e3bbbd06d
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:	2016-03-03

    Updated Swedish translation

M	po/sv.po

commit aa254d8d573e1ace39cee5c7d1f65b8800835262
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-03-02

    Updated Slovak translation

M	po/sk.po

commit 7a66286430281f7ea1fb1ccb3055fe293ae726ba
Author: Jim Evins <evins@snaught.com>
Date:	2016-02-28

    Fix drawing beyond drawing area viewport (bug #762307).

    Fixes Bug #762307.	Clip the drawing area's bin_window to a
    viewport determined by the widget's physical window size and
    current scroll adjustments.

M	src/view.c

commit 99b749f214affdb3d7fe590f675ea23ba9d7fb23
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-25

    Show changes immediately after rotate/flip

M	src/label.c

commit 46d0313b58e5d0c18f6a1803b6940934c59db199
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-22

    Fix crash on Select All

M	src/object-editor.c

commit 71a6570fad3df336c275f6dd1a12b1ee749d8333
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-25

    Updated Czech translation

M	po/cs.po

commit ed04ee3f971c85073417b8a4f7f09078bd80d947
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-25

    Fix typo

M	src/label.c

commit 71b63b09608b5bc1dfeb6037bcf0e9d21030d69f
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-02-24

    Updated German translation

M	po/de.po

commit 215f105bfe9b5436e29873efefdb9ec8067366d2
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-24

    Be more specific comments for translators

M	src/label.c

commit 29cdcc4644e6900fb0913dc37b6f21acc0f52b77
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-24

    Fix typos

M	src/label.c

commit 085265d35e5f67a789ecca4056b66ba66c5ed06f
Author: Rafael Fontenelle <rffontenelle@gmail.com>
Date:	2016-02-23

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit 8b1e71279e63cfbd5f2f5f26ce6bc553dff91508
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2016-02-22

    Updated POTFILES.in

M	po/POTFILES.in

commit c719015609b943decb76fbbdf18618227b6654a9
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-18

    Add properties dialog

M	data/ui/Makefile.am
A	data/ui/label-properties-dialog.ui
M	src/Makefile.am
M	src/file.c
M	src/file.h
A	src/label-properties-dialog.c
C058	src/file.h	src/label-properties-dialog.h
M	src/label.c
M	src/label.h

commit a8fdd2ef48cd8bd832f6c85c8f2a2903ac39c346
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-14

    Set path for Save As

M	src/file.c

commit c7004d7988d2b47d9f09226301bab2d21f1a12dd
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-17

    Some dimension fixes

M	templates/rayfilm-templates.xml

commit bfd72b4fd652140f7987058e49bae2c62b44696a
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-17

    Updated Czech translation

M	help/cs/cs.po

commit b5e16a792c68cdd5b809b878a4573db7ba83604f
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-13

    Fix text and line shadow color from key

M	src/color.c
M	src/color.h
M	src/label-line.c
M	src/label-text.c

commit cb06227147d7c6eda9074530baabe75307773883
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-13

    Object dragging enhancement

M	src/view-box.c
M	src/view-box.h
M	src/view-ellipse.c
M	src/view-ellipse.h
M	src/view-line.c
M	src/view-line.h
M	src/view.c
M	src/view.h

commit fbacfb3d00e89daffced4586f4654c65ce2111bd
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-11

    Fix line handle P1 sensitive

M	src/label-object.c

commit aae4fee62cf98b130cfa25a056b35ad203fedb5c
Author: Windel Bouwman <windel@windel.nl>
Date:	2016-02-07

    Add full page Bruna template for A4.

M	templates/misc-iso-templates.xml

commit d5ff2a4052fcc0c9b26e3410f69fd2903e704583
Author: Marek Černocký <marek@manet.cz>
Date:	2016-02-02

    Updated Czech translation

M	po/cs.po

commit 6c9a0a990219d15eacefc873befe71b966678046
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-02-01

    Updated German translation

M	po/de.po

commit 12aacd1a153b89e91081da811bc4b41235bd1cf9
Author: Jim Evins <evins@snaught.com>
Date:	2016-01-31

    Bump version.

M	configure.ac

commit 5b6f8fb1f98967833b9954baa43d50750531d043
Author: Jim Evins <evins@snaught.com>
Date:	2016-01-31

    Some cleanup to satisfy distcheck.

M	.gitignore
M	po/POTFILES.skip
M	templates/Makefile.am

commit e1a38920a8968afec6949759040f7f393fe5b2be
Author: Richard Hughes <richard@hughsie.com>
Date:	2016-01-25

    Update the AppData to spec version 0.7+

M	data/appdata/glabels-3.appdata.xml.in

commit 1f4d83785171ef57e1342dcfeed063c5a00b28d2
Author: Richard Hughes <richard@hughsie.com>
Date:	2016-01-25

    Add a missing tag to the AppData file

M	data/appdata/glabels-3.appdata.xml.in

commit d68a06597d8ca19b654138001ee653fb9dd2f80e
Author: Walter Cheuk <wwycheuk@gmail.com>
Date:	2016-01-24

    Updated Chinese (Hong Kong) translation
    (cherry picked from commit 752f97a141e3613d2aeb4bbf30667716cd4e986f)

M	po/zh_HK.po

commit 419a15ed0b11cfe7a4eaa49f3cc8317a2cded728
Author: Walter Cheuk <wwycheuk@gmail.com>
Date:	2016-01-24

    Updated Chinese (Taiwan) translation
    (cherry picked from commit 861305ac11561bb1dab661d89de3f38db7f28815)

M	po/zh_TW.po

commit b3e7d28f699a196a37aa53fd345af8ef36b2718d
Author: Marek Černocký <marek@manet.cz>
Date:	2016-01-31

    Udated Czech translation

M	po/cs.po

commit 626bf4f71bdeb977424a31145842cf58269b09c3
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-01-24

    Updated German translation

M	po/de.po

commit 7a93d511a50d066409ddeac313e9a5bad277bd7e
Author: Jim Evins <evins@snaught.com>
Date:	2016-01-23

    Fixes to doap file from master.

M	glabels.doap

commit 9b1aa2676512c1d4e2101847a1be38504bdda88a
Author: Jim Evins <evins@snaught.com>
Date:	2016-01-23

    Update project meta data.

M	.gitignore
M	HACKING
M	README
M	data/desktop/glabels-3.0.desktop.in
M	glabels.doap

commit 6efdb7f35c3f0cf8b61178bde5a7912f627bdf7e
Author: Jiri Grönroos <jiri.gronroos@iki.fi>
Date:	2016-01-21

    Updated Finnish translation

M	po/fi.po

commit f12018edd8857d91a5d4662fd8d8fbadd505a358
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	2015-12-31

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit 41a843b11d604be1f76b03ec2c915112f3ce74ac
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2015-12-30

    Updated German translation

M	po/de.po

commit 49d65be25f8eef69fd7b258db342dac07d56c002
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	2015-12-30

    Updated Serbian translation

M	po/sr.po
M	po/sr@latin.po

commit 7fc57ed02d2b73badc789020ec9506ffac817ea9
Author: Jim Evins <evins@snaught.com>
Date:	2015-12-26

    Reconcile whitespace styles.

M	src/merge-text.c

commit 641ac096f10a846f620551563327da67be16ae67
Author: Jim Patterson <sf.rs9z@ncf.ca>
Date:	2015-12-26

    Auto-detect file encoding of CSV files and process accordingly.

    Fixes sourceforge bug# 139. The changes scan any CSV file for a BOM
    (Byte Order Mark) when it's opened. If one is found, then the getc
    routine will use g_iconv to convert code sequences to utf-8 before
    passing them up for processing. Since it checks for the UTF-8 BOM as
    well as those for UTF-16 and UTF-32, this change also provides a way
    in which a UTF-8 CSV file can be passed into GLabels on those systems
    which aren't using UTF-8 as the system codeset. Currently, those
    files are (it appears) assumed to be in the system code set, and so
    are a bit problematic.

M	src/merge-text.c

commit 0f73a4fd412c9e4812926747ef8a0ed68d9096c8
Author: Marek Černocký <marek@manet.cz>
Date:	2015-12-20

    Fixed typo mm8 -> 8mm

M	templates/endisch-templates.xml

commit c8be3946b6389beb51da7ecafe96854d20383369
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2015-12-17

    Updated Spanish translation

M	po/es.po

commit 3b3ab61c724d0e83e5a826446642191df57f7a31
Author: Muhammet Kara <muhammetk@gmail.com>
Date:	2015-12-13

    Updated Turkish translation

M	po/tr.po

commit f8adad57e31608beb9cca35de3cd0313facda856
Author: Necdet Yücel <necdetyucel@gmail.com>
Date:	2015-12-13

    Updated Turkish translation
    (cherry picked from commit 0d23cb983ceb1eb7fe49c8dd1297c13b8649e40b)

M	po/tr.po

commit 2e2474159e3b7e1f7dfcf778cedc7adbb5801298
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2015-12-13

    Updated Spanish translation

M	help/es/es.po

commit fc69408fa71d9b13788b0fb45a93aaee452eaadb
Author: Pedro Albuquerque <palbuquerque73@gmail.com>
Date:	2015-12-13

    Updated Portuguese translation

M	po/pt.po

commit 5dc90f7519e81ab21e04d5885618ea41a9e958c1
Author: Marek Černocký <marek@manet.cz>
Date:	2015-12-08

    Updated Czech translation

M	po/cs.po

commit f1de8eb10559e97747ba75a0754d622c30a5739c
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:	2014-12-15

    Fix a typo

    Signed-off-by: Marek Černocký <marek@manet.cz>

M	src/bc-backends.c

commit a393c8109108f04ae5e77b1fa3fa406e2f5c40a8
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2015-12-02

    Updated Spanish translation

M	po/es.po

commit bb90018a24d222db468ee0fe5f2377a26ade10e8
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2015-11-21

    Updated German doc translation

M	help/de/de.po

commit 470594f178029d92c77b3f8e221fcb689486aa90
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2015-11-21

    Updated German translation

M	po/de.po

commit 19f231afa72c63c46b58293adc9c30663cd17338
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:	2015-10-26

    Updated Swedish translation

M	po/sv.po

commit 3acce37267ce4fdeb978616a65a83c6784ae9255
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:	2015-10-18

    Updated Greek translation

M	po/el.po

commit 5e6cc832e13669dc2e17e17c34208738d29c92d6
Author: Marek Černocký <marek@manet.cz>
Date:	2015-09-14

    Updated Czech translation

M	help/cs/cs.po

commit a1c3cccdbb7c8c21f69694f55d06d10bb97b60b7
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	2015-08-17

    Updated Greek translation

M	help/el/el.po

commit bb3bd64bad2c7b8afcb601370ff065efc1a4c0d0
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	2015-08-15

    Updated French translation

M	help/fr/fr.po

commit b227668b1a477231a39cd95aab8549797a247032
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2015-08-08

    Updated POTFILES.in

M	po/POTFILES.in

commit 982c22b9e923eca694d6482c42b6afde4a6c8302
Author: Thomas Steinert <contact.steinert@gmail.com>
Date:	2015-08-08

    Add Avery L4730 and Cable Lable Co CableBug Labels.

    - Includes some whitespace cleanup in vendor.xml and categories.xml.

M	.gitignore
M	templates/Makefile.am
M	templates/avery-iso-templates.xml
A	templates/cablelabel-templates.xml
M	templates/categories.xml
M	templates/vendors.xml

commit a5a1d5e3ccc502d89ec224d4af67b5b1c75226b7
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:	2015-08-07

    Fix typos in manual

M	help/C/customize.page
M	help/C/mancreate.page
M	help/C/merge-ex3.page

commit 318e05e03840a452ae7b44f9576485d51bd6585f
Author: Jim Evins <evins@snaught.com>
Date:	2015-08-02

    Fixed names of brother templates.

M	templates/brother-other-templates.xml

commit 15786d2aecdca97834ab6ed4f42d83d4592990b4
Author: Marek Černocký <marek@manet.cz>
Date:	2015-07-22

    Updated Czech translation

M	po/cs.po

commit 8b6f024a6d81f10ca74c987571cd30ff55095d37
Author: Pedro Albuquerque <palbuquerque73@gmail.com>
Date:	2015-07-19

    Updated Portuguese translation

M	po/pt.po

commit 3a57a96a64b4eb606434a524a85b136c188a12a1
Author: Balázs Úr <urbalazs@gmail.com>
Date:	2015-07-18

    Updated Hungarian translation

M	po/hu.po

commit 149b37a7ddf58dd287426443fe9114a5209bca85
Author: Jim Evins <evins@snaught.com>
Date:	2015-07-17

    Updated Brother QL-500/550/... templates.

    Updated these templates to use the foomatic ptouch driver.	The
    label sizes and measurements come directly from version 1.1 of
    the 'Brother-QL-500-ptouch.ppd' file.

    Kept old templates around for backwards compatability.

M	templates/brother-other-templates.xml
M	templates/vendors.xml

commit 4f3e3e8e3ba98a27e8378fb2ffd38ae9f59d659a
Author: Pedro Albuquerque <palbuquerque73@gmail.com>
Date:	2015-07-07

    Updated Portuguese translation

M	po/pt.po

commit 05c43afd5967c441c3568d49629824572745cd90
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2015-06-27

    Updated POTFILES.in

M	po/POTFILES.in

commit 074c6bb6a77d208568bf99a0c02ec01a66e98f18
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2015-06-27

    Add Malte Skoruppa to AUTHORS

M	AUTHORS

commit cc3d2a9547e22d429691471198b45fca9e5ee666
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2015-06-27

    Add Mayspies to vendors

M	templates/vendors.xml

commit 6e682a8b1573b4cff774377f114d5231a9c5b023
Author: Malte Skoruppa <skoruppa@cs.uni-saarland.de>
Date:	2015-06-27

    Add new template file for Mayspies

A	templates/mayspies-templates.xml

commit 757777500e690976dabb2e5e4803fcdbf82326b5
Author: Gábor Kelemen <kelemeng@openscope.org>
Date:	2015-05-28

    Updated Hungarian translation

M	po/hu.po

commit 2c5e4afcb665478cee337d2939a6a01ec3168d71
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	2015-05-26

    Initial Hungarian translation by Balazs UR <urbalazs at gmail dot
    com>, corrections by me

A	po/hu.po

commit 31e12b92e72a93dd3e0a892cc5a4c1557fb7323d
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	2015-05-26

    Added hu to LINGUAS

M	po/LINGUAS

commit 3480159dacc5c7576562c1fff7bcdd8303347629
Author: Jordi Mas <jmas@softcatala.org>
Date:	2015-05-06

    Fixes to Catalan translation

M	po/ca.po

commit d9b453d0b3a79ec74a8e35573ed23fda820f9c5d
Author: Daniel Șerbănescu <daniel@serbanescu.dk>
Date:	2015-04-06

    Added Romanian Translation

M	po/LINGUAS
A	po/ro.po

commit 6e3afc47ed6b8ca72393c740d5dfa489ca8163f2
Author: Samir Ribic <samir.ribic@etf.unsa.ba>
Date:	2015-03-13

    Added Bosnian translation

M	po/LINGUAS
A	po/bs.po

commit 5a6da4851e83b52ba56b3d59c652c29c229b7916
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2015-03-11

    Added Slovak translation

M	po/LINGUAS
A	po/sk.po

commit abb54d7416428501e26f9a121135ddc043034b61
Author: Tim Waugh <twaugh@redhat.com>
Date:	2015-01-19

    Handle vcard entries with addresses but no address labels (bug
    #742441).

    Fixes Bug #742441.	A vcard entry that has no address labels but
    does include
    structured address components can be handled by fabricating the
    address label
    from the address components.

M	src/merge-vcard.c

commit 1dd1d6e1697373140eea0373beb195c0ca4534c0
Author: Tim Waugh <twaugh@redhat.com>
Date:	2015-01-06

    Fixed missing contacts when importing from vcard.

    Fixes Bug #742440.	After checking for an END line, another line
    was read
    before breaking out of the loop. This could have been the BEGIN
    line for
    the next record, in which case that record will be lost.

M	src/merge-vcard.c

commit 42d630343f0da1ef616b6252e352e1602832e088
Author: Åke Engelbrektson <eson57@gmail.com>
Date:	2015-01-13

    Updated Swedish translation

M	po/sv.po

commit f9ab70e76c6d0493ad388c30ba3d80d27bdb4487
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2014-12-19

    Add a few SheetLabels templates

M	templates/sheetlabels-us-templates.xml

commit bb7d492a4469a92e8d9f56912522c127505ca7cc
Author: Bruce Dagel <bdagel@machlink.com>
Date:	2014-12-18

    Add SheetLabels SL 573 template

M	templates/sheetlabels-us-templates.xml

commit 6aab0235a879e6c9dff561a35335958ab056008a
Author: Muhammet Kara <muhammetk@gmail.com>
Date:	2014-12-11

    Updated Turkish translation

M	po/tr.po

commit 3e7beab866edeb88bd87742eaa86ff3cb014f41b
Author: Jim Evins <evins@snaught.com>
Date:	2014-11-10

    Post 3.2.1 preparation.

M	configure.ac

commit 7956897f0dec97f6297bd438a175e3934bf8ec5e
Author: Jim Evins <evins@snaught.com>
Date:	2014-11-09

    Final preparation for 3.2.1.

M	NEWS

commit a3c7ddc68495c9391b2295c0806ce6dcadbaeac0
Author: Jim Evins <evins@snaught.com>
Date:	2014-10-23

    Preparation for 3.2.1

M	NEWS
M	configure.ac

commit 60557cad418e0caf2687f8e365a9e7f7cf1e11ce
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:	2014-11-02

    Updated French translation

M	po/fr.po

commit a19c15779d09aecc5f48556d5f531cf96694bd5d
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	2014-11-01

    Updated Latvian translation

M	po/lv.po

commit 3700cd8f40e429bb9a562533493a352fc40c3d4e
Author: Jim Evins <evins@snaught.com>
Date:	2014-10-23

    Removed obsolete tab-hborder property from media-select UI file.

    Unfortunately, beginning with gtk 3.14, rather than ignoring this
    obsolete
    property, having it in a UI file is considered a critical error,
    thus crashing
    glabels on newer distributions.

M	data/ui/media-select.ui

commit b66c0076908a706235af21b2c1d3ef04a6ba1f7f
Author: Jim Evins <evins@snaught.com>
Date:	2014-10-23

    Added dummy window as parent in warning and critical error handlers.

    In gtk 3.14, creating a message dialog without a parent window
    causes a crash.  Unfortunately this causes the original error or
    warning message from being seen by the user.

M	src/critical-error-handler.c
M	src/warning-handler.c

commit 20975776a273e48bbd5d600cdff7040b159ba162
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2014-10-05

    Removed Polish translation

    Last updated in 2002 (that's 12 years ago) and with 68 strings
    translated,
    it's doing more harm than good at this point. It can always be
    brought back
    from git, but it's probably easier to just start from scratch,
    if anyone's
    interested.

M	po/LINGUAS
D	po/pl.po

commit 6f7078360ec06f2baab951c897c05b57dc6b4a42
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2014-04-15

    [l10n] Updated German translation

M	po/de.po

commit b1eae7c6d2430974c409c9a019f4d2b6b52a5628
Author: Jordi Mas <jmas@softcatala.org>
Date:	2014-04-06

    Fix typos in Catalan translation

M	po/ca.po

commit 099514976b443da7e26097e1df820c9295cb2acd
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2014-03-10

    Fix a tag in French help translation

M	help/fr/fr.po

commit fcaf1b13e5f7d411a245c6cc682bb32f5bb002e4
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2014-02-28

    Updated Slovenian translation

M	po/sl.po

commit 535782f91a75f0ad09bea38b373d09ffa1493ded
Author: Marek Černocký <marek@manet.cz>
Date:	2014-02-13

    Updated Czech translation

M	po/cs.po

commit bcd9e861895c8e10ba8f72e10230f73222bec888
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2014-02-11

    Updated POTFILES.in

M	po/POTFILES.in

commit 83f437bdae66b307066b5bc3a40e8b8ea03f1c51
Author: Jim Evins <evins@snaught.com>
Date:	2014-02-09

    Added Canon Type J CD/DVD Tray template.

M	AUTHORS
M	templates/Makefile.am
A	templates/canon-other-templates.xml
M	templates/vendors.xml

commit a65a7dfee1053660679989a9a28ae10d4e589648
Author: Jim Evins <evins@snaught.com>
Date:	2014-01-25

    Fix layout problems with center and right text alignment to text box.

    Pango layout width should be 6 pts smaller than text object width
    to account
    for a 3 pt margin around layout.

M	src/label-text.c

commit 10eeb5e0e0edfacbd7c2bfb66855b46f02475e80
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2014-01-03

    Updated Spanish translation

M	po/es.po

commit 69feb397965f45985cf6128d46ba292b4944d115
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2014-01-03

    Updated Spanish translation

M	help/es/es.po

commit c2222b5dfa2865b9b38c43b6eb22368e1efa7d06
Author: Marek Černocký <marek@manet.cz>
Date:	2013-12-27

    Updated Czech translation

M	help/cs/cs.po

commit b7081a1bacf28232c7342fdd12f9ec44b8d94f89
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	2013-11-26

    [l10n] Updated Serbian translations

M	po/sr.po
M	po/sr@latin.po

commit 5da2300ccdaa0bdb4d38e820cc6ab4f95c664b7f
Author: Martin Srebotnjak <miles@filmsi.net>
Date:	2013-10-29

    Updated Slovenian translation

M	po/sl.po

commit b315c9acd46d106710b318d54b8f752358744466
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-28

    Preparation for 3.2.0.

M	NEWS

commit 3185fe6c520ca2386bcbb0e4288cdd95c7c1c07e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2013-10-13

    Updated Slovenian translation

M	po/sl.po

commit e60a0076cf975abc88ae24949867b340d430e678
Author: Marek Černocký <marek@manet.cz>
Date:	2013-10-13

    Updated Czech translation

M	po/cs.po

commit 6da1e7523a81fbf524e8c6c8ccf59c6566e0f3fb
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	2013-10-13

    Updated Latvian translation

M	po/lv.po

commit daaf0c74eac5498dffaf947742b91e6e681174bd
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	2013-10-12

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit f07cd37c71d5a49443ced7f50c834905512922ac
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-10-12

    [l10n] Updated German translation

M	po/de.po

commit 89e0ba6d44387274aab5f512c7cb499b66a77871
Author: Claude Paroz <claude@2xlibre.net>
Date:	2013-10-12

    Updated French manual translation

M	help/fr/fr.po

commit f6c1d7ec099672a6dfa5dbae3f1ae9c0b2c39cda
Author: Claude Paroz <claude@2xlibre.net>
Date:	2013-10-12

    Updated French translation

M	po/fr.po

commit cfeb47947d11c45271bbb86ca357231c3a610778
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-10

    Bump version to 3.2.0.

M	configure.ac

commit 81bfea5ad77360d2d8f26b61b17ddc4c207ca7d5
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-09

    Generated new app and mimetype bitmaps from scalable icons.

M	.gitignore
M	data/icons/16x16/apps/glabels-3.0.png
M	data/icons/22x22/apps/glabels-3.0.png
M	data/icons/24x24/apps/glabels-3.0.png
M	data/icons/32x32/apps/glabels-3.0.png
M	data/icons/48x48/apps/glabels-3.0.png
M	data/icons/48x48/mimetypes/application-x-glabels.png

commit 63ad6763093d0ff95b2233bbc54a14029f0217da
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-09

    Added scalable app and mimetype icons.

M	configure.ac
M	data/icons/Makefile.am
A	data/icons/scalable/Makefile.am
A	data/icons/scalable/apps/glabels-3.0.svg
A	data/icons/scalable/mimetypes/application-x-glabels.svg

commit 11e93788cf275580c27c13eec376f2f9dba56bad
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-05

    Added appdata file

M	configure.ac
M	data/Makefile.am
A	data/appdata/Makefile.am
A	data/appdata/glabels-3.appdata.xml.in
M	po/POTFILES.in

commit 3e730864d88a9dd9af9fe8ece3a9539ad15d764c
Author: Timo Jyrinki <timo@debian.org>
Date:	2013-09-23

    Finnish translation update

M	po/fi.po

commit f54e34afe43a049754cd992149eb6fd192bef228
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	2013-09-20

    Updated Brazilian Portuguese translation

M	help/Makefile.am
A	help/pt_BR/pt_BR.po

commit 065065c183fe3121f76a55a82657e000836bde8d
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2013-09-15

    Fix a broken tag in German help translation

M	help/de/de.po

commit 67bf47d1c529ad76f874d649f232ecd4f8e6f2c0
Author: Marek Černocký <marek@manet.cz>
Date:	2013-07-21

    Updated Czech translation

M	help/cs/cs.po

commit 450e436800ed173f4300a66009556149a02dad32
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-06-26

    [l10n] Updated German doc translation

M	help/de/de.po

commit 02617415fef9b490f44fc8aa54998e91a274e41c
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-06-26

    [l10n] Updated German translation

M	po/de.po

commit 36de4c460e0106357bf34919e4c085fbb00047f6
Author: Jim Evins <evins@snaught.com>
Date:	2013-06-23

    Emit selection_changed after delete_selection

    Emit selection_changed signal after a delete_selection.  Fixes bug
    where object
    editor remained active after an object was deleted.

M	src/label.c

commit 063afbdeece38750044f2462837246bb1c8346c6
Author: James Cloos <cloos@jhcloos.com>
Date:	2013-06-22

    Embed the text in the printstream as text rather that as an outline

    Fixes bug #702783.	Render text directly using pango-cairo API
    instead of
    filling text outline path.	Original patch modified to still use
    path to test
    for selection.

M	src/label-text.c

commit 48bdf0059de924880e20fc7641b7b5e6e33476dd
Author: Jim Evins <evins@snaught.com>
Date:	2013-06-20

    Add decoration to new label dialog.

    Manually added decorations back to new label dialog that have been
    deprecated
    in recent versions of Gtk.	Still need to look for proper way to
    use theming
    information to select text and background colors.

M	data/ui/new-label-dialog.ui
M	src/new-label-dialog.c

commit acb8a0c8e4ee4131b059aeb4544c4ef108dd183c
Author: Jim Evins <evins@snaught.com>
Date:	2013-06-16

    Workaround for pango kerning bug.

    Fixes bug #698777.	This is a workaround for pango-cairo bug #700592,
    which is
    a regression of bug #341481 which was originally fixed back in 2009.
    This
    workaround works by rendering the font at device scale rather than
    world scale.
    To make this work the actual font size is manually scaled
    appropriately to
    compensate for this.

M	src/label-text.c

commit e3a8b073f0f914b71279f28630f79f0cfec736e2
Author: Jim Evins <evins@snaught.com>
Date:	2013-06-15

    Reconcile object-editor glade file with 3.0.

    Reconciled object-editor glade file with 3.0 version to correct
    vertical
    packing of widgets.

    This file should probably be rebuilt to remove gtk+-2 deprecations.

M	data/ui/object-editor.ui

commit d3701e7eccee70258b7092848c5009dd1ab0a839
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	2013-05-31

    l10n: Update Japanese translation

M	po/ja.po

commit 748c4120718803a54040400e074db7fd250fc813
Author: Jim Evins <evins@snaught.com>
Date:	2013-05-19

    Fixed low hanging deprecations and warnings.

M	src/color-combo-button.c
M	src/color-combo.c
M	src/field-button.c
M	src/font-combo-menu-item.c
M	src/font-combo.c
M	src/font-util.c
M	src/label-image.c
M	src/label-object.c
M	src/label-text.c
M	src/label.h
M	src/merge-text.c
M	src/mini-preview.c
M	src/str-util.h
M	src/ui-property-bar.c
M	src/view.c
M	src/window.c
M	src/xml-label.c

commit 329d5bb8abd2962e51fa76655a53357061f100bd
Author: Jim Evins <evins@snaught.com>
Date:	2013-05-14

    Fix autogen.sh that was mistakenly broken in previous commit.

M	autogen.sh

commit b78e6f1d6ef50cca053ba671dc02826e5dbba91b
Author: OKANO Takayoshi <kano@na.rim.or.jp>
Date:	2013-04-27

    l10n: Update Japanese translation

M	po/ja.po

commit ce86b981a8a04f8d7ef26c3406a3f8d810c2361f
Author: Marek Černocký <marek@manet.cz>
Date:	2013-04-26

    Updated Czech translation

M	help/cs/cs.po

commit 090ba2cab4666137839e03b2488cbc40f0851039
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	2013-04-18

    Updated Greek translation

M	help/el/el.po

commit d7daf5a802fdfb252d63995515ae4e930d6665a0
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-04-17

    [doc] Notes about creating CSV from kaddressbook and Thunderbird

M	help/C/mergefeatures.page

commit 6d5918ace1f8d47b2a0e462d7eeaf6ad4d0220aa
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-04-16

    Added more SheetLabels templates

M	templates/sheetlabels-us-templates.xml

commit 6b7d7e831e5542b6ea3c15802fa882a42399fc15
Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date:	2013-04-01

    unbreak with evolution-data-server >= 3.6.0

    https://bugzilla.gnome.org/show_bug.cgi?id=685130

M	src/merge-evolution.c
M	src/merge-vcard.c

commit e4d56c40e66a1bc53974800d8fe48dd5da432878
Author: Yusuf Bolu <yusufbolu@gmail.com>
Date:	2013-03-28

    [l10n] Added Turkish translation

M	po/LINGUAS
A	po/tr.po

commit 41ce4d95a8f4ae1f071f0fd2cb3b00e8d09cb17f
Author: Marek Černocký <marek@manet.cz>
Date:	2013-03-21

    Fixed XML

M	help/cs/cs.po

commit b13952d2c74cef740f18f9a790471ade2b2b5ae9
Author: Marek Černocký <marek@manet.cz>
Date:	2013-02-19

    Updated Czech translation

M	help/cs/cs.po

commit e011f5927d44b2eca758550c72811edd30404908
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-02-02

    [l10n] Updated German translation, SourceForge bug #3601568

M	po/de.po

commit 95b8f0e2f01d09b019cb499afe296740228242e3
Author: Walter Cheuk <wwycheuk@gmail.com>
Date:	2013-01-06

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

M	po/LINGUAS

commit 041bbd9b5e19a527a860a9c1052ca8b73b5c7067
Author: Walter Cheuk <wwycheuk@gmail.com>
Date:	2013-01-06

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

C051	po/zh_TW.po	po/zh_HK.po
M	po/zh_TW.po

commit 63bf696bcc7402ca21858e9f8cb293a74c12622a
Author: Gebhard Moser <gebhard.moser@yahoo.com>
Date:	2012-12-13

    Added Avery template

M	AUTHORS
M	templates/avery-iso-templates.xml

commit a24cc21714ac2427025f1b6c67edef0984b6754d
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	2012-11-01

    Aded galician translations

M	po/LINGUAS
A	po/gl.po

commit ef295496fd140a64688d9c36d5761eddf1e90350
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	2012-10-30

    Updated Greek translation

M	po/el.po

commit da5ea59a91a3a0a679ad9e84f9d9cdd03558a440
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2012-10-25

    Updated Slovenian translation

M	help/sl/sl.po

commit 7e25731ad2e921b57651e377acbf9e3decac9427
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-10-19

    Updated Spanish translation

M	help/es/es.po

commit a46132113544510803ad9c03a25010ad319e8b26
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	2012-10-17

    Added Latvian translation

M	po/LINGUAS
A	po/lv.po

commit cf5bf48b821dd7fe62037c3d7c464c549880b7b4
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-10-17

    Dummy commit to test the itstool functionality on Damned Lies

M	po/de.po

commit eb71b33d66bf5e81d3417edce1a224efa619f505
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-10-04

    Added Sigel template

M	AUTHORS
M	templates/misc-iso-templates.xml

commit 933a3996cf531177ba200d8ce21b753033f33530
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-09-24

    Some fixes around itstool

M	help/C/about.page
M	help/C/basicusage.page
M	help/C/createnew.page
M	help/C/customize.page
M	help/C/customtemplate.page
M	help/C/editprop.page
M	help/C/index.page
M	help/C/labelprop.page
M	help/C/mancreate.page
M	help/C/merge-ex1.page
M	help/C/merge-ex2.page
M	help/C/merge-ex3.page
M	help/C/merge-ex4.page
M	help/C/merge.page
M	help/C/mergefeatures.page
M	help/C/multifile.page
M	help/C/newlabel.page
M	help/C/printfile.page
M	help/C/select.page
M	help/C/skipfields.page

commit ad8e5a2f73991152989b75f2860c31ab562c6924
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-09-23

    Fixed menu entry for the user docs

M	src/ui-commands.c

commit 431595191971940954bc843973cee1a2466cecac
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-09-23

    First try to migrate to itstool

M	Makefile.am
M	autogen.sh
M	configure.ac
M	help/Makefile.am

commit 35637bb33b5cbe5b4937cf6bd328b0d232a9d687
Author: Jim Evins <evins@snaught.com>
Date:	2012-09-22

    Fix validation problems with desktop file.

    Fixes bug #684612.	Removed png extension from Icon.  Also removed
    deprecated
    Encoding key.

M	data/desktop/glabels-3.0.desktop.in

commit 3337c1bb1a0fbe677f9aacde21dd93eea08f0bd5
Author: Jim Evins <evins@snaught.com>
Date:	2012-09-17

    Preparation for 3.0.1

M	NEWS
M	configure.ac
M	templates/Makefile.am

commit 8e726680fe879928c5f75e252f21de1a7cc51e90
Author: Hatim Ali <dr.hatim@hotmail.com>
Date:	2012-09-17

    Added Arabic translation.

M	po/LINGUAS
A	po/ar.po

commit 0bf9aa6a1022b981dad8b718ec50f466d56743bc
Author: Jim Evins <evins@snaught.com>
Date:	2012-09-07

    Fixed calculation of number of pages when printing merge jobs

    Fixes bug #680585.	Poorly placed parenthesis caused the calculation
    of the
    number of sheets to be wrong whenever starting on any label other
    than the
    first one on a page.

M	src/print-op-dialog.c

commit f07b8360fd82befbd06642b0f646325c291d5597
Author: Timo Jyrinki <timo@debian.org>
Date:	2012-09-06

    Finnish translation update by Jiri Grönroos

M	po/LINGUAS
A	po/fi.po

commit 1e8097a4df10a4ac802efe6fd457013c6a9f55dd
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:	2012-09-04

    Adeed British English translation

M	po/LINGUAS
A	po/en_GB.po

commit a8c50effd6d66ee7948c4938ad062a2816239473
Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
Date:	2012-09-04

    Updated Russian translation

M	po/ru.po

commit 338bf28d2d9fc0b0b1950330b6a0ab5e7359433b
Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
Date:	2012-09-04

    Updated copyright years

M	src/ui-commands.c

commit 49471d0070c747f10dc209451b700afc142434db
Author: Claude Paroz <claude@2xlibre.net>
Date:	2012-09-04

    Updated French help translation

M	help/fr/fr.po

commit d86f08b2278658e273558beb281643ccf0e7c8d0
Author: Claude Paroz <claude@2xlibre.net>
Date:	2012-09-04

    Updated French translation

M	po/fr.po

commit 671bbb8ef104f1fb99de25cc88002dfdc7c69278
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-09-03

    Added APLI 1271 label

M	templates/misc-iso-templates.xml

commit c1885eefcdfa29126dbe814d3f0cdcfc08015469
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	2012-08-12

    [l10n] Update Japanese translation

    Modify the About label

M	po/ja.po

commit d9594a085ffa6f17ea116aecbd24aa9d349c4b72
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	2012-08-12

    [l10n] Update Japanese translation

    Merge latest pot

M	po/ja.po

commit 11ad1bb970c8ce47e24db76214b80f076a85470e
Author: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>
Date:	2012-01-08

    Updated Japanese translation

M	po/ja.po

commit 7c80dbc86607edd5835419a4b6404bd0e70db1c6
Author: Andika Triwidada <andika@gmail.com>
Date:	2012-07-24

    Added Indonesian translation to UI and User Guide

M	help/Makefile.am
A	help/id/id.po
M	po/LINGUAS
A	po/id.po

commit 0a48ec82bbe12a289c7e467af122dbe39d54e9e0
Author: Jim Evins <evins@snaught.com>
Date:	2012-07-22

    Make sure word wrap is consistent at all zoom levels.

M	src/label-text.c

commit 83977eda4a92c19f4f8ae44879d5041231b84f80
Author: Jim Evins <evins@snaught.com>
Date:	2012-07-14

    Use line spacing when automatically adjusting font size.

    Consider line spacing when automatically adjusting font size to
    keep within
    vertical dimension of bounding box.

M	src/label-text.c

commit aed8853e6e6007b9e18341da84b099a1ab9dda31
Author: Konstantinos Chortis <cograss@yahoo.com>
Date:	2012-07-12

    Updated Greek help translation

M	help/el/el.po

commit 875974e0832c9a11d046d276e32dc02d8c4a9194
Author: Konstantinos Chortis <cograss@yahoo.com>
Date:	2012-07-12

    Added Greek help translation

M	help/Makefile.am
A	help/el/el.po

commit 1f4a9a4d6e256a708581e37a77a3edd5d5c327d2
Author: Efstathios Iosifidis <diamond_gr@freemail.gr>
Date:	2012-07-12

    Added Greek translation

M	po/LINGUAS
A	po/el.po

commit 642a686f03e5be944a153f995c49e44516717a99
Author: Samuel Sieb <samuel-gnome@sieb.net>
Date:	2012-07-10

    Don't add newline when last line is an empty merge field.

    Fixes bug #679600.	Fixes problem by only prepending newlines to
    lines as they
    are added, except on the first line.

M	src/text-node.c

commit b1edca8e32ac3322dbbad5a63d2151a6092a228c
Author: Samuel Sieb <samuel-gnome@sieb.net>
Date:	2012-07-10

    Apply merge shrinkage both horizontally and vertically.

    Implements enhancement suggested in Bug #679594.  When "Allow merge to
    automatically shrink text" option is selected, allow both the
    horizontal
    and vertical dimensions of the text bounding box to trigger this
    behavior.

M	src/label-text.c

commit c691553a05723f7802f2356a3ed4d096ee1feab1
Author: Jim Evins <evins@snaught.com>
Date:	2012-07-08

    Fix font scaling problem.

    Fixes bug #679531.	Don't apply font scale twice when "Allow merge to
    automatically shrink text."  This also correctly applies font
    scale when
    line spacing is not 1.

M	src/label-text.c

commit 61788fad790e275ba45005302341c2f5d890d7ca
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-05-01

    Added Sigel template

M	templates/misc-iso-templates.xml

commit 840201bf140c77b6594485d478b6ee130c9c72e8
Author: Jim Evins <evins@snaught.com>
Date:	2012-04-21

    Removed reference to unused screenshot.

    Fixes sourceforge bug #3514704
    (http://sourceforge.net/tracker/index.php?func=detail&aid=3514704&group_id=46122&atid=445116).
    Removed reference to unused/non-existant screenshot from
    help/Makefile.am.

M	help/Makefile.am

commit f208a3c2bbb3075c13970c6795a528481ba3d506
Author: Jim Evins <evins@snaught.com>
Date:	2012-04-21

    Fix incomplete library dependencies.

    Fixes Sourcforge bug #3514704
    (http://sourceforge.net/tracker/?func=detail&aid=3514704&group_id=46122&atid=445116).
    Added missing dependencies to pkg-config files for libglabels and
    libglbarcode.

M	libglabels/libglabels-3.0.pc.in
M	libglbarcode/libglbarcode-3.0.pc.in

commit 78a98cda1a6e2673bffdf0278fc0be9dc9926a10
Author: Joe Hansen <joedalton2@yahoo.dk>
Date:	2012-04-21

    Updated Danish translation

M	po/da.po

commit 4b6db420d7d21d8777c1d10738d89de16c520490
Author: Martin Srebotnjak <miles@filmsi.net>
Date:	2012-04-08

    Updated Slovenian translation

M	help/sl/sl.po

commit 2d8b64f7c2eb5ac29d1eedd1510960e0dc70ad8a
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2012-04-08

    Added Slovenian translation

M	help/sl/sl.po

commit 05b0564b40ca1cea67f6cd14459914b39ca2c69c
Author: Marek Černocký <marek@manet.cz>
Date:	2012-03-25

    Updated Czech translation

M	po/cs.po

commit c06983885014c9cbac39796e51637a27f2f4adfc
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-03-22

    Updated Spanish translation

M	po/es.po

commit 95bbe61fee30d144129f11ca842c87207f011b8a
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-03-18

    Hint about the  migration from gnome-doc-utils to itstool

M	TODO

commit d8504adf1ab5e18e31ec0093e72f72993fd78452
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-03-18

    Added missing xml files to Makefile.am

M	templates/Makefile.am

commit c3f389ba22c86ca1faaaa53342c9bc43bb000a8c
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-03-18

    [l10n] Updated German translation

M	po/de.po

commit 21278df5bdb4af4c7cc6f1a56110d7c4e3bcc8a9
Author: Marek černocký <marek@manet.cz>
Date:	2012-03-18

    Added new Igepa and Rayfilm templates

A	templates/igepa-templates.xml
A	templates/rayfilm-templates.xml
M	templates/vendors.xml

commit 0a70f1cea96245c5b80edd6a65506178ac2f86bd
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-03-18

    Added missing xml files to POTFILES.in

M	po/POTFILES.in

commit e20ef8e3fe1bd88f6eb1dfb0ca2da3691b10d648
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	2012-03-04

    Added Serbian translation

M	po/LINGUAS
A	po/sr.po
A	po/sr@latin.po

commit 094183af76ff377062bcaa213b4aeee41c23f2ec
Author: Jim Evins <evins@snaught.com>
Date:	2012-02-26

    Fix invalid schema file.

    Fixes Redhat bug 795241.  Fixes minor errors in schema file: child
    schema ids
    are incorrect.

M	data/schemas/org.gnome.glabels-3.gschema.xml.in.in

commit 8bb6ba804d0d9f91e31731451e258bb29cd6c025
Author: Jim Evins <evins@snaught.com>
Date:	2012-02-26

    More specific dependencies.

    Fixes bug 669899.  Added finer grain dependencies to libglabels and
    libglbarcode.

M	configure.ac

commit 9ebb9e62a91639b34878275a7d627ff39309326f
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-02-25

    Added Desmat template

M	AUTHORS
M	po/POTFILES.in
A	templates/desmat-templates.xml
M	templates/vendors.xml

commit 3893ab23a9e7210740d5a7ccf0e3d763e11048bf
Author: Marek Černocký <marek@manet.cz>
Date:	2012-02-17

    Updated Czech translation

M	po/cs.po

commit 181df0f23155c19818b250b0c970b5f16bb51e0c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-01-29

    Updated Spanish translation

M	help/es/es.po

commit a8d81b84d87266d5e2513068f7f8f316352b68ac
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-01-29

    Updated Spanish translation

M	po/es.po

commit a608963262d9ff192259c11fd4a9a6cb88706f11
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-01-29

    Updated Spanish translation

M	help/es/es.po

commit 24bca86c6e0ba5f68c4cfc00fd20bd525713194f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-01-29

    Updated Spanish translation

M	help/es/es.po

commit 76079b979a047260c5a1e58887d51a27c8c2a9d5
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-01-29

    Added new screenshots

M	help/C/figures/merge-ex3-2.png
M	help/C/figures/print-copies.png

commit ae661707369f6cd111c5f3bb3c36d464638fc6af
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-01-29

    Added new screenshot

M	help/C/figures/print-merge.png

commit 91c30c10aa65b0b42e67019628837c8f851592e1
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-01-29

    Added new screenshots to match the Adwaita style

M	help/C/figures/introduction-glabels-main-window.png
M	help/C/figures/merge-ex1-1.png
M	help/C/figures/merge-ex1-2.png
M	help/C/figures/merge-ex1-3.png
M	help/C/figures/merge-ex1-4.png
M	help/C/figures/merge-ex2-1.png
M	help/C/figures/merge-ex2-2.png
M	help/C/figures/merge-ex3-3.png
M	help/C/figures/merge-ex3-4.png
M	help/C/figures/object-editor-sidebar.png

commit 360168e7d2887b87895abcd2d58746be605bc054
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-01-29

    [l10n] Updated German translation

M	po/de.po

commit 3b5cfb6eef8bca1c48497f28729e8f08b3ccfbeb
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-01-28

    [i18n] Added missing file to POTFILES

M	po/POTFILES.in

commit 98d8954fffe00c2f48dc30d9191c0c9c27e7dba9
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-01-28

    [l10n] Updated German translation

M	po/de.po

commit 994c8afc198c67532661c0f89f0715dd74aaddbf
Author: Gaz Davidson <gaz@bitplane.net>
Date:	2012-01-28

    Added Q-CONNECT template

M	AUTHORS
M	templates/misc-iso-templates.xml
M	templates/vendors.xml

commit 5637571945adbadaaa8861364c751ec3045b0bee
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-01-28

    Added acknowledgement for new templates

M	AUTHORS

commit c14f227ddafe1f623a1f9c0978b11750a6aa3ede
Author: Marek Černocký <marek@manet.cz>
Date:	2012-01-28

    Added Endisch templates

A	templates/endisch-templates.xml
M	templates/vendors.xml

commit 6b7da2b054019e900df0bd248a518a5f5a3f99cf
Author: Marek Černocký <marek@manet.cz>
Date:	2012-01-28

    Added ISO 217 paper sizes

M	templates/paper-sizes.xml

commit c821271c41201e099f1f1d491a926d1aea9c22c0
Author: James Le Cuirot <chewi@aura-online.co.uk>
Date:	2012-01-22

    New text vertical alignment feature.

    Adds vertical alignment feature for text objects.
    Added appropriate icons (evins@snaught.com).

M	data/icons/22x22/Makefile.am
A	data/icons/22x22/actions/glabels-align-text-bottom.png
A	data/icons/22x22/actions/glabels-align-text-middle.png
A	data/icons/22x22/actions/glabels-align-text-top.png
M	data/icons/24x24/Makefile.am
A	data/icons/24x24/actions/glabels-align-text-bottom.png
A	data/icons/24x24/actions/glabels-align-text-middle.png
A	data/icons/24x24/actions/glabels-align-text-top.png
M	data/ui/object-editor.ui
M	data/ui/property-bar.ui
M	src/label-object.c
M	src/label-object.h
M	src/label-text.c
M	src/label.c
M	src/label.h
M	src/object-editor-private.h
M	src/object-editor-text-page.c
M	src/object-editor.c
M	src/str-util.c
M	src/ui-property-bar.c
M	src/xml-label.c
M	templates/glabels-3.0.dtd

commit 7734f6d7687226eec5b8a475d8c3519e276c24b7
Author: Marek Černocký <marek@manet.cz>
Date:	2012-01-20

    Fixed Czech translation

M	po/cs.po

commit 087096d9b5af32da26e09295d715033f9ebb700d
Author: Marek Černocký <marek@manet.cz>
Date:	2012-01-20

    Fixed Czech translation

M	help/cs/cs.po

commit 98c1a064c999c8df492495a3b0ab58822f2c92de
Author: Marek Černocký <marek@manet.cz>
Date:	2012-01-20

    Fixed Czech translation

M	help/cs/cs.po

commit 907418a0fc402afff06945f116486f06a7a46617
Author: Jim Evins <evins@snaught.com>
Date:	2012-01-07

    Fixed Avery 5160 template.

    Fixes bug 667239.  Fixed incorrect horizontal pitch and left edge
    measurements
    for the built-in Avery 5160 template.

M	templates/avery-us-templates.xml

commit d2abdcd5f0f635091b70d85e58ed814959399f8d
Author: Marek Černocký <marek@manet.cz>
Date:	2012-01-07

    Updated Czech translation

M	po/cs.po

commit 53e301fb7807be198532340335ca66c4cd335717
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	2012-01-04

    Updated Russian translation

M	help/Makefile.am
A	help/ru/ru.po

commit 3e9c5f5d8cbeff6e12ba18bc1705fbf822ca2ce5
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-12-28

    [l10n] Updated German translation

M	po/de.po

commit 0a0b2202aa9f849fe41951e9481ab67233cd6478
Author: Schlomo Schapiro <schlomoschapiro@users.sf.net>
Date:	2011-12-19

    Added new Avery template

M	AUTHORS
M	templates/avery-iso-templates.xml

commit 17e378b63644677ed7881cb30c864af051759329
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-11-27

    Added more Sheetlabels templates

M	templates/sheetlabels-us-templates.xml

commit a0261738f608c7b98281e0738e50ac67ed061900
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-11-27

    Moved Sheetlabels template to its own file

M	po/POTFILES.in
M	templates/misc-us-templates.xml
A	templates/sheetlabels-us-templates.xml

commit ae8c1d4bfaed6619ca8449cfc41a5b0f8aa9b8a6
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date:	2011-11-10

    Updated Esperanto translation

M	po/eo.po

commit bc995f4694d9b4196172ab17b60eaacdb78d89b1
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	2011-10-31

    Updated Russian translation

M	po/ru.po

commit 7e7ecc846195095e0d3fa095e6f7622e3655705c
Author: Jim Evins <evins@snaught.com>
Date:	2011-10-23

    Fixed incorrect clip region for rectangular templates.

M	src/cairo-label-path.c

commit 395cf5ad4720a50a4c50022b0589e3d2785da116
Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
Date:	2011-10-16

    Updated Russian translation

M	po/ru.po

commit 47d4822c631f154f7d92d024ade753381fcbc286
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	2011-10-08

    Updated French doc translation

A	help/fr/figures/glabels-template-cd-label.png
A	help/fr/figures/glabels-template-circle-label.png
A	help/fr/figures/glabels-template-ellipse-label.png
A	help/fr/figures/glabels-template-rect-label.png
A	help/fr/figures/introduction-glabels-main-window.png
A	help/fr/figures/merge-ex1-1.png
A	help/fr/figures/merge-ex1-2.png
A	help/fr/figures/merge-ex1-3.png
A	help/fr/figures/merge-ex1-4.png
A	help/fr/figures/merge-ex2-1.png
A	help/fr/figures/merge-ex2-2.png
A	help/fr/figures/merge-ex2-3.png
A	help/fr/figures/merge-ex2-4.png
A	help/fr/figures/merge-ex3-1.png
A	help/fr/figures/merge-ex3-2.png
A	help/fr/figures/merge-ex3-3.png
A	help/fr/figures/merge-ex3-4.png
A	help/fr/figures/object-editor-sidebar.png
A	help/fr/figures/print-copies.png
A	help/fr/figures/print-merge.png
A	help/fr/figures/skip-fields-output.png
A	help/fr/figures/skip-fields-screenshot.png
M	help/fr/fr.po

commit 4dfef01ff7629e7acf70d1eb1f5be228456100ee
Author: Bruce Dagel <bdagel@machlink.com>
Date:	2011-09-09

    Added SheetLabels label

M	AUTHORS
M	templates/misc-us-templates.xml
M	templates/vendors.xml

commit bc183301da0e6eca83d1e3d62635ead009e5c4ef
Author: Arnaud van Cortenbosch <arnaud.van.cortenbosch@ens.fr>
Date:	2011-09-09

    Added Agipa label

M	AUTHORS
M	templates/misc-iso-templates.xml

commit 9b724a1296adf22f2c38eaf5fff1ed5ca575178d
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	2011-08-26

    Updated Norwegian bokmål translation

M	po/nb.po

commit b49ec7326fbb1c56f9c587452f79ac73ae15bda4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-08-19

    [l10n] Updated German translation

M	po/de.po

commit a4e2886f44832c8f58f35313489da20fc1073b29
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-08-13

    Updated Spanish translation

M	po/es.po

commit 5166fd6aa4533de486d74937107025436a401ba0
Author: Marek Černocký <marek@manet.cz>
Date:	2011-08-09

    Updated Czech translation

M	po/cs.po

commit 9087da6d083e7dd9ad495a417958fcb7d66c39a1
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-08-04

    Added missing filename to POTFILES.in

M	po/POTFILES.in

commit 7d9129105d2599a87a4b49936940c2c9248bddfe
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-07-29

    Added Microapp template

A	templates/microapp-templates.xml
M	templates/vendors.xml

commit b613b24bc2fd8aceb6a9a391529691527a33d36f
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-07-23

    Updated filenamein man page

M	data/man/glabels-3.1

commit 35071c2addc324f51169de2d2b132d4f0afbdcf0
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	2011-07-18

    Updated Norwegian bokmål translation

M	po/nb.po

commit ae0f82fd1ac14890a6e3a928d66f289117eef5a0
Author: Marek Černocký <marek@manet.cz>
Date:	2011-07-04

    Updated Czech translation

M	help/cs/cs.po

commit fd3c17c7f04daa66d21624d3fcc759cb78f3c280
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-06-23

    Updated Spanish translation

M	help/es/es.po

commit 0540ee1ee8fb1b6ea4afbc6bc0d7b70585fe7c97
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-06-20

    [l10n] Updated German doc translation

M	help/de/de.po

commit 379225ae22948f662ae7b4e49bf5685e3a4c5197
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-06-20

    [l10n] Added note about multiple layout including example

A	help/C/figures/layouts-cdlabel.png
M	help/C/mancreate.page

commit fdfa831e34fd57b8b4f288f69e7deb6377fccbb9
Author: du baodao <centerpoint@139.com>
Date:	2011-05-23

    update zh_CN translation

M	po/zh_CN.po

commit ba95e14aecc5748b934c268c3c40eacaac2adf45
Author: Claude Paroz <claude@2xlibre.net>
Date:	2011-05-05

    Updated French translation

    Reapplied this commit.  I accidentally undid it when I merged the
    3.0 branch
    back onto master.

M	po/fr.po

commit 86c9519cd2ef47aeb8959f93871861c6f130818f
Author: Takeshi AIHANA <takeshi.aihana@gmail.com>
Date:	2011-05-21

    Updated Japanese translation.

M	po/ja.po

commit 9fa49670448efc62cc3546b2c0ec25ab780f05b2
Author: Jim Evins <evins@snaught.com>
Date:	2011-05-16

    Even more preparation for 3.0.0 release.

M	README
M	configure.ac

commit 2870c062a7b8dd81da439abda69509a91398d3ac
Author: Jim Evins <evins@snaught.com>
Date:	2011-05-16

    More preparation for 3.0 release

M	NEWS
M	libglabels/lgl-xml.h
M	templates/Makefile.am
M	templates/ascom-iso-templates.xml
M	templates/databecker-iso-templates.xml
M	templates/dataline-iso-templates.xml
M	templates/geha-iso-templates.xml
R099	templates/glabels-2.3.dtd	templates/glabels-3.0.dtd
M	templates/hama-iso-templates.xml
M	templates/jac-iso-templates.xml
M	templates/misc-iso-templates.xml
M	templates/pearl-iso-templates.xml

commit ed1bd711911a456e552297967754072345ebbda2
Author: Jim Evins <evins@snaught.com>
Date:	2011-05-21

    Preparation for 3.0 release.

M	Makefile.am
M	configure.ac
M	po/fr.po

commit 29073d4b56183bcb43dc859d17e7c079482e5a63
Author: Claude Paroz <claude@2xlibre.net>
Date:	2011-05-05

    Updated French translation

M	po/fr.po

commit 6a47b5cdab899590651b0abda7ad34e9f3bcd3e5
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-04-29

    Updated Spanish translation

M	po/es.po

commit ff1569ac39ceb866ead6394033376eff6d2bf940
Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
Date:	2011-04-25

    Updated Japanese translation

M	po/ja.po

commit 186d2516639549c56cb1f513932f23e08eb769bf
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/merge-ex2-1.png

commit 63747f9f9684a54cdff32474b8a228d3ab9d1d71
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/merge-ex1-1.png

commit 3307da9d369704bae244d9501975b6f90caec6c9
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/merge-ex3-1.png

commit 76ac17d3725ac4ed80e76b9c1e199ac5af80f146
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/merge-ex3-1.png

commit 1e5f1c5c5ecb5733dbfa29a9c81c68613c753c5a
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Czech screenshot

A	help/cs/figures/merge-ex3-1.png

commit b5f72ac136910eaa830b777a126c097595183df2
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech translation

M	po/cs.po

commit 43b1ee240a0eefdc0c30391d21bf0bf15fca0891
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/object-editor-sidebar.png

commit 986b010c2b29f4937ed0fa5bc4eb61704c8ac9e1
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/object-editor-sidebar.png

commit 677a726bcd9c8bcd55e573c35ba288c63c521598
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/skip-fields-screenshot.png

commit 1e9b39dad778cd4ebfac00372bd54f46e973ec09
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/skip-fields-screenshot.png

commit 15b8149e3d0c08e32554c2fe20a78eb53774cde6
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/print-merge.png

commit 6ca652b51d095de7e0eaa92bfeee0f230c3d1dca
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/print-copies.png

commit 91557a5e46e0ce14b5365212d9280d9e258141b5
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Unused Czech screenshot

D	help/cs/figures/main-window-empty.png

commit 47891355ecebefb5ae826a2a3f0dfba3a1386e63
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Czech screenshot

A	help/cs/figures/skip-fields-screenshot.png

commit 500279e89312f9ae2090a89a3feb24fc35b84c10
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-21

    Czech screenshot

A	help/cs/figures/skip-fields-output.png

commit 22acea090ca313b616ebb0c90fcf5846d3885447
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-21

    Updated Czech translation

M	help/cs/cs.po

commit e17dffc422199abd882d4448a4d8fe5672989636
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-19

    Updated Czech translation

M	help/cs/cs.po

commit bf73db190505f297c640bb76ccdde3895f613681
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-18

    Updated Czech translation

M	po/cs.po

commit edc606015a0252f66a57c332dd6524c48e2653d4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-04-17

    [l10n] Updated German translation

M	po/de.po

commit ec58a44af91d79d9be9fe63f7814327602ba5cd7
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-17

    Updated Czech translation

M	po/cs.po

commit 6141161e4a031f6b15de83379f6f690096eaa524
Author: Jim Evins <evins@snaught.com>
Date:	2011-04-16

    Reorganization of object alignment menus

    Object alignment menus have been reorganized and menu items renamed to
    remove any ambiguity as to what horizontal versus vertical alignment
    mean.  The new labels and organization attempt to be consistent with
    other graphic applications.

M	src/ui.c

commit 51b590ea08683c08ab39366970c140b1fc6f5eef
Author: Takayoshi OKANO <kano@na.rim.or.jp>
Date:	2011-04-14

    Updated Japanese translation

M	po/ja.po

commit 64d6190bf896630e8c1cafb61bd6132b3e453592
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-04-03

    Updated Spanish translation

M	help/es/es.po

commit 68d10df024493df3045b4a5ebbd88f76ddbb6f45
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-03-03

    Some corrections to the newest Kores template

M	templates/misc-iso-templates.xml
M	templates/vendors.xml

commit ae2c5aa93dcdc9f93de163c6d598373062b15669
Author: Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>
Date:	2011-03-03

    Added Korres template

M	AUTHORS
M	templates/misc-iso-templates.xml

commit 67785b3fe46e285c80b5c312aedcda7daff29192
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-27

    Updated Spanish translation

M	help/es/es.po

commit 66d2aa8ed705bbb573571e8ea16328cfbae56731
Author: Jim Evins <evins@snaught.com>
Date:	2011-02-26

    Don't require windowing system for glabels-batch.

    Use gtk_init_check() instead of gtk_init() to initialize GTK.

M	src/glabels-batch.c

commit 7e55002270dda25fc70c379be19396f449d5aa89
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-22

    Updated Spanish translation

M	help/es/es.po

commit bd3208b5cac24a8d6f231a72ed45bb0e73d1bb6e
Author: Jim Evins <evins@snaught.com>
Date:	2011-02-21

    Modified CSV parser.

    Modified CSV parser to more closely follow the format outlined in
    RFC 4180.
    The primary difference is that quoted text cannot be embedded in
    the middle
    of a field.  I.e. the quotes (") should envelope the entire field.
    Legacy
    "escape" rules still apply.

M	src/merge-text.c

commit 61a7ec1126f33c26dcb57fb3423df70df32b8e71
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-20

    Updated Spanish translation

M	help/es/es.po

commit 92192b1e5c37f4a0d2bdf363d80d0c380c4b56a4
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-20

    Updated Spanish translation

M	po/es.po

commit 7dd57e55560e8132dd9d251c640061bbfc235c32
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-14

    Added Avery template

M	AUTHORS
M	templates/avery-iso-templates.xml

commit d1ccf52d5d0ebdd533ad0692e5e375ee90444b63
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-12

    Added Merax template

M	AUTHORS
M	templates/misc-other-templates.xml
M	templates/vendors.xml

commit f9dd2935eefff13bbdcff719801feca62aa8c95a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-07

    Updated Spanish translation

M	help/es/es.po

commit 240cc08cb6b9a9350ea358fb4828f32a5001c16a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-06

    Updated Spanish translation

M	po/es.po

commit d0ec06d8c6f4ec8c3fa26fa946991aa5e904d162
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-05

    Updated Spanish translation

M	help/es/es.po

commit 8481ea582aa78a7973d8199062cb3737ad75b07e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-03

    [l10n] Added nl to DOC_LINGUAS

M	help/Makefile.am

commit f8d673a02c64aaffd27304d7b3a50cc26bf55754
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-03

    [l10n] Added initial Dutch doc translation to prevent translating
    actually untranslatable strings

A	help/nl/nl.po

commit 3840d11039df4c6834a4675d7e0a5b6a47ec5d7e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-03

    [l10n] Updated Dutch translation

M	po/nl.po

commit 3943dd1240c9a6ef449fccfd52e7302baf9c5ae4
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	2011-02-02

    Updated French doc translation

M	help/fr/fr.po

commit 124cff7d1682058043276ce0ee4845010e25b43a
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	2011-02-02

    Updated French Doc Translation

    Gérard Baylard and Bruno Brouard

D	help/fr/figures/main-window-empty.png
D	help/fr/figures/merge-ex1-1.png
D	help/fr/figures/merge-ex1-2.png
D	help/fr/figures/merge-ex1-3.png
D	help/fr/figures/merge-ex1-4.png
D	help/fr/figures/merge-ex2-1.png
D	help/fr/figures/merge-ex2-2.png
D	help/fr/figures/merge-ex2-3.png
D	help/fr/figures/merge-ex2-4.png
D	help/fr/figures/object-editor-sidebar.png
D	help/fr/figures/print-copies.png
D	help/fr/figures/print-merge.png
M	help/fr/fr.po

commit 0bd38baa90a0f44b58d90bb4c02abd73b84f0f51
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-01-29

    [l10n] Updated German translation

M	po/de.po

commit ddbff2b17acd43e4e9c67a40158c4d884a8d611e
Author: Marek Černocký <marek@manet.cz>
Date:	2011-01-29

    Updated Czech translation

M	po/cs.po

commit 94e5539014882d3974c84eef6b2fa13acf60dbe1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-27

    Updated Spanish translation

M	help/es/es.po

commit 63cb045c9cc3abbe2af6a62166b891a417ce17f8
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-27

    Updated Spanish translation

M	po/es.po

commit c839157ab3638b4935a8a4021855515d83b07f2b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-01-26

    Added acknowledgement for template submission

M	AUTHORS

commit 714ed64ebe1bef13073168e78b9a9a86bb2588dc
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-01-26

    Added Brother template, changed obsolete part numbers

M	templates/brother-other-templates.xml

commit cb3d9f9aa69b717f6f6d2870b2eb7aa9bc37215a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-19

    Updated Spanish translation

M	help/es/es.po

commit 6c28e77fb42ad477370cdd4e104c2a05981951f3
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-16

    Updated Spanish translation

M	po/es.po

commit ebe69bb2755eef349159e9ccfbdc34c1906038e1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-13

    Updated Spanish translation

M	help/es/es.po

commit 69517f49cd41645693dc186f791a7a32203d92ba
Author: Wouter Bolsterlee <wbolster@gnome.org>
Date:	2011-01-08

    Added Dutch translation by Mario Blättermann and Hannie Dumoleyn

M	po/LINGUAS
A	po/nl.po

commit 9b82ba17efaef7634a4be9fef0dd90313ed8e3b1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-06

    Updated Spanish translation

M	help/es/es.po

commit 87b856938c42a25544aa0d7fcc93ad34f008e935
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-03

    Updated Spanish translation

M	help/es/es.po

commit b4de56df5fa411a7e79333ab4df8e3f2422be099
Author: Jim Evins <evins@snaught.com>
Date:	2011-01-03

    More preparation for 2.3.1

M	NEWS

commit bb1bd1a68c5d188ccad3c0fd49a65b5d57566e96
Author: Claude Paroz <claude@2xlibre.net>
Date:	2011-01-02

    Updated French translation

M	po/fr.po

commit 4d5ca3f941c77b9a2a8829dd6748e3a063072317
Author: Joe Hansen <joedalton2@yahoo.dk>
Date:	2011-01-02

    Updated Danish translation

M	po/da.po

commit 40710db147d8b45e7aea4fe050bf0fec909e80ba
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-01-02

    [l10n] Updated German doc translation

M	help/de/de.po

commit 8fe15148b83c12d1f67631198edc1d83393f1b99
Author: Jim Evins <evins@snaught.com>
Date:	2011-01-01

    Preparation for 2.3.1

M	configure.ac

commit 378e18ebc7c08075fa0d66abc136335d9d1ab4dd
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-29

    Updated Spanish translation

M	help/es/es.po

commit 677ce8eedc473d132ca15fef0e92d8d7dcfe1003
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-27

    Some cleanup of built-in barcode code.

    - Validate data rather than filtering it into something canonical
    - Reconcile style and design patterns between all built-in backends

M	libglbarcode/lgl-barcode-code39.c
M	libglbarcode/lgl-barcode-onecode.c
M	libglbarcode/lgl-barcode-postnet.c

commit e23b1e0e460896905eed8c4c8c1ce7dc4a06b6d6
Author: Petr Kovar <pknbe@volny.cz>
Date:	2010-12-27

    Update Czech translation by Marek Cernocky

    Reviewed by Petr Kovar.

M	po/cs.po

commit 73897c1e98299fff6a935757ede72b32cb838637
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-26

    Updated help screenshots.

    Updated screenshots in help to be consistent with current development
    version of glabels.  Updated help text to be consistent with the new
    screenshots.

M	help/C/editprop.page
M	help/C/figures/introduction-glabels-main-window.png
D	help/C/figures/main-window-empty.png
M	help/C/figures/merge-ex1-1.png
M	help/C/figures/merge-ex1-2.png
M	help/C/figures/merge-ex1-3.png
M	help/C/figures/merge-ex1-4.png
M	help/C/figures/merge-ex2-1.png
M	help/C/figures/merge-ex2-2.png
M	help/C/figures/merge-ex2-3.png
M	help/C/figures/merge-ex2-4.png
A	help/C/figures/merge-ex3-1.png
A	help/C/figures/merge-ex3-2.png
A	help/C/figures/merge-ex3-3.png
A	help/C/figures/merge-ex3-4.png
M	help/C/figures/object-editor-sidebar.png
M	help/C/figures/print-copies.png
M	help/C/figures/print-merge.png
M	help/C/merge-ex1.page
M	help/C/merge-ex2.page
M	help/C/merge-ex3.page

commit 2fde09a614399ab805e94b036ac367beaa5a16c9
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-24

    Fix crash when encountering an invalid barcode backend

    A file may have been saved from an instance of glabels that had
    a backend
    enabled that is not enabled in the current instance of glabels.
    This fix
    accounts for this.	It is also possible that the glabels file
    was created
    manually with an invalid backend ID or a typo.

M	src/bc-backends.c
M	src/bc-backends.h
M	src/xml-label.c

commit a0156d27b51928bea9acda121ab616a571b47836
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-24

    Updated Spanish translation

M	help/es/es.po

commit 4967753a46173c4123e9cd958b2d1af0076be352
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-24

    Updated Spanish translation

M	po/es.po

commit fb9fc961547a370f916b4a263d8ecca3d39077d4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-23

    Some ideas for the future

M	TODO

commit 1df0cd9751734cc89f71f849ecb434f8804633c1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-23

    Updated Spanish translation

M	help/es/es.po

commit cfd6986162064bb23ef223372735c9dfc2b140a7
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-23

    Updated Spanish translation

M	po/es.po

commit 78173bdf8d3a32bb7d7c01567c47a3c0a7200f57
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-22

    Updated Spanish translation

M	help/es/es.po

commit 3d0f7724236b654adf326a926837428bba8d09d0
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-22

    Updated Spanish translation

M	po/es.po

commit 91dae28aba1ee42a015a2d5594d6f916affaa957
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-22

    Added Dataline templates

M	templates/dataline-iso-templates.xml

commit c88852dd70f0ac735515cc9cc26ab1803a257832
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-22

    Added JAC templates

M	po/de.po
M	templates/jac-iso-templates.xml

commit 4d3bc4e4a59890004ec9d0eb7964e37f26813208
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-21

    [l10n] Updated German translation

M	po/de.po

commit 3f0a08e40ffb1efa553a8cfd3fdf55cb1f821c98
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-21

    Added Hama templates. Hama is now fully covered.

M	templates/hama-iso-templates.xml

commit 7db09dd9f349eba5e276fe0f2c4795339320504e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-20

    Removed comment which prevents intltool from running properly

M	templates/meritline-us-templates.xml

commit 4a60da1dfe64df62cc7b8b01d709deeb893b1a5f
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-20

    Added Meritline templates

M	po/POTFILES.in
M	templates/Makefile.am
A	templates/meritline-us-templates.xml
M	templates/misc-us-templates.xml

commit 8c1f05cfb999c20d1cc8821fa60d8ad68568ba9c
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-20

    Moved Dataline template to its own file

M	po/POTFILES.in
M	templates/Makefile.am
A	templates/dataline-iso-templates.xml
M	templates/misc-iso-templates.xml
M	templates/vendors.xml

commit 554266756a638ad0ee161decfe07bb86b8bc4b3f
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-19

    Fix vertical expansion of various widgets

    Gtk3 has new behavior for expansion of widgets. This commit turns
    off vertical
    expansion for various widgets created with builder UI files.
    These properties
    have been added manually to these files, so they could be easily
    wiped out
    by editing them with glade.

M	data/ui/object-editor.ui
M	data/ui/print-op-dialog-custom-widget.ui

commit 4f37ea189b9cc80ef25d608c024273a345970722
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-19

    Some coding style cleanup.

M	libglabels/lgl-template.h
M	libglabels/lgl-units.h
M	libglbarcode/lgl-barcode-render-to-cairo.c
M	libglbarcode/lgl-barcode.h
M	src/bc-builtin.c
M	src/bc-gnubarcode.c
M	src/bc-iec16022.c
M	src/bc-iec18004.c
M	src/bc-zint.c
M	src/color-combo-button.c
M	src/color-combo-color-menu-item.c
M	src/color-combo-menu.c
M	src/color-combo.c
M	src/color-history-model.c
M	src/color-swatch.c
M	src/debug.h
M	src/field-button-menu.c
M	src/field-button.c
M	src/font-combo-menu-item.c
M	src/font-combo-menu.c
M	src/font-combo.c
M	src/font-history-model.c
M	src/font-sample.c
M	src/label-barcode.c
M	src/label-box.c
M	src/label-ellipse.c
M	src/label-image.c
M	src/label-line.c
M	src/label-object.c
M	src/label-object.h
M	src/label-text.c
M	src/label.c
M	src/media-select.c
M	src/merge-evolution.c
M	src/merge-properties-dialog.c
M	src/merge-text.c
M	src/merge-vcard.c
M	src/merge.c
M	src/merge.h
M	src/message-bar.c
M	src/mini-label-preview.c
M	src/mini-preview.c
M	src/new-label-dialog.c
M	src/object-editor.c
M	src/prefs-dialog.c
M	src/prefs-model.c
M	src/print-op-dialog.c
M	src/print-op.c
M	src/print.c
M	src/template-designer.c
M	src/template-history-model.c
M	src/ui-property-bar.c
M	src/ui-sidebar.c
M	src/view.c
M	src/view.h
M	src/wdgt-chain-button.c
M	src/window.c
M	src/xml-label.h

commit 791f29c01c646eaebc443c5220405d399b6082cb
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-18

    Coding style cleanup.

M	libglabels/lgl-category.c
M	libglabels/lgl-category.h
M	libglabels/lgl-db.c
M	libglabels/lgl-paper.c
M	libglabels/lgl-paper.h
M	libglabels/lgl-str.c
M	libglabels/lgl-template.c
M	libglabels/lgl-template.h
M	libglabels/lgl-units.c
M	libglabels/lgl-units.h
M	libglabels/lgl-vendor.c
M	libglabels/lgl-vendor.h
M	libglabels/lgl-xml-category.c
M	libglabels/lgl-xml-paper.c
M	libglabels/lgl-xml-template.c
M	libglabels/lgl-xml-template.h
M	libglabels/lgl-xml-vendor.c
M	libglabels/lgl-xml.c
M	libglabels/lgl-xml.h

commit 5c6f4d559896d7290d8877651d60010eefc1c6bb
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-18

    Renamed libglabels source files to have "lgl-" prefix.

    Improve odds that source files (headers in particular) remain
    unique.

M	docs/libglabels/libglabels-3.0-sections.txt
M	libglabels/Makefile.am
R096	libglabels/category.c	libglabels/lgl-category.c
R095	libglabels/category.h	libglabels/lgl-category.h
R099	libglabels/db.c libglabels/lgl-db.c
R097	libglabels/db.h libglabels/lgl-db.h
R097	libglabels/paper.c	libglabels/lgl-paper.c
R096	libglabels/paper.h	libglabels/lgl-paper.h
R098	libglabels/str.c	libglabels/lgl-str.c
R094	libglabels/str.h	libglabels/lgl-str.h
R099	libglabels/template.c	libglabels/lgl-template.c
R099	libglabels/template.h	libglabels/lgl-template.h
R098	libglabels/units.c	libglabels/lgl-units.c
R096	libglabels/units.h	libglabels/lgl-units.h
R096	libglabels/vendor.c	libglabels/lgl-vendor.c
R095	libglabels/vendor.h	libglabels/lgl-vendor.h
R097	libglabels/xml-category.c	libglabels/lgl-xml-category.c
R092	libglabels/xml-category.h	libglabels/lgl-xml-category.h
R097	libglabels/xml-paper.c	libglabels/lgl-xml-paper.c
R092	libglabels/xml-paper.h	libglabels/lgl-xml-paper.h
R099	libglabels/xml-template.c	libglabels/lgl-xml-template.c
R094	libglabels/xml-template.h	libglabels/lgl-xml-template.h
R096	libglabels/xml-vendor.c libglabels/lgl-xml-vendor.c
R092	libglabels/xml-vendor.h libglabels/lgl-xml-vendor.h
R099	libglabels/xml.c	libglabels/lgl-xml.c
R096	libglabels/xml.h	libglabels/lgl-xml.h
M	libglabels/libglabels-private.h
M	libglabels/libglabels.h
M	po/POTFILES.in

commit a20a5bbf88612bd6ef88e7eeb022fca824905da8
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-18

    Fixed potential memory leak.

M	libglbarcode/lgl-barcode-code39.c

commit 429d875df7f9ed902b5a15d017e37eef49336326
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-17

    Updated Southworth template

M	templates/misc-us-templates.xml

commit 38e921a6bcc6a016accbdb6337f26df5244c4e62
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-17

    Updated Sigel template

M	templates/misc-iso-templates.xml

commit 303ba997361a9d120a4cb91246811e7f9502bcba
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-17

    Added Sigel template

M	templates/misc-iso-templates.xml

commit 39b99eeb9bc19230899c9bc7014198f8bfebe1c6
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-17

    Added note about DECAdry templates

M	templates/decadry-iso-templates.xml

commit 5dcf1c0c74a81c457207ce1ddfa7768a70e7c5ff
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-17

    Added a product_url

M	templates/misc-us-templates.xml

commit 1a5eccae2505e61059f59be8774b252548a6491c
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-17

    Added Ascom templates

M	templates/ascom-iso-templates.xml

commit 3bcf37e19f90aaa61ae5a0b2092583c438c4973e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-17

    Added Ascom file

A	templates/ascom-iso-templates.xml

commit 2b1ed215968487da9ac7c0ceb7123028a8729b6e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-17

    Moved Ascom template to its own file

M	po/POTFILES.in
M	templates/Makefile.am
M	templates/misc-iso-templates.xml

commit ac9f784be20aa4878cf45ceefb7f9a6d23568301
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-15

    Updated Spanish translation

M	po/es.po

commit 01be49583ebeab6d38905fd6c08e6db614bdcdba
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-13

    Added Herma templates

M	templates/herma-iso-templates.xml

commit 1c923cfa68fb0277fd732fa870ca89a67916d21a
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-12

    [l10n] Updated German translation

M	po/de.po

commit 4ebb369584f6ae3efa6db7a95b32514c1cfa00e4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-12

    Added hint about Ascom labels

M	templates/misc-iso-templates.xml

commit ed47bfc6fecd57b6db3b1f1903c4dd60925a6cb7
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-12

    Added Ascom URL

M	templates/vendors.xml

commit 86b68f3318b926e1873bd5832b932975368bc11a
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-11

    Cleanup of ui files.

    Regenerated ui files using glade from jhbuild.

M	data/ui/media-select.ui
M	data/ui/merge-properties-dialog.ui
M	data/ui/new-label-dialog.ui
M	data/ui/object-editor.ui
M	data/ui/prefs-dialog.ui
M	data/ui/print-op-dialog-custom-widget.ui
M	data/ui/property-bar.ui
M	data/ui/template-designer.ui

commit 5860b2b1dc85039d79a40502c2b3fa7e4843d7ee
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-11

    Updated Spanish translation

M	po/es.po

commit 0e29ea75a7daf3d3b1adc40aa5348adbdafc428c
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-11

    Make all g_warning and g_message untranslatable

M	libglabels/template.c
M	libglabels/xml-template.c

commit 8963061c3080ead1a2000f829d506f6d510943bf
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-10

    Disconnect prefs changed callback when destroying view.

    This fixes a crash when changing prefs after deleting a window.

M	src/view.c

commit c6ccdd681e8f32471c0cb51030869416d7534d45
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-10

    Removed duplicate template

M	templates/herma-iso-templates.xml

commit 4f12b28e6f0d77a360b74ee57db15612cafbf098
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-10

    Make all g_warning and g_message untranslatable for better bug
    handling

M	src/merge-evolution.c
M	src/xml-label-04.c
M	src/xml-label.c

commit 5bd9bc4fc3b3ab019b8e290d7ae48bd3a63cd320
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-09

    Cleanup some '-Wall' warnings.

M	libglabels/db.c
M	src/color-swatch.c
M	src/font-sample.c
M	src/label-barcode.c

commit 90b87092927aa6b706a7a220b81cf8ef14e81e48
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added more Herma templates

M	templates/herma-iso-templates.xml

commit d1e3f397bb25c41ee43584c7929a3d976b9dbdae
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    [l10n] Updated German translation

M	po/de.po

commit 318d394fed4e29e0793d3467f057b850185a28b8
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added more Hama templates

M	templates/hama-iso-templates.xml

commit bc208ecf065133508b0d121ce3aab2bd2d4c3df2
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added missing underscore

M	templates/jac-iso-templates.xml

commit 345ff45db2e8c21a4e8df1243ae96960cd46e49a
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    [l10n] Updated German translation

M	po/de.po

commit 9eaaa7570f8290b890f546f4c20625fe2f50dd44
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added more Hama templates

M	templates/hama-iso-templates.xml

commit f8a50b04009496d09fabfb418e91ae15c648c38d
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Fixed bug in Geha templates

M	templates/geha-iso-templates.xml

commit 2ebcd4192a7fcb70e4b0a778b3902c4e524af991
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    [l10n] Updated German translation

M	po/de.po

commit 2edf2ba85b43199407eea3a1421b9c5d6ea0a4bd
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added some equivalent templates

M	templates/hama-iso-templates.xml

commit 4bd003abfb60e80544e6d824dfccf2d7cbc1ac2a
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added more Hama products, added a new category »photo« and assigned
    it to some products

M	help/C/mancreate.page
M	templates/categories.xml
M	templates/geha-iso-templates.xml
M	templates/hama-iso-templates.xml
M	templates/pearl-iso-templates.xml

commit 36f4649ebd535aae1cbeb43553d04434fc1d806f
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added Hama template page

A	templates/hama-iso-templates.xml

commit 0c6ebf2102d079a4480ba06aaf1842f71e1a234a
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Initial page for Hama templates

M	po/POTFILES.in
M	templates/Makefile.am
M	templates/jac-iso-templates.xml
M	templates/vendors.xml

commit a125051c16605b2247acd7b539897c491e296edd
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added hint about data for creating Geha templates

M	templates/geha-iso-templates.xml

commit e9f7e82b1c50b54c3556db73c2d0d240ffb91171
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    [l10n] Updated German translation

M	po/de.po

commit f79686873af4021a7c794e5830c9ae08f81bf0f8
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added missing underscores for translations

M	templates/geha-iso-templates.xml

commit 39731183520b9da4382589c8857cba02190c1450
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added new Geha template. All current Geha templates are now present.

M	templates/geha-iso-templates.xml

commit c89c44f2580acde5cf1f00ac0ea3d21c04de9b9c
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Added lost OMF file again

A	help/glabels.omf.in

commit f5c5ab05261c857f5c5730dab51a47e06c3890f9
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    Reorganized the PEARL templates

M	templates/pearl-iso-templates.xml

commit ddcfb2dc3030a9fd3a3baf31b7c044b3ee5ce842
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-09

    [l10n] Updated German doc translation

M	help/de/de.po

commit 81d3f3f11939e6feba33cfe6db56529e2ed7f2fd
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-07

    Cleanup of "Manually creating new templates" page.

M	help/C/mancreate.page

commit 02525ecebbfac77a732cf30354f00da86a10aef1
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-07

    Removed duplicate meta tag

M	templates/geha-iso-templates.xml

commit eac7f6ae1d9aa4059d7f5955fa7be1627d5b3170
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-07

    [l10n] Updated German translation

M	po/de.po

commit 9429e4d84e437e5996e4f9d3841eb98fca91f567
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-07

    Added more Geha templates

M	templates/geha-iso-templates.xml

commit 0dc2f0a1cfcef51429248c80522723a1a5a0b71b
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-07

    Optimize loading of barcode styles.

    Only load barcode styles into object editor combo box if backend
    ID has
    changed.  Otherwise, skip loading.	This seems to be a very expensive
    operation and would manifest itself as sluggish resizes of barcodes.

M	src/object-editor-bc-page.c
M	src/object-editor-private.h
M	src/object-editor.c

commit 01b6f0b41fc8ab4f24f3bbb49daeb9d537c53189
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-07

    Some optimization of barcode updates.

    Keep a cached copy of the display glBarcode, so that it does not
    need to be
    regenerated on every update.

M	src/label-barcode.c
M	src/label-object.c
M	src/label-object.h

commit c64827154b26e3cae7ba3f60e175ca38e242e2bd
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-07

    Optimized the handling of moved objects.

    Created a separate "moved" signal for objects, so that we don't
    waste time
    updating unrelated controls in the object editor.  This currently
    is most
    visible with barcode objects.

M	src/label-object.c
M	src/label-object.h
M	src/label.c
M	src/object-editor.c

commit 6e818159dd6c0f7107c9ecac8fcebb44bdbb1ad4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-06

    Added missing filename to POTFILES.in

M	po/POTFILES.in

commit 1be777aae8bae2c1119b0cb5829f2da801548e45
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-06

    Added more Geha templates

M	templates/geha-iso-templates.xml

commit 63ac5e48f813c53f5b3b8bf698ae01c72daa9be3
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-06

    Moved Geha template to its own file

M	templates/Makefile.am
A	templates/geha-iso-templates.xml
M	templates/misc-iso-templates.xml

commit 4b278cb83e512bdc271373e152018f17e980baae
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-05

    Created smaller logo for manual title.

M	help/C/figures/glabels-logo.png

commit cd75de36caeb263c82800231e2510f1cabadc04c
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-05

    Cleanup of some documentation artifacts.

    - Removed omf file from help/.
    - Removed docs/libgl*/tmpl/libgl*-unused.sgml which are automatically
    generated.
    - Removed documentation refs to lgl_db_get_template_list_unique()
    which has
      been recently removed from libglabels.
    - Updated .gitignore.

M	.gitignore
M	docs/libglabels/libglabels-3.0-sections.txt
M	docs/libglabels/tmpl/db.sgml
D	docs/libglabels/tmpl/libglabels-3.0-unused.sgml
D	docs/libglbarcode/tmpl/libglbarcode-3.0-unused.sgml
D	help/glabels-3.0.omf.in
M	libglabels/db.c

commit 60519e8f9b7be15d5988b03c1a95cea45ca00657
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-05

    [l10n] Updated German doc translation

M	help/de/de.po

commit 4e51ab44ec19ac818a5b8d36f2720d1469c20f7c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-05

    Updated Spanish translation

M	help/es/es.po

commit 5bdab116303bdcdc011657030a3813c364e319ed
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-05

    Fixed wrong template numbers

M	templates/herma-iso-templates.xml

commit 350bb1773bd34fb92c111e231d774ea173615594
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-04

    Search both ~/.glabels and ${XDG_CONFIG_HOME}/libglabels/templates.

    Keep ~/.glabels as an alternate location for user defined templates.
    This
    directory would hold manually created templates as well as template
    designer
    templates from previous versions.  The new template designer will
    manage
    its templates in ${XDG_CONFIG_HOME}/libglabels/templates.

M	libglabels/db.c
M	libglabels/template.c
M	libglabels/xml-template.c

commit f20a898ceef00151fd13afbf04c6961cff39ffe9
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-04

    Added namespace declaration

M	help/C/mancreate.page

commit ff2e814d1014d59ee701a8d6f47df81fe782eeb4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-04

    Added its: to the untranslatable strings

M	help/C/mancreate.page

commit d086e015fc2e516ac10bcf2915e36164acf03afa
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-04

    Added markup for non-translatable items

M	help/C/mancreate.page

commit 9f338207d5ec3a847a65d191c44e78055b3983df
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-04

    Removed artifact of template aliases.

M	libglabels/db.c
M	libglabels/db.h
M	src/mini-preview-pixbuf-cache.c

commit dc41a686c30e7e80eb3e54cacba4c2af94e678f8
Author: Jim Evins <evins@snaught.com>
Date:	2010-12-03

    Add some selection slop to barcode and text objects

    Add a 4 pixel slop area around barcode lines and text glyphs in
    object_at
    methods of barcode and text objects.  This will hopefully make
    selecting
    these objects less frustrating while still allowing selection of
    background
    objects through the negative space of these objects.

M	src/label-barcode.c
M	src/label-text.c

commit 17fbc0ff3528298065c3df6dce0f38bfd8972899
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-02

    Updated Spanish translation

M	help/es/es.po

commit 952e6c14ad7a544a6bf820801fa40fb7b6b222b2
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-12-02

    Updated Spanish translation

M	help/es/es.po
M	po/es.po

commit ffaf06a95c635ef26335da26d63a74511068e03c
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-02

    [l10n] Some cleanup

M	help/de/de.po

commit c3ef406eccdd4eb9d6e5651c72766a0292ab1d57
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-02

    [l10n] Updated German doc translation

M	help/de/de.po

commit cccabeafc0c73e4ec1698bb9569f03621a58af71
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-02

    Fixed typo

M	help/C/multifile.page

commit 5f1338e0bb4df1ac40b26b89c6c49a319de94287
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-02

    Made email links clickable

M	help/C/about.page
M	help/C/mancreate.page

commit 3e42b1117fb1c4251a22873436412f9e07c5e7c1
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-01

    [l10n] Updated German doc translation

M	help/de/de.po

commit 4ea2ba2bcf00a753ee4e061af1bd8b02742f6753
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-01

    Added note about available categories

M	help/C/mancreate.page

commit cae9d526245a50b945404d0fffa4722a33323a0b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-01

    Added new template equivalents again

M	templates/herma-iso-templates.xml

commit 6dc9e7bcbac90c94e3af34eabcabe08e3abeceb5
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-12-01

    Added new template equivalents

M	templates/herma-iso-templates.xml

commit a82d4a9a8badd982f39b0a16b52c1459c3604390
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-30

    [l10n] Updated German translation

M	po/de.po

commit 5447097d6fb8b640873327611f607f1fbab82bb6
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-30

    Added new category and assigned some templates to this category

M	templates/categories.xml
M	templates/pearl-iso-templates.xml

commit ace7ef5e6b10569d736ad2cdf4718b6aeab5198c
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-30

    [i18n] Added new templates and some cleanup

M	templates/herma-iso-templates.xml

commit 1c5a40ac06c7fd9f809974784c83205af2890a38
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-30

    [i18n] Added new templates

M	templates/herma-iso-templates.xml

commit 0dfe4457223fae2d4b21c758fde905d4f8e78ea3
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-28

    Fixed malformed XML file.

M	templates/misc-iso-templates.xml

commit 043939ac8cf4396319cec17b871d9f4c891a34ab
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-27

    Added more templates

M	templates/herma-iso-templates.xml

commit f3c77ad8a3482627572448d65df2e756763c9e90
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-27

    Moved DataBecker templates to their own file, added one more template

M	po/POTFILES.in
M	templates/Makefile.am
A	templates/databecker-iso-templates.xml
M	templates/misc-iso-templates.xml

commit d48275b51809ebfc4aa926e311470e0d8032e067
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-27

    Added URL tooltips to links.

M	src/new-label-dialog.c

commit 30916207aa15fde60417267c059340d88a193602
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-11-27

    Updated Spanish translation

M	help/es/es.po

commit ec3dbcf7eaf48d6f9ec266075fdf67d54011c23f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-11-27

    Updated Spanish translation

M	po/es.po

commit f8095371bfa8914605162aa3ea34fd99cd4ad8cc
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-27

    Improve selection of barcode objects.

    Allow selection of barcode objects by clicking on the alternate
    text when
    a valid barcode cannot be displayed.

M	src/label-barcode.c

commit 7c8701b3c9063510e362d8a0a786976ddca570e7
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-26

    Fixed problem with creation of 1st barcode, again.

    Previous fix only temporarily masked the problem.  The problem is that
    the first time the barcode tabs are made visible, the digits spin
    button
    would emit a "changed" signal.  The fix is to connect to the
    "value-changed"
    signal instead.

    This commit also includes replacing the stop_signals flag with
    explicit
    signal blockers.

M	src/object-editor-bc-page.c
M	src/object-editor-data-page.c
M	src/object-editor-fill-page.c
M	src/object-editor-image-page.c
M	src/object-editor-line-page.c
M	src/object-editor-lsize-page.c
M	src/object-editor-position-page.c
M	src/object-editor-private.h
M	src/object-editor-shadow-page.c
M	src/object-editor-size-page.c
M	src/object-editor-text-page.c
M	src/object-editor.c

commit c0905027d4dd2667ed738c6679fdf657e9d4cf40
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-26

    [l10n] Updated German translation

M	po/de.po

commit ab4e9596763ea64304efc2fe962344b5cc61587c
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-26

    Added note to template designer.

    Added note to template designer about the possibility of more
    than 2 layouts.

M	data/ui/template-designer.ui

commit aae747108292ab75611e891ffecfcad89382ccdc
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-26

    [l10n] Updated German translation

M	po/de.po

commit ed3c4f8c1e2df4b740698425a15a3ad8080c5335
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-26

    Added Sattleford VM-6084 label, added new category for elliptical
    labels

M	templates/categories.xml
M	templates/pearl-iso-templates.xml

commit 63396b3df293ba68fbe6a2507b97e74201c1794f
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-26

    Added more vendor definitions and URLs

M	templates/vendors.xml

commit 3cae5b04317e8b1ad5069bee713254b5c4f51125
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-26

    [l10n] Updated German translation

M	po/de.po

commit 30419b26c459fd1a9339c1c8a0341fc43ea7308f
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-25

    Cleanup of build system.

    - 'make distcheck' is now successful
    - Removed several old artifacts

M	.gitignore
M	Makefile.am
M	configure.ac
M	data/desktop/Makefile.am
M	data/mime/Makefile.am
M	po/POTFILES.in
A	po/POTFILES.skip
M	src/Makefile.am

commit f9d15efd6543ae69c821010751ef960d97877349
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-25

    Remove deprecated alias node support for templates.

    Removed support for the "Alias" node in templates.	For backwards
    compatibility alias nodes will be skipped over.  This greatly
    simplifies
    the iteration through the template database, since all templates are
    fully realized.

M	docs/libglabels/libglabels-3.0-sections.txt
M	docs/libglabels/tmpl/db.sgml
M	docs/libglabels/tmpl/libglabels-3.0-unused.sgml
M	docs/libglabels/tmpl/template.sgml
M	help/C/mancreate.page
M	libglabels/db.c
M	libglabels/template.c
M	libglabels/template.h
M	libglabels/xml-template.c
M	src/mini-preview-pixbuf-cache.c
M	templates/glabels-2.3.dtd

commit 5003bd33e74c1de3fbe3dd7b5b206aff61f78658
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-25

    Cleanup of template database.

    - Alphabetized the templates in the misc-*-templates.xml files.
    - Replaced the last of the deprecated "Alias" tags.
    - Added TODO comments for questionable part #s and vendors.

M	templates/avery-iso-templates.xml
M	templates/misc-iso-templates.xml
M	templates/misc-other-templates.xml
M	templates/misc-us-templates.xml

commit 79dbb3d7444f6fc13d114dbf4cc7070ced271398
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-24

    Cleanup of template database.

    - Moved "DECAdry" templates to their own file.
    - Replaced some deprecated "Alias" tags.

M	po/POTFILES.in
M	templates/Makefile.am
M	templates/avery-iso-templates.xml
A	templates/decadry-iso-templates.xml
M	templates/misc-iso-templates.xml
M	templates/zweckform-iso-templates.xml

commit 71819034a8140dcad8731d9095f018d683b27340
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-24

    Cleanup of template database.

    - Moved "Herma" templates to their own file.
    - Replaced some deprecated "Alias" tags.

M	po/POTFILES.in
M	templates/Makefile.am
M	templates/avery-iso-templates.xml
A	templates/herma-iso-templates.xml
M	templates/misc-iso-templates.xml
M	templates/zweckform-iso-templates.xml

commit 9c7681dc51320c27dab08bea3f89c3fbc45946a4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-22

    Added new template file to POTFILES.in

M	po/POTFILES.in

commit f5cfd2233e03d2d2b0d3f4fee300ad3da2f9ca17
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-21

    Added new template file to Makefile.am

M	templates/Makefile.am

commit 3b110fd933a9ab9f666b74e22af9c33827c23a4e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-21

    Removed product_url from JAC templates and added it to vendors.xml

M	templates/jac-iso-templates.xml
M	templates/vendors.xml

commit 6971f7336af7c5dbfa3fd6a329e7e483983915b2
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-21

    Fixed misplaced tags in JAC templates

M	templates/jac-iso-templates.xml

commit 0a8ecfa00185f5cd5a90a01955e26870b48169bf
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-21

    Moved JAC templates to their own file

A	templates/jac-iso-templates.xml
M	templates/misc-iso-templates.xml

commit 702554106de4ada46d566028a0f768ed6582e88b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-21

    [l10n] Updated German doc translation

M	help/de/de.po

commit 0586a73c43cda8e82f0198e61164d86b15391452
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-21

    [l10n] Updated German translation

M	po/de.po

commit 2391bd0de7d31abc0a3bb5bdf95ae6481e4275eb
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-21

    Added confirmation dialog to custom template delete button.

M	src/media-select.c

commit a35071a7dd2b561b6cf479c46639fa62fbefb045
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-20

    Fixed problem with creation of 1st barcode.

    A change signal is apparently being delayed until the actual widget is
    being realized as a result of the gtk_widget_show of the object editor
    notebook.  The proper fix is to use actual signal blockers rather than
    the simple "stop_signals" flag, since the flags assume callbacks are
    always called inline rather than being called asynchronously.

M	src/object-editor-bc-page.c
M	src/object-editor.c

commit 860dea63a5a9389d42605bc759892428ad3e94d2
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-20

    Removed pre-libglbarcode artifacts.

M	po/POTFILES.in
D	src/bc.c
D	src/bc.h

commit 86f26962cab620b73bdf6f42dcd9ebb31e58ab82
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-11-20

    Updated Spanish translation

M	help/es/es.po
M	po/es.po

commit 3d7aa37f0eba1c52a959e07b4e53efb8377b838a
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-18

    Documentation cleanup.

    Bug sf#3110768: duplicate choice in editprop.page.
    Bug sf#3110794: incorrect wording in customize.page.
    Bug sf#3110801: incorrect wording in customize.page.
    Bug sf#3110918: docbook artifacts in link tags in createnew.page.
    Bug sf#3110930: misplaced <credit></credit> tags in about.page.
    Bug sf#3111019: spelling mistake in editprop.page.

M	help/C/about.page
M	help/C/createnew.page
M	help/C/customize.page
M	help/C/editprop.page

commit b1fd31ae78a8dd346fb48d7f7588274b68820179
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-16

    Cleanup of mancreate.page.

    Bug sf#3110232: Remove docbook artifacts (replaced docbook tags w/
    mallard tags.
    Bug sf#3110286: Fixed cut&paste error.
    Bug sf#3110291: Fixed spelling mistake (height, not heigth).

M	help/C/mancreate.page

commit 8f7f0191cb2f4962064a62b240eed926b150df17
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-15

    [l10n] Updated German translation

M	po/de.po

commit 76fd27c54a401448d1795491e958f8b379bc20ab
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-15

    Fixed typo

M	data/schemas/org.gnome.glabels-3.gschema.xml.in.in

commit 99f337b4c2de88c4cfaf3cc9def3253484ab2c39
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-15

    Removed last addition again

M	po/POTFILES.in

commit fdf16d572cd58dcf8e8d3b18e2bf68b7583225c4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-15

    Added another missing filename to POTFILES.in

M	po/POTFILES.in

commit 94b0bf095d42e68c3d6dea64cac99f87964a11e4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-15

    Added missing filename to POTFILES.in

M	po/POTFILES.in

commit 9453143c64d5bbfde9c156c3b5a379eeb124f863
Merge: 61404cf 6e743df
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-14

    Merge branch 'gtk3'

commit 6e743df0f244177ac9e503c6114b344e0052b71c
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-14

    Fixed stupid typo.

    Must of been temporary insanity.  I had replaced a g_unlink with
    a g_free
    a while back.  Hanging my head in shame.

M	libglabels/db.c

commit f29bc31c9132bc604d60d7c96cac6b0ef5056a74
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-14

    Fixed typo.

M	src/template-designer.c

commit 52446a0a719433f54f4983aabbc9caff685797c7
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-14

    Make sure merge source is shown.

M	data/ui/merge-properties-dialog.ui
M	src/merge-properties-dialog.c

commit 61404cf7270a415c3ed1a185dcefd905bde8dc07
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-14

    Added some more JAC templates

M	templates/misc-iso-templates.xml

commit 92965dc1eafa2019bd2c69e921c499eb734cc8d9
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-14

    Added some JAC templates

M	templates/misc-iso-templates.xml

commit 88f44555402d9a405cbbff6ac57bb463e2ee18f0
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-12

    Fix for some gtk3 widget layout issues.

M	data/ui/object-editor.ui
M	src/ui-sidebar.c

commit e29469011998fbbabe950f4ead5b9b081aeb6375
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-11

    Remove artifacts from old manual.

D	help/C/glabels-3.0.xml
D	help/C/legal.xml
M	help/Makefile.am
M	src/ui-commands.c

commit 45b59e5b4316338dde419f17a3fdb88575b6de02
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-10

    Update licensing information.

    - Docs are now licensed by the CC Attribution-Share Alike 3.0
    Unported license
    - Libglbarcode is relicensed by the LGPL3+

M	COPYING-DOCS
R100	COPYING-LIBGLABELS	COPYING-LIBS
M	COPYING.README_FIRST
M	libglbarcode/lgl-barcode-code39.c
M	libglbarcode/lgl-barcode-code39.h
M	libglbarcode/lgl-barcode-create.c
M	libglbarcode/lgl-barcode-create.h
M	libglbarcode/lgl-barcode-onecode.c
M	libglbarcode/lgl-barcode-onecode.h
M	libglbarcode/lgl-barcode-postnet.c
M	libglbarcode/lgl-barcode-postnet.h
M	libglbarcode/lgl-barcode-render-to-cairo.c
M	libglbarcode/lgl-barcode-render-to-cairo.h
M	libglbarcode/lgl-barcode-type.h
M	libglbarcode/lgl-barcode.c
M	libglbarcode/lgl-barcode.h

commit eda073e8e2563046b8c199372033d013a4697f25
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-09

    Yet another logo update.

M	data/pixmaps/glabels-logo.png
M	help/C/figures/glabels-logo.png
M	help/C/index.page

commit c57137558f60775a8a2205e127c2079f286d4625
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-09

    Use GtkComboBoxText

M	data/ui/media-select.ui
M	data/ui/merge-properties-dialog.ui
M	data/ui/object-editor.ui
M	data/ui/template-designer.ui
M	src/combo-util.c
M	src/combo-util.h
M	src/media-select.c
M	src/merge-properties-dialog.c
M	src/object-editor-bc-page.c
M	src/object-editor-private.h
M	src/object-editor.c
M	src/print-op-dialog.c
M	src/template-designer.c

commit 52214490bb8d25cd754cb40a274ac9ff36ba60d3
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-11-09

    Updated Spanish translation

M	help/es/es.po

commit d405bc913b1d7d23ff12f92f6ef6323d15a4610d
Author: Jim Evins <evins@snaught.com>
Date:	2010-11-07

    Initial documentation for libglbarcode.

M	.gitignore
M	configure.ac
M	docs/Makefile.am
A	docs/libglbarcode/Makefile.am
A	docs/libglbarcode/intro.sgml
A	docs/libglbarcode/libglbarcode-3.0-docs.sgml
A	docs/libglbarcode/libglbarcode-3.0-overrides.txt
A	docs/libglbarcode/libglbarcode-3.0-sections.txt
A	docs/libglbarcode/libglbarcode-3.0.types
A	docs/libglbarcode/tmpl/lgl-barcode-create.sgml
A	docs/libglbarcode/tmpl/lgl-barcode-render-to-cairo.sgml
A	docs/libglbarcode/tmpl/lgl-barcode-type.sgml
A	docs/libglbarcode/tmpl/lgl-barcode.sgml
A	docs/libglbarcode/tmpl/libglbarcode-3.0-unused.sgml
M	libglbarcode/lgl-barcode-create.c
M	libglbarcode/lgl-barcode-render-to-cairo.c
M	libglbarcode/lgl-barcode-type.h
M	libglbarcode/lgl-barcode.c
M	libglbarcode/lgl-barcode.h
M	libglbarcode/libglbarcode-3.0.pc.in
M	libglbarcode/libglbarcode.h

commit ff1457fe9ff2f87815dcbbdc927f409a0a20a1fd
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-11-03

    Updated Spanish translation

M	help/es/es.po

commit 57f251a8d3ef3592e0856eb3c8916ca7c464f324
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	2010-11-01

    Updated French translation

M	po/fr.po

commit b8fc8ef5359af7b42d3bd0493c1adcf8236086db
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-11-01

    Added ca@valencia to LINGUAS

M	po/LINGUAS

commit 81941432d20338b56011444017b01799320a6e97
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-31

    Refinements to barcode objects
    - Draw outline around barcode objects.
    - Use a more sophisticated test for determining if cursor is on
    a barcode
      object: test against lines and glyphs instead of simple bounds
      test. The
      test will also indicate that cursor is on the object if it is on the
      selection outline.  Similar to text objects.

M	libglbarcode/lgl-barcode-render-to-cairo.c
M	libglbarcode/lgl-barcode-render-to-cairo.h
M	src/label-barcode.c

commit 9c8e77f5735b97af445de3a5a8926535535c10f8
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-31

    [l10n] Updated German doc translation

M	help/de/de.po

commit 576d435eba3d25c70329798a29ce99b7934b0582
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-31

    Removed introduction.page

D	help/C/introduction.page

commit 9da0eeeabc8554a3e84a4718fe08c43ec4848333
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-31

    Moved introduction to index.page

M	help/C/index.page

commit ba922c500a1875be6abd70cbacf946a00d375c2b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-31

    Added names of new files

M	po/POTFILES.in

commit 3f4f1213f12fc5be87547cfb82239c3f9c32c19f
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-31

    Removed names of no longer existing files

M	po/POTFILES.in

commit 411560a0b6eb8057add9b6862bc477cb00600e14
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	2010-10-31

    [l10n] Added Catalan (Valencia) translation

A	po/ca@valencia.po

commit edaa3e0b6dec8f8ba81c05b5a196a90b1ebb1ca2
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-30

    Refactored core barcode subsystem.

    - Created new libglbarcode library
    - Moved core barcode structure into library
    - Moved cairo rendering of barcode into library
    - Moved built-in barcodes to library
    - Resurrected Code39 support (from wayback in glabels 0.1.x)

    - Backend "glue" remains in glabels proper

M	.gitignore
M	Makefile.am
M	configure.ac
A	libglbarcode/Makefile.am
A	libglbarcode/lgl-barcode-code39.c
C076	src/bc-iec18004.h	libglbarcode/lgl-barcode-code39.h
A	libglbarcode/lgl-barcode-create.c
C060	src/bc-iec18004.h	libglbarcode/lgl-barcode-create.h
R085	src/bc-onecode.c	libglbarcode/lgl-barcode-onecode.c
C064	src/bc-onecode.h	libglbarcode/lgl-barcode-onecode.h
A	libglbarcode/lgl-barcode-postnet.c
C060	src/bc-onecode.h	libglbarcode/lgl-barcode-postnet.h
A	libglbarcode/lgl-barcode-render-to-cairo.c
C075	src/bc-onecode.h	libglbarcode/lgl-barcode-render-to-cairo.h
R063	src/bc-onecode.h	libglbarcode/lgl-barcode-type.h
A	libglbarcode/lgl-barcode.c
A	libglbarcode/lgl-barcode.h
A	libglbarcode/libglbarcode-3.0.pc.in
R067	src/bc-postnet.h	libglbarcode/libglbarcode.h
M	src/Makefile.am
M	src/bc-backends.c
M	src/bc-backends.h
A	src/bc-builtin.c
C087	src/bc-iec18004.h	src/bc-builtin.h
M	src/bc-gnubarcode.c
M	src/bc-gnubarcode.h
M	src/bc-iec16022.c
M	src/bc-iec16022.h
M	src/bc-iec18004.c
M	src/bc-iec18004.h
D	src/bc-postnet.c
M	src/bc-zint.c
M	src/bc-zint.h
M	src/label-barcode.c

commit 227f04fc6321c2e05aa216cafcac42d6c682a83f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-10-28

    Updated Spanish translation

M	help/es/es.po

commit c9171d11050f595055ba17e53a906e27ad8d28d0
Author: Petr Kovar <pknbe@volny.cz>
Date:	2010-10-28

    Update Czech translation by Marek Cernocky

M	po/cs.po

commit ebd747a78e20c7839bc05dfccbae19730772d2c2
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-26

    Removed dupicate name

M	AUTHORS

commit 8018996159a5af3bb20149c6eb9f327367dd50d9
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-26

    Added missing name for template contributor

M	AUTHORS

commit f8a80d9fb9e73780c408971458be49affec9ba3c
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-25

    Tweak template designer.

    - Added figure for ellipse size page.
    - Removed translatable attribute to "ellipse_page" label which
    is never
      exposed to the user interface.

M	data/pixmaps/Makefile.am
A	data/pixmaps/ex-ellipse-size.png
M	data/ui/template-designer.ui

commit d04b523c567a0961a6378921d1ec6adfa810ff71
Author: Daniel Nylander <po@danielnylander.se>
Date:	2010-10-25

    Updated Swedish translation

M	po/sv.po

commit 002b014d22c4ab4e655a53e4382db94aee637a56
Author: Daniel Nylander <po@danielnylander.se>
Date:	2010-10-25

    Updated Swedish translation

M	po/sv.po

commit b6c503e318bb31b37e83100975ca4795553cb50f
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-25

    [l10n] Updated German translation

M	po/de.po

commit 5f3fe187983bddfe3f74eb9b2b5fd9654e827741
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-10-25

    Updated Spanish translation

M	po/es.po

commit a1a1ba75805a6b52d44edca62f1a46758f5edcef
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-24

    Added support for elliptical labels to template designer.

M	data/ui/template-designer.ui
M	src/template-designer.c

commit edb718146f4462962f7f8d945e3f4e94a267e128
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-24

    Added JAC 987349 template

M	templates/misc-iso-templates.xml

commit 655d3876f4dc85d543757da4ddcb5a7f859d5d68
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-24

    [i18n] Updated German doc translation

M	help/de/de.po

commit 123e40341b75ed9908bf8efe93e7730e8ad7bcd3
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-24

    Fixed some bad formattings in page files

M	help/C/about.page
M	help/C/mancreate.page
M	help/C/merge-ex1.page
M	help/C/merge-ex2.page
M	help/C/merge-ex3.page
M	help/C/multifile.page

commit 9e1ffae4ad71013013ffda810938560270aeb0a9
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-24

    [i18n] Updated German doc translation

M	help/de/de.po

commit e76ba5917c22a48071dbfd7ca1d57dd15aecc33e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-24

    [i18n] Updated German doc translation

M	help/de/de.po

commit 6c64505b7ff37d2f07768509f8c0ea47d37a04c7
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-23

    [i18n] Updated German translation

M	po/de.po

commit e1a86d815851f2d9ea8ab8986779d9b5f2d942e5
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-23

    Added note about rotating objects.

M	help/C/editprop.page

commit 45a1bf10d41bc020a9e8438d2bd49d9383ef537e
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-23

    Updated glabels logo yet again.

    Updated logo based on the new-label-dialog image rather than the
    simple
    "gLabels" text which is more appropriate for a web-page title rather
    than a graphical logo which always sits next to the text "glabels"
    anyway.

M	data/pixmaps/glabels-logo.png
M	help/C/figures/glabels-logo.png

commit d57e4b8adf4369742323f2a8098cdd996a8c0b99
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-06-10

    Updated German doc translation

M	help/de/de.po

commit f0459b79dae33f354121d4b9d3138e63bfc1a93e
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-09

    Extended introduction

    Extended introduction and moved to its own page.
    Added logo for index page (used current web logo for now).

A	help/C/figures/glabels-logo.png
A	help/C/figures/introduction-glabels-main-window.png
M	help/C/index.page
A	help/C/introduction.page

commit e88a0125b560cbdd3fcc2eb9e991fae45555013f
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-31

    Updated manual template creation page.

    Updated text to reflect changes in current development version of
    glabels.  Updated and added figures.

A	help/C/figures/glabels-template-cd-label.png
D	help/C/figures/glabels-template-cd.png
A	help/C/figures/glabels-template-circle-label.png
A	help/C/figures/glabels-template-ellipse-label.png
D	help/C/figures/glabels-template-label.png
M	help/C/figures/glabels-template-layout.png
A	help/C/figures/glabels-template-rect-label.png
M	help/C/mancreate.page

commit 5325e8976aeb992aebe7d1f725fdcb9ee4d0df2d
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-30

    Added missing filename for page file in Makefile.am

M	help/Makefile.am

commit 6a502e49f1219d69fdd1a9ac38263cdbb05f2944
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-29

    Added page on skipping empty address fields.

M	help/C/about.page
A	help/C/figures/skip-fields-output.png
A	help/C/figures/skip-fields-screenshot.png
A	help/C/skipfields.page

commit 3c8c219808431f0e4b3054ca7011a50196048a86
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-28

    Fixed bug in Makefile.am

M	help/Makefile.am

commit a963feda67b0b24510679fdfeb66631fdc5fc36d
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-28

    Added new filenames to Makefile.am

M	help/Makefile.am

commit c8cc8d439836b01b925067e15f3f5cda60c606b8
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-28

    Changed license to Creative Commons

M	help/glabels-3.0.omf.in

commit 073fcd34a90b522980a96d7a1b41f1be3ccdee08
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-28

    Added page files for the new manual

A	help/C/about.page
A	help/C/basicusage.page
A	help/C/createnew.page
A	help/C/customize.page
A	help/C/customtemplate.page
A	help/C/editprop.page
A	help/C/index.page
A	help/C/labelprop.page
A	help/C/license.page
A	help/C/mancreate.page
A	help/C/merge-ex1.page
A	help/C/merge-ex2.page
A	help/C/merge-ex3.page
A	help/C/merge-ex4.page
A	help/C/merge.page
A	help/C/mergefeatures.page
A	help/C/multifile.page
A	help/C/newlabel.page
A	help/C/printfile.page
A	help/C/select.page

commit b071ef81f3bb86f042a317dd509b10f2f52aaefb
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-22

    Added native OneCode barcode backend.

M	src/Makefile.am
M	src/bc-backends.c
A	src/bc-onecode.c
A	src/bc-onecode.h

commit 4ccc7568162606b01eda07d20b1c6f3596a18250
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2010-10-22

    Added sl for Slovenian translation

M	help/Makefile.am

commit 8db3ca50ad72ff6f748c7025b94b6dd9228c0088
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2010-10-22

    Added Slovenian translation

A	help/sl/sl.po

commit 8f1058a9430b0f464f2f8bbb5ca7198db06370cf
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-10-21

    Updated Spanish translation

M	help/es/es.po

commit 323db1068fec3f9e29b243526532f8db56b083bb
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-17

    Do not expand object editor vertically.

    Gtk3 has new behavior for expansion of widgets.  This commit takes
    care of
    the most obvious case of this new behavior.  Additional cases still
    need to
    be addressed in the object-editor.ui file.

M	src/ui-sidebar.c

commit 6560b886953a6147b9cd4bca2f797c694fb18f2d
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-17

    Removed gtk_status_bar_set_has_resize_grip().

    Resize grip in Gtk3 has been moved from GtkStatusBar to GtkWindow.
    Glabels
    also no longer explicitly turns the resize grip off.

M	src/window.c

commit d70695c6d164015b9502592107e256b7bc020a88
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-10-15

    Updated Slovenian translation

M	po/sl.po

commit 7e864db86631552f49edd0b014fb197e75d6007f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-10-11

    Updated Spanish translation

M	po/es.po

commit b2b3f6be7f95887f10f9bd7d64b0251f4cef1f70
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-10

    [i18n] Updated German translation

M	po/de.po

commit 0faa416ed1eae948d13d23269fba55ed04bfbea4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-10-10

    Added some new templates

M	templates/pearl-iso-templates.xml

commit e4f1404d031e896bf56e9ac857a913110b4e1477
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-05

    Cleanup of chain button.

    - Convert to new drawing model for bracket lines
    - Use "changes-allow" and "changes-prevent" lock images
    - Use toggle button to indicate state (in addition to image)

M	data/ui/object-editor.ui
M	src/object-editor-size-page.c
M	src/wdgt-chain-button.c

commit 799a7f4911e9abd575c2b7683750aeca1b905ca8
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-04

    Fix drawing problems with view.c

    - Create separate cairo_t from bin_window and draw into it.
    - For manual updates, create allocation rectangle manually

M	.gitignore
M	src/view.c

commit dd7c11af6233329e7f0a05947167dfd8debc3dea
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-03

    Initial port to GTK3.

    Still has update and drawing problems with view.c.

M	configure.ac
M	src/Makefile.am
M	src/color-swatch.c
A	src/cursors/Makefile.am
A	src/cursors/cursor_barcode.png
A	src/cursors/cursor_box.png
A	src/cursors/cursor_ellipse.png
A	src/cursors/cursor_image.png
A	src/cursors/cursor_line.png
A	src/cursors/cursor_text.png
M	src/font-sample.c
M	src/media-select.c
M	src/merge-properties-dialog.c
M	src/mini-label-preview.c
M	src/mini-preview.c
M	src/prefs-dialog.c
M	src/view-barcode.c
M	src/view-box.c
M	src/view-ellipse.c
M	src/view-image.c
M	src/view-line.c
M	src/view-text.c
M	src/view.c
M	src/wdgt-chain-button.c
M	src/window.c

commit a0e160ca8b5dd417430b42f1984ed3ceafbca6bd
Author: Jim Evins <evins@snaught.com>
Date:	2010-10-02

    Merge changes from gsettings branch.

M	configure.ac
M	data/Makefile.am
A	data/schemas/Makefile.am
A	data/schemas/org.gnome.glabels-3.gschema.xml.in.in
M	src/color-history-model.c
M	src/font-history-model.c
M	src/prefs-model.c
M	src/template-history-model.c
M	src/ui.c

commit 2cc9977dd9fb2e069b9dac4439af952c2f2c15ee
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-27

    Better test for libzint.

M	configure.ac

commit 8404402282b56b1bee08f5115bf43c21fa10574e
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-09-26

    Updated Spanish translation

M	po/es.po

commit 9a9188f05d74896575aaf2060866dbfb20723058
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-09-26

    Added Best Office 75753 template

M	templates/misc-iso-templates.xml

commit 1c886494fe294fd145d7b6234786dbf32b75f6c7
Author: Antonio Fernandes C. Neto <fernandes@pelivre.org>
Date:	2010-09-22

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit 3f02585e277e869df63e78dcc538f1b21964e7fe
Author: Joe Hansen <joedalton2@yahoo.dk>
Date:	2010-09-19

    Updated Danish translation

M	po/da.po

commit bce03e38fb47839357147cff6526acefc67e313a
Author: Petr Kovar <pknbe@volny.cz>
Date:	2010-09-10

    Update Czech translation by Marek Cernocky

M	po/cs.po

commit cacd288f41657322697972dd2c478fbab72e7536
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-09-09

    Fixed small typo

M	src/ui-commands.c

commit aaf2b3ed072e8a9eacbd0f382bd2af62a6072af3
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-09-06

    Updated Spanish translation

M	po/es.po

commit aeb33f64541ad5c39bcc62a0fe94cb1e992a63f0
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-05

    Added logo for template designer druid.

M	data/pixmaps/Makefile.am
A	data/pixmaps/template-designer.png
M	src/template-designer.c

commit 9667f709d131a52eca55c5a8400f20d4084a1409
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-05

    Manage mimetype icon with other theme friendly icons.

M	data/icons/48x48/Makefile.am
R100	data/pixmaps/application-x-glabels.png
data/icons/48x48/mimetypes/application-x-glabels.png
M	data/pixmaps/Makefile.am

commit 065ffb88346791da881cfed8a06343c6b6e4b50c
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-05

    Theme friendly, glabels specific, action icons.

M	configure.ac
M	data/icons/16x16/Makefile.am
R100	src/stock-pixmaps/stock_align_bottom_16.png
data/icons/16x16/actions/glabels-align-bottom.png
R100	src/stock-pixmaps/stock_align_hcenter_16.png
data/icons/16x16/actions/glabels-align-hcenter.png
R100	src/stock-pixmaps/stock_align_left_16.png
data/icons/16x16/actions/glabels-align-left.png
R100	src/stock-pixmaps/stock_align_right_16.png
data/icons/16x16/actions/glabels-align-right.png
R100	src/stock-pixmaps/stock_align_top_16.png
data/icons/16x16/actions/glabels-align-top.png
R100	src/stock-pixmaps/stock_align_vcenter_16.png
data/icons/16x16/actions/glabels-align-vcenter.png
R100	src/stock-pixmaps/stock_arrow_16.png
data/icons/16x16/actions/glabels-arrow.png
R100	src/stock-pixmaps/stock_barcode_16.png
data/icons/16x16/actions/glabels-barcode.png
R100	src/stock-pixmaps/stock_box_16.png
data/icons/16x16/actions/glabels-box.png
R100	src/stock-pixmaps/stock_bucket_fill_16.png
data/icons/16x16/actions/glabels-bucket-fill.png
R100	src/stock-pixmaps/stock_center_horiz_16.png
data/icons/16x16/actions/glabels-center-horiz.png
R100	src/stock-pixmaps/stock_center_vert_16.png
data/icons/16x16/actions/glabels-center-vert.png
R100	src/stock-pixmaps/stock_ellipse_16.png
data/icons/16x16/actions/glabels-ellipse.png
R100	src/stock-pixmaps/stock_flip_horiz_16.png
data/icons/16x16/actions/glabels-flip-horiz.png
R100	src/stock-pixmaps/stock_flip_vert_16.png
data/icons/16x16/actions/glabels-flip-vert.png
R100	src/stock-pixmaps/stock_image_16.png
data/icons/16x16/actions/glabels-image.png
R100	src/stock-pixmaps/stock_line_16.png
data/icons/16x16/actions/glabels-line.png
R100	src/stock-pixmaps/stock_merge_16.png
data/icons/16x16/actions/glabels-merge.png
R100	src/stock-pixmaps/stock_properties_16.png
data/icons/16x16/actions/glabels-object-properties.png
R100	src/stock-pixmaps/stock_order_bottom_16.png
data/icons/16x16/actions/glabels-order-bottom.png
R100	src/stock-pixmaps/stock_order_top_16.png
data/icons/16x16/actions/glabels-order-top.png
R100	src/stock-pixmaps/stock_pencil_16.png
data/icons/16x16/actions/glabels-pencil.png
R100	src/stock-pixmaps/stock_rotate_left_16.png
data/icons/16x16/actions/glabels-rotate-left.png
R100	src/stock-pixmaps/stock_rotate_right_16.png
data/icons/16x16/actions/glabels-rotate-right.png
R100	src/stock-pixmaps/stock_text_16.png
data/icons/16x16/actions/glabels-text.png
M	data/icons/24x24/Makefile.am
R100	src/stock-pixmaps/stock_arrow_24.png
data/icons/24x24/actions/glabels-arrow.png
R100	src/stock-pixmaps/stock_barcode_24.png
data/icons/24x24/actions/glabels-barcode.png
R100	src/stock-pixmaps/stock_box_24.png
data/icons/24x24/actions/glabels-box.png
R100	src/stock-pixmaps/stock_bucket_fill_24.png
data/icons/24x24/actions/glabels-bucket-fill.png
R100	src/stock-pixmaps/stock_ellipse_24.png
data/icons/24x24/actions/glabels-ellipse.png
R100	src/stock-pixmaps/stock_hchain_broken_24.png
data/icons/24x24/actions/glabels-hchain-broken.png
R100	src/stock-pixmaps/stock_hchain_24.png
data/icons/24x24/actions/glabels-hchain.png
R100	src/stock-pixmaps/stock_image_24.png
data/icons/24x24/actions/glabels-image.png
R100	src/stock-pixmaps/stock_line_24.png
data/icons/24x24/actions/glabels-line.png
R100	src/stock-pixmaps/stock_merge_24.png
data/icons/24x24/actions/glabels-merge.png
R100	src/stock-pixmaps/stock_properties_24.png
data/icons/24x24/actions/glabels-object-properties.png
R100	src/stock-pixmaps/stock_pencil_24.png
data/icons/24x24/actions/glabels-pencil.png
R100	src/stock-pixmaps/stock_text_24.png
data/icons/24x24/actions/glabels-text.png
R100	src/stock-pixmaps/stock_vchain_broken_24.png
data/icons/24x24/actions/glabels-vchain-broken.png
R100	src/stock-pixmaps/stock_vchain_24.png
data/icons/24x24/actions/glabels-vchain.png
M	po/POTFILES.in
M	src/Makefile.am
M	src/color-combo-button.c
M	src/color-combo-button.h
M	src/glabels.c
M	src/object-editor.c
D	src/stock-pixmaps/Makefile.am
D	src/stock.c
D	src/stock.h
M	src/ui-property-bar.c
M	src/ui-sidebar.c
M	src/ui.c
M	src/wdgt-chain-button.c

commit ece7eac613951c98d90cb698497576a110265a21
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-04

    Additional ignore pattern.

M	.gitignore

commit 3fd4017b3e2461638683b3753b96c7484e7d4ed2
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-04

    Theme friendly app icons.

M	configure.ac
M	data/Makefile.am
A	data/icons/16x16/Makefile.am
A	data/icons/16x16/apps/glabels-3.0.png
A	data/icons/22x22/Makefile.am
A	data/icons/22x22/apps/glabels-3.0.png
A	data/icons/24x24/Makefile.am
A	data/icons/24x24/apps/glabels-3.0.png
A	data/icons/32x32/Makefile.am
A	data/icons/32x32/apps/glabels-3.0.png
A	data/icons/48x48/Makefile.am
A	data/icons/48x48/apps/glabels-3.0.png
A	data/icons/Makefile.am
M	data/pixmaps/Makefile.am
D	data/pixmaps/glabels-3.0.png
M	src/Makefile.am
M	src/glabels-batch.c
M	src/glabels.c
M	src/template-designer.c

commit acadb7b8e069be9c8a95502191771b6466ddaedf
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-03

    New logo and tweaking of about dialog.

M	data/pixmaps/Makefile.am
D	data/pixmaps/glabels-about-logo.png
A	data/pixmaps/glabels-logo.png
D	data/pixmaps/glabels-splash.png
M	src/ui-commands.c

commit 8b85d5b2506945a45411f160ec2d6afc8d184499
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-03

    Removed remaining artifacts from old hig module.

M	data/ui/merge-properties-dialog.ui
M	po/POTFILES.in
M	src/Makefile.am
D	src/hig.h
M	src/merge-properties-dialog.c
M	src/prefs-dialog.c

commit de714c6562a0cf92eadc8430da644117e948a422
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-09-03

    [i18n] Updated German translation

M	po/de.po

commit 9e1e6e9b3e8f03a95a949d612e6f6f7846f95a1e
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-09-03

    Updated Slovenian translation

M	po/sl.po

commit 05e9418eb30b1702a10a8662c83da7904d60151a
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-02

    Update POTFILES.in after merge and update AUTHORS.

M	AUTHORS
M	po/POTFILES.in

commit 6c9d844640ff7c481eaa1962aff3bdebd0c2c0ff
Merge: 7e03137 e681454
Author: Jim Evins <evins@snaught.com>
Date:	2010-09-02

    Merge branch 'zint'

commit e68145406dd9ea1326cace7341fa736e8e065bff
Author: Jim Evins <evins@snaught.com>
Date:	2010-08-31

    Fix maximum size of object editor sidebar at initialization.

    Kludge:  Load barcode styles for each backend type at initialization,
    so that
    when they are loaded for real, the maximum size of the widget has
    already been
    established and doesn't cause the object editor to change size.

M	data/ui/object-editor.ui
M	src/object-editor-bc-page.c

commit a8d633c591f7cb28150ab85ae6b0feac1856335c
Author: Jim Evins <evins@snaught.com>
Date:	2010-08-31

	Encapsulate barcode style in single struct.

	Encapsulate barcode style into a single struct and related
	clean-up.

M	src/label-barcode.c
M	src/label-barcode.h
M	src/merge-evolution.c
M	src/merge-text.c
M	src/merge-vcard.c
M	src/merge.c
M	src/merge.h
M	src/object-editor-bc-page.c
M	src/object-editor-private.h
M	src/object-editor.c
M	src/text-node.c
M	src/text-node.h
M	src/xml-label-04.c
M	src/xml-label.c

commit a6f3364c48c13198e6583701cff3ba8f1e0230aa
Author: Jim Evins <evins@snaught.com>
Date:	2010-08-29

    Allow user selection of barcode backend.

    - User can now select which backend to use for a particular barcode.
    - This prevents one implementation from eclipsing another.
    - For backwards compatability, do best guess at backend.

M	data/ui/object-editor.ui
M	src/bc-backends.c
M	src/bc-backends.h
M	src/label-barcode.c
M	src/label-barcode.h
M	src/object-editor-bc-page.c
M	src/object-editor-private.h
M	src/object-editor.c
M	src/xml-label-04.c
M	src/xml-label.c
M	templates/glabels-2.3.dtd

commit 2ef27d0e798c9c6f72c946ed502bc7d670ab4a07
Author: Robin Stuart <robin@zint.org.uk>
Date:	2010-08-21

    Added support for Maxicode barcodes using the libzint backend.

M	src/bc-backends.c
M	src/bc-zint.c
M	src/bc.c
M	src/bc.h
M	src/label-barcode.c

commit 7e031374c3c42b858eb321a5cbaf63ffa7d9cd3e
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-08-18

    Updated Slovenian translation

M	po/sl.po

commit e805759afe8c7c0c410516f387ee76cb37f23827
Author: Marek Černocký <marek@manet.cz>
Date:	2010-08-11

    Updated Czech translation

M	po/cs.po

commit 1f0f30a0aa1e81d2b347d61acdf114d7d4041c64
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-08-08

    Updated Slovenian translation

M	po/sl.po

commit 16ac39db3608aed0d6859b8472c32fa1da6fd48b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-08-06

    [i18n] Updated German translation

M	po/de.po

commit e8c1b3f843997bbdb508e32bd951732ef8ffbc17
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-08-05

    Updated Spanish translation

M	po/es.po

commit 432cc50d56107d94a59269345df985dd75976ffb
Author: Jim Evins <evins@snaught.com>
Date:	2010-08-02

    Added user submitted templates.

    Added templates submitted by Rudolph Leitgeb and E. Travis.
    Also cleaned up
    avery-iso-templates.xml file.

M	AUTHORS
M	templates/avery-iso-templates.xml
M	templates/misc-us-templates.xml

commit 2e156f680d5f563ed3b050dbfe6f6d3d30a5e826
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-14

    Cleanup zint backend settings and flags.

M	src/bc-backends.c

commit b5865243f8cb28214bfed442ee5d7cbee2967bc2
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-11

    More refactoring of barcode subsystem.

    Create a clear separation between the intermediate barcode format and
    the management of the barcode backends.

M	src/Makefile.am
A	src/bc-backends.c
A	src/bc-backends.h
M	src/bc-gnubarcode.c
M	src/bc-iec16022.c
M	src/bc-iec18004.c
M	src/bc-postnet.c
M	src/bc-zint.c
M	src/bc.c
M	src/bc.h
M	src/label-barcode.c
M	src/label-barcode.h
M	src/object-editor-bc-page.c
M	src/object-editor.h

commit 6717882e759c320e468683f8c69cf8af1281d91b
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-11

    Refactoring of barcode structure.

    Minor refactoring of API to barcode structure.

M	src/bc-gnubarcode.c
M	src/bc-iec16022.c
M	src/bc-iec18004.c
M	src/bc-postnet.c
M	src/bc-zint.c
M	src/bc.c
M	src/bc.h
M	src/label-barcode.c

commit f6a1818fe2e0975dc664a1863594f3ed371e0937
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-07-10

    Updated Slovenian translation

M	po/sl.po

commit 8d2a845d489a74468776034fdab4a2e377ecffaa
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-07-10

    Updated Spanish translation

M	po/es.po

commit b012b9c74def1a87e21e678486eeb4debeaf23be
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-10

    Improved centering of barcode text.

    Don't try to calculate x offset using hardcoded fixed character
    width, which
    does not work properly for proportional fonts.  Use the origin
    provided by
    zint (wich is at the horizontal center) and use pango to calculate
    the offset
    at render time.

M	src/bc-zint.c
M	src/bc.h
M	src/label-barcode.c

commit 61aa9b8dce8e6143eba39b368897a5f1a39a8e29
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-10

    Update po files to allow me to push this branch.

M	po/ca.po
M	po/cs.po
M	po/da.po
M	po/de.po
M	po/eo.po
M	po/es.po
M	po/fr.po
M	po/it.po
M	po/ja.po
M	po/ko.po
M	po/nb.po
M	po/pl.po
M	po/pt.po
M	po/pt_BR.po
M	po/ru.po
M	po/sl.po
M	po/sv.po
M	po/zh_CN.po
M	po/zh_TW.po
M	src/Makefile.am

commit e43f6397f295172646ed67456799c1fe6cbfb94a
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-09

    Added new barcode drawing primitives.

    Added a "Box" and a "String" barcode drawing primitives.  The box
    primitive
    should be more natural for drawing actual boxes instead of lines.
    The string
    primitive allows an entire string to be rendered with a single
    interaction with
    pango and cairo, rather than an interaction for each character.
    There is no
    need to try to implement kerning since pango will take care of the
    string as
    a single layout.

M	src/bc-zint.c
M	src/bc.c
M	src/bc.h
M	src/label-barcode.c

commit f2ced22e6919c5311fb0467e0f07874d9e28e16d
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-09

    Fixed width behavior of object editor.

    I had neglected to add the barcode page to the appropriate size
    group. Longer
    names in the zint backend caused the style combobox to be the long
    pole in
    the tent, causing the width of the object editor to fluctuate when
    selecting
    and un-selecting barcode objects.

M	data/ui/object-editor.ui

commit 7e6b5431df2e8eed3152fb33db25c856dfc2a20b
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-08

    Revert "Fix for batch output"

    This reverts commit 03d80812158823eb8ad7184d1c7629b64daaecb5.

M	src/label-text.c

commit dd0b78bdd763b8f47b1031b478c6b2b57119fff3
Author: Sam Lown <me@samlown.com>
Date:	2010-07-08

    Fix for batch output

M	src/label-text.c

commit 8b662f5b767bb4172e4b1911ecb304bd0b4c5b40
Author: Sam Lown <me@samlown.com>
Date:	2010-07-07

    Freeing memory in xml and adding poor mans kerning to bc-zint

M	src/bc-zint.c
M	src/xml-label.c

commit e9f492c8fc1638bc9a0a7014653e54306c7e974e
Author: Sam Lown <me@samlown.com>
Date:	2010-07-07

    Using regexp to remove white space from text instead of detecting
    newlines in xml

M	src/xml-label.c

commit a3fd97c6757a71f8761f76bb28c356ca425148c2
Author: Sam Lown <me@samlown.com>
Date:	2010-07-07

    Getting GS1-128 to behave as expected

M	src/bc.c

commit 9d21b20ed765ef3f924a9ee48158cde94f707022
Author: Sam Lown <me@samlown.com>
Date:	2010-07-06

    Adding Robin's changes for latest Zint

M	src/bc-zint.c
M	src/bc.c

commit f3219c0e3e7800336ac13b8fbd8f62371c2398bb
Author: Sam Lown <me@samlown.com>
Date:	2010-06-13

    Provides barcode even if invalid for correct sizing

M	src/bc-zint.c

commit 65dd24369545da8bd2a698fa72f08fac40cd2d37
Author: Sam Lown <me@samlown.com>
Date:	2010-06-12

    Minor alteration for GS1-128 length@

M	src/bc.c

commit 769479af3289ee847ccea3145d91d15a80482b69
Author: Sam Lown <me@samlown.com>
Date:	2010-06-11

    Updating for Zint strings and fixed dimensions

M	src/bc-zint.c
M	src/bc.c

commit e1e80392cc40e87cd673e1d55a450d393432c240
Author: Sam Lown <me@samlown.com>
Date:	2010-05-30

    Alterations to zint rendering

M	src/bc-zint.c

commit 6220643a6116d965c08e17da3f35acd66698be1d
Author: Sam Lown <me@samlown.com>
Date:	2010-05-30

    Modified Zint support to use rendered data rather than encoded

M	src/bc-zint.c

commit b8b660ce6a19fd5c32d2311a6afe873c10f399c2
Author: Sam Lown <me@samlown.com>
Date:	2010-05-17

    Forwardporting changes for zint barcode support

M	src/Makefile.am
M	src/bc-zint.c

commit bc70724dbf60a6d2ee2f393b1252aed167e07823
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-08

    Initialize font-history subsystem in glabels-batch.

M	src/glabels-batch.c

commit 6b6ff9ba800dde3f3954f36743e390dac8200b22
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-07-07

    [i18n] Updated German translation

M	po/de.po

commit 0d5e8e336aa6d3b76470c8b396e442e0e7f2dd83
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-06

    String cleanup.

    Removed pango markup from translatable strings.  Fixed word order
    assumption
    with use of standalone "per sheet" string.

M	data/ui/merge-properties-dialog.ui
M	data/ui/object-editor.ui
M	data/ui/prefs-dialog.ui
M	data/ui/print-op-dialog-custom-widget.ui
M	libglabels/template.c
M	src/template-designer.c

commit 09b643f62fc415b50a6d85079e0e503b6bd8f2a6
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-06

    Fixed a few -Wall warnings.

M	src/label-image.c
M	src/svg-cache.c

commit 669df86b2593b4a6ba19b0fa58092f19fabf32b3
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-07-05

    [i18n] Updated German translation

M	po/de.po

commit b2ef908e8f1f0ae8daf7a08a82ff9c3e3128f06d
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-07-04

    Updated Slovenian translation

M	po/sl.po

commit 3e365e5f9187a12fbf0e29d4d3804cab0261e8e9
Author: Jim Evins <evins@snaught.com>
Date:	2010-07-02

    Add native support for SVG images.

    Rather than just rasterizing SVG files into GdkPixbufs, use RSVG
    to handle
    SVG files directly -- preserving the original file as inline data.

M	configure.ac
M	po/POTFILES.in
M	src/Makefile.am
M	src/debug.c
M	src/debug.h
M	src/file-util.c
M	src/file-util.h
M	src/label-image.c
M	src/label-image.h
M	src/label.c
M	src/label.h
M	src/object-editor.c
A	src/svg-cache.c
A	src/svg-cache.h
M	src/xml-label.c
M	templates/glabels-2.3.dtd

commit 85c5b1fa0d48486d3985c43cd0272a3d5d0753c7
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-06-16

    Updated Spanish translation

M	po/es.po

commit 907a32752b637186451c56cc79fa19b35e7e33e2
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-12

    Add shadow property to image objects.

    Added shadow support to image objects.  Shadow is created from
    the image's
    alpha channel, so the shadow will work properly for images with
    transparent
    backgrounds.  More work needs to be done to better optimize the
    performance.

M	src/Makefile.am
M	src/label-image.c
M	src/object-editor.c
A	src/pixbuf-util.c
A	src/pixbuf-util.h

commit 3f4bd5d778015e524870eeb8bf89ad5bd615eabe
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-12

    Cleanup of shadows for boxes and ellipses.

    Do a more intelligent job of drawing shadows for boxes and ellipses.
    Instead
    of just blindly drawing a fill shadow and an outline shadow, choose
    to draw
    one or the other and adjust size of shadow appropriately.

M	data/ui/object-editor.ui
M	src/label-box.c
M	src/label-ellipse.c

commit fe7a2fbf407047c5d69ccc93e9d5a6cb92d08871
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-11

    Do not explicitly set sidebar size.

    Use 2 sizegroups to automatically fix sidebar size based on the size
    of the widgets it contains -- even hidden ones.  The width was
    previously
    set explicitly to prevent the sidebar from changing size whenever
    objects
    are selected and unselected.  This has been problematic for
    compatability
    with different themes, fonts, and translations.

M	data/ui/object-editor.ui
M	src/object-editor.c
M	src/ui-sidebar.c

commit 1382ac85c0d0516a9760db1f52173a6d3f0563e5
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-06-11

    Updated Slovenian translation

M	po/sl.po

commit 8aa1c5b131e6ee24c2f1c54be23239f062c91a65
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-06-10

    Updated German translation

M	po/de.po

commit 2dc9de0c566a201d49f436fa6831dec403603f2e
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-09

    Added text merge backend for semicolon separated values

    Feature request #3013910.  Added entry for a text merge backend using
    a semicolon as delimiter.

M	src/merge-init.c

commit 59eac573a766dce34876713953efd5a147fd0222
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-06

    Some final preparation for 2.3.0.

M	NEWS
M	configure.ac

commit 245b69b5ed745eea8509133fd5c49a8bdde8082f
Author: Christian Persch <chpe@gnome.org>
Date:	2010-06-05

    Speed up large barcodes

    g_list_append() is evil. Just use prepend().

M	src/bc.c

commit 3cc1494b4838d0aa4c6b4fb35f15a80b44a69071
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-05

    Some preparation for 2.3.0 release

M	AUTHORS
M	NEWS
M	configure.ac

commit b27f91e7105e2a28ca1f7377d67ee20ccd7ec994
Author: Michel Recondo <michel@recondo.com.br>
Date:	2010-06-05

    Updated Brazilian Portuguese translation

    Reviewed by Henrique Machado <hpmachado@gnome.org>

M	po/pt_BR.po

commit 3c200d2279f57999de42fb211ed878de3a62ad5b
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-04

    Updated libglabels documentation.

M	docs/libglabels/libglabels-3.0-sections.txt
M	docs/libglabels/tmpl/category.sgml
M	docs/libglabels/tmpl/db.sgml
M	docs/libglabels/tmpl/paper.sgml
M	docs/libglabels/tmpl/str.sgml
M	docs/libglabels/tmpl/template.sgml
M	docs/libglabels/tmpl/units.sgml
M	docs/libglabels/tmpl/vendor.sgml
M	docs/libglabels/tmpl/xml-category.sgml
M	docs/libglabels/tmpl/xml-paper.sgml
M	docs/libglabels/tmpl/xml-template.sgml
M	docs/libglabels/tmpl/xml-vendor.sgml
M	docs/libglabels/tmpl/xml.sgml
M	libglabels/db.c
M	libglabels/str.c

commit 424d8c45333504425cebb58d97b1f9e58e45a473
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-02

    Fixed a few -Wall warnings

M	libglabels/db.c
M	src/file-util.c
M	src/merge.c
M	src/str-util.c

commit 10d31988ea2247e420f2622043fb8586bc839ed9
Author: Jim Evins <evins@snaught.com>
Date:	2010-06-02

    Updated NEWS for upcoming 2.3.0 release.

M	NEWS

commit a05703c9967c8bca38785a8c4872bf6ab266f57c
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-31

    Updated DTD.

M	templates/glabels-2.3.dtd

commit 55b7dda6b69c4f1a25734152fd6b69b72ee3f385
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-30

    Fix selection problem.

    Clear existing paths before creating new test paths.  This would
    occasionally
    cause the wrong object to be selected because the in_fill or in_stroke
    tests would be satisfied using left-over paths from previous tests.

M	src/label-barcode.c
M	src/label-box.c
M	src/label-ellipse.c
M	src/label-image.c
M	src/label-line.c
M	src/label-text.c

commit c555edf9c5195b45812383d699e6021417dd96cd
Author: Joe Hansen <joedalton2@yahoo.dk>
Date:	2010-05-30

    Updated Danish translation

M	po/da.po

commit 1ce273bf46b7e199600e5332d2ee13a2e4aea241
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-05-30

    Updated Spanish translation

M	po/es.po

commit 1990055cc0190e23fc0796ff04c00678b68faba3
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-29

    Tweak rendering of color swatches and font samples.

M	src/color-swatch.c
M	src/font-sample.c

commit 06f27cce690f6ee0a498a05ae16d4eeb96cf20c1
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-29

    Explicitly link with libm.

M	src/Makefile.am

commit 1d85e165dcfedb28327b8e79bd91bdbb02e1f6e6
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-05-28

    Updated Slovenian translation

M	po/sl.po

commit bb8763ff8f3d739280dafbde15e27622fa08148a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-05-28

    Updated Spanish translation

M	po/es.po

commit 88decad7363f3e3d13ca34fd6e956ed9bd197a11
Author: Claude Paroz <claude@2xlibre.net>
Date:	2010-05-27

    Updated French translation

    Contributed by Claude Paroz and Gérard Baylard

M	po/fr.po

commit 26990ef637b55a385c9b61308bc6ecbb9234334b
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-26

    Some minor barcode cleanup

    - Added DEBUG_BARCODE so that verbosity on stdout of new libzint
    backend
      can be controlled.
    - Removed artifact comments and some minor formatting changes
    in libzint
      backend.
    - In object editor, make preview format track the number of digits
    in the
      digits spinbox in real-time.

M	src/bc-zint.c
M	src/bc.c
M	src/debug.c
M	src/debug.h
M	src/object-editor-bc-page.c

commit c22727a27e8ab935eeaf4ef2a0d5119212597406
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2010-05-26

    Updated Spanish translation

M	po/es.po

commit 4071ed90076bb15c831435063b2b6bce0cbbe00e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-25

    Updated German translation

M	po/de.po

commit 29d57a7936c1d39db31fd5e952bda32f13331ac1
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-24

    Additional translator hints.

    - Fixed a couple of strings that should not have been marked
    translatable.
    - Added comments for "Fixed", "Other", "None", and "No match."
    - Attempted to disambiguate 3 different occurances of "Any"

M	data/ui/new-label-dialog.ui
M	data/ui/object-editor.ui
M	libglabels/db.c
M	libglabels/template.c
M	src/media-select.c
M	src/merge-properties-dialog.c
M	src/merge.c

commit eb650e1275a4a9f54ef05c97933646ec37fc7d56
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-24

    Use a translator comment rather than context.

M	src/mini-preview.c

commit d9f004626ba7f8a8870c3265c89863b569357556
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-24

    Added context for "Up" string

M	src/mini-preview.c

commit 51181713e931b531cb595dffe2c7fc742155b687
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-24

    Removed "translatable" attribute from unused builder strings

    Removed "translatable" attribute from unused builder strings.
    These strings
    are an artifact of how I organized the individual pages for
    GtkAssistants
    in GtkNotebooks in glade.

M	data/ui/new-label-dialog.ui
M	data/ui/template-designer.ui

commit 21115bdb38a0b6ffc93cfa6c6611dc071cb3812a
Author: Takeshi AIHANA <takeshi.aihana@gmail.com>
Date:	2010-05-24

    Updated Japanese translation, taken from the 2_2 branch

M	po/ja.po

commit b039cb00f971a74d9add15fbeecadfa37de698f7
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-24

    Updated German translation

M	po/de.po

commit 3144ddc46eea2ac6e74887a6229981491da10aa0
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-24

    Made PEARL label descriptions translatable

M	po/POTFILES.in

commit b0ef76a570d6af52af44dbe0014ebe559720058c
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-24

    Added more labels

M	templates/pearl-iso-templates.xml

commit 0c89cdc382cd774da88e0b065fc0b6851aacbdf1
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-24

    Properly mark strings as no-c-format

    Properly mark non-c-format strings containing '%' as no-c-format.
     - Added "xgettext: no-c-format" comments as suggested by Claude
     Paroz.
     - Removed backslashes ('\') from my ignorant attempt to address this.

M	src/color-combo-menu.c

commit 30d4df7681459d895ef5c09e2e43ba88c0e72785
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-22

    Minor refactoring of glBarcode structure.

    Minor refactoring of glBarcode structure in preparation of support for
    more exotic barcode shapes.

M	src/bc-gnubarcode.c
M	src/bc-iec16022.c
M	src/bc-iec18004.c
M	src/bc-postnet.c
M	src/bc-zint.c
M	src/bc.c
M	src/bc.h
M	src/label-barcode.c

commit ee2801d56d29e847b90849f95a14e2cab518718d
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-17

    Autosize zint barcode when w == 0 && h == 0.

M	src/bc-zint.c

commit 0f73f8658931299b97a4e9126622014e7d86e9ed
Author: Sam Lown <me@samlown.com>
Date:	2010-05-17

    Added libzint as a barcode backend.

    Added libzint as a barcode backend.  Currently only implements the
    GS1-128 barcode.

M	configure.ac
M	src/Makefile.am
A	src/bc-zint.c
A	src/bc-zint.h
M	src/bc.c

commit 94475149f8f8568f62723cb2428ce11d76243f1b
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-16

    Allow for small error in comparison of dimensions.

    In lgl_template_are_templates_identical(), allow for a small
    error when
    comparing dimensions.  Set EPSILON to 0.5pt, which is aproximately
    0.007in or 0.2mm.

M	libglabels/template.c

commit a4d7958651c3cd53424b8ca74b314b8bd71a055f
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-15

    Use g_get_user_config_dir() to locate custom templates.

    Use g_get_user_config_dir() to locate custom template.  By default
    this
    means that custom templates will be stored at
    ~/.config/libglabels/templates
    instead of ~/.glabels.

    Also automatically migrate user custom templates to the new location
    when
    run for the first time.

M	libglabels/Makefile.am
M	libglabels/db.c
M	libglabels/libglabels-private.h

commit a8fe0a4371351910d70fc66f71b347ba904fafa0
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-15

    Update TODO file.

M	TODO

commit 25a0745280c5b37d702bca540a0bc1f78ac8270e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-15

    Updated German translation

M	po/de.po

commit 634f1afa97ecae4589fb82d130de78b0b2724db0
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-05-15

    Fixed filenames in POTFILES.in

M	po/POTFILES.in

commit 25af4f2b739108625226db78aebe4b206535bacb
Author: Daniel Mustieles <danielmustieles@gmail.com>
Date:	2010-05-15

    Updated Spanish translation

M	po/es.po

commit d88c0c2aa50950095fbff6fef46732d586333522
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-12

    Renamed builder files to use '.ui' extension.

M	configure.ac
M	data/Makefile.am
D	data/builder/Makefile.am
A	data/ui/Makefile.am
R100	data/builder/media-select.builder	data/ui/media-select.ui
R100	data/builder/merge-properties-dialog.builder
data/ui/merge-properties-dialog.ui
R100	data/builder/new-label-dialog.builder
data/ui/new-label-dialog.ui
R100	data/builder/object-editor.builder	data/ui/object-editor.ui
R100	data/builder/prefs-dialog.builder	data/ui/prefs-dialog.ui
R100	data/builder/print-op-dialog-custom-widget.builder
data/ui/print-op-dialog-custom-widget.ui
R100	data/builder/property-bar.builder	data/ui/property-bar.ui
R100	data/builder/template-designer.builder
data/ui/template-designer.ui
M	src/media-select.c
M	src/merge-properties-dialog.c
M	src/new-label-dialog.c
M	src/object-editor.c
M	src/prefs-dialog.c
M	src/print-op-dialog.c
M	src/template-designer.c
M	src/ui-property-bar.c

commit 4d51e31d5f526b0885b25be6f94624e5ea4ff1f7
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-11

    Reconciled font size limits in separate spinboxes.

M	data/builder/object-editor.builder

commit f470b3aa6484c6c56cc98d451c6f57708aaf4d53
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-10

    Refinements to text objects

    - Draw outline around text objects.
    - Use a more sophisticated test for determining if cursor is on a text
      object: test against glyphs instead of simple bounds test.
      The test will
      also indicate that cursor is on the object if it is on the
      selection outline.
    - Do word wrap instead of character wrap.

M	src/label-text.c

commit edff98c6ae5250858a3e376a992ba84265a93d6c
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-07

    Added several vendor URLs.

M	templates/vendors.xml

commit 206b483f611441d18db5360800975f2f0d35014b
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-05

    Added sanity tests to template parser

    When parsing a template node, if there is no recognized frame node
    (e.g.
    Label-rectangle), a default full-page frame with a 1x1 layout
    is created.
    Likewise, if a frame has no layout, a default 1x1 layout is created.
    This prevents potential crashes due to typos in the case of typos in
    hand generated templates.

M	libglabels/str.c
M	libglabels/xml-template.c

commit 6509948cb27c7c76349350e1b84aaaf4a52c7e59
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-02

    Added Avery 8658 family of templates.

    Added Avery 8658 family of templates, submitted by Nigel Titley.

M	templates/avery-iso-templates.xml

commit 7d926a37cc8956753d610140fc301b845e3a7de9
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-02

    Do a better job of rounding in lgl_str_format_fraction().

    When a number is determined to be "close enough" to being an integer,
    don't
    just simply cast the number to get the integer value.

M	libglabels/str.c

commit 8df8aedaf99f072cb2739fbbdcfa3440acd415eb
Author: Jim Evins <evins@snaught.com>
Date:	2010-05-01

    Removed obsolete workaround.

    Removed obsolete workaround for Pango Bug#341481.  This is now
    fixed in
    recent versions of Pango.

M	src/label-text.c

commit 8fb4c72166b2052b31bc9b5f02e63c6ae5886a82
Author: Jim Evins <evins@snaught.com>
Date:	2010-04-29

    Minor Cleanup

M	libglabels/db.c
M	src/new-label-dialog.c

commit e322da91fe4a9bdabbc35e1e146e1dada04d6288
Author: Jim Evins <evins@snaught.com>
Date:	2010-04-25

    Added "Up" label to orientation arrow.

    Added an "Up" label to the orientation arrow in the 1st label in the
    mini preview.  Use theme base color for arrow and label.  Don't draw
    arrow if w == h.

M	src/mini-preview.c

commit 7381cfd88fa386dc1fc3a7cce0d0aaac9c4dce45
Author: Jim Evins <evins@snaught.com>
Date:	2010-04-21

    Added test for duplicate templates

    Added test for duplicate pre-defined templates.  Removed duplicate
    template in pearl-iso-templates.xml.  Also added lgl_template_print()
    for
    debugging purposes.

M	libglabels/db.c
M	libglabels/template.c
M	libglabels/template.h
M	templates/pearl-iso-templates.xml

commit 0633489db60773e6e61914d978d9f64bae0fbf13
Author: Jim Evins <evins@snaught.com>
Date:	2010-04-20

    Added decorations to "new label" dialog

    Added new images to decorate each page of the "new label"
    dialog/wizard.

M	data/pixmaps/Makefile.am
A	data/pixmaps/new-confirm.png
A	data/pixmaps/new-rotate.png
A	data/pixmaps/new-select.png
M	src/new-label-dialog.c

commit 58982c93787c62d55e343f6b316643fe5d4f05d6
Author: Jim Evins <evins@snaught.com>
Date:	2010-04-18

    Added ability to edit user-defined templates

M	libglabels/db.c
M	libglabels/db.h
M	src/media-select.c
M	src/mini-preview-pixbuf-cache.c
M	src/mini-preview-pixbuf-cache.h
M	src/template-designer.c
M	src/template-designer.h

commit 08f8cffbc138c302c502b08c4464462d19532bcf
Author: Jim Evins <evins@snaught.com>
Date:	2010-04-04

    Changed packing style for media select widget

    Changed packing style for media select widget so that it will expand
    both horizontally and vertically with new label dialog.

M	data/builder/media-select.builder
M	data/builder/new-label-dialog.builder

commit 3ebe5807c5895cd9ca91233813ad11a9a0916698
Author: Jim Evins <evins@snaught.com>
Date:	2010-04-03

    Allow "new label" and "properties" dialogs to be resizable.

M	src/file.c

commit 1404fad764041cd32b156e43fb3a6417d9e140d9
Author: Filipe Roque <fliproque@gmail.com>
Date:	2010-04-04

    Updated Portuguese translation

M	po/LINGUAS
A	po/pt.po

commit 253e63d0a170859aeae433afb94c8df9908f2e92
Author: Jim Evins <evins@snaught.com>
Date:	2010-04-03

    Added Avery DL33 and look-alike templates.

    DL33 templates provided by Ian Shuttleworth.

M	AUTHORS
M	templates/avery-iso-templates.xml
M	templates/misc-iso-templates.xml

commit 8bbf05ef33758514b23fdd31ed5b0e4d5f128396
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-31

    Fixed selection problem with media select widget

    Fixed selection problem with media select widget by removing cut&paste
    artifact from last update to this widget.

M	src/media-select.c

commit 712fd7eb1a39500a22196feef726d4fb26cf1acb
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-03-29

    Updated German translation

M	po/de.po

commit 07cc165a7d57312cffee8b56a318fe4a597cdb83
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-28

    Added "custom" tab to media select widget

    Added "custom" tab to media select widget.	In this tab, the user can
    launch the template designer or delete an existing user-defined
    template.
    Added notification callbacks to libglabels db subsystem so that the
    media select widget will automatically update when user-defined
    templates
    are added or deleted.  The "edit" button does not do anything yet.

    Also did some visual cleanup to the new label dialog.

    Also include ../libglabels in SUBDIRS in src/ so that libglabels can
    be rebuilt from src/ directory.

M	data/builder/media-select.builder
M	data/builder/new-label-dialog.builder
M	libglabels/db.c
M	libglabels/db.h
M	src/Makefile.am
M	src/media-select.c

commit 270bb68dcf6c6e02af8643bec6e9b82a80542c91
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-03-21

    Updated Slovenian translation

M	po/sl.po

commit cce75a2b36bd94b7771c779c0f0d7b9dd30813b9
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-21

    Added new file to POTFILES.in from last commit.

M	po/POTFILES.in

commit 0a83046c78acea94d80fe2aea239a220445410ab
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-21

    Yet another new "New Label Dialog"

    Re-designed the "New label dialog" again.  This time as a "wizard" or
    GtkAssistant.  This is an attempt to keep the easy navigation of the
    2.2.x dialog, to keep the added meta data and preview of the latest
    incarnation, and to maintain a compact dialog that should work
    on fairly
    small displays such on netbooks (probably not hand-helds still).

M	data/builder/Makefile.am
A	data/builder/media-select.builder
M	data/builder/new-label-dialog.builder
M	po/POTFILES.in
M	src/Makefile.am
M	src/file.c
D	src/media-combo-menu-item.c
D	src/media-combo-menu-item.h
D	src/media-combo-menu.c
D	src/media-combo-menu.h
D	src/media-combo.c
D	src/media-combo.h
A	src/media-select.c
A	src/media-select.h
M	src/new-label-dialog.c
M	src/new-label-dialog.h
D	src/rotate-label-button.c
D	src/rotate-label-button.h

commit fd8e5102e03cf35277af2a99a15d5b5402de5b77
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-03-20

    Updated German translation

M	po/de.po

commit 0f42e39d7e5cacf48e972b50b882fd955288ffaf
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-18

    Escape URLs in markup.

    Escape URLs in vendor and product markup.  Also rearranged the layout
    of the
    new "new label" dialog -- I am still not happy with navigating
    the templates
    with this new dialog.  I will probably try for a hybrid between
    this and
    the 2.2.x dialog.

M	data/builder/new-label-dialog.builder
M	src/new-label-dialog.c

commit 1d1965d625e85601514f7c6dcf5ef53a34859e5d
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-17

    Added missing file from last commit.

A	templates/pearl-iso-templates.xml

commit 3cc850d2ede031b82a21781c029370407b90a980
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-17

    Reconciled label database with 2.2 branch

    Merged recent template additions from 2.2 branch + some cleanup.

M	AUTHORS
M	templates/Makefile.am
M	templates/glabels-2.3.dtd
M	templates/misc-iso-templates.xml

commit 7356e898494b7d68c0fc9063f2ec0fdb867bf471
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-16

    Catching up on template submissions.

M	AUTHORS
M	templates/misc-iso-templates.xml
M	templates/misc-us-templates.xml

commit fad9e52268012e6e046cd989d708026d6a244e70
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	2010-03-15

    Add Norwegian language entry.

M	po/LINGUAS

commit 5c38897c7d89d517c010e1f8a2271e55bc7f31d3
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	2010-03-15

    Added Norwegian bokmål translation

A	po/nb.po

commit 7c7efdf6f7d84030b13761f460eeef61ae0c2fc3
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-13

    Make fractions more readable

    Use Unicode superscripts and subscripts to format fractions.
    Should be
    more readable than the uggly 1_5/8.

M	libglabels/str.c

commit 84dfd774bae16f8bdc9dde21baabd41cc7638dd0
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-13

    Some new label dialog cleanup

    Draw arrow in mini preview relative to first label, not the entire
    sheet.
    This should be more obvious what the arrow is indicating, before
    it could
    have been interpreted as the feed direction.

    Don't put an empty line at the end of the list of similar templates.

M	src/mini-preview.c
M	src/new-label-dialog.c

commit 4abc5d0a6552b48c0190e5a2baff4a6eb14b9281
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-10

    Reconciled POTFILES.in with last commit.

M	po/POTFILES.in

commit 44ad3d257b9594674604fa82215e72759b40de11
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-10

    Created new "New label dialog"

    Created a new re-designed "New label dialog."  The dialog now shows
    meta-data
    for the selected template, including hyperlinks to vendor and product
    websites, if available.  The new dialog is more compact and thus
    should
    be usable on small displays such as netbooks (probably not
    hand-helds).

    The menu is somewhat clumbsy to navigate still -- will need to
    reorganize
    to make navigation easier and more intuitive.

M	data/builder/Makefile.am
D	data/builder/media-select.builder
A	data/builder/new-label-dialog.builder
M	libglabels/db.c
M	libglabels/db.h
M	libglabels/str.c
M	libglabels/str.h
M	libglabels/template.c
M	libglabels/template.h
M	src/Makefile.am
A	src/media-combo-menu-item.c
A	src/media-combo-menu-item.h
A	src/media-combo-menu.c
A	src/media-combo-menu.h
A	src/media-combo.c
A	src/media-combo.h
D	src/media-select.c
D	src/media-select.h
M	src/mini-preview.c
M	src/mini-preview.h
M	src/new-label-dialog.c
M	src/rotate-label-button.c
M	src/str-util.c
M	src/str-util.h

commit d94c47da20d726831e16f8cd720d64d26ce85d2b
Author: Jim Evins <evins@snaught.com>
Date:	2010-03-02

    Minor Cleanup

M	COPYING.README_FIRST
M	README
M	configure.ac
M	libglabels/xml-template.c
M	libglabels/xml-vendor.c
M	src/cairo-label-path.c
M	src/cairo-markup-path.c
M	src/label-line.c
M	src/label-text.c
M	src/template-designer.c
M	templates/avery-iso-templates.xml
M	templates/avery-other-templates.xml
M	templates/avery-us-templates.xml
M	templates/brother-other-templates.xml
M	templates/categories.xml
M	templates/dymo-other-templates.xml
M	templates/maco-us-templates.xml
M	templates/misc-iso-templates.xml
M	templates/misc-other-templates.xml
M	templates/misc-us-templates.xml
M	templates/paper-sizes.xml
M	templates/uline-us-templates.xml
M	templates/vendors.xml
M	templates/worldlabel-us-templates.xml
M	templates/zweckform-iso-templates.xml

commit 4aa7c2ac0a4578c2213b8964dff098f039eef703
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-28

    Cleanup of libglabels documentation.

    Added documentation for new functionality in 3.0, including the vendor
    database and a new "natural order" compare function for sorting
    part numbers.

M	docs/libglabels/libglabels-3.0-docs.sgml
M	docs/libglabels/libglabels-3.0-sections.txt
M	docs/libglabels/tmpl/db.sgml
M	docs/libglabels/tmpl/str.sgml
M	docs/libglabels/tmpl/template.sgml
A	docs/libglabels/tmpl/vendor.sgml
A	docs/libglabels/tmpl/xml-vendor.sgml
M	libglabels/str.c
M	libglabels/template.c
M	libglabels/vendor.c
M	libglabels/xml-template.c

commit 12f3f040b340c30188e4953b9f6a51263206f8ab
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-28

    Updated libglabels documentation to support parallel installation

M	.gitignore
M	docs/libglabels/Makefile.am
R094	docs/libglabels/libglabels-docs.sgml
docs/libglabels/libglabels-3.0-docs.sgml
R100	docs/libglabels/libglabels-overrides.txt
docs/libglabels/libglabels-3.0-overrides.txt
R099	docs/libglabels/libglabels-sections.txt
docs/libglabels/libglabels-3.0-sections.txt
R100	docs/libglabels/libglabels.types
docs/libglabels/libglabels-3.0.types
R100	docs/libglabels/tmpl/libglabels-unused.sgml
docs/libglabels/tmpl/libglabels-3.0-unused.sgml
M	docs/libglabels/tmpl/template.sgml
M	docs/libglabels/tmpl/units.sgml

commit 7838152cdfea71a3676e40593ab4cb4a30484ffe
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-28

    Additional changes to support parallel installation

    Changed GETTEXT_PACKAGE to glabels-3.0 and renamed help files
    to support
    parallel installation with other versions of glabels.

M	.gitignore
M	configure.ac
R100	help/C/glabels.xml	help/C/glabels-3.0.xml
M	help/Makefile.am
R100	help/glabels.omf.in	help/glabels-3.0.omf.in
M	po/POTFILES.in
M	src/ui-commands.c

commit 69f4e1fc6a8a731d8a73e020810aef5a895fba5b
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-26

    Cleanup of mime support

    Removed old mime support files.  Renamed mime icon file.

M	.gitignore
M	Makefile.am
M	data/mime/Makefile.am
R100	data/mime/glabels.xml.in	data/mime/glabels-3.0.xml.in
D	data/mime/glabels.applications
D	data/mime/glabels.keys.in
D	data/mime/glabels.mime
M	data/pixmaps/Makefile.am
R100	data/pixmaps/glabels-3.0-application-x-glabels.png
data/pixmaps/application-x-glabels.png

commit 65b8b97bc7fece41dcbba69f4ef4533c4fc6b2e5
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-25

    Updated mimetype icon.

    Updated mimetype icon to look more modern.

M	data/pixmaps/glabels-3.0-application-x-glabels.png

commit 5f40d24d1843a5b124c9f638bf9d57e7fead5b4f
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-24

    Rename executables and key files to support parallel installation

    Renamed glabels and glabels-batch to glabels-3 and glabels-3-batch
    to support
    parallel installation with other versions of glabels.  Also renamed
    and
    reconciled man pages and icon files.

M	.gitignore
M	data/desktop/Makefile.am
R073	data/desktop/glabels.desktop.in
data/desktop/glabels-3.0.desktop.in
M	data/man/Makefile.am
A	data/man/glabels-3-batch.1
R095	data/man/glabels.1	data/man/glabels-3.1
M	data/mime/glabels.keys.in
M	data/pixmaps/Makefile.am
R100	data/pixmaps/glabels-application-x-glabels.png
data/pixmaps/glabels-3.0-application-x-glabels.png
R100	data/pixmaps/glabels.png	data/pixmaps/glabels-3.0.png
M	src/Makefile.am
M	src/glabels.c
M	src/template-designer.c

commit a68f91d57b2eac4a624a0e0c632338b88581d23d
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-24

    Rename glabels data directory to support parallel installation.

    Renamed glabels data directory from glabels to glabels-3.0 to
    ultimately
    support parallel installation with older versions of glabels.

M	configure.ac
M	data/builder/Makefile.am
M	data/pixmaps/Makefile.am
M	libglabels/Makefile.am
M	libglabels/libglabels-3.0.pc.in
M	src/Makefile.am
M	src/glabels.c
M	src/media-select.c
M	src/merge-properties-dialog.c
M	src/object-editor.c
M	src/prefs-dialog.c
M	src/print-op-dialog.c
M	src/template-designer.c
M	src/ui-commands.c
M	src/ui-property-bar.c
M	templates/Makefile.am

commit c69edbd06103ad457c2fa87369094f17d7fa9030
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-23

    Make libglabels parallel installable with other versions

    Made libglabels install as libglabels-3.0 to support parallel
    installation
    with earlier versions.  Performed some related cleanup associated with
    this move, including installing libglabels.h into
    include/libglabels-3.0
    and installing all other include files in
    include/libglabels-3.0/libglabels/.

    More work is still need to support parallel installation of the
    glabels
    application.

M	.gitignore
D	INSTALL
M	autogen.sh
R079	configure.in	configure.ac
M	data/desktop/Makefile.am
M	data/mime/Makefile.am
M	libglabels/Makefile.am
R066	libglabels/libglabels.pc.in	libglabels/libglabels-3.0.pc.in
M	src/Makefile.am
M	src/combo-util.c
M	src/file.c
M	src/font-history-model.c
M	src/font-util.c
M	src/glabels-batch.c
M	src/glabels.c
M	src/media-select.c
M	src/merge-evolution.c
M	src/merge.c
M	src/mini-label-preview.c
M	src/mini-preview-pixbuf-cache.c
M	src/mini-preview.c
M	src/prefs-model.c
M	src/prefs.c
M	src/print-op.c
M	src/print.c
M	src/rotate-label-button.c
M	src/template-designer.c
M	src/template-history-model.c
M	src/xml-label-04.c
M	src/xml-label.c
M	templates/Makefile.am

commit 50f04182df385b4d535ea22de6b8b44c1545f53d
Author: Joe Hansen <joedalton2@yahoo.dk>
Date:	2010-02-23

    Updated Danish translation

A	po/da.po

commit 242db8f321477a9cb3a904928a65aeec0fc292b3
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	2010-02-23

    Added da to list of languages

M	po/LINGUAS

commit 4c65998c8e09c354a93180a39fd35406c28b7dfd
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	2010-02-19

    Added es to DOC_LINGUAS

M	help/Makefile.am

commit 855164906135d8bf586776b628a4e758f9bf8dbe
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	2010-02-19

    Added initial Spanish translation

A	help/es/es.po

commit fc936bcec26a162cbef176125c9ddafa34fa0074
Author: Petr Kovar <pknbe@volny.cz>
Date:	2010-02-18

    Fix Czech translation by Marek Cernocky

M	po/cs.po

commit 9959f357a8ab37756c08ef5d63cac2213ab56897
Author: Petr Kovar <pknbe@volny.cz>
Date:	2010-02-18

    Add Czech help translation by Marek Cernocky

M	help/Makefile.am
A	help/cs/cs.po
A	help/cs/figures/main-window-empty.png
A	help/cs/figures/merge-ex1-1.png
A	help/cs/figures/merge-ex1-2.png
A	help/cs/figures/merge-ex1-3.png
A	help/cs/figures/merge-ex1-4.png
A	help/cs/figures/merge-ex2-1.png
A	help/cs/figures/merge-ex2-2.png
A	help/cs/figures/merge-ex2-3.png
A	help/cs/figures/merge-ex2-4.png
A	help/cs/figures/object-editor-sidebar.png
A	help/cs/figures/print-copies.png
A	help/cs/figures/print-merge.png

commit eb35f13b2425449c6ec18b5ac5e3dd43169c3256
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-02-12

    Updated Slovenian translation

M	po/sl.po

commit fb41df013f26d24c2cb6d395446a7d142716977b
Author: Petr Kovar <pknbe@volny.cz>
Date:	2010-02-11

    Update Czech translation by Marek Cernocky

M	po/cs.po

commit 8f71968174b552bd57d342f2deebf58ef8d2ca81
Author: Jim Evins <evins@snaught.com>
Date:	2010-02-03

    Added support for elliptical labels and markup

    Added support for elliptical labels.
    Added support for elliptical markup lines.

M	docs/libglabels/tmpl/template.sgml
M	docs/libglabels/tmpl/xml-template.sgml
M	libglabels/template.c
M	libglabels/template.h
M	libglabels/xml-template.c
M	src/cairo-label-path.c
M	src/cairo-markup-path.c
M	templates/glabels-2.3.dtd

commit 1dd19c88400a07af8f9eb33e05d967d19da91b08
Author: Jim Evins <evins@snaught.com>
Date:	2010-01-28

    Tweaks to glView.

    - Draw drop shadow behind label.
    - Fixed starting grid lines on round labels.
    - Adjust grid spacing based on selected units:
      Inches -> 0.125 in
      mm     -> 5 mm
      Points -> 10 pt

M	src/units-util.c
M	src/units-util.h
M	src/view.c
M	src/view.h

commit 8fe68d63b2acb46a133e9e643d45657faf54ee50
Author: Jim Evins <evins@snaught.com>
Date:	2010-01-24

    Fixed NULL warning when copying uninitialized barcode objects.

    Make sure both arguments to g_ascii_strcasecmp() are non NULL.

M	src/label-barcode.c

commit 52e8083629f0a9316b7df2bf6b400de8d6bc260e
Author: Jim Evins <evins@snaught.com>
Date:	2010-01-24

    Update TODO list based on current status and plans.

M	TODO

commit efcdc61b8111ba20416592f02da224468cb5c616
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-01-20

    Updated German translation

M	po/de.po

commit a490fde76c660355393bebff2fe48ec4daa3bfd7
Author: Jim Evins <evins@snaught.com>
Date:	2010-01-18

    Don't allow message bars to stack up in media select widget.

    Remove old glMessageBar when attempting to load glMediaSelect
    tree views.
    This will make sure if a new glMessageBar is needed, it won't
    just stack
    up old message bars.

M	src/media-select.c

commit c840dc081304d5f1b6bba2009324c83dea0d0d7f
Author: Jim Evins <evins@snaught.com>
Date:	2010-01-18

    Cleanup and addition of label templates.

    Reconciled Worldlabel part numbers with current online information.
    Added
    some additional templates and their Avery look-alikes.

M	templates/avery-us-templates.xml
M	templates/worldlabel-us-templates.xml

commit 938da1f73ef790eb1691d0037ba0686cfececee5
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-01-15

    Added fr to DOC_LINGUAS

M	help/Makefile.am

commit 0a1c588f5bb1766a5daef21d0427b37c11489ea6
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-01-14

    Removed trailing whitespaces from POTFILES.in

M	po/POTFILES.in

commit d49f1149ff6d35d100444b198d532f84c26ccfc3
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2010-01-14

    Added missing template files to POTFILES.in

M	po/POTFILES.in

commit 73581f4f9b30bd423f930c3fa1bc3942bb5694fd
Author: Petr Kovar <pknbe@volny.cz>
Date:	2010-01-13

    Updated Czech translation by Marek Cernocky

M	po/cs.po

commit 9b783558c733321de3e7be150cf3cbf21ddfa985
Author: Claude Paroz <claude@2xlibre.net>
Date:	2010-01-09

    Add French translation of manual

    Contributed by Alain Lojewski and Claude Paroz

A	help/fr/figures/main-window-empty.png
A	help/fr/figures/merge-ex1-1.png
A	help/fr/figures/merge-ex1-2.png
A	help/fr/figures/merge-ex1-3.png
A	help/fr/figures/merge-ex1-4.png
A	help/fr/figures/merge-ex2-1.png
A	help/fr/figures/merge-ex2-2.png
A	help/fr/figures/merge-ex2-3.png
A	help/fr/figures/merge-ex2-4.png
A	help/fr/figures/object-editor-sidebar.png
A	help/fr/figures/print-copies.png
A	help/fr/figures/print-merge.png
A	help/fr/fr.po

commit 091eea6d387183ae34da9a59dbe6ce784e15e544
Author: Jim Evins <evins@snaught.com>
Date:	2010-01-06

    Delay freeing of pixbuf cache in gl_label_finalize()

    Make sure all objects have been unreferenced before freeing pixbuf
    cache --
    including copies in undo/redo stacks.

M	src/label.c

commit 9f99c2dc866740bf252fa6f0e6e28d165ae3606f
Author: Jim Evins <evins@snaught.com>
Date:	2010-01-03

    Use "natural" sorting order for part numbers

    Use a "natural" sorting order for part numbers.  I.e. numeric
    portions are
    sorted numerically rather than character by character, such that
    "A20" will precede "A100".

    Also found and fixed a couple minor inconsistencies in the template
    data base
    while debugging the new sorting code.

M	libglabels/db.c
M	libglabels/str.c
M	libglabels/str.h
M	templates/avery-other-templates.xml
M	templates/avery-us-templates.xml

commit 90cd31f442b5d0d115ea72fe828414ad32c9e944
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-30

    Reorganizing template database

    Split out uline-us-templates.xml from avery-us-templates.xml.
    Also removed
    the single "IP Invent It!" alias.  I could not find this brand online
    -- I
    assume it was a mis-identification -- this was a single alias for
    full-sheet
    labels which is so generic anyway.

M	templates/Makefile.am
M	templates/avery-us-templates.xml
C053	templates/vendors.xml	templates/uline-us-templates.xml
M	templates/vendors.xml

commit a5de57d22d62436c5d1014d376ecd22dff8c7853
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-30

    Reorganizing label database

    Reorganized avery-us-templates.xml to remove deprecated Alias tags.
    Also,
    split out separate worldlabel-us-templates.xml and
    maco-us-templates.xml
    files.

M	templates/Makefile.am
M	templates/avery-us-templates.xml
A	templates/maco-us-templates.xml
A	templates/worldlabel-us-templates.xml

commit f09e62c27585cbf067d6bae33ecd4496d17b1ebc
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-12-28

    Updated German translation

M	po/de.po

commit b0fcb9d96c1719d1841294dc76f81893c600ace9
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-26

    Handle zoom-to-fit properly for unrealized view

    Delay calculations in gl_view_zoom_to_fit() if window has not been
    realized
    yet.  Do calculations in realize callback.

M	src/view.c

commit 03609218a247efb40b71dc10827feff80c05dce2
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-23

    Fixed typo

    Fixed typo.

M	src/label.c

commit 73b70cb6f49f732eb826f145cd1c229f707abc7f
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-22

    Added undo/redo feature

    Checkpoint the label state before each user initiated change.  These
    checkpoint states are kept on an undo stack.  As the user pops items
    from the undo stack, the current state is pushed onto a redo stack.

M	src/file.c
M	src/glabels-batch.c
M	src/label-barcode.c
M	src/label-barcode.h
M	src/label-box.c
M	src/label-box.h
M	src/label-ellipse.c
M	src/label-ellipse.h
M	src/label-image.c
M	src/label-image.h
M	src/label-line.c
M	src/label-line.h
M	src/label-object.c
M	src/label-object.h
M	src/label-text.c
M	src/label-text.h
M	src/label.c
M	src/label.h
M	src/merge-properties-dialog.c
M	src/object-editor.c
M	src/template-designer.c
M	src/ui-commands.c
M	src/ui-commands.h
M	src/ui-property-bar.c
M	src/ui.c
M	src/view-barcode.c
M	src/view-box.c
M	src/view-ellipse.c
M	src/view-image.c
M	src/view-line.c
M	src/view-text.c
M	src/view.c
M	src/window.c
M	src/xml-label-04.c
M	src/xml-label.c

commit ab665830afa2c549d3b3d76a5a3f20affcc69f57
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-17

    Refactored MediaSelect code

    - Renamed glWdgtMediaSelect to glMediaSelect
    - Created new glMessageBar widget derived from GtkInfoBar -- API
    is modelled
      after GtkMessageDialog.  Used this new widget to provide
      notification
      of empty search results in the 2 glMediaSelect tabs.
    - Simple code formatting changes.

M	data/builder/Makefile.am
R084	data/builder/wdgt-media-select.builder
data/builder/media-select.builder
M	po/POTFILES.in
M	src/Makefile.am
R069	src/wdgt-media-select.c src/media-select.c
A	src/media-select.h
A	src/message-bar.c
A	src/message-bar.h
M	src/new-label-dialog.c
D	src/wdgt-media-select.h

commit d677458f28c10fe6e0a5663a67aa8edd87424e36
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-16

    Minor cleanup.

    Removed extra includes.

M	src/view-barcode.h
M	src/view-box.h
M	src/view-ellipse.h
M	src/view-image.h
M	src/view-line.h
M	src/view-text.h

commit 3bd29145040c79580b03e4e0e430afd6164ef806
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2009-12-17

    Added sl for Slovenian translation

M	po/LINGUAS

commit ee83ad3f392f9bbf630cbf32fdeac436a78f391b
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2009-12-17

    Updated Slovenian translation

A	po/sl.po

commit cbfbbff95d01ff6daffbb24159aa6fa0a4ae2e1c
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-15

    Use glFieldButton instead of GtkComboBox for field selection

    Extended glFieldButton so that it could be used instead of a
    GtkComboBox
    for field selectors in the object editor.  This unifies the dropdown
    style
    with the "Insert field" button on the text editor page.

M	data/builder/object-editor.builder
M	src/field-button.c
M	src/field-button.h
M	src/object-editor-bc-page.c
M	src/object-editor-data-page.c
M	src/object-editor-fill-page.c
M	src/object-editor-image-page.c
M	src/object-editor-line-page.c
M	src/object-editor-private.h
M	src/object-editor-shadow-page.c
M	src/object-editor-text-page.c
M	src/object-editor.c

commit 1bddb489410c3e82ced613cd500080c5e0e94790
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-15

    Minor cleanup of label.c

    Removed unused variables.  Added a couple explicit casts.

M	src/label.c

commit 0f2ea2061dd8f4e957c9b5241842de578cb78d0b
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-13

    Fixed crash when manipulating barcode

    Failed to initialize line_color_node for barcodes in
    object_changed_cb().

M	src/object-editor.c

commit be84e5a72c2ffc412fcf7905115a78b8faa6820b
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-12

    Always show images for object menuitems

    Because of the visual nature of the actions of these menuitems,
    the visual
    cues provided by these icons should help improve the ability to
    find the
    correct menuitem -- I know it does for me ( I don't always know
    my left
    from my right :-))

M	src/ui.c

commit 4e81eb872bef66a6b76e9ffd74c09a83323f802e
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-12

    Refactored Cut/Copy/Paste code

    Now offers everything (glabels xml, text, or image) on the standard
    clipboard.
    Will now paste text or images from other programs as new objects.

M	src/label-image.c
M	src/label-image.h
M	src/label-object.c
M	src/label-object.h
M	src/label-text.c
M	src/label-text.h
M	src/label.c
M	src/label.h
M	src/ui-commands.c
M	src/ui.h
M	src/window.c

commit 3444d934754fcc305af29a8c05f19792c77b89e2
Author: Alessandro Zummo <a.zummo@towertech.it>
Date:	2009-12-08

    Allow merge source to be stdin

    Use the filename "-" to indicate that the merge source is to be
    taken from
    standard input (stdin).  This is primarily intended for the
    glabels-batch
    program.

M	src/merge-text.c

commit 85bfb8a64853db59f56410670675015a8aa716e5
Author: Alessandro Zummo <a.zummo@towertech.it>
Date:	2009-12-08

    Fix glabels-batch crash

    The template_history subsystem needs to be initialized.

M	AUTHORS
M	src/glabels-batch.c

commit 02157b5db05cdf1cca285454c83bccb909ee99b8
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-07

    Install correct DTD file

    Reconciled templates/Makefile.am with recent name change of DTD file.

M	templates/Makefile.am

commit 2d0ad672af26c3bc863e0a56a65a6be89944ced8
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-06

    Libglabels mods to support reorganization of template database

    Added "equiv" attribute to "Template" tag.	The "equiv" attribute
    works
    differently than the "Alias" tag: instead of defining a simple
    alias for
    the current template struct, it says to use the equivalent part as the
    prototype for this template.  The template could override (or append)
    unique meta data for this part number.  The "Alias" tag is still
    supported,
    but is deprecated.

    Added a "product_url" attribute to the "Meta" tag.

    Added a "vendor.xml" file which contains a database of vendors
    and their
    primary url.  This file has only been populated with a few examples
    so far.

    A new DTD file has been created to describe the above changes.

    The "Avery 5160" family in "avery-us-templates.xml", has been
    organized in
    the new scheme as an example.

M	libglabels/Makefile.am
M	libglabels/db.c
M	libglabels/db.h
M	libglabels/libglabels-private.h
M	libglabels/template.c
M	libglabels/template.h
A	libglabels/vendor.c
C059	libglabels/libglabels-private.h libglabels/vendor.h
M	libglabels/xml-template.c
M	libglabels/xml-template.h
A	libglabels/xml-vendor.c
C061	libglabels/libglabels-private.h libglabels/xml-vendor.h
M	templates/Makefile.am
M	templates/avery-us-templates.xml
R091	templates/glabels-2.2.dtd	templates/glabels-2.3.dtd
A	templates/vendors.xml

commit 5f45a608055226f06cd013a414439293174121f4
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-03

    Improved object editor default page selection

    Whenever the object is changed, an attempt is made to either keep
    the same
    page active or if that page is no longer visible, set to the first
    visible
    page.

M	src/object-editor.c

commit 520ea9f42482012404000e7eebe436c94bca4440
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-03

    Follow focus when setting sensitivity of selection verbs

    The previous commit did not completely work right.	Selection verb
    sensitivity now follows the focus of the glView widget.

M	src/ui.c
M	src/ui.h
M	src/window.c

commit 8ae9003ee19f2c508452ca5a8534af6caf7a6b11
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-12-03

    Updated German translation

M	po/de.po

commit 2d0b321b49e0dcf8701d000bc2c5f9f4673689f8
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-02

    Don't intercept copy/paste operations intended for other widgets

    Fixes bugs 1683799, 2833194 and probably 1978142.  Only enable
    copy/paste
    verbs if the focused widget is the glView.	Otherwise let these
    operations
    propagate to the focused widget to be handled natively.

M	.gitignore
M	src/label.c
M	src/label.h
M	src/ui-commands.c
M	src/ui.c
M	src/ui.h
M	src/window.c

commit 9ad72e4b3df7122496e84af4bbc1013738145f5b
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-02

    Control sensitivity of paste verb

    Track the availability of data on the private glabels clipboard
    to control
    the sensitivity of the paste verb.

M	src/ui.c
M	src/ui.h
M	src/window.c

commit c7934cf38d69f29e539a4110de36e88c8ed070bb
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-02

    Some string cleanup

    - Replaced "x" with UTF D7 "TIMES" symbol in dimension strings
    - Separated "diameter" into its own translatable string

M	src/wdgt-media-select.c

commit ff3a495ea186e7ff5d68a589312b3e2ef5c7d35e
Author: Jim Evins <evins@snaught.com>
Date:	2009-12-02

    Refactored glLabel and glView

    Refactored glLabel and glView code:

    - Moved selection tracking and storage of current label defaults from
      glView to glLabel.

    - Removed complexity of synchronizing lists of labels between
    glView and
      glLabel.

    - Current defaults for new objects are now kept in glLabel,
    not glView.

    - Now follows a more faithful MVC pattern.	As a consequence, the
      Object editor and property bar are now fully independent views of
      glLabel and do not need to be aware of glView at all.

    - Refactoring reduced total SLOC count by about 1100 lines of code.

    - This should potentially simplify the addition of an Undo/Redo
      capability, because selections and object lists do not need
      to be kept synchronized.

M	.gitignore
M	data/builder/object-editor.builder
M	po/POTFILES.in
M	src/Makefile.am
M	src/cairo-label-path.c
M	src/cairo-label-path.h
M	src/cairo-markup-path.c
M	src/color-swatch.c
M	src/file.c
M	src/glabels-batch.c
M	src/label-barcode.c
M	src/label-box.c
M	src/label-ellipse.c
M	src/label-image.c
M	src/label-line.c
M	src/label-object.c
M	src/label-object.h
M	src/label-text.c
M	src/label-text.h
M	src/label.c
M	src/label.h
M	src/object-editor-bc-page.c
M	src/object-editor-data-page.c
M	src/object-editor-fill-page.c
M	src/object-editor-image-page.c
M	src/object-editor-line-page.c
M	src/object-editor-lsize-page.c
M	src/object-editor-private.h
M	src/object-editor-shadow-page.c
M	src/object-editor-size-page.c
M	src/object-editor-text-page.c
M	src/object-editor.c
M	src/object-editor.h
M	src/print-op-dialog.c
M	src/print-op.c
M	src/print.c
M	src/ui-commands.c
M	src/ui-property-bar.c
M	src/ui-property-bar.h
M	src/ui-sidebar.c
M	src/ui-sidebar.h
M	src/ui.c
M	src/view-barcode.c
M	src/view-barcode.h
M	src/view-box.c
M	src/view-box.h
M	src/view-ellipse.c
M	src/view-ellipse.h
M	src/view-image.c
M	src/view-image.h
M	src/view-line.c
M	src/view-line.h
D	src/view-object.c
D	src/view-object.h
M	src/view-text.c
M	src/view-text.h
M	src/view.c
M	src/view.h
M	src/window.c
M	src/window.h
M	src/xml-label.c

commit 280d7ace9c2dd028515ecad81b4003109ef1b5d3
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-12-02

    Updated German translation

M	po/de.po

commit 82bdbd24494f2351389c3e2eceef20e21ac93f46
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-22

    Added additional file to .gitignore.

M	.gitignore

commit b87405cab3c8fba70b5261280b5ed1e3de0871bd
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-22

    Use accessor functions instead direct access

    Replaced direct access of widget fields with accessor functions.
    This round
    catches flags and allocations which now have accessor functions in
    Gtk 2.18.
    As a result, the master branch now requires Gtk-2.18/GNOME-2.28.

M	configure.in
D	docs/libglabels/libglabels-decl-list.txt
M	src/color-combo-button.c
M	src/color-combo.c
M	src/color-swatch.c
M	src/field-button.c
M	src/font-combo.c
M	src/font-sample.c
M	src/glabels-batch.c
M	src/merge-text.c
M	src/mini-label-preview.c
M	src/mini-preview.c
M	src/object-editor-edit-page.c
M	src/view.c
M	src/wdgt-chain-button.c

commit 841296e9d9882d93af94b8dc08765a42c9a3bb9e
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-18

    Updated AUTHORS and .gitignore

    Added Mario to AUTHORS so that he gets proper credit.

    Added another pattern to .gitignore.

M	.gitignore
M	AUTHORS

commit d6fb9999d0996c1c3528de406e486efce5bb5511
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-18

    Fixed focus behavior of view canvas

    Fixes bug #2899305.  Don't just automatically steal focus when
    entering
    canvas.  Require a click to get focus back.

M	src/view.c

commit 971a85643f25304fe1eda917f4771cd498a0d89c
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-17

    Reference glabels.org website

    Change all references to the glabels.sourceforge.net website to the
    glabels.org alias.	Change namespace for 2.3 development version to
    glabels.org/xmlns/2.3/.

M	MESSAGE-OF-DOOM
M	README
M	data/man/glabels.1
M	glabels.doap
M	libglabels/xml.h
M	src/ui-commands.c
M	src/xml-label.c

commit 0f07e3243d10acd2343adbc711bee89baf568023
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-08

    Expose all supported fields in vcard backend

    The original version of the vcard merge backend only supported
    3 hard-coded
    fields.  This modification exposes all supported fields, via the
    libebook
    API.  It also uses the "pretty names" for field names, exactly as the
    evolution merge backend does.

    An "off-by-one" error in the evolution merge backend has also been
    fixed --
    exposing one more field.

M	src/merge-evolution.c
M	src/merge-vcard.c

commit 474a40371a2adeadb61ae710c52f5591b7363093
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-07

    Removed unused defines

    Removed unused defines from INCLUDES.

M	libglabels/Makefile.am
M	src/Makefile.am

commit 06b2f56f9594ec0bde746aab774ccb4aa33b9dbf
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-07

    Added support for Code93 barcode.

    Added glue to support for Code93 barcode, which is already supported
    by
    the GNU Barcode Library.

M	src/bc-gnubarcode.c
M	src/bc.c

commit fc18f8be1747cb29d33ee7bdf05b354318778017
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-05

    Automatically generate ChangeLog when building dist

    Automatically generate ChangeLog when building distributions using
    'git log'.

M	.gitignore
M	ChangeLog
M	Makefile.am

commit a2b827198e23b23ed064b822c9331813758c2856
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-05

    Caught up on user submitted templates.

    Added user submitted templates and acknowledgements.

M	AUTHORS
M	templates/misc-iso-templates.xml
M	templates/zweckform-iso-templates.xml

commit 8016d6f4fe8f4970ce615d53d2d541be6afef850
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-04

    Fixed merge inconsistencies and crash

    merge.c:
	    Fixed crash when trying to print when a "key" radio has
	    been selected
	    but no key has been selected yet.

    object-editor-*-page.c:
	    Fixed potential inconsistencies with "key" radio buttons
	    when a merge
	    source has not been selected but the field indicates that
	    it is using a
	    merge key.	This can happen when opening a glabels file that
	    has a merge
	    type not supported by the current instance of glabels.

    xml-label.c:
	    Also when parsing a merge field that has a merge type not
	    supported,
	    don't continue parsing it.

M	src/merge.c
M	src/object-editor-bc-page.c
M	src/object-editor-data-page.c
M	src/object-editor-fill-page.c
M	src/object-editor-image-page.c
M	src/object-editor-line-page.c
M	src/object-editor-shadow-page.c
M	src/object-editor-text-page.c
M	src/xml-label.c

commit dcf2b94b88479c283abdf7b65affd77ea5919ce9
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-03

    Don't allow clipping to affect outlines

    Remove clipping region before printing outlines of labels.

M	src/print.c

commit 6cd2cf8a1b548608959dac94229c634e1f3a0f7e
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-03

    Clip to outline restored

    During my last commit & push, I left the clip to outline line
    commented out
    which is an artifact of my testing.

M	src/print.c

commit e0db4b1264c2d87b82092987dc4a5d0d803f352c
Author: Jim Evins <evins@snaught.com>
Date:	2009-11-03

    Added simple envelope support

    Added several envelope sizes to page-sizes.xml.  Also reversed
    the rotation
    direction when printing rotated labels to better match the
    orientation of
    envelope feeders.

M	src/print.c
M	templates/paper-sizes.xml

commit 97c5b449004606b377f8a75ec65c56019e118882
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-11-03

    Updated German translation

M	po/de.po

commit 397ea71c27af9920b71c3fbf197ffe8a10d6583b
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-30

    Copy all fields when duplicating glMergeText object.

    Copy n_fields_max field when duplicating glMergeText object.

M	src/merge-text.c

commit 8fd8b99f7edf0decfc3ea58fa5931c853c96fd0e
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-29

    Harvest line 1 of CSVs for field names

    Added capability to text merge backend to harvest line 1 for field
    names (keys).

M	src/merge-init.c
M	src/merge-text.c
M	src/merge-text.h

commit 19428af40ad4f1c6c5fc947046429bf22ca4a13b
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-26

    Make libglabels include guards more unique

    Renamed libglabels include guards to be more unique.  For example,
    the include
    guard for xml.h was renamed from __XML_H__ to __LGL_XML_H__, which
    is less
    likely to collide with other similarly named macros.

M	libglabels/category.h
M	libglabels/db.h
M	libglabels/paper.h
M	libglabels/str.h
M	libglabels/template.h
M	libglabels/xml-category.h
M	libglabels/xml-paper.h
M	libglabels/xml-template.h
M	libglabels/xml.h

commit ab8bb6ad208670b587d23f55c9edb5ba8c754050
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-26

    Improved menu positioning functions

    Use requisition instead of allocation for menu size (the allocation
    does not
    exist for a newly realized menu, so the position is not always
    right the
    first time it is popped up, causing a mangled menu position with ugly
    scroll buttons.)

    Query for the actual screen of "this" instead of blindly using
    the default
    screen.

M	src/color-combo-button.c
M	src/color-combo.c
M	src/field-button.c
M	src/font-combo.c

commit 4d71d3f3e3cc8300be41c58867f9386d53e4b760
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-25

    Refactored glPrefsModel; Added Units module to libglabels

    Refactored glPrefsModel, reconciling its style with glFontsHistory,
    etc.

    Added Units module to libglabels, consolidating most utilities
    associated
    with units into this module.  Also created a units-util module in
    glabels for utilities that do not belong in libglabels.

M	docs/libglabels/libglabels-decl-list.txt
M	docs/libglabels/libglabels-docs.sgml
M	docs/libglabels/libglabels-sections.txt
D	docs/libglabels/libglabels-undocumented.txt
D	docs/libglabels/tmpl/enums.sgml
M	docs/libglabels/tmpl/libglabels-unused.sgml
M	docs/libglabels/tmpl/paper.sgml
A	docs/libglabels/tmpl/units.sgml
M	libglabels/Makefile.am
M	libglabels/libglabels.h
A	libglabels/units.c
R070	libglabels/enums.h	libglabels/units.h
M	libglabels/xml.c
M	libglabels/xml.h
M	po/POTFILES.in
M	src/Makefile.am
M	src/cairo-label-path.c
M	src/font-combo-menu.c
M	src/font-history-model.c
M	src/glabels.c
M	src/object-editor-bc-page.c
M	src/object-editor-fill-page.c
M	src/object-editor-line-page.c
M	src/object-editor-lsize-page.c
M	src/object-editor-position-page.c
M	src/object-editor-shadow-page.c
M	src/object-editor-size-page.c
M	src/object-editor-text-page.c
M	src/prefs-dialog.c
M	src/prefs-model.c
M	src/prefs-model.h
M	src/prefs.c
M	src/prefs.h
M	src/recent.c
M	src/template-designer.c
M	src/ui-commands.c
M	src/ui-property-bar.c
M	src/ui.c
C052	src/prefs.c	src/units-util.c
C066	src/prefs.h	src/units-util.h
M	src/view.c
M	src/wdgt-media-select.c
M	src/window.c
M	src/xml-label.c

commit 3b8bb98a84de015cdc937f7e2b767e4c1f11f4ee
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-24

    Removed unused variables

    Removed unused variables from draw_text_real().

M	src/label-text.c

commit ebe7c16c62c4d724b2a09b51c8a7c72c42cb0960
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-24

    Created new glTemplateHistoryModel

    Pulled recent template history from glPrefsModel and created
    a separate
    glTemplateHistoryModel object to track this history.  Based on
    glFontHistoryModel.

M	.gitignore
M	po/POTFILES.in
M	src/Makefile.am
M	src/glabels-batch.c
M	src/glabels.c
M	src/label.c
M	src/prefs-model.c
M	src/prefs-model.h
M	src/prefs.c
M	src/prefs.h
A	src/template-history-model.c
A	src/template-history-model.h
A	src/template-history.c
C060	src/prefs.h	src/template-history.h
M	src/wdgt-media-select.c

commit 87e9f1324b388483e0078ebcccda4ffa30687bd2
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-24

    Use GConf to store custom color history

    Renamed glColorComboHistory to glColorHistoryModel and reconciled
    style
    with glFontHistoryModel.  glColorHistoryModel now front-ends GConf
    to store
    custom color history between sessions.

M	po/POTFILES.in
M	src/Makefile.am
D	src/color-combo-history.c
D	src/color-combo-history.h
M	src/color-combo-menu.c
C062	src/font-history-model.c	src/color-history-model.c
A	src/color-history-model.h
M	src/font-history-model.c
M	src/font-history-model.h

commit b69e6e688733168b847f4c0785f75e21b5f77dfd
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-24

    Use GConf to store font history

    glFontHistoryModel now front-ends GConf to store font history between
    sessions.  Also, don't store default font family when creating a blank
    label text object.

M	src/font-combo-menu.c
M	src/font-history-model.c
M	src/font-history-model.h
M	src/font-util.c
M	src/font-util.h
M	src/label-text.c

commit b0a92a3f0b9855585fb7fe856483d2e8cece64f7
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-22

    Added font history

    Added font history object.	Setting/changing fonts in text objects
    updates
    this object.  The glFontCombMenu tracks this object to keep its recent
    fonts submenu up-to-date.

M	po/POTFILES.in
M	src/Makefile.am
M	src/font-combo-menu.c
A	src/font-history-model.c
A	src/font-history-model.h
A	src/font-history.c
A	src/font-history.h
M	src/glabels-batch.c
M	src/glabels.c
M	src/label-text.c

commit 1a23b8164c972458c3a434e892c6810939ac424b
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-21

    Make glFieldButtonMenu multi-columned for large number of keys.

    Make glFieldButtonMenu multi-columned for large number of keys.
    I don't know
    why, but I need to unrealize the old menu whenever reloading a new
    set of
    keys -- otherwise, the new menu would not render properly.

    Also, cleared the CAN_FOCUS and CAN_DEFAULT bits for the instance in
    the object editor text edit page, so that it would not steal the focus
    from the text editor.

M	src/field-button-menu.c
M	src/object-editor-edit-page.c

commit f83b6537a0fdf8f6f25483ab691a76923c10508a
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-20

    Minor cleanup of glFieldButton widgets

    Free proper data in gl_field_button_menu_finalize().  Minor formatting
    cleanup.

M	src/field-button-menu.c
M	src/field-button-menu.h
M	src/field-button.c

commit 797627cec95e55d0305a0b7aa81811cd5be291a4
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-19

    Create new glFieldButton widget family

    Created new glFieldButton widget family modelled after glFontCombo.
    This
    widget is for inserting merge fields into text.  This button will
    pop-up
    a menu containing possible field keys.  The button attempts to
    place the
    menu intelligently, rather than simply where the button was pressed.

    Renamed glWdgtMergeMenu to glFieldButtonMenu.

M	data/builder/object-editor.builder
M	po/POTFILES.in
M	src/Makefile.am
M	src/debug.c
M	src/debug.h
R060	src/wdgt-merge-menu.c	src/field-button-menu.c
A	src/field-button-menu.h
A	src/field-button.c
A	src/field-button.h
M	src/object-editor-edit-page.c
M	src/object-editor-private.h
M	src/object-editor.c
D	src/wdgt-merge-menu.h

commit aac305dceb30dcc44e50917da3350fca428ef5d4
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-18

    Cleanup of configure.in

    More minor cleanup of configure.in.  My iec16022 patch was accepted
    upstream
    and there was a new release -- update required version.  Added URLs to
    configure.in to inform packagers where to obtain upstream libraries.
    Updated
    README to document these optional dependencies.

M	README
M	configure.in
M	src/Makefile.am

commit 0060d0193ece855c41a9d079e074fd659d406256
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-17

    Refine glFontComboMenuItem tooltip sample text.

    Refine sample text used in tooltip for glFontComboMenuItem.
    The sample
    alphabet, numbers and special symbols text is now localized.
    Also used
    Pango to get a localized sample string such as "The quick brown
    fox..."

M	src/font-combo-menu-item.c

commit 360d5b047a6eb4855bd4018f05bd083b465ed084
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-11

    Cleanup of configure.in

    Minor cleanup of configure.in.  Assumes libiec16022 will be installed
    along
    with a pkg-config file -- patch to upstream has been submitted --
    we shall
    see.

M	configure.in

commit 95316ca98ce80e0569ec66b66e8d4efa2a11a737
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-11

    Added .gitignore

    Added .gitignore file to cleanup cruft reported by "git status"

A	.gitignore

commit 480d31eff113c6a5136f56654bdbed67805c269c
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-11

    Use accessor functions instead direct access

    Replaced several occurances of directly accessing widget fields
    with the
    use of accessor functions. This round hit primarily windows,
    bin_windows
    and styles. Still need to address flags and allocations when GTK
    has the
    needed accessors.

M	src/color-combo-button.c
M	src/color-combo.c
M	src/color-swatch.c
M	src/font-combo.c
M	src/font-sample.c
M	src/mini-label-preview.c
M	src/mini-preview.c
M	src/view.c
M	src/wdgt-chain-button.c

commit f9d1fc9b35f9c3b9005340f954298aaf5f6623a0
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-10-10

    Converted pl.po to UTF-8 again

M	po/pl.po

commit 98c57ae33f847d1e97be507fdb4efcc09d680d2e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-10-10

    Converted pt_BR.po to UTF-8

M	po/pt_BR.po

commit dc43c1b38e3fa9f5dd0e6627e07a059ccd808fb2
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-10-10

    Updated NEWS

M	NEWS

commit cf622f9277e6db8bc641b7c39a53163712bdd064
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-08

    Use accessor functions instead direct access

    Replaced several occurances of directly accessing widget fields
    with the
    use of accessor functions.	This round only hit some of the
    low-hanging
    fruit -- several modules still contain many such accesses.

M	src/color-combo-menu.c
M	src/combo-util.c
M	src/merge-properties-dialog.c
M	src/new-label-dialog.c
M	src/prefs-dialog.c

commit 67a64dea73deedfc465df50fd92442a460fa5f42
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-07

    Removed 3rd-party libraries

    The 3rd-party libraries used as barcode backends are no longer
    redistributed
    with gLabels.  These libraries are now optional external dependencies,
    so if
    one is not present it will not be used.

    FIXME: the datamatrix IEC 16022 library is not installed by default
    by the
    official iec16022 tarball.

M	AUTHORS
M	COPYING.README_FIRST
M	Makefile.am
D	bc-backends/Makefile.am
D	bc-backends/barcode-0.98/COPYING
D	bc-backends/barcode-0.98/ChangeLog
D	bc-backends/barcode-0.98/INSTALL
D	bc-backends/barcode-0.98/Makefile.am
D	bc-backends/barcode-0.98/Makefile.in.dist
D	bc-backends/barcode-0.98/README
D	bc-backends/barcode-0.98/README.glabels
D	bc-backends/barcode-0.98/TODO
D	bc-backends/barcode-0.98/barcode.h
D	bc-backends/barcode-0.98/barcode.spec
D	bc-backends/barcode-0.98/bookland/bookland.py
D	bc-backends/barcode-0.98/cmdline.c
D	bc-backends/barcode-0.98/cmdline.h
D	bc-backends/barcode-0.98/codabar.c
D	bc-backends/barcode-0.98/code128.c
D	bc-backends/barcode-0.98/code39.c
D	bc-backends/barcode-0.98/code93.c
D	bc-backends/barcode-0.98/compat/getopt.c
D	bc-backends/barcode-0.98/compat/getopt.h
D	bc-backends/barcode-0.98/configure
D	bc-backends/barcode-0.98/configure.in.dist
D	bc-backends/barcode-0.98/contrib/barcode-SVG.tar.gz
D	bc-backends/barcode-0.98/contrib/barcode-SVG.tar.gz.README
D	bc-backends/barcode-0.98/contrib/barcode-for-delphi.tar.gz
D	bc-backends/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
D	bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz
D	bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz.README
D	bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz
D	bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
D	bc-backends/barcode-0.98/debian/README.debian
D	bc-backends/barcode-0.98/debian/changelog
D	bc-backends/barcode-0.98/debian/control
D	bc-backends/barcode-0.98/debian/copyright
D	bc-backends/barcode-0.98/debian/dirs
D	bc-backends/barcode-0.98/debian/info
D	bc-backends/barcode-0.98/debian/rules
D	bc-backends/barcode-0.98/doc/Makefile.in
D	bc-backends/barcode-0.98/doc/README
D	bc-backends/barcode-0.98/doc/barcode.info
D	bc-backends/barcode-0.98/doc/barcode.pdf
D	bc-backends/barcode-0.98/doc/barcode.ps
D	bc-backends/barcode-0.98/doc/barcodedoc.txt
D	bc-backends/barcode-0.98/doc/doc.barcode
D	bc-backends/barcode-0.98/doc/infofilter
D	bc-backends/barcode-0.98/doc/manpager
D	bc-backends/barcode-0.98/doc/mktxt
D	bc-backends/barcode-0.98/doc/texi2html
D	bc-backends/barcode-0.98/ean.c
D	bc-backends/barcode-0.98/i25.c
D	bc-backends/barcode-0.98/install-sh
D	bc-backends/barcode-0.98/library.c
D	bc-backends/barcode-0.98/main.c
D	bc-backends/barcode-0.98/missing
D	bc-backends/barcode-0.98/mkinstalldirs
D	bc-backends/barcode-0.98/msi.c
D	bc-backends/barcode-0.98/pcl.c
D	bc-backends/barcode-0.98/plessey.c
D	bc-backends/barcode-0.98/ps.c
D	bc-backends/barcode-0.98/sample.c
D	bc-backends/iec16022-0.2.1/BUGS
D	bc-backends/iec16022-0.2.1/CHANGELOG
D	bc-backends/iec16022-0.2.1/CREDITS
D	bc-backends/iec16022-0.2.1/INSTALL
D	bc-backends/iec16022-0.2.1/LICENSE
D	bc-backends/iec16022-0.2.1/Makefile.am
D	bc-backends/iec16022-0.2.1/Makefile.dist
D	bc-backends/iec16022-0.2.1/README
D	bc-backends/iec16022-0.2.1/README.glabels
D	bc-backends/iec16022-0.2.1/TODO
D	bc-backends/iec16022-0.2.1/iec16022.1
D	bc-backends/iec16022-0.2.1/iec16022.c
D	bc-backends/iec16022-0.2.1/iec16022ecc200.c
D	bc-backends/iec16022-0.2.1/iec16022ecc200.h
D	bc-backends/iec16022-0.2.1/image.c
D	bc-backends/iec16022-0.2.1/image.h
D	bc-backends/iec16022-0.2.1/reedsol.c
D	bc-backends/iec16022-0.2.1/reedsol.h
D	bc-backends/iec16022-0.2.1/test/testsuite-example.bin
D	bc-backends/iec16022-0.2.1/test/testsuite-example.eps
D	bc-backends/iec16022-0.2.1/test/testsuite-example.hex
D	bc-backends/iec16022-0.2.1/test/testsuite-example.png
D	bc-backends/iec16022-0.2.1/test/testsuite-example.text
D	bc-backends/iec16022-0.2.1/test/testsuite.sh
D	bc-backends/qrencode-3.1.0/COPYING
D	bc-backends/qrencode-3.1.0/ChangeLog
D	bc-backends/qrencode-3.1.0/Doxyfile
D	bc-backends/qrencode-3.1.0/Makefile.am
D	bc-backends/qrencode-3.1.0/Makefile.am.dist
D	bc-backends/qrencode-3.1.0/Makefile.in.dist
D	bc-backends/qrencode-3.1.0/NEWS
D	bc-backends/qrencode-3.1.0/README
D	bc-backends/qrencode-3.1.0/README.glabels
D	bc-backends/qrencode-3.1.0/TODO
D	bc-backends/qrencode-3.1.0/acinclude.m4
D	bc-backends/qrencode-3.1.0/aclocal.m4
D	bc-backends/qrencode-3.1.0/autogen.sh
D	bc-backends/qrencode-3.1.0/bitstream.c
D	bc-backends/qrencode-3.1.0/bitstream.h
D	bc-backends/qrencode-3.1.0/config.h.in
D	bc-backends/qrencode-3.1.0/configure
D	bc-backends/qrencode-3.1.0/configure.ac.dist
D	bc-backends/qrencode-3.1.0/libqrencode.pc.in
D	bc-backends/qrencode-3.1.0/mask.c
D	bc-backends/qrencode-3.1.0/mask.h
D	bc-backends/qrencode-3.1.0/qrenc.c
D	bc-backends/qrencode-3.1.0/qrencode.1.in
D	bc-backends/qrencode-3.1.0/qrencode.c
D	bc-backends/qrencode-3.1.0/qrencode.h
D	bc-backends/qrencode-3.1.0/qrencode.spec
D	bc-backends/qrencode-3.1.0/qrencode.spec.in
D	bc-backends/qrencode-3.1.0/qrencode_inner.h
D	bc-backends/qrencode-3.1.0/qrinput.c
D	bc-backends/qrencode-3.1.0/qrinput.h
D	bc-backends/qrencode-3.1.0/qrspec.c
D	bc-backends/qrencode-3.1.0/qrspec.h
D	bc-backends/qrencode-3.1.0/rscode.c
D	bc-backends/qrencode-3.1.0/rscode.h
D	bc-backends/qrencode-3.1.0/split.c
D	bc-backends/qrencode-3.1.0/split.h
D	bc-backends/qrencode-3.1.0/tests/Makefile.am
D	bc-backends/qrencode-3.1.0/tests/Makefile.in
D	bc-backends/qrencode-3.1.0/tests/common.h
D	bc-backends/qrencode-3.1.0/tests/create_frame_pattern.c
D	bc-backends/qrencode-3.1.0/tests/frame
D	bc-backends/qrencode-3.1.0/tests/prof_qrencode.c
D	bc-backends/qrencode-3.1.0/tests/test_all.sh
D	bc-backends/qrencode-3.1.0/tests/test_bitstream.c
D	bc-backends/qrencode-3.1.0/tests/test_estimatebit.c
D	bc-backends/qrencode-3.1.0/tests/test_monkey.c
D	bc-backends/qrencode-3.1.0/tests/test_qrencode.c
D	bc-backends/qrencode-3.1.0/tests/test_qrinput.c
D	bc-backends/qrencode-3.1.0/tests/test_qrspec.c
D	bc-backends/qrencode-3.1.0/tests/test_rs.c
D	bc-backends/qrencode-3.1.0/tests/test_split.c
D	bc-backends/qrencode-3.1.0/tests/view_qrcode.c
D	bc-backends/qrencode-3.1.0/use/compile
D	bc-backends/qrencode-3.1.0/use/config.guess
D	bc-backends/qrencode-3.1.0/use/config.sub
D	bc-backends/qrencode-3.1.0/use/depcomp
D	bc-backends/qrencode-3.1.0/use/install-sh
D	bc-backends/qrencode-3.1.0/use/ltmain.sh
D	bc-backends/qrencode-3.1.0/use/missing
M	configure.in
M	po/POTFILES.in
M	src/Makefile.am
M	src/bc-gnubarcode.c
M	src/bc-iec16022.c
M	src/bc-iec18004.c
M	src/bc.c

commit 1d8d113699adea7360355c7cef8ad539825829e0
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-06

    Fixed some gettext problems

    color-combo-menu.c:
	    - escape "%" in strings so that they are not interpreted
	    as c-format
	      conversions.
	    - call gettext() on color names initialized in table.
    bc.c:
	    - call gettext() on barcode names initialized in table.
    property-bar.builder:
	    - moved "Font family" tooltip to correct field for
	    translation.

M	data/builder/property-bar.builder
M	src/bc.c
M	src/color-combo-menu.c

commit 48fe1b343471e074156ea342ded7faaaca390c40
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-06

    Added information for translators to HACKING

    Added information for translators to the HACKING file.

M	HACKING

commit 1a23afe96b3503f6d19a871623d31ce9eb4177e7
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-10-06

    Converted polish translation to UTF-8

M	po/pl.po

commit 7b88300bed91c62816557772cfa263604aa209d2
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-10-06

    Added missing filename

M	po/POTFILES.in

commit d5ae0b083b9f9ba9f39cc302b233eb44bab1ff65
Author: Claude Paroz <claude@2xlibre.net>
Date:	2009-10-06

    Convert zh_TW translation to UTF-8

M	po/LINGUAS
R089	po/zh_TW.Big5.po	po/zh_TW.po

commit 05f3749a2034521a14d229ca11cde7c91051cec2
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-10-06

    Updated German translation

M	po/de.po

commit f6f8ebf5318cf00d7735a7dc87885373677370c1
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-10-06

    Updated German translation

M	po/de.po

commit 23449d845bce7cdde774e1dc006814ce08280f59
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-10-06

    Updated German doc translation

M	po/de.po

commit 0bc48aa862b0a2f01b6c222aab279cb6f35a4f35
Author: Daniel Nylander <po@danielnylander.se>
Date:	2009-10-06

    Added Swedish translation

M	po/LINGUAS
A	po/sv.po

commit a869e748bc106014e98749786471aef0198725ef
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-05

    Adding MAINTAINERS and HACKING files.

    Added MAINTAINERS and HACKING files.  Updated glabels.doap to
    reconcile with new MAINTAINERS file.  Updated TODO file bringing
    up-to-date with the current roadmap.

A	HACKING
A	MAINTAINERS
M	TODO
M	glabels.doap

commit 6684593a76fba89a941edcf8991d45f0c5521ecc
Author: Jim Evins <evins@snaught.com>
Date:	2009-10-05

    Adding glabels.doap

    Adding glabels.doap file for gnome Git repository.

A	glabels.doap

commit d8ea0137a6f1aa1924f62a64c2a83e048a79f0ce
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-09-29

    Removed non-existent filenames from po/POTFILES.in

M	po/POTFILES.in

commit 743c111fc1f7f0a698c459d0ef387f5591112d36
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-09-29

    Removed non-existent filenames from po/POTFILES.in

M	po/de.po

commit 73e7592ce7bc2ad65ebeb85b7f17f0ef10bd8f3c
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-28

    Removed gtk-doc.make.

    Removed the gtk-doc.make file, since it gets regenerated anyway.

D	gtk-doc.make

commit d45bb113212523705e156d79044849b08025f305
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-27

    Relocated barcode backends.

    Moved 3rd party barcode backends to a new bc-backends/ subdirectory.

M	COPYING.README_FIRST
M	Makefile.am
A	bc-backends/Makefile.am
R100	barcode-0.98/COPYING	bc-backends/barcode-0.98/COPYING
R100	barcode-0.98/ChangeLog	bc-backends/barcode-0.98/ChangeLog
R100	barcode-0.98/INSTALL	bc-backends/barcode-0.98/INSTALL
R100	barcode-0.98/Makefile.am
bc-backends/barcode-0.98/Makefile.am
R100	barcode-0.98/Makefile.in.dist
bc-backends/barcode-0.98/Makefile.in.dist
R100	barcode-0.98/README	bc-backends/barcode-0.98/README
R100	barcode-0.98/README.glabels
bc-backends/barcode-0.98/README.glabels
R100	barcode-0.98/TODO	bc-backends/barcode-0.98/TODO
R100	barcode-0.98/barcode.h	bc-backends/barcode-0.98/barcode.h
R100	barcode-0.98/barcode.spec
bc-backends/barcode-0.98/barcode.spec
R100	barcode-0.98/bookland/bookland.py
bc-backends/barcode-0.98/bookland/bookland.py
R100	barcode-0.98/cmdline.c	bc-backends/barcode-0.98/cmdline.c
R100	barcode-0.98/cmdline.h	bc-backends/barcode-0.98/cmdline.h
R100	barcode-0.98/codabar.c	bc-backends/barcode-0.98/codabar.c
R100	barcode-0.98/code128.c	bc-backends/barcode-0.98/code128.c
R100	barcode-0.98/code39.c	bc-backends/barcode-0.98/code39.c
R100	barcode-0.98/code93.c	bc-backends/barcode-0.98/code93.c
R100	barcode-0.98/compat/getopt.c
bc-backends/barcode-0.98/compat/getopt.c
R100	barcode-0.98/compat/getopt.h
bc-backends/barcode-0.98/compat/getopt.h
R100	barcode-0.98/configure	bc-backends/barcode-0.98/configure
R100	barcode-0.98/configure.in.dist
bc-backends/barcode-0.98/configure.in.dist
R100	barcode-0.98/contrib/barcode-SVG.tar.gz
bc-backends/barcode-0.98/contrib/barcode-SVG.tar.gz
R100	barcode-0.98/contrib/barcode-SVG.tar.gz.README
bc-backends/barcode-0.98/contrib/barcode-SVG.tar.gz.README
R100	barcode-0.98/contrib/barcode-for-delphi.tar.gz
bc-backends/barcode-0.98/contrib/barcode-for-delphi.tar.gz
R100	barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
bc-backends/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
R100	barcode-0.98/contrib/barcodeps-0.1.tgz
bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz
R100	barcode-0.98/contrib/barcodeps-0.1.tgz.README
bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz.README
R100	barcode-0.98/contrib/grab-0.0.4.tar.gz
bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz
R100	barcode-0.98/contrib/grab-0.0.4.tar.gz.README
bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
R100	barcode-0.98/debian/README.debian
bc-backends/barcode-0.98/debian/README.debian
R100	barcode-0.98/debian/changelog
bc-backends/barcode-0.98/debian/changelog
R100	barcode-0.98/debian/control
bc-backends/barcode-0.98/debian/control
R100	barcode-0.98/debian/copyright
bc-backends/barcode-0.98/debian/copyright
R100	barcode-0.98/debian/dirs
bc-backends/barcode-0.98/debian/dirs
R100	barcode-0.98/debian/info
bc-backends/barcode-0.98/debian/info
R100	barcode-0.98/debian/rules
bc-backends/barcode-0.98/debian/rules
R100	barcode-0.98/doc/Makefile.in
bc-backends/barcode-0.98/doc/Makefile.in
R100	barcode-0.98/doc/README bc-backends/barcode-0.98/doc/README
R100	barcode-0.98/doc/barcode.info
bc-backends/barcode-0.98/doc/barcode.info
R100	barcode-0.98/doc/barcode.pdf
bc-backends/barcode-0.98/doc/barcode.pdf
R100	barcode-0.98/doc/barcode.ps
bc-backends/barcode-0.98/doc/barcode.ps
R100	barcode-0.98/doc/barcodedoc.txt
bc-backends/barcode-0.98/doc/barcodedoc.txt
R100	barcode-0.98/doc/doc.barcode
bc-backends/barcode-0.98/doc/doc.barcode
R100	barcode-0.98/doc/infofilter
bc-backends/barcode-0.98/doc/infofilter
R100	barcode-0.98/doc/manpager
bc-backends/barcode-0.98/doc/manpager
R100	barcode-0.98/doc/mktxt	bc-backends/barcode-0.98/doc/mktxt
R100	barcode-0.98/doc/texi2html
bc-backends/barcode-0.98/doc/texi2html
R100	barcode-0.98/ean.c	bc-backends/barcode-0.98/ean.c
R100	barcode-0.98/i25.c	bc-backends/barcode-0.98/i25.c
R100	barcode-0.98/install-sh bc-backends/barcode-0.98/install-sh
R100	barcode-0.98/library.c	bc-backends/barcode-0.98/library.c
R100	barcode-0.98/main.c	bc-backends/barcode-0.98/main.c
R100	barcode-0.98/missing	bc-backends/barcode-0.98/missing
R100	barcode-0.98/mkinstalldirs
bc-backends/barcode-0.98/mkinstalldirs
R100	barcode-0.98/msi.c	bc-backends/barcode-0.98/msi.c
R100	barcode-0.98/pcl.c	bc-backends/barcode-0.98/pcl.c
R100	barcode-0.98/plessey.c	bc-backends/barcode-0.98/plessey.c
R100	barcode-0.98/ps.c	bc-backends/barcode-0.98/ps.c
R100	barcode-0.98/sample.c	bc-backends/barcode-0.98/sample.c
R100	iec16022-0.2.1/BUGS	bc-backends/iec16022-0.2.1/BUGS
R100	iec16022-0.2.1/CHANGELOG
bc-backends/iec16022-0.2.1/CHANGELOG
R100	iec16022-0.2.1/CREDITS	bc-backends/iec16022-0.2.1/CREDITS
R100	iec16022-0.2.1/INSTALL	bc-backends/iec16022-0.2.1/INSTALL
R100	iec16022-0.2.1/LICENSE	bc-backends/iec16022-0.2.1/LICENSE
R100	iec16022-0.2.1/Makefile.am
bc-backends/iec16022-0.2.1/Makefile.am
R100	iec16022-0.2.1/Makefile.dist
bc-backends/iec16022-0.2.1/Makefile.dist
R100	iec16022-0.2.1/README	bc-backends/iec16022-0.2.1/README
R100	iec16022-0.2.1/README.glabels
bc-backends/iec16022-0.2.1/README.glabels
R100	iec16022-0.2.1/TODO	bc-backends/iec16022-0.2.1/TODO
R100	iec16022-0.2.1/iec16022.1
bc-backends/iec16022-0.2.1/iec16022.1
R100	iec16022-0.2.1/iec16022.c
bc-backends/iec16022-0.2.1/iec16022.c
R100	iec16022-0.2.1/iec16022ecc200.c
bc-backends/iec16022-0.2.1/iec16022ecc200.c
R100	iec16022-0.2.1/iec16022ecc200.h
bc-backends/iec16022-0.2.1/iec16022ecc200.h
R100	iec16022-0.2.1/image.c	bc-backends/iec16022-0.2.1/image.c
R100	iec16022-0.2.1/image.h	bc-backends/iec16022-0.2.1/image.h
R100	iec16022-0.2.1/reedsol.c
bc-backends/iec16022-0.2.1/reedsol.c
R100	iec16022-0.2.1/reedsol.h
bc-backends/iec16022-0.2.1/reedsol.h
R100	iec16022-0.2.1/test/testsuite-example.bin
bc-backends/iec16022-0.2.1/test/testsuite-example.bin
R100	iec16022-0.2.1/test/testsuite-example.eps
bc-backends/iec16022-0.2.1/test/testsuite-example.eps
R100	iec16022-0.2.1/test/testsuite-example.hex
bc-backends/iec16022-0.2.1/test/testsuite-example.hex
R100	iec16022-0.2.1/test/testsuite-example.png
bc-backends/iec16022-0.2.1/test/testsuite-example.png
R100	iec16022-0.2.1/test/testsuite-example.text
bc-backends/iec16022-0.2.1/test/testsuite-example.text
R100	iec16022-0.2.1/test/testsuite.sh
bc-backends/iec16022-0.2.1/test/testsuite.sh
R100	qrencode-3.1.0/COPYING	bc-backends/qrencode-3.1.0/COPYING
R100	qrencode-3.1.0/ChangeLog
bc-backends/qrencode-3.1.0/ChangeLog
R100	qrencode-3.1.0/Doxyfile bc-backends/qrencode-3.1.0/Doxyfile
R100	qrencode-3.1.0/Makefile.am
bc-backends/qrencode-3.1.0/Makefile.am
R100	qrencode-3.1.0/Makefile.am.dist
bc-backends/qrencode-3.1.0/Makefile.am.dist
R100	qrencode-3.1.0/Makefile.in.dist
bc-backends/qrencode-3.1.0/Makefile.in.dist
R100	qrencode-3.1.0/NEWS	bc-backends/qrencode-3.1.0/NEWS
R100	qrencode-3.1.0/README	bc-backends/qrencode-3.1.0/README
R100	qrencode-3.1.0/README.glabels
bc-backends/qrencode-3.1.0/README.glabels
R100	qrencode-3.1.0/TODO	bc-backends/qrencode-3.1.0/TODO
R100	qrencode-3.1.0/acinclude.m4
bc-backends/qrencode-3.1.0/acinclude.m4
R100	qrencode-3.1.0/aclocal.m4
bc-backends/qrencode-3.1.0/aclocal.m4
R100	qrencode-3.1.0/autogen.sh
bc-backends/qrencode-3.1.0/autogen.sh
R100	qrencode-3.1.0/bitstream.c
bc-backends/qrencode-3.1.0/bitstream.c
R100	qrencode-3.1.0/bitstream.h
bc-backends/qrencode-3.1.0/bitstream.h
R100	qrencode-3.1.0/config.h.in
bc-backends/qrencode-3.1.0/config.h.in
R100	qrencode-3.1.0/configure
bc-backends/qrencode-3.1.0/configure
R100	qrencode-3.1.0/configure.ac.dist
bc-backends/qrencode-3.1.0/configure.ac.dist
R100	qrencode-3.1.0/libqrencode.pc.in
bc-backends/qrencode-3.1.0/libqrencode.pc.in
R100	qrencode-3.1.0/mask.c	bc-backends/qrencode-3.1.0/mask.c
R100	qrencode-3.1.0/mask.h	bc-backends/qrencode-3.1.0/mask.h
R100	qrencode-3.1.0/qrenc.c	bc-backends/qrencode-3.1.0/qrenc.c
R100	qrencode-3.1.0/qrencode.1.in
bc-backends/qrencode-3.1.0/qrencode.1.in
R100	qrencode-3.1.0/qrencode.c
bc-backends/qrencode-3.1.0/qrencode.c
R100	qrencode-3.1.0/qrencode.h
bc-backends/qrencode-3.1.0/qrencode.h
R100	qrencode-3.1.0/qrencode.spec
bc-backends/qrencode-3.1.0/qrencode.spec
R100	qrencode-3.1.0/qrencode.spec.in
bc-backends/qrencode-3.1.0/qrencode.spec.in
R100	qrencode-3.1.0/qrencode_inner.h
bc-backends/qrencode-3.1.0/qrencode_inner.h
R100	qrencode-3.1.0/qrinput.c
bc-backends/qrencode-3.1.0/qrinput.c
R100	qrencode-3.1.0/qrinput.h
bc-backends/qrencode-3.1.0/qrinput.h
R100	qrencode-3.1.0/qrspec.c bc-backends/qrencode-3.1.0/qrspec.c
R100	qrencode-3.1.0/qrspec.h bc-backends/qrencode-3.1.0/qrspec.h
R100	qrencode-3.1.0/rscode.c bc-backends/qrencode-3.1.0/rscode.c
R100	qrencode-3.1.0/rscode.h bc-backends/qrencode-3.1.0/rscode.h
R100	qrencode-3.1.0/split.c	bc-backends/qrencode-3.1.0/split.c
R100	qrencode-3.1.0/split.h	bc-backends/qrencode-3.1.0/split.h
R100	qrencode-3.1.0/tests/Makefile.am
bc-backends/qrencode-3.1.0/tests/Makefile.am
R100	qrencode-3.1.0/tests/Makefile.in
bc-backends/qrencode-3.1.0/tests/Makefile.in
R100	qrencode-3.1.0/tests/common.h
bc-backends/qrencode-3.1.0/tests/common.h
R100	qrencode-3.1.0/tests/create_frame_pattern.c
bc-backends/qrencode-3.1.0/tests/create_frame_pattern.c
R100	qrencode-3.1.0/tests/frame
bc-backends/qrencode-3.1.0/tests/frame
R100	qrencode-3.1.0/tests/prof_qrencode.c
bc-backends/qrencode-3.1.0/tests/prof_qrencode.c
R100	qrencode-3.1.0/tests/test_all.sh
bc-backends/qrencode-3.1.0/tests/test_all.sh
R100	qrencode-3.1.0/tests/test_bitstream.c
bc-backends/qrencode-3.1.0/tests/test_bitstream.c
R100	qrencode-3.1.0/tests/test_estimatebit.c
bc-backends/qrencode-3.1.0/tests/test_estimatebit.c
R100	qrencode-3.1.0/tests/test_monkey.c
bc-backends/qrencode-3.1.0/tests/test_monkey.c
R100	qrencode-3.1.0/tests/test_qrencode.c
bc-backends/qrencode-3.1.0/tests/test_qrencode.c
R100	qrencode-3.1.0/tests/test_qrinput.c
bc-backends/qrencode-3.1.0/tests/test_qrinput.c
R100	qrencode-3.1.0/tests/test_qrspec.c
bc-backends/qrencode-3.1.0/tests/test_qrspec.c
R100	qrencode-3.1.0/tests/test_rs.c
bc-backends/qrencode-3.1.0/tests/test_rs.c
R100	qrencode-3.1.0/tests/test_split.c
bc-backends/qrencode-3.1.0/tests/test_split.c
R100	qrencode-3.1.0/tests/view_qrcode.c
bc-backends/qrencode-3.1.0/tests/view_qrcode.c
R100	qrencode-3.1.0/use/compile
bc-backends/qrencode-3.1.0/use/compile
R100	qrencode-3.1.0/use/config.guess
bc-backends/qrencode-3.1.0/use/config.guess
R100	qrencode-3.1.0/use/config.sub
bc-backends/qrencode-3.1.0/use/config.sub
R100	qrencode-3.1.0/use/depcomp
bc-backends/qrencode-3.1.0/use/depcomp
R100	qrencode-3.1.0/use/install-sh
bc-backends/qrencode-3.1.0/use/install-sh
R100	qrencode-3.1.0/use/ltmain.sh
bc-backends/qrencode-3.1.0/use/ltmain.sh
R100	qrencode-3.1.0/use/missing
bc-backends/qrencode-3.1.0/use/missing
M	configure.in
M	src/Makefile.am

commit 39f4c44e000d410b4f63ab1fcdc4b04273ff0a83
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-26

    Organized master branch to be top-level directory for glabels,
    instead of
    having a glabels2 sub-directory.

R100	glabels2/AUTHORS	AUTHORS
R100	glabels2/COPYING	COPYING
R100	glabels2/COPYING-DOCS	COPYING-DOCS
R100	glabels2/COPYING-LIBGLABELS	COPYING-LIBGLABELS
R100	glabels2/COPYING-TEMPLATES	COPYING-TEMPLATES
R100	glabels2/COPYING.README_FIRST	COPYING.README_FIRST
R100	glabels2/ChangeLog	ChangeLog
R100	glabels2/INSTALL	INSTALL
R100	glabels2/MESSAGE-OF-DOOM	MESSAGE-OF-DOOM
R100	glabels2/Makefile.am	Makefile.am
R100	glabels2/NEWS	NEWS
R100	glabels2/README README
R100	glabels2/TODO	TODO
R100	glabels2/autogen.sh	autogen.sh
R100	glabels1/barcode-0.98/COPYING	barcode-0.98/COPYING
R100	glabels1/barcode-0.98/ChangeLog barcode-0.98/ChangeLog
R100	glabels1/barcode-0.98/INSTALL	barcode-0.98/INSTALL
R100	glabels2/barcode-0.98/Makefile.am	barcode-0.98/Makefile.am
R100	glabels2/barcode-0.98/Makefile.in.dist
barcode-0.98/Makefile.in.dist
R100	glabels1/barcode-0.98/README	barcode-0.98/README
R100	glabels2/barcode-0.98/README.glabels
barcode-0.98/README.glabels
R100	glabels1/barcode-0.98/TODO	barcode-0.98/TODO
R100	glabels1/barcode-0.98/barcode.h barcode-0.98/barcode.h
R100	glabels1/barcode-0.98/barcode.spec	barcode-0.98/barcode.spec
R100	glabels1/barcode-0.98/bookland/bookland.py
barcode-0.98/bookland/bookland.py
R100	glabels1/barcode-0.98/cmdline.c barcode-0.98/cmdline.c
R100	glabels1/barcode-0.98/cmdline.h barcode-0.98/cmdline.h
R100	glabels1/barcode-0.98/codabar.c barcode-0.98/codabar.c
R100	glabels1/barcode-0.98/code128.c barcode-0.98/code128.c
R100	glabels1/barcode-0.98/code39.c	barcode-0.98/code39.c
R100	glabels1/barcode-0.98/code93.c	barcode-0.98/code93.c
R100	glabels1/barcode-0.98/compat/getopt.c
barcode-0.98/compat/getopt.c
R100	glabels1/barcode-0.98/compat/getopt.h
barcode-0.98/compat/getopt.h
R100	glabels2/barcode-0.98/configure barcode-0.98/configure
R100	glabels2/barcode-0.98/configure.in.dist
barcode-0.98/configure.in.dist
R100	glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz
barcode-0.98/contrib/barcode-SVG.tar.gz
R100	glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz.README
barcode-0.98/contrib/barcode-SVG.tar.gz.README
R100	glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz
barcode-0.98/contrib/barcode-for-delphi.tar.gz
R100	glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
R100	glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz
barcode-0.98/contrib/barcodeps-0.1.tgz
R100	glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz.README
barcode-0.98/contrib/barcodeps-0.1.tgz.README
R100	glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz
barcode-0.98/contrib/grab-0.0.4.tar.gz
R100	glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
barcode-0.98/contrib/grab-0.0.4.tar.gz.README
R100	glabels1/barcode-0.98/debian/README.debian
barcode-0.98/debian/README.debian
R100	glabels1/barcode-0.98/debian/changelog
barcode-0.98/debian/changelog
R100	glabels1/barcode-0.98/debian/control
barcode-0.98/debian/control
R100	glabels1/barcode-0.98/debian/copyright
barcode-0.98/debian/copyright
R100	glabels1/barcode-0.98/debian/dirs	barcode-0.98/debian/dirs
R100	glabels1/barcode-0.98/debian/info	barcode-0.98/debian/info
R100	glabels1/barcode-0.98/debian/rules	barcode-0.98/debian/rules
R100	glabels1/barcode-0.98/doc/Makefile.in
barcode-0.98/doc/Makefile.in
R100	glabels1/barcode-0.98/doc/README	barcode-0.98/doc/README
R100	glabels2/barcode-0.98/doc/barcode.info
barcode-0.98/doc/barcode.info
R100	glabels2/barcode-0.98/doc/barcode.pdf
barcode-0.98/doc/barcode.pdf
R100	glabels2/barcode-0.98/doc/barcode.ps
barcode-0.98/doc/barcode.ps
R100	glabels2/barcode-0.98/doc/barcodedoc.txt
barcode-0.98/doc/barcodedoc.txt
R100	glabels1/barcode-0.98/doc/doc.barcode
barcode-0.98/doc/doc.barcode
R100	glabels1/barcode-0.98/doc/infofilter
barcode-0.98/doc/infofilter
R100	glabels1/barcode-0.98/doc/manpager	barcode-0.98/doc/manpager
R100	glabels1/barcode-0.98/doc/mktxt barcode-0.98/doc/mktxt
R100	glabels1/barcode-0.98/doc/texi2html	barcode-0.98/doc/texi2html
R100	glabels1/barcode-0.98/ean.c	barcode-0.98/ean.c
R100	glabels1/barcode-0.98/i25.c	barcode-0.98/i25.c
R100	glabels1/barcode-0.98/install-sh	barcode-0.98/install-sh
R100	glabels1/barcode-0.98/library.c barcode-0.98/library.c
R100	glabels1/barcode-0.98/main.c	barcode-0.98/main.c
R100	glabels2/barcode-0.98/missing	barcode-0.98/missing
R100	glabels1/mkinstalldirs	barcode-0.98/mkinstalldirs
R100	glabels1/barcode-0.98/msi.c	barcode-0.98/msi.c
R100	glabels1/barcode-0.98/pcl.c	barcode-0.98/pcl.c
R100	glabels1/barcode-0.98/plessey.c barcode-0.98/plessey.c
R100	glabels1/barcode-0.98/ps.c	barcode-0.98/ps.c
R100	glabels1/barcode-0.98/sample.c	barcode-0.98/sample.c
R100	glabels2/configure.in	configure.in
R100	glabels2/data/Makefile.am	data/Makefile.am
R100	glabels2/data/builder/Makefile.am	data/builder/Makefile.am
R100	glabels2/data/builder/merge-properties-dialog.builder
data/builder/merge-properties-dialog.builder
R100	glabels2/data/builder/object-editor.builder
data/builder/object-editor.builder
R100	glabels2/data/builder/prefs-dialog.builder
data/builder/prefs-dialog.builder
R100	glabels2/data/builder/print-op-dialog-custom-widget.builder
data/builder/print-op-dialog-custom-widget.builder
R100	glabels2/data/builder/property-bar.builder
data/builder/property-bar.builder
R100	glabels2/data/builder/template-designer.builder
data/builder/template-designer.builder
R100	glabels2/data/builder/wdgt-media-select.builder
data/builder/wdgt-media-select.builder
R100	glabels2/data/desktop/Makefile.am	data/desktop/Makefile.am
R100	glabels2/data/desktop/glabels.desktop.in
data/desktop/glabels.desktop.in
R100	glabels2/data/man/Makefile.am	data/man/Makefile.am
R100	glabels2/data/man/glabels.1	data/man/glabels.1
R100	glabels2/data/mime/Makefile.am	data/mime/Makefile.am
R100	glabels2/data/mime/glabels.applications
data/mime/glabels.applications
R100	glabels2/data/mime/glabels.keys.in	data/mime/glabels.keys.in
R100	glabels2/data/mime/glabels.mime data/mime/glabels.mime
R100	glabels2/data/mime/glabels.xml.in	data/mime/glabels.xml.in
R100	glabels2/data/pixmaps/Makefile.am	data/pixmaps/Makefile.am
R100	glabels2/data/pixmaps/ex-1layout.png
data/pixmaps/ex-1layout.png
R100	glabels2/data/pixmaps/ex-2layouts.png
data/pixmaps/ex-2layouts.png
R100	glabels2/data/pixmaps/ex-cd-size.png
data/pixmaps/ex-cd-size.png
R100	glabels2/data/pixmaps/ex-rect-size.png
data/pixmaps/ex-rect-size.png
R100	glabels2/data/pixmaps/ex-round-size.png
data/pixmaps/ex-round-size.png
R100	glabels2/data/pixmaps/glabels-about-logo.png
data/pixmaps/glabels-about-logo.png
R100	glabels2/data/pixmaps/glabels-application-x-glabels.png
data/pixmaps/glabels-application-x-glabels.png
R100	glabels2/data/pixmaps/glabels-splash.png
data/pixmaps/glabels-splash.png
R100	glabels2/data/pixmaps/glabels.png	data/pixmaps/glabels.png
R100	glabels2/docs/Makefile.am	docs/Makefile.am
R100	glabels2/docs/libglabels/Makefile.am
docs/libglabels/Makefile.am
R100	glabels2/docs/libglabels/libglabels-decl-list.txt
docs/libglabels/libglabels-decl-list.txt
R100	glabels2/docs/libglabels/libglabels-docs.sgml
docs/libglabels/libglabels-docs.sgml
R100	glabels2/docs/libglabels/libglabels-overrides.txt
docs/libglabels/libglabels-overrides.txt
R100	glabels2/docs/libglabels/libglabels-sections.txt
docs/libglabels/libglabels-sections.txt
R100	glabels2/docs/libglabels/libglabels-undocumented.txt
docs/libglabels/libglabels-undocumented.txt
R100	glabels2/docs/libglabels/libglabels.types
docs/libglabels/libglabels.types
R100	glabels2/docs/libglabels/tmpl/category.sgml
docs/libglabels/tmpl/category.sgml
R100	glabels2/docs/libglabels/tmpl/db.sgml
docs/libglabels/tmpl/db.sgml
R100	glabels2/docs/libglabels/tmpl/enums.sgml
docs/libglabels/tmpl/enums.sgml
R100	glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
docs/libglabels/tmpl/libglabels-unused.sgml
R100	glabels2/docs/libglabels/tmpl/libglabels.sgml
docs/libglabels/tmpl/libglabels.sgml
R100	glabels2/docs/libglabels/tmpl/paper.sgml
docs/libglabels/tmpl/paper.sgml
R100	glabels2/docs/libglabels/tmpl/str.sgml
docs/libglabels/tmpl/str.sgml
R100	glabels2/docs/libglabels/tmpl/template.sgml
docs/libglabels/tmpl/template.sgml
R100	glabels2/docs/libglabels/tmpl/xml-category.sgml
docs/libglabels/tmpl/xml-category.sgml
R100	glabels2/docs/libglabels/tmpl/xml-paper.sgml
docs/libglabels/tmpl/xml-paper.sgml
R100	glabels2/docs/libglabels/tmpl/xml-template.sgml
docs/libglabels/tmpl/xml-template.sgml
R100	glabels2/docs/libglabels/tmpl/xml.sgml
docs/libglabels/tmpl/xml.sgml
R100	glabels2/glabels.spec.in	glabels.spec.in
D	glabels1/ABOUT-NLS
D	glabels1/AUTHORS
D	glabels1/COPYING
D	glabels1/ChangeLog
D	glabels1/INSTALL
D	glabels1/Makefile.am
D	glabels1/NEWS
D	glabels1/README
D	glabels1/TODO
D	glabels1/acconfig.h
D	glabels1/aclocal.m4
D	glabels1/autogen.sh
D	glabels1/barcode-0.98/Makefile.in
D	glabels1/barcode-0.98/configure
D	glabels1/barcode-0.98/configure.in
D	glabels1/barcode-0.98/doc/barcode.info
D	glabels1/barcode-0.98/doc/barcode.pdf
D	glabels1/barcode-0.98/doc/barcode.ps
D	glabels1/barcode-0.98/doc/barcodedoc.txt
D	glabels1/config.h.in
D	glabels1/configure.in
D	glabels1/data/predefined-labels.template
D	glabels1/doc/C/Makefile.am
D	glabels1/doc/C/Makefile.in
D	glabels1/doc/C/glabels.sgml
D	glabels1/doc/C/glabels/index.html
D	glabels1/doc/C/glabels/ln7.html
D	glabels1/doc/C/topic.dat
D	glabels1/doc/Makefile.am
D	glabels1/doc/Makefile.in
D	glabels1/glabels.desktop
D	glabels1/glabels.spec.in
D	glabels1/install-sh
D	glabels1/intl/ChangeLog
D	glabels1/intl/Makefile.in
D	glabels1/intl/VERSION
D	glabels1/intl/bindtextdom.c
D	glabels1/intl/cat-compat.c
D	glabels1/intl/dcgettext.c
D	glabels1/intl/dgettext.c
D	glabels1/intl/explodename.c
D	glabels1/intl/finddomain.c
D	glabels1/intl/gettext.c
D	glabels1/intl/gettext.h
D	glabels1/intl/gettextP.h
D	glabels1/intl/hash-string.h
D	glabels1/intl/intl-compat.c
D	glabels1/intl/l10nflist.c
D	glabels1/intl/libgettext.h
D	glabels1/intl/linux-msg.sed
D	glabels1/intl/loadinfo.h
D	glabels1/intl/loadmsgcat.c
D	glabels1/intl/localealias.c
D	glabels1/intl/po2tbl.sed.in
D	glabels1/intl/textdomain.c
D	glabels1/intl/xopen-msg.sed
D	glabels1/macros/Makefile.am
D	glabels1/macros/Makefile.in
D	glabels1/macros/aclocal-include.m4
D	glabels1/macros/autogen.sh
D	glabels1/macros/compiler-flags.m4
D	glabels1/macros/curses.m4
D	glabels1/macros/gnome-bonobo-check.m4
D	glabels1/macros/gnome-common.m4
D	glabels1/macros/gnome-fileutils.m4
D	glabels1/macros/gnome-gettext.m4
D	glabels1/macros/gnome-ghttp-check.m4
D	glabels1/macros/gnome-gnorba-check.m4
D	glabels1/macros/gnome-guile-checks.m4
D	glabels1/macros/gnome-libgtop-check.m4
D	glabels1/macros/gnome-objc-checks.m4
D	glabels1/macros/gnome-orbit-check.m4
D	glabels1/macros/gnome-print-check.m4
D	glabels1/macros/gnome-pthread-check.m4
D	glabels1/macros/gnome-support.m4
D	glabels1/macros/gnome-undelfs.m4
D	glabels1/macros/gnome-vfs.m4
D	glabels1/macros/gnome-x-checks.m4
D	glabels1/macros/gnome-xml-check.m4
D	glabels1/macros/gnome.m4
D	glabels1/macros/linger.m4
D	glabels1/macros/need-declaration.m4
D	glabels1/missing
D	glabels1/pixmaps/glabels-about-logo.png
D	glabels1/pixmaps/glabels-icon.png
D	glabels1/pixmaps/glabels-logo.png
D	glabels1/po/ChangeLog
D	glabels1/po/Makefile.in.in
D	glabels1/po/POTFILES.in
D	glabels1/po/cat-id-tbl.c
D	glabels1/po/de.po
D	glabels1/po/es.po
D	glabels1/po/fr.po
D	glabels1/po/glabels.pot
D	glabels1/po/ja.po
D	glabels1/po/pl.po
D	glabels1/po/pt_BR.po
D	glabels1/po/ru.po
D	glabels1/po/stamp-cat-id
D	glabels1/po/zh_TW.Big5.po
D	glabels1/src/Makefile.am
D	glabels1/src/bc.c
D	glabels1/src/bc.h
D	glabels1/src/bc_gnubarcode.c
D	glabels1/src/bc_gnubarcode.h
D	glabels1/src/bc_postnet.c
D	glabels1/src/bc_postnet.h
D	glabels1/src/debug.h
D	glabels1/src/display.c
D	glabels1/src/display.h
D	glabels1/src/edit.c
D	glabels1/src/edit.h
D	glabels1/src/file.c
D	glabels1/src/file.h
D	glabels1/src/glabels.c
D	glabels1/src/glabels_batch.c
D	glabels1/src/gnome-canvas-hacktext.h
D	glabels1/src/hack.c
D	glabels1/src/hack.h
D	glabels1/src/highlight.c
D	glabels1/src/highlight.h
D	glabels1/src/item.c
D	glabels1/src/item.h
D	glabels1/src/item_barcode.c
D	glabels1/src/item_barcode.h
D	glabels1/src/item_box.c
D	glabels1/src/item_box.h
D	glabels1/src/item_ellipse.c
D	glabels1/src/item_ellipse.h
D	glabels1/src/item_image.c
D	glabels1/src/item_image.h
D	glabels1/src/item_line.c
D	glabels1/src/item_line.h
D	glabels1/src/item_text.c
D	glabels1/src/item_text.h
D	glabels1/src/label.c
D	glabels1/src/label.h
D	glabels1/src/mdi.c
D	glabels1/src/mdi.h
D	glabels1/src/media_select.c
D	glabels1/src/media_select.h
D	glabels1/src/menu.c
D	glabels1/src/menu.h
D	glabels1/src/merge.c
D	glabels1/src/merge.h
D	glabels1/src/merge_properties.c
D	glabels1/src/merge_properties.h
D	glabels1/src/merge_text.c
D	glabels1/src/merge_text.h
D	glabels1/src/merge_ui.c
D	glabels1/src/merge_ui.h
D	glabels1/src/merge_ui_text.c
D	glabels1/src/merge_ui_text.h
D	glabels1/src/mini_preview.c
D	glabels1/src/mini_preview.h
D	glabels1/src/pixmaps/Makefile.am
D	glabels1/src/pixmaps/arrow.xpm
D	glabels1/src/pixmaps/barcode.xpm
D	glabels1/src/pixmaps/box.xpm
D	glabels1/src/pixmaps/cursor_zoomin.xbm
D	glabels1/src/pixmaps/cursor_zoomin_mask.xbm
D	glabels1/src/pixmaps/cursor_zoomout.xbm
D	glabels1/src/pixmaps/cursor_zoomout_mask.xbm
D	glabels1/src/pixmaps/ellipse.xpm
D	glabels1/src/pixmaps/image.xpm
D	glabels1/src/pixmaps/line.xpm
D	glabels1/src/pixmaps/merge.xpm
D	glabels1/src/pixmaps/text.xpm
D	glabels1/src/pixmaps/zoom1to1.xpm
D	glabels1/src/pixmaps/zoomin.xpm
D	glabels1/src/pixmaps/zoomout.xpm
D	glabels1/src/prefs.c
D	glabels1/src/prefs.h
D	glabels1/src/print.c
D	glabels1/src/print.h
D	glabels1/src/print_copies.c
D	glabels1/src/print_copies.h
D	glabels1/src/print_dialog.c
D	glabels1/src/print_dialog.h
D	glabels1/src/print_merge.c
D	glabels1/src/print_merge.h
D	glabels1/src/prop_bc.c
D	glabels1/src/prop_bc.h
D	glabels1/src/prop_bc_data.c
D	glabels1/src/prop_bc_data.h
D	glabels1/src/prop_bc_style.c
D	glabels1/src/prop_bc_style.h
D	glabels1/src/prop_fill.c
D	glabels1/src/prop_fill.h
D	glabels1/src/prop_line.c
D	glabels1/src/prop_line.h
D	glabels1/src/prop_position.c
D	glabels1/src/prop_position.h
D	glabels1/src/prop_size.c
D	glabels1/src/prop_size.h
D	glabels1/src/prop_text.c
D	glabels1/src/prop_text.h
D	glabels1/src/prop_text_entry.c
D	glabels1/src/prop_text_entry.h
D	glabels1/src/prop_vector.c
D	glabels1/src/prop_vector.h
D	glabels1/src/propertybox.c
D	glabels1/src/propertybox.h
D	glabels1/src/rotate_select.c
D	glabels1/src/rotate_select.h
D	glabels1/src/splash.c
D	glabels1/src/splash.h
D	glabels1/src/stock.c
D	glabels1/src/stock.h
D	glabels1/src/template.c
D	glabels1/src/template.h
D	glabels1/src/text_node.c
D	glabels1/src/text_node.h
D	glabels1/src/tools.c
D	glabels1/src/tools.h
D	glabels1/src/util.c
D	glabels1/src/util.h
D	glabels1/stamp-h.in
D	glabels2/barcode-0.98/COPYING
D	glabels2/barcode-0.98/ChangeLog
D	glabels2/barcode-0.98/INSTALL
D	glabels2/barcode-0.98/README
D	glabels2/barcode-0.98/TODO
D	glabels2/barcode-0.98/barcode.h
D	glabels2/barcode-0.98/barcode.spec
D	glabels2/barcode-0.98/bookland/bookland.py
D	glabels2/barcode-0.98/cmdline.c
D	glabels2/barcode-0.98/cmdline.h
D	glabels2/barcode-0.98/codabar.c
D	glabels2/barcode-0.98/code128.c
D	glabels2/barcode-0.98/code39.c
D	glabels2/barcode-0.98/code93.c
D	glabels2/barcode-0.98/compat/getopt.c
D	glabels2/barcode-0.98/compat/getopt.h
D	glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz
D	glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README
D	glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz
D	glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
D	glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz
D	glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz.README
D	glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz
D	glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
D	glabels2/barcode-0.98/debian/README.debian
D	glabels2/barcode-0.98/debian/changelog
D	glabels2/barcode-0.98/debian/control
D	glabels2/barcode-0.98/debian/copyright
D	glabels2/barcode-0.98/debian/dirs
D	glabels2/barcode-0.98/debian/info
D	glabels2/barcode-0.98/debian/rules
D	glabels2/barcode-0.98/doc/Makefile.in
D	glabels2/barcode-0.98/doc/README
D	glabels2/barcode-0.98/doc/doc.barcode
D	glabels2/barcode-0.98/doc/infofilter
D	glabels2/barcode-0.98/doc/manpager
D	glabels2/barcode-0.98/doc/mktxt
D	glabels2/barcode-0.98/doc/texi2html
D	glabels2/barcode-0.98/ean.c
D	glabels2/barcode-0.98/i25.c
D	glabels2/barcode-0.98/install-sh
D	glabels2/barcode-0.98/library.c
D	glabels2/barcode-0.98/main.c
D	glabels2/barcode-0.98/mkinstalldirs
D	glabels2/barcode-0.98/msi.c
D	glabels2/barcode-0.98/pcl.c
D	glabels2/barcode-0.98/plessey.c
D	glabels2/barcode-0.98/ps.c
D	glabels2/barcode-0.98/sample.c
D	glabels2/src/pixmaps/checkerboard.xpm
D	glabels2/src/pixmaps/collate.xpm
D	glabels2/src/pixmaps/cursor_barcode.xbm
D	glabels2/src/pixmaps/cursor_barcode_mask.xbm
D	glabels2/src/pixmaps/cursor_box.xbm
D	glabels2/src/pixmaps/cursor_box_mask.xbm
D	glabels2/src/pixmaps/cursor_ellipse.xbm
D	glabels2/src/pixmaps/cursor_ellipse_mask.xbm
D	glabels2/src/pixmaps/cursor_image.xbm
D	glabels2/src/pixmaps/cursor_image_mask.xbm
D	glabels2/src/pixmaps/cursor_line.xbm
D	glabels2/src/pixmaps/cursor_line_mask.xbm
D	glabels2/src/pixmaps/cursor_text.xbm
D	glabels2/src/pixmaps/cursor_text_mask.xbm
D	glabels2/src/pixmaps/nocollate.xpm
R100	glabels2/gtk-doc.make	gtk-doc.make
R100	glabels2/help/C/figures/glabels-template-cd.png
help/C/figures/glabels-template-cd.png
R100	glabels2/help/C/figures/glabels-template-label.png
help/C/figures/glabels-template-label.png
R100	glabels2/help/C/figures/glabels-template-layout.png
help/C/figures/glabels-template-layout.png
R100	glabels2/help/C/figures/main-window-empty.png
help/C/figures/main-window-empty.png
R100	glabels2/help/C/figures/merge-ex1-1.png
help/C/figures/merge-ex1-1.png
R100	glabels2/help/C/figures/merge-ex1-2.png
help/C/figures/merge-ex1-2.png
R100	glabels2/help/C/figures/merge-ex1-3.png
help/C/figures/merge-ex1-3.png
R100	glabels2/help/C/figures/merge-ex1-4.png
help/C/figures/merge-ex1-4.png
R100	glabels2/help/C/figures/merge-ex2-1.png
help/C/figures/merge-ex2-1.png
R100	glabels2/help/C/figures/merge-ex2-2.png
help/C/figures/merge-ex2-2.png
R100	glabels2/help/C/figures/merge-ex2-3.png
help/C/figures/merge-ex2-3.png
R100	glabels2/help/C/figures/merge-ex2-4.png
help/C/figures/merge-ex2-4.png
R100	glabels2/help/C/figures/object-editor-sidebar.png
help/C/figures/object-editor-sidebar.png
R100	glabels2/help/C/figures/print-copies.png
help/C/figures/print-copies.png
R100	glabels2/help/C/figures/print-merge.png
help/C/figures/print-merge.png
R100	glabels2/help/C/glabels.xml	help/C/glabels.xml
R100	glabels2/help/C/legal.xml	help/C/legal.xml
R100	glabels2/help/Makefile.am	help/Makefile.am
R100	glabels2/help/de/de.po	help/de/de.po
R100	glabels2/help/de/figures/main-window-empty.png
help/de/figures/main-window-empty.png
R100	glabels2/help/de/figures/merge-ex1-1.png
help/de/figures/merge-ex1-1.png
R100	glabels2/help/de/figures/merge-ex1-2.png
help/de/figures/merge-ex1-2.png
R100	glabels2/help/de/figures/merge-ex1-3.png
help/de/figures/merge-ex1-3.png
R100	glabels2/help/de/figures/merge-ex1-4.png
help/de/figures/merge-ex1-4.png
R100	glabels2/help/de/figures/merge-ex2-1.png
help/de/figures/merge-ex2-1.png
R100	glabels2/help/de/figures/merge-ex2-2.png
help/de/figures/merge-ex2-2.png
R100	glabels2/help/de/figures/merge-ex2-3.png
help/de/figures/merge-ex2-3.png
R100	glabels2/help/de/figures/merge-ex2-4.png
help/de/figures/merge-ex2-4.png
R100	glabels2/help/de/figures/object-editor-sidebar.png
help/de/figures/object-editor-sidebar.png
R100	glabels2/help/de/figures/print-copies.png
help/de/figures/print-copies.png
R100	glabels2/help/de/figures/print-merge.png
help/de/figures/print-merge.png
R100	glabels2/help/glabels.omf.in	help/glabels.omf.in
R100	glabels2/iec16022-0.2.1/BUGS	iec16022-0.2.1/BUGS
R100	glabels2/iec16022-0.2.1/CHANGELOG	iec16022-0.2.1/CHANGELOG
R100	glabels2/iec16022-0.2.1/CREDITS iec16022-0.2.1/CREDITS
R100	glabels2/iec16022-0.2.1/INSTALL iec16022-0.2.1/INSTALL
R100	glabels2/iec16022-0.2.1/LICENSE iec16022-0.2.1/LICENSE
R100	glabels2/iec16022-0.2.1/Makefile.am	iec16022-0.2.1/Makefile.am
R100	glabels2/iec16022-0.2.1/Makefile.dist
iec16022-0.2.1/Makefile.dist
R100	glabels2/iec16022-0.2.1/README	iec16022-0.2.1/README
R100	glabels2/iec16022-0.2.1/README.glabels
iec16022-0.2.1/README.glabels
R100	glabels2/iec16022-0.2.1/TODO	iec16022-0.2.1/TODO
R100	glabels2/iec16022-0.2.1/iec16022.1	iec16022-0.2.1/iec16022.1
R100	glabels2/iec16022-0.2.1/iec16022.c	iec16022-0.2.1/iec16022.c
R100	glabels2/iec16022-0.2.1/iec16022ecc200.c
iec16022-0.2.1/iec16022ecc200.c
R100	glabels2/iec16022-0.2.1/iec16022ecc200.h
iec16022-0.2.1/iec16022ecc200.h
R100	glabels2/iec16022-0.2.1/image.c iec16022-0.2.1/image.c
R100	glabels2/iec16022-0.2.1/image.h iec16022-0.2.1/image.h
R100	glabels2/iec16022-0.2.1/reedsol.c	iec16022-0.2.1/reedsol.c
R100	glabels2/iec16022-0.2.1/reedsol.h	iec16022-0.2.1/reedsol.h
R100	glabels2/iec16022-0.2.1/test/testsuite-example.bin
iec16022-0.2.1/test/testsuite-example.bin
R100	glabels2/iec16022-0.2.1/test/testsuite-example.eps
iec16022-0.2.1/test/testsuite-example.eps
R100	glabels2/iec16022-0.2.1/test/testsuite-example.hex
iec16022-0.2.1/test/testsuite-example.hex
R100	glabels2/iec16022-0.2.1/test/testsuite-example.png
iec16022-0.2.1/test/testsuite-example.png
R100	glabels2/iec16022-0.2.1/test/testsuite-example.text
iec16022-0.2.1/test/testsuite-example.text
R100	glabels2/iec16022-0.2.1/test/testsuite.sh
iec16022-0.2.1/test/testsuite.sh
R100	glabels2/libglabels/Makefile.am libglabels/Makefile.am
R100	glabels2/libglabels/category.c	libglabels/category.c
R100	glabels2/libglabels/category.h	libglabels/category.h
R100	glabels2/libglabels/db.c	libglabels/db.c
R100	glabels2/libglabels/db.h	libglabels/db.h
R100	glabels2/libglabels/enums.h	libglabels/enums.h
R100	glabels2/libglabels/libglabels-private.h
libglabels/libglabels-private.h
R100	glabels2/libglabels/libglabels.h	libglabels/libglabels.h
R100	glabels2/libglabels/libglabels.pc.in
libglabels/libglabels.pc.in
R100	glabels2/libglabels/paper.c	libglabels/paper.c
R100	glabels2/libglabels/paper.h	libglabels/paper.h
R100	glabels2/libglabels/str.c	libglabels/str.c
R100	glabels2/libglabels/str.h	libglabels/str.h
R100	glabels2/libglabels/template.c	libglabels/template.c
R100	glabels2/libglabels/template.h	libglabels/template.h
R100	glabels2/libglabels/xml-category.c	libglabels/xml-category.c
R100	glabels2/libglabels/xml-category.h	libglabels/xml-category.h
R100	glabels2/libglabels/xml-paper.c libglabels/xml-paper.c
R100	glabels2/libglabels/xml-paper.h libglabels/xml-paper.h
R100	glabels2/libglabels/xml-template.c	libglabels/xml-template.c
R100	glabels2/libglabels/xml-template.h	libglabels/xml-template.h
R100	glabels2/libglabels/xml.c	libglabels/xml.c
R100	glabels2/libglabels/xml.h	libglabels/xml.h
R100	glabels2/po/LINGUAS	po/LINGUAS
R100	glabels2/po/POTFILES.in po/POTFILES.in
R100	glabels2/po/ca.po	po/ca.po
R100	glabels2/po/cs.po	po/cs.po
R100	glabels2/po/de.po	po/de.po
R100	glabels2/po/eo.po	po/eo.po
R100	glabels2/po/es.po	po/es.po
R100	glabels2/po/fr.po	po/fr.po
R100	glabels2/po/it.po	po/it.po
R100	glabels2/po/ja.po	po/ja.po
R100	glabels2/po/ko.po	po/ko.po
R100	glabels2/po/pl.po	po/pl.po
R100	glabels2/po/pt_BR.po	po/pt_BR.po
R100	glabels2/po/ru.po	po/ru.po
R100	glabels2/po/zh_CN.po	po/zh_CN.po
R100	glabels2/po/zh_TW.Big5.po	po/zh_TW.Big5.po
R100	glabels2/qrencode-3.1.0/COPYING qrencode-3.1.0/COPYING
R100	glabels2/qrencode-3.1.0/ChangeLog	qrencode-3.1.0/ChangeLog
R100	glabels2/qrencode-3.1.0/Doxyfile	qrencode-3.1.0/Doxyfile
R100	glabels2/qrencode-3.1.0/Makefile.am	qrencode-3.1.0/Makefile.am
R100	glabels2/qrencode-3.1.0/Makefile.am.dist
qrencode-3.1.0/Makefile.am.dist
R100	glabels2/qrencode-3.1.0/Makefile.in.dist
qrencode-3.1.0/Makefile.in.dist
R100	glabels2/qrencode-3.1.0/NEWS	qrencode-3.1.0/NEWS
R100	glabels2/qrencode-3.1.0/README	qrencode-3.1.0/README
R100	glabels2/qrencode-3.1.0/README.glabels
qrencode-3.1.0/README.glabels
R100	glabels2/qrencode-3.1.0/TODO	qrencode-3.1.0/TODO
R100	glabels2/qrencode-3.1.0/acinclude.m4
qrencode-3.1.0/acinclude.m4
R100	glabels2/qrencode-3.1.0/aclocal.m4	qrencode-3.1.0/aclocal.m4
R100	glabels2/qrencode-3.1.0/autogen.sh	qrencode-3.1.0/autogen.sh
R100	glabels2/qrencode-3.1.0/bitstream.c	qrencode-3.1.0/bitstream.c
R100	glabels2/qrencode-3.1.0/bitstream.h	qrencode-3.1.0/bitstream.h
R100	glabels2/qrencode-3.1.0/config.h.in	qrencode-3.1.0/config.h.in
R100	glabels2/qrencode-3.1.0/configure	qrencode-3.1.0/configure
R100	glabels2/qrencode-3.1.0/configure.ac.dist
qrencode-3.1.0/configure.ac.dist
R100	glabels2/qrencode-3.1.0/libqrencode.pc.in
qrencode-3.1.0/libqrencode.pc.in
R100	glabels2/qrencode-3.1.0/mask.c	qrencode-3.1.0/mask.c
R100	glabels2/qrencode-3.1.0/mask.h	qrencode-3.1.0/mask.h
R100	glabels2/qrencode-3.1.0/qrenc.c qrencode-3.1.0/qrenc.c
R100	glabels2/qrencode-3.1.0/qrencode.1.in
qrencode-3.1.0/qrencode.1.in
R100	glabels2/qrencode-3.1.0/qrencode.c	qrencode-3.1.0/qrencode.c
R100	glabels2/qrencode-3.1.0/qrencode.h	qrencode-3.1.0/qrencode.h
R100	glabels2/qrencode-3.1.0/qrencode.spec
qrencode-3.1.0/qrencode.spec
R100	glabels2/qrencode-3.1.0/qrencode.spec.in
qrencode-3.1.0/qrencode.spec.in
R100	glabels2/qrencode-3.1.0/qrencode_inner.h
qrencode-3.1.0/qrencode_inner.h
R100	glabels2/qrencode-3.1.0/qrinput.c	qrencode-3.1.0/qrinput.c
R100	glabels2/qrencode-3.1.0/qrinput.h	qrencode-3.1.0/qrinput.h
R100	glabels2/qrencode-3.1.0/qrspec.c	qrencode-3.1.0/qrspec.c
R100	glabels2/qrencode-3.1.0/qrspec.h	qrencode-3.1.0/qrspec.h
R100	glabels2/qrencode-3.1.0/rscode.c	qrencode-3.1.0/rscode.c
R100	glabels2/qrencode-3.1.0/rscode.h	qrencode-3.1.0/rscode.h
R100	glabels2/qrencode-3.1.0/split.c qrencode-3.1.0/split.c
R100	glabels2/qrencode-3.1.0/split.h qrencode-3.1.0/split.h
R100	glabels2/qrencode-3.1.0/tests/Makefile.am
qrencode-3.1.0/tests/Makefile.am
R100	glabels2/qrencode-3.1.0/tests/Makefile.in
qrencode-3.1.0/tests/Makefile.in
R100	glabels2/qrencode-3.1.0/tests/common.h
qrencode-3.1.0/tests/common.h
R100	glabels2/qrencode-3.1.0/tests/create_frame_pattern.c
qrencode-3.1.0/tests/create_frame_pattern.c
R100	glabels2/qrencode-3.1.0/tests/frame	qrencode-3.1.0/tests/frame
R100	glabels2/qrencode-3.1.0/tests/prof_qrencode.c
qrencode-3.1.0/tests/prof_qrencode.c
R100	glabels2/qrencode-3.1.0/tests/test_all.sh
qrencode-3.1.0/tests/test_all.sh
R100	glabels2/qrencode-3.1.0/tests/test_bitstream.c
qrencode-3.1.0/tests/test_bitstream.c
R100	glabels2/qrencode-3.1.0/tests/test_estimatebit.c
qrencode-3.1.0/tests/test_estimatebit.c
R100	glabels2/qrencode-3.1.0/tests/test_monkey.c
qrencode-3.1.0/tests/test_monkey.c
R100	glabels2/qrencode-3.1.0/tests/test_qrencode.c
qrencode-3.1.0/tests/test_qrencode.c
R100	glabels2/qrencode-3.1.0/tests/test_qrinput.c
qrencode-3.1.0/tests/test_qrinput.c
R100	glabels2/qrencode-3.1.0/tests/test_qrspec.c
qrencode-3.1.0/tests/test_qrspec.c
R100	glabels2/qrencode-3.1.0/tests/test_rs.c
qrencode-3.1.0/tests/test_rs.c
R100	glabels2/qrencode-3.1.0/tests/test_split.c
qrencode-3.1.0/tests/test_split.c
R100	glabels2/qrencode-3.1.0/tests/view_qrcode.c
qrencode-3.1.0/tests/view_qrcode.c
R100	glabels2/qrencode-3.1.0/use/compile	qrencode-3.1.0/use/compile
R100	glabels2/qrencode-3.1.0/use/config.guess
qrencode-3.1.0/use/config.guess
R100	glabels2/qrencode-3.1.0/use/config.sub
qrencode-3.1.0/use/config.sub
R100	glabels2/qrencode-3.1.0/use/depcomp	qrencode-3.1.0/use/depcomp
R100	glabels2/qrencode-3.1.0/use/install-sh
qrencode-3.1.0/use/install-sh
R100	glabels2/qrencode-3.1.0/use/ltmain.sh
qrencode-3.1.0/use/ltmain.sh
R100	glabels2/qrencode-3.1.0/use/missing	qrencode-3.1.0/use/missing
R100	glabels2/src/Makefile.am	src/Makefile.am
R100	glabels2/src/bc-gnubarcode.c	src/bc-gnubarcode.c
R100	glabels2/src/bc-gnubarcode.h	src/bc-gnubarcode.h
R100	glabels2/src/bc-iec16022.c	src/bc-iec16022.c
R100	glabels2/src/bc-iec16022.h	src/bc-iec16022.h
R100	glabels2/src/bc-iec18004.c	src/bc-iec18004.c
R100	glabels2/src/bc-iec18004.h	src/bc-iec18004.h
R100	glabels2/src/bc-postnet.c	src/bc-postnet.c
R100	glabels2/src/bc-postnet.h	src/bc-postnet.h
R100	glabels2/src/bc.c	src/bc.c
R100	glabels2/src/bc.h	src/bc.h
R100	glabels2/src/builder-util.c	src/builder-util.c
R100	glabels2/src/builder-util.h	src/builder-util.h
R100	glabels2/src/cairo-ellipse-path.c	src/cairo-ellipse-path.c
R100	glabels2/src/cairo-ellipse-path.h	src/cairo-ellipse-path.h
R100	glabels2/src/cairo-label-path.c src/cairo-label-path.c
R100	glabels2/src/cairo-label-path.h src/cairo-label-path.h
R100	glabels2/src/cairo-markup-path.c	src/cairo-markup-path.c
R100	glabels2/src/cairo-markup-path.h	src/cairo-markup-path.h
R100	glabels2/src/color-combo-button.c	src/color-combo-button.c
R100	glabels2/src/color-combo-button.h	src/color-combo-button.h
R100	glabels2/src/color-combo-color-menu-item.c
src/color-combo-color-menu-item.c
R100	glabels2/src/color-combo-color-menu-item.h
src/color-combo-color-menu-item.h
R100	glabels2/src/color-combo-history.c	src/color-combo-history.c
R100	glabels2/src/color-combo-history.h	src/color-combo-history.h
R100	glabels2/src/color-combo-menu.c src/color-combo-menu.c
R100	glabels2/src/color-combo-menu.h src/color-combo-menu.h
R100	glabels2/src/color-combo.c	src/color-combo.c
R100	glabels2/src/color-combo.h	src/color-combo.h
R100	glabels2/src/color-swatch.c	src/color-swatch.c
R100	glabels2/src/color-swatch.h	src/color-swatch.h
R100	glabels2/src/color.c	src/color.c
R100	glabels2/src/color.h	src/color.h
R100	glabels2/src/combo-util.c	src/combo-util.c
R100	glabels2/src/combo-util.h	src/combo-util.h
R100	glabels2/src/critical-error-handler.c
src/critical-error-handler.c
R100	glabels2/src/critical-error-handler.h
src/critical-error-handler.h
R100	glabels2/src/debug.c	src/debug.c
R100	glabels2/src/debug.h	src/debug.h
R100	glabels2/src/file-util.c	src/file-util.c
R100	glabels2/src/file-util.h	src/file-util.h
R100	glabels2/src/file.c	src/file.c
R100	glabels2/src/file.h	src/file.h
R100	glabels2/src/font-combo-menu-item.c	src/font-combo-menu-item.c
R100	glabels2/src/font-combo-menu-item.h	src/font-combo-menu-item.h
R100	glabels2/src/font-combo-menu.c	src/font-combo-menu.c
R100	glabels2/src/font-combo-menu.h	src/font-combo-menu.h
R100	glabels2/src/font-combo.c	src/font-combo.c
R100	glabels2/src/font-combo.h	src/font-combo.h
R100	glabels2/src/font-sample.c	src/font-sample.c
R100	glabels2/src/font-sample.h	src/font-sample.h
R100	glabels2/src/font-util.c	src/font-util.c
R100	glabels2/src/font-util.h	src/font-util.h
R100	glabels2/src/glabels-batch.c	src/glabels-batch.c
R100	glabels2/src/glabels.c	src/glabels.c
R100	glabels2/src/hig.h	src/hig.h
R100	glabels2/src/label-barcode.c	src/label-barcode.c
R100	glabels2/src/label-barcode.h	src/label-barcode.h
R100	glabels2/src/label-box.c	src/label-box.c
R100	glabels2/src/label-box.h	src/label-box.h
R100	glabels2/src/label-ellipse.c	src/label-ellipse.c
R100	glabels2/src/label-ellipse.h	src/label-ellipse.h
R100	glabels2/src/label-image.c	src/label-image.c
R100	glabels2/src/label-image.h	src/label-image.h
R100	glabels2/src/label-line.c	src/label-line.c
R100	glabels2/src/label-line.h	src/label-line.h
R100	glabels2/src/label-object.c	src/label-object.c
R100	glabels2/src/label-object.h	src/label-object.h
R100	glabels2/src/label-text.c	src/label-text.c
R100	glabels2/src/label-text.h	src/label-text.h
R100	glabels2/src/label.c	src/label.c
R100	glabels2/src/label.h	src/label.h
R100	glabels2/src/marshal.list	src/marshal.list
R100	glabels2/src/merge-evolution.c	src/merge-evolution.c
R100	glabels2/src/merge-evolution.h	src/merge-evolution.h
R100	glabels2/src/merge-init.c	src/merge-init.c
R100	glabels2/src/merge-init.h	src/merge-init.h
R100	glabels2/src/merge-properties-dialog.c
src/merge-properties-dialog.c
R100	glabels2/src/merge-properties-dialog.h
src/merge-properties-dialog.h
R100	glabels2/src/merge-text.c	src/merge-text.c
R100	glabels2/src/merge-text.h	src/merge-text.h
R100	glabels2/src/merge-vcard.c	src/merge-vcard.c
R100	glabels2/src/merge-vcard.h	src/merge-vcard.h
R100	glabels2/src/merge.c	src/merge.c
R100	glabels2/src/merge.h	src/merge.h
R100	glabels2/src/mini-label-preview.c	src/mini-label-preview.c
R100	glabels2/src/mini-label-preview.h	src/mini-label-preview.h
R100	glabels2/src/mini-preview-pixbuf-cache.c
src/mini-preview-pixbuf-cache.c
R100	glabels2/src/mini-preview-pixbuf-cache.h
src/mini-preview-pixbuf-cache.h
R100	glabels2/src/mini-preview-pixbuf.c	src/mini-preview-pixbuf.c
R100	glabels2/src/mini-preview-pixbuf.h	src/mini-preview-pixbuf.h
R100	glabels2/src/mini-preview.c	src/mini-preview.c
R100	glabels2/src/mini-preview.h	src/mini-preview.h
R100	glabels2/src/new-label-dialog.c src/new-label-dialog.c
R100	glabels2/src/new-label-dialog.h src/new-label-dialog.h
R100	glabels2/src/object-editor-bc-page.c
src/object-editor-bc-page.c
R100	glabels2/src/object-editor-data-page.c
src/object-editor-data-page.c
R100	glabels2/src/object-editor-edit-page.c
src/object-editor-edit-page.c
R100	glabels2/src/object-editor-fill-page.c
src/object-editor-fill-page.c
R100	glabels2/src/object-editor-image-page.c
src/object-editor-image-page.c
R100	glabels2/src/object-editor-line-page.c
src/object-editor-line-page.c
R100	glabels2/src/object-editor-lsize-page.c
src/object-editor-lsize-page.c
R100	glabels2/src/object-editor-position-page.c
src/object-editor-position-page.c
R100	glabels2/src/object-editor-private.h
src/object-editor-private.h
R100	glabels2/src/object-editor-shadow-page.c
src/object-editor-shadow-page.c
R100	glabels2/src/object-editor-size-page.c
src/object-editor-size-page.c
R100	glabels2/src/object-editor-text-page.c
src/object-editor-text-page.c
R100	glabels2/src/object-editor.c	src/object-editor.c
R100	glabels2/src/object-editor.h	src/object-editor.h
R100	glabels2/src/pixbuf-cache.c	src/pixbuf-cache.c
R100	glabels2/src/pixbuf-cache.h	src/pixbuf-cache.h
R100	glabels2/src/pixmaps/Makefile.am	src/pixmaps/Makefile.am
R100	glabels1/src/pixmaps/checkerboard.xpm
src/pixmaps/checkerboard.xpm
R100	glabels1/src/pixmaps/collate.xpm	src/pixmaps/collate.xpm
R100	glabels1/src/pixmaps/cursor_barcode.xbm
src/pixmaps/cursor_barcode.xbm
R100	glabels1/src/pixmaps/cursor_barcode_mask.xbm
src/pixmaps/cursor_barcode_mask.xbm
R100	glabels1/src/pixmaps/cursor_box.xbm	src/pixmaps/cursor_box.xbm
R100	glabels1/src/pixmaps/cursor_box_mask.xbm
src/pixmaps/cursor_box_mask.xbm
R100	glabels1/src/pixmaps/cursor_ellipse.xbm
src/pixmaps/cursor_ellipse.xbm
R100	glabels1/src/pixmaps/cursor_ellipse_mask.xbm
src/pixmaps/cursor_ellipse_mask.xbm
R100	glabels1/src/pixmaps/cursor_image.xbm
src/pixmaps/cursor_image.xbm
R100	glabels1/src/pixmaps/cursor_image_mask.xbm
src/pixmaps/cursor_image_mask.xbm
R100	glabels1/src/pixmaps/cursor_line.xbm
src/pixmaps/cursor_line.xbm
R100	glabels1/src/pixmaps/cursor_line_mask.xbm
src/pixmaps/cursor_line_mask.xbm
R100	glabels1/src/pixmaps/cursor_text.xbm
src/pixmaps/cursor_text.xbm
R100	glabels1/src/pixmaps/cursor_text_mask.xbm
src/pixmaps/cursor_text_mask.xbm
R100	glabels1/src/pixmaps/nocollate.xpm	src/pixmaps/nocollate.xpm
R100	glabels2/src/prefs-dialog.c	src/prefs-dialog.c
R100	glabels2/src/prefs-dialog.h	src/prefs-dialog.h
R100	glabels2/src/prefs-model.c	src/prefs-model.c
R100	glabels2/src/prefs-model.h	src/prefs-model.h
R100	glabels2/src/prefs.c	src/prefs.c
R100	glabels2/src/prefs.h	src/prefs.h
R100	glabels2/src/print-op-dialog.c	src/print-op-dialog.c
R100	glabels2/src/print-op-dialog.h	src/print-op-dialog.h
R100	glabels2/src/print-op.c src/print-op.c
R100	glabels2/src/print-op.h src/print-op.h
R100	glabels2/src/print.c	src/print.c
R100	glabels2/src/print.h	src/print.h
R100	glabels2/src/recent.c	src/recent.c
R100	glabels2/src/recent.h	src/recent.h
R100	glabels2/src/rotate-label-button.c	src/rotate-label-button.c
R100	glabels2/src/rotate-label-button.h	src/rotate-label-button.h
R100	glabels2/src/stock-pixmaps/Makefile.am
src/stock-pixmaps/Makefile.am
R100	glabels2/src/stock-pixmaps/stock_align_bottom_16.png
src/stock-pixmaps/stock_align_bottom_16.png
R100	glabels2/src/stock-pixmaps/stock_align_hcenter_16.png
src/stock-pixmaps/stock_align_hcenter_16.png
R100	glabels2/src/stock-pixmaps/stock_align_left_16.png
src/stock-pixmaps/stock_align_left_16.png
R100	glabels2/src/stock-pixmaps/stock_align_right_16.png
src/stock-pixmaps/stock_align_right_16.png
R100	glabels2/src/stock-pixmaps/stock_align_top_16.png
src/stock-pixmaps/stock_align_top_16.png
R100	glabels2/src/stock-pixmaps/stock_align_vcenter_16.png
src/stock-pixmaps/stock_align_vcenter_16.png
R100	glabels2/src/stock-pixmaps/stock_arrow_16.png
src/stock-pixmaps/stock_arrow_16.png
R100	glabels2/src/stock-pixmaps/stock_arrow_24.png
src/stock-pixmaps/stock_arrow_24.png
R100	glabels2/src/stock-pixmaps/stock_barcode_16.png
src/stock-pixmaps/stock_barcode_16.png
R100	glabels2/src/stock-pixmaps/stock_barcode_24.png
src/stock-pixmaps/stock_barcode_24.png
R100	glabels2/src/stock-pixmaps/stock_box_16.png
src/stock-pixmaps/stock_box_16.png
R100	glabels2/src/stock-pixmaps/stock_box_24.png
src/stock-pixmaps/stock_box_24.png
R100	glabels2/src/stock-pixmaps/stock_bucket_fill_16.png
src/stock-pixmaps/stock_bucket_fill_16.png
R100	glabels2/src/stock-pixmaps/stock_bucket_fill_24.png
src/stock-pixmaps/stock_bucket_fill_24.png
R100	glabels2/src/stock-pixmaps/stock_center_horiz_16.png
src/stock-pixmaps/stock_center_horiz_16.png
R100	glabels2/src/stock-pixmaps/stock_center_vert_16.png
src/stock-pixmaps/stock_center_vert_16.png
R100	glabels2/src/stock-pixmaps/stock_ellipse_16.png
src/stock-pixmaps/stock_ellipse_16.png
R100	glabels2/src/stock-pixmaps/stock_ellipse_24.png
src/stock-pixmaps/stock_ellipse_24.png
R100	glabels2/src/stock-pixmaps/stock_flip_horiz_16.png
src/stock-pixmaps/stock_flip_horiz_16.png
R100	glabels2/src/stock-pixmaps/stock_flip_vert_16.png
src/stock-pixmaps/stock_flip_vert_16.png
R100	glabels2/src/stock-pixmaps/stock_hchain_24.png
src/stock-pixmaps/stock_hchain_24.png
R100	glabels2/src/stock-pixmaps/stock_hchain_broken_24.png
src/stock-pixmaps/stock_hchain_broken_24.png
R100	glabels2/src/stock-pixmaps/stock_image_16.png
src/stock-pixmaps/stock_image_16.png
R100	glabels2/src/stock-pixmaps/stock_image_24.png
src/stock-pixmaps/stock_image_24.png
R100	glabels2/src/stock-pixmaps/stock_line_16.png
src/stock-pixmaps/stock_line_16.png
R100	glabels2/src/stock-pixmaps/stock_line_24.png
src/stock-pixmaps/stock_line_24.png
R100	glabels2/src/stock-pixmaps/stock_merge_16.png
src/stock-pixmaps/stock_merge_16.png
R100	glabels2/src/stock-pixmaps/stock_merge_24.png
src/stock-pixmaps/stock_merge_24.png
R100	glabels2/src/stock-pixmaps/stock_order_bottom_16.png
src/stock-pixmaps/stock_order_bottom_16.png
R100	glabels2/src/stock-pixmaps/stock_order_top_16.png
src/stock-pixmaps/stock_order_top_16.png
R100	glabels2/src/stock-pixmaps/stock_pencil_16.png
src/stock-pixmaps/stock_pencil_16.png
R100	glabels2/src/stock-pixmaps/stock_pencil_24.png
src/stock-pixmaps/stock_pencil_24.png
R100	glabels2/src/stock-pixmaps/stock_properties_16.png
src/stock-pixmaps/stock_properties_16.png
R100	glabels2/src/stock-pixmaps/stock_properties_24.png
src/stock-pixmaps/stock_properties_24.png
R100	glabels2/src/stock-pixmaps/stock_rotate_left_16.png
src/stock-pixmaps/stock_rotate_left_16.png
R100	glabels2/src/stock-pixmaps/stock_rotate_right_16.png
src/stock-pixmaps/stock_rotate_right_16.png
R100	glabels2/src/stock-pixmaps/stock_text_16.png
src/stock-pixmaps/stock_text_16.png
R100	glabels2/src/stock-pixmaps/stock_text_24.png
src/stock-pixmaps/stock_text_24.png
R100	glabels2/src/stock-pixmaps/stock_vchain_24.png
src/stock-pixmaps/stock_vchain_24.png
R100	glabels2/src/stock-pixmaps/stock_vchain_broken_24.png
src/stock-pixmaps/stock_vchain_broken_24.png
R100	glabels2/src/stock.c	src/stock.c
R100	glabels2/src/stock.h	src/stock.h
R100	glabels2/src/str-util.c src/str-util.c
R100	glabels2/src/str-util.h src/str-util.h
R100	glabels2/src/template-designer.c	src/template-designer.c
R100	glabels2/src/template-designer.h	src/template-designer.h
R100	glabels2/src/text-node.c	src/text-node.c
R100	glabels2/src/text-node.h	src/text-node.h
R100	glabels2/src/ui-commands.c	src/ui-commands.c
R100	glabels2/src/ui-commands.h	src/ui-commands.h
R100	glabels2/src/ui-property-bar.c	src/ui-property-bar.c
R100	glabels2/src/ui-property-bar.h	src/ui-property-bar.h
R100	glabels2/src/ui-sidebar.c	src/ui-sidebar.c
R100	glabels2/src/ui-sidebar.h	src/ui-sidebar.h
R100	glabels2/src/ui-util.c	src/ui-util.c
R100	glabels2/src/ui-util.h	src/ui-util.h
R100	glabels2/src/ui.c	src/ui.c
R100	glabels2/src/ui.h	src/ui.h
R100	glabels2/src/view-barcode.c	src/view-barcode.c
R100	glabels2/src/view-barcode.h	src/view-barcode.h
R100	glabels2/src/view-box.c src/view-box.c
R100	glabels2/src/view-box.h src/view-box.h
R100	glabels2/src/view-ellipse.c	src/view-ellipse.c
R100	glabels2/src/view-ellipse.h	src/view-ellipse.h
R100	glabels2/src/view-image.c	src/view-image.c
R100	glabels2/src/view-image.h	src/view-image.h
R100	glabels2/src/view-line.c	src/view-line.c
R100	glabels2/src/view-line.h	src/view-line.h
R100	glabels2/src/view-object.c	src/view-object.c
R100	glabels2/src/view-object.h	src/view-object.h
R100	glabels2/src/view-text.c	src/view-text.c
R100	glabels2/src/view-text.h	src/view-text.h
R100	glabels2/src/view.c	src/view.c
R100	glabels2/src/view.h	src/view.h
R100	glabels2/src/warning-handler.c	src/warning-handler.c
R100	glabels2/src/warning-handler.h	src/warning-handler.h
R100	glabels2/src/wdgt-chain-button.c	src/wdgt-chain-button.c
R100	glabels2/src/wdgt-chain-button.h	src/wdgt-chain-button.h
R100	glabels2/src/wdgt-media-select.c	src/wdgt-media-select.c
R100	glabels2/src/wdgt-media-select.h	src/wdgt-media-select.h
R100	glabels2/src/wdgt-merge-menu.c	src/wdgt-merge-menu.c
R100	glabels2/src/wdgt-merge-menu.h	src/wdgt-merge-menu.h
R100	glabels2/src/window.c	src/window.c
R100	glabels2/src/window.h	src/window.h
R100	glabels2/src/xml-label-04.c	src/xml-label-04.c
R100	glabels2/src/xml-label-04.h	src/xml-label-04.h
R100	glabels2/src/xml-label.c	src/xml-label.c
R100	glabels2/src/xml-label.h	src/xml-label.h
R100	glabels2/templates/Makefile.am	templates/Makefile.am
R100	glabels2/templates/avery-iso-templates.xml
templates/avery-iso-templates.xml
R100	glabels2/templates/avery-other-templates.xml
templates/avery-other-templates.xml
R100	glabels2/templates/avery-us-templates.xml
templates/avery-us-templates.xml
R100	glabels2/templates/brother-other-templates.xml
templates/brother-other-templates.xml
R100	glabels2/templates/categories.xml	templates/categories.xml
R100	glabels2/templates/dymo-other-templates.xml
templates/dymo-other-templates.xml
R100	glabels2/templates/glabels-2.2.dtd	templates/glabels-2.2.dtd
R100	glabels2/templates/misc-iso-templates.xml
templates/misc-iso-templates.xml
R100	glabels2/templates/misc-other-templates.xml
templates/misc-other-templates.xml
R100	glabels2/templates/misc-us-templates.xml
templates/misc-us-templates.xml
R100	glabels2/templates/paper-sizes.xml	templates/paper-sizes.xml
R100	glabels2/templates/zweckform-iso-templates.xml
templates/zweckform-iso-templates.xml
D	web/common_php.inc
D	web/contact/index.php
D	web/css/glabels.css
D	web/doc/glabels-2.0.dtd.txt
D	web/doc/glabels-2.2.dtd.txt
D	web/doc/index.php
D	web/doc/install-src/index.php
D	web/doc/templates-2.0/glabels-template-cd.png
D	web/doc/templates-2.0/glabels-template-label.png
D	web/doc/templates-2.0/glabels-template-layout.png
D	web/doc/templates-2.0/index.php
D	web/doc/templates-2.2/glabels-template-cd.png
D	web/doc/templates-2.2/glabels-template-label.png
D	web/doc/templates-2.2/glabels-template-layout.png
D	web/doc/templates-2.2/index.php
D	web/download/index.php
D	web/faq/index.php
D	web/faq/q1.3-output.png
D	web/faq/q1.3-screenshot.png
D	web/images/button-bg.png
D	web/images/corner-bl.png
D	web/images/corner-br.png
D	web/images/corner-tl.png
D	web/images/corner-tr.png
D	web/images/glabels-title-140.png
D	web/images/pixel-null.png
D	web/index.php
D	web/links/index.php
D	web/news/index.php
D	web/screenshots/191-screenshot-main-grid-thumb.png
D	web/screenshots/191-screenshot-main-grid.png
D	web/screenshots/191-screenshot-main-thumb.png
D	web/screenshots/191-screenshot-main.png
D	web/screenshots/191-screenshot-new-thumb.png
D	web/screenshots/191-screenshot-new.png
D	web/screenshots/191-screenshot-print-merge-thumb.png
D	web/screenshots/191-screenshot-print-merge.png
D	web/screenshots/191-screenshot-print-simple-thumb.png
D	web/screenshots/191-screenshot-print-simple.png
D	web/screenshots/192-screenshot-thumb.png
D	web/screenshots/192-screenshot.png
D	web/screenshots/193-screenshot-main-thumb.png
D	web/screenshots/193-screenshot-main.png
D	web/screenshots/193-screenshot-new-thumb.png
D	web/screenshots/193-screenshot-new.png
D	web/screenshots/193-screenshot-preview-thumb.png
D	web/screenshots/193-screenshot-preview.png
D	web/screenshots/193-screenshot-print-thumb.png
D	web/screenshots/193-screenshot-print.png
D	web/screenshots/220-screenshot-main-thumb.png
D	web/screenshots/220-screenshot-main.png
D	web/screenshots/220-screenshot-new-thumb.png
D	web/screenshots/220-screenshot-new.png
D	web/screenshots/220-screenshot-preview-thumb.png
D	web/screenshots/220-screenshot-preview.png
D	web/screenshots/220-screenshot-print-thumb.png
D	web/screenshots/220-screenshot-print.png
D	web/screenshots/glabels1-screenshot-thumb.jpg
D	web/screenshots/glabels1-screenshot.jpg
D	web/screenshots/glabels1-screenshot.png
D	web/screenshots/index.php
D	web/source/glabels-0.1.0.tar.gz
D	web/source/glabels-0.1.1.tar.gz
D	web/source/glabels-0.1.2.tar.gz
D	web/source/glabels-0.1.3.tar.gz
D	web/source/glabels-0.1.4.tar.gz
D	web/source/glabels-0.1.5.tar.gz
D	web/source/glabels-0.2.0.tar.gz
D	web/source/glabels-0.2.1.tar.gz
D	web/source/glabels-0.2.2.tar.gz
D	web/source/glabels-0.2.3.tar.gz
D	web/source/glabels-0.2.4.tar.gz
D	web/source/glabels-0.3.0.tar.gz
D	web/source/glabels-0.3.1.tar.gz
D	web/source/glabels-0.3.2.tar.gz
D	web/source/glabels-0.3.3.tar.gz
D	web/source/glabels-0.3.4.tar.gz
D	web/source/glabels-0.4.0.tar.gz
D	web/source/glabels-0.4.1.tar.gz
D	web/source/glabels-0.4.2.tar.gz
D	web/source/glabels-0.4.3.tar.gz
D	web/source/glabels-0.4.4.tar.gz
D	web/source/glabels-0.4.5.tar.gz
D	web/source/glabels-0.4.6.tar.gz
D	web/source/glabels-1.89.0.tar.gz
D	web/source/glabels-1.89.1.tar.gz
D	web/source/glabels-1.89.2.tar.gz
D	web/source/glabels-1.90.0.tar.gz
D	web/source/glabels-1.91.0.tar.gz
D	web/source/glabels-1.91.1.tar.gz
D	web/source/glabels-1.92.0.tar.gz
D	web/source/glabels-1.92.1.tar.gz
D	web/source/glabels-1.92.2.tar.gz
D	web/source/glabels-1.92.3.tar.gz
D	web/source/glabels-1.93.0.tar.gz
D	web/source/glabels-1.93.1.tar.gz
D	web/source/glabels-1.93.2.tar.gz
D	web/source/glabels-1.93.3.tar.gz
D	web/tango-icons/applications-development.png
D	web/tango-icons/applications-internet.png
D	web/tango-icons/dialog-information.png
D	web/tango-icons/emblem-photos.png
D	web/tango-icons/help-browser.png
D	web/tango-icons/internet-news-reader.png
D	web/tango-icons/package-x-generic.png
D	web/tango-icons/system-users.png

commit afa4a2a62381d2502254a8928216f11509aa1b7d
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-23

    2009-09-22	Jim Evins  <evins@snaught.com>

	    * po/POTFILES.in:
	    * src/Makefile.am:
	    * src/builder-util.c:
	    * src/builder-util.h:
	    * src/combo-util.c:
	    * src/combo-util.h:
	    * src/file-util.c:
	    * src/file-util.h:
	    * src/str-util.c:
	    * src/str-util.h:
		    Split "catch all" util module into separate modules
		    for different
		    domains of utilities.
	    * src/file.c: (gl_file_open_real), (save_as_response):
	    * src/glabels-batch.c: (main):
	    * src/label.c: (gl_label_get_short_name):
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_init),
	    (gl_merge_properties_dialog_construct):
	    * src/new-label-dialog.c:
	    * src/object-editor-bc-page.c:
	    (gl_object_editor_prepare_bc_page),
	    (gl_object_editor_set_bc_style),
	    (gl_object_editor_set_bc_color):
	    * src/object-editor-data-page.c:
	    (gl_object_editor_prepare_data_page),
	    (gl_object_editor_set_data):
	    * src/object-editor-edit-page.c:
	    (gl_object_editor_prepare_edit_page):
	    * src/object-editor-fill-page.c:
	    (gl_object_editor_prepare_fill_page),
	    (gl_object_editor_set_fill_color):
	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page),
	    (gl_object_editor_set_image):
	    * src/object-editor-line-page.c:
	    (gl_object_editor_prepare_line_page),
	    (gl_object_editor_set_line_color):
	    * src/object-editor-lsize-page.c:
	    (gl_object_editor_prepare_lsize_page):
	    * src/object-editor-position-page.c:
	    (gl_object_editor_prepare_position_page):
	    * src/object-editor-shadow-page.c:
	    (gl_object_editor_prepare_shadow_page),
	    (gl_object_editor_set_shadow_color):
	    * src/object-editor-size-page.c:
	    (gl_object_editor_prepare_size_page):
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page),
	    (gl_object_editor_set_text_color):
	    * src/object-editor.c: (gl_object_editor_init),
	    (gl_object_editor_set_key_names):
	    * src/prefs-dialog.c: (gl_prefs_dialog_construct),
	    (construct_locale_page), (construct_object_page):
	    * src/prefs-model.c: (gl_prefs_model_save_settings),
	    (gl_prefs_model_load_settings):
	    * src/print-op-dialog.c: (create_custom_widget_cb):
	    * src/template-designer.c: (construct_start_page),
	    (construct_name_page), (construct_pg_size_page),
	    (construct_shape_page), (construct_rect_size_page),
	    (construct_round_size_page), (construct_cd_size_page),
	    (construct_nlayouts_page), (construct_layout_page),
	    (construct_finish_page):
	    * src/ui-property-bar.c: (gl_ui_property_bar_construct):
	    * src/wdgt-media-select.c: (gl_wdgt_media_select_construct),
	    (gl_wdgt_media_select_set_filter_parameters),
	    (get_label_size_desc):
	    * src/window.c: (gl_window_new_from_file):
	    * src/xml-label-04.c: (xml04_parse_text_props):
	    * src/xml-label.c: (xml_parse_object_text),
	    (xml_parse_toplevel_span), (xml_create_object_text),
	    (xml_create_toplevel_span):
		    Reconciled all references to old utils module with
		    new domain
		    specific utilities modules.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@895
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
A	glabels2/src/builder-util.c
A	glabels2/src/builder-util.h
A	glabels2/src/combo-util.c
A	glabels2/src/combo-util.h
A	glabels2/src/file-util.c
A	glabels2/src/file-util.h
M	glabels2/src/file.c
M	glabels2/src/glabels-batch.c
M	glabels2/src/label.c
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/new-label-dialog.c
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-model.c
M	glabels2/src/print-op-dialog.c
A	glabels2/src/str-util.c
A	glabels2/src/str-util.h
M	glabels2/src/template-designer.c
M	glabels2/src/ui-property-bar.c
D	glabels2/src/util.c
D	glabels2/src/util.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/window.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label.c

commit b837823b737bdc2dd87ccc7d16e48d8079ed04e4
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-23

    2009-09-22	Jim Evins  <evins@snaught.com>

	    * po/POTFILES.in:
		    Include all (src/*.[ch]) source files.
	    * data/builder/merge-properties-dialog.builder:
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_init),
	    (gl_merge_properties_dialog_construct), (type_changed_cb):
		    - OK button now has default focus.
		    - Some formatting cleanup.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@894
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/builder/merge-properties-dialog.builder
M	glabels2/po/POTFILES.in
M	glabels2/src/merge-properties-dialog.c

commit c41ee6a35575304bc9a08337f75b7e2a1c658e7e
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-21

    2009-09-21	Jim Evins  <evins@snaught.com>

	    * po/POTFILES.in:
	    * data/builder/Makefile.am:
	    * data/builder/new-label-dialog.builder:
		    Removed trivial builder file for new label dialog.
	    * data/builder/wdgt-media-select.builder:
		    Changed focus behavior of widgets.
	    * src/new-label-dialog.c: (gl_new_label_dialog_init),
	    (gl_new_label_dialog_construct):
		    - Removed use of trivial builder file -- populate
		    explicitely.
		    - Moved population code to init.
		    - OK button now has default focus.
		    - Some formatting cleanup.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@893
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/builder/Makefile.am
D	glabels2/data/builder/new-label-dialog.builder
M	glabels2/data/builder/wdgt-media-select.builder
M	glabels2/po/POTFILES.in
M	glabels2/src/new-label-dialog.c

commit bbbf408cc04af2b04aea5c0607e780cb1f6a70f0
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-09-20

    *po/de.po: Updated German translation



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@892
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/de.po

commit 8faa3c122a93e40e4d296af10155542818b4666e
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-19

    2009-09-19	Jim Evins  <evins@snaught.com>

	    * COPYING:
		    Updated to GPL3 text.
	    * COPYING-LIBGLABELS:
		    Updated to LGPL3 text.
	    * COPYING-TEMPLATES:
		    New MIT/X license file for templates subdirectory.
	    * COPYING.README_FIRST:
		    Updated licensing information.
	    * templates/Makefile.am:
	    * templates/avery-iso-templates.xml:
	    * templates/avery-other-templates.xml:
	    * templates/avery-us-templates.xml:
	    * templates/brother-other-templates.xml:
	    * templates/categories.xml:
	    * templates/dymo-other-templates.xml:
	    * templates/glabels-2.2.dtd:
	    * templates/misc-iso-templates.xml:
	    * templates/misc-other-templates.xml:
	    * templates/misc-us-templates.xml:
	    * templates/paper-sizes.xml:
	    * templates/zweckform-iso-templates.xml:
		    - Added MIT/X license notice to database files.
		    - Moved from data subdirectory.
	    * configure.in:
	    * po/POTFILES.in:
	    * Makefile.am:
	    * data/Makefile.am:
		    Updated to reflect above move.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@891
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/COPYING
M	glabels2/COPYING-LIBGLABELS
A	glabels2/COPYING-TEMPLATES
M	glabels2/COPYING.README_FIRST
M	glabels2/ChangeLog
M	glabels2/Makefile.am
M	glabels2/configure.in
M	glabels2/data/Makefile.am
D	glabels2/data/dtd/Makefile.am
D	glabels2/data/templates/avery-other-templates.xml
D	glabels2/data/templates/categories.xml
D	glabels2/data/templates/misc-other-templates.xml
M	glabels2/po/POTFILES.in
R079	glabels2/data/templates/Makefile.am
glabels2/templates/Makefile.am
R092	glabels2/data/templates/avery-iso-templates.xml
glabels2/templates/avery-iso-templates.xml
A	glabels2/templates/avery-other-templates.xml
R096	glabels2/data/templates/avery-us-templates.xml
glabels2/templates/avery-us-templates.xml
R064	glabels2/data/templates/brother-other-templates.xml
glabels2/templates/brother-other-templates.xml
A	glabels2/templates/categories.xml
R078	glabels2/data/templates/dymo-other-templates.xml
glabels2/templates/dymo-other-templates.xml
R093	glabels2/data/dtd/glabels-2.2.dtd
glabels2/templates/glabels-2.2.dtd
R096	glabels2/data/templates/misc-iso-templates.xml
glabels2/templates/misc-iso-templates.xml
A	glabels2/templates/misc-other-templates.xml
R090	glabels2/data/templates/misc-us-templates.xml
glabels2/templates/misc-us-templates.xml
R071	glabels2/data/templates/paper-sizes.xml
glabels2/templates/paper-sizes.xml
R090	glabels2/data/templates/zweckform-iso-templates.xml
glabels2/templates/zweckform-iso-templates.xml

commit cc737549c143021a3463c490c6122261717b918c
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-19

    2009-09-19	Jim Evins  <evins@snaught.com>

	    * libglabels/category.c:
	    * libglabels/category.h:
	    * libglabels/db.c:
	    * libglabels/db.h:
	    * libglabels/enums.h:
	    * libglabels/libglabels-private.h:
	    * libglabels/libglabels.h:
	    * libglabels/paper.c:
	    * libglabels/paper.h:
	    * libglabels/str.c:
	    * libglabels/str.h:
	    * libglabels/template.c:
	    * libglabels/template.h:
	    * libglabels/xml-category.c:
	    * libglabels/xml-category.h:
	    * libglabels/xml-paper.c:
	    * libglabels/xml-paper.h:
	    * libglabels/xml-template.c:
	    * libglabels/xml-template.h:
	    * libglabels/xml.c:
	    * libglabels/xml.h:
		    - Cleaned up GTK/GLIB includes.
		    - Updated license notification to LGPL3+.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@890
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/category.c
M	glabels2/libglabels/category.h
M	glabels2/libglabels/db.c
M	glabels2/libglabels/db.h
M	glabels2/libglabels/enums.h
M	glabels2/libglabels/libglabels-private.h
M	glabels2/libglabels/libglabels.h
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/paper.h
M	glabels2/libglabels/str.c
M	glabels2/libglabels/str.h
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-category.c
M	glabels2/libglabels/xml-category.h
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-paper.h
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml-template.h
M	glabels2/libglabels/xml.c
M	glabels2/libglabels/xml.h

commit 728c32fbe052cd712c75a0e6abd857b9edad0769
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-19

    2009-09-18	Jim Evins  <evins@snaught.com>

	    * po/POTFILES.in:
		    Added missing file.
	    * src/mini-preview.h:
	    * src/mini-preview.c: (gl_mini_preview_class_init),
	    (gl_mini_preview_finalize), (gl_mini_preview_set_by_name),
	    (gl_mini_preview_highlight_range),
	    (gl_mini_preview_set_label),
	    (gl_mini_preview_set_page), (gl_mini_preview_set_n_sheets),
	    (gl_mini_preview_set_n_copies), (gl_mini_preview_set_first),
	    (gl_mini_preview_set_last),
	    (gl_mini_preview_set_collate_flag),
	    (gl_mini_preview_set_outline_flag),
	    (gl_mini_preview_set_reverse_flag),
	    (gl_mini_preview_set_crop_marks_flag),
	    (button_release_event_cb),
	    (expose_event_cb), (redraw), (draw), (draw_labels),
	    (draw_rich_preview):
		    Added rich preview capability to mini preview.
	    * src/print-op-dialog.c: (create_custom_widget_cb),
	    (simple_sheets_radio_cb), (simple_first_spin_cb),
	    (simple_last_spin_cb), (preview_pressed_cb),
	    (preview_released_cb),
	    (merge_spin_cb), (merge_collate_check_cb),
	    (preview_clicked_cb),
	    (option_toggled_cb):
		    Use new rich preview capability of mini preview in
		    print dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@889
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/po/POTFILES.in
M	glabels2/src/mini-preview.c
M	glabels2/src/mini-preview.h
M	glabels2/src/print-op-dialog.c

commit 8ab36a60a289ee05a68bff6e0057fcfedbc707f6
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-09-18

    po/POTFILES.in: Removed name of no longer existant file


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@888
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit 25a36cf2b7d91c7578d40b141b6810e5f635b629
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-18

    2009-09-17	Jim Evins  <evins@snaught.com>

	    * src/stock.c: (add_icons), (add_button_icon):
		    Use proper free function for GtkIconSource
		    (gtk_icon_source_free() not g_free()).
		    Patch provided by Christian Persch <chpe@gnome.org>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@886
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/stock.c

commit 7e55e35f41dbbbbb2dcf285fa5fbcc9007628457
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-18

    2009-09-17	Jim Evins  <evins@snaught.com>

	    * libglabels/category.h:
	    * libglabels/db.h:
	    * libglabels/paper.h:
	    * libglabels/template.h:
	    * libglabels/xml-category.h:
	    * libglabels/xml-paper.h:
	    * libglabels/xml.h:
		    Cleaned up GTK/GLIB includes.
	    * src/bc-gnubarcode.c:
	    * src/bc-gnubarcode.h:
	    * src/bc-iec16022.c:
	    * src/bc-iec16022.h:
	    * src/bc-iec18004.c:
	    * src/bc-iec18004.h:
	    * src/bc-postnet.c:
	    * src/bc-postnet.h:
	    * src/bc.c:
	    * src/bc.h:
	    * src/cairo-ellipse-path.c:
	    * src/cairo-ellipse-path.h:
	    * src/cairo-label-path.c:
	    * src/cairo-label-path.h:
	    * src/cairo-markup-path.c:
	    * src/cairo-markup-path.h:
	    * src/color-combo-button.c:
	    * src/color-combo-button.h:
	    * src/color-combo-color-menu-item.c:
	    * src/color-combo-color-menu-item.h:
	    * src/color-combo-history.c:
	    * src/color-combo-menu.c:
	    * src/color-combo-menu.h:
	    * src/color-combo.c:
	    * src/color-combo.h:
	    * src/color-swatch.c:
	    * src/color-swatch.h:
	    * src/color.c:
	    * src/color.h:
	    * src/critical-error-handler.c:
	    * src/critical-error-handler.h:
	    * src/debug.c:
	    * src/debug.h:
	    * src/file.c:
	    * src/file.h:
	    * src/font-combo-menu-item.c:
	    * src/font-combo-menu-item.h:
	    * src/font-combo-menu.c:
	    * src/font-combo-menu.h:
	    * src/font-combo.c:
	    * src/font-combo.h:
	    * src/font-sample.h:
	    * src/font-util.c:
	    * src/font-util.h:
	    * src/glabels-batch.c:
	    * src/glabels.c:
	    * src/hig.h:
	    * src/label-barcode.c:
	    * src/label-barcode.h:
	    * src/label-box.c:
	    * src/label-box.h:
	    * src/label-ellipse.c:
	    * src/label-ellipse.h:
	    * src/label-image.c:
	    * src/label-image.h:
	    * src/label-line.c:
	    * src/label-line.h:
	    * src/label-object.c:
	    * src/label-object.h:
	    * src/label-text.c:
	    * src/label-text.h:
	    * src/label.c:
	    * src/label.h:
	    * src/merge-evolution.c:
	    * src/merge-evolution.h:
	    * src/merge-init.c:
	    * src/merge-init.h:
	    * src/merge-properties-dialog.c:
	    * src/merge-properties-dialog.h:
	    * src/merge-text.c:
	    * src/merge-text.h:
	    * src/merge-vcard.c:
	    * src/merge-vcard.h:
	    * src/merge.c:
	    * src/merge.h:
	    * src/mini-label-preview.c:
	    * src/mini-label-preview.h:
	    * src/mini-preview-pixbuf-cache.c:
	    * src/mini-preview-pixbuf-cache.h:
	    * src/mini-preview-pixbuf.c:
	    * src/mini-preview-pixbuf.h:
	    * src/mini-preview.c:
	    * src/new-label-dialog.c:
	    * src/new-label-dialog.h:
	    * src/object-editor-bc-page.c:
	    * src/object-editor-data-page.c:
	    * src/object-editor-fill-page.c:
	    * src/object-editor-image-page.c:
	    * src/object-editor-line-page.c:
	    * src/object-editor-lsize-page.c:
	    * src/object-editor-position-page.c:
	    * src/object-editor-private.h:
	    * src/object-editor-shadow-page.c:
	    * src/object-editor-size-page.c:
	    * src/object-editor-text-page.c:
	    * src/object-editor.c:
	    * src/object-editor.h:
	    * src/pixbuf-cache.c:
	    * src/pixbuf-cache.h:
	    * src/prefs-dialog.c:
	    * src/prefs-dialog.h:
	    * src/prefs-model.c:
	    * src/prefs-model.h:
	    * src/prefs.c:
	    * src/prefs.h:
	    * src/print-op-dialog.c:
	    * src/print-op.c:
	    * src/print-op.h:
	    * src/print.c:
	    * src/print.h:
	    * src/recent.c:
	    * src/recent.h:
	    * src/rotate-label-button.c:
	    * src/rotate-label-button.h:
	    * src/stock.c:
	    * src/stock.h:
	    * src/template-designer.c:
	    * src/template-designer.h:
	    * src/text-node.c:
	    * src/text-node.h:
	    * src/ui-commands.c:
	    * src/ui-commands.h:
	    * src/ui-property-bar.c:
	    * src/ui-property-bar.h:
	    * src/ui-sidebar.c:
	    * src/ui-sidebar.h:
	    * src/ui-util.c:
	    * src/ui-util.h:
	    * src/ui.c:
	    * src/ui.h:
	    * src/util.c:
	    * src/util.h:
	    * src/view-barcode.c:
	    * src/view-barcode.h:
	    * src/view-box.c:
	    * src/view-box.h:
	    * src/view-ellipse.c:
	    * src/view-ellipse.h:
	    * src/view-image.c:
	    * src/view-image.h:
	    * src/view-line.c:
	    * src/view-line.h:
	    * src/view-object.c:
	    * src/view-object.h:
	    * src/view-text.c:
	    * src/view-text.h:
	    * src/view.c:
	    * src/view.h:
	    * src/warning-handler.c:
	    * src/warning-handler.h:
	    * src/wdgt-chain-button.c:
	    * src/wdgt-chain-button.h:
	    * src/wdgt-media-select.c:
	    * src/wdgt-media-select.h:
	    * src/wdgt-merge-menu.c:
	    * src/wdgt-merge-menu.h:
	    * src/window.c:
	    * src/window.h:
	    * src/xml-label-04.c:
	    * src/xml-label-04.h:
	    * src/xml-label.c:
	    * src/xml-label.h:
		    Cleaned up GTK/GLIB includes.
		    Updated remainder of notices to GPL3+.
		    Simple formatting cleanup.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@885
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/category.h
M	glabels2/libglabels/db.h
M	glabels2/libglabels/paper.h
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-category.h
M	glabels2/libglabels/xml-paper.h
M	glabels2/libglabels/xml.h
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-gnubarcode.h
M	glabels2/src/bc-iec16022.c
M	glabels2/src/bc-iec16022.h
M	glabels2/src/bc-iec18004.c
M	glabels2/src/bc-iec18004.h
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc-postnet.h
M	glabels2/src/bc.c
M	glabels2/src/bc.h
M	glabels2/src/cairo-ellipse-path.c
M	glabels2/src/cairo-ellipse-path.h
M	glabels2/src/cairo-label-path.c
M	glabels2/src/cairo-label-path.h
M	glabels2/src/cairo-markup-path.c
M	glabels2/src/cairo-markup-path.h
M	glabels2/src/color-combo-button.c
M	glabels2/src/color-combo-button.h
M	glabels2/src/color-combo-color-menu-item.c
M	glabels2/src/color-combo-color-menu-item.h
M	glabels2/src/color-combo-history.c
M	glabels2/src/color-combo-menu.c
M	glabels2/src/color-combo-menu.h
M	glabels2/src/color-combo.c
M	glabels2/src/color-combo.h
M	glabels2/src/color-swatch.c
M	glabels2/src/color-swatch.h
M	glabels2/src/color.c
M	glabels2/src/color.h
M	glabels2/src/critical-error-handler.c
M	glabels2/src/critical-error-handler.h
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/file.c
M	glabels2/src/file.h
M	glabels2/src/font-combo-menu-item.c
M	glabels2/src/font-combo-menu-item.h
M	glabels2/src/font-combo-menu.c
M	glabels2/src/font-combo-menu.h
M	glabels2/src/font-combo.c
M	glabels2/src/font-combo.h
M	glabels2/src/font-sample.h
M	glabels2/src/font-util.c
M	glabels2/src/font-util.h
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/hig.h
M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/label-box.c
M	glabels2/src/label-box.h
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-ellipse.h
M	glabels2/src/label-image.c
M	glabels2/src/label-image.h
M	glabels2/src/label-line.c
M	glabels2/src/label-line.h
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/merge-evolution.c
M	glabels2/src/merge-evolution.h
M	glabels2/src/merge-init.c
M	glabels2/src/merge-init.h
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge-properties-dialog.h
M	glabels2/src/merge-text.c
M	glabels2/src/merge-text.h
M	glabels2/src/merge-vcard.c
M	glabels2/src/merge-vcard.h
M	glabels2/src/merge.c
M	glabels2/src/merge.h
M	glabels2/src/mini-label-preview.c
M	glabels2/src/mini-label-preview.h
M	glabels2/src/mini-preview-pixbuf-cache.c
M	glabels2/src/mini-preview-pixbuf-cache.h
M	glabels2/src/mini-preview-pixbuf.c
M	glabels2/src/mini-preview-pixbuf.h
M	glabels2/src/mini-preview.c
M	glabels2/src/new-label-dialog.c
M	glabels2/src/new-label-dialog.h
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.h
M	glabels2/src/pixbuf-cache.c
M	glabels2/src/pixbuf-cache.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-dialog.h
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/prefs.c
M	glabels2/src/prefs.h
M	glabels2/src/print-op-dialog.c
M	glabels2/src/print-op.c
M	glabels2/src/print-op.h
M	glabels2/src/print.c
M	glabels2/src/print.h
M	glabels2/src/recent.c
M	glabels2/src/recent.h
M	glabels2/src/rotate-label-button.c
M	glabels2/src/rotate-label-button.h
M	glabels2/src/stock.c
M	glabels2/src/stock.h
M	glabels2/src/template-designer.c
M	glabels2/src/template-designer.h
M	glabels2/src/text-node.c
M	glabels2/src/text-node.h
M	glabels2/src/ui-commands.c
M	glabels2/src/ui-commands.h
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-property-bar.h
M	glabels2/src/ui-sidebar.c
M	glabels2/src/ui-sidebar.h
M	glabels2/src/ui-util.c
M	glabels2/src/ui-util.h
M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/util.c
M	glabels2/src/util.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-barcode.h
M	glabels2/src/view-box.c
M	glabels2/src/view-box.h
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-ellipse.h
M	glabels2/src/view-image.c
M	glabels2/src/view-image.h
M	glabels2/src/view-line.c
M	glabels2/src/view-line.h
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c
M	glabels2/src/view-text.h
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/warning-handler.c
M	glabels2/src/warning-handler.h
M	glabels2/src/wdgt-chain-button.c
M	glabels2/src/wdgt-chain-button.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-media-select.h
M	glabels2/src/wdgt-merge-menu.c
M	glabels2/src/wdgt-merge-menu.h
M	glabels2/src/window.c
M	glabels2/src/window.h
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-04.h
M	glabels2/src/xml-label.c
M	glabels2/src/xml-label.h

commit 83898579197af3dbe8fecb57c729770cd7e34694
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-09-16

    de.po: Updated German translation
    POTFILES.in: Removed filenames which are no longer available



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@884
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/po/de.po

commit a1f61988eb85f9133482e6f8fa6232600f897b1c
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-13

    2009-09-13	Jim Evins  <evins@snaught.com>

	    Refactored print operation subsystem.

	    * src/print-op.c:
	    * src/print-op.h:
		    Basic GtkPrintOperation based class.  Does not
		    instantiate
		    custom widgets, so it can be used by glabels-batch
		    without
		    the additional overhead.
	    * src/print-op-dialog.c:
	    * src/print-op-dialog.h:
		    New object derived from glPrintOp.	This one is
		    intended
		    to be used as a dialog and installs custom widgets.
		    glWdgtPrintCopies and glWdgtPrintMerge have been
		    merged
		    into this object.
	    * src/wdgt-print-copies.c:
	    * src/wdgt-print-copies.h:
	    * src/wdgt-print-merge.c:
	    * src/wdgt-print-merge.h:
		    Deleted.
	    * src/Makefile.am:
		    Modified to reflect above additions and deletions.
	    * src/mini-preview.c: (gl_mini_preview_construct),
	    (gl_mini_preview_set_template), (set_transform_and_get_scale),
	    (button_press_event_cb), (motion_notify_event_cb), (draw):
		    Now scales with allocation.
	    * src/glabels-batch.c: (main):
	    * src/template-designer.c: (print_test_cb):
	    * src/ui-commands.c: (gl_ui_cmd_file_print):
		    Use above modifications.
	    * data/builder/print-op-dialog-custom-widget.builder:
		    New builder file for glPrintOpDialog custom widgets.
	    * data/builder/print-custom-widget.builder:
		    Deleted.
	    * data/builder/Makefile.am:
		    Modified to reflect above addition and deletion.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@883
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/builder/Makefile.am
D	glabels2/data/builder/print-custom-widget.builder
A	glabels2/data/builder/print-op-dialog-custom-widget.builder
M	glabels2/src/Makefile.am
M	glabels2/src/glabels-batch.c
M	glabels2/src/mini-preview.c
A	glabels2/src/print-op-dialog.c
A	glabels2/src/print-op-dialog.h
M	glabels2/src/print-op.c
M	glabels2/src/print-op.h
M	glabels2/src/template-designer.c
M	glabels2/src/ui-commands.c
D	glabels2/src/wdgt-print-copies.c
D	glabels2/src/wdgt-print-copies.h
D	glabels2/src/wdgt-print-merge.c
D	glabels2/src/wdgt-print-merge.h

commit 96a9288a2f2f9b72daf98f7a768d0e37345dcc9e
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-11

    2009-09-10	Jim Evins  <evins@snaught.com>

	    * src/Makefile.am:
	    * src/mini-label-preview.c:
	    * src/mini-label-preview.h:
		    Created new glMiniLabelPreview widget to support
		    glRotateLabelButton.
	    * src/rotate-label-button.c:
	    * src/rotate-label-button.h:
		    Renamed glWdgtRotateLabel to glRotateLabelButton.
	    * src/new-label-dialog.c: (gl_new_label_dialog_construct),
	    (template_changed_cb), (gl_new_label_dialog_get_rotate_state),
	    (gl_new_label_dialog_set_rotate_state):
		    Propogated above renaming.
	    * src/mini-preview.c: (gl_mini_preview_set_template), (draw),
	    (draw_shadow), (draw_paper), (draw_labels):
		    Use GtkStyle for colors instead of hardcoded ones.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@882
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
A	glabels2/src/mini-label-preview.c
A	glabels2/src/mini-label-preview.h
M	glabels2/src/mini-preview.c
M	glabels2/src/new-label-dialog.c
A	glabels2/src/rotate-label-button.c
A	glabels2/src/rotate-label-button.h
D	glabels2/src/wdgt-rotate-label.c
D	glabels2/src/wdgt-rotate-label.h

commit cedd2451f2f2a5d8d3ca52c74659ce6597dce235
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-10

    2009-09-09	Jim Evins  <evins@snaught.com>

	    * configure.in:
	    * Makefile.am:
	    * src/Makefile.am:
	    * src/stock-pixmaps/Makefile.am:
	    * qrencode-3.1.0/Makefile.am
	    * data/desktop/glabels.desktop.in:
	    * docs/libglabels/libglabels-decl-list.txt:
		    Various build system fixes and cleanup.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@880
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/Makefile.am
M	glabels2/barcode-0.98/Makefile.am
M	glabels2/configure.in
M	glabels2/data/desktop/glabels.desktop.in
M	glabels2/docs/libglabels/libglabels-decl-list.txt
D	glabels2/help/C/Makefile.am
M	glabels2/help/Makefile.am
M	glabels2/qrencode-3.1.0/Makefile.am
M	glabels2/src/Makefile.am
M	glabels2/src/stock-pixmaps/Makefile.am

commit 245cb815f5a040b97443fff0229afd0d74711a5c
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-09

    2009-09-08	Jim Evins  <evins@snaught.com>

	    * src/font-util.c: (gl_font_util_validate_family):
	    * src/font-util.h:
		    Added gl_font_util_validate_family().
	    * src/font-combo.c: (gl_font_combo_class_init),
	    (gl_font_combo_new), (gl_font_combo_set_family):
		    Use gl_font_util_validate_family() when setting
		    family.
	    * src/label-text.c: (set_font_family):
	    * src/prefs-dialog.c: (construct_object_page),
	    (update_object_page_from_prefs):
	    * src/ui-property-bar.c: (gl_ui_property_bar_construct),
	    (reset_to_default_properties):
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page),
	    (gl_object_editor_set_font_family):
		    Removed code obsoleted by the addition of
		    gl_font_util_validate_family().
	    * src/color-swatch.c: (gl_color_swatch_class_init),
	    (style_set_cb),
	    (draw_swatch):
	    * src/font-sample.c: (gl_font_sample_class_init),
	    (style_set_cb),
	    (draw_sample):
		    Added handler for style_set event.
	    * src/color-combo-button.c:
	    (gl_color_combo_button_class_init):
	    * src/color-combo-color-menu-item.c:
	    (gl_color_combo_color_menu_item_class_init):
	    * src/color-combo-history.c:
	    (gl_color_combo_history_class_init):
	    * src/color-combo-menu.c: (map_event_cb):
	    * src/color-combo.c: (gl_color_combo_class_init),
	    (gl_color_combo_new):
	    * src/font-combo-menu-item.c:
	    (gl_font_combo_menu_item_class_init):
	    * src/font-combo-menu.c: (gl_font_combo_menu_class_init):
	    * src/wdgt-rotate-label.c: (create_pixbuf):
		    Various cleanups -- mostly removing unused variables.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@877
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/color-combo-button.c
M	glabels2/src/color-combo-color-menu-item.c
M	glabels2/src/color-combo-history.c
M	glabels2/src/color-combo-menu.c
M	glabels2/src/color-combo.c
M	glabels2/src/color-swatch.c
M	glabels2/src/font-combo-menu-item.c
M	glabels2/src/font-combo-menu.c
M	glabels2/src/font-combo.c
M	glabels2/src/font-sample.c
M	glabels2/src/font-util.c
M	glabels2/src/font-util.h
M	glabels2/src/label-text.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/wdgt-rotate-label.c

commit fabfeed962240d2d0a128576218b690564470b50
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-09-08

    Updated German doc translation, added screenshots


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@876
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/help/de/de.po
A	glabels2/help/de/figures/main-window-empty.png
A	glabels2/help/de/figures/merge-ex1-1.png
A	glabels2/help/de/figures/merge-ex1-2.png
A	glabels2/help/de/figures/merge-ex1-3.png
A	glabels2/help/de/figures/merge-ex1-4.png
A	glabels2/help/de/figures/merge-ex2-1.png
A	glabels2/help/de/figures/merge-ex2-2.png
A	glabels2/help/de/figures/merge-ex2-3.png
A	glabels2/help/de/figures/merge-ex2-4.png
A	glabels2/help/de/figures/object-editor-sidebar.png
A	glabels2/help/de/figures/print-copies.png
A	glabels2/help/de/figures/print-merge.png

commit c5a7ae0d233eb95f7ef7424f38d99ffb6a8cc555
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-08

    2009-09-07	Jim Evins  <evins@snaught.com>

	    Created new glFontCombo widget family subsystem + minor
	    refinements to glColorCombo
	    widget family.

	    * src/color-combo-button.c:
	    * src/color-combo-button.h:
		    Renamed ColorButton to ColorComboButton.
	    * src/color.h:
		    Added GL_COLOR_WHITE macro.
	    * src/color-combo.c: (gl_color_combo_init):
		    Minor cleanup.
	    * src/Makefile.am:
	    * src/font-combo.c:
	    * src/font-combo.h:
	    * src/font-combo-menu.c:
	    * src/font-combo-menu.h:
	    * src/font-combo-menu-item.c:
	    * src/font-combo-menu-item.h:
	    * src/font-sample.c:
	    * src/font-sample.h:
	    * src/font-util.c:
	    * src/font-util.h:
		    New FontCombo subsystem.
	    * src/util.c:
	    * src/util.h:
		    Moved font functions to font-util.[ch].
	    * data/builder/object-editor.builder:
	    * data/builder/prefs-dialog.builder:
	    * data/builder/property-bar.builder:
	    * src/label-text.c: (set_font_family):
	    * src/object-editor-private.h:
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page),
	    (gl_object_editor_set_font_family),
	    (gl_object_editor_get_font_family):
	    * src/prefs-dialog.c: (construct_object_page),
	    (update_object_page_from_prefs),
	    (update_prefs_from_object_page):
	    * src/ui-property-bar.c: (gl_ui_property_bar_construct),
	    (reset_to_default_properties), (update_text_properties),
	    (update_fill_color), (update_line_color),
	    (font_family_changed_cb),
	    (text_color_changed_cb), (fill_color_changed_cb),
	    (line_color_changed_cb):
		    Incorporated new FontCombo subsystem.
	    * po/POTFILES.in:
		    Reconciled with above changes/additions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@872
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/builder/object-editor.builder
M	glabels2/data/builder/prefs-dialog.builder
M	glabels2/data/builder/property-bar.builder
M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
D	glabels2/src/color-button.h
R078	glabels2/src/color-button.c	glabels2/src/color-combo-button.c
A	glabels2/src/color-combo-button.h
M	glabels2/src/color-combo.c
M	glabels2/src/color.h
A	glabels2/src/font-combo-menu-item.c
A	glabels2/src/font-combo-menu-item.h
A	glabels2/src/font-combo-menu.c
A	glabels2/src/font-combo-menu.h
C059	glabels2/src/color-combo.c	glabels2/src/font-combo.c
A	glabels2/src/font-combo.h
A	glabels2/src/font-sample.c
A	glabels2/src/font-sample.h
A	glabels2/src/font-util.c
A	glabels2/src/font-util.h
M	glabels2/src/label-text.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/util.c
M	glabels2/src/util.h

commit 40b43703976586165fbf035c0419b5c6e687efc2
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-06

    2009-09-06	Jim Evins  <evins@snaught.com>

	    * src/color-button.c: (gl_color_button_finalize):
		    Unreference menu in finalize.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@871
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/color-button.c

commit 036015bb9ed3b53bf85f25ed3b17a4886bdeedbc
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-06

    Added link to glabels-commit mail list.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@870
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/contact/index.php

commit 2e3f514405a35f35f7e29c839e2360ab924894a7
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-06

    2009-09-06	Jim Evins  <evins@snaught.com>

	    Some major refinements to the glColorCombo family of widgets.

	    * src/Makefile.am:
	    * src/color-button.c:
	    * src/color-button.h:
		    New widget: glColorButton.	This widget is a button
		    that applies
		    the currently selected color with a ColorCombo type
		    dropdown button
		    to change that selected color.  This is basically
		    the old
		    glColorCombo widget.
	    * src/color-combo.c: (gl_color_combo_init),
	    (gl_color_combo_finalize), (gl_color_combo_new),
	    (button_press_event_cb), (menu_color_changed_cb),
	    (menu_selection_done_cb):
	    * src/color-combo.h:
		    The glColorCombo widget has been modified to be a
		    single button
		    that is only used to change the selected color.
	    * src/color-swatch.c: (gl_color_swatch_init),
	    (expose_event_cb):
		    Draw on parent containers window to allow an effective
		    transparency.
	    * src/object-editor-bc-page.c:
	    (gl_object_editor_prepare_bc_page):
	    * src/object-editor-fill-page.c:
	    (gl_object_editor_prepare_fill_page):
	    * src/object-editor-line-page.c:
	    (gl_object_editor_prepare_line_page):
	    * src/object-editor-shadow-page.c:
	    (gl_object_editor_prepare_shadow_page):
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page):
	    * src/prefs-dialog.c: (construct_object_page):
		    Change how ColorCombos are packed so that they don't
		    expand to fill hbox.
	    * src/ui-property-bar.c: (gl_ui_property_bar_construct),
	    (reset_to_default_properties), (update_text_properties),
	    (update_fill_color), (update_line_color),
	    (text_color_changed_cb),
	    (fill_color_changed_cb), (line_color_changed_cb),
	    (set_doc_items_sensitive), (set_text_items_sensitive),
	    (set_fill_items_sensitive), (set_line_color_items_sensitive):
		    The property bar now uses the new glColorButton
		    instead of
		    glColorCombo.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@869
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
C068	glabels2/src/color-combo.c	glabels2/src/color-button.c
C053	glabels2/src/color-combo.h	glabels2/src/color-button.h
M	glabels2/src/color-combo.c
M	glabels2/src/color-combo.h
M	glabels2/src/color-swatch.c
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/ui-property-bar.c

commit 1029782c2edff08531e703a61527eaa8a09f9633
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-03

    2009-09-02	Jim Evins  <evins@snaught.com>

	    * src/Makefile.am:
	    * src/wdgt-mini-preview.c:
	    * src/wdgt-mini-preview.h:
	    * src/mini-preview.h:
	    * src/mini-preview.c:
		    - Renamed WdgtMiniPreview to MiniPreview.
		    - Style cleanup.
		    - Modified to draw to parent window to be effectively
		    transparent.
		    - Updated license notification to gpl3+.
	    * src/template-designer.c: (construct_layout_page),
	    (layout_page_prepare_cb), (layout_page_changed_cb):
	    * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct),
	    (sheets_radio_cb), (first_spin_cb), (last_spin_cb),
	    (preview_pressed):
	    * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct),
	    (spin_cb), (preview_clicked),
	    (gl_wdgt_print_merge_set_copies):
		    - Reconciled with rename above.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@868
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
R058	glabels2/src/wdgt-mini-preview.c
glabels2/src/mini-preview.c
A	glabels2/src/mini-preview.h
M	glabels2/src/template-designer.c
D	glabels2/src/wdgt-mini-preview.h
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c

commit d780283920166f23fb7fdbe1d7f0385b692f0d4c
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-02

    2009-09-01	Jim Evins  <evins@snaught.com>

	    * data/builder/object-editor.builder:
		    Fixed errant expansion of tab.
	    * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new):
	    * src/bc-postnet.c: (gl_barcode_postnet_new):
	    * src/bc.c: (id_to_index), (name_to_index):
	    * src/label-barcode.c: (gl_label_barcode_set_props):
	    * src/label-text.c: (set_font_family):
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_construct):
	    * src/merge.c: (gl_merge_description_to_name):
	    * src/new-label-dialog.c:
	    * src/object-editor-edit-page.c:
	    * src/object-editor-image-page.c: (update_preview_cb):
	    * src/object-editor-lsize-page.c:
	    * src/object-editor-position-page.c:
	    * src/object-editor-size-page.c:
	    * src/object-editor.c: (gl_object_editor_new):
	    * src/prefs-dialog.c: (update_locale_page_from_prefs):
	    * src/prefs-model.c: (string_to_units):
	    * src/print-op.c: (create_custom_widget_cb):
	    * src/template-designer.c: (gl_template_designer_init),
	    (pg_size_page_changed_cb), (build_template):
	    * src/ui-commands.c: (gl_ui_cmd_help_about):
	    * src/xml-label.c: (xml_parse_pixdata):
		    Fixed various deprecations as of Gtk-2.16.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@867
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/builder/object-editor.builder
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc.c
M	glabels2/src/label-barcode.c
M	glabels2/src/label-text.c
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge.c
M	glabels2/src/new-label-dialog.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-model.c
M	glabels2/src/print-op.c
M	glabels2/src/template-designer.c
M	glabels2/src/ui-commands.c
M	glabels2/src/xml-label.c

commit 7bc8e820df3c2380479df0f93601466d981e2295
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-02

    Adding missing Changelog and removed files that should not have been
    checked in.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@866
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/qrencode-3.1.0/ChangeLog
D	glabels2/qrencode-3.1.0/Makefile
D	glabels2/qrencode-3.1.0/Makefile.in

commit 6f54e1fc51bfe8c0cbe60ab7c321320eda020323
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-01

    2009-08-31	Jim Evins  <evins@snaught.com>

	    * po/fr.po:
		    Updated french translation (Claude Paroz)


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@865
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/po/fr.po

commit d701d4f532af82224b880a18ab89cb8d6c1f65fa
Author: Jim Evins <evins@snaught.com>
Date:	2009-09-01

    2009-08-31	Jim Evins  <evins@snaught.com>

	    * data/builder/property-bar.builder:
		    Make sure event box does not obscure tool bar
		    background.
	    * src/Makefile.am:
	    * src/color-swatch.c:
	    * src/color-swatch.h:
		    New color swatch widget.
	    * src/color-combo-color-menu-item.c:
	    (gl_color_combo_color_menu_item_init),
	    (gl_color_combo_color_menu_item_new),
	    (gl_color_combo_color_menu_item_set_color):
	    * src/color-combo.c: (gl_color_combo_init),
	    (gl_color_combo_finalize), (gl_color_combo_new),
	    (gl_color_combo_set_color), (menu_color_changed_cb):
		    Updated to use new color swatch widget.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@863
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/builder/property-bar.builder
M	glabels2/src/Makefile.am
M	glabels2/src/color-combo-color-menu-item.c
M	glabels2/src/color-combo.c
A	glabels2/src/color-swatch.c
A	glabels2/src/color-swatch.h

commit 216c039e5797b6c3bada83668ec7227728a070f3
Author: Jim Evins <evins@snaught.com>
Date:	2009-08-27

    2009-08-26	Jim Evins  <evins@snaught.com>

	    * po/POTFILES.in:
		    Explicitely mark file types.  Removed unneeded
		    file from
		    libbarcode.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@862
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/po/POTFILES.in

commit cbfdf9f8ce58c238a8eb5535c617599ad5570d1f
Author: Jim Evins <evins@snaught.com>
Date:	2009-08-23

    2009-08-23	Jim Evins  <evins@snaught.com>

	    * data/builder/Makefile.am:
	    * data/builder/merge-properties-dialog.builder:
	    * data/builder/merge-properties-dialog.glade:
	    * data/builder/new-label-dialog.builder:
	    * data/builder/new-label-dialog.glade:
	    * data/builder/object-editor.builder:
	    * data/builder/object-editor.glade:
	    * data/builder/prefs-dialog.builder:
	    * data/builder/prefs-dialog.glade:
	    * data/builder/print-custom-widget.builder:
	    * data/builder/print-custom-widget.glade:
	    * data/builder/property-bar.builder:
	    * data/builder/property-bar.glade:
	    * data/builder/template-designer.builder:
	    * data/builder/template-designer.glade:
	    * data/builder/wdgt-media-select.builder:
	    * data/builder/wdgt-media-select.glade:
	    * po/POTFILES.in:
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_finalize),
	    (gl_merge_properties_dialog_construct):
	    * src/new-label-dialog.c: (gl_new_label_dialog_finalize),
	    (gl_new_label_dialog_construct):
	    * src/object-editor-bc-page.c:
	    (gl_object_editor_prepare_bc_page):
	    * src/object-editor-data-page.c:
	    (gl_object_editor_prepare_data_page):
	    * src/object-editor-edit-page.c:
	    (gl_object_editor_prepare_edit_page):
	    * src/object-editor-fill-page.c:
	    (gl_object_editor_prepare_fill_page):
	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page):
	    * src/object-editor-line-page.c:
	    (gl_object_editor_prepare_line_page):
	    * src/object-editor-lsize-page.c:
	    (gl_object_editor_prepare_lsize_page):
	    * src/object-editor-position-page.c:
	    (gl_object_editor_prepare_position_page):
	    * src/object-editor-private.h:
	    * src/object-editor-shadow-page.c:
	    (gl_object_editor_prepare_shadow_page):
	    * src/object-editor-size-page.c:
	    (gl_object_editor_prepare_size_page):
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page):
	    * src/object-editor.c: (gl_object_editor_init),
	    (gl_object_editor_finalize):
	    * src/prefs-dialog.c: (gl_prefs_dialog_init),
	    (gl_prefs_dialog_finalize), (gl_prefs_dialog_construct),
	    (construct_locale_page), (construct_object_page):
	    * src/print-op.c: (gl_print_op_finalize),
	    (gl_print_op_set_settings), (create_custom_widget_cb):
	    * src/template-designer.c: (gl_template_designer_init),
	    (gl_template_designer_finalize), (construct_start_page),
	    (construct_name_page), (construct_pg_size_page),
	    (construct_shape_page), (construct_rect_size_page),
	    (construct_round_size_page), (construct_cd_size_page),
	    (construct_nlayouts_page), (construct_layout_page),
	    (construct_finish_page):
	    * src/ui-property-bar.c: (gl_ui_property_bar_finalize),
	    (gl_ui_property_bar_construct):
	    * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize),
	    (gl_wdgt_media_select_construct):
		    Builder files no longer built from glade files.
		    Also did some
		    cleanup on formatting and update license notifications
		    to GPL3+.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@861
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/builder/Makefile.am
A	glabels2/data/builder/merge-properties-dialog.builder
D	glabels2/data/builder/merge-properties-dialog.glade
A	glabels2/data/builder/new-label-dialog.builder
D	glabels2/data/builder/new-label-dialog.glade
A	glabels2/data/builder/object-editor.builder
D	glabels2/data/builder/object-editor.glade
A	glabels2/data/builder/prefs-dialog.builder
D	glabels2/data/builder/prefs-dialog.glade
A	glabels2/data/builder/print-custom-widget.builder
D	glabels2/data/builder/print-custom-widget.glade
A	glabels2/data/builder/property-bar.builder
D	glabels2/data/builder/property-bar.glade
A	glabels2/data/builder/template-designer.builder
D	glabels2/data/builder/template-designer.glade
A	glabels2/data/builder/wdgt-media-select.builder
D	glabels2/data/builder/wdgt-media-select.glade
M	glabels2/po/POTFILES.in
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/new-label-dialog.c
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/print-op.c
M	glabels2/src/template-designer.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/wdgt-media-select.c

commit 6f1394ef48f3a3fd4efb06247cced9db2fdb6d54
Author: Jim Evins <evins@snaught.com>
Date:	2009-08-14

    2009-08-13	Jim Evins  <evins@snaught.com>

	    * src/color-combo-color-menu-item.c:
	    (gl_color_combo_color_menu_item_init),
	    (gl_color_combo_color_menu_item_new),
	    (gl_color_combo_color_menu_item_set_color):
		    Explicitly request size of menu item and enlarge
		    color swatch.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@860
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/color-combo-color-menu-item.c

commit 29355781ab15fccd774aba068d4965f07d75f8ca
Author: Jim Evins <evins@snaught.com>
Date:	2009-08-14

    Fixed typo in header.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@859
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/common_php.inc

commit 6f7963a0bf6a6e0c6dac3d94475cd56c71b220bf
Author: Jim Evins <evins@snaught.com>
Date:	2009-08-12

    2009-08-12	Jim Evins  <evins@snaught.com>

	    * src/label-text.c: (buffer_changed_cb), (draw_object),
	    (draw_shadow), (draw_text_real):
	    * src/label-text.h:
		    Moved common code from draw_object() and draw_shadow()
		    to
		    draw_text_real().  Also cleaned up formatting
		    and updated
		    license notification to GPL3+.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@858
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h

commit ef5fdef2965be8977c6814148d1fe6241be8b446
Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
Date:	2009-07-29

    Updated and fixed Russian translation


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@857
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/po/ru.po

commit 2d2bbdf3aadf183a122a7e26f39a2e10814edaa9
Author: Jim Evins <evins@snaught.com>
Date:	2009-07-27

    2009-07-26	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * COPYING.README_FIRST:
	    * Makefile.am:
	    * configure.in:
	    * qrencode-3.1.0/*
		    Added 3rd party qrencode library.
	    * src/Makefile.am:
	    * src/bc-iec18004.c: (gl_barcode_iec18004_new),
	    (render_iec18004):
	    * src/bc-iec18004.h:
	    * src/bc.c:
		    Added IEC18004 (QRCode) 2 dimensional barcode backend.
		    Patch provided by Daniel Mueller <daniel@danm.de>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@856
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/COPYING.README_FIRST
M	glabels2/ChangeLog
M	glabels2/Makefile.am
M	glabels2/configure.in
M	glabels2/gtk-doc.make
A	glabels2/qrencode-3.1.0/COPYING
A	glabels2/qrencode-3.1.0/Doxyfile
A	glabels2/qrencode-3.1.0/Makefile
A	glabels2/qrencode-3.1.0/Makefile.am
A	glabels2/qrencode-3.1.0/Makefile.am.dist
A	glabels2/qrencode-3.1.0/Makefile.in
A	glabels2/qrencode-3.1.0/Makefile.in.dist
A	glabels2/qrencode-3.1.0/NEWS
A	glabels2/qrencode-3.1.0/README
A	glabels2/qrencode-3.1.0/README.glabels
A	glabels2/qrencode-3.1.0/TODO
A	glabels2/qrencode-3.1.0/acinclude.m4
A	glabels2/qrencode-3.1.0/aclocal.m4
A	glabels2/qrencode-3.1.0/autogen.sh
A	glabels2/qrencode-3.1.0/bitstream.c
A	glabels2/qrencode-3.1.0/bitstream.h
A	glabels2/qrencode-3.1.0/config.h.in
A	glabels2/qrencode-3.1.0/configure
A	glabels2/qrencode-3.1.0/configure.ac.dist
A	glabels2/qrencode-3.1.0/libqrencode.pc.in
A	glabels2/qrencode-3.1.0/mask.c
A	glabels2/qrencode-3.1.0/mask.h
A	glabels2/qrencode-3.1.0/qrenc.c
A	glabels2/qrencode-3.1.0/qrencode.1.in
A	glabels2/qrencode-3.1.0/qrencode.c
A	glabels2/qrencode-3.1.0/qrencode.h
A	glabels2/qrencode-3.1.0/qrencode.spec
A	glabels2/qrencode-3.1.0/qrencode.spec.in
A	glabels2/qrencode-3.1.0/qrencode_inner.h
A	glabels2/qrencode-3.1.0/qrinput.c
A	glabels2/qrencode-3.1.0/qrinput.h
A	glabels2/qrencode-3.1.0/qrspec.c
A	glabels2/qrencode-3.1.0/qrspec.h
A	glabels2/qrencode-3.1.0/rscode.c
A	glabels2/qrencode-3.1.0/rscode.h
A	glabels2/qrencode-3.1.0/split.c
A	glabels2/qrencode-3.1.0/split.h
A	glabels2/qrencode-3.1.0/tests/Makefile.am
A	glabels2/qrencode-3.1.0/tests/Makefile.in
A	glabels2/qrencode-3.1.0/tests/common.h
A	glabels2/qrencode-3.1.0/tests/create_frame_pattern.c
A	glabels2/qrencode-3.1.0/tests/frame
A	glabels2/qrencode-3.1.0/tests/prof_qrencode.c
A	glabels2/qrencode-3.1.0/tests/test_all.sh
A	glabels2/qrencode-3.1.0/tests/test_bitstream.c
A	glabels2/qrencode-3.1.0/tests/test_estimatebit.c
A	glabels2/qrencode-3.1.0/tests/test_monkey.c
A	glabels2/qrencode-3.1.0/tests/test_qrencode.c
A	glabels2/qrencode-3.1.0/tests/test_qrinput.c
A	glabels2/qrencode-3.1.0/tests/test_qrspec.c
A	glabels2/qrencode-3.1.0/tests/test_rs.c
A	glabels2/qrencode-3.1.0/tests/test_split.c
A	glabels2/qrencode-3.1.0/tests/view_qrcode.c
A	glabels2/qrencode-3.1.0/use/compile
A	glabels2/qrencode-3.1.0/use/config.guess
A	glabels2/qrencode-3.1.0/use/config.sub
A	glabels2/qrencode-3.1.0/use/depcomp
A	glabels2/qrencode-3.1.0/use/install-sh
A	glabels2/qrencode-3.1.0/use/ltmain.sh
A	glabels2/qrencode-3.1.0/use/missing
M	glabels2/src/Makefile.am
A	glabels2/src/bc-iec18004.c
A	glabels2/src/bc-iec18004.h
M	glabels2/src/bc.c

commit eedb5bf0e10f9fa4feb1137381f2aa2e5cf33f28
Author: Jim Evins <evins@snaught.com>
Date:	2009-07-26

    2009-07-25	Jim Evins  <evins@snaught.com>

	    * src/xml-label.c: (gl_xml_label_open):
		    Relax limits when parsing file.  Allows large
		    embedded image
		    files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@855
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/xml-label.c

commit 568ea135699a47a3286106356fb9928ad10adc5f
Author: Jim Evins <evins@snaught.com>
Date:	2009-07-20

    Added compiling-from-source directions.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@854
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/doc/index.php
A	web/doc/install-src/index.php
M	web/download/index.php
M	web/index.php
M	web/links/index.php
M	web/news/index.php

commit 0e0af532e4b99123832cefa84e54d395c949f336
Author: Jim Evins <evins@snaught.com>
Date:	2009-05-20

    2009-05-19	Jim Evins  <evins@purple>

	    * configure.in:
	    * po/LINGUAS:
		    Moved translation list from configure.in to
		    po/LINGUAS.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@852
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
A	glabels2/po/LINGUAS

commit de5160282bb632146ffe6810f845dcea4cb22e2f
Author: Jim Evins <evins@snaught.com>
Date:	2009-05-20

    2009-05-19	Jim Evins  <evins@snaught.com>

	    * configure.in:
	    * po/zh_CN.po:
		    New Chinese translation (Careon
		    <zzbusagain@yahoo.com.cn>).
	    * AUTHORS:
		    Added above translation to acknowledgements.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@851
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/configure.in
A	glabels2/po/zh_CN.po

commit fac890372fff6be2410f3d0bac332fac8aba3c76
Author: Jim Evins <evins@snaught.com>
Date:	2009-05-18

    2009-05-18	Jim Evins  <evins@snaught.com>

	    * src/prefs-model.c: (gl_prefs_model_load_settings):
		    Make an educated guess at locale settings when run
		    for the
		    first time.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@849
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/prefs-model.c

commit 6fb8d93a2091a644e15ce3b2a8760a037aa1f224
Author: Jim Evins <evins@snaught.com>
Date:	2009-05-18

    2009-05-17	Jim Evins  <evins@snaught.com>

	    * help/de/de.po:
	    * help/glabels.omf.in:
		    Adding missing files from last checkin.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@846
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
D	glabels2/help/C/glabels-C.omf
A	glabels2/help/de/de.po
A	glabels2/help/glabels.omf.in

commit 37a920e876ef4e7c019554be12caec3ff17bd030
Author: Jim Evins <evins@snaught.com>
Date:	2009-05-18

    2009-05-17	Jim Evins  <evins@snaught.com>

	    * Makefile.am:
	    * configure.in:
	    * help/C/glabels-C.omf:
	    * help/C/glabels.xml:
	    * help/Makefile.am:
	    * po/de.po:
		    Updated german translation, gnome-doc-utils support
		    and
		    german translation of glabels manual (Mario
		    Blättermann).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@845
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/Makefile.am
M	glabels2/configure.in
M	glabels2/help/C/glabels-C.omf
M	glabels2/help/C/glabels.xml
M	glabels2/help/Makefile.am
M	glabels2/po/de.po

commit dd9de9b237713197a38a600b167e2463f8391a25
Author: Jim Evins <evins@snaught.com>
Date:	2009-05-02

    2009-05-01	Jim Evins  <evins@purple>

	    * AUTHORS:
	    * configure.in:
	    * po/ca.po:
		    Added catalan translation (David Planella).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@843
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/configure.in
A	glabels2/po/ca.po

commit 53eaba2de44181026372fd2e512021ff4ab01ac6
Author: Jim Evins <evins@snaught.com>
Date:	2009-04-30

    2009-04-29	Jim Evins  <evins@purple>

	    * data/templates/avery-iso-templates.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/misc-us-templates.xml:
		    Caught up on user submitted templates.
	    * AUTHORS:
		    Acknowledgements for above templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@838
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/misc-us-templates.xml

commit 88df0a84494022b59684c6fc997fcc001905cffc
Author: Jim Evins <evins@snaught.com>
Date:	2009-04-30

    2009-04-29	Jim Evins  <evins@purple>

	    * po/POTFILES.in:
	    * po/de.po:
		    Updated german translation (Mario Blättermann).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@835
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
D	glabels2/po/ChangeLog
M	glabels2/po/POTFILES.in
M	glabels2/po/de.po

commit 3d49690351c8f4fa5a46e15208a71e26de9e045e
Author: Jim Evins <evins@snaught.com>
Date:	2009-04-20

    Updated links.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@832
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/links/index.php

commit 80018e80624e22e2d44239f4fd07401acfbb19ad
Author: Jim Evins <evins@snaught.com>
Date:	2009-04-12

    Website updates.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@831
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php
M	web/links/index.php

commit 27432959aa92808be3edff2a3317cad6341f57ec
Author: Jim Evins <evins@snaught.com>
Date:	2009-03-25

    Added links to getdeb packages.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@830
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php
M	web/links/index.php

commit a861bd74a69cf6163be77d42e0d888f55e2aba4b
Author: Jim Evins <evins@snaught.com>
Date:	2009-03-23

    2009-03-23	Jim Evins  <evins@snaught.com>

	    * src/glabels-batch.c: (main):
	    * src/glabels.c: (main):
		    Tidy up help option output.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@829
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c

commit 4aad2f4999b238fe83a47ea51e1f2b0b24ac7fb8
Author: Jim Evins <evins@snaught.com>
Date:	2009-02-28

    2009-02-28	Jim Evins  <evins@snaught.com>

	    reviewed by: <delete if not using a buddy>

	    * src/Makefile.am:
	    * src/base64.c:
	    * src/base64.h:
		    Deleted base64 module.
	    * src/xml-label.c: (xml_parse_pixdata), (xml_create_pixdata):
		    Use glib for base64 support.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@828
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
D	glabels2/src/base64.c
D	glabels2/src/base64.h
M	glabels2/src/xml-label.c

commit 7c94e09d4f2968f4699ed6b91f5dbfd18d43ff1a
Author: Jim Evins <evins@snaught.com>
Date:	2009-02-23

    2009-02-22	Jim Evins  <evins@snaught.com>

	    * src/merge-properties-dialog.h:
	    * src/new-label-dialog.h:
	    * src/object-editor.h:
	    * src/prefs-dialog.h:
	    * src/print-op.h:
	    * src/template-designer.h:
		    Corrected cut&paste errors.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@827
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-properties-dialog.h
M	glabels2/src/new-label-dialog.h
M	glabels2/src/object-editor.h
M	glabels2/src/prefs-dialog.h
M	glabels2/src/print-op.h
M	glabels2/src/template-designer.h

commit 4e719ff243581797720031f50cfa33c835552931
Author: Jim Evins <evins@snaught.com>
Date:	2009-02-22

    2009-02-21	JimEvins  <evins@snaught.com>

	    * src/prefs-model.c: (gl_prefs_model_save_settings),
	    (gl_prefs_model_load_settings):
	    * src/prefs-model.h:
	    * src/ui-commands.c:
	    * src/ui-property-bar.c:
	    * src/ui.c: (view_ui_item_toggled_cb),
	    (set_app_main_toolbar_style), (set_app_drawing_toolbar_style):
		    Removed tooltip toggling capability, which wasn't
		    working
		    anyway.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@826
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/ui-commands.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui.c

commit e66208f5c1f1573ab4aa75e0fb734d01ab2688bf
Author: Jim Evins <evins@snaught.com>
Date:	2009-02-21

    2009-02-21	JimEvins  <evins@snaught.com>

	    * README:
	    * configure.in:
	    * data/builder/object-editor.glade:
	    * data/builder/prefs-dialog.glade:
	    * data/builder/property-bar.glade:
	    * data/builder/template-designer.glade:
	    * gtk-doc.make:
	    * src/color-combo-color-menu-item.c:
	    * src/color-combo-color-menu-item.h:
	    * src/color-combo-menu.h:
	    * src/glabels-batch.c: (main):
	    * src/glabels.c: (main):
	    * src/merge-properties-dialog.h:
	    * src/new-label-dialog.h:
	    * src/object-editor-lsize-page.c:
	    (gl_object_editor_prepare_lsize_page),
	    (lsize_prefs_changed_cb):
	    * src/object-editor.h:
	    * src/prefs-dialog.h:
	    * src/print-op.h:
	    * src/template-designer.h:
	    * src/ui-commands.c:
	    (gl_ui_cmd_view_property_bar_tips_toggle),
	    (gl_ui_cmd_help_contents), (gl_ui_cmd_help_about):
	    * src/ui-property-bar.c:
	    * src/ui-property-bar.h:
	    * src/ui-sidebar.c: (gl_ui_sidebar_construct),
	    (selection_changed_cb):
	    * src/ui-sidebar.h:
	    * src/view.h:
	    * src/wdgt-media-select.h:
	    * src/wdgt-merge-menu.h:
	    * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_class_init):
	    * src/wdgt-mini-preview.h:
	    * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct):
	    * src/wdgt-print-copies.h:
	    * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct):
	    * src/wdgt-print-merge.h:
	    * src/wdgt-rotate-label.h:
	    * src/window.h:
		    Removed final dependencies on libgnome and libgnomeui.
		    Removed all currently deprecated symbols as of
		    GTK 2.14.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@825
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/README
M	glabels2/configure.in
M	glabels2/data/builder/object-editor.glade
M	glabels2/data/builder/prefs-dialog.glade
M	glabels2/data/builder/property-bar.glade
M	glabels2/data/builder/template-designer.glade
M	glabels2/gtk-doc.make
M	glabels2/src/color-combo-color-menu-item.c
M	glabels2/src/color-combo-color-menu-item.h
M	glabels2/src/color-combo-menu.h
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/merge-properties-dialog.h
M	glabels2/src/new-label-dialog.h
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor.h
M	glabels2/src/prefs-dialog.h
M	glabels2/src/print-op.h
M	glabels2/src/template-designer.h
M	glabels2/src/ui-commands.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-property-bar.h
M	glabels2/src/ui-sidebar.c
M	glabels2/src/ui-sidebar.h
M	glabels2/src/view.h
M	glabels2/src/wdgt-media-select.h
M	glabels2/src/wdgt-merge-menu.h
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-copies.h
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-print-merge.h
M	glabels2/src/wdgt-rotate-label.h
M	glabels2/src/window.h

commit 3d4a88e43b50dc93d7a5159c7655204c98ecdd6e
Author: Jim Evins <evins@snaught.com>
Date:	2009-02-11

    Make sure all pages still validate.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@824
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/common_php.inc
M	web/contact/index.php
M	web/download/index.php
M	web/faq/index.php
M	web/index.php
M	web/news/index.php

commit 785f385b0a34cb02732bbd48d483988c75a0c651
Author: Jim Evins <evins@snaught.com>
Date:	2009-01-08

    2009-01-07	Jim Evins  <evins@snaught.com>

	    * src/critical-error-handler.c: (critical_error_handler):
	    * src/ui-commands.c: (gl_ui_cmd_help_contents):
	    * src/warning-handler.c: (warning_handler):
	    * src/view.c: (selection_received_cb):
		    Compile without warning with additional CFLAGS of
		    -O1 -Wall -Wformat=2.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@823
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/critical-error-handler.c
M	glabels2/src/ui-commands.c
M	glabels2/src/view.c
M	glabels2/src/warning-handler.c

commit dc8b4a0f9fe720d384aaaf4811a8a990c3a7bbda
Author: Jim Evins <evins@snaught.com>
Date:	2009-01-03

    2009-01-02	Jim Evins  <evins@snaught.com>

	    * COPYING.README_FIRST:
		    Fixed typo.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@821
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/COPYING.README_FIRST
M	glabels2/ChangeLog

commit fc11548527b8363cf1595da581fd46a6574f4116
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-28

    2008-12-27	Jim Evins  <evins@snaught.com>

	    * data/templates/avery-iso-templates.xml:
	    * data/templates/avery-other-templates.xml:
	    * data/templates/avery-us-templates.xml:
	    * data/templates/brother-other-templates.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/misc-other-templates.xml:
	    * data/templates/zweckform-iso-templates.xml:
		    Make sure all descriptions are marked as translatable.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@819
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/avery-other-templates.xml
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/brother-other-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/misc-other-templates.xml
M	glabels2/data/templates/zweckform-iso-templates.xml

commit 4d4d318a5e7b1a78263d289bae0c41fda99d74b2
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-28

    2008-12-27	Jim Evins  <evins@snaught.com>

	    * de.po:
		    Updated german translation (Mario Blättermann)
	    * AUTHORS:
		    Updated credits to reflect above translation.
	    * data/builder/object-editor.glade:
	    * data/builder/prefs-dialog.glade:
	    * data/builder/template-designer.glade:
		    Removed "translatable" attribute from whitespace
		    strings,
		    which are used only to help layout.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@817
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/builder/object-editor.glade
M	glabels2/data/builder/prefs-dialog.glade
M	glabels2/data/builder/template-designer.glade
M	glabels2/po/de.po

commit 324bdb14055546411bd9909753677fa91b22a4c4
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-22

    Release 2.2.4

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@815
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php
M	web/index.php
M	web/news/index.php

commit c5c822b536c68e3820e2d435634f1c4407ede1e9
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-22

    2008-12-21	Jim Evins  <evins@snaught.com>

	    * data/templates/avery-us-templates.xml:
	    * data/templates/misc-iso-templates.xml:
		    A couple of recent template submissions.
	    * AUTHORS:
		    Acknowledgements for above templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@811
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml

commit 7f533d981565aecf7c4ec7f47743b5197e4ea2af
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-21

    2008-12-21	Jim Evins  <evins@snaught.com>

	    * src/view.c: (motion_notify_event_cb),
	    (button_press_event_cb):
		    Don't check for handles on aggregate selections.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@809
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/view.c

commit 1da3c68162b4aa96021c1d51d6dece3a630a968a
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-21

    Updated development version requirements.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@807
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php

commit 43adc6cb0e93d294807ff2a6b0e180807983d7da
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-20

    2008-12-20	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Updated prerequisite library versions required.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@806
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in

commit 60afedc9a3de0a1de48b79664299f71384ca2a25
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-19

    Updated FAQ.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@805
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/faq/index.php

commit 5f5fc0b681e7db77307f05ee7fcc7e2236f12467
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-19

    2008-12-18	Jim Evins  <evins@snaught.com>

	    * src/view.c: (selection_received_cb):
		    Fixed paste bug that caused a duplicate phantom
		    view_object to be created for
		    each new label_object.  This is because the view now
		    (as of r673) the view
		    monitiors the label for new objects and creates
		    view_objects automatically.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@804
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/view.c

commit 31bd44a96ae5c7f2687d2c37f037a386a087ad17
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-15

    2008-12-14	Jim Evins  <evins@snaught.com>

	    * src/ui.c: (gl_ui_new):
		    Bug #2395628.  Fixed i18n for application shell.
	    * po/POTFILES.in:
		    Bug #2395628.  Reconciled POTFILES.in with current
		    files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@801
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/po/POTFILES.in
M	glabels2/src/ui.c

commit 65526d446c2fcef33bd5f786601e312e566b6de9
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-15

    2008-12-14	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Bug #2316013.  Added PKG_PROG_PKG_CONFIG.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@799
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in

commit ae5381bcfb4cfef51379bdd7df40fd461aa0f0d5
Author: Jim Evins <evins@snaught.com>
Date:	2008-12-01

    Added link to another linux.com artical.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@797
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/links/index.php

commit f76b27f1dae279463613e58ea6082f6a6711d2e5
Author: Jim Evins <evins@snaught.com>
Date:	2008-11-16

    2008-11-15	Jim Evins  <evins@snaught.com>

	    * libglabels/db.c: (lgl_db_register_template):
	    * libglabels/xml-template.c:
	    (lgl_xml_template_parse_template_node):
	    * src/glabels-batch.c:
	    * src/view-text.c: (gl_view_text_create_button_press_event):
		    Fixed several issues such as possible use of
		    uninitialized variables found with "-O1 -Wall".


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@796
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/db.c
M	glabels2/libglabels/xml-template.c
M	glabels2/src/glabels-batch.c
M	glabels2/src/view-text.c

commit b8f1816d53df85e2234b374bf64bbd84249fe667
Author: Jim Evins <evins@snaught.com>
Date:	2008-11-10

    2008-11-09	Jim Evins  <evins@snaught.com>

	    * data/templates/misc-iso-templates.xml:
		    Another user submitted template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@794
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/templates/misc-iso-templates.xml

commit 20ce4c33fcd64fecba7e403f127ba0c42743c397
Author: Jim Evins <evins@snaught.com>
Date:	2008-10-31

    Added link to nice blog.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@792
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/links/index.php

commit 263be22ce938c604d9de9a20650bcef888f720fd
Author: Jim Evins <evins@snaught.com>
Date:	2008-10-31

    Website changes from last release.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@791
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php
M	web/index.php
M	web/news/index.php

commit 3a0de14d527a044a6ab3f67436df74e4fb5b5c7c
Author: Jim Evins <evins@snaught.com>
Date:	2008-10-28

    2008-10-27	Jim Evins  <evins@snaught.com>

	    * data/templates/avery-us-templates.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/zweckform-iso-templates.xml:
		    Caught up on user submitted templates.
	    * AUTHORS:
		    Acknowledgements for above templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@790
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/zweckform-iso-templates.xml

commit c9e2de5f7326b9bd172268da0584d6c6e31a7e03
Author: Jim Evins <evins@snaught.com>
Date:	2008-10-24

    2008-10-23	Jim Evins  <evins@snaught.com>

	    * src/label-text.c: (set_font_family):
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page),
	    (gl_object_editor_set_font_family):
	    * src/prefs-dialog.c: (construct_object_page),
	    (update_object_page_from_prefs):
	    * src/ui-property-bar.c: (gl_ui_property_bar_construct),
	    (reset_to_default_properties):
	    * src/util.c: (gl_util_get_font_family_list):
	    * src/util.h:
		    Bug #1902275 and Bug #2186214.  Cache font list so
		    that it is not re-created
		    everytime the list is requested.
	    * src/object-editor-text-page.c:
	    (gl_object_editor_set_font_family):
		    Don't change font-family if it hasn't actually
		    changed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@788
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-text.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/util.c
M	glabels2/src/util.h

commit dbd84afd35a3b583955817558d598183eadec95f
Author: Jim Evins <evins@snaught.com>
Date:	2008-10-20

    2008-10-19	Jim Evins  <evins@snaught.com>

	    * data/builder/object-editor.glade:
		    Some tweaking of builder/glade widgets.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@786
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/builder/object-editor.glade

commit 0dc8ff1f3ef7c7659bc25f59d9a3e364d9214746
Author: Jim Evins <evins@snaught.com>
Date:	2008-10-18

    2008-10-18	Jim Evins  <evins@snaught.com>

	    Migrated all use of libglade to GtkBuilder.

	    * data/glade/Makefile.am:
	    * data/glade/merge-properties-dialog.glade:
	    * data/glade/new-label-dialog.glade:
	    * data/glade/object-editor.glade:
	    * data/glade/prefs-dialog.glade:
	    * data/glade/print-custom-widget.glade:
	    * data/glade/property-bar.glade:
	    * data/glade/template-designer.glade:
	    * data/glade/wdgt-media-select.glade:
		    Removed data/glade directory.
	    * data/builder/Makefile.am:
	    * data/builder/merge-properties-dialog.glade:
	    * data/builder/new-label-dialog.glade:
	    * data/builder/object-editor.glade:
	    * data/builder/prefs-dialog.glade:
	    * data/builder/print-custom-widget.glade:
	    * data/builder/property-bar.glade:
	    * data/builder/template-designer.glade:
	    * data/builder/wdgt-media-select.glade:
		    Added data/builder directory.
	    * configure.in:
	    * data/Makefile.am:
	    * src/Makefile.am:
		    Change glade to builder.
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_finalize),
	    (gl_merge_properties_dialog_construct):
	    * src/new-label-dialog.c: (gl_new_label_dialog_finalize),
	    (gl_new_label_dialog_construct):
	    * src/object-editor-bc-page.c:
	    (gl_object_editor_prepare_bc_page):
	    * src/object-editor-data-page.c:
	    (gl_object_editor_prepare_data_page):
	    * src/object-editor-edit-page.c:
	    (gl_object_editor_prepare_edit_page):
	    * src/object-editor-fill-page.c:
	    (gl_object_editor_prepare_fill_page):
	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page):
	    * src/object-editor-line-page.c:
	    (gl_object_editor_prepare_line_page):
	    * src/object-editor-lsize-page.c:
	    (gl_object_editor_prepare_lsize_page):
	    * src/object-editor-position-page.c:
	    (gl_object_editor_prepare_position_page):
	    * src/object-editor-private.h:
	    * src/object-editor-shadow-page.c:
	    (gl_object_editor_prepare_shadow_page):
	    * src/object-editor-size-page.c:
	    (gl_object_editor_prepare_size_page):
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page):
	    * src/object-editor.c: (gl_object_editor_init):
	    * src/prefs-dialog.c: (gl_prefs_dialog_init),
	    (gl_prefs_dialog_construct), (construct_locale_page),
	    (construct_object_page):
	    * src/print-op.c: (gl_print_op_finalize),
	    (create_custom_widget_cb):
	    * src/template-designer.c: (gl_template_designer_class_init),
	    (gl_template_designer_finalize),
	    (gl_template_designer_construct),
	    (construct_start_page), (construct_name_page),
	    (construct_pg_size_page), (construct_shape_page),
	    (construct_rect_size_page), (construct_round_size_page),
	    (construct_cd_size_page), (construct_nlayouts_page),
	    (construct_layout_page), (construct_finish_page):
	    * src/template-designer.h:
	    * src/ui-property-bar.c: (gl_ui_property_bar_init),
	    (gl_ui_property_bar_finalize), (gl_ui_property_bar_new),
	    (gl_ui_property_bar_construct), (reset_to_default_properties),
	    (gl_ui_property_bar_set_view),
	    (gl_ui_property_bar_set_tooltips),
	    (update_text_properties), (update_fill_color),
	    (update_line_color),
	    (update_line_width), (selection_changed_cb),
	    (font_family_changed_cb), (font_size_changed_cb),
	    (text_color_changed_cb), (fill_color_changed_cb),
	    (line_color_changed_cb), (line_width_changed_cb),
	    (font_bold_toggled_cb), (font_italic_toggled_cb),
	    (text_align_toggled_cb), (set_doc_items_sensitive),
	    (set_text_items_sensitive), (set_fill_items_sensitive),
	    (set_line_color_items_sensitive),
	    (set_line_width_items_sensitive):
	    * src/ui-property-bar.h:
	    * src/util.c: (gl_util_get_builder_widgets):
	    * src/util.h:
	    * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize),
	    (gl_wdgt_media_select_construct):
		    Migration of glade to builder.
	    * src/color.h:
		    New macros for color combo initialization.
	    * TODO:
		    Added idea for internal merge database.
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/paper.sgml:
	    * gtk-doc.make:
		    Automagic.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@785
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/TODO
M	glabels2/configure.in
M	glabels2/data/Makefile.am
A	glabels2/data/builder/Makefile.am
R100	glabels2/data/glade/merge-properties-dialog.glade
glabels2/data/builder/merge-properties-dialog.glade
R100	glabels2/data/glade/new-label-dialog.glade
glabels2/data/builder/new-label-dialog.glade
R097	glabels2/data/glade/object-editor.glade
glabels2/data/builder/object-editor.glade
R096	glabels2/data/glade/prefs-dialog.glade
glabels2/data/builder/prefs-dialog.glade
R100	glabels2/data/glade/print-custom-widget.glade
glabels2/data/builder/print-custom-widget.glade
R089	glabels2/data/glade/property-bar.glade
glabels2/data/builder/property-bar.glade
R099	glabels2/data/glade/template-designer.glade
glabels2/data/builder/template-designer.glade
R100	glabels2/data/glade/wdgt-media-select.glade
glabels2/data/builder/wdgt-media-select.glade
D	glabels2/data/glade/Makefile.am
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/paper.sgml
M	glabels2/gtk-doc.make
M	glabels2/src/Makefile.am
M	glabels2/src/color.h
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/new-label-dialog.c
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/print-op.c
M	glabels2/src/template-designer.c
M	glabels2/src/template-designer.h
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-property-bar.h
M	glabels2/src/util.c
M	glabels2/src/util.h
M	glabels2/src/wdgt-media-select.c

commit 7ef35253c18443a10f4f38d53143341c09c06015
Author: Jim Evins <evins@snaught.com>
Date:	2008-10-12

    2008-10-12	Jim Evins  <evins@snaught.com>

	    * src/mygal/Makefile.am:
	    * src/mygal/color-group.c:
	    * src/mygal/color-group.h:
	    * src/mygal/color-palette.c:
	    * src/mygal/color-palette.h:
	    * src/mygal/e-colors.c:
	    * src/mygal/e-colors.h:
	    * src/mygal/e-marshal.list:
	    * src/mygal/e-util.h:
	    * src/mygal/mygal-combo-box.c:
	    * src/mygal/mygal-combo-box.h:
	    * src/mygal/widget-color-combo.c:
	    * src/mygal/widget-color-combo.h:
	    * AUTHORS:
	    * configure.in:
		    Deleted mygal.
	    * src/color-combo.c:
	    * src/color-combo.h:
	    * src/color-combo-color-menu-item.c:
	    * src/color-combo-color-menu-item.h:
	    * src/color-combo-history.c:
	    * src/color-combo-history.h:
	    * src/color-combo-menu.c:
	    * src/color-combo-menu.h:
	    * src/marshal.list:
	    * src/util.c:
	    * src/util.h:
	    * src/Makefile.am:
		    Created new glColorCombo widget.
	    * src/object-editor-bc-page.c:
	    * src/object-editor-edit-page.c:
	    * src/object-editor-fill-page.c:
	    * src/object-editor-line-page.c:
	    * src/object-editor-shadow-page.c:
	    * src/object-editor-text-page.c:
	    * src/object-editor.c:
	    * src/prefs-dialog.c:
	    * src/ui-property-bar.c:
		    Replaced use of mygal color combo with new
		    glColorCombo widget.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@784
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/src/Makefile.am
A	glabels2/src/color-combo-color-menu-item.c
A	glabels2/src/color-combo-color-menu-item.h
A	glabels2/src/color-combo-history.c
A	glabels2/src/color-combo-history.h
A	glabels2/src/color-combo-menu.c
A	glabels2/src/color-combo-menu.h
A	glabels2/src/color-combo.c
A	glabels2/src/color-combo.h
M	glabels2/src/marshal.list
D	glabels2/src/mygal/Makefile.am
D	glabels2/src/mygal/color-group.c
D	glabels2/src/mygal/color-group.h
D	glabels2/src/mygal/color-palette.c
D	glabels2/src/mygal/color-palette.h
D	glabels2/src/mygal/e-colors.c
D	glabels2/src/mygal/e-colors.h
D	glabels2/src/mygal/e-marshal.list
D	glabels2/src/mygal/e-util.h
D	glabels2/src/mygal/mygal-combo-box.c
D	glabels2/src/mygal/mygal-combo-box.h
D	glabels2/src/mygal/widget-color-combo.c
D	glabels2/src/mygal/widget-color-combo.h
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/util.c
M	glabels2/src/util.h

commit 6accda9df32944d48b5e8556c5b7d4fd6e37b485
Author: Jim Evins <evins@snaught.com>
Date:	2008-08-30

    2008-08-29	Jim Evins  <evins@snaught.com>

	    * src/file.c: (gl_file_open), (gl_file_save_as):
		    Bug #2069668.  Corrected button order in Open and
		    "Save as"
		    dialogs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@783
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/file.c

commit 7b353782309c9627b471bd5928d836e4ed380e9b
Author: Jim Evins <evins@snaught.com>
Date:	2008-08-17

    2008-08-17	Jim Evins  <evins@snaught.com>

	    * data/dtd/glabels-2.2.dtd:
	    * data/templates/paper-sizes.xml:
	    * libglabels/db.c: (lgl_db_init):
	    * libglabels/paper.c: (lgl_paper_new), (lgl_paper_dup),
	    (lgl_paper_free):
	    * libglabels/paper.h:
	    * libglabels/xml-paper.c: (lgl_xml_paper_parse_paper_node):
	    * src/print-op.c: (set_page_size):
		    Bug #2049431.  Always explicitely set page size.
		    Added pwg_size field (PWG 5101.1-2002
		    size specification) to the libglabels paper database
		    to allow the page size to be
		    communicated to GtkPrintOp un-ambiguously.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@777
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/dtd/glabels-2.2.dtd
M	glabels2/data/templates/paper-sizes.xml
M	glabels2/libglabels/db.c
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/paper.h
M	glabels2/libglabels/xml-paper.c
M	glabels2/src/print-op.c

commit a4e50ffadf1d9aaf6d3fdd6fa88a4a144652be70
Author: Jim Evins <evins@snaught.com>
Date:	2008-07-26

    2008-07-25	Jim Evins  <evins@snaught.com>

	    * src/object-editor-size-page.c: (size_reset_cb),
	    (gl_object_editor_set_max_size):
		    Bug #1993550.  Set size limits based on longest side
		    of label.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@776
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/object-editor-size-page.c

commit d842a8e3b41ef987d9f402f80a5ea19f2cc8528f
Author: Jim Evins <evins@snaught.com>
Date:	2008-07-20

    2008-07-19	Jim Evins  <evins@snaught.com>

	    * configure.in:
	    * src/mygal/Makefile.am:
		    Make sure libtool handles library dependencies
		    for mygal
		    properly.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@774
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/src/mygal/Makefile.am

commit c046a8d5f2adcabf208bf344ae2d49b2c35d9563
Author: Jim Evins <evins@snaught.com>
Date:	2008-05-22

    2008-05-21	Jim Evins  <evins@snaught.com>

	    * src/glabels-batch.c: (main):
		    Bug #1968653.  Initialize prefs subsystem.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@772
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/glabels-batch.c

commit a3fb8ada88270c000ca8ed92552df8bd73e43b81
Author: Jim Evins <evins@snaught.com>
Date:	2008-05-10

    2008-05-09	Jim Evins  <evins@snaught.com>

	    * data/glade/object-editor.glade:
		    Bug #1959135.  A couple of radio buttons somehow
		    became
		    ungrouped.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@769
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/object-editor.glade

commit 85c07ac71aaff4903c38f816ae77c5932754512b
Author: Jim Evins <evins@snaught.com>
Date:	2008-04-08

    2008-04-07	Jim Evins  <evins@snaught.com>

	    * src/wdgt-rotate-label.h:
	    * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_init),
	    (gl_wdgt_rotate_label_new), (toggled_cb), (create_pixbuf),
	    (gl_wdgt_rotate_label_get_state),
	    (gl_wdgt_rotate_label_set_state),
	    (gl_wdgt_rotate_label_set_template_name):
		    Modified wdgt-rotate-label to better indicate the
		    rotation choices.
	    * data/glade/Makefile.am:
	    * data/glade/wdgt-rotate-label.glade:
		    Deleted wdgt-rotate-label.glade.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@768
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/Makefile.am
D	glabels2/data/glade/wdgt-rotate-label.glade
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/wdgt-rotate-label.h

commit cec0279eb60ae357ff93ef662a432b979160a303
Author: Jim Evins <evins@snaught.com>
Date:	2008-04-05

    2008-04-04	Jim Evins  <evins@snaught.com>

	    * data/templates/brother-other-templates.xml:
		    Added categories to existing templates.
	    * data/templates/misc-other-templates.xml:
		    Moved dymo templates to their own file.
	    * data/templates/Makefile.am:
	    * data/templates/dymo-other-templates.xml:
		    Additional dymo templates provided by Harald Welte
		    <laforge@gnumonks.org>.
	    * AUTHORS:
		    Acknowledgement for above templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@767
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/data/templates/dymo-other-templates.xml

commit 49497c2580870b2a1b2364e4da33e4587efae50a
Author: Jim Evins <evins@snaught.com>
Date:	2008-04-05

    2008-04-04	Jim Evins  <evins@snaught.com>

	    * data/templates/brother-other-templates.xml:
		    Added categories to existing templates.
	    * data/templates/misc-other-templates.xml:
		    Moved dymo templates to their own file.
	    * data/templates/Makefile.am:
	    * data/templates/dymo-other-templates.xml:
		    Additional dymo templates provided by Harald Welte
		    <laforge@gnumonks.org>.
	    * AUTHORS:
		    Acknowledgement for above templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@766
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/Makefile.am
M	glabels2/data/templates/brother-other-templates.xml
M	glabels2/data/templates/misc-other-templates.xml

commit 0bd0009193b9e28d4ddf96028399f038996d15d5
Author: Jim Evins <evins@snaught.com>
Date:	2008-03-25

    2008-03-24	Jim Evins  <evins@snaught.com>

	    * src/xml-label.c: (xml_doc_to_label):
		    Bug #1872584.  Don't refuse to parse label file if
		    namespace is
		    unrecognized -- it may be from a newer version
		    of glabels.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@763
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/xml-label.c

commit 5f3c093d8b3d6aeef8a9e477481b0bdc7728c65b
Author: Jim Evins <evins@snaught.com>
Date:	2008-03-16

    2008-03-15	Jim Evins  <evins@snaught.com>

	    * data/templates/Makefile.am:
	    * data/templates/brother-other-templates.xml:
		    Added brother templates.
	    * src/cairo-markup-path.c: (gl_cairo_markup_margin_rect_path),
	    (gl_cairo_markup_margin_cd_path):
	    * src/view.c: (draw_markup_layer):
		    Fixed markup drawing errors when label is rotated.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@762
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/templates/Makefile.am
A	glabels2/data/templates/brother-other-templates.xml
M	glabels2/src/cairo-markup-path.c
M	glabels2/src/view.c

commit ffb3bb596fd074d8aff5d967f0468d7c47769510
Author: Jim Evins <evins@snaught.com>
Date:	2008-03-04

    2008-03-03	Jim Evins  <evins@snaught.com>

	    * configure.in:
	    * ko.po:
		    Added korean translation provided by xein@naver.com.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@760
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
A	glabels2/po/ko.po

commit eb9b5b77918c0ca267429d15417370a7af529cbb
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-23

    Release 2.2.2

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@756
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php
M	web/index.php
M	web/news/index.php

commit 22ec28c04b44a74d3dfe10f5667bde6d36637df3
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-22

    2008-02-21	Jim Evins  <evins@snaught.com>

	    * src/ui.c:
		    Fixed typo that prevented "Save" from being
		    deactivated when
		    document is not modified.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@755
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/ui.c

commit 23cbe3a3256f0edd295a7d4fc0c92c2de23e5e9c
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-19

    2008-02-18	Jim Evins  <evins@snaught.com>

	    * src/prefs-model.c: (gl_prefs_model_save_settings),
	    (gl_prefs_model_load_settings):
		    Set default units for file output.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@752
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/prefs-model.c

commit 4618bceeaf24715211c17ca9585e7a807b4df814
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-18

    2008-02-18	Jim Evins  <evins@snaught.com>

	    * help/C/glabels.xml:
		    Fixed example template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@750
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/help/C/glabels.xml

commit 41999df6e9a40596e0e6986813b70f3f360c9b0e
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-17

    2008-02-16	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * data/templates/avery-iso-templates.xml:
	    * data/templates/avery-us-templates.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/misc-us-templates.xml:
		    Caught up on user submitted templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@748
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/misc-us-templates.xml

commit 9e0bdc8ba7b36e33843fa7ba8baf496db7a41b88
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-05

    2008-02-04	Jim Evins  <evins@snaught.com>

	    * src/view-image.c: (update_object_from_editor_cb):
		    Bug #1886438.  Don't update the image size unless
		    it is actually
		    triggered by a change in image source.  The result
		    of this bug
		    was that any attempt to edit the size spinboxes,
		    immediately
		    reset the size.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@746
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/view-image.c

commit 91d37cb324c418683201aa5c25bd013789286831
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-03

    2008-02-03	Jim Evins  <evins@snaught.com>

	    * src/label-image.c: (gl_label_image_class_init), (set_size):
		    Enforce minimum size for images.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@743
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-image.c

commit d9e0dd7675822598ed33528baa97c41d68b617e2
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-03

    2008-02-03	Jim Evins  <evins@snaught.com>

	    * src/object-editor-edit-page.c: (field_selected_cb):
	    * src/object-editor-lsize-page.c:
	    (gl_object_editor_set_max_lsize):
	    * src/object-editor-private.h:
	    * src/object-editor-shadow-page.c:
	    (gl_object_editor_set_max_shadow_offset):
	    * src/object-editor-size-page.c:
	    (gl_object_editor_set_max_size):
	    * src/object-editor.c: (gl_object_editor_finalize),
	    (gl_object_editor_new), (gl_object_notebook_construct_valist),
	    (label_changed_cb):
	    * src/object-editor.h:
	    * src/ui-sidebar.c: (gl_ui_sidebar_construct):
	    * src/view-barcode.c: (construct_properties_editor):
	    * src/view-box.c: (construct_properties_editor):
	    * src/view-ellipse.c: (construct_properties_editor):
	    * src/view-image.c: (construct_properties_editor):
	    * src/view-line.c: (construct_properties_editor):
	    * src/view-object.c: (gl_view_object_finalize):
	    * src/view-text.c: (construct_properties_editor),
		    Move update_editor_from_label callback from individual
		    view objects
		    to the object editor, so that signals can be
		    disconnected when
		    object editor is finalized.
	    * src/view-text.c: (gl_view_text_create_button_press_event):
		    Fixed bug that caused multiple view objects to be
		    created for a
		    single text object.  This bug would manifest itself
		    as a crash
		    when deleting multi-object selections which included
		    text objects.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@741
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.h
M	glabels2/src/ui-sidebar.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-object.c
M	glabels2/src/view-text.c

commit b4714e50f777fe29eb16a2d729e8b5692ade6c88
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-02

    2008-02-02	Jim Evins  <evins@snaught.com>

	    * src/Makefile.am:
	    * src/wdgt-merge-menu.c:
	    * src/wdgt-merge-menu.h:
	    * src/debug.c: (gl_debug_init):
	    * src/debug.h:
	    * src/marshal.list:
		    New merge menu widget.
	    * data/glade/object-editor.glade:
	    * src/object-editor-private.h:
	    * src/object-editor.c: (gl_object_editor_set_key_names):
	    * src/object-editor-edit-page.c:
	    (gl_object_editor_prepare_edit_page), (field_selected_cb),
	    (insert_button_cb):
		    Simplified UI for inserting fields into text objects
		    by launching
		    a merge menu and directly inserting fields from
		    the menu.  No more
		    selecting field in combobox, then pressing insert
		    button.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@740
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/object-editor.glade
M	glabels2/src/Makefile.am
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/marshal.list
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor.c
A	glabels2/src/wdgt-merge-menu.c
A	glabels2/src/wdgt-merge-menu.h

commit b9efddafae059c1834ee10d3d7aedf9a23a1aea9
Author: Jim Evins <evins@snaught.com>
Date:	2008-02-01

    2008-01-31	Jim Evins  <evins@snaught.com>

	    * src/label-barcode.c: (draw_object):
		    Fixed rendering problem when "Invalid data" is
		    displayed when text
		    object is lower in stacking order.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@738
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-barcode.c

commit 34ce1482d3abe34922ef9bc8d0173ec98c74f1c0
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-31

    2008-01-30	Jim Evins  <evins@snaught.com>

	    * src/label-text.c: (get_size), (draw_object), (draw_shadow):
		    Don't turn off cairo_hint_metrics.	This causes
		    serious issues with
		    bitmap fonts.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@736
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-text.c

commit c3eb26e0dc3c7c4ae2dfd150d15ac2dfdda751b2
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-30

    2008-01-29	Jim Evins  <evins@snaught.com>

	    * src/print-op.c: (gl_print_op_construct),
	    (gl_print_op_construct_batch), (set_page_size):
		    Explicitly set page size for "other" page sizes.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@734
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print-op.c

commit 30a30cddd30848ddb8c27bd3883e355c5f455aee
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-26

    2008-01-25	Jim Evins  <evins@snaught.com>

	    * src/bc.c:
		    Fixed Code128C backend parameters.
	    * src/label-barcode.c: (get_size):
		    Bug #1766425.  If barcode is not renderable with
		    either
		    input data or default data, use a default size.  Also
		    fixed small leak.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@733
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/bc.c
M	glabels2/src/label-barcode.c

commit f92a36a65a99196ea77369e36306ef012713c1f0
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-23

    Release 2.2.1

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@729
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php
M	web/index.php
M	web/news/index.php

commit b3284942b4787e79360f989f39573cf4db05be2b
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-17

    2008-01-16	Jim Evins  <evins@snaught.com>

	    * src/print.c: (print_label):
		    Bug #1872568.  Don't apply special transforms
		    (rotate and
		    mirror) to clipping region or outline.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@727
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print.c

commit 4fc7a95ffe11cda0bdfd9074cb8ee5d41e6d4434
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-02

    2008-01-01	Jim Evins  <evins@snaught.com>

	    * src/util.c:
		    Sort font lists alphabetically.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@725
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/util.c

commit 2405b022fb9d95b98b20ad37de761fdb885b3d86
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-02

    2008-01-01	Jim Evins  <evins@snaught.com>

	    * src/merge-evolution.c:
		    Do a case-insensitive sort.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@723
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-evolution.c

commit 0f866d1aacfc4da617ae484b6c0873ff08909b6e
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-02

    2008-01-01	Jim Evins  <evins@snaught.com>

	    * src/merge-evolution.c:
		    Sort evolution by "file_under" field.  Original patch
		    provided
		    by Peter Cherriman
		    <glabels-devel2712@bubieyehyeh.me.uk> in
		    Patch #1860423.
	    * AUTHORS:
		    Added acknowledgement for above patch.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@721
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/src/merge-evolution.c

commit 2c6f4ad2ae25e3feb6bec338a727689663479fbf
Author: Jim Evins <evins@snaught.com>
Date:	2008-01-02

    2008-01-01	Jim Evins  <evins@snaught.com>

	    * NEWS:
	    * configure.in:
	    * glabels.spec.in:
		    Reconcile with 2.2 branch.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@719
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/NEWS
M	glabels2/configure.in
M	glabels2/glabels.spec.in

commit 2dc21eca4a51c1e9a96a2ad2b8a308b75b8450a5
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-26

    Prep for 2.2.0 release.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@716
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	web/doc/glabels-2.2.dtd.txt
M	web/doc/index.php
A	web/doc/templates-2.2/glabels-template-cd.png
A	web/doc/templates-2.2/glabels-template-label.png
A	web/doc/templates-2.2/glabels-template-layout.png
A	web/doc/templates-2.2/index.php
M	web/download/index.php
M	web/index.php
M	web/links/index.php
M	web/news/index.php
A	web/screenshots/220-screenshot-main-thumb.png
A	web/screenshots/220-screenshot-main.png
A	web/screenshots/220-screenshot-new-thumb.png
A	web/screenshots/220-screenshot-new.png
A	web/screenshots/220-screenshot-preview-thumb.png
A	web/screenshots/220-screenshot-preview.png
A	web/screenshots/220-screenshot-print-thumb.png
A	web/screenshots/220-screenshot-print.png
M	web/screenshots/index.php

commit 8836dd00ecb2dca5462442a6149872ec84d9efdc
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-22

    2007-12-21	Jim Evins  <evins@snaught.com>

	    * COPYING.LIBGLABELS:
	    * COPYING.README_FIRST:
	    * README:
		    Updating license information to make more complete
		    and understandable.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@711
    f5e0f49d-192f-0410-a22d-a8d8700d0965

R100	glabels2/COPYING.LIBGLABELS	glabels2/COPYING-LIBGLABELS
A	glabels2/COPYING.README_FIRST
M	glabels2/ChangeLog
M	glabels2/README

commit 5375ec7401a13e0749329bc34d912cbffbee2b6f
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-16

    2007-12-16	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Updated version to 2.pre2.
	    * help/C/glabels.xml:
		    Updated documentation.
	    * src/ui-commands.c: (gl_ui_cmd_help_about):
		    Updated copyright string.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@710
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/help/C/glabels.xml
M	glabels2/src/ui-commands.c

commit 63153b839d3534ecd8f8761ffa78963a1b9a3918
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-16

    2007-12-15	Jim Evins  <evins@snaught.com>

	    * data/glade/object-editor.glade:
		    Removed any GtkTable that contained a GtkComboBox
		    because the size of
		    the combo box was not constrained properly.
		    This sacrifices the nice
		    orderly labels for combo boxes that don't extend
		    beyond the edge of the
		    window.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@709
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/object-editor.glade

commit a80d06dfd7b2b2a0ad6fefb8930bf29e0da47bd8
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-15

    2007-12-15	Jim Evins  <evins@snaught.com>

	    * libglabels/db.c: (lgl_db_lookup_template_from_name):
	    * src/object-editor.c: (gl_object_editor_finalize):
	    * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize):
		    Fixed several small memory leaks.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@708
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/db.c
M	glabels2/src/object-editor.c
M	glabels2/src/wdgt-media-select.c

commit 910f142b0201ac95fa7c62bf6d1a658e16093f16
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-15

    2007-12-14	Jim Evins  <evins@snaught.com>

	    * libglabels/db.c:
		    Optimize template search by name by using a
		    GHashTable.
	    * src/mini-preview-pixbuf-cache.c:
	    * src/mini-preview-pixbuf-cache.h:
		    Store one pixbuf per template, but use a key for
		    each alias.
	    * src/wdgt-media-select.c:
		    Optimize loading of tree data, thus optimizing the
		    "new label" dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@707
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/db.c
M	glabels2/src/mini-preview-pixbuf-cache.c
M	glabels2/src/mini-preview-pixbuf-cache.h
M	glabels2/src/wdgt-media-select.c

commit 56efcf961c8dad206f835cb6eaa27621a837e457
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-13

    2007-12-12	Jim Evins  <evins@snaught.com>

	    * data/templates/avery-us-templates.xml:
		    More templates and aliases.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@706
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/templates/avery-us-templates.xml

commit b84fefc66d9297af2c7987605fba5df694273907
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-09

    Updated download links.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@705
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/common_php.inc

commit 2a503f794c163ad0f8d540e205ecdc689d0d59f0
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-09

    Release 2.1.5

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@702
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php
M	web/index.php
M	web/news/index.php

commit 67f66fd47238547b043f41b566b5176a2512a8b1
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-09

    2007-12-08	Jim Evins  <evins@snaught.com>

	    * TODO:
		    More prep for 2.1.5/2.2.0.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@701
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/TODO

commit e40a0e4b96767ad3e127dd5a8698a842faa79013
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-09

    2007-12-08	Jim Evins  <evins@snaught.com>

	    * NEWS:
	    * README:
	    * TODO:
	    * configure.in:
		    Preparation for 2.1.5.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@700
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/NEWS
M	glabels2/README
M	glabels2/TODO
M	glabels2/configure.in

commit 61ce763cb6817e0d22b262d9933a3d5d32cd945f
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-08

    2007-12-08	Jim Evins  <evins@snaught.com>

	    * docs/libglabels/libglabels-decl-list.txt:
	    * docs/libglabels/libglabels-docs.sgml:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/db.sgml:
	    * docs/libglabels/tmpl/str.sgml:
	    * libglabels/str.c:
		    Documentation cleanup for libglabels.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@699
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-docs.sgml
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/db.sgml
A	glabels2/docs/libglabels/tmpl/str.sgml
M	glabels2/libglabels/str.c

commit f5cdac62dc40e5f8d3e2f0d33fe645c098d68f06
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-02

    Fixed capitalization.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@698
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/links/index.php

commit 9e63a7ba6a5af8eeac9bf7a008050c3072f35c9c
Author: Jim Evins <evins@snaught.com>
Date:	2007-12-02

    Added missing title image. Small edits to links and download pages.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@697
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	web/download/index.php
A	web/images/glabels-title-140.png
D	web/images/glabels-title-140.png.good
M	web/links/index.php

commit 7fc2595f019ca9b9e4ddc8bf04173489c42dada8
Author: Jim Evins <evins@snaught.com>
Date:	2007-11-30

    2007-11-29	Jim Evins  <evins@snaught.com>

	    * libglabels/db.h:
	    * libglabels/db.c:
		    Added lgl_db_does_template_name_exist().
		    In lgl_db_lookup_template_from_name() substitute
		    brand/part of new template from
		    requested alias.
	    * src/prefs-model.c:
		    Proof read recent templates -- make sure they
		    still exist.
	    * src/wdgt-media-select.c:
		    Default to "search all templates" tab if no recent
		    templates found.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@696
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/db.c
M	glabels2/libglabels/db.h
M	glabels2/src/prefs-model.c
M	glabels2/src/wdgt-media-select.c

commit 7d3d00e59c9deac3590b2e0cd5b756e66945de9b
Author: Jim Evins <evins@snaught.com>
Date:	2007-11-28

    2007-11-28	Jim Evins  <evins@snaught.com>

	    * data/glade/wdgt-media-select.glade:
	    * src/wdgt-media-select.c:
		    Added tabbed notebook to allow selection of recent
		    template versus searching the
		    entire database.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@695
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/wdgt-media-select.glade
M	glabels2/src/wdgt-media-select.c

commit 5aca44500cc85783f61bd7a572c38645f8513cc0
Author: Jim Evins <evins@snaught.com>
Date:	2007-11-27

    2007-11-26	Jim Evins  <evins@snaught.com>

	    * libglabels/Makefile.am:
	    * libglabels/libglabels.h:
		    Make str.h public.
	    * src/label.c:
	    * src/prefs-dialog.c:
	    * src/prefs-model.c:
	    * src/prefs-model.h:
	    * src/prefs.c:
	    * src/prefs.h:
		    Added tracking of recently used templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@694
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/Makefile.am
M	glabels2/libglabels/libglabels.h
M	glabels2/src/label.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/prefs.c
M	glabels2/src/prefs.h

commit f16056b8177404142111d3355fa5a3b94839b1d8
Author: Jim Evins <evins@snaught.com>
Date:	2007-11-21

    2007-11-20	Jim Evins  <evins@snaught.com>

	    * data/glade/template-designer.glade:
	    * src/template-designer.c:
		    Added warning icon when match brand and part match
		    an existing template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@693
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/template-designer.glade
M	glabels2/src/template-designer.c

commit 58279423cfb4c6fa816d19f7078fdf1e111fbc55
Author: Jim Evins <evins@snaught.com>
Date:	2007-11-19

    2007-11-18	Jim Evins  <evins@snaught.com>

	    * libglabels/Makefile.am:
	    * libglabels/str.h:
	    * libglabels/str.c:
		    Added lgl_str_utf8_casecmp().
	    * libglabels/libglabels-private.h:
		    Use lgl_str_utf8_casecmp() for UTF8_EQUAL macro --
		    do case insensitive comparisons.
	    * libglabels/db.c: (lgl_db_get_brand_list):
		    Use lgl_str_utf8_casecmp() to determine if we have
		    seen brand before when building
		    brand list.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@692
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/Makefile.am
M	glabels2/libglabels/db.c
M	glabels2/libglabels/libglabels-private.h
A	glabels2/libglabels/str.c
C055	glabels2/libglabels/libglabels-private.h
glabels2/libglabels/str.h

commit ac41c67c4089c1303453fee8efe5c5e97acbc1bd
Author: Jim Evins <evins@snaught.com>
Date:	2007-11-19

    2007-11-18	Jim Evins  <evins@snaught.com>

	    * data/glade/template-designer.glade:
	    * src/template-designer.c:
		    Don't advance past name page, if brand and part
		    match an existing template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@691
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/template-designer.glade
M	glabels2/src/template-designer.c

commit 8afdc497ab84d6fb788e9822a15c24320d686fbe
Author: Jim Evins <evins@snaught.com>
Date:	2007-11-18

    2007-11-18	Jim Evins  <evins@snaught.com>

	    * libglabels/db.c: (lgl_db_register_template),
	    (read_templates):
		    When registering a new template, don't add to "User
		    defined" category before
		    writing to file.  Add to "User defined" category
		    when reading from "~/.glabels"
		    directory instead.	This will allow legacy templates
		    (and manually created
		    templates) to be automatically added to the "user
		    defined" category.
	    * libglabels/xml-template.c:
	    (lgl_xml_template_create_template_node):
		    Fixed typo/bug causing brand to be wrong.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@690
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/db.c
M	glabels2/libglabels/xml-template.c

commit ab3ea131f3061e41dd0753167ce5493ecca205ad
Author: Jim Evins <evins@snaught.com>
Date:	2007-11-17

    2007-11-16	Jim Evins  <evins@snaught.com>

	    * libglabels/db.c:
	    * libglabels/db.h:
		    Added return codes to lgl_db_register_template().
		    Added lgl_db_does_template_exist()
		    function.  Automatically create "User defined"
		    category and add to all user
		    registered templates.
	    * libglabels/xml-template.c:
	    * libglabels/xml-template.h:
		    Return number of bytes written from
		    lgl_xml_template_write_templates_to_file() and
		    lgl_xml_template_write_template_to_file().
	    * docs/libglabels/libglabels-decl-list.txt:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/db.sgml:
	    * docs/libglabels/tmpl/xml-template.sgml:
		    Update documentation to reflect above changes.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@689
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/db.sgml
M	glabels2/docs/libglabels/tmpl/xml-template.sgml
M	glabels2/libglabels/db.c
M	glabels2/libglabels/db.h
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml-template.h

commit 1843beacf1f7d4c2954fe21a60d8c95ce8dcec79
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-29

    2007-10-28	Jim Evins  <evins@snaught.com>

	    * libglabels/xml-template.c:
		    Remove any leading white space from part #s when
		    parsing old names.
	    * src/mini-preview-pixbuf-cache.c:
		    If name isn't in cache add it.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@688
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/xml-template.c
M	glabels2/src/mini-preview-pixbuf-cache.c

commit c4087c54cb13e22815a28921fdcc214b0b5c122c
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-27

    2007-10-26	Jim Evins  <evins@snaught.com>

	    * libglabels/Makefile.am:
	    * libglabels/category.c:
	    * libglabels/category.h:
	    * libglabels/db.c:
	    * libglabels/db.h:
	    * libglabels/libglabels-private.h:
	    * libglabels/libglabels.h:
	    * libglabels/paper.c:
	    * libglabels/paper.h:
	    * libglabels/template.c:
	    * libglabels/template.h:
	    * libglabels/xml-template.c:
		    Another pass at screwing with the libglabels API.
		    Moved all
		    database related stuff to db.[ch].
	    * docs/libglabels/libglabels-decl-list.txt:
	    * docs/libglabels/libglabels-docs.sgml:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/category.sgml:
	    * docs/libglabels/tmpl/db.sgml:
	    * docs/libglabels/tmpl/init.sgml:
	    * docs/libglabels/tmpl/libglabels-unused.sgml:
	    * docs/libglabels/tmpl/paper.sgml:
	    * docs/libglabels/tmpl/template-construction.sgml:
	    * docs/libglabels/tmpl/template-db.sgml:
	    * docs/libglabels/tmpl/template-misc.sgml:
	    * docs/libglabels/tmpl/template-struct.sgml:
	    * docs/libglabels/tmpl/template.sgml:
		    Updated documentation to reflect above changes to
		    libglabels API.
	    * src/file.c:
	    * src/glabels-batch.c:
	    * src/glabels.c:
	    * src/mini-preview-pixbuf-cache.c:
	    * src/prefs-model.c:
	    * src/print.c:
	    * src/template-designer.c:
	    * src/wdgt-media-select.c:
	    * src/wdgt-mini-preview.c:
	    * src/wdgt-rotate-label.c:
	    * src/xml-label-04.c:
	    * src/xml-label.c:
		    Reconciled usage with above libglabels API changes.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@687
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-docs.sgml
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/category.sgml
A	glabels2/docs/libglabels/tmpl/db.sgml
D	glabels2/docs/libglabels/tmpl/init.sgml
M	glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
M	glabels2/docs/libglabels/tmpl/paper.sgml
D	glabels2/docs/libglabels/tmpl/template-construction.sgml
D	glabels2/docs/libglabels/tmpl/template-db.sgml
D	glabels2/docs/libglabels/tmpl/template-misc.sgml
R074	glabels2/docs/libglabels/tmpl/template-struct.sgml
glabels2/docs/libglabels/tmpl/template.sgml
M	glabels2/libglabels/Makefile.am
M	glabels2/libglabels/category.c
M	glabels2/libglabels/category.h
A	glabels2/libglabels/db.c
A	glabels2/libglabels/db.h
D	glabels2/libglabels/init.c
D	glabels2/libglabels/init.h
M	glabels2/libglabels/libglabels-private.h
M	glabels2/libglabels/libglabels.h
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/paper.h
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-template.c
M	glabels2/src/file.c
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/mini-preview-pixbuf-cache.c
M	glabels2/src/prefs-model.c
M	glabels2/src/print.c
M	glabels2/src/template-designer.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label.c

commit 4b0f2e892f20e124d2897ac071832b1bc256eb25
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-21

    Removing xv detritus.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@686
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	web/images/.xvpics/button-bg.png
D	web/images/.xvpics/corner-bl-1.png
D	web/images/.xvpics/corner-br-1.png
D	web/images/.xvpics/corner-tl-1.png
D	web/images/.xvpics/corner-tr-1.png
D	web/images/.xvpics/glabels-title-140.png
D	web/images/.xvpics/glabels-title-clean1-140-1.png
D	web/images/.xvpics/pixel-null.png
D	web/screenshots/.xvpics/191-screenshot-main-grid-thumb.png
D	web/screenshots/.xvpics/191-screenshot-main-thumb.png
D	web/screenshots/.xvpics/191-screenshot-new-thumb.png
D	web/screenshots/.xvpics/191-screenshot-print-merge-thumb.png
D	web/screenshots/.xvpics/191-screenshot-print-simple-thumb.png
D	web/screenshots/.xvpics/192screenshot-tumb.png
D	web/screenshots/.xvpics/193-screenshot-main-thumb.png
D	web/screenshots/.xvpics/193-screenshot-new-thumb.png
D	web/screenshots/.xvpics/193-screenshot-preview-thumb.png
D	web/screenshots/.xvpics/193-screenshot-print-thumb.png
D	web/screenshots/.xvpics/glabels-screenshot-1-50%.png
D	web/screenshots/.xvpics/glabels-screenshot-1-640x480.png

commit a84e23b3e38a8c6fc710759cd3cbf74deedec5d7
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-21

    Initial checkin of website.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@685
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	web/common_php.inc
A	web/contact/index.php
A	web/css/glabels.css
A	web/doc/glabels-2.0.dtd.txt
A	web/doc/index.php
A	web/doc/templates-2.0/glabels-template-cd.png
A	web/doc/templates-2.0/glabels-template-label.png
A	web/doc/templates-2.0/glabels-template-layout.png
A	web/doc/templates-2.0/index.php
A	web/download/index.php
A	web/faq/index.php
A	web/faq/q1.3-output.png
A	web/faq/q1.3-screenshot.png
A	web/images/.xvpics/button-bg.png
A	web/images/.xvpics/corner-bl-1.png
A	web/images/.xvpics/corner-br-1.png
A	web/images/.xvpics/corner-tl-1.png
A	web/images/.xvpics/corner-tr-1.png
A	web/images/.xvpics/glabels-title-140.png
A	web/images/.xvpics/glabels-title-clean1-140-1.png
A	web/images/.xvpics/pixel-null.png
A	web/images/button-bg.png
A	web/images/corner-bl.png
A	web/images/corner-br.png
A	web/images/corner-tl.png
A	web/images/corner-tr.png
A	web/images/glabels-title-140.png.good
A	web/images/pixel-null.png
A	web/index.php
A	web/links/index.php
A	web/news/index.php
A	web/screenshots/.xvpics/191-screenshot-main-grid-thumb.png
A	web/screenshots/.xvpics/191-screenshot-main-thumb.png
A	web/screenshots/.xvpics/191-screenshot-new-thumb.png
A	web/screenshots/.xvpics/191-screenshot-print-merge-thumb.png
A	web/screenshots/.xvpics/191-screenshot-print-simple-thumb.png
A	web/screenshots/.xvpics/192screenshot-tumb.png
A	web/screenshots/.xvpics/193-screenshot-main-thumb.png
A	web/screenshots/.xvpics/193-screenshot-new-thumb.png
A	web/screenshots/.xvpics/193-screenshot-preview-thumb.png
A	web/screenshots/.xvpics/193-screenshot-print-thumb.png
A	web/screenshots/.xvpics/glabels-screenshot-1-50%.png
A	web/screenshots/.xvpics/glabels-screenshot-1-640x480.png
A	web/screenshots/191-screenshot-main-grid-thumb.png
A	web/screenshots/191-screenshot-main-grid.png
A	web/screenshots/191-screenshot-main-thumb.png
A	web/screenshots/191-screenshot-main.png
A	web/screenshots/191-screenshot-new-thumb.png
A	web/screenshots/191-screenshot-new.png
A	web/screenshots/191-screenshot-print-merge-thumb.png
A	web/screenshots/191-screenshot-print-merge.png
A	web/screenshots/191-screenshot-print-simple-thumb.png
A	web/screenshots/191-screenshot-print-simple.png
A	web/screenshots/192-screenshot-thumb.png
A	web/screenshots/192-screenshot.png
A	web/screenshots/193-screenshot-main-thumb.png
A	web/screenshots/193-screenshot-main.png
A	web/screenshots/193-screenshot-new-thumb.png
A	web/screenshots/193-screenshot-new.png
A	web/screenshots/193-screenshot-preview-thumb.png
A	web/screenshots/193-screenshot-preview.png
A	web/screenshots/193-screenshot-print-thumb.png
A	web/screenshots/193-screenshot-print.png
A	web/screenshots/glabels1-screenshot-thumb.jpg
A	web/screenshots/glabels1-screenshot.jpg
A	web/screenshots/glabels1-screenshot.png
A	web/screenshots/index.php
A	web/source/glabels-0.1.0.tar.gz
A	web/source/glabels-0.1.1.tar.gz
A	web/source/glabels-0.1.2.tar.gz
A	web/source/glabels-0.1.3.tar.gz
A	web/source/glabels-0.1.4.tar.gz
A	web/source/glabels-0.1.5.tar.gz
A	web/source/glabels-0.2.0.tar.gz
A	web/source/glabels-0.2.1.tar.gz
A	web/source/glabels-0.2.2.tar.gz
A	web/source/glabels-0.2.3.tar.gz
A	web/source/glabels-0.2.4.tar.gz
A	web/source/glabels-0.3.0.tar.gz
A	web/source/glabels-0.3.1.tar.gz
A	web/source/glabels-0.3.2.tar.gz
A	web/source/glabels-0.3.3.tar.gz
A	web/source/glabels-0.3.4.tar.gz
A	web/source/glabels-0.4.0.tar.gz
A	web/source/glabels-0.4.1.tar.gz
A	web/source/glabels-0.4.2.tar.gz
A	web/source/glabels-0.4.3.tar.gz
A	web/source/glabels-0.4.4.tar.gz
A	web/source/glabels-0.4.5.tar.gz
A	web/source/glabels-0.4.6.tar.gz
A	web/source/glabels-1.89.0.tar.gz
A	web/source/glabels-1.89.1.tar.gz
A	web/source/glabels-1.89.2.tar.gz
A	web/source/glabels-1.90.0.tar.gz
A	web/source/glabels-1.91.0.tar.gz
A	web/source/glabels-1.91.1.tar.gz
A	web/source/glabels-1.92.0.tar.gz
A	web/source/glabels-1.92.1.tar.gz
A	web/source/glabels-1.92.2.tar.gz
A	web/source/glabels-1.92.3.tar.gz
A	web/source/glabels-1.93.0.tar.gz
A	web/source/glabels-1.93.1.tar.gz
A	web/source/glabels-1.93.2.tar.gz
A	web/source/glabels-1.93.3.tar.gz
A	web/tango-icons/applications-development.png
A	web/tango-icons/applications-internet.png
A	web/tango-icons/dialog-information.png
A	web/tango-icons/emblem-photos.png
A	web/tango-icons/help-browser.png
A	web/tango-icons/internet-news-reader.png
A	web/tango-icons/package-x-generic.png
A	web/tango-icons/system-users.png

commit 251a5dee819b418665ab35f0438fd86f43ba7335
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-21

    2007-10-21	Jim Evins  <evins@snaught.com>

	    * data/glade/wdgt-media-select.glade:
	    * src/wdgt-media-select.c:
		    Added brand to filter settings.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@684
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/wdgt-media-select.glade
M	glabels2/src/wdgt-media-select.c

commit 387dce347efdd1ca66fb73d6e44c26e1aa6d93e0
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-21

    2007-10-21	Jim Evins  <evins@snaught.com>

	    * data/dtd/glabels-2.2.dtd:
		    Forgot to replace Alias name attribute with brand
		    and part attributes.
	    * data/templates/avery-iso-templates.xml:
	    * data/templates/avery-other-templates.xml:
	    * data/templates/avery-us-templates.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/misc-other-templates.xml:
	    * data/templates/misc-us-templates.xml:
	    * data/templates/zweckform-iso-templates.xml:
		    Replaced all name attributes with brand/part
		    attribute pairs.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@683
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/dtd/glabels-2.2.dtd
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/avery-other-templates.xml
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/misc-other-templates.xml
M	glabels2/data/templates/misc-us-templates.xml
M	glabels2/data/templates/zweckform-iso-templates.xml

commit 2e4ddae04caaf2ab9a5dea48d2c5961aeaf081a7
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-21

    2007-10-20	Jim Evins  <evins@snaught.com>

	    * src/stock-pixmaps/*.png
		    Updated icons to use Tango color palette.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@682
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/stock-pixmaps/stock_align_bottom_16.png
M	glabels2/src/stock-pixmaps/stock_align_hcenter_16.png
M	glabels2/src/stock-pixmaps/stock_align_left_16.png
M	glabels2/src/stock-pixmaps/stock_align_right_16.png
M	glabels2/src/stock-pixmaps/stock_align_top_16.png
M	glabels2/src/stock-pixmaps/stock_align_vcenter_16.png
M	glabels2/src/stock-pixmaps/stock_box_16.png
M	glabels2/src/stock-pixmaps/stock_box_24.png
M	glabels2/src/stock-pixmaps/stock_bucket_fill_16.png
M	glabels2/src/stock-pixmaps/stock_bucket_fill_24.png
M	glabels2/src/stock-pixmaps/stock_ellipse_16.png
M	glabels2/src/stock-pixmaps/stock_ellipse_24.png
M	glabels2/src/stock-pixmaps/stock_image_24.png
M	glabels2/src/stock-pixmaps/stock_merge_16.png
M	glabels2/src/stock-pixmaps/stock_merge_24.png
M	glabels2/src/stock-pixmaps/stock_order_bottom_16.png
M	glabels2/src/stock-pixmaps/stock_order_top_16.png
M	glabels2/src/stock-pixmaps/stock_properties_16.png
M	glabels2/src/stock-pixmaps/stock_properties_24.png

commit a068fff04513122c2b6c7d039aeb9987b19350e2
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-20

    2007-10-20	Jim Evins  <evins@snaught.com>

	    * data/dtd/Makefile.am:
	    * data/dtd/glabels-2.0.dtd:
	    * data/dtd/glabels-2.2.dtd:
		    Rename glabels-2.0.dtd to glabels-2.2.dtd.
		    Added brand and part attributes to
		    template node.
	    * libglabels/template.c:
	    * libglabels/template.h:
	    * libglabels/xml-template.c:
	    * libglabels/xml.h:
		    Added brand and part attributes to template and
		    alias structures and nodes.
	    * src/file.c:
	    * src/label.c:
	    * src/mini-preview-pixbuf-cache.c:
	    * src/template-designer.c:
	    * src/wdgt-media-select.c:
		    Use modified libglabels API.
	    * docs/libglabels/libglabels-decl-list.txt:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/template-construction.sgml:
	    * docs/libglabels/tmpl/template-db.sgml:
	    * docs/libglabels/tmpl/template-struct.sgml:
		    Update libglabels documentation to reflect above
		    modifications.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@681
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/dtd/Makefile.am
R098	glabels2/data/dtd/glabels-2.0.dtd
glabels2/data/dtd/glabels-2.2.dtd
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/template-construction.sgml
M	glabels2/docs/libglabels/tmpl/template-db.sgml
M	glabels2/docs/libglabels/tmpl/template-struct.sgml
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml.h
M	glabels2/src/file.c
M	glabels2/src/label.c
M	glabels2/src/mini-preview-pixbuf-cache.c
M	glabels2/src/template-designer.c
M	glabels2/src/wdgt-media-select.c

commit 830b1c677df8aef20f24fa11c5dfc3591bf068ee
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-15

    2007-10-14	Jim Evins  <evins@snaught.com>

	    * docs/libglabels/libglabels-decl-list.txt:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/category.sgml:
	    * libglabels/category.c:
	    * libglabels/category.h:
		    Added lgl_category_get_id_list() and
		    lgl_category_free_id_list() to have
	    parity with paper functions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@680
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/category.sgml
M	glabels2/libglabels/category.c
M	glabels2/libglabels/category.h

commit 1ec161acb06ebf7440a74f4cf46d927a379980c3
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-13

    2007-10-12	Jim Evins  <evins@snaught.com>

	    * docs/libglabels/libglabels-decl-list.txt:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/category.sgml:
	    * docs/libglabels/tmpl/enums.sgml:
	    * docs/libglabels/tmpl/libglabels-unused.sgml:
	    * docs/libglabels/tmpl/paper.sgml:
	    * docs/libglabels/tmpl/template-struct.sgml:
	    * libglabels/init.c:
	    * libglabels/template.c:
	    * libglabels/template.h:
		    Another pass at fleshing out the libglabels
		    documentation.
	    * src/cairo-label-path.c:
	    * src/cairo-markup-path.c:
	    * src/label.c:
	    * src/mini-preview-pixbuf.c:
	    * src/print-op.c:
	    * src/print.c:
	    * src/view.c:
	    * src/wdgt-media-select.c:
	    * src/wdgt-mini-preview.c:
	    * src/wdgt-print-copies.c:
	    * src/wdgt-print-merge.c:
	    * src/wdgt-rotate-label.c:
		    Removed lgl_template_get_first_frame() from libglabels
		    API and all references.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@679
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/category.sgml
M	glabels2/docs/libglabels/tmpl/enums.sgml
M	glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
M	glabels2/docs/libglabels/tmpl/paper.sgml
M	glabels2/docs/libglabels/tmpl/template-struct.sgml
M	glabels2/libglabels/init.c
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/src/cairo-label-path.c
M	glabels2/src/cairo-markup-path.c
M	glabels2/src/label.c
M	glabels2/src/mini-preview-pixbuf.c
M	glabels2/src/print-op.c
M	glabels2/src/print.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-rotate-label.c

commit 7b4ddd14f3013baa2e305a7d8f724ac5bedea6e1
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-12

    2007-10-11	Jim Evins  <evins@snaught.com>
	    * configure.in:
		    Extended checks for deprecated symbols.
	    * libglabels/template.c:
		    Removed g_strcasecmp references, which are deprecated.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@678
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/libglabels/template.c

commit d04a1b6e0b58d4b4e97836c936a38c1a9c8039e0
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-10

    2007-10-09	Jim Evins  <evins@snaught.com>

	    * src/merge-evolution.c:
		    Create address book if it does not exist.  Also,
		    be more robust about handling
		    error conditions -- don't just assume GError has
		    been set.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@677
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-evolution.c

commit bd566146fa954271ebcb3536251c5c521f0a9e87
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-08

    2007-10-08	Jim Evins  <evins@snaught.com>

	    * libglabels/template.c:
	    * libglabels/xml-template.c:
	    * src/template-designer.c:
		    Missed some symbols with libglabels API work


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@676
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/template.c
M	glabels2/libglabels/xml-template.c
M	glabels2/src/template-designer.c

commit 52befabc0173ee7dcd6e4e662cc60e57c7240c98
Author: Jim Evins <evins@snaught.com>
Date:	2007-10-02

    2007-10-01	Jim Evins  <evins@snaught.com>

	    * docs/libglabels/libglabels-decl-list.txt:
	    * docs/libglabels/libglabels-docs.sgml:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/category.sgml:
	    * docs/libglabels/tmpl/enums.sgml:
	    * docs/libglabels/tmpl/init.sgml:
	    * docs/libglabels/tmpl/libglabels-unused.sgml:
	    * docs/libglabels/tmpl/paper.sgml:
	    * docs/libglabels/tmpl/template-construction.sgml:
	    * docs/libglabels/tmpl/template-db.sgml:
	    * docs/libglabels/tmpl/template-misc.sgml:
	    * docs/libglabels/tmpl/template-struct.sgml:
	    * docs/libglabels/tmpl/template.sgml:
	    * docs/libglabels/tmpl/xml-category.sgml:
	    * docs/libglabels/tmpl/xml-template.sgml:
	    * libglabels/category.h:
	    * libglabels/init.c:
	    * libglabels/libglabels-private.h:
	    * libglabels/paper.h:
	    * libglabels/template.c:
	    * libglabels/template.h:
	    * libglabels/xml-template.h:
		    Basic documentation framework for libglabels updated.
		    This still needs some
		    fleshing out.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@675
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-docs.sgml
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
A	glabels2/docs/libglabels/tmpl/category.sgml
M	glabels2/docs/libglabels/tmpl/enums.sgml
M	glabels2/docs/libglabels/tmpl/init.sgml
M	glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
M	glabels2/docs/libglabels/tmpl/paper.sgml
A	glabels2/docs/libglabels/tmpl/template-construction.sgml
A	glabels2/docs/libglabels/tmpl/template-db.sgml
C050	glabels2/docs/libglabels/tmpl/init.sgml
glabels2/docs/libglabels/tmpl/template-misc.sgml
A	glabels2/docs/libglabels/tmpl/template-struct.sgml
D	glabels2/docs/libglabels/tmpl/template.sgml
A	glabels2/docs/libglabels/tmpl/xml-category.sgml
M	glabels2/docs/libglabels/tmpl/xml-template.sgml
M	glabels2/libglabels/category.h
M	glabels2/libglabels/init.c
M	glabels2/libglabels/libglabels-private.h
M	glabels2/libglabels/paper.h
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-template.h

commit c1dd8eca6b4bdb77ba47a74b0bc760cb90ecbf7a
Author: Jim Evins <evins@snaught.com>
Date:	2007-09-27

    2007-09-27	Jim Evins  <evins@snaught.com>

	    * docs/libglabels/libglabels-decl-list.txt:
	    * docs/libglabels/libglabels-docs.sgml:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/enums.sgml:
	    * docs/libglabels/tmpl/init.sgml:
	    * docs/libglabels/tmpl/libglabels-unused.sgml:
	    * docs/libglabels/tmpl/paper.sgml:
	    * docs/libglabels/tmpl/template.sgml:
	    * docs/libglabels/tmpl/xml-paper.sgml:
	    * docs/libglabels/tmpl/xml-template.sgml:
	    * docs/libglabels/tmpl/xml.sgml:
	    * libglabels/Makefile.am:
	    * libglabels/category.c:
	    * libglabels/category.h:
	    * libglabels/enums.h:
	    * libglabels/init.c:
	    * libglabels/init.h:
	    * libglabels/libglabels-private.h:
	    * libglabels/libglabels.h:
	    * libglabels/paper.c:
	    * libglabels/paper.h:
	    * libglabels/template.c:
	    * libglabels/template.h:
	    * libglabels/xml-category.c:
	    * libglabels/xml-category.h:
	    * libglabels/xml-paper.c:
	    * libglabels/xml-paper.h:
	    * libglabels/xml-template.c:
	    * libglabels/xml-template.h:
	    * libglabels/xml.c:
	    * libglabels/xml.h:
	    * src/cairo-label-path.c:
	    * src/cairo-label-path.h:
	    * src/cairo-markup-path.c:
	    * src/cairo-markup-path.h:
	    * src/file.c:
	    * src/glabels-batch.c:
	    * src/glabels.c:
	    * src/label-object.c:
	    * src/label.c:
	    * src/label.h:
	    * src/mini-preview-pixbuf-cache.c:
	    * src/mini-preview-pixbuf.c:
	    * src/mini-preview-pixbuf.h:
	    * src/prefs-dialog.c:
	    * src/prefs-model.c:
	    * src/prefs-model.h:
	    * src/prefs.c:
	    * src/prefs.h:
	    * src/print-op.c:
	    * src/print.c:
	    * src/template-designer.c:
	    * src/view-barcode.c:
	    * src/view-box.c:
	    * src/view-ellipse.c:
	    * src/view-image.c:
	    * src/view-line.c:
	    * src/view.c:
	    * src/wdgt-media-select.c:
	    * src/wdgt-mini-preview.c:
	    * src/wdgt-mini-preview.h:
	    * src/wdgt-print-copies.c:
	    * src/wdgt-print-merge.c:
	    * src/wdgt-rotate-label.c:
	    * src/xml-label-04.c:
	    * src/xml-label.c:
		    Major cleanup of libglabels API -- this breaks API
		    compatibility with older
		    development and stable versions -- as far as I know,
		    there are currently
		    no external users of this library yet.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@674
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-docs.sgml
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/enums.sgml
A	glabels2/docs/libglabels/tmpl/init.sgml
M	glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
M	glabels2/docs/libglabels/tmpl/paper.sgml
M	glabels2/docs/libglabels/tmpl/template.sgml
M	glabels2/docs/libglabels/tmpl/xml-paper.sgml
M	glabels2/docs/libglabels/tmpl/xml-template.sgml
M	glabels2/docs/libglabels/tmpl/xml.sgml
M	glabels2/libglabels/Makefile.am
M	glabels2/libglabels/category.c
M	glabels2/libglabels/category.h
M	glabels2/libglabels/enums.h
A	glabels2/libglabels/init.c
C066	glabels2/libglabels/libglabels.h	glabels2/libglabels/init.h
M	glabels2/libglabels/libglabels-private.h
M	glabels2/libglabels/libglabels.h
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/paper.h
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-category.c
M	glabels2/libglabels/xml-category.h
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-paper.h
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml-template.h
M	glabels2/libglabels/xml.c
M	glabels2/libglabels/xml.h
M	glabels2/src/cairo-label-path.c
M	glabels2/src/cairo-label-path.h
M	glabels2/src/cairo-markup-path.c
M	glabels2/src/cairo-markup-path.h
M	glabels2/src/file.c
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/label-object.c
M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/mini-preview-pixbuf-cache.c
M	glabels2/src/mini-preview-pixbuf.c
M	glabels2/src/mini-preview-pixbuf.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/prefs.c
M	glabels2/src/prefs.h
M	glabels2/src/print-op.c
M	glabels2/src/print.c
M	glabels2/src/template-designer.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label.c

commit be11ca532e497806c00fa59c084b0710668226f8
Author: Jim Evins <evins@snaught.com>
Date:	2007-09-15

    2007-09-14	Jim Evins  <evins@snaught.com>

	    * src/marshal.list:
	    * src/label.c:
	    * src/label.h:
	    * src/label-object.c:
	    * src/label-object.h:
	    * src/label-barcode.c:
	    * src/label-ellipse.c:
	    * src/view.c:
	    * src/view-object.c:
	    * src/view-barcode.c:
	    * src/view-box.c:
	    * src/view-ellipse.c:
	    * src/view-image.c:
	    * src/view-line.c:
	    * src/view-text.c:
		    Better separation of model from view.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@673
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-barcode.c
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/marshal.list
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-object.c
M	glabels2/src/view-text.c
M	glabels2/src/view.c

commit 9fe68ac1e34bd2d8067d7ba1b11d199d789e6c43
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-22

    2007-08-21	Jim Evins  <evins@snaught.com>

	    * src/print-op.c: (create_custom_widget_cb):
		    Fix problem with force_outline_flag -- don't override
		    with default.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@672
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print-op.c

commit eadd088d7026e249e02e8e72aadc5e24ef2d6669
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-22

    2007-08-21	Jim Evins  <evins@snaught.com>

	    * data/dtd/glabels-2.0.dtd:
	    * libglabels/template.c:
	    * libglabels/template.h:
	    * libglabels/xml-template.c:
	    * src/cairo-markup-path.c:
		    Added "Markup-rect" element to template format.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@671
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/dtd/glabels-2.0.dtd
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-template.c
M	glabels2/src/cairo-markup-path.c

commit f4b0642bf5404f4000d1a5931e24343fc3c39a53
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-22

    2007-08-21	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Changed version to 2.1.pre5svn.
	    * src/view.c: (draw_markup_layer):
		    Do a stroke for each markup path, otherwise multiple
		    markups
		    get connected.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@670
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/src/view.c

commit 0add4c0381f437d2ddd4ea70b4af9e496f36fb3f
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-18

    2007-08-17	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Bump libglabels revision numbers for 2.1.4 release.



    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@667
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in

commit c37dbc205f6a08254456ca5e6eabf5ddda0c2e85
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-17

    2007-08-16	Jim Evins  <evins@snaught.com>

	    * Makefile.am:
		    Include subdir iec16022-0.2.1.
	    * NEWS:
	    * configure.in:
	    * glabels.spec.in:
		    Preparation for 2.1.4.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@666
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/Makefile.am
M	glabels2/NEWS
M	glabels2/configure.in
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/enums.sgml
M	glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
M	glabels2/docs/libglabels/tmpl/libglabels.sgml
M	glabels2/docs/libglabels/tmpl/paper.sgml
M	glabels2/docs/libglabels/tmpl/template.sgml
M	glabels2/docs/libglabels/tmpl/xml-paper.sgml
M	glabels2/docs/libglabels/tmpl/xml-template.sgml
M	glabels2/docs/libglabels/tmpl/xml.sgml
M	glabels2/glabels.spec.in

commit 23849ca81b5519a810303a58f5fc9c1786f8183c
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-11

    2007-08-11	Jim Evins  <evins@snaught.com>

	    * po/POTFILES.in:
		    Updated file list.
	    * configure.in:
	    * po/eo.po:
		    Added Esperanto translation.  Provided by Antonio C.
		    Codazzi "la Filozofo" <f_sophia@libero.it>.
	    * po/fr.po:
		    Updated French translation. Provided by Claude Paroz
		    <claude@2xlibre.net>.
	    * AUTHORS:
		    Updated to reflect above translations.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@665
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/po/POTFILES.in
A	glabels2/po/eo.po
M	glabels2/po/fr.po

commit 41fd335f6a64f47c220865ce5e4ea993f3aed19f
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-11

    2007-08-11	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * data/templates/avery-iso-templates.xml:
	    * data/templates/avery-us-templates.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/misc-other-templates.xml:
	    * data/templates/misc-us-templates.xml:
	    * data/templates/zweckform-iso-templates.xml:
		    Caught up with backlog of template submissions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@664
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/misc-other-templates.xml
M	glabels2/data/templates/misc-us-templates.xml
M	glabels2/data/templates/zweckform-iso-templates.xml

commit 4d42d2cdb0267a4a7a702ddea96ad03afe5774ce
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-11

    2007-08-10	Jim Evins  <evins@snaught.com>

	    * src/bc-postnet.c: (gl_barcode_postnet_new):
	    * src/bc.c:
		    Added support for Brazilian CEPNet barcodes.  This is
		    simply an
		    instance of the US POSTNET format with 8 digits.
		    Patch supplied
		    by Mário Meyer in bug # 1768792.
	    * AUTHORS:
		    Updated acknowledgments to reflect above patch and
		    recent shuffling
		    of underlying technology.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@663
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc.c

commit c6ae0e48ca2e5c3675d863a3f0ff82c54b952400
Author: Jim Evins <evins@snaught.com>
Date:	2007-08-10

    Some updates to TODO.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@662
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/TODO

commit 71660d95ad493fc253582ef351fdffe5a143ed99
Author: Jim Evins <evins@snaught.com>
Date:	2007-05-13

    2007-05-13	Jim Evins  <evins@snaught.com>

	    * src/merge-text.c: (parse_line), (parse_field):
		    Remove leading and trailing spaces from CSV fields,
		    unless quoted.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@661
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-text.c

commit 76cb751459575fbd6a6ccfbd26aac9cb28bcb974
Author: Jim Evins <evins@snaught.com>
Date:	2007-05-10

    2007-05-09	Jim Evins  <evins@snaught.com>

	    * src/object-editor-bc-page.c:
	    * src/object-editor-data-page.c:
	    * src/object-editor-fill-page.c:
	    * src/object-editor-image-page.c:
	    * src/object-editor-line-page.c:
	    * src/object-editor-lsize-page.c:
	    * src/object-editor-position-page.c:
	    * src/object-editor-private.h:
	    * src/object-editor-shadow-page.c:
	    * src/object-editor-size-page.c:
	    * src/object-editor-text-page.c:
	    * src/object-editor.c:
	    * src/prefs-dialog.c:
	    * src/template-designer.c:
	    * src/ui-property-bar.c:
	    * src/wdgt-media-select.c:
		    Replaced signal block/unblock pairs with simple flags.
		    This reduces
		    some code clutter, hopefully making it easier to read.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@660
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/template-designer.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/wdgt-media-select.c

commit 63c94320e22a52c443f063092dee5256042eff52
Author: Jim Evins <evins@snaught.com>
Date:	2007-05-05

    2007-05-05	Jim Evins  <evins@snaught.com>

	    * src/template-designer.c: (apply_cb):
		    Add new template to mini-preview pixbuf cache.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@659
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/template-designer.c

commit 0e067c75fb73a72914d789d2922a3828523c11a8
Author: Jim Evins <evins@snaught.com>
Date:	2007-05-03

    2007-05-03	Jim Evins  <evins@snaught.com>

	    * src/label-image.c: (gl_label_image_init), (draw_object):
		    Scale default pixbuf up, to prevent bluring.
		    Use cairo_fill to
		    render image.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@658
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-image.c

commit d82e7fed684814b37b3306114b66faaaa2336a1b
Author: Jim Evins <evins@snaught.com>
Date:	2007-05-03

    2007-05-02	Jim Evins  <evins@snaught.com>

	    * src/view.c: (draw_select_region_layer),
	    (motion_notify_event_cb),
	    (button_release_event_cb):
		    Removed attempt at rendering optimization by clipping
		    the updates
		    to areas affected -- this actually seemed to hurt
		    update performance.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@657
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/view.c

commit 6c00fe9f6e32f702f5887d6145f8b88e2e09de3d
Author: Jim Evins <evins@snaught.com>
Date:	2007-05-01

    2007-04-30	Jim Evins  <evins@snaught.com>

	    * src/color.h:
	    * src/color.c: (gl_color_shadow), (gl_color_node_new_default),
	    (gl_color_node_equal), (gl_color_node_expand):
	    * src/label-barcode.c: (draw_object):
	    * src/label-box.c: (draw_object), (draw_shadow):
	    * src/label-ellipse.c: (draw_object), (draw_shadow):
	    * src/label-line.c: (draw_object), (draw_shadow):
	    * src/label-text.c: (draw_object), (draw_shadow):
	    * src/wdgt-mini-preview.c: (draw_shadow), (draw_labels):
	    * src/wdgt-rotate-label.c: (drawingarea_update):
		    Some cleanup to color related code.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@656
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/color.c
M	glabels2/src/color.h
M	glabels2/src/label-barcode.c
M	glabels2/src/label-box.c
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-line.c
M	glabels2/src/label-text.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-rotate-label.c

commit 4ca379add847194fa1375fe127e9800367f655e1
Author: Jim Evins <evins@snaught.com>
Date:	2007-05-01

    2007-04-30	Jim Evins  <evins@snaught.com>

	    * src/label.h:
		    Added glLabelRegion structure type.
	    * src/label-object.c: (gl_label_object_get_extent):
	    * src/label-object.h:
		    Modified gl_label_object_get_extent() to fill in a
		    glLabelRegion struct.
	    * src/view.h:
	    * src/view.c: (gl_view_update_region),
	    (draw_select_region_layer),
	    (gl_view_select_region), (gl_view_align_selection_left),
	    (gl_view_align_selection_right),
	    (gl_view_align_selection_hcenter),
	    (gl_view_align_selection_top),
	    (gl_view_align_selection_bottom),
	    (gl_view_align_selection_vcenter),
	    (gl_view_center_selection_horiz),
	    (gl_view_center_selection_vert),
	    (gl_view_move_selection), (gl_view_can_selection_text),
	    (motion_notify_event_cb), (button_press_event_cb),
	    (button_release_event_cb):
		    - Reconcile with new gl_label_object_get_extent() API.
		    - Use glLabelRegion for view->select_region.
		    - Added gl_view_update_region() to clip updates
		    to region.
		    - Use gl_view_update_region() during manipulation
		    of view->select_region.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@655
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label.h
M	glabels2/src/view.c
M	glabels2/src/view.h

commit b6893fe7ca71c477320ba676d3805e8561d393ad
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-27

    2007-04-26	Jim Evins  <evins@snaught.com>

	    * src/mini-preview-pixbuf.c: (draw_paper),
	    (draw_label_outlines),
	    (draw_label_outline):
	    * src/print.c: (print_crop_marks), (draw_outline):
	    * src/view-object.c: (gl_view_object_draw_handles):
	    * src/view.c: (draw_bg_layer), (draw_grid_layer),
	    (draw_markup_layer), (draw_fg_layer),
	    (draw_select_region_layer):
	    * src/wdgt-mini-preview.c: (draw_paper), (draw_labels):
	    * src/wdgt-rotate-label.c: (drawingarea_update):
		    Added defines for various magic numbers.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@654
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/mini-preview-pixbuf.c
M	glabels2/src/print.c
M	glabels2/src/view-object.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-rotate-label.c

commit 9f454a0a6e7c34a33cbe829be4cfd5374a4cde9a
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-26

    2007-04-25	Jim Evins  <evins@snaught.com>

	    * src/label-text.c: (get_size), (draw_object), (draw_shadow):
		    Scale text down.  Cairo seems to render text too
		    large.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@653
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-text.c

commit 06ddcbb495e31a450b36bd7a90b7760d5ca9553a
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-25

    2007-04-25	Jim Evins  <evins@snaught.com>

	    * src/view.h:
	    * src/view.c: (gl_view_update), (expose_cb),
	    (motion_notify_event_cb), (button_press_event_cb),
	    (button_release_event_cb):
		    - Try not to let updates get backed up.
		    - Grab pointer when doing any drag operations.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@652
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/view.c
M	glabels2/src/view.h

commit 50418d4af1223ea832c83b09ac0e67027f97fd78
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-12

    2007-04-11	Jim Evins  <evins@snaught.com>

	    * src/cairo-label-path.c: (gl_cairo_label_path),
	    (gl_cairo_rect_label_path), (gl_cairo_round_label_path),
	    (gl_cairo_cd_label_path):
	    * src/cairo-label-path.h:
	    * src/mini-preview-pixbuf.c: (draw_paper),
	    (draw_label_outlines),
	    (draw_label_outline):
	    * src/print.c: (draw_outline), (clip_to_outline):
	    * src/view.c: (draw_bg_layer), (draw_fg_layer):
	    * src/wdgt-mini-preview.c: (draw_labels):
	    * src/wdgt-rotate-label.c: (drawingarea_update):
		    Modified to universally use gl_cairo_label_path()
		    to create paths
		    for labels.  Added shadow to mini preview in rotate
		    widget.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@651
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/cairo-label-path.c
M	glabels2/src/cairo-label-path.h
M	glabels2/src/mini-preview-pixbuf.c
M	glabels2/src/print.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-rotate-label.c

commit 964caeca001e6f6b7c26d5beb6dc5cc34b7debba
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-10

    2007-04-10	Jim Evins  <evins@snaught.com>

	    * libglabels/template.h:
	    * libglabels/template.c: (gl_template_get_name_list_unique),
	    (gl_template_get_name_list_all), (gl_template_from_name):
		    Modified libglabels to allow you to get a list of
		    all template names
		    including all aliases or just a list of primary
		    names of each unique
		    template.
	    * src/Makefile.am:
	    * src/file.c: (gl_file_properties):
	    * src/glabels.c: (main):
	    * src/mini-preview-pixbuf-cache.h:
	    * src/mini-preview-pixbuf-cache.c:
	    * src/wdgt-media-select.c: (gl_wdgt_media_select_construct),
	    (filter_changed_cb), (load_list):
		    Added mini-preview pixbuf cache, so that only one
		    mini-preview is
		    needed for a unique template and gets reused for
		    all aliases.  These
		    pixbufs will also live for the life of the program
		    so they are not
		    rebuilt everytime a new label dialog is invoked.
	    * src/mini-preview-pixbuf.c: (draw_paper),
	    (draw_rect_label_outline), (draw_round_label_outline),
	    (draw_cd_label_outline):
		    Removed some comment artifacts.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@650
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/src/Makefile.am
M	glabels2/src/file.c
M	glabels2/src/glabels.c
A	glabels2/src/mini-preview-pixbuf-cache.c
A	glabels2/src/mini-preview-pixbuf-cache.h
M	glabels2/src/mini-preview-pixbuf.c
M	glabels2/src/wdgt-media-select.c

commit b84b6dc42d8058bf402d94381a1c04f000b1eaa5
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-05

    2007-04-04	Jim Evins  <evins@snaught.com>

	    * src/mini-preview-pixbuf.c: (gl_mini_preview_pixbuf_new),
	    (draw_paper), (draw_label_outlines),
	    (draw_rect_label_outline),
	    (draw_round_label_outline), (draw_cd_label_outline):
	    * src/wdgt-media-select.c: (load_list):
	    * src/wdgt-rotate-label.c: (draw_cd_label_outline):
		    Cosmetic enhancments to mini previews.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@649
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/mini-preview-pixbuf.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-rotate-label.c

commit 1be928597fdd42d641cc0a04d772e82254e54483
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-05

    2007-04-04	Jim Evins  <evins@snaught.com>

	    * src/ui-property-bar.c: (gl_ui_property_bar_finalize),
	    (gl_ui_property_bar_construct):
		    Save copy of GladeXML tree so that we don't lose
		    tooltips.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@648
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/ui-property-bar.c

commit 9b65ed5d46a7f5dc3c4e8f2aedc0e770d98652a1
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-03

    2007-04-02	Jim Evins  <evins@snaught.com>

	    * src/merge-properties-dialog.c:
	    * src/new-label-dialog.c:
	    * src/object-editor.c:
	    * src/prefs-dialog.c:
	    * src/print-op.c:
	    * src/template-designer.c:
	    * src/ui-property-bar.c:
	    * src/wdgt-media-select.c:
	    * src/wdgt-rotate-label.c:
		    Fixed several memory leaks.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@647
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/new-label-dialog.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/print-op.c
M	glabels2/src/template-designer.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-rotate-label.c

commit 9ee204c455957fe69435d198bfe5dea1a76c4dcf
Author: Jim Evins <evins@snaught.com>
Date:	2007-04-02

    2007-04-01	Jim Evins  <evins@snaught.com>

	    * src/label-text.c: (gl_label_text_init), (copy),
	    (gl_label_text_set_lines), (buffer_changed_cb), (get_size),
	    (set_font_family), (set_font_size), (set_font_weight),
	    (set_font_italic_flag), (set_text_alignment),
	    (set_text_line_spacing):
		    Cache object size, so that expensive extent
		    calculations are only done
		    when needed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@646
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-text.c

commit f1f7eedc35c3d9b79d20df87a3bd9fa04d5f4801
Author: Jim Evins <evins@snaught.com>
Date:	2007-03-31

    2007-03-30	Jim Evins  <evins@snaught.com>

	    * src/prefs-model.c: (gl_prefs_model_load_settings):
		    Default to an unlimited list of recent documents,
		    since this parameter
		    seems to be pre-filter anyway.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@645
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/prefs-model.c

commit 2bc6be422a9c43e13323282eac6561a1dc0a040a
Author: Jim Evins <evins@snaught.com>
Date:	2007-03-31

    2007-03-30	Jim Evins  <evins@snaught.com>

	    * src/label-box.c: (draw_shadow):
	    * src/label-ellipse.c: (draw_shadow):
		    Added missing shadow fill.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@644
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-box.c
M	glabels2/src/label-ellipse.c

commit 509bffa75a8b51d08dfd2103c309492c73572fa1
Author: Jim Evins <evins@snaught.com>
Date:	2007-03-29

    2007-03-28	Jim Evins  <evins@snaught.com>

	    * src/ui-commands.c: (gl_ui_cmd_file_print):
		    Unreferencing the print operation sometimes crashes.
		    Just don't do it
		    right now.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@643
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/ui-commands.c

commit 98764f06e25c92bfbd923aaa2b0733ac5a98b888
Author: Jim Evins <evins@snaught.com>
Date:	2007-03-29

    2007-03-28	Jim Evins  <evins@snaught.com>

	    * src/print-op.c: (gl_print_op_construct),
	    (gl_print_op_get_settings), (gl_print_op_set_settings),
	    (gl_print_op_free_settings), (create_custom_widget_cb):
	    * src/print-op.h:
	    * src/ui-commands.c: (gl_ui_cmd_file_print):
	    * src/window.c: (gl_window_init):
	    * src/window.h:
		    Save print settings and custom settings between
		    print operations
		    on the same window.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@642
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print-op.c
M	glabels2/src/print-op.h
M	glabels2/src/ui-commands.c
M	glabels2/src/window.c
M	glabels2/src/window.h

commit a25478bf5ee5750eace1a8e62017dac72ecf908d
Author: Jim Evins <evins@snaught.com>
Date:	2007-03-25

    2007-03-24	Jim Evins  <evins@snaught.com>

	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page),
	    (gl_object_editor_set_image), (img_selection_changed_cb):
		    Workaround for GtkFileChooserButton bug # 327243.
		    This the root
		    cause for gLabels bug # 1192884.  I have actually
		    observed 3 delayed
		    "selection-changed" signals -- the first 2 return
		    NULL -- this is
		    what caused the image to reset to the default followed
		    by setting
		    it back to the original image, trying to fit it into
		    a new bounding
		    box.  This sequence of events is much more evident
		    with the new
		    cairo rendering.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@641
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/object-editor-image-page.c

commit 80da57dd539f5b6d5118703b7b005740561b645a
Author: Jim Evins <evins@snaught.com>
Date:	2007-03-24

    2007-03-23	Jim Evins  <evins@snaught.com>

	    Merged all changes from experimental cairo branch to trunk.
	    Trunk no longer depends on libgnomecanvas or
	    libgnomeprint[ui].


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@639
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/src/Makefile.am
M	glabels2/src/base64.c
M	glabels2/src/bc-iec16022.c
A	glabels2/src/cairo-ellipse-path.c
C070	glabels2/src/xml-label-191.h	glabels2/src/cairo-ellipse-path.h
A	glabels2/src/cairo-label-path.c
C069	glabels2/src/xml-label-191.h	glabels2/src/cairo-label-path.h
A	glabels2/src/cairo-markup-path.c
R067	glabels2/src/xml-label-191.h	glabels2/src/cairo-markup-path.h
D	glabels2/src/canvas-hacktext.c
D	glabels2/src/canvas-hacktext.h
M	glabels2/src/color.c
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/file.c
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/label-barcode.c
M	glabels2/src/label-box.c
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-image.c
M	glabels2/src/label-line.c
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge.c
M	glabels2/src/new-label-dialog.c
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/pixbuf-cache.c
M	glabels2/src/print-op.c
M	glabels2/src/print.c
M	glabels2/src/recent.c
M	glabels2/src/stock.c
M	glabels2/src/template-designer.c
M	glabels2/src/text-node.c
M	glabels2/src/ui-commands.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-barcode.h
M	glabels2/src/view-box.c
M	glabels2/src/view-box.h
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-ellipse.h
D	glabels2/src/view-highlight.c
D	glabels2/src/view-highlight.h
M	glabels2/src/view-image.c
M	glabels2/src/view-image.h
M	glabels2/src/view-line.c
M	glabels2/src/view-line.h
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c
M	glabels2/src/view-text.h
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/window.c
M	glabels2/src/xml-label-04.c
D	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit d105b1574ae720348f30ca814fb494e4d44fd344
Author: Jim Evins <evins@snaught.com>
Date:	2007-02-18

    2007-02-18	Jim Evins  <evins@snaught.com>

	    * src/bc.h:
		    GNOME_FONT_BOOK changed to PANGO_WEIGHT_NORMAL.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@615
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/bc.h

commit 70d3926fcf186c46f553e1ea58a1072a9ab4c68f
Author: Jim Evins <evins@snaught.com>
Date:	2007-02-14

    2007-02-14	Jim Evins  <evins@snaught.com>

	    * src/base64.c:
	    * src/base64.h:
	    * src/bc-gnubarcode.c:
	    * src/bc-gnubarcode.h:
	    * src/bc-postnet.c:
	    * src/bc-postnet.h:
	    * src/bc.c:
	    * src/bc.h:
	    * src/canvas-hacktext.c:
	    * src/canvas-hacktext.h:
	    * src/debug.c:
	    * src/debug.h:
	    * src/file.c:
	    * src/file.h:
	    * src/glabels.c:
	    * src/hig.h:
	    * src/label-barcode.c:
	    * src/label-barcode.h:
	    * src/label-box.c:
	    * src/label-box.h:
	    * src/label-ellipse.c:
	    * src/label-ellipse.h:
	    * src/label-image.c:
	    * src/label-image.h:
	    * src/label-line.c:
	    * src/label-line.h:
	    * src/label-object.c:
	    * src/label-object.h:
	    * src/label-text.c:
	    * src/label-text.h:
	    * src/label.c:
	    * src/label.h:
	    * src/merge-evolution.c:
	    * src/merge-evolution.h:
	    * src/merge-init.c:
	    * src/merge-init.h:
	    * src/merge-properties-dialog.c:
	    * src/merge-properties-dialog.h:
	    * src/merge-text.c:
	    * src/merge-text.h:
	    * src/merge-vcard.c:
	    * src/merge-vcard.h:
	    * src/merge.c:
	    * src/merge.h:
	    * src/mini-preview-pixbuf.h:
	    * src/new-label-dialog.c:
	    * src/new-label-dialog.h:
	    * src/object-editor-bc-page.c:
	    * src/object-editor-data-page.c:
	    * src/object-editor-edit-page.c:
	    * src/object-editor-fill-page.c:
	    * src/object-editor-image-page.c:
	    * src/object-editor-line-page.c:
	    * src/object-editor-lsize-page.c:
	    * src/object-editor-position-page.c:
	    * src/object-editor-private.h:
	    * src/object-editor-size-page.c:
	    * src/object-editor-text-page.c:
	    * src/object-editor.c:
	    * src/object-editor.h:
	    * src/pixbuf-cache.c:
	    * src/pixbuf-cache.h:
	    * src/prefs-dialog.c:
	    * src/prefs-dialog.h:
	    * src/prefs-model.c:
	    * src/prefs-model.h:
	    * src/prefs.c:
	    * src/prefs.h:
	    * src/print-op.c:
	    * src/stock.c:
	    * src/stock.h:
	    * src/template-designer.c:
	    * src/text-node.c:
	    * src/text-node.h:
	    * src/ui-commands.c:
	    * src/ui-commands.h:
	    * src/ui-property-bar.c:
	    * src/ui-property-bar.h:
	    * src/ui-sidebar.c:
	    * src/ui-sidebar.h:
	    * src/ui-util.c:
	    * src/ui-util.h:
	    * src/ui.c:
	    * src/ui.h:
	    * src/util.c:
	    * src/util.h:
	    * src/view-barcode.c:
	    * src/view-barcode.h:
	    * src/view-box.c:
	    * src/view-box.h:
	    * src/view-ellipse.c:
	    * src/view-ellipse.h:
	    * src/view-highlight.c:
	    * src/view-highlight.h:
	    * src/view-image.c:
	    * src/view-image.h:
	    * src/view-line.c:
	    * src/view-line.h:
	    * src/view-object.c:
	    * src/view-object.h:
	    * src/view-text.c:
	    * src/view-text.h:
	    * src/view.c:
	    * src/view.h:
	    * src/wdgt-chain-button.c:
	    * src/wdgt-chain-button.h:
	    * src/wdgt-media-select.c:
	    * src/wdgt-mini-preview.c:
	    * src/wdgt-print-copies.c:
	    * src/wdgt-print-copies.h:
	    * src/wdgt-print-merge.c:
	    * src/wdgt-print-merge.h:
	    * src/wdgt-rotate-label.c:
	    * src/window.h:
	    * src/xml-label-04.c:
	    * src/xml-label-04.h:
	    * src/xml-label-191.c:
	    * src/xml-label-191.h:
	    * src/xml-label.c:
	    * src/xml-label.h:

	    Assorted superficial cleanup.  Including:
	    - Use G_DEFINE_TYPE for all objects.
	    - Reconcile style of all class initializer functions
	    - Reconcile style of all finalize functions
	    - Add emacs mode line to all source files


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@614
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/base64.c
M	glabels2/src/base64.h
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-gnubarcode.h
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc-postnet.h
M	glabels2/src/bc.c
M	glabels2/src/bc.h
M	glabels2/src/canvas-hacktext.c
M	glabels2/src/canvas-hacktext.h
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/file.c
M	glabels2/src/file.h
M	glabels2/src/glabels.c
M	glabels2/src/hig.h
M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/label-box.c
M	glabels2/src/label-box.h
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-ellipse.h
M	glabels2/src/label-image.c
M	glabels2/src/label-image.h
M	glabels2/src/label-line.c
M	glabels2/src/label-line.h
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/merge-evolution.c
M	glabels2/src/merge-evolution.h
M	glabels2/src/merge-init.c
M	glabels2/src/merge-init.h
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge-properties-dialog.h
M	glabels2/src/merge-text.c
M	glabels2/src/merge-text.h
M	glabels2/src/merge-vcard.c
M	glabels2/src/merge-vcard.h
M	glabels2/src/merge.c
M	glabels2/src/merge.h
M	glabels2/src/mini-preview-pixbuf.h
M	glabels2/src/new-label-dialog.c
M	glabels2/src/new-label-dialog.h
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.h
M	glabels2/src/pixbuf-cache.c
M	glabels2/src/pixbuf-cache.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-dialog.h
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/prefs.c
M	glabels2/src/prefs.h
M	glabels2/src/print-op.c
M	glabels2/src/stock.c
M	glabels2/src/stock.h
M	glabels2/src/template-designer.c
M	glabels2/src/text-node.c
M	glabels2/src/text-node.h
M	glabels2/src/ui-commands.c
M	glabels2/src/ui-commands.h
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-property-bar.h
M	glabels2/src/ui-sidebar.c
M	glabels2/src/ui-sidebar.h
M	glabels2/src/ui-util.c
M	glabels2/src/ui-util.h
M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/util.c
M	glabels2/src/util.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-barcode.h
M	glabels2/src/view-box.c
M	glabels2/src/view-box.h
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-ellipse.h
M	glabels2/src/view-highlight.c
M	glabels2/src/view-highlight.h
M	glabels2/src/view-image.c
M	glabels2/src/view-image.h
M	glabels2/src/view-line.c
M	glabels2/src/view-line.h
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c
M	glabels2/src/view-text.h
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/wdgt-chain-button.c
M	glabels2/src/wdgt-chain-button.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-copies.h
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-print-merge.h
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/window.c
M	glabels2/src/window.h
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-04.h
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label-191.h
M	glabels2/src/xml-label.c
M	glabels2/src/xml-label.h

commit 665381a70f6353b094d0b1a1c4307b70a6e2b1be
Author: Jim Evins <evins@snaught.com>
Date:	2007-02-07

    2007-02-06	Jim Evins  <evins@snaught.com>

    Assorted cleanup and removal of deprecated items.

	    * src/splash.c:
	    * src/splash.h:
	    * src/Makefile.am:
		    Removed annoying splash screen.
	    * src/glabels-batch.c: (main):
	    * src/glabels.c: (main):
		    Converted from popt to GOption.
	    * src/object-editor-shadow-page.c:
	    (gl_object_editor_set_shadow_state):
		    Removed deprecated method on GtkToggleButton.
	    * src/ui-commands.c: (gl_ui_cmd_help_about):
		    Removed dependency on libgnomui/qnome-url.h.
	    * src/template-designer.c:
		    Removed dependency on libgnome/gnome-program.h.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@613
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/object-editor-shadow-page.c
D	glabels2/src/splash.c
D	glabels2/src/splash.h
M	glabels2/src/template-designer.c
M	glabels2/src/ui-commands.c

commit 0e1789c306720da62df98918ddd2b9d724f446dd
Author: Jim Evins <evins@snaught.com>
Date:	2007-02-05

    2007-02-04	Jim Evins  <evins@snaught.com>

	    * src/color.c:
	    * src/color.h:
	    * src/prefs-model.c:
	    * src/print.c: (draw_text_object):
	    * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_construct):
		    Removed GnomeCanvas artifacts from color.[ch] and
		    related modules.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@612
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/color.c
M	glabels2/src/color.h
M	glabels2/src/prefs-model.c
M	glabels2/src/print.c
M	glabels2/src/wdgt-mini-preview.c

commit 8fba57d0f464c7fc6c08145ce8dc6f70eb693ac9
Author: Jim Evins <evins@snaught.com>
Date:	2007-02-05

    2007-02-04	Jim Evins  <evins@snaught.com>

	    * src/wdgt-mini-preview.c:
	    * src/wdgt-mini-preview.h:
		    Ported widget from GnomeCanvas to Cairo.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@611
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h

commit be3e30869fa93195007e75dc2646887490a8776a
Author: Jim Evins <evins@snaught.com>
Date:	2007-02-03

    2007-02-03	Jim Evins  <evins@snaught.com>

	    * data/glade/template-designer.glade:
	    * src/template-designer.c:
	    * src/template-designer.h:
		    Ported GnomeDruid to GtkAssistant.	Since libglade
		    does not
		    yet support the GtkAssistant and we derive directly
		    from
		    the Assistant, the pages are layed out in a
		    GtkNotebook in
		    the glade description -- we then append each page
		    to the
		    assistant.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@610
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/template-designer.glade
M	glabels2/src/template-designer.c
M	glabels2/src/template-designer.h

commit ab68c667d1b265e30fb49264231c48158904922f
Author: Jim Evins <evins@snaught.com>
Date:	2007-01-26

    2007-01-25	Jim Evins  <evins@snaught.com>

	    * data/glade/object-editor.glade:
		    Added dummy page to notebook, to prevent shadow
		    page from
		    becoming the default current page at creation.
	    * src/view-box.c: (construct_properties_editor):
	    * src/view-ellipse.c: (construct_properties_editor):
	    * src/view-line.c: (construct_properties_editor):
	    * src/view-text.c: (construct_properties_editor):
		    Reconciled order of params.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@609
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/object-editor.glade
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c

commit ac594875e6e9bd1725ce7c1a2035b2b14ae4cf83
Author: Jim Evins <evins@snaught.com>
Date:	2007-01-20

    2007-01-19	Jim Evins  <evins@snaught.com>

	    * src/label-barcode.h:
	    * src/label-object.c: (gl_label_object_set_font_weight),
	    (gl_label_object_set_text_alignment),
	    (gl_label_object_get_font_weight),
	    (gl_label_object_get_text_alignment):
	    * src/label-object.h:
	    * src/label-text.c: (gl_label_text_instance_init), (copy),
	    (get_size), (set_font_family), (set_font_weight),
	    (set_text_alignment), (get_font_weight), (get_text_alignment):
	    * src/label-text.h:
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page),
	    (gl_object_editor_set_font_family),
	    (gl_object_editor_set_font_weight),
	    (gl_object_editor_get_font_weight),
	    (gl_object_editor_set_text_alignment),
	    (gl_object_editor_get_text_alignment),
	    (gl_object_editor_set_text_color):
	    * src/object-editor.h:
	    * src/prefs-dialog.c: (construct_object_page),
	    (update_object_page_from_prefs),
	    (update_prefs_from_object_page):
	    * src/prefs-model.c: (gl_prefs_model_save_settings),
	    (gl_prefs_model_load_settings):
	    * src/prefs-model.h:
	    * src/print.c: (draw_text_object):
	    * src/ui-property-bar.c: (gl_ui_property_bar_construct),
	    (reset_to_default_properties), (update_text_properties),
	    (font_bold_toggled_cb), (text_align_toggled_cb):
	    * src/ui-sidebar.c:
	    * src/util.c: (gl_util_align_to_string),
	    (gl_util_string_to_align),
	    (gl_util_weight_to_string), (gl_util_string_to_weight),
	    (gl_util_get_font_family_list),
	    (gl_util_font_family_list_free):
	    * src/util.h:
	    * src/view-text.c: (update_object_from_editor_cb),
	    (update_editor_from_object_cb), (draw_hacktext),
	    (draw_cursor):
	    * src/view.c: (gl_view_set_selection_text_alignment),
	    (gl_view_set_default_text_alignment),
	    (gl_view_get_default_text_alignment):
	    * src/view.h:
	    * src/xml-label-04.c: (xml04_parse_text_props):
	    * src/xml-label-191.c: (xml191_parse_text_props):
	    * src/xml-label.c: (xml_parse_object_text),
	    (xml_parse_toplevel_span), (xml_create_object_text),
	    (xml_create_toplevel_span):
		    Converted all model internals to Pango.  GnomeFont
		    remains in
	    view until GnomeCanvas can be replaced with a cairo-based
	    canvas.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@608
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-barcode.h
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/print.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-sidebar.c
M	glabels2/src/util.c
M	glabels2/src/util.h
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit 151648533ca01ebdc95b8c28bb261ab8f4cdce50
Author: Jim Evins <evins@snaught.com>
Date:	2007-01-17

    2007-01-17	Jim Evins  <evins@snaught.com>

	    * src/Makefile.am:
	    * src/hig.c:
		    Deleted hig.c.
	    * src/hig.h:
	    * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type),
	    (gl_wdgt_print_copies_construct):
	    * src/wdgt-print-copies.h:
	    * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type),
	    (gl_wdgt_print_merge_construct):
	    * src/wdgt-print-merge.h:
		    Removed all remaining HIG wrapper widgets.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@607
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
D	glabels2/src/hig.c
M	glabels2/src/hig.h
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-copies.h
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-print-merge.h

commit f628d64bc327e037fa58c8c11f7919b62b182cb6
Author: Jim Evins <evins@snaught.com>
Date:	2007-01-17

    2007-01-16	Jim Evins  <evins@snaught.com>

	    * src/Makefile.am:
	    * src/print-dialog.c:
	    * src/print-dialog.h:
	    * src/print-op.c:
	    * src/print-op.h:
	    * src/template-designer.c: (print_test_cb):
	    * src/ui-commands.c: (gl_ui_cmd_file_print):
	    * src/print.c:
		    Renamed PrintDialog to PrintOp.  Added constructor
		    for batch
		    printing.
	    * src/glabels-batch.c: (main):
		    Converted to use new PrintOp object for printing.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@606
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
M	glabels2/src/glabels-batch.c
D	glabels2/src/print-dialog.c
D	glabels2/src/print-dialog.h
A	glabels2/src/print-op.c
A	glabels2/src/print-op.h
M	glabels2/src/print.c
M	glabels2/src/template-designer.c
M	glabels2/src/ui-commands.c

commit 4c211331406f4acb734bbc70bf9fc713e0afb196
Author: Jim Evins <evins@snaught.com>
Date:	2007-01-16

    2007-01-15	Jim Evins  <evins@snaught.com>

	    * data/glade/Makefile.am:
	    * data/glade/print-custom-widget.glade:
	    * src/print-dialog.c:
	    * src/print-dialog.h:
	    * src/print.c:
	    * src/print.h:
	    * src/template-designer.c: (print_test_cb):
	    * src/ui-commands.c: (gl_ui_cmd_file_print):
	    * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_copies):
	    * src/wdgt-print-merge.h:
	    * src/window.c: (gl_window_init):
	    * src/window.h:
		    Initial conversion to GtkPrintOperation.
		    Still to do:
		     - Remove font and other libgnomeprint[ui] from
		     elsewhere
		     - Add batch initialization of print operation


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@605
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/Makefile.am
A	glabels2/data/glade/print-custom-widget.glade
M	glabels2/src/print-dialog.c
M	glabels2/src/print-dialog.h
M	glabels2/src/print.c
M	glabels2/src/print.h
M	glabels2/src/template-designer.c
M	glabels2/src/ui-commands.c
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-print-merge.h
M	glabels2/src/window.c
M	glabels2/src/window.h

commit eb45e319f0ff83b292a56474ff2c1ba5137f51f5
Author: Jim Evins <evins@snaught.com>
Date:	2007-01-09

    2007-01-08	Jim Evins  <evins@snaught.com>
	    * configure.in:
		    Updated dependencies.  Set version to 2.1.pre4cvs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@604
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in

commit f36c9e446e0640cbf78b76117d3fa254181b7882
Author: Jim Evins <evins@snaught.com>
Date:	2007-01-04

    2007-01-03	Jim Evins  <evins@snaught.com>

	    * src/recent-files/*
		    Removed EggRecent stuff.
	    * configure.in:
	    * src/Makefile.am:
	    * src/file.c:
	    * src/recent.c:
	    * src/recent.h:
	    * src/ui-commands.c:
	    * src/ui-commands.h:
	    * src/ui.c:
		    Ported from EggRecent to GtkRecentManager.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@603
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/src/Makefile.am
M	glabels2/src/file.c
D	glabels2/src/recent-files/Makefile.am
D	glabels2/src/recent-files/egg-recent-item.c
D	glabels2/src/recent-files/egg-recent-item.h
D	glabels2/src/recent-files/egg-recent-model.c
D	glabels2/src/recent-files/egg-recent-model.h
D	glabels2/src/recent-files/egg-recent-util.c
D	glabels2/src/recent-files/egg-recent-util.h
D	glabels2/src/recent-files/egg-recent-view-uimanager.c
D	glabels2/src/recent-files/egg-recent-view-uimanager.h
D	glabels2/src/recent-files/egg-recent-view.c
D	glabels2/src/recent-files/egg-recent-view.h
D	glabels2/src/recent-files/egg-recent.h
D	glabels2/src/recent-files/update-from-egg.sh
M	glabels2/src/recent.c
M	glabels2/src/recent.h
M	glabels2/src/ui-commands.c
M	glabels2/src/ui-commands.h
M	glabels2/src/ui.c

commit 8d177160daf7c299b803331e03b3b429070cb1eb
Author: Jim Evins <evins@snaught.com>
Date:	2007-01-03

    2007-01-02	Jim Evins  <evins@snaught.com>

	    * configure.in:
	    * iec16022-0.2.1/BUGS:
	    * iec16022-0.2.1/CHANGELOG:
	    * iec16022-0.2.1/CREDITS:
	    * iec16022-0.2.1/INSTALL:
	    * iec16022-0.2.1/LICENSE:
	    * iec16022-0.2.1/Makefile.am:
	    * iec16022-0.2.1/Makefile.dist:
	    * iec16022-0.2.1/README:
	    * iec16022-0.2.1/README.glabels:
	    * iec16022-0.2.1/TODO:
	    * iec16022-0.2.1/iec16022.1:
	    * iec16022-0.2.1/iec16022.c:
	    * iec16022-0.2.1/iec16022ecc200.c:
	    * iec16022-0.2.1/iec16022ecc200.h:
	    * iec16022-0.2.1/image.c:
	    * iec16022-0.2.1/image.h:
	    * iec16022-0.2.1/reedsol.c:
	    * iec16022-0.2.1/reedsol.h:
	    * iec16022-0.2.1/test/testsuite-example.bin:
	    * iec16022-0.2.1/test/testsuite-example.eps:
	    * iec16022-0.2.1/test/testsuite-example.hex:
	    * iec16022-0.2.1/test/testsuite-example.png:
	    * iec16022-0.2.1/test/testsuite-example.text:
	    * iec16022-0.2.1/test/testsuite.sh:
		    Include modified copy of iec16022-0.2.1 to provide
		    encoding
		    support for datamatrix 2D barcodes.
	    * src/Makefile.am:
	    * src/bc-iec16022.c:
	    * src/bc-iec16022.h:
	    * src/bc.c:
		    Added initial datamatrix 2D barcode backend to
		    barcode code.
	    * INSTALL:
	    * gtk-doc.make:
		    Automatic updates to later versions of these files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@602
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/INSTALL
M	glabels2/configure.in
M	glabels2/gtk-doc.make
A	glabels2/iec16022-0.2.1/BUGS
A	glabels2/iec16022-0.2.1/CHANGELOG
A	glabels2/iec16022-0.2.1/CREDITS
A	glabels2/iec16022-0.2.1/INSTALL
A	glabels2/iec16022-0.2.1/LICENSE
A	glabels2/iec16022-0.2.1/Makefile.am
A	glabels2/iec16022-0.2.1/Makefile.dist
A	glabels2/iec16022-0.2.1/README
A	glabels2/iec16022-0.2.1/README.glabels
A	glabels2/iec16022-0.2.1/TODO
A	glabels2/iec16022-0.2.1/iec16022.1
A	glabels2/iec16022-0.2.1/iec16022.c
A	glabels2/iec16022-0.2.1/iec16022ecc200.c
A	glabels2/iec16022-0.2.1/iec16022ecc200.h
A	glabels2/iec16022-0.2.1/image.c
A	glabels2/iec16022-0.2.1/image.h
A	glabels2/iec16022-0.2.1/reedsol.c
A	glabels2/iec16022-0.2.1/reedsol.h
A	glabels2/iec16022-0.2.1/test/testsuite-example.bin
A	glabels2/iec16022-0.2.1/test/testsuite-example.eps
A	glabels2/iec16022-0.2.1/test/testsuite-example.hex
A	glabels2/iec16022-0.2.1/test/testsuite-example.png
A	glabels2/iec16022-0.2.1/test/testsuite-example.text
A	glabels2/iec16022-0.2.1/test/testsuite.sh
M	glabels2/src/Makefile.am
A	glabels2/src/bc-iec16022.c
A	glabels2/src/bc-iec16022.h
M	glabels2/src/bc.c

commit 468fd00dc4fcec77d28301274de4c50ebd4afaeb
Author: Jim Evins <evins@snaught.com>
Date:	2006-11-28

    2006-11-28	Jim Evins  <evins@snaught.com>

	    * data/templates/avery-iso-templates.xml:
	    * data/templates/avery-us-templates.xml:
	    * data/templates/categories.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/misc-us-templates.xml:
	    * data/templates/zweckform-iso-templates.xml:
		    More categorization.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@597
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/categories.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/misc-us-templates.xml
M	glabels2/data/templates/zweckform-iso-templates.xml

commit 0348e755ccc6e81d040771bfbdff6ccd081908ff
Author: Jim Evins <evins@snaught.com>
Date:	2006-09-13

    2006-09-12	Jim Evins  <evins@snaught.com>

	    * data/dtd/glabels-2.0.dtd:
	    * data/templates/Makefile.am:
	    * data/templates/avery-iso-templates.xml:
	    * data/templates/avery-other-templates.xml:
	    * data/templates/avery-us-templates.xml:
	    * data/templates/categories.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/misc-other-templates.xml:
	    * data/templates/zweckform-iso-templates.xml:
	    * data/glade/Makefile.am:
	    * data/glade/new-label-dialog.glade:
	    * data/glade/wdgt-media-select.glade:
	    * data/glade/wdgt-rotate-label.glade:
	    * libglabels/Makefile.am:
	    * libglabels/category.c:
	    * libglabels/category.h:
	    * libglabels/libglabels.h:
	    * libglabels/paper.c:
	    * libglabels/template.c:
	    * libglabels/template.h:
	    * libglabels/xml-category.c:
	    * libglabels/xml-category.h:
	    * libglabels/xml-template.c:
		    Added support for category meta data.
	    * src/Makefile.am:
	    * src/file.c:
	    * src/mini-preview-pixbuf.c:
	    * src/mini-preview-pixbuf.h:
	    * src/new-label-dialog.c:
	    * src/new-label-dialog.h:
	    * src/wdgt-media-select.c:
	    * src/wdgt-media-select.h:
	    * src/wdgt-rotate-label.c:
	    * src/wdgt-rotate-label.h:
		    New "new label" dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@596
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/dtd/glabels-2.0.dtd
M	glabels2/data/glade/Makefile.am
A	glabels2/data/glade/new-label-dialog.glade
A	glabels2/data/glade/wdgt-media-select.glade
A	glabels2/data/glade/wdgt-rotate-label.glade
M	glabels2/data/templates/Makefile.am
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/avery-other-templates.xml
M	glabels2/data/templates/avery-us-templates.xml
A	glabels2/data/templates/categories.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/misc-other-templates.xml
M	glabels2/data/templates/zweckform-iso-templates.xml
M	glabels2/gtk-doc.make
M	glabels2/libglabels/Makefile.am
A	glabels2/libglabels/category.c
A	glabels2/libglabels/category.h
M	glabels2/libglabels/libglabels.h
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
A	glabels2/libglabels/xml-category.c
C059	glabels2/libglabels/libglabels.h
glabels2/libglabels/xml-category.h
M	glabels2/libglabels/xml-template.c
M	glabels2/src/Makefile.am
M	glabels2/src/file.c
A	glabels2/src/mini-preview-pixbuf.c
A	glabels2/src/mini-preview-pixbuf.h
A	glabels2/src/new-label-dialog.c
A	glabels2/src/new-label-dialog.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-media-select.h
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/wdgt-rotate-label.h

commit 1667e133aa695fd8dd6a4475267e030699013804
Author: Jim Evins <evins@snaught.com>
Date:	2006-05-27

    2006-05-27	Jim Evins  <evins@snaught.com>

	    * NEWS:
	    * autogen.sh:
	    * configure.in:
		    Preparation for 2.1.3.
	    * acinclude.m4:
	    * omf.make:
	    * xmldocs.make:
		    Removed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@592
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/NEWS
D	glabels2/acinclude.m4
M	glabels2/autogen.sh
M	glabels2/configure.in
D	glabels2/omf.make
D	glabels2/xmldocs.make

commit 1089d9b2f104ef8d172aa3304ff7e90c88b2d68c
Author: Jim Evins <evins@snaught.com>
Date:	2006-05-23

    2006-05-22	Jim Evins  <evins@snaught.com>

	    * src/print.c: (draw_barcode_object):
		    Don't print "Invalid barcode data" if data field
		    is empty.  Patch provided
		    by Darren Warner <warnerd@users.sourceforge.net>.
		    Fixes Bug #1479839.
	    * AUTHORS:
		    Added acknowledgment for above patch.
	    * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new):
	    * src/bc-postnet.c: (postnet_code):
		    Removed "Invalid barcode data" warnings from stderr.
	    * src/view-barcode.c: (draw_barcode):
		    Draw box around barcode extent if data empty or
		    invalid.  Center a
		    message whether the data is empty or invalid in box.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@591
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-postnet.c
M	glabels2/src/print.c
M	glabels2/src/view-barcode.c

commit ba2b25fb9ca6a4182e5503df8da832a3db0493d8
Author: Jim Evins <evins@snaught.com>
Date:	2006-05-22

    2006-05-22	Jim Evins  <evins@snaught.com>

	    * src/print.c: (draw_text_object):
		    Check shadow state when printing text.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@590
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print.c

commit e846c1338e1a2608bf23eaceac97bb1f9a0e850e
Author: Jim Evins <evins@snaught.com>
Date:	2006-05-20

    2006-05-20	Jim Evins  <evins@snaught.com>

	    * src/ui-commands.c: (gl_ui_cmd_view_grid_toggle),
	    (gl_ui_cmd_view_markup_toggle):
		    Fixed crash when grid or markup have been toggled
		    off during
		    a previous session.  Bug #1434324.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@589
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/ui-commands.c

commit 888d81773c18187b4a66047121b9c75bdfdabde1
Author: Jim Evins <evins@snaught.com>
Date:	2006-04-06

    2006-04-05	Jim Evins  <evins@snaught.com>

	    * src/object-editor.c: (gl_object_editor_set_key_names):
		    Fixed potential crash when freeing empty key list.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@588
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/object-editor.c

commit aebddd9d6b63a0a09277fa0d5d57f29765ce3923
Author: Jim Evins <evins@snaught.com>
Date:	2006-03-12

    2006-03-11	Jim Evins  <evins@snaught.com>

	    * src/print.c: (draw_text_object):
	    * src/view-text.c: (gl_view_text_new),
	    (construct_properties_editor), (update_object_from_editor_cb),
	    (update_editor_from_object_cb), (update_editor_from_label_cb),
	    (draw_hacktext):
		    Added shadow support to text object.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@587
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print.c
M	glabels2/src/view-text.c

commit 5cc9f150f427f0b4e9cb70bd1b5a3cbd1818418d
Author: Jim Evins <evins@snaught.com>
Date:	2006-02-18

    2006-02-18	Jim Evins  <evins@snaught.com>

	    * src/print.c: (draw_line_object):
	    * src/view-line.c: (gl_view_line_new),
	    (construct_properties_editor),
	    (update_canvas_item_from_object_cb),
	    (update_object_from_editor_cb),
	    (update_editor_from_object_cb),
	    (update_editor_from_label_cb):
		    Added shadow support to line object.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@586
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print.c
M	glabels2/src/view-line.c

commit dbcb557b5640362136324341b71a8d05ea87a476
Author: Jim Evins <evins@snaught.com>
Date:	2006-02-17

    2006-02-16	Jim Evins  <evins@snaught.com>

	    * src/view-box.c:
		    Comment changes.
	    * src/print.c: (draw_ellipse_object):
	    * src/view-ellipse.c: (gl_view_ellipse_new),
	    (construct_properties_editor),
	    (update_canvas_item_from_object_cb),
	    (update_object_from_editor_cb),
	    (update_editor_from_object_cb),
	    (update_editor_from_label_cb):
		    Added shadow support to ellipse object.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@585
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c

commit 31c2b2eec7aee4e95da2b4b14f15b3cb0313fb34
Author: Jim Evins <evins@snaught.com>
Date:	2006-02-16

    2006-02-15	Jim Evins  <evins@snaught.com>

	    * src/label-object.c:
		    Changed default shadow offsets.
	    * src/view-box.c: (gl_view_box_new):
		    Simplified gl_view_box_new() so that is does not
		    duplicate code
		    in update_canvas_item_from_object_cb().


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@584
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-object.c
M	glabels2/src/view-box.c

commit 4a68c33f4b10396ae9835a73db093b1b3c855446
Author: Jim Evins <evins@snaught.com>
Date:	2006-02-08

    2006-02-07	Jim Evins  <evins@snaught.com>

	    * data/glade/object-editor.glade:
		    Fixed color groups of color combos.
	    * src/color.h:
		    Added default shadow color.
	    * src/object-editor.c:
	    (gl_object_editor_construct_color_combo):
		    Added shadow color group.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@583
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/object-editor.glade
M	glabels2/src/color.h
M	glabels2/src/object-editor.c

commit 98beec748e072395765a1b648b6c77cae18fa8da
Author: Jim Evins <evins@snaught.com>
Date:	2006-02-07

    2006-02-06	Jim Evins  <evins@snaught.com>

	    * src/object-editor-shadow-page.c:
		    Forgot to add this file.
	    * src/view-box.c: (gl_view_box_new),
	    (update_canvas_item_from_object_cb),
	    (update_editor_from_label_cb):
		    Update limits on shadow offset spinbuttons.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@582
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
A	glabels2/src/object-editor-shadow-page.c
M	glabels2/src/view-box.c

commit 40e256fa0bafd52f616ee3c6696efe6702d256f9
Author: Jim Evins <evins@snaught.com>
Date:	2006-01-20

    2006-01-19	Jim Evins  <evins@snaught.com>

	    * src/merge-evolution.c: (gl_merge_evolution_get_key_list):
		    Initialize key_list to NULL.  Only lucky that this
		    worked at all -- will
		    probably crash for many people.
	    * data/glade/object-editor.glade:
	    * src/Makefile.am:
	    * src/color.c:
	    * src/color.h:
	    * src/label-object.c:
	    * src/label-object.h:
	    * src/object-editor-fill-page.c:
	    * src/object-editor-private.h:
	    * src/object-editor.c:
	    * src/object-editor.h:
	    * src/xml-label.c:
		    Created infrastructure for shadow support.
	    * src/view-box.c:
	    * src/print.c:
		    Initial shadow support in box object only.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@581
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/object-editor.glade
M	glabels2/src/Makefile.am
M	glabels2/src/color.c
M	glabels2/src/color.h
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/merge-evolution.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.h
M	glabels2/src/print.c
M	glabels2/src/view-box.c
M	glabels2/src/xml-label.c

commit af70df1732fa8a56a2ff3319ed2ee4c255c72c61
Author: Jim Evins <evins@snaught.com>
Date:	2006-01-05

    2006-01-05	Jim Evins  <evins@snaught.com>

	    * src/merge-properties-dialog.c: (src_changed_cb):
		    Be extra paranoid before calling strcmp().
	    * src/merge.c: (gl_merge_set_src):
		    Don't make (merge == NULL) a critical error.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@580
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge.c

commit bb0499ec358adc1cc8e0fe1ed0c53b420f99aa12
Author: Jim Evins <evins@snaught.com>
Date:	2005-12-22

    2005-12-22	Jim Evins  <evins@snaught.com>

	    * src/glabels-batch.c: (main):
		    Compile warning free with gcc 4.0.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@569
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/glabels-batch.c

commit 58c00e66b430132afeb2cdfd1411668a9c5646cd
Author: Jim Evins <evins@snaught.com>
Date:	2005-12-22

    2005-12-21	Jim Evins  <evins@snaught.com>

	    * glabels.spec.in:
		    Updated example RPM spec file.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@568
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-decl-list.txt
M	glabels2/glabels.spec.in

commit 3c89931fbeec7d5de710bf1c9b03e01e25c8c157
Author: Jim Evins <evins@snaught.com>
Date:	2005-12-22

	    * NEWS:
	    * configure.in:
		    Preparation for 2.1.2.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@567
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/NEWS
M	glabels2/configure.in

commit 1dd5d023b5989dda77cd4afe03b6a321ae4f78fb
Author: Jim Evins <evins@snaught.com>
Date:	2005-12-21

    2005-12-20	Jim Evins  <evins@snaught.com>

	    * src/Makefile.am:
		    Define unique G_LOG_DOMAIN for glabels.
	    * src/critical-error-handler.c:
	    (gl_critical_error_handler_init):
	    * src/warning-handler.c: (gl_warning_handler_init),
	    (warning_handler):
		    Register for G_LOG_DOMAIN instead of NULL.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@566
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
M	glabels2/src/critical-error-handler.c
M	glabels2/src/warning-handler.c

commit fc0b866a373a89285aa1d507d412b5a9d8e9d12d
Author: Jim Evins <evins@snaught.com>
Date:	2005-12-10

    2005-12-10	Jim Evins  <evins@snaught.com>

	    * src/merge-evolution.c:
	    * src/merge-vcard.c:
		    Fixed indentation.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@565
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-evolution.c
M	glabels2/src/merge-vcard.c

commit 9e26662eaa578f1d48636e503ceee998f192c8cd
Author: Jim Evins <evins@snaught.com>
Date:	2005-12-09

    2005-12-08	Jim Evins  <evins@snaught.com>

	    * libglabels/paper.c: (read_paper_files_from_dir):
	    * libglabels/template.c: (gl_template_register),
	    (read_template_files_from_dir):
	    * libglabels/xml-paper.c:
	    (gl_xml_paper_read_papers_from_file),
	    (gl_xml_paper_parse_papers_doc):
	    * libglabels/xml-template.c:
	    (gl_xml_template_read_templates_from_file),
	    (gl_xml_template_parse_templates_doc),
	    (gl_xml_template_parse_template_node),
	    (xml_parse_label_rectangle_node),
	    (xml_parse_label_round_node),
	    (xml_parse_label_cd_node), (xml_parse_layout_node),
	    (xml_parse_markup_margin_node), (xml_parse_markup_line_node),
	    (xml_parse_markup_circle_node),
	    (gl_xml_template_write_templates_to_file),
	    (xml_create_label_node):
	    * libglabels/xml.c: (gl_xml_get_prop_length):
		    Re-classified g_warnings to g_messages.
	    * src/Makefile.am:
	    * src/glabels.c: (main):
	    * src/warning-handler.c: (gl_warning_handler_init),
	    (warning_handler):
	    * src/warning-handler.h:
		    Added warning message handler to make sure the user is
		    presented with appropriate non-fatal errors.
	    * src/critical-error-handler.c: (critical_error_handler):
		    Changed exit to abort.
	    * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new),
	    (render_pass1):
	    * src/bc-postnet.c: (postnet_code):
	    * src/bc.c: (id_to_index), (name_to_index):
	    * src/merge.c: (gl_merge_register_backend), (gl_merge_new):
	    * src/object-editor.c: (gl_object_notebook_construct_valist):
	    * src/prefs-dialog.c: (update_locale_page_from_prefs):
	    * src/prefs.c: (gl_prefs_get_units_per_point),
	    (gl_prefs_get_units_precision),
	    (gl_prefs_get_units_step_size),
	    (gl_prefs_get_units_string):
	    * src/print.c: (draw_outline), (clip_to_outline),
	    (clip_punchouts):
	    * src/splash.c: (gl_splash):
	    * src/ui-commands.c: (gl_ui_cmd_help_contents):
	    * src/view-highlight.c: (gl_view_highlight_new),
	    (highlight_resizable_box_construct), (object_changed_cb),
	    (view_scale_changed_cb):
	    * src/view.c: (draw_label_layer), (draw_bg_fg_layers),
	    (draw_markup_layer), (draw_markup_margin),
	    (gl_view_object_create_mode), (canvas_event),
	    (selection_received_cb):
	    * src/wdgt-mini-preview.c: (mini_outline_list_new):
	    * src/wdgt-rotate-label.c: (mini_preview_canvas_update):
	    * src/xml-label-04.c: (gl_xml_label_04_parse),
	    (xml04_parse_media_description), (xml04_parse_text_props),
	    (xml04_parse_barcode_props):
	    * src/xml-label-191.c: (gl_xml_label_191_parse),
	    (xml191_parse_objects), (xml191_parse_object),
	    (xml191_parse_text_props), (xml191_parse_image_props),
	    (xml191_parse_barcode_props), (xml191_parse_data),
	    (xml191_parse_sheet), (xml191_parse_label),
	    (xml191_parse_layout),
	    (xml191_parse_markup):
	    * src/xml-label.c: (gl_xml_label_open),
	    (gl_xml_label_open_buffer),
	    (xml_doc_to_label), (xml_parse_label), (xml_parse_objects),
	    (xml_parse_object_text), (xml_parse_object_image),
	    (xml_parse_object_barcode), (xml_parse_data),
	    (xml_parse_toplevel_span), (gl_xml_label_save),
	    (xml_create_objects):
		    Re-classified g_warnings to g_messages.
	    * src/merge-evolution.c: (gl_merge_evolution_open),
	    (gl_merge_evolution_close), (gl_merge_evolution_get_record):
		    Use g_warning to output errors encountered while
		    communicating with the evolution data server
		    instead of embedding them in the data.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@564
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/template.c
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml.c
M	glabels2/src/Makefile.am
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc.c
M	glabels2/src/critical-error-handler.c
M	glabels2/src/glabels.c
M	glabels2/src/merge-evolution.c
M	glabels2/src/merge.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs.c
M	glabels2/src/print.c
M	glabels2/src/splash.c
M	glabels2/src/ui-commands.c
M	glabels2/src/view-highlight.c
M	glabels2/src/view.c
C064	glabels2/src/critical-error-handler.c
glabels2/src/warning-handler.c
A	glabels2/src/warning-handler.h
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit 599f3be4bcea39fb4da1ee940be7d566abd1abef
Author: Jim Evins <evins@snaught.com>
Date:	2005-12-09

    2005-12-08	Jim Evins  <evins@snaught.com>

	    * libglabels/libglabels-private.h:
		    Set G_LOG_DOMAIN
	    * libglabels/paper.c: (read_papers):
	    * libglabels/template.c: (read_templates):
		    Made appropriate warnings critical.
	    * src/Makefile.am:
	    * src/critical-error-handler.h:
	    * src/critical-error-handler.c:
	    (gl_critical_error_handler_init),
	    (critical_error_handler):
		    Created critical error handler.
	    * src/glabels.c: (main):
		    Register critical error handler.
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_init):
	    * src/object-editor.c: (gl_object_editor_init):
	    * src/prefs-dialog.c: (gl_prefs_dialog_init):
	    * src/template-designer.c: (gl_template_designer_init):
	    * src/ui-property-bar.c: (gl_ui_property_bar_instance_init):
		    Made appropriate warnings critical.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@563
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/libglabels-private.h
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/template.c
M	glabels2/src/Makefile.am
A	glabels2/src/critical-error-handler.c
A	glabels2/src/critical-error-handler.h
M	glabels2/src/glabels.c
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/template-designer.c
M	glabels2/src/ui-property-bar.c

commit e44d2f82ab2179a7c5003d0efd852345c97e2d40
Author: Jim Evins <evins@snaught.com>
Date:	2005-11-27

    2005-11-27	Jim Evins  <evins@snaught.com>

	    * src/merge-evolution.c: (gl_merge_evolution_get_key_list),
	    (gl_merge_evolution_get_primary_key),
	    (gl_merge_evolution_get_record):
		    Don't create "record_key" pseudo-key.  Don't populate
		    fields with null data.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@562
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-evolution.c

commit 25379fe60c61d9a7ba38a4fee58457dda8f0f1ac
Author: Jim Evins <evins@snaught.com>
Date:	2005-11-26

    2005-11-25	Jim Evins  <evins@snaught.com>

	    * src/merge-evolution.c: (gl_merge_evolution_finalize),
	    (gl_merge_evolution_get_key_list), (gl_merge_evolution_open),
	    (gl_merge_evolution_get_record), (gl_merge_evolution_copy),
	    (free_field_list):
		    Query EDS for all supported fields.  Patch provided by
		    Austin Henry <ahenry@users.sourceforge.net>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@561
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-evolution.c

commit 648ed6853c2c7dd6e94af0db1a3d6c1b92643a73
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-30

    2005-10-29	Jim Evins  <evins@snaught.com>

	    * src/glabels.c: (main):
	    * src/label-barcode.c: (gl_label_barcode_finalize):
	    * src/label-text.c: (gl_label_text_finalize),
	    (set_font_family):
	    * src/label.c: (gl_label_instance_init), (gl_label_finalize):
	    * src/object-editor.c: (gl_object_editor_finalize):
		    Another pass at valgrinding -- plugged several
		    memory leaks.
	    * src/view-text.c: (gl_view_text_new),
	    (update_canvas_item_from_object_cb), (draw_hacktext):
		    Commented out artifacts of edit-in-place code.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@560
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/glabels.c
M	glabels2/src/label-barcode.c
M	glabels2/src/label-text.c
M	glabels2/src/label.c
M	glabels2/src/object-editor.c
M	glabels2/src/view-text.c

commit 76fd90ffd79f73f4d8cd9acc009696a12db77e1e
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-28

    2005-10-28	Jim Evins  <evins@snaught.com>

	    * src/canvas-hacktext.c: (gl_canvas_hacktext_set_arg):
		    Fixed use of uninitialized variable.  Caught by
		    d binderman <dcb314@hotmail.com>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@559
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/canvas-hacktext.c

commit 71e143d2eec8f00cc33b766b6e5dabdf117425ce
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-28

    2005-10-27	Jim Evins  <evins@snaught.com>

	    * src/merge-evolution.c: (gl_merge_evolution_get_record):
	    * src/merge-vcard.c: (gl_merge_vcard_get_record),
	    (parse_next_vcard):
		    Additional cleanup of EDS and vcard backends.
		    Provided by
		    Austin Henry <ahenry@users.sourceforge.net>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@558
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-evolution.c
M	glabels2/src/merge-vcard.c

commit 6564675732a6cf86f70960aa83070cc64e940235
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-25

    2005-10-24	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * src/Makefile.am:
	    * src/merge-evolution.c:
	    * src/merge-evolution.h:
	    * src/merge-init.c: (gl_merge_init):
	    * src/merge-properties-dialog.c: (type_changed_cb):
	    * src/merge-vcard.c:
	    * src/merge-vcard.h:
	    * src/ui-commands.c: (gl_ui_cmd_help_about):
		    Added Evolution Data Server and VCard merge backends.
		    Original patch
		    provided by Austin Henry
		    <ahenry@users.sourceforge.net>.
	    * configure.in:
		    Only support EDS and VCard backends if libebook
		    is installed.  Allow
		    user to disable support, even if installed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@557
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/src/Makefile.am
A	glabels2/src/merge-evolution.c
A	glabels2/src/merge-evolution.h
M	glabels2/src/merge-init.c
M	glabels2/src/merge-properties-dialog.c
A	glabels2/src/merge-vcard.c
A	glabels2/src/merge-vcard.h
M	glabels2/src/ui-commands.c

commit 1b1e0d9590f300773c89589eab03c4f8a5db3f45
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-24

    2005-10-24	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * data/templates/avery-iso-templates.xml:
	    * data/templates/avery-us-templates.xml:
	    * data/templates/misc-iso-templates.xml:
	    * data/templates/zweckform-iso-templates.xml:
		    Collected all template changes and submissions
		    since last
		    release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@556
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/zweckform-iso-templates.xml

commit 2bd3499f59f15f1ba3d83aca12dc895ede9c9fcc
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-24

    2005-10-23	Jim Evins  <evins@snaught.com>

	    * configure.in:
	    * data/mime/Makefile.am:
		    Added configure options to disable
		    update-mime-database and
		    update-desktop-database as part of the install.  Patch
		    provided by Leonardo Boshell
		    (qhoracio@sourceforge.net).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@555
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/data/mime/Makefile.am
M	glabels2/gtk-doc.make

commit ec932804d8b229fff5fea65452a4f6d0982e7cb1
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-23

    2005-10-23	Jim Evins  <evins@snaught.com>

	    * libglabels/xml.h:
	    * libglabels/xml.c: (gl_xml_get_prop_string),
	    (gl_xml_get_prop_i18n_string), (gl_xml_set_prop_string),
	    (gl_xml_is_node), (gl_xml_get_node_content):
		    Added new XML utility functions.
	    * libglabels/xml-paper.c:
	    * libglabels/xml-template.c:
	    * src/xml-label.c:
		    Cleanup by using new xml utilities created above.
	    * libglabels/paper.c: (gl_paper_free):
	    * src/file.c: (new_response):
	    * src/object-editor-image-page.c:
	    (add_image_filters_to_chooser):
	    * src/pixbuf-cache.c: (gl_pixbuf_cache_add_pixbuf),
	    (gl_pixbuf_cache_get_pixbuf):
	    * src/ui-property-bar.c:
	    (gl_ui_property_bar_construct_color_combo):
	    * src/view-highlight.c: (gl_view_highlight_finalize):
	    * src/view-image.c: (update_object_from_editor_cb):
	    * src/view.c: (gl_view_finalize), (draw_bg_fg_layers),
	    (draw_bg_fg_rounded_rect), (draw_bg_fg_round),
	    (draw_bg_fg_cd),
	    (draw_bg_fg_cd_bc), (draw_markup_layer), (draw_markup_margin),
	    (draw_markup_margin_rect), (draw_markup_margin_rounded_rect),
	    (draw_markup_margin_round), (draw_markup_margin_cd),
	    (draw_markup_margin_cd_bc):
	    * src/wdgt-mini-preview.c: (mini_outline_list_new):
	    * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_finalize):
		    Plugged various memory leaks located with valgrind.
	    * src/view-image.c: (update_canvas_item_from_object_cb):
		    Don't allow a width or height of zero when drawing
		    pixbuf.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@554
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml.c
M	glabels2/libglabels/xml.h
M	glabels2/src/file.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/pixbuf-cache.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/view-highlight.c
M	glabels2/src/view-image.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/xml-label.c

commit cba39e6ae22742514a61a6c822d26f83613e45a7
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-23

    2005-10-22	Jim Evins  <evins@snaught.com>

	    * libglabels/xml-paper.c:
	    * libglabels/xml-template.c:
	    * libglabels/xml.c:
	    * src/base64.c:
	    * src/bc-gnubarcode.c:
	    * src/canvas-hacktext.c:
	    * src/label-text.c:
	    * src/object-editor-data-page.c:
	    * src/print-dialog.c:
	    * src/print.c:
	    * src/recent.c:
	    * src/template-designer.c:
	    * src/text-node.c:
	    * src/ui-property-bar.c:
	    * src/ui.c:
	    * src/view-barcode.c:
	    * src/view-box.c:
	    * src/view-ellipse.c:
	    * src/view-image.c:
	    * src/view-line.c:
	    * src/view-text.c:
	    * src/view.c:
	    * src/wdgt-media-select.c:
	    * src/xml-label-04.c:
	    * src/xml-label-191.c:
	    * src/xml-label.c:
		    Modified to compile warning free with gcc-4.0.  Mostly
		    casting to change signedness of characters.  Did not
		    attack gnu-barcode library yet.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@553
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml.c
M	glabels2/src/base64.c
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/canvas-hacktext.c
M	glabels2/src/label-text.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/print-dialog.c
M	glabels2/src/print.c
M	glabels2/src/recent.c
M	glabels2/src/template-designer.c
M	glabels2/src/text-node.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit afd036875ddd1bc5ca13c3b1ac353f81187df194
Author: Jim Evins <evins@snaught.com>
Date:	2005-10-22

    2005-10-22	Jim Evins <evins@snaught.com>

	    * src/glabels.c: (main):
	    * src/splash.c: (gl_splash):
		    Removed some small memory leaks.
	    * gtk-doc.make:
		    Added.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@552
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
A	glabels2/gtk-doc.make
M	glabels2/src/glabels.c
M	glabels2/src/splash.c

commit 39d8141f74f981643811f13b1fb09b5f6339b57f
Author: Jim Evins <evins@snaught.com>
Date:	2005-09-20

    2005-09-19	Jim Evins  <evins@snaught.com>

	    * data/glade/property-bar.glade:
		    Remove items from font_family_combo.  This prevents
		    the
		    double entry after adding text model and list
		    of fonts.
	    * src/ui-property-bar.c: (reset_to_default_properties):
		    Free font_family_list.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@551
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/property-bar.glade
M	glabels2/src/ui-property-bar.c

commit da392ae3611dbf3b5cfb3bc89e6ccfa652e47380
Author: Jim Evins <evins@snaught.com>
Date:	2005-07-02

    2005-07-01	Jim Evins  <evins@snaught.com>

	    * po/it.po:
		    Updated italian translation (Daniele Medri)


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@550
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/po/it.po

commit ae2bf27499f3e297a2bd73f20ca9697a67bd1006
Author: Jim Evins <evins@snaught.com>
Date:	2005-06-26

    I guess I need it after all -- however, it needs to be empty.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@545
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/docs/libglabels/libglabels.types

commit 243b3dc521a2fc222d31bd139abac37bd0adef1b
Author: Jim Evins <evins@snaught.com>
Date:	2005-06-26

    2005-06-26	Jim Evins  <evins@snaught.com>

	    * docs/libglabels/libglabels-decl-list.txt:
		    Somehow never got checked in before.
	    * docs/libglabels/libglabels.types:
		    Removed -- don't need it afterall.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@544
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
A	glabels2/docs/libglabels/libglabels-decl-list.txt
D	glabels2/docs/libglabels/libglabels.types

commit c4eb1a543ab5897431bc2a4796785c4aca7bfe9b
Author: Jim Evins <evins@snaught.com>
Date:	2005-06-21

    2005-06-20	Jim Evins  <evins@snaught.com>

	    * NEWS:
		    Final prep for 2.1.1 release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@543
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/NEWS

commit 0e3ae99f1dfcb00a6e6e5f320f1159b732960b73
Author: Jim Evins <evins@snaught.com>
Date:	2005-06-21

    2005-06-20	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Final preps for 2.1.1 release.
	    * docs/libglabels/libglabels.types:
		    Somehow never got checked in before.
	    * po/POTFILES.in:
		    Bring up-to-date with recent reorg of ui code.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@542
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
A	glabels2/docs/libglabels/libglabels.types
M	glabels2/po/POTFILES.in

commit 266a744f8ad5d09df9daa095adab2f7b76f69bec
Author: Jim Evins <evins@snaught.com>
Date:	2005-06-19

    2005-06-19	Jim Evins  <evins@snaught.com>

	    * src/template-designer.c: (construct_layout_page):
		    Removed attempt to match background color of mini
		    preview widget to
		    background.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@540
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/template-designer.c

commit 3c72bfece4ac69e74d1de4b7c2abd7cd94d2a548
Author: Jim Evins <evins@snaught.com>
Date:	2005-06-18

    2005-06-17	Jim Evins  <evins@snaught.com>

	    * help/C/figures/merge-ex2-4.png:
	    * help/C/glabels.xml:
		    Fixed spelling error.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@539
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/help/C/figures/merge-ex2-4.png
M	glabels2/help/C/glabels.xml

commit 4e3e2f3a70c4670eb2dc905aafa743efa546c404
Author: Jim Evins <evins@snaught.com>
Date:	2005-06-14

    2005-06-13	Jim Evins  <evins@snaught.com>

	    * help/C/figures/merge-ex1-1.png:
	    * help/C/figures/merge-ex1-2.png:
	    * help/C/figures/merge-ex1-3.png:
	    * help/C/figures/merge-ex1-4.png:
	    * help/C/figures/merge-ex2-1.png:
	    * help/C/figures/merge-ex2-2.png:
	    * help/C/figures/merge-ex2-3.png:
	    * help/C/figures/merge-ex2-4.png:
		    Added figures for document merge tutorial.
	    * help/C/glabels.xml:
		    Added document merge tutorial.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@538
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
A	glabels2/help/C/figures/merge-ex1-1.png
A	glabels2/help/C/figures/merge-ex1-2.png
A	glabels2/help/C/figures/merge-ex1-3.png
A	glabels2/help/C/figures/merge-ex1-4.png
A	glabels2/help/C/figures/merge-ex2-1.png
A	glabels2/help/C/figures/merge-ex2-2.png
A	glabels2/help/C/figures/merge-ex2-3.png
A	glabels2/help/C/figures/merge-ex2-4.png
M	glabels2/help/C/glabels.xml

commit 541b2920873eb6bfe225e8a7c573e41917c5dae5
Author: Jim Evins <evins@snaught.com>
Date:	2005-05-20

    2005-05-19	Jim Evins  <evins@snaught.com>

	    * data/glade/merge-properties-dialog.glade:
		    Fixed irregular spacing.
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_init),
	    (gl_merge_properties_dialog_construct):
		    Set outer padding and remove separator.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@536
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/merge-properties-dialog.glade
M	glabels2/src/merge-properties-dialog.c

commit 43beed37015c722577065ec11a431f75651b8199
Author: Jim Evins <evins@snaught.com>
Date:	2005-05-19

    2005-05-18	Jim Evins  <evins@snaught.com>

	    * src/hig.h:
	    * src/hig.c:
		    Removed glHigDialog class.
	    * src/file.c: (gl_file_new), (create_new_dialog_widgets),
	    (gl_file_properties), (create_properties_dialog_widgets):
	    * src/prefs-dialog.h:
	    * src/prefs-dialog.c: (gl_prefs_dialog_get_type),
	    (gl_prefs_dialog_init), (gl_prefs_dialog_construct):
	    * src/print-dialog.h:
	    * src/prefs-dialog.h:
	    * src/print-dialog.c: (gl_print_dialog_get_type),
	    (gl_print_dialog_init), (gl_print_dialog_construct):
		    Replaced all instances of glHigDialog with GtkDialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@535
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/file.c
M	glabels2/src/hig.c
M	glabels2/src/hig.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-dialog.h
M	glabels2/src/print-dialog.c
M	glabels2/src/print-dialog.h

commit b75ae61753d37cd5b74f393cfb8a207d0e0ae3bc
Author: Jim Evins <evins@snaught.com>
Date:	2005-05-18

    2005-05-17	Jim Evins  <evins@snaught.com>

	    * src/hig.h:
	    * src/hig.c:
		    Removed HigAlert class since it is obsoleted by the
		    GtkMessageDialog class.
	    * src/file.c: (open_response), (gl_file_open_real),
	    (gl_file_save),
	    (save_as_response), (gl_file_close):
		    Replaced all instances of HigAlert widgets with
		    GtkMessageDialog widgets.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@534
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/file.c
M	glabels2/src/hig.c
M	glabels2/src/hig.h

commit da21e95810774f0c12cca0694d7c444a1c5dd3f2
Author: Jim Evins <evins@snaught.com>
Date:	2005-05-16

    2005-05-15	Jim Evins  <evins@snaught.com>

	    * src/ui-commands.h:
	    * src/ui-util.c:
	    * src/ui-util.h:
	    * src/ui.c:
	    * src/ui.h:
	    * src/view.c:
	    * src/window.c:
	    * src/window.h:
		    A little code reformatting -- no functional changes.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@533
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/ui-commands.h
M	glabels2/src/ui-util.c
M	glabels2/src/ui-util.h
M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/view.c
M	glabels2/src/window.c
M	glabels2/src/window.h

commit cfdd17795f804b342a1551d517a44ae60f47e917
Author: Jim Evins <evins@snaught.com>
Date:	2005-05-15

    2005-05-14	Jim Evins  <evins@snaught.com>

	    * src/Makefile.am:
		    Removed obsolete macros.
	    * src/marshal.list:
		    Added marshalling template to support new view signal:
		    "context_menu_activate."
	    * src/view.h:
	    * src/view.c: (gl_view_class_init), (gl_view_construct),
	    (canvas_event_arrow_mode):
		    - Removed hardcoded context menus and added new signal
		    "context_menu_activate"
		    to push this up to the uimanager.
		    - Removed merge properties and print dialogs so that
		    they can be managed with
		    the window by the uimanager.
	    * src/merge-properties-dialog.h:
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_new),
	    (gl_merge_properties_dialog_construct):
		    Changed calling convention of
		    gl_merge_properties_dialog_new() to use
		    glLabel and GtkWindow instead of view to make more
		    consistent with other
		    dialogs.
	    * src/print-dialog.h:
	    * src/print-dialog.c: (gl_print_dialog_new),
	    (gl_print_dialog_construct):
		    Removed last artifact of libbonoboui.
	    * src/ui-commands.c: (gl_ui_cmd_file_print),
	    (gl_ui_cmd_objects_merge_properties), (gl_ui_cmd_help_about):
		    Reconciled style for launching dialogs.
	    * src/ui.c: (gl_ui_new):
		    Added context menus to ui manager.
	    * src/view-object.c: (item_event_arrow_mode):
		    No longer try to select objects with right-click.
	    * src/window.h:
	    * src/window.c: (gl_window_init), (gl_window_set_label),
	    (context_menu_activate_cb):
		    Context menus and all dialogs are now managed in a
		    consistent way in window
		    by the ui manager.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@532
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/Makefile.am
M	glabels2/src/marshal.list
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge-properties-dialog.h
M	glabels2/src/print-dialog.c
M	glabels2/src/print-dialog.h
M	glabels2/src/ui-commands.c
M	glabels2/src/ui.c
M	glabels2/src/view-object.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/window.c
M	glabels2/src/window.h

commit 843936402808e55c2be7970c22ecbaaafe2f7f73
Author: Jim Evins <evins@snaught.com>
Date:	2005-05-12

    2005-05-11	Jim Evins  <evins@snaught.com>

	    * src/window.h:
	    * src/window.c: (gl_window_init), (gl_window_destroy):
	    * src/ui.c: (gl_ui_new), (gl_ui_unref), (recent_tooltip_func):
	    * src/ui-commands.c: (gl_ui_cmd_file_open_recent):
		    Moved management of recent_view back from window.c
		    to ui.c -- it just feels
		    better there.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@531
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/ui-commands.c
M	glabels2/src/ui.c
M	glabels2/src/window.c
M	glabels2/src/window.h

commit 1479a95e84b51da3faee9a7a263c032b19afc3e4
Author: Jim Evins <evins@snaught.com>
Date:	2005-05-11

    2005-05-10	Jim Evins  <evins@snaught.com>

	    * src/window.h:
	    * src/window.c: (gl_window_init):
	    * src/ui.h:
	    * src/ui.c: (gl_ui_new), (connect_proxy_cb),
	    (disconnect_proxy_cb),
	    (menu_item_select_cb), (menu_item_deselect_cb):
		    Added GtkStatusbar which displays menu tooltips.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@530
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/window.c
M	glabels2/src/window.h

commit 6f2f4ee62487d346746d5fe8b8ed2801a72ce90b
Author: Jim Evins <evins@snaught.com>
Date:	2005-05-09

    2005-05-09	Jim Evins  <evins@snaught.com>

	    Replaced libbonoboui with GtkUIManager for creation of basic
	    user interface menus
	    and toolbars.

	    * configure.in:
	    * glabels.spec.in:
		    Removed dependencies on libbonoboui.
	    * data/Makefile.am:
	    * data/ui/Makefile.am:
	    * data/ui/glabels-ui.xml:
		    Removed data/ui directory.
	    * data/glade/Makefile.am:
	    * data/property-bar.glade:
		    Added glade description of property-bar for new
		    libglade implementation
		    of glUIPropertyBar.
	    * src/Makefile.am:
	    * src/commands.h:
	    * src/commands.c:
	    * src/tools.h:
	    * src/tools.c:
	    * src/ui-commands.h:
	    * src/ui-commands.c:
		    Replaced commands.[ch] and tools.[ch] with the single
		    ui-commands.[ch] module
		    since the distinction between "commands" and "tools"
		    is no longer that clear.
	    * src/file.h:
	    * src/file.c:
		    Modified to expect glWindow instead of GtkWindow.
		    gl_file_open_recent()
		    no longer has knowledge of eggRecent*.
	    * src/glabels.c: (main):
		    Removed libbonobo initialization and replaced
		    bonobo_main loop with gtk_main
		    loop.
	    * src/object-editor.c: (gl_object_editor_init):
		    Make sure notebook does not respond to a "show_all"
		    on the parent.
	    * src/recent-files/Makefile.am:
	    * src/recent-files/*.[ch]
		    Updated from latest version of libegg which now has
		    a view based on
		    GtkUIManager.  Removed unused bonobo and gtk views.
	    * src/ui-property-bar.h:
	    * src/ui-property-bar.c:
		    New implementation based on libglade.
	    * src/ui-sidebar.h:
	    * src/ui-sidebar.c:
		    Sidebar is now simply a GtkWidget and does not expect
		    to be a part of
		    a libbonoboui interface.
	    * src/ui-util.h:
	    * src/ui-util.c:
	    * src/ui.h:
	    * src/ui.c:
		    Converted for use with GtkUIManager.
	    * src/window.h:
	    * src/window.c:
		    Now derived from GtkWindow instead of BonoboWindow
		    and uses GtkUIManager
		    to create menus and toolbars.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@529
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/data/Makefile.am
M	glabels2/data/glade/Makefile.am
A	glabels2/data/glade/property-bar.glade
D	glabels2/data/ui/Makefile.am
D	glabels2/data/ui/glabels-ui.xml
M	glabels2/glabels.spec.in
M	glabels2/src/Makefile.am
D	glabels2/src/commands.c
D	glabels2/src/commands.h
M	glabels2/src/file.c
M	glabels2/src/file.h
M	glabels2/src/glabels.c
M	glabels2/src/object-editor.c
M	glabels2/src/recent-files/Makefile.am
M	glabels2/src/recent-files/egg-recent-item.c
M	glabels2/src/recent-files/egg-recent-item.h
M	glabels2/src/recent-files/egg-recent-model.c
M	glabels2/src/recent-files/egg-recent-util.c
D	glabels2/src/recent-files/egg-recent-view-bonobo.c
D	glabels2/src/recent-files/egg-recent-view-bonobo.h
D	glabels2/src/recent-files/egg-recent-view-gtk.c
D	glabels2/src/recent-files/egg-recent-view-gtk.h
A	glabels2/src/recent-files/egg-recent-view-uimanager.c
A	glabels2/src/recent-files/egg-recent-view-uimanager.h
M	glabels2/src/recent-files/egg-recent-view.c
M	glabels2/src/recent-files/egg-recent.h
D	glabels2/src/tools.c
D	glabels2/src/tools.h
A	glabels2/src/ui-commands.c
A	glabels2/src/ui-commands.h
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-property-bar.h
M	glabels2/src/ui-sidebar.c
M	glabels2/src/ui-sidebar.h
M	glabels2/src/ui-util.c
M	glabels2/src/ui-util.h
M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/window.c
M	glabels2/src/window.h

commit 15816dc54a53451be050144db535e67af6db88f8
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-26

    2005-04-25	Jim Evins  <evins@snaught.com>

	    * data/templates/misc-iso-templates.xml:
		    Added Fellows 04715 template provided by Steve Saxon.
	    * AUTHORS:
		    Updated acknowledgement for above.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@528
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/misc-iso-templates.xml

commit 6bb6a3435ecfd07583605dda070accf9996ec165
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-24

    2005-04-23	Jim Evins  <evins@snaught.com>

	    * src/util.c: (gl_util_combo_box_set_strings):
		    Make sure to clear model before loading a new list
		    of strings.
	    * src/wdgt-media-select.h:
	    * src/wdgt-media-select.c:
	    (gl_wdgt_media_select_instance_init),
	    (gl_wdgt_media_select_construct),
	    (page_size_combo_changed_cb),
	    (template_combo_changed_cb), (prefs_changed_cb),
	    (gl_wdgt_media_select_get_name),
	    (gl_wdgt_media_select_set_name),
	    (gl_wdgt_media_select_get_page_size),
	    (gl_wdgt_media_select_set_page_size):
		    Replaced the deprecated GtkCombo widget with the new
		    GtkComboBox.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@527
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/util.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-media-select.h

commit caf7fa47549bd5e82771dae7352a3e9df54876a5
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-22

    2005-04-21	Jim Evins  <evins@snaught.com>

	    * data/glade/template-designer.glade:
	    * src/template-designer.c: (construct_pg_size_page),
	    (pg_size_page_changed_cb), (build_template):
		    Replaced the deprecated GtkCombo widget with the new
		    GtkComboBox.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@526
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/template-designer.glade
M	glabels2/src/template-designer.c

commit e95389e41390751097436307edb19d49963e3e59
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-21

    2005-04-20	Jim Evins  <evins@snaught.com>

	    * data/glade/prefs-dialog.glade:
	    * src/prefs-dialog.c: (construct_object_page),
	    (update_object_page_from_prefs),
	    (update_prefs_from_object_page):
		    Replaced the deprecated GtkCombo widget with the new
		    GtkComboBox.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@525
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/prefs-dialog.glade
M	glabels2/src/prefs-dialog.c

commit 2c6b6469e0956561eed729f5d56865456abfec50
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-20

    2005-04-19	Jim Evins  <evins@snaught.com>

	    * data/glade/object-editor.glade:
	    * src/object-editor-bc-page.c:
	    (gl_object_editor_prepare_bc_page),
	    (style_changed_cb), (gl_object_editor_set_bc_style),
	    (gl_object_editor_get_bc_style),
	    (gl_object_editor_set_bc_color),
	    (gl_object_editor_get_bc_color):
	    * src/object-editor-data-page.c:
	    (gl_object_editor_prepare_data_page),
	    (gl_object_editor_set_data),
	    (gl_object_editor_get_data):
	    * src/object-editor-edit-page.c:
	    (gl_object_editor_prepare_edit_page), (insert_button_cb):
	    * src/object-editor-fill-page.c:
	    (gl_object_editor_prepare_fill_page),
	    (gl_object_editor_set_fill_color),
	    (gl_object_editor_get_fill_color):
	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page),
	    (gl_object_editor_set_image), (gl_object_editor_get_image):
	    * src/object-editor-line-page.c:
	    (gl_object_editor_prepare_line_page),
	    (gl_object_editor_set_line_color),
	    (gl_object_editor_get_line_color):
	    * src/object-editor-private.h:
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page),
	    (gl_object_editor_set_font_family),
	    (gl_object_editor_get_font_family),
	    (gl_object_editor_set_text_color),
	    (gl_object_editor_get_text_color):
	    * src/object-editor.c: (gl_object_editor_set_key_names):
	    * src/ui-sidebar.c:
		    In the object editor: replaced all instances of
		    the deprecated
		    GtkCombo widget with the new GtkComboBox.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@524
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/object-editor.glade
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/ui-sidebar.c

commit 39acef8eb6f976d76c3c7f4cce0a2b546467e2e5
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-19

    2005-04-18	Jim Evins  <evins@snaught.com>

	    * src/stock.c:
		    Neglected to save this one in previous checkin
		    to support
		    header cleanup.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@523
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/stock.c

commit 174223a5516fbfc5e3b4a865b8310b51bed3dee2
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-18

    2005-04-17	Jim Evins  <evins@snaught.com>

	    * libglabels/libglabels-private.h:
	    * libglabels/paper.c:
	    * libglabels/paper.h:
	    * libglabels/template.c:
	    * libglabels/template.h:
	    * libglabels/xml-paper.c:
	    * libglabels/xml-paper.h:
	    * libglabels/xml-template.c:
	    * libglabels/xml.c:
	    * libglabels/xml.h:
	    * src/base64.c:
	    * src/base64.h:
	    * src/bc-gnubarcode.c:
	    * src/bc-postnet.c:
	    * src/bc.c:
	    * src/bc.h:
	    * src/commands.c:
	    * src/debug.c:
	    * src/debug.h:
	    * src/file.c:
	    * src/file.h:
	    * src/hig.c:
	    * src/hig.h:
	    * src/label-barcode.c:
	    * src/label-box.c:
	    * src/label-ellipse.c:
	    * src/label-image.c:
	    * src/label-image.h:
	    * src/label-line.c:
	    * src/label-object.c:
	    * src/label-text.c:
	    * src/label-text.h:
	    * src/label.c:
	    * src/merge-properties-dialog.c:
	    * src/object-editor-bc-page.c:
	    * src/object-editor-data-page.c:
	    * src/object-editor-edit-page.c:
	    * src/object-editor-fill-page.c:
	    * src/object-editor-image-page.c:
	    * src/object-editor-line-page.c:
	    * src/object-editor-lsize-page.c:
	    * src/object-editor-position-page.c:
	    * src/object-editor-private.h:
	    * src/object-editor-size-page.c:
	    * src/object-editor-text-page.c:
	    * src/object-editor.c:
	    * src/object-editor.h:
	    * src/pixbuf-cache.h:
	    * src/prefs-dialog.c:
	    * src/prefs-dialog.h:
	    * src/prefs-model.c:
	    * src/prefs-model.h:
	    * src/prefs.c:
	    * src/print-dialog.c:
	    * src/print-dialog.h:
	    * src/print.c:
	    * src/print.h:
	    * src/recent.c:
	    * src/recent.h:
	    * src/splash.c:
	    * src/splash.h:
	    * src/stock.h:
	    * src/template-designer.c:
	    * src/template-designer.h:
	    * src/text-node.h:
	    * src/tools.c:
	    * src/ui-property-bar.c: (gl_ui_property_bar_construct):
	    * src/ui-sidebar.c:
	    * src/ui-util.c:
	    * src/ui.c:
	    * src/util.c:
	    * src/util.h:
	    * src/view-barcode.c:
	    * src/view-box.c:
	    * src/view-ellipse.c:
	    * src/view-highlight.c:
	    * src/view-highlight.h:
	    * src/view-image.c:
	    * src/view-line.c:
	    * src/view-object.c:
	    * src/view-object.h:
	    * src/view-text.c:
	    * src/view.c:
	    * src/view.h:
	    * src/wdgt-chain-button.c:
	    * src/wdgt-media-select.c:
	    * src/wdgt-media-select.h:
	    * src/wdgt-mini-preview.c:
	    * src/wdgt-mini-preview.h:
	    * src/wdgt-print-copies.c:
	    * src/wdgt-print-copies.h:
	    * src/wdgt-print-merge.c:
	    * src/wdgt-print-merge.h:
	    * src/wdgt-rotate-label.c:
	    * src/wdgt-rotate-label.h:
	    * src/window.c:
	    * src/window.h:
	    * src/xml-label-04.c:
	    * src/xml-label-191.c:
	    * src/xml-label.c:
		    Cleanup of header files:
		    - all header files are now stand-alone, verified
		    by including
		      first in corresponding "c" files
		    - replaced blanket includes of gnome, gtk, and
		    glib with
		      targetted includes


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@522
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/libglabels-private.h
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/paper.h
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-paper.h
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml.c
M	glabels2/libglabels/xml.h
M	glabels2/src/base64.c
M	glabels2/src/base64.h
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc.c
M	glabels2/src/bc.h
M	glabels2/src/commands.c
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/file.c
M	glabels2/src/file.h
M	glabels2/src/hig.c
M	glabels2/src/hig.h
M	glabels2/src/label-barcode.c
M	glabels2/src/label-box.c
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-image.c
M	glabels2/src/label-image.h
M	glabels2/src/label-line.c
M	glabels2/src/label-object.c
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/label.c
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-edit-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.h
M	glabels2/src/pixbuf-cache.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-dialog.h
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/prefs.c
M	glabels2/src/print-dialog.c
M	glabels2/src/print-dialog.h
M	glabels2/src/print.c
M	glabels2/src/print.h
M	glabels2/src/recent.c
M	glabels2/src/recent.h
M	glabels2/src/splash.c
M	glabels2/src/splash.h
M	glabels2/src/stock.h
M	glabels2/src/template-designer.c
M	glabels2/src/template-designer.h
M	glabels2/src/text-node.h
M	glabels2/src/tools.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-sidebar.c
M	glabels2/src/ui-util.c
M	glabels2/src/ui.c
M	glabels2/src/util.c
M	glabels2/src/util.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-highlight.c
M	glabels2/src/view-highlight.h
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/wdgt-chain-button.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-media-select.h
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-copies.h
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-print-merge.h
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/wdgt-rotate-label.h
M	glabels2/src/window.c
M	glabels2/src/window.h
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit 8b5703b7bbbbb9c7bd88090bc6d3b58aee4e99f8
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-16

    2005-04-16	Jim Evins  <evins@snaught.com>

	    * data/glade/Makefile.am:
	    * data/glade/merge-properties-dialog.glade:
		    Added merge properties dialog glade description file.
	    * src/merge-properties-dialog.h:
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_get_type),
	    (gl_merge_properties_dialog_init),
	    (gl_merge_properties_dialog_finalize),
	    (gl_merge_properties_dialog_new),
	    (gl_merge_properties_dialog_construct), (type_changed_cb),
	    (src_changed_cb), (response_cb), (load_tree),
	    (record_select_toggled_cb), (select_all_button_clicked_cb),
	    (unselect_all_button_clicked_cb):
		    Modified merge properties dialog to use libglade.
		    Added
		    "select all" and "unselect all" buttons.
	    * src/merge-text.c: (parse_line):
		    Handle empty lines better.
	    * src/merge.c: (gl_merge_eval_key):
		    Evaluate the key whether the record is selected
		    or not.
	    * src/util.h:
	    * src/util.c: (gl_util_combo_box_add_text_model):
		    Since libglade does not use the
		    gtk_combo_box_new_text()
		    constructor for GtkComboBoxes, a utility function
		    was created
		    to add an appropriate text model to a GtkComboBox.
	    * src/view.c: (gl_view_edit_merge_props):
		    Removed unnecessary "show all's".


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@521
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/Makefile.am
A	glabels2/data/glade/merge-properties-dialog.glade
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge-properties-dialog.h
M	glabels2/src/merge-text.c
M	glabels2/src/merge.c
M	glabels2/src/util.c
M	glabels2/src/util.h
M	glabels2/src/view.c

commit 7013c7014cd9f41690563913707fcfa25dfce5d6
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-16

    2005-04-15	Jim Evins  <evins@snaught.com>

	    * po/ru.po:
		    Updated russian translation (Vitaly Lipatov)
	    * data/templates/misc-iso-templates.xml:
		    Added templates for russian business cards provided
		    by Vitaly Lipatov.
	    * AUTHORS:
		    Updated acknowledgements for above.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@520
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/po/ru.po

commit d420b4bf2aa0b8ae7fc109fa795504ce7ea3309f
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-16

    2005-04-15	Jim Evins  <evins@snaught.com>

	    * data/templates/avery-us-templates.xml:
		    Added Avery 5388 and 5389 templates provided by
		    Peter L. Berghold.
	    * data/templates/misc-iso-templates.xml:
		    Added Ryman standard CD/DVD template, provided by
		    Dan Clark.
	    * AUTHORS:
		    Added acknowledgements for above.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@518
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml

commit cceb27eeb72f647452215fb4bf724f2946428a46
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-10

    2005-04-10	Jim Evins <evins@snaught.com>

	    * libglabels/xml-paper.c: (gl_xml_paper_parse_paper_node):
	    * libglabels/xml-template.c:
	    (gl_xml_template_parse_template_node),
	    (xml_parse_label_rectangle_node),
	    (xml_parse_label_round_node),
	    (xml_parse_label_cd_node), (xml_parse_alias_node):
	    * libglabels/xml.c: (gl_xml_get_prop_double),
	    (gl_xml_get_prop_boolean), (gl_xml_get_prop_int),
	    (gl_xml_get_prop_uint), (gl_xml_get_prop_length):
	    * src/xml-label-04.c: (xml04_parse_media_description),
	    (xml04_parse_text_props), (xml04_parse_barcode_props),
	    (xml04_parse_merge_properties):
	    * src/xml-label-191.c: (xml191_parse_object),
	    (xml191_parse_text_props), (xml191_parse_barcode_props),
	    (xml191_parse_merge_fields), (xml191_parse_pixdata),
	    (xml191_parse_sheet), (xml191_parse_label),
	    (xml191_parse_markup),
	    (xml191_parse_alias):
	    * src/xml-label.c: (xml_parse_object_text),
	    (xml_parse_object_barcode), (xml_parse_merge_fields),
	    (xml_parse_pixdata), (xml_parse_toplevel_span):
		    Make sure to use xmlFree for anything obtained
		    from libxml
		    in case libxml and glib use different memory
		    management
		    space.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@516
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit 21cb58ded51cba453457ac6c47517b32f5915f59
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-09

    2005-04-08	Jim Evins <evins@snaught.com>

	    * src/util.h:
	    * src/util.c: (gl_util_combo_box_set_strings),
	    (search_text_func),
	    (gl_util_combo_box_set_active_text):
		    Added utility functions to simplify working with
		    GtkComboBox
		    widgets in GTK-2.6.
	    * src/ui-property-bar.h:
	    * src/ui-property-bar.c: (gl_ui_property_bar_construct),
	    (reset_to_default_properties), (update_text_properties),
	    (font_family_changed_cb):
		    Replaced deprecated GtkCombo with GtkComboBox.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@515
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-property-bar.h
M	glabels2/src/util.c
M	glabels2/src/util.h

commit d99e9af35cbdba98f6919c63e1d6e6755e2ab66f
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-04

    2005-04-03	Jim Evins <evins@snaught.com>

	    * src/Makefile.am:
	    * src/wdgt-image-select.h:
	    * src/wdgt-image-select.c:
		    Removed obsolete wdgt-image-select.[ch] files.
	    * libglabels/paper.c: (gl_paper_dup):
		    Fixed rename of parameter introduced during
		    documentation
		    updates.
	    * data/glade/object-editor.glade:
	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page), (img_radio_toggled_cb),
	    (gl_object_editor_set_image), (gl_object_editor_get_image),
	    (update_preview_cb), (add_image_filters_to_chooser):
	    * src/object-editor-private.h:
		    Replaced deprecated GnomePixmapEntry with
		    GtkFileChooserButton.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@514
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glade/object-editor.glade
M	glabels2/libglabels/paper.c
M	glabels2/src/Makefile.am
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-private.h
D	glabels2/src/wdgt-image-select.c
D	glabels2/src/wdgt-image-select.h

commit 18e4f3780c76fb968f4ba57636b8c1ec66804b91
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-03

    2005-04-02	Jim Evins <evins@snaught.com>

	    * src/mygal/mygal-combo-box.c: (deactivate_arrow),
	    (mygal_combo_box_popup_hide_unconditional),
	    (mygal_combo_box_popup_hide), (mygal_combo_box_popup_display),
	    (mygal_combo_toggle_pressed), (mygal_combo_box_init),
	    (mygal_combo_popup_tear_off), (mygal_combo_set_tearoff_state),
	    (mygal_combo_tearoff_bg_copy), (mygal_combo_popup_reparent),
	    (cb_tearable_button_release), (mygal_combo_box_set_tearable):
		    Renamed all internal gtk_combo functions to
		    mygal_combo
		    to prevent namespace confusion.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@513
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/mygal/mygal-combo-box.c

commit 27bba0435e5a44ee0a63086c01872eaf070ce3d0
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-03

    2005-04-02	Jim Evins <evins@snaught.com>

	    * src/mygal/color-palette.c:
	    (color_palette_change_custom_color),
	    (cust_color_set), (color_palette_setup):
	    * src/mygal/color-palette.h:
		    Replaced deprecated GnomeColorPicker with
		    GtkColorButton.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@512
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/mygal/color-palette.c
M	glabels2/src/mygal/color-palette.h

commit 7fcb67653dc29f7449baa7f069c3d4bb2ecdd7e9
Author: Jim Evins <evins@snaught.com>
Date:	2005-04-03

	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/enums.sgml:
	    * docs/libglabels/tmpl/paper.sgml:
	    * docs/libglabels/tmpl/xml-paper.sgml:
	    * docs/libglabels/tmpl/xml-template.sgml:
	    * libglabels/enums.h:
	    * libglabels/paper.c: (gl_paper_dup):
	    * libglabels/paper.h:
	    * libglabels/xml-paper.c:
	    * libglabels/xml-template.c:
		    More documentation updates for libglabels.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@511
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/docs/libglabels/libglabels-sections.txt
M	glabels2/docs/libglabels/libglabels-undocumented.txt
M	glabels2/docs/libglabels/tmpl/enums.sgml
M	glabels2/docs/libglabels/tmpl/paper.sgml
M	glabels2/docs/libglabels/tmpl/xml-paper.sgml
M	glabels2/docs/libglabels/tmpl/xml-template.sgml
M	glabels2/libglabels/enums.h
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/paper.h
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-template.c

commit 4b3e8b953927a4350334909c55d0aa790591e3f3
Author: Jim Evins <evins@snaught.com>
Date:	2005-03-24

    2005-03-23	Jim Evins  <evins@snaught.com>

	    * INSTALL:
		    Automatically updated.
	    * Makefile.am:
	    * autogen.sh:
	    * configure.in:
	    * docs/Makefile.am:
	    * docs/libglabels/Makefile.am:
	    * docs/libglabels/libglabels-docs.sgml:
	    * docs/libglabels/libglabels-sections.txt:
	    * docs/libglabels/libglabels-undocumented.txt:
	    * docs/libglabels/tmpl/enums.sgml:
	    * docs/libglabels/tmpl/libglabels-unused.sgml:
	    * docs/libglabels/tmpl/libglabels.sgml:
	    * docs/libglabels/tmpl/paper.sgml:
	    * docs/libglabels/tmpl/template.sgml:
	    * docs/libglabels/tmpl/xml-paper.sgml:
	    * docs/libglabels/tmpl/xml-template.sgml:
	    * docs/libglabels/tmpl/xml.sgml:
		    Added basic gtk-doc stuff to support documenting
		    libglabels
		    API.
	    * libglabels/xml.c:
		    Updated function comments with gtk-doc markup.
	    * missing:
		    Removed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@510
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/INSTALL
M	glabels2/Makefile.am
M	glabels2/autogen.sh
M	glabels2/configure.in
A	glabels2/docs/Makefile.am
A	glabels2/docs/libglabels/Makefile.am
A	glabels2/docs/libglabels/libglabels-docs.sgml
A	glabels2/docs/libglabels/libglabels-overrides.txt
A	glabels2/docs/libglabels/libglabels-sections.txt
A	glabels2/docs/libglabels/libglabels-undocumented.txt
A	glabels2/docs/libglabels/tmpl/enums.sgml
A	glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
A	glabels2/docs/libglabels/tmpl/libglabels.sgml
A	glabels2/docs/libglabels/tmpl/paper.sgml
A	glabels2/docs/libglabels/tmpl/template.sgml
A	glabels2/docs/libglabels/tmpl/xml-paper.sgml
A	glabels2/docs/libglabels/tmpl/xml-template.sgml
A	glabels2/docs/libglabels/tmpl/xml.sgml
M	glabels2/libglabels/xml.c
D	glabels2/missing

commit bf335f6190c755edecd76daa222ddf818c3962f7
Author: Jim Evins <evins@snaught.com>
Date:	2005-03-23

    2005-03-22	Jim Evins  <evins@snaught.com>

	    Since the development version now requires gtk-2.6/gnome-2.10,
	    I
	    have made a first pass at removing deprecations.

	    * configure.in:
	    * libglabels/Makefile.am:
	    * src/Makefile.am:
		    Added configure option to turn on X_DISABLE_DEPRECATED
		    flags.
		    Also removed all remnants of HAVE_FILECHOOSER.
	    * src/file.c: (gl_file_open_real):
		    Removed code for old GtkFileSelection.
	    * libglabels/libglabels-private.h:
	    * libglabels/paper.c:
	    * libglabels/template.c:
	    * libglabels/xml-paper.c:
	    * libglabels/xml-template.c:
	    * libglabels/xml.c:
	    * src/bc.c:
	    * src/file.c:
	    * src/glabels-batch.c:
	    * src/glabels.c:
	    * src/label.c:
	    * src/merge-init.c:
	    * src/merge-properties-dialog.c:
	    * src/merge.c:
	    * src/object-editor.c:
	    * src/prefs-dialog.c:
	    * src/prefs.c:
	    * src/print-dialog.c:
	    * src/print.c:
	    * src/stock.c:
	    * src/template-designer.c:
	    * src/ui-property-bar.c:
	    * src/ui-sidebar.c:
	    * src/view-barcode.c:
	    * src/view-box.c:
	    * src/view-ellipse.c:
	    * src/view-image.c:
	    * src/view-line.c:
	    * src/view-text.c:
	    * src/view.c:
	    * src/wdgt-image-select.c:
	    * src/wdgt-media-select.c:
	    * src/wdgt-print-copies.c:
	    * src/wdgt-print-merge.c:
	    * src/wdgt-rotate-label.c:
	    * src/window.c:
	    * src/xml-label-04.c:
	    * src/xml-label-191.c:
	    * src/xml-label.c:
		    Added '#include <glib/gi18n.h>" where needed.
		    Removed any unused '#include <gnome.h>"s.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@509
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/libglabels/Makefile.am
M	glabels2/libglabels/libglabels-private.h
M	glabels2/libglabels/paper.c
M	glabels2/libglabels/template.c
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-template.c
M	glabels2/libglabels/xml.c
M	glabels2/src/Makefile.am
M	glabels2/src/bc.c
M	glabels2/src/file.c
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/label.c
M	glabels2/src/merge-init.c
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge.c
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs.c
M	glabels2/src/print-dialog.c
M	glabels2/src/print.c
M	glabels2/src/stock.c
M	glabels2/src/template-designer.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-sidebar.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-image-select.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/window.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit c5beb442f3f9bb114d6da1e6bc47785cff1e3e9c
Author: Jim Evins <evins@snaught.com>
Date:	2005-03-23

    2005-03-22	Jim Evins  <evins@snaught.com>

	    * src/commands.c: (activate_url), (gl_cmd_help_about):
		    Replaced GnomeAbout with GtkAboutDialog.
		    Therefore the
		    development version of glabels now depends on GTK
		    2.6 and
		    GNOME 2.10.
	    * configure.in:
		    Updated library dependencies.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@508
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/src/commands.c

commit 578df4908bb69264be20b4e887782ff1276bb2e8
Author: Jim Evins <evins@snaught.com>
Date:	2005-03-01

    2005-02-28	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * data/templates/misc-iso-templates.xml:
		    Added 'Ednet 45021' template provided by Ali Akcaagac
		    <aliakc@web.de>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@507
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/templates/misc-iso-templates.xml

commit 25516165e852af71671d740a8d9ed003ca7846ae
Author: Jim Evins <evins@snaught.com>
Date:	2005-02-15

    2005-02-14	Jim Evins  <evins@snaught.com>

	    * data/templates/avery-us-templates.xml:
		    Updated templates to use inches instead of points.
	    * src/print-dialog.c: (printer_page_new):
		    Changed packing style when adding printer selector
		    widget.  This fixes
		    debian Bug#295274.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@504
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/templates/avery-us-templates.xml
M	glabels2/src/print-dialog.c

commit 7acfd66581cd73e6bf1fa7db370be984ecc1df9e
Author: Jim Evins <evins@snaught.com>
Date:	2005-02-13

    2005-02-13	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * po/es.po:
		    Updated spanish translations. (sergio rivadero)


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@502
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/po/es.po

commit 46b4d3627f3a1af503c1433286dbe78c7e7f2d09
Author: Jim Evins <evins@snaught.com>
Date:	2005-02-06

    2005-02-05	Jim Evins  <evins@snaught.com>

	    Some cleanup to libglabels.

	    * configure.in:
		    Updated version to 2.1.1cvs.  Added generation of
		    libglabels.pc.
	    * libglabels/libglabels.pc.in
		    Created.
	    * libglabels/enums.h
		    Created.  Currently only contains glUnitsType which
		    provides enumerations
		    for all possible units of distance.
	    * libglabels/Makefile.am:
		    Incorporated new files enums.h and libglabels.pc[.in].
	    * libglabels/libglabels.h:
		    Include enums.h.
	    * libglabels/template.h:
	    * libglabels/template.c: (gl_template_layout_new):
		    Changed parameters nx and ny to gint from gdouble.
	    * libglabels/xml.h:
	    * libglabels/xml.c: (gl_xml_get_prop_length),
	    (gl_xml_set_prop_length), (gl_xml_set_default_units):
		    Added support for different output units.
	    * src/prefs-dialog.c: (update_locale_page_from_prefs),
	    (update_prefs_from_locale_page):
	    * src/prefs-model.c: (string_to_units), (units_to_string):
	    * src/prefs-model.h:
	    * src/prefs.c: (gl_prefs_get_units_per_point),
	    (gl_prefs_get_units_precision),
	    (gl_prefs_get_units_step_size),
	    (gl_prefs_get_units_string):
	    * src/prefs.h:
	    * src/wdgt-media-select.c: (details_update),
	    (get_label_size_desc):
		    Reconciled all length enumerations with the new
		    enumerations provided
		    in libglabels/enums.h.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@501
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/libglabels/Makefile.am
C066	glabels2/libglabels/libglabels.h
glabels2/libglabels/enums.h
M	glabels2/libglabels/libglabels.h
A	glabels2/libglabels/libglabels.pc.in
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml.c
M	glabels2/libglabels/xml.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/prefs.c
M	glabels2/src/prefs.h
M	glabels2/src/wdgt-media-select.c

commit 80c6dfde91a3ca72b4015c50ecebb7898fc474ae
Author: Jim Evins <evins@snaught.com>
Date:	2005-02-04

    2005-02-03	Jim Evins  <evins@snaught.com>

	    * po/cs.po:
		    Updated Czech translations. (David Makovský and
		    Zbynek Mrkvick)
	    * po/it.po:
		    Updated Italian translations. (Daniele Medri)
	    * AUTHORS:
		    Updated credits to reflect above translations.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@500
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/po/cs.po
M	glabels2/po/it.po

commit d4cb26542c64b720aa718adb1aacde180d9f8b32
Author: Jim Evins <evins@snaught.com>
Date:	2005-01-22

    2005-01-22	Jim Evins  <evins@snaught.com>

	    * MESSAGE-OF-DOOM:
		    Added.
	    * Makefile.am:
		    Added MESSAGE-OF-DOOM to EXTRA_DIST.
	    * NEWS:
		    Final prep for 2.1.0.
	    * configure.in:
		    Set version to 2.1.0.  Output MESSAGE-OF-DOOM.
	    * glabels.spec.in:
		    Added '--remove-original' flag to
		    desktop-file-install, so that there is
		    only one menu entry.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@497
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
A	glabels2/MESSAGE-OF-DOOM
M	glabels2/Makefile.am
M	glabels2/NEWS
M	glabels2/configure.in
M	glabels2/data/desktop/glabels.desktop.in
M	glabels2/data/dtd/glabels-2.0.dtd
M	glabels2/data/glade/object-editor.glade
M	glabels2/data/man/glabels.1
M	glabels2/data/mime/glabels.keys.in
M	glabels2/data/pixmaps/Makefile.am
M	glabels2/data/pixmaps/glabels-about-logo.png
A	glabels2/data/pixmaps/glabels-application-x-glabels.png
D	glabels2/data/pixmaps/glabels-icon.png
R100	glabels2/data/pixmaps/glabels-logo.png
glabels2/data/pixmaps/glabels-splash.png
M	glabels2/data/pixmaps/glabels.png
M	glabels2/data/templates/avery-iso-templates.xml
M	glabels2/data/templates/misc-iso-templates.xml
M	glabels2/data/templates/misc-us-templates.xml
M	glabels2/data/ui/glabels-ui.xml
M	glabels2/glabels.spec.in
D	glabels2/mkinstalldirs
M	glabels2/po/fr.po
M	glabels2/src/Makefile.am
M	glabels2/src/color.c
M	glabels2/src/color.h
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/label-barcode.c
M	glabels2/src/label-box.c
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-line.c
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.h
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/print.c
M	glabels2/src/print.h
M	glabels2/src/splash.c
M	glabels2/src/template-designer.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/window.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit fb62736c8d9761183cc64ded63a9b5ff9fc5ae3d
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-22

    2004-08-22	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * src/glabels-batch.c: (main):
		    Applied patch with minor mods to allow selecting
		    merge source and
		    crop-marks on glabels-batch's command line.
		    Original patch provided by
		    José Dapena Paz <jdapena@igalia.com>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@461
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/src/glabels-batch.c

commit 83246d813303e9b6459abad3ea7fa3367eac06c6
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-15

    2004-08-15	Jim Evins  <evins@snaught.com>

	    * data/desktop/glabels.desktop.in:
		    - Added encoding line
		    - Removed period from comment
		    - Fixed Terminal line, changed "0" to "false"
		    - Added semicolen to Categories line
	    * po/ja.po:
		    - Made sure desktop.in comment string above still
		    translated properly


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@460
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/desktop/glabels.desktop.in
M	glabels2/po/ja.po

commit 968a16da88603023f7c7b5e526fd5a7a9099d94c
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-15

    2004-08-14	Jim Evins  <evins@snaught.com>

	    * libglabels/xml-paper.c: (gl_xml_paper_parse_paper_node):
	    * libglabels/xml-template.c:
	    (gl_xml_template_parse_template_node):
	    * src/xml-label-191.c: (xml191_parse_sheet):
		    Fixed improper freeing of gettext strings.
		    Merged from 2.0.1.
	    * configure.in:
		    Reconciled libglabels versioning with 2.0.1.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@457
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/libglabels/xml-paper.c
M	glabels2/libglabels/xml-template.c
M	glabels2/src/xml-label-191.c

commit abae8fc459f68745dbc6369fd5b71dffad62e256
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-14

    2004-08-14	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Updated version to 2.1cvs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@452
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in

commit 9f33ea2bb3803234511af8e7fbd454eacce42877
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-14

    2004-08-14	Jim Evins  <evins@snaught.com>

	    * po/ja.po:
		    Updated 2.0.x translation by Takeshi AIHANA
		    <aihana@gnome.gr.jp>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@449
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/po/ja.po

commit a5659c418bcd65d7435c3ce51613801a64d0ac1a
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-14

    2004-08-14	Jim Evins  <evins@snaught.com>

	    Fixes for Bug #1008181.

	    * src/bc.c: (gl_barcode_default_digits):
		    Make a format of zero digits, harmless.
	    * src/xml-label.c: (xml_parse_object_barcode):
		    Set default value of the format property of barcode
		    objects to 10, not
		    zero.  This will prevent crashes when reading pre
		    2.0.x files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@448
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/bc.c
M	glabels2/src/xml-label.c

commit 342ce3d7a1b5dd0b214cafa5062b9822d171d959
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-09

    2004-08-09	Jim Evins  <evins@snaught.com>

	    * NEWS:
	    * TODO:
	    * help/C/glabels-C.omf:
	    * help/C/glabels.xml:
		    Brought documentation up-to-date for 2.0.0 release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@445
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/NEWS

commit 02bee8734212c7fd340a00788764001f698bab05
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-09

    2004-08-09	Jim Evins  <evins@snaught.com>

	    * NEWS:
	    * TODO:
	    * help/C/glabels-C.omf:
	    * help/C/glabels.xml:
		    Brought documentation up-to-date for 2.0.0 release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@444
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/NEWS
M	glabels2/TODO
M	glabels2/help/C/glabels-C.omf
M	glabels2/help/C/glabels.xml

commit 356e6b3d52372448409a359f07ad04c73fa35a82
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-09

    2004-08-09	Jim Evins  <evins@snaught.com>

	    These are hopefully the final preparations for 2.0.0.

	    * data/mime/Makefile.am:
		    Include glabels.xml in EXTRA_DIST.
	    * configure.in:
		    - Updated comment style.
		    - Added LIBGLABELS_VERSION_INFO macro, updated
		    Current.
		    - Added package and version info to configuration
		    printout
		    - Update version to 2.0.0
	    * libglabels/Makefile.am:
		    Use the new LIBGLABELS_VERSION_INFO macro.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@443
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/data/mime/Makefile.am
M	glabels2/libglabels/Makefile.am

commit db1a07eb0f330390e2b7fd6f4d82647f076a307d
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-09

    2004-08-09	Jim Evins  <evins@snaught.com>

	    * configure.in:
	    * glabels.spec.in:
		    Cleanup of required library macros.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@442
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/glabels.spec.in

commit 7427f8f1bced3e4bc465d0d0492019435193d9d0
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-08

    2004-08-08	Jim Evins  <evins@snaught.com>

	    * glabels.spec.in:
		    - Updated URL
		    - More specific of what to install in /usr/bin
		    and /usr/lib
		    - Remove built mime registration files from staging
		    directory


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@441
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/glabels.spec.in

commit 4f4f868eade0e1e5f9c6c8640cc424a209e930ea
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-08

    2004-08-08	Jim Evins  <evins@snaught.com>

	    * data/mime/Makefile.am:
		    Fixed typo:  key_files should have been keys_files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@440
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/mime/Makefile.am

commit 3470ca951a824cee7a23eec888299124eed6eb13
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-08

    2004-08-08	Jim Evins  <evins@snaught.com>

	    Reorganization of runtime data files.  Also added registration
	    of mimetype with
	    new freedesktop.org mime database if available.

	    * data/*
		    Moved files to appropriate subdirectories, creating
		    local Makefile.am
		    in each subdirectory.
		    - Moved paper-sizes.xml and *-templates.xml to
		    templates subdirectory.
		      These are now installed at
		      $datadir/glabels/templates.
		    - Moved glabels.1 to man subdirectory.
		    - Moved glabels-2.0.dtd to dtd subdirectory.
		    - Moved glabels.desktop.in to desktop subdirectory.
		    - Moved glabels.keys.in and glabels.mime to mime
		    subdirectory.
	    * data/pixmaps/*
		    Moved "./pixmaps" to "./data/pixmaps"
	    * data/ui/*
		    Moved src/glabels-ui.xml to data/ui directory. Created
		    Makefile.am.
	    * data/glade/*
		    Moved libglade files from src to data/glade. Created
		    Makefile.am.
	    * Makefile.am:
		    Removed pixmaps from SUBDIRS.
	    * configure.in:
		    - Removed pixmaps from makefiles.
		    - Added makefiles for new subdirs of data.
		    - Added tests for freedesktop.org mime database.
	    * glabels.spec.in:
		    - Added tests for freedesktop.org mime database for
		    post install and
		      post un-install actions.
	    * libglabels/Makefile.am:
		    Moved system template files to
		    $(datadir)/glabels/templates.
	    * libglabels/libglabels-private.h:
		    Moved system template files to
		    $(datadir)/glabels/templates.
	    * po/POTFILES.in:
		    - Accounted for movement of ui and libglade files.
		    - Added missing .in files.
		    - Reorganized by directory.
	    * src/Makefile.am:
		    Accounted for movement of ui and libglade files.
	    * data/mime/glabels.xml.in:
		    New file for registering with freedesktop.org mime
		    database.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@439
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/Makefile.am
M	glabels2/configure.in
M	glabels2/data/Makefile.am
A	glabels2/data/desktop/Makefile.am
A	glabels2/data/desktop/glabels.desktop.in
A	glabels2/data/dtd/Makefile.am
R100	glabels2/data/glabels-2.0.dtd	glabels2/data/dtd/glabels-2.0.dtd
D	glabels2/data/glabels.desktop.in
A	glabels2/data/glade/Makefile.am
R100	glabels2/src/object-editor.glade
glabels2/data/glade/object-editor.glade
R100	glabels2/src/prefs-dialog.glade
glabels2/data/glade/prefs-dialog.glade
R100	glabels2/src/template-designer.glade
glabels2/data/glade/template-designer.glade
A	glabels2/data/man/Makefile.am
R100	glabels2/data/glabels.1 glabels2/data/man/glabels.1
A	glabels2/data/mime/Makefile.am
R100	glabels2/data/glabels.applications
glabels2/data/mime/glabels.applications
R090	glabels2/data/glabels.keys.in	glabels2/data/mime/glabels.keys.in
R100	glabels2/data/glabels.mime	glabels2/data/mime/glabels.mime
A	glabels2/data/mime/glabels.xml.in
R100	glabels2/pixmaps/Makefile.am	glabels2/data/pixmaps/Makefile.am
R100	glabels2/pixmaps/ex-1layout.png
glabels2/data/pixmaps/ex-1layout.png
R100	glabels2/pixmaps/ex-2layouts.png
glabels2/data/pixmaps/ex-2layouts.png
R100	glabels2/pixmaps/ex-cd-size.png
glabels2/data/pixmaps/ex-cd-size.png
R100	glabels2/pixmaps/ex-rect-size.png
glabels2/data/pixmaps/ex-rect-size.png
R100	glabels2/pixmaps/ex-round-size.png
glabels2/data/pixmaps/ex-round-size.png
R057	glabels2/pixmaps/glabels-about-logo.png
glabels2/data/pixmaps/glabels-about-logo.png
R100	glabels2/pixmaps/glabels-icon.png
glabels2/data/pixmaps/glabels-icon.png
A	glabels2/data/pixmaps/glabels-logo.png
R100	glabels2/pixmaps/glabels.png	glabels2/data/pixmaps/glabels.png
A	glabels2/data/templates/Makefile.am
R100	glabels2/data/avery-iso-templates.xml
glabels2/data/templates/avery-iso-templates.xml
R100	glabels2/data/avery-other-templates.xml
glabels2/data/templates/avery-other-templates.xml
R100	glabels2/data/avery-us-templates.xml
glabels2/data/templates/avery-us-templates.xml
R100	glabels2/data/misc-iso-templates.xml
glabels2/data/templates/misc-iso-templates.xml
R100	glabels2/data/misc-other-templates.xml
glabels2/data/templates/misc-other-templates.xml
R100	glabels2/data/misc-us-templates.xml
glabels2/data/templates/misc-us-templates.xml
R100	glabels2/data/paper-sizes.xml
glabels2/data/templates/paper-sizes.xml
R100	glabels2/data/zweckform-iso-templates.xml
glabels2/data/templates/zweckform-iso-templates.xml
A	glabels2/data/ui/Makefile.am
R100	glabels2/src/glabels-ui.xml	glabels2/data/ui/glabels-ui.xml
M	glabels2/glabels.spec.in
M	glabels2/libglabels/Makefile.am
M	glabels2/libglabels/libglabels-private.h
D	glabels2/pixmaps/glabels-logo.png
M	glabels2/po/POTFILES.in
M	glabels2/po/cs.po
M	glabels2/po/de.po
M	glabels2/po/es.po
M	glabels2/po/fr.po
M	glabels2/po/it.po
M	glabels2/po/ja.po
M	glabels2/po/pl.po
M	glabels2/po/pt_BR.po
M	glabels2/po/ru.po
M	glabels2/po/zh_TW.Big5.po
M	glabels2/src/Makefile.am

commit d4ecd627e9dbeb831a9751c67d3e4bd983f73ccd
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-07

    2004-08-07	Jim Evins  <evins@snaught.com>

	    * src/recent-files/*:
		    Re-synced to latest libegg/recent-files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@438
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/recent-files/Makefile.am
M	glabels2/src/recent-files/egg-recent-item.c
M	glabels2/src/recent-files/egg-recent-item.h
M	glabels2/src/recent-files/egg-recent-model.c
M	glabels2/src/recent-files/egg-recent-util.c
D	glabels2/src/recent-files/egg-recent-vfs-utils.c
D	glabels2/src/recent-files/egg-recent-vfs-utils.h
M	glabels2/src/recent-files/egg-recent-view-gtk.c
M	glabels2/src/recent-files/egg-recent-view.h
A	glabels2/src/recent-files/egg-recent.h

commit dcfe50a8208c3959e1b0313fd92619fe754a945a
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-07

    2004-08-07	Jim Evins  <evins@snaught.com>

	    * Makefile.am:
	    * configure.in:
	    * help/*
		    Renamed "./doc" directory to "./help" which contains
		    user documentation,
		    to be more consistent with other GNOME applications.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@437
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/help/C/Makefile.am
A	glabels2/help/C/figures/glabels-template-cd.png
A	glabels2/help/C/figures/glabels-template-label.png
A	glabels2/help/C/figures/glabels-template-layout.png
A	glabels2/help/C/figures/main-window-empty.png
A	glabels2/help/C/figures/object-editor-sidebar.png
A	glabels2/help/C/figures/print-copies.png
A	glabels2/help/C/figures/print-merge.png
A	glabels2/help/C/glabels-C.omf
A	glabels2/help/C/glabels.xml
A	glabels2/help/C/legal.xml
A	glabels2/help/Makefile.am

commit a1220b934f65cb92dc9f70f4a56202f5dcc990c3
Author: Jim Evins <evins@snaught.com>
Date:	2004-08-07

    2004-08-07	Jim Evins  <evins@snaught.com>

	    * Makefile.am:
	    * configure.in:
	    * help/*
		    Renamed "./doc" directory to "./help" which contains
		    user documentation,
		    to be more consistent with other GNOME applications.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@436
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/Makefile.am
M	glabels2/configure.in

commit 1e4aa252e63eda3a5c119028baebe5b8d76fcbf5
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-26

    2004-07-26	Jim Evins  <evins@snaught.com>

	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_init):
		    Corrected button order of merge properties dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@435
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/merge-properties-dialog.c

commit e84ded9f15e286b712ea5d1f876eed9e5d45c563
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-18

    2004-07-18	Jim Evins  <evins@snaught.com>

	    * data/glabels-2.0.dtd:
	    * src/bc.c: (gl_barcode_default_digits),
	    (gl_barcode_can_freeform),
	    (gl_barcode_get_prefered_n):
	    * src/bc.h:
	    * src/label-barcode.c: (copy), (gl_label_barcode_set_props),
	    (gl_label_barcode_get_props), (get_size):
	    * src/label-barcode.h:
	    * src/object-editor-bc-page.c:
	    (gl_object_editor_prepare_bc_page),
	    (style_changed_cb), (gl_object_editor_set_bc_style),
	    (gl_object_editor_get_bc_style):
	    * src/object-editor-data-page.c: (data_radio_toggled_cb),
	    (gl_object_editor_set_data), (gl_object_editor_get_data):
	    * src/object-editor-private.h:
	    * src/object-editor.c: (gl_object_editor_set_key_names):
	    * src/object-editor.glade:
	    * src/object-editor.h:
	    * src/print.c: (draw_barcode_object):
	    * src/view-barcode.c: (update_object_from_editor_cb),
	    (update_editor_from_object_cb),
	    (gl_view_barcode_create_event_handler), (draw_barcode):
	    * src/xml-label-04.c: (xml04_parse_barcode_props):
	    * src/xml-label-191.c: (xml191_parse_barcode_props):
	    * src/xml-label.c: (xml_parse_object_barcode),
	    (xml_create_object_barcode):
		    Added "format" attribute to barcode objects.
		    This attribute is used
		    to properly format freeform barcodes barcodes prior
		    to merge data is
		    applied, so that barcodes can be accurately layed out.
		    This addresses
		    remaining issues of feature request #824787.
		    Also added an example of
		    the format in the object editor.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@434
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glabels-2.0.dtd
M	glabels2/src/bc.c
M	glabels2/src/bc.h
M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.glade
M	glabels2/src/object-editor.h
M	glabels2/src/print.c
M	glabels2/src/view-barcode.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit fe42d658938053fa034ba7b8e56e3d6b5ba098ca
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-12

    2004-07-12	Jim Evins  <evins@snaught.com>

	    Various code cleanups.

	    * src/label-barcode.c:
		    Removed unneeded include of gnome-glyphlist.h.

	    * src/label-text.c: (get_size):
		    Fixed memory leak: unref glyphlists when done
		    with them.

	    * src/object-editor-bc-page.c:
	    (gl_object_editor_prepare_bc_page):
	    * src/object-editor-data-page.c:
	    (gl_object_editor_prepare_data_page):
	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page):
	    * src/object-editor-line-page.c:
	    (gl_object_editor_prepare_line_page):
	    * src/object-editor-lsize-page.c:
	    (gl_object_editor_prepare_lsize_page):
	    * src/object-editor-position-page.c:
	    (gl_object_editor_prepare_position_page):
	    * src/object-editor-size-page.c:
	    (gl_object_editor_prepare_size_page):
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page):
		    Removed unneeded size groups, originally intended
		    to keep widgets aligned.
		    Now use tables to lay these out in
		    object-editor.glade.

	    * src/print.c: (draw_text_object):
		    Fixed memory leak: unref glyphlists when done
		    with them.

	    * src/view-barcode.c: (draw_barcode):
		    Fixed memory leak: unref glyphlists when done
		    with them.

	    * src/view-text.c: (update_object_from_editor_cb),
	    (draw_hacktext):
		    - Removed unneeded cast of
		    gl_object_editor_get_text_line_spacing()s
		      return value.
		    - Fixed memory leak: unref glyphlists when done
		    with them.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@433
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-barcode.c
M	glabels2/src/label-text.c
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-data-page.c
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/object-editor-line-page.c
M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/print.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-text.c

commit 00ddb9df4fe9f2ae732a5561ea7b8867aa8433d4
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-12

    2004-07-11	Jim Evins  <evins@snaught.com>

	    * data/glabels-2.0.dtd:
	    * src/label-text.c: (gl_label_text_instance_init), (copy),
	    (gl_label_text_set_auto_shrink),
	    (gl_label_text_get_auto_shrink):
	    * src/label-text.h:
	    * src/object-editor-private.h:
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page),
	    (gl_object_editor_set_text_auto_shrink),
	    (gl_object_editor_get_text_auto_shrink):
	    * src/object-editor.c: (gl_object_editor_set_key_names):
	    * src/object-editor.glade:
	    * src/object-editor.h:
	    * src/print.c: (draw_text_object):
	    * src/view-text.c: (update_object_from_editor_cb),
	    (update_editor_from_object_cb):
	    * src/xml-label.c: (xml_parse_object_text),
	    (xml_create_object_text):
		    Added option to allow document merge to auto shrink
		    text size to fit
		    within the text box.  The code in print.c that
		    actually shrinks the
		    text is loosely based on a patch submitted by Mark
		    Harrison
		    <mark.harrison@velocitynet.com.au>.  This addresses
		    feature request
		    #661421.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@432
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glabels-2.0.dtd
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.glade
M	glabels2/src/object-editor.h
M	glabels2/src/print.c
M	glabels2/src/view-text.c
M	glabels2/src/xml-label.c

commit 1fd401c400027d08f75b0a1105a47ba3b416e193
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-11

    2004-07-11	Jim Evins  <evins@snaught.com>

	    * data/glabels-2.0.dtd:
	    * libglabels/template.c: (gl_template_rect_label_type_new),
	    (gl_template_round_label_type_new),
	    (gl_template_cd_label_type_new), (gl_template_label_type_dup),
	    (template_full_page):
	    * libglabels/template.h:
	    * libglabels/xml-template.c: (xml_parse_label_rectangle_node),
	    (xml_create_label_node):
	    * pixmaps/ex-rect-size.png:
	    * src/print.c: (clip_to_outline), (clip_punchouts):
	    * src/template-designer.c: (construct_rect_size_page),
	    (rect_size_page_prepare_cb), (layout_page_prepare_cb),
	    (build_template):
	    * src/template-designer.glade:
	    * src/xml-label-191.c: (xml191_parse_label):
		    Modifications to allow separate horizontal (x_waste)
		    and vertical (y_waste)
		    properties for rectangular labels.	Templates remain
		    backwards compatible,
		    but this breaks the libglabels API (I don't know of
		    anyone outside of
		    glabels using libglabels at this time -- what can
		    I say, the program is
		    is still "unstable").  This addresses the suggestion
		    in Feature Request
		    #976313.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@431
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glabels-2.0.dtd
M	glabels2/libglabels/template.c
M	glabels2/libglabels/template.h
M	glabels2/libglabels/xml-template.c
M	glabels2/pixmaps/ex-rect-size.png
M	glabels2/src/print.c
M	glabels2/src/template-designer.c
M	glabels2/src/template-designer.glade
M	glabels2/src/xml-label-191.c

commit e2bb3e9baa9e37d525cd36408dcc5ef1c9008bcd
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-06

    2004-07-05	Jim Evins  <evins@snaught.com>
	    * src/print.c: (print_crop_marks), (draw_outline):
		    Changed crop marks and label outlines to black,
		    instead of 25% gray.
		    This addresses debian Bug #257460.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@430
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/print.c

commit 64e93eac58ec9545c3896e271ce3b78f23ebea26
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-05

    2004-07-05	Jim Evins  <evins@snaught.com>

	    * src/object-editor-fill-page.c:
	    (gl_object_editor_set_fill_color):
	    * src/object-editor-line-page.c:
	    (gl_object_editor_set_line_color):
		    Preserve "is_default" of fill and line color_combos
		    when creating from
		    existing objects.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@429
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/object-editor-fill-page.c
M	glabels2/src/object-editor-line-page.c

commit 6ebd01b8a785ff3e49fafa0e0f94369ac9f95ca1
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-02

    2004-07-02	Jim Evins  <evins@snaught.com>

	    * data/glabels.1:
		    Created man page.  Based on page submitted by Matthew
		    J. Lockner, however
		    it has been severely edited.

	    * data/avery-other-templates.xml
	    * data/misc-other-templates.xml:
		    Started new files for predefined templates with
		    non-standard sheet sizes.
		    These have been initially populated with the Avery
		    06141 and
		    OfficeMax #86112, both provided by Matthew J. Lockner.

	    * data/Makefile.am:
		    Install above manpage and template files.

	    * glabels.spec.in:
		    Make sure we install man pages.

	    * src/glabels-batch.c:
		    Changed short form of help option to '-?' to be
		    consistent with glabels.

	    * AUTHORS:
		    Added acknowledgement for above labels.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@428
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/Makefile.am
A	glabels2/data/avery-other-templates.xml
A	glabels2/data/glabels.1
A	glabels2/data/misc-other-templates.xml
M	glabels2/glabels.spec.in
M	glabels2/src/glabels-batch.c

commit d64bd058272ae98ad15f2995edddeb8570d2b64d
Author: Jim Evins <evins@snaught.com>
Date:	2004-07-02

    2004-07-02	Jim Evins  <evins@snaught.com>

	    * src/glabels.c: (main), (save_session_cb):
		    - Now include libbonoboui.h, recent.h, and file.h
		    to provide missing
		      prototypes.
		    - save_session_cb() now returns gboolean.
		    - Minor formatting changes.

	    * src/window.h:
	    * src/window.c:
		    - Now include file.h to provide missing prototype.
		    - gl_window_get_type() now returns GType, not guint.
		    I believe this may
		      ultimately be cause of the segfault reported in
		      Bug #982287, since
		      GType is actually a gulong, which may not be
		      compatible on other
		      architectures (64bit) -- I cannot personally test
		      this at this time.
		      I was sloppy in several other xxx_get_type()
		      functions which also
		      returned guint -- see next group of files:

	    * src/window.c: (gl_window_get_type):
	    * src/canvas-hacktext.c: (gl_canvas_hacktext_get_type):
	    * src/canvas-hacktext.h:
	    * src/hig.c: (gl_hig_alert_get_type),
	    (gl_hig_dialog_get_type),
	    (gl_hig_category_get_type), (gl_hig_vbox_get_type),
	    (gl_hig_hbox_get_type):
	    * src/hig.h:
	    * src/label-barcode.c: (gl_label_barcode_get_type):
	    * src/label-barcode.h:
	    * src/label-box.c: (gl_label_box_get_type):
	    * src/label-box.h:
	    * src/label-ellipse.c: (gl_label_ellipse_get_type):
	    * src/label-ellipse.h:
	    * src/label-image.c: (gl_label_image_get_type):
	    * src/label-image.h:
	    * src/label-line.c: (gl_label_line_get_type):
	    * src/label-line.h:
	    * src/label-object.c: (gl_label_object_get_type):
	    * src/label-object.h:
	    * src/label-text.c: (gl_label_text_get_type):
	    * src/label-text.h:
	    * src/label.c: (gl_label_get_type):
	    * src/label.h:
	    * src/merge-properties-dialog.c:
	    (gl_merge_properties_dialog_get_type):
	    * src/merge-properties-dialog.h:
	    * src/merge-text.c: (gl_merge_text_get_type):
	    * src/merge-text.h:
	    * src/merge.c: (gl_merge_get_type):
	    * src/merge.h:
	    * src/object-editor.c: (gl_object_editor_get_type):
	    * src/prefs-dialog.c: (gl_prefs_dialog_get_type):
	    * src/prefs-dialog.h:
	    * src/prefs-model.c: (gl_prefs_model_get_type):
	    * src/prefs-model.h:
	    * src/print-dialog.c: (gl_print_dialog_get_type):
	    * src/print-dialog.h:
	    * src/template-designer.c: (gl_template_designer_get_type):
	    * src/template-designer.h:
	    * src/ui-property-bar.c: (gl_ui_property_bar_get_type):
	    * src/ui-property-bar.h:
	    * src/ui-sidebar.c: (gl_ui_sidebar_get_type):
	    * src/ui-sidebar.h:
	    * src/view-barcode.c: (gl_view_barcode_get_type):
	    * src/view-barcode.h:
	    * src/view-box.c: (gl_view_box_get_type):
	    * src/view-box.h:
	    * src/view-ellipse.c: (gl_view_ellipse_get_type):
	    * src/view-ellipse.h:
	    * src/view-highlight.c: (gl_view_highlight_get_type):
	    * src/view-highlight.h:
	    * src/view-image.c: (gl_view_image_get_type):
	    * src/view-image.h:
	    * src/view-line.c: (gl_view_line_get_type):
	    * src/view-line.h:
	    * src/view-object.c: (gl_view_object_get_type):
	    * src/view-object.h:
	    * src/view-text.c: (gl_view_text_get_type):
	    * src/view-text.h:
	    * src/view.c: (gl_view_get_type):
	    * src/view.h:
	    * src/wdgt-chain-button.c: (gl_wdgt_chain_button_get_type):
	    * src/wdgt-image-select.c: (gl_wdgt_image_select_get_type):
	    * src/wdgt-image-select.h:
	    * src/wdgt-media-select.c: (gl_wdgt_media_select_get_type):
	    * src/wdgt-media-select.h:
	    * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_get_type):
	    * src/wdgt-mini-preview.h:
	    * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type):
	    * src/wdgt-print-copies.h:
	    * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type):
	    * src/wdgt-print-merge.h:
	    * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_get_type):
	    * src/wdgt-rotate-label.h:
		    - Made sure all xxx_get_type functions returned GType,
		    not guint.	This
		      was the case in hig.[ch], window.[ch],
		      ui-property-bar.[ch],
		      ui-sidebar.[ch], view.[ch], wdgt-image-select.[ch],
		      wdgt-media-select.[ch], wdgt-mini-preview.[ch],
		      wdgt-print-copies.[ch],
		      wdt-print-merge.[ch], and wdgt-rotate-label.[ch].
		      See separate
		      window.[ch] details above for more info.
		    - Reconciled various coding style differences in
		    all xxx_get_type()
		      functions:
			    * All prototypes include G_GNUC_CONST.
			    * All prototypes specify the return value
			    as GType, not GtkType
			      or guint.
			    * Info structures are all declared as
			    "static const."
			    * Generalized the names of type and info
			    variables.
			    * Miscelaneous formatting.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@427
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/canvas-hacktext.c
M	glabels2/src/canvas-hacktext.h
M	glabels2/src/glabels.c
M	glabels2/src/hig.c
M	glabels2/src/hig.h
M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/label-box.c
M	glabels2/src/label-box.h
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-ellipse.h
M	glabels2/src/label-image.c
M	glabels2/src/label-image.h
M	glabels2/src/label-line.c
M	glabels2/src/label-line.h
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge-properties-dialog.h
M	glabels2/src/merge-text.c
M	glabels2/src/merge-text.h
M	glabels2/src/merge.c
M	glabels2/src/merge.h
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-dialog.h
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/print-dialog.c
M	glabels2/src/print-dialog.h
M	glabels2/src/template-designer.c
M	glabels2/src/template-designer.h
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-property-bar.h
M	glabels2/src/ui-sidebar.c
M	glabels2/src/ui-sidebar.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-barcode.h
M	glabels2/src/view-box.c
M	glabels2/src/view-box.h
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-ellipse.h
M	glabels2/src/view-highlight.c
M	glabels2/src/view-highlight.h
M	glabels2/src/view-image.c
M	glabels2/src/view-image.h
M	glabels2/src/view-line.c
M	glabels2/src/view-line.h
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c
M	glabels2/src/view-text.h
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/wdgt-chain-button.c
M	glabels2/src/wdgt-image-select.c
M	glabels2/src/wdgt-image-select.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-media-select.h
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-copies.h
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-print-merge.h
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/wdgt-rotate-label.h
M	glabels2/src/window.c
M	glabels2/src/window.h

commit 8917cca244d9e34768af178a54238683ec8127e2
Author: Jim Evins <evins@snaught.com>
Date:	2004-06-12

    2004-06-08	Jim Evins  <evins@snaught.com>

	    * src/label.c:
	    * src/label.h:
	    * src/xml-label.c:
	    * AUTHORS:
		    Don't touch compression of original file -- still
		    defaults to 9 for
		    new files.	Original patch provided by Javier
		    Donaire Segarra
		    (#912252 in patch tracker).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@426
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog

commit 7256870b60b9aa34b538a1d4b59fe455aefbcb29
Author: Jim Evins <evins@snaught.com>
Date:	2004-06-08

    Don't touch compression of original file -- still defaults to 9
    for new files.  Original patch provided by Javier Donaire Segarra
    (#912252 in patch tracker).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@425
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/xml-label.c

commit 20808aa3eca1b58fd8a8818699ce6afeaaedea1c
Author: Jim Evins <evins@snaught.com>
Date:	2004-05-06

    2004-05-05	Jim Evins  <evins@snaught.com>

	    * data/glabels-2.0.dtd:
		    Broke DTD previously when adding new barcode types
		    that contain
    a
		    plus sign (+).  Simply changed the BC_STYLE_TYPE
		    entity to "CDATA"
		    to avoid the problem.
	    * data/avery-iso-templates.xml:
	    * data/zweckform-iso-templates.xml:
	    * AUTHORS:
		    Added templates for Avery 7165, Zweckform 3688,
		    4732, and 6021.
     Templates
		    provided by Frank Altpeter.
	    * libglabels/xml-template.c: (xml_create_label_node):
		    Reordered markup and layout sub-nodes so that
		    resulting templates will
		    validate against DTD.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@424
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/avery-iso-templates.xml
M	glabels2/data/glabels-2.0.dtd
M	glabels2/data/zweckform-iso-templates.xml
M	glabels2/libglabels/xml-template.c

commit 9ddb032772f0b86540354e53e033a594a6e803d7
Author: Jim Evins <evins@snaught.com>
Date:	2004-03-14

    2004-03-13	Jim Evins  <evins@snaught.com>

	    * src/object-editor-size-page.c:
	    (gl_object_editor_prepare_size_page):
		    Changed spin callback signals from "value-changed"
		    back to "changed."
		    This was accidentally introduced in a previous
		    revision, and can cause
		    size changes just by selecting the size tab.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@423
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/object-editor-size-page.c

commit 9d106262d34c861c16ad1d32bb410513b5e3d030
Author: Jim Evins <evins@snaught.com>
Date:	2004-03-07

    2004-03-06	Jim Evins  <evins@snaught.com>

	    * src/view.c: (draw_grid_layer):
		    For round labels (round and cd) adjust grid so that
		    it lines up with
		    center of label.  Also, no longer draw box around
		    label in the grid layer,
		    it is hidden by he fg layer anyway.  Feature suggested
		    by
		    nemolivier@free.fr.  Although the grid is aligned
		    with the center of the
		    label, the coordinate system is still relative to
		    the upper left corner
		    of the rectangle containing the label.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@422
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/view.c

commit 60d890a26c81ee5fe3b6aeb587095ddc891d1871
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-26

    2004-02-25	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Changed version to 2.0pre1cvs

	    * libglabels/xml-template.c:
	    (gl_xml_template_parse_templates_doc):
		    Removed extra xmlFreeDoc() calls upon error.
		    Also print the doc->URL
		    instead of doc->name fields when errors encountered.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@421
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/libglabels/xml-template.c

commit db892e05bdff8969d492480eaabfd53cc4d26e0e
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-21

    2004-02-21	Jim Evins  <evins@snaught.com>

	    * data/avery-iso-templates.xml:
		    Added aliases for Avery 8651.  Patch provided by
		    Wayne Schuller.

	    * glabels.spec.in:
		    Added libglabels library and include file to
		    installed files.

	    * configure.in:
		    Final prep for 1.93.3.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@419
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/data/avery-iso-templates.xml
M	glabels2/glabels.spec.in

commit 02ab3e0ba36d0d0e212c49d536d9988b472433a5
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-21

    2004-02-20	Jim Evins  <evins@snaught.com>

	    * src/glabels-batch.c: (main):
		    Changed key for setting output filename to
		    GNOME_PRINT_KEY_OUTPUT_FILENAME
		    as suggested by Javier Donaire Segarra.  This
		    addresses bug #901063.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@418
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/glabels-batch.c

commit 5f4d73307100027c51108750bc00fd0245898f90
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-17

    2004-02-16	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    If gtk+ >= 2.3.2 then define HAVE_FILE_CHOOSER.

	    * src/Makefile.am:
		    Added HAVE_FILE_CHOOSER to INCLUDES.

	    * src/file.c: (gl_file_open), (open_response),
	    (gl_file_open_real),
	    (gl_file_save_as), (save_as_response):
		    Ported to use GtkFileChooserDialog if
		    HAVE_FILE_CHOOSER is defined.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@417
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in
M	glabels2/src/Makefile.am
M	glabels2/src/file.c

commit 70ae1974aed8233b3ddf56987d2b39c14f49eec9
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-16

    2004-02-16	Jim Evins  <evins@snaught.com>

	    * src/xml-label-04.c: (xml04_parse_image_props):
	    * src/xml-label-191.c: (xml191_parse_image_props):
	    * src/xml-label.c: (xml_parse_object_image):
		    Delay setting image size until after image has been
		    applied to new
		    object.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@416
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit 1793cb9fc61fe010218dc43b590c00387bad7f25
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-16

    2004-02-15	Jim Evins  <evins@snaught.com>

	    * src/label-barcode.c: (gl_label_barcode_set_data),
	    (gl_label_barcode_set_props):
		    Don't emit "changed" signal, if no change actually
		    made for these
		    methods.  Reduces number of unnecessary redraws
		    of barcodes.

	    * src/label-object.h:
	    * src/label-object.c: (gl_label_object_set_position),
	    (gl_label_object_set_position_relative), (set_size),
	    (gl_label_object_set_size),
	    (gl_label_object_set_size_honor_aspect):
		    Don't emit "changed" signal, if no change actually
		    made for these
		    methods.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@415
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-barcode.c
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h

commit c15370de048b1e46ae69459fc702fcd3c75b7810
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-15

    2004-02-15	Jim Evins  <evins@snaught.com>

	    * data/glabels-2.0.dtd:
		    Added specific subtypes for various barcode types.

	    * src/bc.h:
	    * src/bc.c: (id_to_index), (name_to_index), (gl_barcode_new),
	    (gl_barcode_get_styles_list), (gl_barcode_default_digits),
	    (gl_barcode_can_text), (gl_barcode_text_optional),
	    (gl_barcode_can_csum), (gl_barcode_csum_optional),
	    (gl_barcode_id_to_name), (gl_barcode_name_to_id):
		    Changed API to use a string id, rather than a fixed
		    enumeration.  Id and
		    name are separate strings.	Added entries to backend
		    table for specific
		    subtypes for various barcode types.

	    * src/bc-postnet.h:
	    * src/bc-postnet.c: (gl_barcode_postnet_new), (postnet_code),
	    (is_length_valid):
		    Modified to conform to above API.  Now more stringent
		    with data length
		    for various subtypes.

	    * src/bc-gnubarcode.h:
	    * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new),
	    (is_length_valid), (is_length1_valid), (is_length2_valid):
		    Modified to conform to above API.  Now more stringent
		    with data length
		    for various subtypes.

	    * src/label-barcode.h:
	    * src/label-barcode.c: (copy), (gl_label_barcode_set_props),
	    (gl_label_barcode_get_props), (get_size):
		    Modified to use above API for storing barcode type.

	    * src/object-editor.h:
	    * src/object-editor-bc-page.c: (style_changed_cb),
	    (gl_object_editor_set_bc_style),
	    (gl_object_editor_get_bc_style):
		    Modified to use above API for storing barcode type.

	    * src/object-editor-size-page.c:
	    (gl_object_editor_prepare_size_page), (aspect_toggle_cb),
	    (w_spin_cb), (h_spin_cb), (size_reset_cb):
		    Added debug markers.

	    * src/object-editor.glade:
		    Made barcode style combo's text entry  non-editable.

	    * src/print.c: (draw_barcode_object):
		    Modified to use above API for barcode type.

	    * src/view-barcode.c: (update_object_from_editor_cb),
	    (update_editor_from_object_cb),
	    (gl_view_barcode_create_event_handler), (draw_barcode):
		    Modified to use above API for barcode type.

	    * src/xml-label-04.c: (xml04_parse_barcode_props):
	    * src/xml-label-191.c: (xml191_parse_barcode_props):
	    * src/xml-label.c: (xml_parse_object_barcode),
	    (xml_create_object_barcode):
		    Modified to use above API for barcode type.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@414
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glabels-2.0.dtd
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-gnubarcode.h
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc-postnet.h
M	glabels2/src/bc.c
M	glabels2/src/bc.h
M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/object-editor-bc-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor.glade
M	glabels2/src/object-editor.h
M	glabels2/src/print.c
M	glabels2/src/view-barcode.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit 0f59322c3d8175fafb061e530a6b36c2e043b4ee
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-07

    2004-02-07	Jim Evins  <evins@snaught.com>

	    * src/stock-pixmaps/Makefile.am:
	    * src/stock-pixmaps/stock_hchain_24.png:
	    * src/stock-pixmaps/stock_hchain_broken_24.png:
	    * src/stock-pixmaps/stock_vchain_24.png:
	    * src/stock-pixmaps/stock_vchain_broken_24.png:
		    Added chain pixmaps borrowed from the gimp's default
		    theme.

	    * src/stock.h:
	    * src/stock.c: (gl_stock_init), (add_button_icon):
		    Added above pixmaps to stock icon sets.  Created
		    add_button_icon() to
		    add these pixmaps sized as GTK_ICON_SIZE_BUTTON.

	    * src/wdgt-chain-button.h
	    * src/wdgt-chain-button.c
	    * src/Makefile.am:
	    * po/POTFILES.in:
		    Added this Modified version of gimpchainbutton widget,
		    borrowed from
		    the gimp.

	    * AUTHORS:
		    Added acknowledgements of the above borrowing from
		    the gimp.

	    * src/object-editor-size-page.c: (aspect_toggle_cb),
	    (w_spin_cb),
	    (h_spin_cb):
	    * src/object-editor.c:
	    (gl_object_editor_construct_chain_button):
	    * src/object-editor.glade:
		    Replaced the keep aspect ratio check box with the
		    above chain-button
		    widget.

	    * src/text-node.c: (gl_text_node_equal):
	    * src/text-node.h:
		    Added function gl_text_node_equal() to compare
		    text_nodes.

	    * src/label-image.c: (gl_label_image_set_filename):
		    Replaced incomplete text_node comparison code with
		    invocation of
		    gl_text_node_equal.  This fixed the problem of not
		    being able to
		    resize an image using the object_editor if the aspect
		    ratio is not
		    locked.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@413
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/label-image.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.glade
M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_hchain_24.png
A	glabels2/src/stock-pixmaps/stock_hchain_broken_24.png
A	glabels2/src/stock-pixmaps/stock_vchain_24.png
A	glabels2/src/stock-pixmaps/stock_vchain_broken_24.png
M	glabels2/src/stock.c
M	glabels2/src/stock.h
M	glabels2/src/text-node.c
M	glabels2/src/text-node.h
A	glabels2/src/wdgt-chain-button.c
A	glabels2/src/wdgt-chain-button.h

commit d7a5fdb634b821ba3ed2c99f90fab88b5c0aba80
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-05

    2004-02-04	Jim Evins  <evins@snaught.com>

	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page):
		    Track "changed" signal of pixmap entry's GtkEntry
		    rather than its
		    "activate" signal -- this catches all changes to
		    the entry rather than
		    just changes resulting from a browse, so one can
		    easily pull previous
		    entries from the history. (This change is marked
		    below on 2004-02-03,
		    but somehow never got checked in.)

	    * src/view-highlight.c: (sl_resize_event_handler),
	    (sr_resize_event_handler), (st_resize_event_handler),
	    (sb_resize_event_handler):
		    Side resize handles will now confirm the actual
		    resize that the object
		    accepted before adjusting position parameters.
		    Previously some interesting
		    things happened when resizing a barcode to its
		    minimum size.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@412
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/object-editor-image-page.c
M	glabels2/src/view-highlight.c

commit b7270cca21f97c762f1a1ff50f63df7efc8b2c5c
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-04

    2004-02-03	Jim Evins  <evins@snaught.com>

	    * src/object-editor-image-page.c:
	    (gl_object_editor_prepare_image_page):
		    Track "changed" signal of pixmap entry's GtkEntry
		    rather than its
		    "activate" signal -- this catches all changes to
		    the entry rather than
		    just changes resulting from a browse, so one can
		    easily pull previous
		    entries from the history.

	    * src/view-highlight.c: (tl_resize_event_handler),
	    (tr_resize_event_handler), (bl_resize_event_handler),
	    (br_resize_event_handler):
		    Allow control key to be dropped while dragging a
		    corner resize handle
		    without losing the aspect ratio lock.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@411
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/view-highlight.c

commit 8d1652bfd6e74700063cdccb120693515c71e6ea
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-03

    2004-02-02	Jim Evins  <evins@snaught.com>

	    * src/label-image.c: (gl_label_image_set_filename):
		    When setting a new filename adjust size such that
		    the aspect ratio of
		    the image is preserved using the current size as a
		    bounding box.

	    * src/view-image.c: (update_object_from_editor_cb):
		    When updating object from editor, feed back possible
		    size changes to
		    editor as a result of a possible change in image.

	    * src/object-editor-size-page.c: (size_reset_cb):
		    Fixed typo when blocking spin handlers.  If the base
		    size is larger than
		    the max size, treat max size as a bounding box while
		    keeping aspect
		    ratio.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@410
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-image.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/view-image.c

commit 6c3073bcc36e8c9e2c46e743b48f559970a14e12
Author: Jim Evins <evins@snaught.com>
Date:	2004-02-03

    2004-02-02	Jim Evins  <evins@snaught.com>

	    * src/label-object.h:
	    * src/label-object.c: (gl_label_object_set_size),
	    (gl_label_object_set_size_honor_aspect):
		    Added gl_label_object_set_size_honor_aspect() which
		    will maintain the
		    current aspect ratio by modifying the supplied w or
		    h apropriately.

	    * src/view-highlight.c: (tl_resize_event_handler),
	    (tr_resize_event_handler), (bl_resize_event_handler),
	    (br_resize_event_handler):
		    Corner handles will now maintain the current aspect
		    ratio if the
		    control key is pressed while resizing.  This addresses
		    feature
		    request #816603.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@409
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/view-highlight.c

commit 66a83b58e4427fffbb7181528d6754a31513de07
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-31

    2004-01-31	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * data/avery-us-templates.xml:
		    Added entries for "LSK-3," "LSK-5," and "LSK-8."
		    Submitted by JBadger.

	    * libglabels/template.c: (read_template_files_from_dir):
		    Corrected problem with testing for extensions.

	    * src/object-editor.glade:
		    Corrected grouping of radio buttons in barcode
		    data page.

	    * src/print.c: (draw_barcode_object):
	    * src/view-barcode.c: (draw_barcode):
		    Corrected problem with calculation of y_offset for
		    locating characters.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@408
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/avery-us-templates.xml
M	glabels2/libglabels/template.c
M	glabels2/src/object-editor.glade
M	glabels2/src/print.c
M	glabels2/src/view-barcode.c

commit 91acdb1f63c5e89de292e321ce93071488e11261
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-25

    2004-01-24	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
	    * data/avery-us-templates.xml:
		    Added Avery 5824, submitted by Fred Bacon.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@407
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/avery-us-templates.xml

commit 9a42fd691a980f7735c152055f56e25c8d556a6e
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-21

    2004-01-20	Jim Evins  <evins@snaught.com>

	    Catching up on a couple of backlogged user template
	    submissions.

	    * data/avery-iso-templates.xml:
		    Added "DECAdry OLW-4731" and "DECAdry DLW-1731"
		    aliases for Avery 7160.
		    Suggested by Linas Jakucionis.

	    * data/zweckform-iso-templates.xml:
		    Added Zweckform 4760, submitted by Thomas Vill.

	    * AUTHORS:
		    Updated to reflect above submissions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@406
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/data/avery-iso-templates.xml
M	glabels2/data/zweckform-iso-templates.xml

commit e1a2cde6e4ffbe6938f93ae8629dc1f80d3a40fa
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-07

    2004-01-06	Jim Evins  <evins@snaught.com>

	    Split-out template.[ch], paper.[ch], xml-template.[ch],
	    xml-paper.[ch], and
	    xml.[ch] into a separate library called libglabels, to
	    facilitate third
	    party use of glabels template files.  This was suggested by
	    Wayne Schuller.
	    Once split-out, some modifications to the structures and
	    functions to
	    make a cleaner more useful API, hopefully.	Rather extensive
	    changes have
	    propogated to other modules.

	    * src/paper.h:
	    * src/paper.c:
	    * src/template.h:
	    * src/template.c:
	    * src/xml-paper.h:
	    * src/xml-paper.c:
	    * src/xml-template.h:
	    * src/xml-template.c:
	    * src/xml.h:
	    * src/xml.c:
		    These files have been moved to libglabels/.
		    API cleanup performed.

	    * libglabels/libglabels.h:
	    * libglabels/libglabels-private.h:
	    * libglabels/Makefile.am:
		    These files have been added to finish out libglabels.

	    * Makefile.am:
	    * configure.in:
	    * glabels.spec.in:
	    * po/POTFILES.in:
	    * src/Makefile.am:
		    Modified to reflect new sets of files in src/
		    and libglabels/.

	    * COPYING.LIBGLABELS:
	    * COPYING-DOCS:
		    Added copy of the LGPL for libglabels, and a copy
		    the GFDL for
		    documentation.

	    * src/glabels-batch.c:
	    * src/glabels.c:
	    * src/label.c: (gl_label_finalize), (gl_label_set_template),
	    (gl_label_get_size):
	    * src/label.h:
	    * src/prefs-model.c: (gl_prefs_model_load_settings):
	    * src/print-dialog.c:
	    * src/print.c: (gl_print_simple), (gl_print_merge_collated),
	    (gl_print_merge_uncollated), (gl_print_batch),
	    (print_info_free),
	    (print_crop_marks), (print_label), (draw_outline),
	    (clip_to_outline), (clip_punchouts):
	    * src/template-designer.c: (construct_pg_size_page),
	    (pg_size_page_changed_cb), (layout_page_changed_cb),
	    (print_test_cb), (build_template):
	    * src/util.c: (gl_util_fraction):
	    * src/util.h:
	    * src/view.c: (draw_bg_fg_layers), (draw_bg_fg_rect),
	    (draw_bg_fg_rounded_rect), (draw_bg_fg_round),
	    (draw_bg_fg_cd),
	    (draw_bg_fg_cd_bc), (draw_markup_layer), (draw_markup_margin),
	    (draw_markup_margin_rect), (draw_markup_margin_rounded_rect),
	    (draw_markup_margin_round), (draw_markup_margin_cd),
	    (draw_markup_margin_cd_bc), (draw_markup_line),
	    (draw_markup_circle), (gl_view_copy):
	    * src/wdgt-media-select.c: (gl_wdgt_media_select_construct),
	    (page_size_entry_changed_cb), (details_update),
	    (get_layout_desc),
	    (get_label_size_desc):
	    * src/wdgt-mini-preview.c:
	    (gl_wdgt_mini_preview_set_label_by_name),
	    (mini_outline_list_new),
	    (cdbc_item):
	    * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct):
	    * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct):
	    * src/wdgt-rotate-label.c: (mini_preview_canvas_update),
	    (gl_wdgt_rotate_label_set_template_name), (cdbc_item):
	    * src/wdgt-rotate-label.h:
	    * src/xml-label-04.c: (xml04_parse_media_description):
	    * src/xml-label-191.c: (gl_xml_label_191_parse),
	    (xml191_parse_sheet), (xml191_parse_label),
	    (xml191_parse_layout),
	    (xml191_parse_markup), (xml191_parse_alias):
	    * src/xml-label.c: (xml_doc_to_label), (xml_parse_label),
	    (xml_label_to_doc):
		    Various changes to accomodate new libglabels API.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@405
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/COPYING-DOCS
A	glabels2/COPYING.LIBGLABELS
M	glabels2/ChangeLog
M	glabels2/Makefile.am
M	glabels2/configure.in
M	glabels2/glabels.spec.in
A	glabels2/libglabels/Makefile.am
A	glabels2/libglabels/libglabels-private.h
A	glabels2/libglabels/libglabels.h
R066	glabels2/src/paper.c	glabels2/libglabels/paper.c
A	glabels2/libglabels/paper.h
A	glabels2/libglabels/template.c
A	glabels2/libglabels/template.h
A	glabels2/libglabels/xml-paper.c
A	glabels2/libglabels/xml-paper.h
A	glabels2/libglabels/xml-template.c
A	glabels2/libglabels/xml-template.h
R090	glabels2/src/xml.c	glabels2/libglabels/xml.c
R064	glabels2/src/xml.h	glabels2/libglabels/xml.h
M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/label.c
M	glabels2/src/label.h
D	glabels2/src/paper.h
M	glabels2/src/prefs-model.c
M	glabels2/src/print-dialog.c
M	glabels2/src/print.c
M	glabels2/src/template-designer.c
D	glabels2/src/template.c
D	glabels2/src/template.h
M	glabels2/src/util.c
M	glabels2/src/util.h
M	glabels2/src/view.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/wdgt-rotate-label.h
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c
D	glabels2/src/xml-paper.c
D	glabels2/src/xml-paper.h
D	glabels2/src/xml-template.c
D	glabels2/src/xml-template.h

commit 5a3bef4441d08531523c1939451fbbe8071e75cd
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-04

    2004-01-03	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Release 1.93.2.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@403
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/configure.in

commit a7899ecce3adcf1bc9fe4f59430acc35de88e2a8
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-04

    2004-01-03	Jim Evins  <evins@snaught.com>

	    * AUTHORS:
		    Added acknowledgement of contributions by Wayne
		    Schuller.

	    * src/commands.c: (gl_cmd_file_print):
		    Create extra reference to print dialog, so that it
		    can be properly re-used.

	    * src/mygal/mygal-combo-box.h:
	    * src/mygal/mygal-combo-box.c:
	    (mygal_combo_box_popup_hide_unconditional),
	    (mygal_combo_box_popup_display),
	    (mygal_combo_box_set_display),
	    (gtk_combo_set_tearoff_state), (mygal_combo_box_construct),
	    (mygal_combo_box_set_arrow_relief),
	    (mygal_combo_box_set_title),
	    (mygal_combo_box_set_tearable):
		    Changed all occurances of GTK_IS_COMBO_BOX to
		    MYGAL_IS_COMBO_BOX, to
		    complete the rename of this widget to prevent
		    namespace collisions
		    with Gtk+-2.3.

	    * src/prefs-dialog.glade:
		    Fixed alignment of Fill/Color widgets.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@402
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/ChangeLog
M	glabels2/src/commands.c
M	glabels2/src/mygal/mygal-combo-box.c
M	glabels2/src/mygal/mygal-combo-box.h
M	glabels2/src/prefs-dialog.glade

commit 67b655a91bbe0c6173998617b4c1e83f3fb01eb1
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-04

    2004-01-03	Jim Evins  <evins@snaught.com>

	    * data/avery-iso-templates.xml:
		    Added user submitted templates.
		    Avery 8435A & 8435B, submitted by Ludger Solbach.

	    * doc/C/glabels.xml:
		    Added minimal documentation, noting the new template
		    designer.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@401
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/avery-iso-templates.xml

commit 827d4017d03dcece28006a5486674a8d4551ac29
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-03

    2004-01-03	Jim Evins  <evins@snaught.com>

	    * pixmaps/ex-rect-size.png:
	    * pixmaps/ex-round-size.png:
	    * pixmaps/ex-cd-size.png:
	    * pixmaps/Makefile.am:
		    Added ex-rect-size.png, ex-round-size.png, and
		    ex-cd-size.png image
		    files to be used as illustrations/examples in the
		    template-designer.

	    * src/template-designer.c: (construct_rect_size_page),
	    (construct_round_size_page), (construct_cd_size_page),
	    (construct_nlayouts_page), (rect_size_page_prepare_cb),
	    (round_size_page_prepare_cb), (cd_size_page_prepare_cb),
	    (layout_page_prepare_cb), (build_template):
	    * src/template-designer.glade:
		    Added illustrations for rectangle, round, and cd
		    label size pages.
		    Added margin spinboxes to these pages, and now add
		    a margin markup
		    to the constructed template.  Added realistic default
		    values for
		    some of the size spinboxes.  Cleaned up the code
		    for setting spinbox
		    ranges on the layouts page.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@400
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/pixmaps/Makefile.am
A	glabels2/pixmaps/ex-cd-size.png
A	glabels2/pixmaps/ex-rect-size.png
A	glabels2/pixmaps/ex-round-size.png
M	glabels2/src/template-designer.c
M	glabels2/src/template-designer.glade

commit 7d0f397683e2a28806fd2cefce1d846a2064f186
Author: Jim Evins <evins@snaught.com>
Date:	2004-01-03

    2004-01-02	Jim Evins  <evins@snaught.com>

	    * src/object-editor-size-page.c: (h_spin_cb):
		    Fixed cut-n-paste error in h_spin_cb that loaded
		    h from
		    the wrong spinbutton.

	    * src/object-editor.h:
	    * src/object-editor.c: (gl_object_editor_class_init),
	    (gl_object_editor_changed_cb),
	    (gl_object_editor_size_changed_cb):
	    * src/object-editor-private.h:
	    * src/object-editor-size-page.c: (w_spin_cb), (h_spin_cb),
	    (size_reset_cb):
		    Added "size_changed" signal.

	    * src/view-text.c: (construct_properties_editor),
	    (update_object_from_editor_cb),
	    (update_object_from_editor_size_cb):
		    Track size changes from object editor separately
		    from other
		    properties.  This is so the default size (0,0)
		    of a text
		    object is not modified unintentionally.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@399
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/object-editor.h
M	glabels2/src/view-text.c

commit e4a19ad71c510363fa80e14c98f65c10a1f187ac
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-30

    2003-12-30	Wayne Schuller	<k_wayne@linuxpower.org>

	    Added feature: line spacing - allows you to comfortably
	    space a text box to
	    fit a label perfectly.

	    * data/glabels-2.0.dtd:
	    * src/label-object.c: (gl_label_object_set_text_line_spacing),
	    (gl_label_object_get_text_alignment),
	    (gl_label_object_get_text_line_spacing):
	    * src/label-object.h:
	    * src/label-text.c: (gl_label_text_class_init),
	    (gl_label_text_instance_init), (copy), (get_size),
	    (set_text_line_spacing), (get_text_alignment),
	    (get_text_line_spacing):
	    * src/object-editor-private.h:
	    * src/object-editor-text-page.c:
	    (gl_object_editor_prepare_text_page),
	    (gl_object_editor_set_text_line_spacing),
	    (gl_object_editor_get_text_line_spacing):
	    * src/object-editor.glade:
	    * src/object-editor.h:
	    * src/prefs-dialog.c: (construct_object_page),
	    (update_object_page_from_prefs),
	    (update_prefs_from_object_page):
	    * src/prefs-dialog.glade:
	    * src/prefs-model.c: (gl_prefs_model_save_settings),
	    (gl_prefs_model_load_settings), (get_float):
	    * src/prefs-model.h:
	    * src/print.c: (draw_text_object):
	    * src/ui-sidebar.c:
	    * src/view-text.c: (update_object_from_editor_cb),
	    (update_editor_from_object_cb),
	    (gl_view_text_create_event_handler), (draw_hacktext):
	    * src/view.c: (gl_view_construct),
	    (gl_view_set_selection_text_line_spacing),
	    (gl_view_set_default_text_line_spacing),
	    (gl_view_get_default_text_line_spacing):
	    * src/view.h:
	    * src/xml-label.c: (xml_parse_toplevel_span),
	    (xml_create_toplevel_span):


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@398
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/data/glabels-2.0.dtd
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-text-page.c
M	glabels2/src/object-editor.glade
M	glabels2/src/object-editor.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-dialog.glade
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/print.c
M	glabels2/src/ui-sidebar.c
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/xml-label.c

commit aa6be2ee3a8a2ca904810f4fde65721d68127093
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-30

    2003-12-30	Jim Evins  <evins@snaught.com>

	    * src/template-designer.c:
	    * src/template-designer.h:
	    * src/template-designer.glade:
		    New template designer assistant.

	    * po/POTFILES.in:
	    * src/Makefile.am:
		    Added entries for src/template-designer.* files.

	    * pixmaps/ex-1layout.png
	    * pixmaps/ex-2layouts.png
	    * pixmaps/Makefile.am:
		    Added the new image files ex-*.png used as
		    illustrations in the
		    template designer assistant.

	    * src/print-dialog.h:
	    * src/print-dialog.c: (gl_print_dialog_finalize),
	    (gl_print_dialog_new), (gl_print_dialog_construct),
	    (gl_print_dialog_force_outline_flag):
		    Changed first argument of gl_print_dialog_new()
		    from glView to glLabel,
		    to support printing from the template designer
		    assistant which does not
		    have a full-fledged view.  Nothing else from the
		    view object was being
		    used by the dialog anyway.

		    Added the gl_print_dialog_force_outline_flag()
		    method, for better
		    integration with the template designer assistant.


	    * src/commands.h:
	    * src/commands.c: (gl_cmd_file_template_designer),
	    (gl_cmd_file_print):
		    Modified print command to provide label instead of
		    view to dialog.
		    Added the gl_cmd_file_template_designer() command
		    to invoke the
		    template designer assistant.

	    * src/ui.c:
	    * src/glabels-ui.xml:
		    Added support for template designer assistant.

	    * src/wdgt-mini-preview.h:
	    * src/wdgt-mini-preview.c:
	    (gl_wdgt_mini_preview_set_template),
	    (gl_wdgt_mini_preview_set_bg_color):
		    Preview is now centered in canvas.	Added
		    gl_wdgt_mini_preview_set_bg_color() to allow the
		    template designer
		    assistant to match the background color with its own.

	    * src/print.c: (clip_to_outline):
		    Fixed really stupid bug when adding waste to clip
		    region of rectangular
		    labels/cards.  Each side of the clip region needs
		    to be extended by
		    twice the waste margin, as well as negatively offset
		    by the waste
		    margin.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@397
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/pixmaps/Makefile.am
A	glabels2/pixmaps/ex-1layout.png
A	glabels2/pixmaps/ex-2layouts.png
M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/commands.c
M	glabels2/src/commands.h
M	glabels2/src/glabels-ui.xml
M	glabels2/src/print-dialog.c
M	glabels2/src/print-dialog.h
M	glabels2/src/print.c
A	glabels2/src/template-designer.c
A	glabels2/src/template-designer.glade
A	glabels2/src/template-designer.h
M	glabels2/src/ui.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h

commit 9b9df2809e35e02aa4c14ff05aaeb683b25c63c8
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-28

    2003-12-28	Jim Evins  <evins@snaught.com>

	    * src/prefs-dialog.c: (update_object_page_from_prefs):
		    Block intermediary function align_toggle_cb()
		    instead of
		    update_prefs_from_object_page() for the three
		    alignment
		    widgets.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@396
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/prefs-dialog.c

commit 94be7f87f0bce60192cf06eee6e10389a82c4e64
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-28

    2003-12-28	Wayne Schuller	<k_wayne@linuxpower.org>

	    * src/file.c: (gl_file_new), (gl_file_properties): Swap
	    button order and set default for higificatory pleasure.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@395
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/file.c

commit 4af61cfcad47d9ba9940760116e139a337e0c301
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-28

    2003-12-27	Jim Evins  <evins@snaught.com>

	    * barcode-0.98/Makefile.am:
		    One last time:  removed doc/Makefile and
		    po/Makefile.in.in from
		    EXTRA_DIST files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@394
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/barcode-0.98/Makefile.am

commit e896552f051622647d765aaaf8a753f883d65846
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-28

    2003-12-27	Jim Evins  <evins@snaught.com>

	    reviewed by: <delete if not using a buddy>

	    * barcode-0.98/Makefile.am:
		    Removed config.stat entry from EXTRA_DIST files.

	    * barcode-0.98/Makefile.in:
		    Removed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@393
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/barcode-0.98/Makefile.am
D	glabels2/barcode-0.98/Makefile.in

commit 6c7d8f20932bc80e2461d12fd2c4ea146fc9c510
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-28

    2003-12-27	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Updated to work with latest gnome-common package
		    from CVS.
		    Removed recursive configuration of barcode-0.98.

	    * acconfig.h:
	    * macros/*:
		    Removed.

	    * Makefile.am:
		    Added barcode-0.98/ as a SUBDIR, and removed
		    dist-hook.

	    * barcode-0.98/Makefile.in:
	    * barcode-0.98/configure.in:
	    * barcode-0.98/Makefile.am:
	    * barcode-0.98/README.glabels:
		    Modified to ignore the barcode package's build system,
		    and build
		    as a part of glabels.
		    Renamed Makefile.in to Makefile.in.dist.
		    Renamed configure.in to configure.in.dist.
		    Added barcode-0.98/Makefile.am and
		    barcode-0.98/README.glabels.
	    * src/Makefile.am:
	    * src/mygal/Makefile.am:
	    * src/recent-files/Makefile.am:
		    In order to build against the GNOME 2.5 platform,
		    all use of *_DISABLE_DEPRECATED compile-time flags
		    has been removed.

	    * src/mygal/Makefile.am:
	    * src/mygal/mygal-combo-box.c:
	    * src/mygal/mygal-combo-box.h:
	    * src/mygal/widget-color-combo.c:
	    * src/mygal/widget-color-combo.h:
	    * po/POTFILES.in:
		    In order to build against the GNOME 2.5 platform,
		    Renamed gtk_combo_box widget to mygal_combo_box,
		    to prevent namespace
		    collisions with the real gtk_combo_box widget,
		    now a part of gtk.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@392
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/barcode-0.98/Makefile.am

commit 0a403c6d9718254ea54850ef1d1f164c48da6b92
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-28

    2003-12-27	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Updated to work with latest gnome-common package
		    from CVS.
		    Removed recursive configuration of barcode-0.98.

	    * acconfig.h:
	    * macros/*:
		    Removed.

	    * Makefile.am:
		    Added barcode-0.98/ as a SUBDIR, and removed
		    dist-hook.

	    * barcode-0.98/Makefile.in:
	    * barcode-0.98/configure.in:
	    * barcode-0.98/Makefile.am:
	    * barcode-0.98/README.glabels:
		    Modified to ignore the barcode package's build system,
		    and build
		    as a part of glabels.
		    Renamed Makefile.in to Makefile.in.dist.
		    Renamed configure.in to configure.in.dist.
		    Added barcode-0.98/Makefile.am and
		    barcode-0.98/README.glabels.

	    * src/Makefile.am:
	    * src/mygal/Makefile.am:
	    * src/recent-files/Makefile.am:
		    In order to build against the GNOME 2.5 platform,
		    all use of *_DISABLE_DEPRECATED compile-time flags
		    has been removed.

	    * src/mygal/Makefile.am:
	    * src/mygal/mygal-combo-box.c:
	    * src/mygal/mygal-combo-box.h:
	    * src/mygal/widget-color-combo.c:
	    * src/mygal/widget-color-combo.h:
	    * po/POTFILES.in:
		    In order to build against the GNOME 2.5 platform,
		    Renamed gtk_combo_box widget to mygal_combo_box,
		    to prevent namespace
		    collisions with the real gtk_combo_box widget,
		    now a part of gtk.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@391
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels2/macros/Makefile.am
D	glabels2/macros/aclocal-include.m4
D	glabels2/macros/autogen.sh
D	glabels2/macros/compiler-flags.m4
D	glabels2/macros/curses.m4
D	glabels2/macros/gnome-bonobo-check.m4
D	glabels2/macros/gnome-common.m4
D	glabels2/macros/gnome-cxx-check.m4
D	glabels2/macros/gnome-fileutils.m4
D	glabels2/macros/gnome-gettext.m4
D	glabels2/macros/gnome-ghttp-check.m4
D	glabels2/macros/gnome-gnorba-check.m4
D	glabels2/macros/gnome-guile-checks.m4
D	glabels2/macros/gnome-libgtop-check.m4
D	glabels2/macros/gnome-objc-checks.m4
D	glabels2/macros/gnome-orbit-check.m4
D	glabels2/macros/gnome-pilot.m4
D	glabels2/macros/gnome-print-check.m4
D	glabels2/macros/gnome-pthread-check.m4
D	glabels2/macros/gnome-support.m4
D	glabels2/macros/gnome-undelfs.m4
D	glabels2/macros/gnome-vfs.m4
D	glabels2/macros/gnome-x-checks.m4
D	glabels2/macros/gnome-xml-check.m4
D	glabels2/macros/gnome.m4
D	glabels2/macros/gperf-check.m4
D	glabels2/macros/linger.m4
D	glabels2/macros/need-declaration.m4
D	glabels2/macros/psiconv.m4

commit 374483b9c1e3bd3054a71d6b502c02218baee4c5
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-28

    2003-12-27	Jim Evins  <evins@snaught.com>

	    * configure.in:
		    Updated to work with latest gnome-common package
		    from CVS.
		    Removed recursive configuration of barcode-0.98.

	    * acconfig.h:
	    * macros/*:
		    Removed.

	    * Makefile.am:
		    Added barcode-0.98/ as a SUBDIR, and removed
		    dist-hook.

	    * barcode-0.98/Makefile.in:
	    * barcode-0.98/configure.in:
	    * barcode-0.98/Makefile.am:
	    * barcode-0.98/README.glabels:
		    Modified to ignore the barcode package's build system,
		    and build
		    as a part of glabels.
		    Renamed Makefile.in to Makefile.in.dist.
		    Renamed configure.in to configure.in.dist.
		    Added barcode-0.98/Makefile.am and
		    barcode-0.98/README.glabels.

	    * src/Makefile.am:
	    * src/mygal/Makefile.am:
	    * src/recent-files/Makefile.am:
		    In order to build against the GNOME 2.5 platform,
		    all use of *_DISABLE_DEPRECATED compile-time flags
		    has been removed.

	    * src/mygal/Makefile.am:
	    * src/mygal/mygal-combo-box.c:
	    * src/mygal/mygal-combo-box.h:
	    * src/mygal/widget-color-combo.c:
	    * src/mygal/widget-color-combo.h:
	    * po/POTFILES.in:
		    In order to build against the GNOME 2.5 platform,
		    Renamed gtk_combo_box widget to mygal_combo_box,
		    to prevent namespace
		    collisions with the real gtk_combo_box widget,
		    now a part of gtk.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@390
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/Makefile.am
D	glabels2/acconfig.h
M	glabels2/barcode-0.98/Makefile.in
C100	glabels2/barcode-0.98/Makefile.in
glabels2/barcode-0.98/Makefile.in.dist
A	glabels2/barcode-0.98/README.glabels
R100	glabels2/barcode-0.98/configure.in
glabels2/barcode-0.98/configure.in.dist
M	glabels2/configure.in
M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/mygal/Makefile.am
D	glabels2/src/mygal/gtk-combo-box.h
R080	glabels2/src/mygal/gtk-combo-box.c
glabels2/src/mygal/mygal-combo-box.c
A	glabels2/src/mygal/mygal-combo-box.h
M	glabels2/src/mygal/widget-color-combo.c
M	glabels2/src/mygal/widget-color-combo.h
M	glabels2/src/recent-files/Makefile.am

commit 0fc7cd31248b35914e681b37cd703f5366d88c76
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-27

    2003-12-26	Jim Evins  <evins@snaught.com>

	    * src/paper.c:
	    * src/template.c:
	    * src/util.c:
	    * src/util.h:
		    Moved local versions of get_home_data_dir() in
		    paper.c and
		    template.c to util package.  Cleaned up formatting in
		    util.[ch].

	    * src/template.c:
		    In gl_template_register() save a copy of the
		    template in
		    ~/.glabels if the template is not known.  Still need
		    to
		    handle duplicate filename case and duplicate name but
		    different template case.

	    * src/xml-label.c:
	    * src/xml.h:
		    Moved local definition of NAME_SPACE macro from
		    xml-label.c
		    to xml.h.

	    * src/xml-template.c:
	    * src/xml-template.h:
		    Added function
		    gl_xml_template_write_template_to_file(), used
		    in gl_template_register().


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@389
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/ChangeLog
M	glabels2/src/paper.c
M	glabels2/src/template.c
M	glabels2/src/util.c
M	glabels2/src/util.h
M	glabels2/src/xml-label.c
M	glabels2/src/xml-template.c
M	glabels2/src/xml-template.h
M	glabels2/src/xml.h

commit a155fb708375c1ed04bd184a45866ea1606a1831
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-26

    Added user contributed template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@388
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/data/misc-iso-templates.xml

commit ab07958f3b8f89b3c2c8be7f836217559aacbdef
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-26

    Preparing for 1.93.2 development.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@387
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 33b3bebc5d206145cf608c7112ecf8b188ac0a1c
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-26

    When looking up templates by name and name isn't found, return
    first template instead of NULL (suggested by Wayne Schuller
    <k_wayne@linuxpower.org>).	In addition, added code to register
    templates (make known, if not already known) when they are encountered
    when reading a label.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@386
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/paper.c
M	glabels2/src/paper.h
M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit f1357e3a29e2b291c6574f49164497e046d2feab
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-23

    Final prep for 1.93.1.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@384
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 5a3d0ee28811fc9ee872552cd7c29020f281bf21
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-23

    Added scrollkeeper stuff.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@383
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/glabels.spec.in

commit 8cf4bade5f2b17f356f7e8253ed89844035638eb
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-22

    New user submitted template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@382
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/data/misc-iso-templates.xml

commit 198fee144039f49f27295e518c0e2e115b07cd1d
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-22

    Changed some tabbed notebook labels to hopefully be more
    understandable.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@381
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/object-editor.glade

commit 2f77d3c19cd97dd2d55dd3bff8a4d5046ef6e2b6
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-21

    In size_reset_cb() fixed broken, un-initialized, use of w_base
    and h_base.  This was accidentally introduced when modified to
    track gl_prefs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@380
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/object-editor-size-page.c

commit be3625185312bb65c5538d3147ac8c2573eda437
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-20

    Added skeletal xml documentation.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@379
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/omf.make
A	glabels2/xmldocs.make

commit c110ae640822b5be441c7ae3802a36b80e6c20ad
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-19

    Fixed properties for text and linewidth spinbuttons.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@378
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/object-editor.glade
M	glabels2/src/prefs-dialog.glade

commit 44e32b0c46bf50195856ebc26b09fcb4f1f3da2a
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-19

    Created 2 methods for setting label for mini-preview widget.
    The first is "by name" and the second is by template.   This second
    method allows us to use a label's local template, even if its name
    is not an exact match with an existing template's -- can occur if
    templates are renamed between versions or if a label uses someone
    else's custom template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@377
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c

commit 00dd4521fae11dda1e5a53c5adb4edd044bb9689
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-17

    Modifications to track properties of selected objects.
    This addresses Bug #839801.  Patch provided by Emmanuel Pacaud
    <emmanuel.pacaud@univ-poitiers.fr>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@376
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/mygal/widget-color-combo.c
M	glabels2/src/ui-property-bar.c
M	glabels2/src/ui-property-bar.h

commit 768611c0fbde602b50f940ae142ee5eb3dc704db
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-14

    Added src/prefs-model.[ch].


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@375
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit 544b2c55be62f99f9a509d534c245c0551445c49
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-14

    Added 2 user submitted templates.  Did a little cleanup of the
    avery-iso and zweckform-iso files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@374
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/data/avery-iso-templates.xml
M	glabels2/data/zweckform-iso-templates.xml

commit 9485ecff9019ccd81087c0a65c99a006a7f0d761
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-14

    Added menu entry to toggle visibility of property toolbar.	Also added
    entry to toggle its tooltips.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@373
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml
M	glabels2/src/prefs-model.c
M	glabels2/src/prefs-model.h
M	glabels2/src/ui.c

commit d8c8689edc8700b670853f040d4aab1c41138a33
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-14

    Track changes in prefered units and update widgets appropriately.
    This addresses bug #852974.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@372
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-private.h
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/object-editor.c
M	glabels2/src/wdgt-media-select.c

commit 1d82d0c3852692d9931c1e5b0533ec50ba3646d1
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-12

    Removed some artifacts in copy() method.  In particular a g_free()
    on an unitialized automatic variable was removed, which caused a
    copy/paste of a text object to segfault (See bug #857773).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@371
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-text.c

commit 4d2997726e0d0c5a27e95cf674132c3f3a293d96
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-07

    View box's object will track position in object editor.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@370
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-box.c

commit 6acb95f4d5fc360a087b7a7f6ab4c9eb9848494e
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-06

    - Changed gl_prefs from a simple structure to a full-fledged object
    (prefs_model).
    - Moved prefs_init after paper_init so that page size proof reading
    code in prefs_model_load_settings works properly.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@369
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/commands.c
M	glabels2/src/glabels.c
M	glabels2/src/prefs-dialog.c
A	glabels2/src/prefs-model.c
C056	glabels2/src/prefs.h	glabels2/src/prefs-model.h
M	glabels2/src/prefs.c
M	glabels2/src/prefs.h
M	glabels2/src/template.c
M	glabels2/src/ui.c

commit b9771d1ad8a9cf97ef7100adfed558098d53cb49
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-03

    Adjust canvas scroll region if when label size is changed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@368
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit b4c795d8542654896ac92d04641cfc9b4a70bd8d
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-03

    Print dialog now tracks changes to a label's template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@367
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print-dialog.c

commit fa0b7499395a94216c9502f06bce301d10fa42b0
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-03

    Print dialog is now a full-fledged object, with a unique instance
    attached to a view.  This address Bug #839860.  The dialog is also
    no longer modal.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@366
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/commands.c
M	glabels2/src/print-dialog.c
M	glabels2/src/print-dialog.h
M	glabels2/src/view.h

commit eb15aa82624a0bc2e24907b28c06ae7a33fb7f58
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-02

    When setting ranges for object-editor size and position spinboxes,
    allow for plenty of slop.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@365
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/object-editor-lsize-page.c
M	glabels2/src/object-editor-position-page.c
M	glabels2/src/object-editor-size-page.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c

commit fb57f0fc0e806719cd1efacde8da67492eeed71d
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-01

    Text merge backend now assumes text files are encoded according to
    the current locale -- converts to UTF8 for internal use.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@364
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/merge-text.c

commit f59501fe42e73950cac52de4362ec6937f0795b7
Author: Jim Evins <evins@snaught.com>
Date:	2003-12-01

    Getting ready for work on 1.93.1.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@363
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 516923ce1d1be249861bd04423fd8aebdc338675
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-30

    Final preps for 1.93.0.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@361
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/TODO
M	glabels2/configure.in

commit 0d23211916e298372d4cb0d7df1df1c4fe67c43b
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-29

    Make sure canvas item representing selection region has a finite size.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@360
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit 8a8670b3964dc497eb410a49a3c7a1d77ea3ff07
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-29

    Added build dependency on libglade2.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@359
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/glabels.spec.in

commit 2c65342596e10da4ca0a8219a7885b34cec7a6cc
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-29

    Delay doing a gtk_widget_show on notebook until it is known if any
    pages are visible or not.  Doing the show on a notebook with all
    hidden pages causes a crash on Fedora Core 1/Gnome 2.4.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@358
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/object-editor.c

commit 115198aeead93ef3ef97cd081f5b855622403e0a
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-28

    gl_view_delete_selection(): Actually clear out selection before
    deleting these objects.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@357
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit 6836860e2dab3b384e89982b8df9856b64c6c911
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-27

    Created generic "get" methods for text, fill and line properties
    for all label objects.  This will make it easier to track changes
    in a general view such as the property toolbar.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@356
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/label-box.c
M	glabels2/src/label-box.h
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-ellipse.h
M	glabels2/src/label-line.c
M	glabels2/src/label-line.h
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/print.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label-191.c
M	glabels2/src/xml-label.c

commit 0bb61293a045dec136d8ef6d82186e54633f63a1
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-27

    After setting max size, restore current setting.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@355
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/object-editor-lsize-page.c

commit 4d331ca9bd594283549e9415d96d40d87d3302d5
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-27

    Make sure canvas will regain focus if clicked on.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@354
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit 608c6e669e6e169b92522131768dedf4f608b4f5
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-26

    Only act on zoom changes (modifying canvas scale and emitting signal)
    if the new level is actually different.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@353
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit 814500dd1a4686522d20abf06b02395d2a5ea230
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-26

    Modified zoom code:
    - Now keeps track of zoom levels, rather than screen scale
    - Calculates home scale from screen DPI
    - View size changes are tracked, and if selected zoom_to_fit is
    maintained.
    - New windows default to zoom_to_fit.
    - Tracks changes in screen, so that new home scale can be updated


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@352
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/tools.c
M	glabels2/src/view-highlight.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/window.c

commit 127a39e7edb69b54cc0ca0b4d421c63891d9ab1f
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-26

    Only present object property editor when selection is atomic.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@351
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/ui-sidebar.c

commit af777d10cca19977c2cb80b7fa015b5ad77fdcd4
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-24

    Glade files are now installed at GLABELS_GLADE_DIR.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@350
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/object-editor.c
M	glabels2/src/prefs-dialog.c

commit b6ae3725e4345dc9aeb153519678175d3f5ce12b
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-24

    Updated to reflect current source files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@349
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit 5f79a4f719b16e37880857730df9f5b65e4fbe17
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-24

    Changed object property dialogs to a single object property editor
    sidebar.
    Added zoom to fit command.
    Converted object property editor and preferences dialog to use
    libglade and removed un-needed widgets.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@348
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/glabels-ui.xml
M	glabels2/src/glabels.c
A	glabels2/src/object-editor-bc-page.c
A	glabels2/src/object-editor-data-page.c
A	glabels2/src/object-editor-edit-page.c
A	glabels2/src/object-editor-fill-page.c
A	glabels2/src/object-editor-image-page.c
A	glabels2/src/object-editor-line-page.c
A	glabels2/src/object-editor-lsize-page.c
A	glabels2/src/object-editor-position-page.c
A	glabels2/src/object-editor-private.h
A	glabels2/src/object-editor-size-page.c
A	glabels2/src/object-editor-text-page.c
A	glabels2/src/object-editor.c
A	glabels2/src/object-editor.glade
A	glabels2/src/object-editor.h
M	glabels2/src/prefs-dialog.c
A	glabels2/src/prefs-dialog.glade
M	glabels2/src/prefs-dialog.h
M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_properties_24.png
M	glabels2/src/stock.c
M	glabels2/src/tools.c
M	glabels2/src/tools.h
A	glabels2/src/ui-sidebar.c
A	glabels2/src/ui-sidebar.h
M	glabels2/src/ui.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/view.h
D	glabels2/src/wdgt-bc-data.c
D	glabels2/src/wdgt-bc-data.h
D	glabels2/src/wdgt-bc-props.c
D	glabels2/src/wdgt-bc-props.h
D	glabels2/src/wdgt-bc-style.c
D	glabels2/src/wdgt-bc-style.h
D	glabels2/src/wdgt-fill.c
D	glabels2/src/wdgt-fill.h
D	glabels2/src/wdgt-line.c
D	glabels2/src/wdgt-line.h
D	glabels2/src/wdgt-position.c
D	glabels2/src/wdgt-position.h
D	glabels2/src/wdgt-size.c
D	glabels2/src/wdgt-size.h
D	glabels2/src/wdgt-text-entry.c
D	glabels2/src/wdgt-text-entry.h
D	glabels2/src/wdgt-text-props.c
D	glabels2/src/wdgt-text-props.h
D	glabels2/src/wdgt-vector.c
D	glabels2/src/wdgt-vector.h
M	glabels2/src/window.c
M	glabels2/src/window.h

commit 132b37df55e9e78afb0abb7de68696de150b59d4
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-24

    Modified for upcomming 1.93.0.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@347
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 5894e21a4bcf7fd0bedda704828ee3dd3f7f4d31
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-17

    Fixed cut-n-paste error:  font_italic_flag is gboolean, not
    GnomeFontWeight.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@346
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c
M	glabels2/src/label-object.h

commit f550817d9014d2bbf5443dd55750fb23c4f327c6
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-16

    Added italian translations.  Provided by Mancio <mancio_and@yahoo.it>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@345
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/configure.in
A	glabels2/po/it.po

commit 1821f44c12d204441415f0f86917aaf7d0dc1bdb
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-16

    Updated copyright date in about dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@344
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/commands.c

commit bbd5fe10e125d4920fb4ed8ef2433e1f5ef9e751
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-16

    Updated japanese translation.  Provided by Takeshi Aihana
    <aihana@jcom.home.ne.jp>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@343
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/ja.po

commit b96836c5812bd54c4d077cacaa3f57cd8f821af5
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-15

    Added "break" in draw_markup_layer between line and circle cases
    of switch.	This fixes Bug #842705.  This is also the 2nd time I
    have fixed this bug -- I must of neglected to check it in.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@342
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit 679345152aca90d9e96764babfaffbf29ad947da
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-11

    Prefixed $(configdir) with $(DESTDIR) in intall-data-local rule.
    Patch provided by Andrew Lau <netsnipe@users.sourceforge.net> needed
    to build debian package.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@341
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/Makefile.am

commit 357dece84bdbf8a6a9cf229cf0145e247e0dc09e
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-09

    Preparation for 1.92.3 release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@339
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 782c39f08243f6e5bac40feab7dfdae50e005957
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-09

    Added additional user submitted templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@338
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/data/misc-iso-templates.xml

commit c20fc06cf628c75318b2330b7bdf7892c5df7a89
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-09

    Make the "Other" page size a full-fledged member of the pages list.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@337
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/paper.c

commit c682ad48f57e9316b809a64f70514ed68f711ed5
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-09

    One of the signal handlers (view_scale_changed_cb) created with a
    view_highlight actually belongs to view.  So when a view_highlight
    is finalized, we must disconnect this handler.  This fixes the crash
    reported in bug #836873.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@336
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-highlight.c

commit 0869fee988c04a6c7bf317fe92410c7a20e5cfeb
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-02

    *** empty log message ***


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@335
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/barcode-0.98/configure
M	glabels2/po/cs.po
M	glabels2/po/de.po
M	glabels2/po/es.po
M	glabels2/po/fr.po
M	glabels2/po/ja.po
M	glabels2/po/pl.po
M	glabels2/po/pt_BR.po
M	glabels2/po/ru.po
M	glabels2/po/zh_TW.Big5.po

commit 12ffda8cb72321cfbd4e5d1e6775beaf34560261
Author: Jim Evins <evins@snaught.com>
Date:	2003-11-02

    Return immediately if --version option set.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@333
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in
M	glabels2/src/glabels-batch.c

commit de9574629d2b0fee2a1f898516863f80c9a43c53
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-31

    Fixes glabels-batch frontend that broke when porting to gnome-print
    2.2.  This fixes bug #832206.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@332
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-batch.c
M	glabels2/src/print.c

commit b657e02ae4905a080de7ca849c5b5310e50b2b91
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-28

    Much cleaner implementation of fix for Bug #822848.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@330
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/window.c

commit ce3e06da0c3abb47e2d9b5970e5bce670e56d639
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-27

    Brought README up-to-date, including updating website.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@329
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/README

commit 5b8870cdd41d8dbede3ef438b87b030f0bf89591
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-27

    Fix for Bug #822848:  in gl_window_destroy() unreference window->uic
    and recent_view.

    Hack:  squirrel away recent_view as data in window->uic, and extract
    this in gl_window_destroy().  A better approach might be to wrap up
    the ui_component in its own object, then simply unreference it.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@328
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/ui.c
M	glabels2/src/window.c

commit 299887846ca7b16b3eb7113a6efae93c73763647
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-27

    Updated reference to glabels website.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@327
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/commands.c

commit acd06beb42f79ed27a2d9a469c56e6daafb72fb8
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-19

    New glabels icon.  Adding as a binary file this time.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@326
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/pixmaps/glabels-icon.png

commit 1746d5fae438cdab908d883742c65f57d1243f23
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-19

    Removing glabels-icon.png, to replace with new file to be added as
    a binary file this time.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@325
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels2/pixmaps/glabels-icon.png

commit f584c36b1ef64ce81102c1033632cbb5a10ffb33
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-19

    Applied patch #826108:  Installs files to register glabels and
    glabels filetypes/mimetypes with gnome.  This addresses bug #822852.
    Supplied by Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>.
    This patch adds the files:

	    pixmaps/glabels.png
	    data/glabels.mime
	    data/glabels.applications
	    data/glabels.keys.in


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@324
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/Makefile.am
A	glabels2/data/glabels.applications
M	glabels2/data/glabels.desktop.in
A	glabels2/data/glabels.keys.in
A	glabels2/data/glabels.mime
M	glabels2/pixmaps/Makefile.am
A	glabels2/pixmaps/glabels.png

commit 9acf7f6f72a3f7aa70325cb99d5416167d7e1e99
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-19

    Do not attempt to install header files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@323
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/recent-files/Makefile.am

commit bd8f890e80ae5726deda06cd1874bbb3e6bc1f03
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-19

    Cannot translate an empty string -- changed to " ".


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@322
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/commands.c

commit a679e0dc1aa5202475800847262095df1b1526d3
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-19

    Removed references to old gnome-recent-* files.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@321
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit 5fba23738c145c5767bab85e1e7f92d050c98ea3
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-19

    glabels.spec.in:  Updated by merging with Dag Wieers's
    <dag@wieers.com> glabels.spec file.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@320
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/glabels.spec.in

commit c850d6c4b460d4eb71462b01b6dd8d67139faf54
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-18

    Workaround for problem with gnome-print rendering images with alpha
    channels.  See bug #822840.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@319
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c

commit 6442032ba8d7117adead42725d24f8ffa0c6df6a
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-18

    Minor tweaks to Avery US definitions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@318
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/avery-us-templates.xml

commit 0922af212e7e1fdd8c100bceb9d1107380afb101
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-17

    Cleanup of Avery US-Letter templates.

     - Spaced between manufacturer and part # to facilitate sorting,
     i.e. Assume part #s are 5 digits and right justified.

     - Unified descriptions so they are consistent with the generic
     portion of Avery's descriptions, and their are fewer unique
     descriptions to facilitate translations.

     - If multiple types per sheet or part #, the part # is suffixed
     with an appropriate description (e.g. 8391-Disc).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@317
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/avery-us-templates.xml

commit 5a7ea2653f663ae324fb66854477600db97ee6fd
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-17

    Allow comments anytime traversing a list of child nodes.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@316
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-template.c

commit c29868bc5e87ebd5e6531e2fc28261afafc183b5
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-15

    Applied patch #822935.  This patch slightly increases the invalidated
    area during a redraw request, to account for anti-aliasing.
    This prevent small artifacts from being left around when text
    and barcode objects are dragged around the canvas.	This patch
    also corrects an oversight in view-barcode.c when converting from
    gnome_canvas_hacktext to gl_canvas_hacktext.  This patch was provided
    by	Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@315
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/canvas-hacktext.c
M	glabels2/src/view-barcode.c

commit 0b5900cdd4732d281af4023d38d6c830fe86627d
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-13

    Removed aclocal.m4.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@314
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels2/aclocal.m4

commit a3f6bc15eabeeffe14eed2fe7645d2621f87f5ae
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-13

    Patch #819541:  moved to latest libegg version of recent-files.
    Patch provided by: Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@313
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 07a7b6952d0e27a252e12ef720bbc4d3e43bcd8b
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-13

    Patch #820699:  corrects interpretation of Object-text nodes when
    it consists of a single Field node.  Interpretation gets screwed
    up by the automatic XML indentation.  Patch provided by:  Emmanuel
    Pacaud <emmanuel.pacaud@univ-poitiers.fr>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@312
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit 49344d5aee4d1c314ba4a16469501d0bf1a72c0d
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-12

    Added StartupNotify line.  Suggested by James Ogley
    <james.ogley@pinnacle.co.uk>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@311
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/glabels.desktop.in

commit d16472a553fb5e025784e0330a6c53278b61c7b1
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-12

    Updated to reflect recent contributors.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@310
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS

commit dc69b06e19b29c9d5c7eead7456e6cb45550cb2a
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-09

    Replacing gnome-recent* with current egg recent files module.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@309
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/file.c
M	glabels2/src/file.h
M	glabels2/src/glabels.c
D	glabels2/src/gnome-recent-marshal.list
D	glabels2/src/gnome-recent-model.c
D	glabels2/src/gnome-recent-model.h
D	glabels2/src/gnome-recent-util.c
D	glabels2/src/gnome-recent-util.h
D	glabels2/src/gnome-recent-view-bonobo.c
D	glabels2/src/gnome-recent-view-bonobo.h
D	glabels2/src/gnome-recent-view.c
D	glabels2/src/gnome-recent-view.h
M	glabels2/src/recent.c
M	glabels2/src/recent.h
M	glabels2/src/ui.c
M	glabels2/src/xml-label.c

commit 060a20747c4aa07a07b8552151e491e60036e587
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-09

    Replacing gnome-recent* with current egg recent files module.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@308
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/src/recent-files/Makefile.am
A	glabels2/src/recent-files/egg-recent-item.c
A	glabels2/src/recent-files/egg-recent-item.h
A	glabels2/src/recent-files/egg-recent-model.c
A	glabels2/src/recent-files/egg-recent-model.h
A	glabels2/src/recent-files/egg-recent-util.c
A	glabels2/src/recent-files/egg-recent-util.h
A	glabels2/src/recent-files/egg-recent-vfs-utils.c
A	glabels2/src/recent-files/egg-recent-vfs-utils.h
A	glabels2/src/recent-files/egg-recent-view-bonobo.c
A	glabels2/src/recent-files/egg-recent-view-bonobo.h
A	glabels2/src/recent-files/egg-recent-view-gtk.c
A	glabels2/src/recent-files/egg-recent-view-gtk.h
A	glabels2/src/recent-files/egg-recent-view.c
A	glabels2/src/recent-files/egg-recent-view.h
A	glabels2/src/recent-files/update-from-egg.sh

commit 1dacd983302ea408fc8faa1f794d0ad09f1d4019
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-08

    Applied color combo patch, provided by Emmanuel Pacaud
    (emmanuelp@sourceforge.net).  One distinct improvement is that the
    icons are grayed out when the widget is insensitive.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@307
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/mygal/widget-color-combo.c
M	glabels2/src/mygal/widget-color-combo.h

commit 9c6084ffce76e776ce4716d2a0f4f09c9e65ac4d
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-08

    Changed default font from "Helvetica" to "Sans."
    Patch provided by Emmanuel Pacaud (emmanuelp@sourceforge.net)


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@306
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/bc.h
M	glabels2/src/label-text.c
M	glabels2/src/prefs.c

commit 72a09e53f6f8af5ed7d754c4f9ebabf4a28e919a
Author: Jim Evins <evins@snaught.com>
Date:	2003-10-08

    Applied patch to correct conversion errors when reading files for many
    non-"C" locales, i.e. locales where commas are used as decimal points.
    Provided by Emmanuel Pacaud (emmanuelp@sourceforge.net).

    Additionally modified, to allow locale format for in xml files to
    be honored and to honor spaces between value and units.

    All values written by glabels are now guaranteed to be in the
    "C" locale.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@305
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml.c

commit 48dd1bd999f454c730feaa4c1c9c69854a28145e
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-29

    Fixed parsing of Text->Line nodes:	removed artifact "== 0".


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@304
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label-04.c

commit fecdc335bcffe3ecc858fd9e8cd07ecb5964a14a
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-25

    Added MediaLine template submitted as feature request at sourceforge.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@303
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/data/misc-iso-templates.xml

commit 5e669ab469eea243df9922345e9223fcd30e9886
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-23

    More descriptive Name and Comment.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@302
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/glabels.desktop.in

commit 610ef2dea4f0cc6e12301295c27317cf87b826ad
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-23

    Removed un-needed dependency on gdk-pixbuf.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@301
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit edfd7d16e33d5a1c03b8cb805dbfdfce5767694d
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-22

    gl_pixbuf_cache_remove_pixbuf():  Bail immediately if name == NULL.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@300
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/pixbuf-cache.c

commit 1aff0b640e22e7eddc8c17a09f1d0636174e9926
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-18

    Added option to print crop marks.  Suggested by Red Planet
    <ephemeroot@yahoo.com>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@299
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-batch.c
M	glabels2/src/print-dialog.c
M	glabels2/src/print.c
M	glabels2/src/print.h

commit b4df48aa17705f9995b4b08e5d20bb241302d44b
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-07

    Updated Japanese translations (Takeshi AIHANA
    <aihana@jcom.home.ne.jp>).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@298
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/ja.po

commit 5202a6f7ffb34a6cf7147e8dd57112a898ade761
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-05

    Added categories field so that glabels will show up in the office
    menu on RH9.  Thanks to David L Norris <dave@webaugur.com>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@297
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/glabels.desktop.in

commit 27acbc86591eb7548bf507d09b5ea7a9ed036134
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-03

    Fixed typo.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@295
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/view.c

commit 407e8e0f8195fde90fbd384cceba03e460ed0543
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-02

    Changed LGPL notices to GPL, as required by the LGPL section 3.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@294
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/mygal/color-group.c
M	glabels2/src/mygal/color-group.h
M	glabels2/src/mygal/color-palette.c
M	glabels2/src/mygal/color-palette.h
M	glabels2/src/mygal/e-colors.c
M	glabels2/src/mygal/e-colors.h
M	glabels2/src/mygal/e-util.h
M	glabels2/src/mygal/gtk-combo-box.c
M	glabels2/src/mygal/gtk-combo-box.h
M	glabels2/src/mygal/widget-color-combo.c
M	glabels2/src/mygal/widget-color-combo.h

commit 01b7a7b4909da417036c09ea42151602dd2249c7
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Brought acknowledgements up-to-date.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@293
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS

commit 221fb81668fb66b84cf249269857655f76ef2528
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Added waste attribute to all CD/DVD labels.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@292
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/avery-iso-templates.xml
M	glabels2/data/misc-iso-templates.xml
M	glabels2/data/misc-us-templates.xml
M	glabels2/data/zweckform-iso-templates.xml

commit 0f6fbe429033b21c7c4fd66d284140a121bead60
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Cleanup.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@291
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/TODO

commit 71f5a916bf906c4b25c6ebfb3ee9bfe43e84bbe6
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    In clip_punchouts(), center hole correctly on business card CDs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@290
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c

commit 1dec5fe436bd8b08d648bc8a7da2171ed137a2cc
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Added XInclude support.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@289
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit 4d6e1a622b1df731ca3d46353170e725f30ac369
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Added hack to save ink, by not printing within CD holes.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@288
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c

commit a119bbef560e4699fae660a1d8c6c4cf67310646
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Superficial code formatting.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@287
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/template.c

commit 38b1468153a8c46e88246bd029de4ee016724a1f
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Added support for Markup-circle in templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@286
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/glabels-2.0.dtd
M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/view.c
M	glabels2/src/xml-template.c

commit 165c5ca1599ac03d43077486cc90e46d3dde6bac
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Added compatability parser for files generated with 1.91.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@285
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
A	glabels2/src/xml-label-191.c
A	glabels2/src/xml-label-191.h
M	glabels2/src/xml-label.c

commit b1c557ddbf0a5e20d5aa52e100e400804a101738
Author: Jim Evins <evins@snaught.com>
Date:	2003-09-01

    Added templates that have been collecting dust in my inbox.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@284
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/TODO
M	glabels2/data/avery-us-templates.xml
M	glabels2/data/misc-iso-templates.xml
M	glabels2/data/misc-us-templates.xml

commit 0e23a07185249e1efecc272f9d5f3ad42a439d54
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    Broke out template file into separate files, organized by manufacturer
    and page size standard (us and iso).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@283
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/Makefile.am
A	glabels2/data/avery-iso-templates.xml
A	glabels2/data/avery-us-templates.xml
A	glabels2/data/misc-iso-templates.xml
A	glabels2/data/misc-us-templates.xml
D	glabels2/data/predefined-templates.xml
A	glabels2/data/zweckform-iso-templates.xml
M	glabels2/po/POTFILES.in

commit 114640562d0fb46ac65e0afadc54c1db0fd69d44
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    No longer use RLE for pixdata -- this caused crashes for many images.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@282
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit 0e570fb78805dcd3ca466e5ad35eeec4db2beaa6
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    Added waste attribute to Avery 5931 template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@281
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/predefined-templates.xml

commit 580cabfe1f1dee67e3952066a24e65eda443f184
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    Added waste attribute to label templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@280
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c
M	glabels2/src/template.h
M	glabels2/src/xml-template.c

commit e318f4a1459cd1b2ae90583d3c25007225d3c0b3
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    "Merge_fields" is now simply "Merge"


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@279
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit 2d88eaebd52cdd58e6e0fc0b7eb8975f44b62a5f
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    - Replaced gnome color pickers with mygal color combos.
    - Made context of all color groups NULL.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@278
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/ui-property-bar.c
M	glabels2/src/wdgt-bc-props.c
M	glabels2/src/wdgt-fill.c
M	glabels2/src/wdgt-line.c
M	glabels2/src/wdgt-text-props.c

commit 4c60c14f0536b5733898c93d3a9f1a61cf15f6b2
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    gl_wdgt_line_get_params(): Line width is double, not int!


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@277
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/wdgt-line.c

commit 24dde46b0c1467f17749404de6fb902073864c07
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    Updated to use 2.0 file formats.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@276
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/xml-label.c
M	glabels2/src/xml-paper.c
M	glabels2/src/xml-template.c
M	glabels2/src/xml-template.h
M	glabels2/src/xml.c

commit 03a364f16bab38c0551af5e804e5394c9b875c80
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    Use theme colors for shadow and selections.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@275
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h

commit 9f032dc3bb103835673fabedf82a6d2a9efbc1a4
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    Created DTD for glabels 2.0 file types.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@274
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/Makefile.am
A	glabels2/data/glabels-2.0.dtd
M	glabels2/data/paper-sizes.xml
M	glabels2/data/predefined-templates.xml

commit 42b8f5fed3158ccf418d34d1ade3c8dca8984a42
Author: Jim Evins <evins@snaught.com>
Date:	2003-08-31

    Updated to reflect current development plan.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@273
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/TODO

commit f99a01c8886bfb351ed488403faa79036294e7ae
Author: Jim Evins <evins@snaught.com>
Date:	2003-07-27

    - Added mygal, a modified version of the gal library, to provide a
    sophisticated color combo widget.

    - Added ui-property-bar.[ch] and ui-util.[ch] to add a property
    bar to edit some properties of selections without going through a
    "edit properties" dialog.

    - Added stock icons


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@272
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/color.c
M	glabels2/src/color.h
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/glabels-ui.xml
M	glabels2/src/glabels.c
M	glabels2/src/label-barcode.c
M	glabels2/src/label-box.c
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-line.c
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
A	glabels2/src/mygal/Makefile.am
A	glabels2/src/mygal/color-group.c
A	glabels2/src/mygal/color-group.h
A	glabels2/src/mygal/color-palette.c
A	glabels2/src/mygal/color-palette.h
A	glabels2/src/mygal/e-colors.c
A	glabels2/src/mygal/e-colors.h
A	glabels2/src/mygal/e-marshal.list
A	glabels2/src/mygal/e-util.h
A	glabels2/src/mygal/gtk-combo-box.c
A	glabels2/src/mygal/gtk-combo-box.h
A	glabels2/src/mygal/widget-color-combo.c
A	glabels2/src/mygal/widget-color-combo.h
M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_bucket_fill_16.png
A	glabels2/src/stock-pixmaps/stock_bucket_fill_24.png
A	glabels2/src/stock-pixmaps/stock_pencil_16.png
A	glabels2/src/stock-pixmaps/stock_pencil_24.png
M	glabels2/src/stock.c
M	glabels2/src/stock.h
A	glabels2/src/ui-property-bar.c
A	glabels2/src/ui-property-bar.h
A	glabels2/src/ui-util.c
A	glabels2/src/ui-util.h
M	glabels2/src/ui.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/wdgt-text-props.c
M	glabels2/src/window.c
M	glabels2/src/window.h

commit d2dcd6e7dc0d0ede254a3fb656a6aad8c9dec747
Author: Jim Evins <evins@snaught.com>
Date:	2003-07-27

    - Added mygal, a modified version of the gal library, to provide a
    sophisticated color combo widget.

    - Added ui-property-bar.[ch] and ui-util.[ch] to add a property
    bar to edit some properties of selections without going through a
    "edit properties" dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@271
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit 007d50748d65f43a899a21c1836aa5ac327491b6
Author: Jim Evins <evins@snaught.com>
Date:	2003-07-27

    Added mygal, a modified version of the gal library, to provide a
    sophisticated color combo widget.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@270
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/aclocal.m4
M	glabels2/configure.in

commit 4fb60b25ad3cb3f2eb883f7fff949f9394a49aaa
Author: Jim Evins <evins@snaught.com>
Date:	2003-07-19

    Fixes crash on XD2: start with an object size of 1pt x 1pt, instead
    of 0 x 0.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@269
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-image.c

commit d914113d4e1b767dbba1b36249524327238d58c8
Author: Jim Evins <evins@snaught.com>
Date:	2003-07-07

    Harmonized runtime checks for view and view->label.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@268
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit 93756b4b8da8dc80900dc8f28499489ef31986b5
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-30

    - View now tracks label resize events.

    - Template instantiations assume name of actual alias selected.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@267
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/file.c
M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/view.c
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/xml-template.c

commit 59462f65a2db3cc6b6a1adb381f568eb5b5201ec
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-28

    Added FileProperties dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@266
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/commands.c
M	glabels2/src/commands.h
M	glabels2/src/file.c
M	glabels2/src/file.h
M	glabels2/src/glabels-ui.xml
M	glabels2/src/ui.c
M	glabels2/src/xml-template.c

commit 23225999ec5847db64faffcae78e0aa136a6c1ed
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-28

    - xml-template.c:  use page size name as a fallback if id doesn't
    exist.

    - print.c:	don't set page size id for config


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@265
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c
M	glabels2/src/xml-template.c

commit 799b35b71486eb37a7435ac76134a2a7441cb8ee
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-23

    The widget should now correctly use the page size "id" when
    interacting through its API, but use the page size "name" (which
    may be localized) when interacting with the human user.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@264
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-media-select.h

commit 34867c4f967a93042e453e550aa5a7921141db7b
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-23

    Renamed files to support gettextizing with intltool.
	page-sizes.paper -> paper-sizes.xml
	predefined-labels.template ->predefined-templates.xml

    xml-paper now looks for files with ".paper" extension or exactly named
    "paper-sizes.xml".

    xml-template now looks for files with ".template" extension or
    ending with
    "-templates.xml".

    Gettext is run on attributes starting with "_" in both xml-paper
    and xml-template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@263
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/paper.c
M	glabels2/src/template.c
M	glabels2/src/xml-paper.c
M	glabels2/src/xml-template.c

commit 42fd154b7670f4a7db82fa0990f856ccd3bd3270
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-23

    Renamed files to support gettextizing with intltool.
	page-sizes.paper -> paper-sizes.xml
	predefined-labels.template ->predefined-templates.xml


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@262
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/Makefile.am
R100	glabels2/data/page-sizes.paper	glabels2/data/paper-sizes.xml
R089	glabels2/data/predefined-labels.template
glabels2/data/predefined-templates.xml
M	glabels2/po/POTFILES.in

commit b3e89167d2b78e0c48ce7239db145b8be9d48757
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-22

    - Created Makefile.am in ./data and ./pixmaps directories
       - Modified ./configure.in and ./Makefile.am to work with these
       Makefiles
       - Moved glabels.desktop to ./data directory

    - Changed version to 1.92.0 in ./configure.in

    - Added page-sizes.paper to ./data -- it seems to be less hassle
    to maintain
      a local paper size database.

    - Added paper.[ch] and xml-paper.[ch] to ./src.

    - Converted to libgnomeprint-2.2 -- serious hack: ignoring the
    fact that
      gnome-printer-selector is private.

    - Added files to ./po/POTFILES.in


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@261
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
A	glabels2/src/paper.c
A	glabels2/src/paper.h
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs.c
M	glabels2/src/print-dialog.c
M	glabels2/src/print.c
M	glabels2/src/print.h
M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
A	glabels2/src/xml-paper.c
A	glabels2/src/xml-paper.h
M	glabels2/src/xml-template.c

commit 608bd2f3e4b58fb6598cc15c52c467990c3295cf
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-22

    - Created Makefile.am in ./data and ./pixmaps directories
       - Modified ./configure.in and ./Makefile.am to work with these
       Makefiles
       - Moved glabels.desktop to ./data directory

    - Changed version to 1.92.0 in ./configure.in

    - Added page-sizes.paper to ./data -- it seems to be less hassle
    to maintain
      a local paper size database.

    - Added files to ./po/POTFILES.in


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@260
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/po/cs.po
M	glabels2/po/de.po
M	glabels2/po/es.po
M	glabels2/po/fr.po
M	glabels2/po/ja.po
M	glabels2/po/pl.po
M	glabels2/po/pt_BR.po
M	glabels2/po/ru.po
M	glabels2/po/zh_TW.Big5.po

commit da616712ac9ecf2dd8a642839ff052e8827a4066
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-22

    - Created Makefile.am in ./data and ./pixmaps directories
       - Modified ./configure.in and ./Makefile.am to work with these
       Makefiles
       - Moved glabels.desktop to ./data directory

    - Changed version to 1.92.0 in ./configure.in

    - Added page-sizes.paper to ./data -- it seems to be less hassle
    to maintain
      a local paper size database.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@259
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/data/Makefile.am
A	glabels2/data/glabels.desktop.in
A	glabels2/data/page-sizes.paper
A	glabels2/pixmaps/Makefile.am

commit ac2056db0f3c63d362789598da0232ce858050af
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-22

    - Created Makefile.am in ./data and ./pixmaps directories
       - Modified ./configure.in and ./Makefile.am to work with these
       Makefiles
       - Moved glabels.desktop to ./data directory

    - Changed version to 1.92.0 in ./configure.in


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@258
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/Makefile.am
M	glabels2/aclocal.m4
M	glabels2/configure.in
D	glabels2/glabels.desktop

commit e6e1186a7ed01d5c26c43ff7f02107a998caeb87
Author: Jim Evins <evins@snaught.com>
Date:	2003-06-07

    Reconciled unit names with absolute unit names from CSS2 spec
    (section 4.3.2).
    Fixed comparison in gl_xml_get_prop_length().


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@257
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml.c

commit 2eab1f387f9288550bac8c615b707eaa58235084
Author: Jim Evins <evins@snaught.com>
Date:	2003-05-26

    In xml.[ch]:
      - Added functions to get and set length properties:
	gl_xml_get_prop_length()
	gl_xml_set_prop_length()

      - Changed gl_xml_get_prop_uint_hex() to gl_xml_get_prop_uint().
      It should
	automatically determine base according to "C" rules, i.e. "0x"
	=> hex,
	"0" => octal, and anything else is decimal.

      - gl_xml_get_prop_int() has also been modified to use the "C" rules.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@256
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label.c
M	glabels2/src/xml-template.c
M	glabels2/src/xml.c
M	glabels2/src/xml.h

commit 9f6e057631e99baa8c5cd1eff1b661c54f578f24
Author: Jim Evins <evins@snaught.com>
Date:	2003-04-30

    Made all comparisons case sensitive.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@255
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label.c
M	glabels2/src/xml-template.c
M	glabels2/src/xml.c

commit 9b6570c2ad57f9394121cc17175b95f72d43dc4c
Author: Jim Evins <evins@snaught.com>
Date:	2003-04-28

    Moved template xml functions to separate module (xml-template.[ch]).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@254
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/xml-label.c
A	glabels2/src/xml-template.c
A	glabels2/src/xml-template.h

commit d7e2e958e19d141526a63ad6d975b6f89ee2d67d
Author: Jim Evins <evins@snaught.com>
Date:	2003-04-27

    Applied barcode patch to save and restore barcode sizes, provided
    by Alessandro Zummo <azummo@towertech.it>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@253
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit 644ae2cb7da38765dfb8dc900eb76eb4be5ae84c
Author: Jim Evins <evins@snaught.com>
Date:	2003-04-27

    Added various templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@252
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/predefined-labels.template

commit e3473cc57bad364568a8b127a4d6ac7149a01365
Author: Jim Evins <evins@snaught.com>
Date:	2003-04-27

    Added various acknowledgments.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@251
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS

commit a60ea319cf36ef22786f6c4853eb25c2a5931170
Author: Jim Evins <evins@snaught.com>
Date:	2003-04-27

    Added Czech translations, thanks to David Makovský(Yakeen)
    <yakeen@sannyas-on.net>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@250
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in
A	glabels2/po/cs.po

commit 9d25899fa01c234a3f868c459b6459061b350e74
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-26

    Cleanup of code formatting.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@248
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml.c

commit b8723dacf7eff5c8ac7acaad5dc4986900921bdd
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-26

    Removed unused signals[] array.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@247
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/merge-text.c
M	glabels2/src/merge.c

commit 19c65879b8dcd02bae6a484f339ecc4dc4a55e5f
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-26

    Fixed parameters sent to gl_label_barcode_set_props() when creating
    new barcode.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@246
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-barcode.c

commit 251323ecb306c6ed40528a6e57e0dbd2a0495f5c
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-25

    Barcodes are now resizable interactively on the canvas in both width
    and height (no more scale).
    Added checkbox to turn-off checksum digit on barcodes when it is
    optional.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@245
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-gnubarcode.h
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc-postnet.h
M	glabels2/src/bc.c
M	glabels2/src/bc.h
M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/print.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-highlight.c
M	glabels2/src/wdgt-bc-props.c
M	glabels2/src/wdgt-bc-props.h
M	glabels2/src/wdgt-bc-style.c
M	glabels2/src/wdgt-bc-style.h
M	glabels2/src/xml-label.c

commit 68b7f3520db383f2ca7000533e63c39f3f07f7c7
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-16

    Text box refinement.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@244
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/print.c
M	glabels2/src/view-text.c

commit 8658f7ffd7739571743c8827b994a0c09d2713ab
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-08

    Added xml_set_prop_*() utilities to xml.c.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@243
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/template.c
M	glabels2/src/xml-label.c
M	glabels2/src/xml.c
M	glabels2/src/xml.h

commit 08f61b05720c3fbd5e44c8723a171f08495683d1
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-07

    Added text box support.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@242
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/view-text.c
M	glabels2/src/xml-label.c

commit 5a7b691ea17308062acf0d62f92ee8811aaeee5e
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-07

    Added xml utility module.  Parsing of label and template xml files
    should no longer strand pointers returned from xmGetProp().


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@241
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/template.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label.c
A	glabels2/src/xml.c
A	glabels2/src/xml.h

commit 2421a75ff0aa9b7b8e1ccf9e944b138b547be044
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-06

    Updated ja and pt_BR translations.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@240
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/ja.po
M	glabels2/po/pt_BR.po

commit 9be83cfe285d2774a6ba97d5cd2fee67e8135f9f
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-06

    Updated pt_BR translations.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@239
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/po/pt_BR.po

commit 8a0aa0721e17c5256a5f35fb44714844bec41195
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-06

    Added pixbuf cache and base64 modules.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@238
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit caa0ba592597dccf7b6980e66ccd7f591c115410
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-06

    Added pixbuf cache and base64 modules.
    Pixbufs are now saved in a glabels file as a base64 encoded version
    of the serialized pixdata.
    Files are now compressed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@237
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
A	glabels2/src/base64.c
A	glabels2/src/base64.h
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/glabels.c
M	glabels2/src/label-image.c
M	glabels2/src/label.c
M	glabels2/src/label.h
A	glabels2/src/pixbuf-cache.c
A	glabels2/src/pixbuf-cache.h
M	glabels2/src/view.c
M	glabels2/src/xml-label.c

commit 2a1ec544be08cf7cf5e0d1c801627d73aa0b5424
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-03

    Added support for "Other" page sizes.  Template sheets with a page
    size of "Other" should also have the height and width properties set.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@236
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c
M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-media-select.h
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-mini-preview.h

commit 73e3165ed36f77fa7048140ccdc4a0e982189a37
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-02

    Bumped up version to 1.91.1, in preparation for next release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@235
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 6becaea14febeb218e1b071014ce1a7458df0d60
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-02

    Added support for Business Card CD Labels (Clipped circular shape).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@234
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/predefined-labels.template

commit 916e4368d97d638db065e79f3ab694701d20cdbc
Author: Jim Evins <evins@snaught.com>
Date:	2003-01-02

    Added support for Business Card CD Labels (Clipped circular shape).
    Fixed artifact hack in wdgt-rotate-label -- made sure the scroll
    region was
    as large as the canvas, so that the label was not shoved into the
    upper left corner of the canvas.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@233
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label.c
M	glabels2/src/print.c
M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/view.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-rotate-label.c

commit 168faf48af68963a103de1def4f87d15ddb6f9b9
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-31

    Use art_affine_scale() to flip objects instead of art_affine_flip().


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@231
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c

commit 11fc5ffdd802110a1997d3746f7488424674d460
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-31

    Created "File" tag for literal filenames for image objects.
    Added "Literal" tag to barcode objects.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@230
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit b8b1d634eaf6b7b6e369e4521cb5a03c1946fc36
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-31

    Do not g_object_unref a merge object, if NULL.  Caused warnings
    during paste.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@229
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label.c
M	glabels2/src/view-text.c
M	glabels2/src/xml-label.c

commit dfdf166ca400fd4028dda0248a0be7f19d7383c4
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-28

    No longer attempt to rotate/flip around center of object.  This was
    very problematic because the object's affine keeps changing under
    one's nose.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@228
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/print.c
M	glabels2/src/view-highlight.c
M	glabels2/src/view-object.c

commit d69454e4ad96cdef3501a62fb60bb3dab2316104
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-28

    glLabelText now uses a GtkTextBuffer to store text, in preparation
    for editing of text in place.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@227
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/view-text.c
M	glabels2/src/wdgt-text-entry.c
M	glabels2/src/wdgt-text-entry.h

commit 8c26425f775cdc04c4410583a91047fef0452a50
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-28

    Fixed compiler warning.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@226
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label-04.c

commit 0bdc99ef3c41c53bdf59bdad64090dc8a7f71b0a
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-28

    Moved item event handler to view-object.c.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@225
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-highlight.c
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view.c
M	glabels2/src/view.h

commit b4cafe8f16b8cd51af2f50dafd69ac19fa5f844b
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-27

    "New" dialog is now modal.
    Added short name to titles of "print" and "save as" dialogs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@224
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/file.c
M	glabels2/src/print-dialog.c

commit 538b382224f845af298b3559bcfa229f410625ac
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-27

    Window title cleanup.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@223
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-dialog.h
M	glabels2/src/window.c

commit b055a6afad199d05172022bf79eb820639907bad
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-27

    Merge property dialog now a widget.
    One merge property dialog per view.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@222
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge-properties-dialog.h
M	glabels2/src/tools.c
M	glabels2/src/view.c
M	glabels2/src/view.h

commit c41c7bae0176ffce9880b4d4e64e81757366792d
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-25

    Formatting clean up.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@221
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/template.h
M	glabels2/src/text-node.h

commit 92e9778eea389de001b4230c76c0870fb1e9ead6
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-25

    Catching up on backlog of template submissions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@220
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/data/predefined-labels.template

commit 21c78e4b481abe340cfcb6af32c1ef1ba0ac223a
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-25

    Adds test to ensure a valid font family.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@219
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-text.c
M	glabels2/src/wdgt-text-props.c

commit aabdc641bfd8f609709a486bdeb965c690f5d734
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-24

    Use object specific methods to determine size when determining extent
    and centers of objects.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@218
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c

commit fd9d7b5004b57bfaf00e9fc1abbf6ee6035aa3f5
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-22

    Removed unused gl_view_object_get_dialog() function.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@217
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-object.c

commit 26ef752a7bc6e9bd7546c95c1639e8d967564c47
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-22

    Fixes crash in gl_text_node_lines_expand() when line contains
    no nodes.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@216
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/text-node.c

commit f5a3b04a4318c31e49a2a4f169e5f172d3f42db4
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-15

    Always set default entry when loading new strings in the
    template_combo.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@215
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/wdgt-media-select.c

commit ccbf23cfc7000b5aeba5030fb7e7cca066a1a315
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-12

    More work on images from merge data.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@214
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-image.c
M	glabels2/src/view-image.c
M	glabels2/src/wdgt-image-select.c

commit 5ddb04aa4cf50122ae8d65409a00f6999c5cf169
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-11

    Initial support for supplying images from merge data.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@213
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-image.c
M	glabels2/src/label-image.h
M	glabels2/src/print.c
M	glabels2/src/text-node.c
M	glabels2/src/view-image.c
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label.c

commit 9b08719f732321618f6f96c5863b3ad3ed01eb7f
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-10

    Added wdgt_image_select widget for selecting image files or merge
    fields for images.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@212
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
A	glabels2/src/wdgt-image-select.c
A	glabels2/src/wdgt-image-select.h

commit 3a083dee8b93f54529ea0bcb448fb9cb1c44a105
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Fixed logic to remember previous merge source.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@211
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/merge-properties-dialog.c

commit 7091e560600fb41c01cb88f334e54cbb6cd7ea0b
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Added logic that ignores lines containing a single empty field
    (e.g. ${ADDRESS2} == "").


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@210
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/text-node.c

commit c1392472ae18285bbfcc4101d0a87f7c7e5e67d8
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Removed annoying affine debug statements.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@209
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/canvas-hacktext.c

commit 5c151d532ee53365a3e1695e2c88f3a6ddd4d3e6
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Added GtkTreeView w/ model to preview fields and allow record
    selection.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@208
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/merge-properties-dialog.c

commit ae1e0d489c56591c29fda89d0d733c050c19cafb
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Added get_primary_key method.
    Rewrote  gl_merge_get_key_list() to use record_list().
    Ported improved CSV parser from 0.4.6.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@207
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/merge-text.c

commit 17c607468d325aa3abb43db3d5c5fa00458303ff
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Added get_primary_key method.
    Removed open, close, get_record, free_record, free_record_list
    functions
    from public API.
    Renamed gl_merge_read_record_list() to gl_merge_get_record_list().
    Renamed gl_merge_count_records() to gl_merge_get_record_count().


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@206
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/merge.c
M	glabels2/src/merge.h

commit 5f50ecbe6d0aba98f76a169f1eec5600f20eb3f3
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Moved gl_merge_get_record_list() to inner-most functions possible.
    Fixed page_begin logic for merge print functions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@205
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print-dialog.c
M	glabels2/src/print.c
M	glabels2/src/print.h

commit c7ba6d95b143d1f44d1e8f615ebcebde8384e686
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Changed field text from "FIELD{*}" to "${*}".


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@204
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/wdgt-text-entry.c

commit 5f7abd61a52ac90b4e4b7d21e006dfd8d10bd36f
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Corrected order of arguments to gl_merge_eval_key().
    Changed field text from "FIELD{*}" to "${*}".


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@203
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/text-node.c

commit 4725dd8e0562bb35593ec155215f7b583931ec89
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    Bumped up namespace to 1.92.
    Literal text is now contained in "Literal" nodes -- this breaks
    compatability with 1.89 and 1.90.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@202
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit 44dfc43fde047c1d6f8cfe13c91debaa7ea37fa8
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-08

    gl_window_new_from_file() no longer ignores abs_filename.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@201
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/window.c

commit da99416fc86eb1724eec8ed335624a6566f09296
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-05

    Multiple fixes to merge type and properties dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@200
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label.c
M	glabels2/src/merge-init.c
M	glabels2/src/merge-properties-dialog.c
M	glabels2/src/merge.c

commit efe5baf8e0405b1f4cc7c6740fb30853ed68b62e
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-03

    Additions to development plan.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@199
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/TODO

commit d4ebf0e752a63bc3a16b52226aba3be1aec5ff5f
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-03

    New document merge API.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@198
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/label.c
A	glabels2/src/merge-init.c
C080	glabels2/src/merge-properties.h glabels2/src/merge-init.h
R067	glabels2/src/merge-properties.c
glabels2/src/merge-properties-dialog.c
R083	glabels2/src/merge-properties.h
glabels2/src/merge-properties-dialog.h
M	glabels2/src/merge-text.c
M	glabels2/src/merge-text.h
D	glabels2/src/merge-ui-text.c
D	glabels2/src/merge-ui-text.h
D	glabels2/src/merge-ui.c
D	glabels2/src/merge-ui.h
M	glabels2/src/merge.c
M	glabels2/src/merge.h
M	glabels2/src/print-dialog.c
M	glabels2/src/print.c
M	glabels2/src/tools.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-text.c
M	glabels2/src/wdgt-bc-data.c
M	glabels2/src/wdgt-bc-data.h
M	glabels2/src/wdgt-text-entry.c
M	glabels2/src/wdgt-text-entry.h
M	glabels2/src/xml-label-04.c
M	glabels2/src/xml-label.c

commit ff94fb2d1395644838dd247aa0643c27878afd99
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-01

    Changed M_PI to G_PI.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@197
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-vector.c

commit 928d14291b48a6cdf432a2e0990c82da0d8c91a4
Author: Jim Evins <evins@snaught.com>
Date:	2002-12-01

    free name during finalize.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@196
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c

commit 99b753edef76d37dbca105ced4c2f08df2c4b2f9
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-30

    Added callback to adjust affine of highlight.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@195
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-highlight.c
M	glabels2/src/view-object.c

commit 87a9ff607ba011815f80a7487492fc612c95af50
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-30

    Removed obsolete menu from view_object.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@194
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-object.c
M	glabels2/src/view-object.h

commit 8630930291f7555b2bbeeafb20f5a7ae25629933
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-30

    Disconnect callbacks that reference the properties dialog when it
    is destroyed.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@193
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c

commit aba3b4b013d3f41252dcffe263446c88bbfba2db
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-29

    Added functions gl_view_rotate_selection_left() and
    gl_view_rotate_selection_right().

    Added new context menus.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@192
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/tools.c
M	glabels2/src/view.c
M	glabels2/src/view.h

commit d0bfe7d204fc9a159c2105b012a8aefe030cc261
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-29

    Added stock_properties_16 icon.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@191
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml
M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_properties_16.png
M	glabels2/src/stock.c
M	glabels2/src/stock.h

commit cc528ab2e13a2d518b90df1734e775eea5132169
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-28

    Added commands to center selected objects to center of label.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@190
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml
M	glabels2/src/tools.c
M	glabels2/src/tools.h
M	glabels2/src/ui.c
M	glabels2/src/view.c
M	glabels2/src/view.h

commit 0f6a9bcff38a3f8f0af56c911c6fe8217ff746f4
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-28

    Added stock_center_horiz and stock_center_vert stock icons.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@189
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_center_horiz_16.png
A	glabels2/src/stock-pixmaps/stock_center_vert_16.png
M	glabels2/src/stock.c
M	glabels2/src/stock.h

commit d29dec5925a922fda1a513c7aa5707760a3a6c2f
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-28

    Updated russian translations, thanks to Vitaly Lipatov
    <LAV@VL3143.spb.edu>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@188
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/ru.po

commit cc5a600a2678408e69b8336481ca8eabec7471cd
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-28

    Added additional templates from my backlog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@187
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/data/predefined-labels.template

commit 2cd7297ae45065421acc610b767b82c9608a475d
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-28

    Added strategic debug statement to help locate bad templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@186
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/template.c

commit c31a43a3500a82401710abef158614e6c24e8a4a
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-26

    Cleaned up label object duplication code.
    Added get_size methods for text and barcode objects.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@185
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/label-box.c
M	glabels2/src/label-box.h
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-ellipse.h
M	glabels2/src/label-image.c
M	glabels2/src/label-image.h
M	glabels2/src/label-line.c
M	glabels2/src/label-line.h
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h
M	glabels2/src/view.c

commit 7fc9f03681245fcf04dee4f3392931f58f9c755b
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-25

    Added menu icons for order, rotation, and flipping commands.
    Split Align submenu, into Horizontal and Vertical submenus.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@184
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml
M	glabels2/src/stock.c
M	glabels2/src/stock.h
M	glabels2/src/ui.c

commit 5600ac72e77355eb50496eb8d079752649d1fb0f
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-25

    Added menu icons for order, rotation, and flipping commands.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@183
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_flip_horiz_16.png
A	glabels2/src/stock-pixmaps/stock_flip_vert_16.png
A	glabels2/src/stock-pixmaps/stock_order_bottom_16.png
A	glabels2/src/stock-pixmaps/stock_order_top_16.png
A	glabels2/src/stock-pixmaps/stock_rotate_left_16.png
A	glabels2/src/stock-pixmaps/stock_rotate_right_16.png

commit e745ae478b6bada6bac871e50d084b9cb4ce93d1
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-25

    Added object alignment commands.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@182
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml
M	glabels2/src/tools.c
M	glabels2/src/tools.h
M	glabels2/src/ui.c
M	glabels2/src/view.c
M	glabels2/src/view.h

commit 9ed794d648593c56391e2c39ba3d45a891f0db23
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-25

    Menu icons for alignment commands.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@181
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_align_bottom_16.png
A	glabels2/src/stock-pixmaps/stock_align_hcenter_16.png
A	glabels2/src/stock-pixmaps/stock_align_left_16.png
A	glabels2/src/stock-pixmaps/stock_align_right_16.png
A	glabels2/src/stock-pixmaps/stock_align_top_16.png
A	glabels2/src/stock-pixmaps/stock_align_vcenter_16.png
M	glabels2/src/stock.c
M	glabels2/src/stock.h

commit 29b2a2d7ad849248f70907052594d3b6a95d4c55
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-22

    Made set_size and get_size into child methods for label-object,
    and construct_dialog for view-object.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@180
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-object.c
M	glabels2/src/view-text.c

commit 7942bd2b1dc7d4adc0ee51d858d34efa92acc6c7
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-22

    Made set_size and get_size into child methods.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@179
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c
M	glabels2/src/view-object.h

commit 7b27fc9199039b2e5397c0a9bc5e5d7b27cfb969
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-21

    Moved highlights/handles to separate layer (top-level group).
    Tweaked appearance of highlights.
    Removed shuffling of items after a raise or lower, these were
    artifacts from when all items belonged to a single top-level group.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@178
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-highlight.c
M	glabels2/src/view-object.c
M	glabels2/src/view.c
M	glabels2/src/view.h

commit 09c923e6b7ea8b9f1dd47cb52489c47361ec6a1f
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-11

    Workaround for flipping/rotation problem for gdkpixbuf items.
    See libgnomecanvas bug #97604.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@177
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-object.c

commit 6ad4f9c94f5cf0144a068649c857638c742b420a
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-11

    Added initial object rotation code.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@176
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/print.c
M	glabels2/src/tools.c
M	glabels2/src/tools.h
M	glabels2/src/ui.c
M	glabels2/src/view-highlight.c
M	glabels2/src/view-object.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/xml-label.c

commit c83e8558a35b8713796e36370bf53064c57b1426
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-08

    Replaced gdk_pointer_grab() calls with gnome_canvas_item_grab() calls.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@175
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c
M	glabels2/src/wdgt-mini-preview.c

commit d1cfc9aeeebab5ed3e98686fb59fbdcd5521b5c4
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-04

    Unref highlight before destroying group.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@174
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-object.c

commit a922bbec35a3b9a3fff8fdf38537a460c8b48c71
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-03

    Adds code to set the view canvas's background color.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@173
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/color.c
M	glabels2/src/color.h
M	glabels2/src/view.c

commit 48b3f4e54f4a46f7265b3e0da02941d4865d6165
Author: Jim Evins <evins@snaught.com>
Date:	2002-11-03

    Highlight is now placed in object group, so it no longer needs to
    track object movements.  This also causes the label layer to appear
    as an ancestor of the highlight objects so that object_at in view.c
    does the right thing.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@172
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-highlight.c

commit 580011286a8e406198575a1222b980ba8e5e9a05
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-20

    Added demonstration markup lines to Avery 5931 and its lookalikes.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@171
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/predefined-labels.template

commit 8f156fce93d5cc64c4722893522ec1dbabba5513
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-20

    Added line markup to template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@170
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/view.c

commit 2b0d83bbb2a14f5ecfb3b17fd786f4fcb780febb
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-20

    Fixes finalization problems with highlight and object properties
    dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@169
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-highlight.c
M	glabels2/src/view-object.c

commit 9fc4f06840b10c94445cad21d24b6f78c79cff65
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-20

    Includes grid lines at perimeter.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@168
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit b897cdcafbb9d3ab52cda4ca8f74409d3ce3d4eb
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-20

    Changed version in preparation for next release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@167
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 24a6782ee37fe2057675d7699670f7890909b7b5
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-20

    Added grid to view.
    Created distinct gnome_canvas_groups for each distinct layer in view.
    Grid and markup visibility are now controlled by view menu.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@166
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/canvas-hacktext.c
M	glabels2/src/glabels-ui.xml
M	glabels2/src/prefs.c
M	glabels2/src/prefs.h
M	glabels2/src/ui.c
M	glabels2/src/view-object.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/window.c

commit e6d13b329522599b11a8fa5682644d8420657ce6
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-15

    View_highlight is now a full-fledged object that tracks its
    corresponding label object independently.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@165
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-highlight.c
M	glabels2/src/view-highlight.h
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c

commit 128e0c135f9048b32de6c0ac6c1a46f6f7140baa
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-15

    Pointer events are now generated for all modes.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@164
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c

commit 814a682c9362f01d7a3847153b0a37e103d83b17
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-14

    Initial flipping support -- still has some problems.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@163
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/marshal.list
M	glabels2/src/print.c
M	glabels2/src/tools.c
M	glabels2/src/tools.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/xml-label.c

commit 72888ff037ca8e1c0fea29b8f908a4bb69966976
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-14

    Now uses gl_label_object_copy_props() in dup function.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@162
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-barcode.c
M	glabels2/src/label-box.c
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-image.c
M	glabels2/src/label-line.c
M	glabels2/src/label-text.c

commit 7d676b96b7ee534ab36054be2febb8086eeef278
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-14

    Includes support for flipping.
    Added function for copying properties from one object to another.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@161
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c
M	glabels2/src/label-object.h

commit b5e19b10316c2fc38af47fbeed61405fa03bd1bb
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-14

    New verbs and menu structure for flipping and rotation.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@160
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml

commit 47583e96fce7f3637a4e842bfda43c5460354468
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-14

    Preferences are now saved when view options are modified.
    Includes new verbs for flipping and rotation.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@159
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/ui.c

commit 3fa08fe5b70f25df787fe02e05c6a9d8f1b6f06f
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-14

    Fixed default-font-weight bug.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@158
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/prefs.c

commit 2c55c7028acaeb1ecd61a5136afe3ac3d7e71db1
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-12

    All 2-pass labels have been converted to single-pass labels using
    multiple layouts per sheet.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@157
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/predefined-labels.template

commit 77fce21b253323abe15246dc980c5726ab6cc9fd
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-10

    Changes to development plan.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@156
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/TODO

commit 9b27951549f2ee5db410e25c0bf553fba8400196
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-10

    Preferences and object property dialogs are now rebuilt if previously
    destroyed rather than assuming they were cleanly closed.  This fixes
    bug #619052.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@155
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/prefs-dialog.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-object.c
M	glabels2/src/view-object.h
M	glabels2/src/view-text.c

commit b35b62402a8c2d1c3919b63b3b1292150a247c93
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-09

    Added handler for view's "pointer_exit" function:  clears cursor_info
    label.
    "zoom_changed" handler now updates zoom related verbs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@154
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/window.c

commit 6f096754a43d01141efc1f9faf672dc698b1b174
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-09

    Added gl_ui_update_zoom_verbs () function and added updates to zoom
    verbs in the gl_ui_update_all () function.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@153
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/ui.c
M	glabels2/src/ui.h

commit 7ef044ec2e605670f694e32f3658751b5b8caab2
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-09

    Added "pointer_exit" signal.
    Added gl_view_is_zoom_min () and gl_view_is_zoom_max () functions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@152
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c
M	glabels2/src/view.h

commit 25d14ad53a028feac7e2a39a364a031dabb62bd0
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-08

    Added cursor position to status bar.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@151
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/window.c

commit 8273d92363a6c41c6671599ce247fd1b0569a05b
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-08

    Fixed incorrect usage of gtk_toggle_button_get_active() in
    update_prefs_from_locale_page () -- must have cut-n-paste from a
    strcmp based decision tree?


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@150
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/prefs-dialog.c

commit 016bd5d0c97aacf3e5540ff0d794e08b8a76072a
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-07

    Initial status bar code -- only the zoom_info area implemented.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@149
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml
M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/view.c
M	glabels2/src/view.h
M	glabels2/src/window.c
M	glabels2/src/window.h

commit e675919eedc4f9899fcdc596dc7be429e55670fa
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-05

    Fixed coordinate system for rotated labels.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@147
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c

commit 3f9e4307f8cb9ab89da09952261ca0b5a7c544b9
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-05

    Removed glabels.h artifact from POTFILES.in


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@146
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit 1cfc87be8f6d2e5b04144cbc73d84cb76dfce603
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-05

    alert module merged into hig module.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@145
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
D	glabels2/src/alert.c
D	glabels2/src/alert.h
M	glabels2/src/file.c
M	glabels2/src/hig.c
M	glabels2/src/hig.h

commit 9be7b598f26a14fcca23836449a9e57c7222e0b2
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-05

    Template origins are now the upper left corner rather than the
    lower left.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@144
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/predefined-labels.template
M	glabels2/src/print.c
M	glabels2/src/print.h
M	glabels2/src/template.c
M	glabels2/src/wdgt-mini-preview.c

commit c94df7e04ef6232c90c433ad796bd965b3a62b9c
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-03

    Now original window propogates to open_ok() as object data.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@143
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/file.c

commit 2e9d175e39ffc0c8cfb57f1ead14b42d79fe9e5a
Author: Jim Evins <evins@snaught.com>
Date:	2002-10-03

    Fixed many problems with glabels-batch.  Still some problem with
    semantics of n_sheets and n_copies.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@142
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-batch.c

commit 689aebc4486bc8486f973687e78a301152353449
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-30

    Changed version to 1.90.0 in preparation for next release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@141
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 7dd8ab1633f9253b5b14617134b714c9ddd40569
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-30

    Made argv const to remove warning when passing to poptGetContext.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@140
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-batch.c

commit 2cb116a55169a0e6730c39c334190a4f7d6cc28e
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-30

    Added session management callbacks.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@139
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels.c

commit 4cb93fd68e89d83fb7b8d173ed85287b6099fe30
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-29

    This is the new SDI window module.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@138
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/src/window.c
A	glabels2/src/window.h

commit 568fc9114bf7feb474f1c1f0ad563f46b7fad9a5
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-29

    Removed all remnants of MDI/BONOBO-MDI.  We now use an SDI application
    model.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@137
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/TODO
M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
D	glabels2/src/bonobo-mdi-child.c
D	glabels2/src/bonobo-mdi-child.h
D	glabels2/src/bonobo-mdi.c
D	glabels2/src/bonobo-mdi.h
M	glabels2/src/commands.c
M	glabels2/src/commands.h
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/file.c
M	glabels2/src/file.h
M	glabels2/src/glabels-ui.xml
M	glabels2/src/glabels.c
D	glabels2/src/glabels.h
D	glabels2/src/mdi-child.c
D	glabels2/src/mdi-child.h
D	glabels2/src/mdi.c
D	glabels2/src/mdi.h
M	glabels2/src/merge-properties.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs.c
M	glabels2/src/print-dialog.c
M	glabels2/src/print-dialog.h
M	glabels2/src/tools.c
M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c

commit 31a7e007b211fdcf5a4f2a6c33221f13401dba76
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-26

    Added new template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@135
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
M	glabels2/data/predefined-labels.template

commit 200f86cd136cb2efade9408858baebfcb1293f06
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-26

    Added template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@134
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS
M	glabels1/data/predefined-labels.template

commit 1282b07f72de900661dc4b3d8d11efca5a314b00
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-25

    view_text and view_barcode dialogs now track changes to label's
    merge properties.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@133
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-object.c
M	glabels2/src/label.c
M	glabels2/src/label.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-text.c
M	glabels2/src/wdgt-bc-data.c
M	glabels2/src/wdgt-bc-data.h
M	glabels2/src/wdgt-text-entry.c
M	glabels2/src/wdgt-text-entry.h

commit 3d67bfa8cac66e625a4aa1d00c867215ed1cc9b9
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-23

    Added callbacks to track "moved" signals of label objects and update
    property dialogs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@132
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c

commit af9ffce2cdf1661abfb7268bf5e96981ee7c4097
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-23

    Additional dialogs and widgets migrated to use HIG module.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@131
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-barcode.c
M	glabels2/src/view-image.c
M	glabels2/src/wdgt-bc-data.c
M	glabels2/src/wdgt-bc-data.h
M	glabels2/src/wdgt-bc-props.c
M	glabels2/src/wdgt-bc-props.h
M	glabels2/src/wdgt-bc-style.c
M	glabels2/src/wdgt-bc-style.h

commit ffda9a42e2bc020470ddd824f3ae041c2ce9daa3
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-22

    HIG applied to more dialogs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@130
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/file.c
M	glabels2/src/merge-properties.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c
M	glabels2/src/wdgt-position.c
M	glabels2/src/wdgt-size.c
M	glabels2/src/wdgt-size.h
M	glabels2/src/wdgt-text-entry.c
M	glabels2/src/wdgt-text-entry.h
M	glabels2/src/wdgt-vector.c
M	glabels2/src/wdgt-vector.h

commit f35c12acd7a9f4347fbcddf7a45263e281441faa
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-21

    Incorporated use of HIG into prefs_dialog, view_text and related
    widgets.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@129
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/hig.c
M	glabels2/src/hig.h
M	glabels2/src/merge-properties.c
M	glabels2/src/merge-properties.h
M	glabels2/src/merge-ui.c
M	glabels2/src/prefs-dialog.c
M	glabels2/src/prefs-dialog.h
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c
M	glabels2/src/wdgt-fill.c
M	glabels2/src/wdgt-fill.h
M	glabels2/src/wdgt-line.c
M	glabels2/src/wdgt-line.h
M	glabels2/src/wdgt-position.c
M	glabels2/src/wdgt-position.h
M	glabels2/src/wdgt-text-entry.c
M	glabels2/src/wdgt-text-entry.h
M	glabels2/src/wdgt-text-props.c
M	glabels2/src/wdgt-text-props.h

commit 0386a5863488324dc75098d1cddca78afe34feb3
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-20

    Removed generic full-page alias from predefined-templates, because
    these are now generated in code automatically.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@128
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/predefined-labels.template

commit eb61824324658f2711ae5c832a5ec954913c990c
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-20

    Added additional signals to view object to support a status bar in
    future releases.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@127
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/marshal.list
M	glabels2/src/view.c
M	glabels2/src/view.h

commit 6d7d332d28475ac2f27f4259b8f00ddc790da963
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-20

    More refinements to HIG module.
    New label and print dialogs along with associated widget now use
    HIG module.
    Full-page labels are now named "Generic %s full page."


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@126
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/file.c
M	glabels2/src/hig.c
M	glabels2/src/hig.h
M	glabels2/src/print-dialog.c
M	glabels2/src/template.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-media-select.h
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-copies.h
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-print-merge.h
M	glabels2/src/wdgt-rotate-label.c
M	glabels2/src/wdgt-rotate-label.h

commit 2b89542781d98e153fd7269a23109f53e5cc6416
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-20

    When creating origins for labels, y is now sorted in reverse.
    Removed inappropriate freeing of pi->template in print_info_new().


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@125
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/hig.c
M	glabels2/src/print.c
M	glabels2/src/template.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c

commit 8c77b29af12a139d89f8edf70ca6ae2458d516dd
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-19

    Refinements to new label dialog and associated widgets.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@124
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/hig.h
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-rotate-label.c

commit a5323663beeb29d04dd85c1a3c0cb17bb12ce8ac
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-18

    Added HIG module (hig.[ch]) to provide HIG inspired dialog and
    layout tools.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@123
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/alert.c
M	glabels2/src/alert.h
M	glabels2/src/file.c
A	glabels2/src/hig.c
A	glabels2/src/hig.h

commit d3f4831bec333b5e6726fbd87843e2bea56f5ca2
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-17

    Code cleanup.  Mostly formatting.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@122
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/mdi-child.c
M	glabels2/src/mdi-child.h
M	glabels2/src/mdi.c
M	glabels2/src/mdi.h

commit 3c77cbba3cb8456d4b54242c9b204159204e2ddf
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-17

    Code cleanup.  Mostly formatting.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@121
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label-barcode.c
M	glabels2/src/label-barcode.h
M	glabels2/src/label-box.c
M	glabels2/src/label-box.h
M	glabels2/src/label-ellipse.c
M	glabels2/src/label-ellipse.h
M	glabels2/src/label-image.c
M	glabels2/src/label-image.h
M	glabels2/src/label-line.c
M	glabels2/src/label-line.h
M	glabels2/src/label-object.c
M	glabels2/src/label-object.h
M	glabels2/src/label-text.c
M	glabels2/src/label-text.h

commit 13e4337ed16d3c8b2b41e2fa4bb3950ff0aa60d1
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-17

    Created mnemonics for spacing and border magic numbers.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@120
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/alert.c

commit b284b4dd826a2f15ac82764f0438dba1da61e1ef
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-16

    Misc. code cleanup.  Mostly formatting.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@119
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label.c
M	glabels2/src/label.h

commit 8d70e8fa1820def464881c72f0bf3c47c285234d
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-16

    Assorted code cleanup.  Mostly formatting.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@118
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/alert.c
M	glabels2/src/alert.h
M	glabels2/src/bc-gnubarcode.c
M	glabels2/src/bc-gnubarcode.h
M	glabels2/src/bc-postnet.c
M	glabels2/src/bc-postnet.h
M	glabels2/src/bc.c
M	glabels2/src/bc.h
M	glabels2/src/canvas-hacktext.c
M	glabels2/src/canvas-hacktext.h
M	glabels2/src/color.c
M	glabels2/src/color.h
M	glabels2/src/commands.c
M	glabels2/src/commands.h
M	glabels2/src/debug.c
M	glabels2/src/debug.h
M	glabels2/src/file.c
M	glabels2/src/file.h
M	glabels2/src/glabels.c
M	glabels2/src/glabels.h

commit 26bbbd8b02ac36829fe272c10d502206a95322f0
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-15

    Restructured template module to ultimately support multiple layouts
    and markups.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@117
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/label.c
M	glabels2/src/prefs.h
M	glabels2/src/print.c
M	glabels2/src/template.c
M	glabels2/src/template.h
M	glabels2/src/view.c
M	glabels2/src/wdgt-media-select.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-print-copies.c
M	glabels2/src/wdgt-print-merge.c
M	glabels2/src/wdgt-rotate-label.c

commit 0e23ca635af5aad404969a1e204bb3eab41b3b7f
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-13

    Changed version to 1.89.2, in preparation for next release.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@116
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit 77f8e365ea6d0dcc6ed5843a61c6f1855eb9708c
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-13

    Moved all ui_component manipulation from mdi module to ui module.
    gl_label_get_short_name() now removes ".glabels" extension.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@115
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/label.c
M	glabels2/src/mdi.c
M	glabels2/src/ui.c
M	glabels2/src/ui.h
M	glabels2/src/util.c
M	glabels2/src/util.h

commit 72740304b5fe654527808d3f6044258072607b60
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-11

    Preparation for 0.4.6 build.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@114
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/configure.in

commit 39b55bb6524feb82f3ca6c9e2f98ab7d60d006fd
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-11

    More screwing with build environment


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@113
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/ABOUT-NLS
M	glabels1/ChangeLog
M	glabels1/Makefile.am
M	glabels1/barcode-0.98/configure
M	glabels1/doc/C/Makefile.in
M	glabels1/doc/Makefile.in
M	glabels1/macros/Makefile.in
M	glabels1/po/ChangeLog
M	glabels1/po/de.po
M	glabels1/po/es.po
M	glabels1/po/fr.po
M	glabels1/po/glabels.pot
M	glabels1/po/ja.po
M	glabels1/po/pl.po
M	glabels1/po/pt_BR.po
M	glabels1/po/zh_TW.Big5.po

commit d98d777fa92fccfc6cbdb5a6af4b3bef5fa4e8d5
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-10

    Fixed old format in APLI 1999.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@111
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/data/predefined-labels.template
M	glabels2/data/predefined-labels.template

commit ae0eb02a3edd2d951ec8746ae49bba85a7c68f58
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-10

    Additional label template acknowledgements.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@110
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS

commit eab514f92befda873f1063aa3bba749b62a77e08
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-10

    Additional label templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@109
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/data/predefined-labels.template
M	glabels2/data/predefined-labels.template

commit b97c24634fc9db3ad474626986e8f37610c2f8ef
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-10

    Additional label acknowedgements.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@108
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS

commit fe555314711582397b57b806576b5e7cd7a32fb4
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-10

    Updated russian translations, thanks to Vitaly Lipatov
    <LAV@VL3143.spb.edu>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@107
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/po/ru.po

commit 570bb13750709ec3eaf631cb5efd6a3cf85612c0
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-10

    Added 16x16 menu sized images for remainder of stock icons.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@106
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_barcode_16.png
A	glabels2/src/stock-pixmaps/stock_box_16.png
A	glabels2/src/stock-pixmaps/stock_ellipse_16.png
A	glabels2/src/stock-pixmaps/stock_image_16.png
A	glabels2/src/stock-pixmaps/stock_line_16.png
A	glabels2/src/stock-pixmaps/stock_merge_16.png
A	glabels2/src/stock-pixmaps/stock_text_16.png

commit beb3e848d55c256418165cc1ed175577f9a78330
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-10

    Added 16x16 menu sized images for remainder of stock icons.
    Now uses g_free() instead of g_object_unref() on GtkIconSource --
    it does not appear to be a GObject.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@105
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/stock.c

commit 9d2970c6cea4d63a62d7f53a14077be5cce6b7d2
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-09

    Cleaned-up 24x24 icons.  Added as binary files this time.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@104
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/src/stock-pixmaps/stock_arrow_24.png
A	glabels2/src/stock-pixmaps/stock_barcode_24.png
A	glabels2/src/stock-pixmaps/stock_box_24.png
A	glabels2/src/stock-pixmaps/stock_ellipse_24.png
A	glabels2/src/stock-pixmaps/stock_image_24.png
A	glabels2/src/stock-pixmaps/stock_line_24.png
A	glabels2/src/stock-pixmaps/stock_merge_24.png
A	glabels2/src/stock-pixmaps/stock_text_24.png

commit 773b3be17816ba9e5a1fe675d8c32aa3c224d498
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-09

    These should be binary files.  Removing.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@103
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels2/src/stock-pixmaps/stock_arrow_24.png
D	glabels2/src/stock-pixmaps/stock_barcode_24.png
D	glabels2/src/stock-pixmaps/stock_box_24.png
D	glabels2/src/stock-pixmaps/stock_ellipse_24.png
D	glabels2/src/stock-pixmaps/stock_image_24.png
D	glabels2/src/stock-pixmaps/stock_line_24.png
D	glabels2/src/stock-pixmaps/stock_merge_24.png
D	glabels2/src/stock-pixmaps/stock_text_24.png

commit 19d085ed916b8652d2dd9fe3b18204bf6d66add8
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-09

    Added 16x16 icon for GL_STOCK_ARROW


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@102
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/stock_arrow_16.png

commit ba5fd945cba4073b4947d9a072aaf63cbc712b80
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-09

    Created add_icons() and added code to add both 24x24 and 16x16 icons
    for a given stock id.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@101
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/stock.c

commit 3ccfe15fdc1e7820db6b4f4936a014dd01ee755e
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-08

    Fixed capitalization in labels and tips.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@100
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml

commit da26567e0080273482f19fc8116e5940a7271626
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-08

    Now uses the new XML parser from libxml.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@99
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/label.c

commit b6b9ceb0a16e3ab214ecfcbd7bb1f90db555ce29
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-08

    Changed libxml requirement from 1.8.10 to 1.8.11 to enable the use
    of the new XML parser.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@98
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/configure.in

commit 9f3fc6353c66abc095b64de6b62b6ad83c853b9c
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-07

    Added rotate and flip properties with default values to objects for
    compatability with future versions.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@97
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit 81266e4d3be7a20712e9946d3014dcb35db2119f
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-07

    Added view controls for drawing toolbar.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@96
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml
M	glabels2/src/mdi.c
M	glabels2/src/prefs.c
M	glabels2/src/prefs.h

commit fc89f960f997273d08f66e6248d5dc9381b1bd61
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-07

    Cleanup of selection code.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@95
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view.c
M	glabels2/src/view.h

commit a8ff7374b838357bf095f00079fa72004008603a
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-06

    Renamed menus module to ui.
    Added "selection_changed" signal to view.
    Added adjustments to sensitivity of menu items based on selection
    state.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@94
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
M	glabels2/src/mdi.c
D	glabels2/src/menus.h
R070	glabels2/src/menus.c	glabels2/src/ui.c
A	glabels2/src/ui.h
M	glabels2/src/view.c

commit 047594ad3ee781d2321ae81b1889b618771a4725
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-06

    Rearranged app menus.
    Added "Object properties" and "raise/lower selection" to app menus.
    Some cleanup of view.[ch]


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@93
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml
M	glabels2/src/menus.c
M	glabels2/src/tools.c
M	glabels2/src/tools.h
M	glabels2/src/view.c
M	glabels2/src/view.h

commit d50f26d829f665b021624ed83de4b4bea93f2c7c
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-05

    Added additional alerts and information to existing alerts.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@92
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/file.c

commit 7f819d54a20703d03c930d1455776dacee3252a5
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-04

    Removed extraneous include.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@91
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/alert.h

commit 8e701e7945f5aa67b12996889c5b5e57dcef56a3
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-04

    Moved HIG inspired alert dialog to its own module (alert.[ch])


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@90
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/src/alert.c
A	glabels2/src/alert.h

commit 1f96e4e8cf4e39298501708c269654283779b80b
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-04

    Replaced hardcoded object defaults with defaults from prefs module.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@89
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/color.c
M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c

commit 076dbabb5fc635eddd38a863379c5ebe5becd9b5
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-04

    Moved color utilities to separate module (color.[ch])


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@88
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in
M	glabels2/src/Makefile.am
A	glabels2/src/color.c
A	glabels2/src/color.h
M	glabels2/src/print-dialog.c
M	glabels2/src/print.c
M	glabels2/src/view.c
M	glabels2/src/wdgt-bc-props.c
M	glabels2/src/wdgt-fill.c
M	glabels2/src/wdgt-line.c
M	glabels2/src/wdgt-mini-preview.c
M	glabels2/src/wdgt-text-props.c

commit 6d2286e67a93ba8c7572f47a457202a98136dd71
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-04

    Moved HIG inspired alert dialog to its own module (alert.[ch]).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@87
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit 875fcf95a3cde43f575c76f5b402b0d72e9cd39b
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-04

    Moved HIG inspired alert dialog to its own module (alert.[ch]).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@86
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
M	glabels2/src/file.c
M	glabels2/src/mdi.c
M	glabels2/src/print.c
M	glabels2/src/util.c
M	glabels2/src/util.h

commit 803af36e65ebb3bf36eee95c95fba454d3f1b66d
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-03

    Added GNOME_COMMON_INIT macro.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@85
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/aclocal.m4

commit 1762ac3c02393c943529ee331c102f094903c5ff
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-03

    Added GNOME_PROGRAM_STANDARD_PROPERTIES.
    Removed configuration artifacts from 0.4.x.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@84
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/commands.c
M	glabels2/src/glabels-batch.c
M	glabels2/src/glabels.c
M	glabels2/src/splash.c
M	glabels2/src/template.c

commit d409fcb505f6db88e47b2a1ed4fdbda9d45515eb
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-03

    Added GNOME_COMMON_INIT macro.
    Removed configuration artifacts from 0.4.x.
    Added minimum Bonobo version.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@83
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/acconfig.h
M	glabels2/configure.in

commit 4e09a8aa2cd791c88b13a6e2f93d07033fdfaeb6
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-03

    Had neglected to run some of the warning/error dialogs.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@82
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/file.c

commit 131d154d86af37e82cb3baf1274fcab2706a4c63
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-03

    No longer changes labels filename and modification status if save
    fails.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@81
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/xml-label.c

commit e2c278742682530e40d174451830b17e5af89e0d
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-03

    Removed TAB from authors strings -- it caused a segfault w/ AA fonts.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@80
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/commands.c

commit 6b512fc87989f66f777aed61540f7116ab6f7f99
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-03

    Replaced gtk_message_dialogs with a custom dialog based on the HIG.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@79
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/file.c
M	glabels2/src/mdi.c
M	glabels2/src/util.c
M	glabels2/src/util.h

commit ee1d07bf8604c5b53544f2b4afa33f3388e6eafd
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-03

    Removed close from main toolbar.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@78
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml

commit 2df2624a8e2ab2434dbf08f5bd326e6a8cb9ac85
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-01

    Added ability to import from 0.4.x


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@77
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/POTFILES.in

commit 715b07ac370161b9d267bb827425797300fefae7
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-01

    Updated german translation, thanks to Christian Neumair
    <christian-neumair@web.de>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@76
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/po/de.po

commit 6702a0a49a3306f6ef7085fe4468cf560aeaa25c
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-01

    Updated german translation, thanks to Christian Neumair
    <christian-neumair@web.de>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@75
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS

commit 2b92b4ab70d2ba3c5b186aa2d33b4e0f192afc30
Author: Jim Evins <evins@snaught.com>
Date:	2002-09-01

    Added capability to import files created w/ 0.4.x


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@74
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/Makefile.am
A	glabels2/src/xml-label-04.c
C056	glabels2/src/xml-label.h	glabels2/src/xml-label-04.h
M	glabels2/src/xml-label.c
M	glabels2/src/xml-label.h

commit 40377ed17a110bfdd5315a87728eeb8813d8ec66
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-28

    Reconciled text object alignment algorithm with view-text.c


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@73
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/print.c

commit c5417dc935595eeda545d0007ac89122f2a534a3
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-28

    Changed version to 1.89.1 for next build.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@72
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/configure.in

commit ee93678898dff82a84fa47c5f749378b226401b5
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-27

    More screwing w/ build environment.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@70
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/Makefile.am

commit 97aa1f5682152f781e6f4e2ff6d6c04772ac308c
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-27

    Still screwing with build environment.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@69
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/barcode-0.98/Makefile.in

commit 4412efca732464e1108e0ab55f1aa641864d9212
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-27

    Still skrewing with build environment.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@68
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/barcode-0.98/Makefile.in

commit c670f3531e994cb52872171e4018c525c28cff49
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-27

    Skrewing with the build environment.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@67
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels2/po/Makefile.in.in
D	glabels2/po/glabels.pot

commit 2990a2608a2c5b56e1377c2d15020963b08efb3a
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-27

    Skrewing with the build environment.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@66
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/acconfig.h
A	glabels2/acinclude.m4
M	glabels2/aclocal.m4
A	glabels2/autogen.sh
D	glabels2/config.h.in
M	glabels2/configure.in
D	glabels2/install-sh
A	glabels2/macros/Makefile.am
A	glabels2/macros/aclocal-include.m4
A	glabels2/macros/autogen.sh
A	glabels2/macros/compiler-flags.m4
A	glabels2/macros/curses.m4
A	glabels2/macros/gnome-bonobo-check.m4
A	glabels2/macros/gnome-common.m4
A	glabels2/macros/gnome-cxx-check.m4
A	glabels2/macros/gnome-fileutils.m4
A	glabels2/macros/gnome-gettext.m4
A	glabels2/macros/gnome-ghttp-check.m4
A	glabels2/macros/gnome-gnorba-check.m4
A	glabels2/macros/gnome-guile-checks.m4
A	glabels2/macros/gnome-libgtop-check.m4
A	glabels2/macros/gnome-objc-checks.m4
A	glabels2/macros/gnome-orbit-check.m4
A	glabels2/macros/gnome-pilot.m4
A	glabels2/macros/gnome-print-check.m4
A	glabels2/macros/gnome-pthread-check.m4
A	glabels2/macros/gnome-support.m4
A	glabels2/macros/gnome-undelfs.m4
A	glabels2/macros/gnome-vfs.m4
A	glabels2/macros/gnome-x-checks.m4
A	glabels2/macros/gnome-xml-check.m4
A	glabels2/macros/gnome.m4
A	glabels2/macros/gperf-check.m4
A	glabels2/macros/linger.m4
A	glabels2/macros/need-declaration.m4
A	glabels2/macros/psiconv.m4
M	glabels2/po/Makefile.in.in
M	glabels2/po/glabels.pot
D	glabels2/stamp-h.in

commit c40f73c9fffc049f09d5f6f5bb1565277ae43c74
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-26

    Added translations from 0.4.5.  Only a fraction of the strings
    are up-to-date.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@65
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/po/es.po
A	glabels2/po/pl.po
A	glabels2/po/ru.po
A	glabels2/po/zh_TW.Big5.po

commit 977b2272d62424ffc272d48aabcd38a9e37cdf3b
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-26

    Removed configure from CVS.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@64
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS
D	glabels2/configure
M	glabels2/configure.in
M	glabels2/po/POTFILES.in
M	glabels2/po/de.po
M	glabels2/po/fr.po
M	glabels2/po/glabels.pot
M	glabels2/po/ja.po
M	glabels2/po/pt_BR.po

commit ef9184a8d24739952072b0b36798cd27832f9515
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-26

    Added stock images to help menu items.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@63
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/glabels-ui.xml

commit 0120f8c8e53c2a3a56c73d732305b0e061303d17
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-25

    Reconciled label acknowledgments with 0.4.5.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@62
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/AUTHORS

commit d154d0c0094506b62760d929030614e7d98c76e6
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-25

    Reconciled predefined labels with 0.4.5.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@61
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/data/predefined-labels.template

commit ea716fa1d1cfce77cb991fec2ac3ca2f37aa5a4e
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-25

    Added gl_view_raise_fg() to keep foreground objects on top.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@60
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-highlight.c
M	glabels2/src/view-object.c
M	glabels2/src/view.c
M	glabels2/src/view.h

commit 262192e1efcac9209a70417db855de98d6a834a2
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-25

    Added foreground label outlines.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@59
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-object.c
M	glabels2/src/view.c
M	glabels2/src/view.h

commit 6320b644115c2c0b78cc68794b482aec3db5a8ac
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-25

    Now unlinks output file to prevent an attempt to pop-up a dialog
    asking to remove it -- since we don't do a gnome_init, this would
    segfault.
    Added a setlocale at initialization.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@57
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/glabels_batch.c

commit f488ddcd9c3a3ff60e25a9f98b4b5b6219c28864
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-25

    Additional label templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@56
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS
M	glabels1/data/predefined-labels.template

commit efbdf799f29c02a8933c8102af43847603dc82d8
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-25

    Added polish translations submitted by Arkadiusz Lipiec
    <A.Lipiec@elka.pw.edu.pl>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@55
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS
M	glabels1/configure.in
A	glabels1/po/pl.po

commit 2bdecc249c87e1513a6c27404e79058e8e61be3a
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-25

    Added chinese (zh_TW.Big5) translations submitted by Shell, Hin-lik
    Hung <shell@home.shellhung.org>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@54
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/configure.in
A	glabels1/po/zh_TW.Big5.po

commit 12a432eefc8f1b5a0166e39b72d638358036e204
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    Replaced gdk_mbstowcs with mbstowcs from stdlib.h.	Gdk_mbstowcs is
    broken in locales that do not use multi-byte characters and any LC_*
    environmental variables are set.  This caused problems for Mandrake
    8.x users (and probably others too).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@53
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/hack.c

commit ea69a794bd98b9fa327f20b3a288d71ed7565d1f
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    Changed version in preparation for 0.4.5.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@52
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/configure.in

commit 198960004f4ccabf2a2485fb803f59e33192b2dd
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    Changed TODO to reflect that current efforts are on the 2.0 codebase.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@51
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/TODO

commit 841ca2ab492e342989338eb4ef485ff8d8d3a0ad
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    Removed .gmo files from CVS.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@50
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels1/po/de.gmo
D	glabels1/po/es.gmo
D	glabels1/po/fr.gmo
D	glabels1/po/ja.gmo
D	glabels1/po/pt_BR.gmo

commit 5774e7a6a5c50f5830d1b3b34b1a9d713ad02b80
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    Updated japanese translations submitted by Takeshi Aihana
    <aihana@gnome.gr.jp>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@49
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/po/ja.po

commit 70f2265289a107abd5564ece58adf22219e2285e
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    Added russian translations submitted by Vitaly Lipatov
    <LAV@VL3143.spb.edu>.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@48
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS
M	glabels1/configure.in
A	glabels1/po/ru.po

commit d2d63a08021ef50eff2d98b5f5d6e4973a361577
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    Makefile.in should not be in CVS.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@47
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels2/barcode-0.98/Makefile.in

commit 893b8caa6be07c5e0621afbe3e698e74419807e5
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    Makefile.in should not be in CVS.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@46
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels2/Makefile.in
D	glabels2/src/Makefile.in
D	glabels2/src/pixmaps/Makefile.in
D	glabels2/src/stock-pixmaps/Makefile.in

commit 8b0fc0a0d2be983a5e663b720a626e39a376c0a7
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-24

    No longer emits "changed" when initially clicking the font family
    combobox.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@45
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/wdgt-text-props.c

commit 84a5fe2c73ed0ecd311133364f5e53d336cdc122
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-23

    Changed event->button.* to event->motion.* when handling
    GTK_MOTION_NOTIFY events.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@44
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/src/view-barcode.c
M	glabels2/src/view-box.c
M	glabels2/src/view-ellipse.c
M	glabels2/src/view-highlight.c
M	glabels2/src/view-image.c
M	glabels2/src/view-line.c
M	glabels2/src/view-text.c

commit b9ef933e41e55b79e7fb7c906810923082ad326d
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-23

    Removed cvswrappers.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@43
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels2/Makefile.in
M	glabels2/barcode-0.98/doc/barcode.info
M	glabels2/barcode-0.98/doc/barcode.pdf
M	glabels2/barcode-0.98/doc/barcode.ps
M	glabels2/barcode-0.98/doc/barcodedoc.txt
D	glabels2/cvswrappers
M	glabels2/src/Makefile.in
M	glabels2/src/pixmaps/Makefile.in
M	glabels2/src/stock-pixmaps/Makefile.in

commit c1f2e6b6e372d0f62945aa26835780039ead7907
Author: Jim Evins <evins@snaught.com>
Date:	2002-08-21

    Initial revision


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@39
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels2/AUTHORS
A	glabels2/COPYING
A	glabels2/ChangeLog
A	glabels2/INSTALL
A	glabels2/Makefile.am
A	glabels2/Makefile.in
A	glabels2/NEWS
A	glabels2/README
A	glabels2/TODO
A	glabels2/acconfig.h
A	glabels2/aclocal.m4
A	glabels2/barcode-0.98/COPYING
A	glabels2/barcode-0.98/ChangeLog
A	glabels2/barcode-0.98/INSTALL
A	glabels2/barcode-0.98/Makefile.in
A	glabels2/barcode-0.98/README
A	glabels2/barcode-0.98/TODO
A	glabels2/barcode-0.98/barcode.h
A	glabels2/barcode-0.98/barcode.spec
A	glabels2/barcode-0.98/bookland/bookland.py
A	glabels2/barcode-0.98/cmdline.c
A	glabels2/barcode-0.98/cmdline.h
A	glabels2/barcode-0.98/codabar.c
A	glabels2/barcode-0.98/code128.c
A	glabels2/barcode-0.98/code39.c
A	glabels2/barcode-0.98/code93.c
A	glabels2/barcode-0.98/compat/getopt.c
A	glabels2/barcode-0.98/compat/getopt.h
A	glabels2/barcode-0.98/configure
A	glabels2/barcode-0.98/configure.in
A	glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz
A	glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README
A	glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz
A	glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
A	glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz
A	glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz.README
A	glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz
A	glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
A	glabels2/barcode-0.98/debian/README.debian
A	glabels2/barcode-0.98/debian/changelog
A	glabels2/barcode-0.98/debian/control
A	glabels2/barcode-0.98/debian/copyright
A	glabels2/barcode-0.98/debian/dirs
A	glabels2/barcode-0.98/debian/info
A	glabels2/barcode-0.98/debian/rules
A	glabels2/barcode-0.98/doc/Makefile.in
A	glabels2/barcode-0.98/doc/README
A	glabels2/barcode-0.98/doc/barcode.info
A	glabels2/barcode-0.98/doc/barcode.pdf
A	glabels2/barcode-0.98/doc/barcode.ps
A	glabels2/barcode-0.98/doc/barcodedoc.txt
A	glabels2/barcode-0.98/doc/doc.barcode
A	glabels2/barcode-0.98/doc/infofilter
A	glabels2/barcode-0.98/doc/manpager
A	glabels2/barcode-0.98/doc/mktxt
A	glabels2/barcode-0.98/doc/texi2html
A	glabels2/barcode-0.98/ean.c
A	glabels2/barcode-0.98/i25.c
A	glabels2/barcode-0.98/install-sh
A	glabels2/barcode-0.98/library.c
A	glabels2/barcode-0.98/main.c
A	glabels2/barcode-0.98/missing
A	glabels2/barcode-0.98/mkinstalldirs
A	glabels2/barcode-0.98/msi.c
A	glabels2/barcode-0.98/pcl.c
A	glabels2/barcode-0.98/plessey.c
A	glabels2/barcode-0.98/ps.c
A	glabels2/barcode-0.98/sample.c
A	glabels2/config.h.in
A	glabels2/configure
A	glabels2/configure.in
A	glabels2/cvswrappers
A	glabels2/data/predefined-labels.template
A	glabels2/glabels.desktop
A	glabels2/glabels.spec.in
A	glabels2/install-sh
A	glabels2/missing
A	glabels2/mkinstalldirs
A	glabels2/pixmaps/glabels-about-logo.png
A	glabels2/pixmaps/glabels-icon.png
A	glabels2/pixmaps/glabels-logo.png
A	glabels2/po/ChangeLog
A	glabels2/po/Makefile.in.in
A	glabels2/po/POTFILES.in
A	glabels2/po/de.po
A	glabels2/po/fr.po
A	glabels2/po/glabels.pot
A	glabels2/po/ja.po
A	glabels2/po/pt_BR.po
A	glabels2/src/Makefile.am
A	glabels2/src/Makefile.in
A	glabels2/src/bc-gnubarcode.c
A	glabels2/src/bc-gnubarcode.h
A	glabels2/src/bc-postnet.c
A	glabels2/src/bc-postnet.h
A	glabels2/src/bc.c
A	glabels2/src/bc.h
A	glabels2/src/bonobo-mdi-child.c
A	glabels2/src/bonobo-mdi-child.h
A	glabels2/src/bonobo-mdi.c
A	glabels2/src/bonobo-mdi.h
A	glabels2/src/canvas-hacktext.c
A	glabels2/src/canvas-hacktext.h
A	glabels2/src/commands.c
A	glabels2/src/commands.h
A	glabels2/src/debug.c
A	glabels2/src/debug.h
A	glabels2/src/file.c
A	glabels2/src/file.h
A	glabels2/src/glabels-batch.c
A	glabels2/src/glabels-ui.xml
A	glabels2/src/glabels.c
A	glabels2/src/glabels.h
A	glabels2/src/gnome-recent-marshal.list
A	glabels2/src/gnome-recent-model.c
A	glabels2/src/gnome-recent-model.h
A	glabels2/src/gnome-recent-util.c
A	glabels2/src/gnome-recent-util.h
A	glabels2/src/gnome-recent-view-bonobo.c
A	glabels2/src/gnome-recent-view-bonobo.h
A	glabels2/src/gnome-recent-view.c
A	glabels2/src/gnome-recent-view.h
A	glabels2/src/label-barcode.c
A	glabels2/src/label-barcode.h
A	glabels2/src/label-box.c
A	glabels2/src/label-box.h
A	glabels2/src/label-ellipse.c
A	glabels2/src/label-ellipse.h
A	glabels2/src/label-image.c
A	glabels2/src/label-image.h
A	glabels2/src/label-line.c
A	glabels2/src/label-line.h
A	glabels2/src/label-object.c
A	glabels2/src/label-object.h
A	glabels2/src/label-text.c
A	glabels2/src/label-text.h
A	glabels2/src/label.c
A	glabels2/src/label.h
A	glabels2/src/marshal.list
A	glabels2/src/mdi-child.c
A	glabels2/src/mdi-child.h
A	glabels2/src/mdi.c
A	glabels2/src/mdi.h
A	glabels2/src/menus.c
A	glabels2/src/menus.h
A	glabels2/src/merge-properties.c
A	glabels2/src/merge-properties.h
A	glabels2/src/merge-text.c
A	glabels2/src/merge-text.h
A	glabels2/src/merge-ui-text.c
A	glabels2/src/merge-ui-text.h
A	glabels2/src/merge-ui.c
A	glabels2/src/merge-ui.h
A	glabels2/src/merge.c
A	glabels2/src/merge.h
A	glabels2/src/pixmaps/Makefile.am
A	glabels2/src/pixmaps/Makefile.in
A	glabels2/src/pixmaps/checkerboard.xpm
A	glabels2/src/pixmaps/collate.xpm
A	glabels2/src/pixmaps/cursor_barcode.xbm
A	glabels2/src/pixmaps/cursor_barcode_mask.xbm
A	glabels2/src/pixmaps/cursor_box.xbm
A	glabels2/src/pixmaps/cursor_box_mask.xbm
A	glabels2/src/pixmaps/cursor_ellipse.xbm
A	glabels2/src/pixmaps/cursor_ellipse_mask.xbm
A	glabels2/src/pixmaps/cursor_image.xbm
A	glabels2/src/pixmaps/cursor_image_mask.xbm
A	glabels2/src/pixmaps/cursor_line.xbm
A	glabels2/src/pixmaps/cursor_line_mask.xbm
A	glabels2/src/pixmaps/cursor_text.xbm
A	glabels2/src/pixmaps/cursor_text_mask.xbm
A	glabels2/src/pixmaps/nocollate.xpm
A	glabels2/src/prefs-dialog.c
A	glabels2/src/prefs-dialog.h
A	glabels2/src/prefs.c
A	glabels2/src/prefs.h
A	glabels2/src/print-dialog.c
A	glabels2/src/print-dialog.h
A	glabels2/src/print.c
A	glabels2/src/print.h
A	glabels2/src/recent.c
A	glabels2/src/recent.h
A	glabels2/src/splash.c
A	glabels2/src/splash.h
A	glabels2/src/stock-pixmaps/Makefile.am
A	glabels2/src/stock-pixmaps/Makefile.in
A	glabels2/src/stock-pixmaps/stock_arrow_24.png
A	glabels2/src/stock-pixmaps/stock_barcode_24.png
A	glabels2/src/stock-pixmaps/stock_box_24.png
A	glabels2/src/stock-pixmaps/stock_ellipse_24.png
A	glabels2/src/stock-pixmaps/stock_image_24.png
A	glabels2/src/stock-pixmaps/stock_line_24.png
A	glabels2/src/stock-pixmaps/stock_merge_24.png
A	glabels2/src/stock-pixmaps/stock_text_24.png
A	glabels2/src/stock.c
A	glabels2/src/stock.h
A	glabels2/src/template.c
A	glabels2/src/template.h
A	glabels2/src/text-node.c
A	glabels2/src/text-node.h
A	glabels2/src/tools.c
A	glabels2/src/tools.h
A	glabels2/src/util.c
A	glabels2/src/util.h
A	glabels2/src/view-barcode.c
A	glabels2/src/view-barcode.h
A	glabels2/src/view-box.c
A	glabels2/src/view-box.h
A	glabels2/src/view-ellipse.c
A	glabels2/src/view-ellipse.h
A	glabels2/src/view-highlight.c
A	glabels2/src/view-highlight.h
A	glabels2/src/view-image.c
A	glabels2/src/view-image.h
A	glabels2/src/view-line.c
A	glabels2/src/view-line.h
A	glabels2/src/view-object.c
A	glabels2/src/view-object.h
A	glabels2/src/view-text.c
A	glabels2/src/view-text.h
A	glabels2/src/view.c
A	glabels2/src/view.h
A	glabels2/src/wdgt-bc-data.c
A	glabels2/src/wdgt-bc-data.h
A	glabels2/src/wdgt-bc-props.c
A	glabels2/src/wdgt-bc-props.h
A	glabels2/src/wdgt-bc-style.c
A	glabels2/src/wdgt-bc-style.h
A	glabels2/src/wdgt-fill.c
A	glabels2/src/wdgt-fill.h
A	glabels2/src/wdgt-line.c
A	glabels2/src/wdgt-line.h
A	glabels2/src/wdgt-media-select.c
A	glabels2/src/wdgt-media-select.h
A	glabels2/src/wdgt-mini-preview.c
A	glabels2/src/wdgt-mini-preview.h
A	glabels2/src/wdgt-position.c
A	glabels2/src/wdgt-position.h
A	glabels2/src/wdgt-print-copies.c
A	glabels2/src/wdgt-print-copies.h
A	glabels2/src/wdgt-print-merge.c
A	glabels2/src/wdgt-print-merge.h
A	glabels2/src/wdgt-rotate-label.c
A	glabels2/src/wdgt-rotate-label.h
A	glabels2/src/wdgt-size.c
A	glabels2/src/wdgt-size.h
A	glabels2/src/wdgt-text-entry.c
A	glabels2/src/wdgt-text-entry.h
A	glabels2/src/wdgt-text-props.c
A	glabels2/src/wdgt-text-props.h
A	glabels2/src/wdgt-vector.c
A	glabels2/src/wdgt-vector.h
A	glabels2/src/xml-label.c
A	glabels2/src/xml-label.h
A	glabels2/stamp-h.in

commit 22858b6573961f37d305a8c343e10348562b578c
Author: Olivier Berger <oberger@april.org>
Date:	2002-06-29

    Updated french translation, up to date with 0.4.4


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@37
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/po/ChangeLog
M	glabels1/po/fr.po

commit f5964f89087a3541d6fcfdb506f5ddff3f8d4e73
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-28

    Fix broken build environment.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@36
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/ABOUT-NLS
M	glabels1/ChangeLog
M	glabels1/Makefile.am
M	glabels1/aclocal.m4
M	glabels1/config.h.in
M	glabels1/configure.in
M	glabels1/intl/Makefile.in
M	glabels1/macros/Makefile.in
M	glabels1/po/ChangeLog
M	glabels1/po/Makefile.in.in
D	glabels1/po/Makevars
D	glabels1/po/Rules-quot
D	glabels1/po/boldquot.sed
M	glabels1/po/cat-id-tbl.c
M	glabels1/po/de.gmo
M	glabels1/po/de.po
D	glabels1/po/en@boldquot.header
D	glabels1/po/en@quot.header
M	glabels1/po/es.gmo
M	glabels1/po/es.po
M	glabels1/po/fr.gmo
M	glabels1/po/fr.po
M	glabels1/po/glabels.pot
D	glabels1/po/insert-header.sin
M	glabels1/po/ja.gmo
M	glabels1/po/ja.po
M	glabels1/po/pt_BR.gmo
M	glabels1/po/pt_BR.po
D	glabels1/po/quot.sed
D	glabels1/po/remove-potcdate.sin

commit 628da1b907a5f2e056bf22f25ca66116a87e4919
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-26

    Additional label template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@35
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS
M	glabels1/data/predefined-labels.template

commit e76e40d1a99bd29c9b415cf337a2d7ea21f285bb
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-26

    Improved CSV parsing.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@34
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/merge.c
M	glabels1/src/merge_text.c

commit a83f950c1f19019cf0092cb7b3af5c61b67417f6
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-26

    Changed about dialog image.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@33
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/menu.c

commit ea3d9e9fce16b8c8cbdbbced5efe15f96675e099
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-26

    New files


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@32
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels1/po/Makevars
A	glabels1/po/Rules-quot
A	glabels1/po/boldquot.sed
A	glabels1/po/en@boldquot.header
A	glabels1/po/en@quot.header
A	glabels1/po/insert-header.sin
A	glabels1/po/quot.sed
A	glabels1/po/remove-potcdate.sin

commit 594b9be22fb1e36585db796865b0362383c20ae1
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-26

    Translations


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@31
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/po/ChangeLog
M	glabels1/po/Makefile.in.in
M	glabels1/po/de.gmo
M	glabels1/po/de.po
M	glabels1/po/es.gmo
M	glabels1/po/es.po
M	glabels1/po/fr.gmo
M	glabels1/po/fr.po
M	glabels1/po/ja.gmo
M	glabels1/po/ja.po
M	glabels1/po/pt_BR.gmo
M	glabels1/po/pt_BR.po

commit 06635a8408e4ba916a1bdb650c6690d58cd9b645
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-26

    Added logo specific to about dialog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@30
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels1/pixmaps/glabels-about-logo.png

commit 60965cc5cf022e99d55479976052837f583888ef
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-26

    File updated w/ gettextize


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@29
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/ChangeLog

commit 6bbae5eef63555bf36c2bcf34df417346e6b64a4
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Updated config.h.in.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@28
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/config.h.in

commit a14d460e21dd854a5911b0e54508de37080153b0
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Updated aclocal.m4.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@27
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/aclocal.m4

commit 52f6a1af385187422b6466c76cc1be50c65f9251
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Updated Makefile.am.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@26
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/Makefile.am

commit 43641f1b064d30a89204ed25b99d4f466a897bcd
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Updated Changelog.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@25
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/ChangeLog

commit c51ab34df7eacbf61c92131adf127fc50bead398
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Updated ABOUT-NLS.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@24
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/ABOUT-NLS

commit b5b3e5c81b4fc4ed519ed2bca6cd8c98cba9c2db
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Set release to 0.4.4


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@23
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/configure.in

commit 365dc4288dee2a5ad40261fc62aa596df656ed9d
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Removing generated files from CM.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@22
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels1/Makefile.in
D	glabels1/configure
D	glabels1/glabels.spec

commit 4205e33a8096be62999327a27a709fb90f12ad12
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Removing generated files from CM.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@21
    f5e0f49d-192f-0410-a22d-a8d8700d0965

D	glabels1/src/Makefile.in
D	glabels1/src/pixmaps/Makefile.in

commit 979dfe500f5773e1fe925e46135045125075b440
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Replace gnu-barcode-0.96 with 0.98.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@20
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS
M	glabels1/Makefile.am
M	glabels1/configure.in
M	glabels1/src/Makefile.am

commit 492ca6b93e3360e64288df1efdd1383990a77c78
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Checking in gnu-barcode-0.98


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@19
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels1/barcode-0.98/COPYING
A	glabels1/barcode-0.98/ChangeLog
A	glabels1/barcode-0.98/INSTALL
A	glabels1/barcode-0.98/Makefile.in
A	glabels1/barcode-0.98/README
A	glabels1/barcode-0.98/TODO
A	glabels1/barcode-0.98/barcode.h
A	glabels1/barcode-0.98/barcode.spec
A	glabels1/barcode-0.98/bookland/bookland.py
A	glabels1/barcode-0.98/cmdline.c
A	glabels1/barcode-0.98/cmdline.h
A	glabels1/barcode-0.98/codabar.c
A	glabels1/barcode-0.98/code128.c
A	glabels1/barcode-0.98/code39.c
A	glabels1/barcode-0.98/code93.c
A	glabels1/barcode-0.98/compat/getopt.c
A	glabels1/barcode-0.98/compat/getopt.h
A	glabels1/barcode-0.98/configure
A	glabels1/barcode-0.98/configure.in
A	glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz
A	glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz.README
A	glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz
A	glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
A	glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz
A	glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz.README
A	glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz
A	glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
A	glabels1/barcode-0.98/debian/README.debian
A	glabels1/barcode-0.98/debian/changelog
A	glabels1/barcode-0.98/debian/control
A	glabels1/barcode-0.98/debian/copyright
A	glabels1/barcode-0.98/debian/dirs
A	glabels1/barcode-0.98/debian/info
A	glabels1/barcode-0.98/debian/rules
A	glabels1/barcode-0.98/doc/Makefile.in
A	glabels1/barcode-0.98/doc/README
A	glabels1/barcode-0.98/doc/barcode.info
A	glabels1/barcode-0.98/doc/barcode.pdf
A	glabels1/barcode-0.98/doc/barcode.ps
A	glabels1/barcode-0.98/doc/barcodedoc.txt
A	glabels1/barcode-0.98/doc/doc.barcode
A	glabels1/barcode-0.98/doc/infofilter
A	glabels1/barcode-0.98/doc/manpager
A	glabels1/barcode-0.98/doc/mktxt
A	glabels1/barcode-0.98/doc/texi2html
A	glabels1/barcode-0.98/ean.c
A	glabels1/barcode-0.98/i25.c
A	glabels1/barcode-0.98/install-sh
A	glabels1/barcode-0.98/library.c
A	glabels1/barcode-0.98/main.c
A	glabels1/barcode-0.98/msi.c
A	glabels1/barcode-0.98/pcl.c
A	glabels1/barcode-0.98/plessey.c
A	glabels1/barcode-0.98/ps.c
A	glabels1/barcode-0.98/sample.c

commit 6592672d77f4e9a0ddab08ef198b56718dc24202
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Added acknowledgements for additional label templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@18
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS

commit 44132388529f64112507a9f2f94ae210b0d738b1
Author: Jim Evins <evins@snaught.com>
Date:	2002-06-18

    Added additional templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@17
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/data/predefined-labels.template

commit 387dfd746a801119e2956e413118cbb050da0e75
Author: Jim Evins <evins@snaught.com>
Date:	2002-05-01

    Additional template.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@16
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/data/predefined-labels.template

commit 6e06d81c9164744d348b2311471c8623df077839
Author: Jim Evins <evins@snaught.com>
Date:	2002-05-01

    Additional credits for templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@15
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS

commit ca24de55a2ed8cf5287e3531692edce61f0f1d76
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-29

    Added spanish (es) support.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@14
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/po/cat-id-tbl.c
A	glabels1/po/es.gmo
C066	glabels1/po/glabels.pot glabels1/po/es.po
M	glabels1/po/glabels.pot

commit 22a00a789cdea2fce310e66ac30f3ef210aa94e0
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-29

    Updated japanese strings.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@13
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/po/ja.gmo
M	glabels1/po/ja.po

commit 46d285dea66301d12d3c11a4271cd8f1a3305e6b
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-29

    Added additional label templates.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@12
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/data/predefined-labels.template

commit db1ba5a430a9d58faf13e70a807a5d082ce2e3a6
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-29

    Added support for spanish (es).


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@11
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/configure.in

commit 92dd882d7b64ff3a86500f66ac85456e45e8c83a
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-29

    Added acknowledgements.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@10
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/AUTHORS

commit 36bc656ed2f4592f58437035c0ca88444f8faa07
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-29

    Removed the clip_to_outline code -- this seemed to cause an outline
    to be printed for some printers.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@9
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/print.c

commit 80c7efe71c394abaab547eee7172ec4c24f2067f
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-29

    Fixed layout of labels so that they are layed out in the proper
    coordinate system:
    The canvas origin is at the upper left, while the origin on paper
    is at the lower left.
    This was not apparent until a non-symetric (vertical) layout was used.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@8
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/mini_preview.c

commit e054900210bd868ed5241f37a6c7220ce13f577f
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-27

    Don't assume all events are button events!


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@7
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/mini_preview.c

commit 9eb6a8a37fd94d5aba4831453a4c2c915dd86cb1
Author: Jim Evins <evins@snaught.com>
Date:	2002-04-27

    Use motion union member for MOTION events.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@6
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/src/display.c
M	glabels1/src/item_box.c
M	glabels1/src/item_ellipse.c
M	glabels1/src/item_image.c
M	glabels1/src/item_line.c

commit e1e85ce13c158a14303c2a38aa1902a42df6d4d8
Author: Jim Evins <evins@snaught.com>
Date:	2002-02-28

    Added glabels-batch to glabels.spec.in.
    Added entries to TODO.


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@5
    f5e0f49d-192f-0410-a22d-a8d8700d0965

M	glabels1/TODO
M	glabels1/glabels.spec.in

commit 1852a103b62f3106bd032dc6e7a55b6ebec5449c
Author: Jim Evins <evins@snaught.com>
Date:	2002-02-24

    Initial revision


    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@2
    f5e0f49d-192f-0410-a22d-a8d8700d0965

A	glabels1/ABOUT-NLS
A	glabels1/AUTHORS
A	glabels1/COPYING
A	glabels1/ChangeLog
A	glabels1/INSTALL
A	glabels1/Makefile.am
A	glabels1/Makefile.in
A	glabels1/NEWS
A	glabels1/README
A	glabels1/TODO
A	glabels1/acconfig.h
A	glabels1/aclocal.m4
A	glabels1/autogen.sh
A	glabels1/config.h.in
A	glabels1/configure
A	glabels1/configure.in
A	glabels1/data/predefined-labels.template
A	glabels1/doc/C/Makefile.am
A	glabels1/doc/C/Makefile.in
A	glabels1/doc/C/glabels.sgml
A	glabels1/doc/C/glabels/index.html
A	glabels1/doc/C/glabels/ln7.html
A	glabels1/doc/C/topic.dat
A	glabels1/doc/Makefile.am
A	glabels1/doc/Makefile.in
A	glabels1/glabels.desktop
A	glabels1/glabels.spec
A	glabels1/glabels.spec.in
A	glabels1/install-sh
A	glabels1/intl/ChangeLog
A	glabels1/intl/Makefile.in
A	glabels1/intl/VERSION
A	glabels1/intl/bindtextdom.c
A	glabels1/intl/cat-compat.c
A	glabels1/intl/dcgettext.c
A	glabels1/intl/dgettext.c
A	glabels1/intl/explodename.c
A	glabels1/intl/finddomain.c
A	glabels1/intl/gettext.c
A	glabels1/intl/gettext.h
A	glabels1/intl/gettextP.h
A	glabels1/intl/hash-string.h
A	glabels1/intl/intl-compat.c
A	glabels1/intl/l10nflist.c
A	glabels1/intl/libgettext.h
A	glabels1/intl/linux-msg.sed
A	glabels1/intl/loadinfo.h
A	glabels1/intl/loadmsgcat.c
A	glabels1/intl/localealias.c
A	glabels1/intl/po2tbl.sed.in
A	glabels1/intl/textdomain.c
A	glabels1/intl/xopen-msg.sed
A	glabels1/macros/Makefile.am
A	glabels1/macros/Makefile.in
A	glabels1/macros/aclocal-include.m4
A	glabels1/macros/autogen.sh
A	glabels1/macros/compiler-flags.m4
A	glabels1/macros/curses.m4
A	glabels1/macros/gnome-bonobo-check.m4
A	glabels1/macros/gnome-common.m4
A	glabels1/macros/gnome-fileutils.m4
A	glabels1/macros/gnome-gettext.m4
A	glabels1/macros/gnome-ghttp-check.m4
A	glabels1/macros/gnome-gnorba-check.m4
A	glabels1/macros/gnome-guile-checks.m4
A	glabels1/macros/gnome-libgtop-check.m4
A	glabels1/macros/gnome-objc-checks.m4
A	glabels1/macros/gnome-orbit-check.m4
A	glabels1/macros/gnome-print-check.m4
A	glabels1/macros/gnome-pthread-check.m4
A	glabels1/macros/gnome-support.m4
A	glabels1/macros/gnome-undelfs.m4
A	glabels1/macros/gnome-vfs.m4
A	glabels1/macros/gnome-x-checks.m4
A	glabels1/macros/gnome-xml-check.m4
A	glabels1/macros/gnome.m4
A	glabels1/macros/linger.m4
A	glabels1/macros/need-declaration.m4
A	glabels1/missing
A	glabels1/mkinstalldirs
A	glabels1/pixmaps/glabels-icon.png
A	glabels1/pixmaps/glabels-logo.png
A	glabels1/po/ChangeLog
A	glabels1/po/Makefile.in.in
A	glabels1/po/POTFILES.in
A	glabels1/po/cat-id-tbl.c
A	glabels1/po/de.gmo
A	glabels1/po/de.po
A	glabels1/po/fr.gmo
A	glabels1/po/fr.po
A	glabels1/po/glabels.pot
A	glabels1/po/ja.gmo
A	glabels1/po/ja.po
A	glabels1/po/pt_BR.gmo
A	glabels1/po/pt_BR.po
A	glabels1/po/stamp-cat-id
A	glabels1/src/Makefile.am
A	glabels1/src/Makefile.in
A	glabels1/src/bc.c
A	glabels1/src/bc.h
A	glabels1/src/bc_gnubarcode.c
A	glabels1/src/bc_gnubarcode.h
A	glabels1/src/bc_postnet.c
A	glabels1/src/bc_postnet.h
A	glabels1/src/debug.h
A	glabels1/src/display.c
A	glabels1/src/display.h
A	glabels1/src/edit.c
A	glabels1/src/edit.h
A	glabels1/src/file.c
A	glabels1/src/file.h
A	glabels1/src/glabels.c
A	glabels1/src/glabels_batch.c
A	glabels1/src/gnome-canvas-hacktext.h
A	glabels1/src/hack.c
A	glabels1/src/hack.h
A	glabels1/src/highlight.c
A	glabels1/src/highlight.h
A	glabels1/src/item.c
A	glabels1/src/item.h
A	glabels1/src/item_barcode.c
A	glabels1/src/item_barcode.h
A	glabels1/src/item_box.c
A	glabels1/src/item_box.h
A	glabels1/src/item_ellipse.c
A	glabels1/src/item_ellipse.h
A	glabels1/src/item_image.c
A	glabels1/src/item_image.h
A	glabels1/src/item_line.c
A	glabels1/src/item_line.h
A	glabels1/src/item_text.c
A	glabels1/src/item_text.h
A	glabels1/src/label.c
A	glabels1/src/label.h
A	glabels1/src/mdi.c
A	glabels1/src/mdi.h
A	glabels1/src/media_select.c
A	glabels1/src/media_select.h
A	glabels1/src/menu.c
A	glabels1/src/menu.h
A	glabels1/src/merge.c
A	glabels1/src/merge.h
A	glabels1/src/merge_properties.c
A	glabels1/src/merge_properties.h
A	glabels1/src/merge_text.c
A	glabels1/src/merge_text.h
A	glabels1/src/merge_ui.c
A	glabels1/src/merge_ui.h
A	glabels1/src/merge_ui_text.c
A	glabels1/src/merge_ui_text.h
A	glabels1/src/mini_preview.c
A	glabels1/src/mini_preview.h
A	glabels1/src/pixmaps/Makefile.am
A	glabels1/src/pixmaps/Makefile.in
A	glabels1/src/pixmaps/arrow.xpm
A	glabels1/src/pixmaps/barcode.xpm
A	glabels1/src/pixmaps/box.xpm
A	glabels1/src/pixmaps/checkerboard.xpm
A	glabels1/src/pixmaps/collate.xpm
A	glabels1/src/pixmaps/cursor_barcode.xbm
A	glabels1/src/pixmaps/cursor_barcode_mask.xbm
A	glabels1/src/pixmaps/cursor_box.xbm
A	glabels1/src/pixmaps/cursor_box_mask.xbm
A	glabels1/src/pixmaps/cursor_ellipse.xbm
A	glabels1/src/pixmaps/cursor_ellipse_mask.xbm
A	glabels1/src/pixmaps/cursor_image.xbm
A	glabels1/src/pixmaps/cursor_image_mask.xbm
A	glabels1/src/pixmaps/cursor_line.xbm
A	glabels1/src/pixmaps/cursor_line_mask.xbm
A	glabels1/src/pixmaps/cursor_text.xbm
A	glabels1/src/pixmaps/cursor_text_mask.xbm
A	glabels1/src/pixmaps/cursor_zoomin.xbm
A	glabels1/src/pixmaps/cursor_zoomin_mask.xbm
A	glabels1/src/pixmaps/cursor_zoomout.xbm
A	glabels1/src/pixmaps/cursor_zoomout_mask.xbm
A	glabels1/src/pixmaps/ellipse.xpm
A	glabels1/src/pixmaps/image.xpm
A	glabels1/src/pixmaps/line.xpm
A	glabels1/src/pixmaps/merge.xpm
A	glabels1/src/pixmaps/nocollate.xpm
A	glabels1/src/pixmaps/text.xpm
A	glabels1/src/pixmaps/zoom1to1.xpm
A	glabels1/src/pixmaps/zoomin.xpm
A	glabels1/src/pixmaps/zoomout.xpm
A	glabels1/src/prefs.c
A	glabels1/src/prefs.h
A	glabels1/src/print.c
A	glabels1/src/print.h
A	glabels1/src/print_copies.c
A	glabels1/src/print_copies.h
A	glabels1/src/print_dialog.c
A	glabels1/src/print_dialog.h
A	glabels1/src/print_merge.c
A	glabels1/src/print_merge.h
A	glabels1/src/prop_bc.c
A	glabels1/src/prop_bc.h
A	glabels1/src/prop_bc_data.c
A	glabels1/src/prop_bc_data.h
A	glabels1/src/prop_bc_style.c
A	glabels1/src/prop_bc_style.h
A	glabels1/src/prop_fill.c
A	glabels1/src/prop_fill.h
A	glabels1/src/prop_line.c
A	glabels1/src/prop_line.h
A	glabels1/src/prop_position.c
A	glabels1/src/prop_position.h
A	glabels1/src/prop_size.c
A	glabels1/src/prop_size.h
A	glabels1/src/prop_text.c
A	glabels1/src/prop_text.h
A	glabels1/src/prop_text_entry.c
A	glabels1/src/prop_text_entry.h
A	glabels1/src/prop_vector.c
A	glabels1/src/prop_vector.h
A	glabels1/src/propertybox.c
A	glabels1/src/propertybox.h
A	glabels1/src/rotate_select.c
A	glabels1/src/rotate_select.h
A	glabels1/src/splash.c
A	glabels1/src/splash.h
A	glabels1/src/stock.c
A	glabels1/src/stock.h
A	glabels1/src/template.c
A	glabels1/src/template.h
A	glabels1/src/text_node.c
A	glabels1/src/text_node.h
A	glabels1/src/tools.c
A	glabels1/src/tools.h
A	glabels1/src/util.c
A	glabels1/src/util.h
A	glabels1/stamp-h.in

commit f8b425009ad387d725524c28b79cafdc940a9b8b
Author: (no author) <(no author)@f5e0f49d-192f-0410-a22d-a8d8700d0965>
Date:	2002-02-24

    New repository initialized by cvs2svn.

    git-svn-id:
    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@1
    f5e0f49d-192f-0410-a22d-a8d8700d0965