Index: trunk/src/canonmn.cpp
===================================================================
--- trunk/src/canonmn.cpp	(revision 3050)
+++ trunk/src/canonmn.cpp	(revision 3051)
@@ -148,12 +148,131 @@
         { 0x2160000, N_("PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10") },
         { 0x2180000, N_("PowerShot A550") },
         { 0x2190000, N_("PowerShot A450") },
+        { 0x2230000, N_("PowerShot G9") },
+        { 0x2240000, N_("PowerShot A650 IS") },
+        { 0x2260000, N_("PowerShot A720 IS") },
+        { 0x2290000, N_("PowerShot SX100 IS") },
+        { 0x2300000, N_("PowerShot SD950 IS / Digital IXUS 960 IS / IXY Digital 2000 IS") },
+        { 0x2310000, N_("PowerShot SD870 IS / Digital IXUS 860 IS / IXY Digital 910 IS") },
+        { 0x2320000, N_("PowerShot SD890 IS / Digital IXUS 970 IS / IXY Digital 820 IS") },
+        { 0x2360000, N_("PowerShot SD790 IS / Digital IXUS 90 IS / IXY Digital 95 IS") },
+        { 0x2370000, N_("PowerShot SD770 IS / Digital IXUS 85 IS / IXY Digital 25 IS") },
+        { 0x2380000, N_("PowerShot A590 IS") },
+        { 0x2390000, N_("PowerShot A580") },
+        { 0x2420000, N_("PowerShot A470") },
+        { 0x2430000, N_("PowerShot SD1100 IS / Digital IXUS 80 IS / IXY Digital 20 IS") },
+        { 0x2460000, N_("PowerShot SX1 IS") },
+        { 0x2470000, N_("PowerShot SX10 IS") },
+        { 0x2480000, N_("PowerShot A1000 IS") },
+        { 0x2490000, N_("PowerShot G10") },
+        { 0x2510000, N_("PowerShot A2000 IS") },
+        { 0x2520000, N_("PowerShot SX110 IS") },
+        { 0x2530000, N_("PowerShot SD990 IS / Digital IXUS 980 IS / IXY Digital 3000 IS") },
+        { 0x2540000, N_("PowerShot SD880 IS / Digital IXUS 870 IS / IXY Digital 920 IS") },
+        { 0x2550000, N_("PowerShot E1") },
+        { 0x2560000, N_("PowerShot D10") },
+        { 0x2570000, N_("PowerShot SD960 IS / Digital IXUS 110 IS / IXY Digital 510 IS") },
+        { 0x2580000, N_("PowerShot A2100 IS") },
+        { 0x2590000, N_("PowerShot A480") },
+        { 0x2600000, N_("PowerShot SX200 IS") },
+        { 0x2610000, N_("PowerShot SD970 IS / Digital IXUS 990 IS / IXY Digital 830 IS") },
+        { 0x2620000, N_("PowerShot SD780 IS / Digital IXUS 100 IS / IXY Digital 210 IS") },
+        { 0x2630000, N_("PowerShot A1100 IS") },
+        { 0x2640000, N_("PowerShot SD1200 IS / Digital IXUS 95 IS / IXY Digital 110 IS") },
+        { 0x2700000, N_("PowerShot G11") },
+        { 0x2710000, N_("PowerShot SX120 IS") },
+        { 0x2720000, N_("PowerShot S90") },
+        { 0x2750000, N_("PowerShot SX20 IS") },
+        { 0x2760000, N_("PowerShot SD980 IS / Digital IXUS 200 IS / IXY Digital 930 IS") },
+        { 0x2770000, N_("PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS") },
+        { 0x2800000, N_("PowerShot A495") },
+        { 0x2810000, N_("PowerShot A490") },
+        { 0x2820000, N_("PowerShot A3100 IS / A3150 IS") },
+        { 0x2830000, N_("PowerShot A3000 IS") },
+        { 0x2840000, N_("PowerShot SD1400 IS / IXUS 130 / IXY 400F") },
+        { 0x2850000, N_("PowerShot SD1300 IS / IXUS 105 / IXY 200F") },
+        { 0x2860000, N_("PowerShot SD3500 IS / IXUS 210 / IXY 10S") },
+        { 0x2870000, N_("PowerShot SX210 IS") },
+        { 0x2880000, N_("PowerShot SD4000 IS / IXUS 300 HS / IXY 30S") },
+        { 0x2890000, N_("PowerShot SD4500 IS / IXUS 1000 HS / IXY 50S") },
+        { 0x2920000, N_("PowerShot G12") },
+        { 0x2930000, N_("PowerShot SX30 IS") },
+        { 0x2940000, N_("PowerShot SX130 IS") },
+        { 0x2950000, N_("PowerShot S95") },
+        { 0x2980000, N_("PowerShot A3300 IS") },
+        { 0x2990000, N_("PowerShot A3200 IS") },
+        { 0x3000000, N_("PowerShot ELPH 500 HS / IXUS 310 HS / IXY 31S") },
         { 0x3010000, N_("PowerShot Pro90 IS") },
+        { 0x3010001, N_("PowerShot A800") },
+        { 0x3020000, N_("PowerShot ELPH 100 HS / IXUS 115 HS / IXY 210F") },
+        { 0x3030000, N_("PowerShot SX230 HS") },
+        { 0x3040000, N_("PowerShot ELPH 300 HS / IXUS 220 HS / IXY 410F") },
+        { 0x3050000, N_("PowerShot A2200") },
+        { 0x3060000, N_("PowerShot A1200") },
+        { 0x3070000, N_("PowerShot SX220 HS") },
+        { 0x3080000, N_("PowerShot G1 X") },
+        { 0x3090000, N_("PowerShot SX150 IS") },
+        { 0x3100000, N_("PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S") },
+        { 0x3110000, N_("PowerShot S100 (new)") },
+        { 0x3130000, N_("PowerShot SX40 HS") },
+        { 0x3120000, N_("PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F") },
+        { 0x3140000, N_("PowerShot ELPH 500 HS / IXUS 320 HS / IXY 32S") },
+        { 0x3160000, N_("PowerShot A1300") },
+        { 0x3170000, N_("PowerShot A810") },
+        { 0x3180000, N_("PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F") },
+        { 0x3190000, N_("PowerShot ELPH 110 HS / IXUS 125 HS / IXY 220F") },
+        { 0x3200000, N_("PowerShot D20") },
+        { 0x3210000, N_("PowerShot A4000 IS") },
+        { 0x3220000, N_("PowerShot SX260 HS") },
+        { 0x3230000, N_("PowerShot SX240 HS") },
+        { 0x3240000, N_("PowerShot ELPH 530 HS / IXUS 510 HS / IXY 1") },
+        { 0x3250000, N_("PowerShot ELPH 520 HS / IXUS 500 HS / IXY 3") },
+        { 0x3260000, N_("PowerShot A3400 IS") },
+        { 0x3270000, N_("PowerShot A2400 IS") },
+        { 0x3280000, N_("PowerShot A2300") },
+        { 0x3330000, N_("PowerShot G15") },
+        { 0x3340000, N_("PowerShot SX50") },
+        { 0x3350000, N_("PowerShot SX160 IS") },
+        { 0x3360000, N_("PowerShot S110 (new)") },
+        { 0x3370000, N_("PowerShot SX500 IS") },
+        { 0x3380000, N_("PowerShot N") },
+        { 0x3390000, N_("IXUS 245 HS / IXY 430F") },
+        { 0x3400000, N_("PowerShot SX280 HS") },
+        { 0x3430000, N_("PowerShot A2600") },
+        { 0x3450000, N_("PowerShot A1400") },
+        { 0x3460000, N_("PowerShot ELPH 130 IS / IXUS 140 / IXY 110F") },
+        { 0x3470000, N_("PowerShot ELPH 115 IS / IXUS 132 / IXY 90F") },
+        { 0x3490000, N_("PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F") },
         { 0x4040000, N_("PowerShot G1") },
         { 0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") },
+        { 0x4007d673, N_("DC19/DC21/DC22") },
+        { 0x4007d674, N_("XH A1") },
         { 0x4007d675, N_("HV10") },
-        { 0x4007d777, N_("iVIS DC50") },
-        { 0x4007d778, N_("iVIS HV20") },
+        { 0x4007d676, N_("MD130/MD140/MD150/MD160/ZR850") },
+        { 0x4007d777, N_("DC50") },
+        { 0x4007d778, N_("HV20") },
+        { 0x4007d779, N_("DC211") },
+        { 0x4007d77a, N_("HG10") },
+        { 0x4007d77b, N_("HR10") },
+        { 0x4007d77c, N_("MD255/ZR950") },
+        { 0x4007d81c, N_("HF11") },
+        { 0x4007d878, N_("HV30") },
+        { 0x4007d87c, N_("XH A1S") },
+        { 0x4007d87e, N_("DC301/DC310/DC311/DC320/DC330") },
+        { 0x4007d87f, N_("FS100") },
+        { 0x4007d880, N_("HF10") },
+        { 0x4007d882, N_("HG20/HG21") },
+        { 0x4007d925, N_("HF21") },
+        { 0x4007d926, N_("HF S11") },
+        { 0x4007d978, N_("HV40") },
+        { 0x4007d987, N_("DC410/DC411/DC420") },
+        { 0x4007d988, N_("FS19/FS20/FS21/FS22/FS200") },
+        { 0x4007d989, N_("HF20/HF200") },
+        { 0x4007d98a, N_("HF S10/S100") },
+        { 0x4007da8e, N_("HF R10/R16/R17/R18/R100/R106") },
+        { 0x4007da8f, N_("HF M30/M31/M36/M300/M306") },
+        { 0x4007da90, N_("HF S20/S21/S200") },
+        { 0x4007da92, N_("FS31/FS36/FS37/FS300/FS305/FS306/FS307") },
         { 0x80000001, N_("EOS-1D") },
         { 0x80000167, N_("EOS-1DS") },
         { 0x80000168, N_("EOS 10D") },
@@ -161,17 +280,27 @@
         { 0x80000170, N_("EOS Digital Rebel / 300D / Kiss Digital") },
         { 0x80000174, N_("EOS-1D Mark II") },
         { 0x80000175, N_("EOS 20D") },
+        { 0x80000176, N_("EOS Digital Rebel XSi / 450D / Kiss X2") },
         { 0x80000188, N_("EOS-1Ds Mark II") },
         { 0x80000189, N_("EOS Digital Rebel XT / 350D / Kiss Digital N") },
+        { 0x80000190, N_("EOS 40D") },
         { 0x80000213, N_("EOS 5D") },
+        { 0x80000215, N_("EOS-1Ds Mark III") },
+        { 0x80000218, N_("EOS 5D Mark II") },
+        { 0x80000219, N_("WFT-E1") },
         { 0x80000232, N_("EOS-1D Mark II N") },
         { 0x80000234, N_("EOS 30D") },
         { 0x80000236, N_("EOS Digital Rebel XTi / 400D / Kiss Digital X") },
+        { 0x80000241, N_("WFT-E2") },
+        { 0x80000246, N_("WFT-E3") },
         { 0x80000250, N_("EOS 7D") },
         { 0x80000252, N_("EOS Rebel T1i / 500D / Kiss X3") },
         { 0x80000254, N_("EOS Rebel XS / 1000D / Kiss F") },
         { 0x80000261, N_("EOS 50D") },
+        { 0x80000269, N_("EOS-1D X") },
         { 0x80000270, N_("EOS Rebel T2i / 550D / Kiss X4") },
+        { 0x80000271, N_("WFT-E4") },
+        { 0x80000273, N_("WFT-E5") },
         { 0x80000281, N_("EOS-1D Mark IV") },
         { 0x80000285, N_("EOS 5D Mark III") },
         { 0x80000286, N_("EOS Rebel T3i / 600D / Kiss X5") },
@@ -181,6 +310,10 @@
         { 0x80000298, N_("WFT-E4 II") },
         { 0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") },
         { 0x80000302, N_("EOS 6D") },
+        { 0x80000324, N_("EOS-1D C") },
+        { 0x80000326, N_("EOS Rebel T5i / 700D / Kiss X7i") },
+        { 0x80000331, N_("EOS M") },
+        { 0x80000346, N_("EOS Rebel SL1 / 100D / Kiss X7") },
     };
 
     //! SerialNumberFormat, tag 0x0015
