commit 57cd5e842e4df053494c04e06163fc0fc635f689 Merge: f853d07 78b41ae Author: Tomás Touceda chiiph@torproject.org Date: Mon Jun 25 20:15:42 2012 -0300

Merge remote-tracking branch 'sirop/bug6130_countries_list' into alpha

changes/bug6130 | 3 + src/vidalia/network/CountryInfo.cpp | 285 +++++++++++-------- src/vidalia/res/country-coordinates.csv | 495 +++++++++++++++---------------- src/vidalia/res/flags/ad.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ae.png | Bin 1048 -> 1093 bytes src/vidalia/res/flags/af.png | Bin 1063 -> 1170 bytes src/vidalia/res/flags/ag.png | Bin 0 -> 1195 bytes src/vidalia/res/flags/ai.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/al.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/am.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/an.png | Bin 1062 -> 1117 bytes src/vidalia/res/flags/ao.png | Bin 1062 -> 1125 bytes src/vidalia/res/flags/aq.png | Bin 0 -> 998 bytes src/vidalia/res/flags/ar.png | Bin 1064 -> 1132 bytes src/vidalia/res/flags/as.png | Bin 0 -> 1177 bytes src/vidalia/res/flags/at.png | Bin 1062 -> 1096 bytes src/vidalia/res/flags/au.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/aw.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ax.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/az.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/ba.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bd.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/be.png | Bin 1060 -> 1170 bytes src/vidalia/res/flags/bf.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/bg.png | Bin 602 -> 1038 bytes src/vidalia/res/flags/bh.png | Bin 1052 -> 1153 bytes src/vidalia/res/flags/bi.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bj.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/bl.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/bm.png | Bin 1057 -> 1176 bytes src/vidalia/res/flags/bn.png | Bin 1064 -> 1189 bytes src/vidalia/res/flags/bo.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/br.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bs.png | Bin 1063 -> 1179 bytes src/vidalia/res/flags/bt.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bv.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/bw.png | Bin 1053 -> 1185 bytes src/vidalia/res/flags/by.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/bz.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ca.png | Bin 1064 -> 1171 bytes src/vidalia/res/flags/cc.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/cd.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/cf.png | Bin 1064 -> 1171 bytes src/vidalia/res/flags/cg.png | Bin 1061 -> 1185 bytes src/vidalia/res/flags/ch.png | Bin 1045 -> 1185 bytes src/vidalia/res/flags/ci.png | Bin 1061 -> 1083 bytes src/vidalia/res/flags/ck.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cl.png | Bin 1046 -> 1039 bytes src/vidalia/res/flags/cm.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cn.png | Bin 645 -> 1185 bytes src/vidalia/res/flags/co.png | Bin 1051 -> 1185 bytes src/vidalia/res/flags/cr.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cu.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/cv.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/cx.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/cy.png | Bin 1062 -> 902 bytes src/vidalia/res/flags/cz.png | Bin 1063 -> 1040 bytes src/vidalia/res/flags/de.png | Bin 194 -> 1185 bytes src/vidalia/res/flags/dj.png | Bin 0 -> 1174 bytes src/vidalia/res/flags/dk.png | Bin 1058 -> 1185 bytes src/vidalia/res/flags/dm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/do.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/dz.png | Bin 1058 -> 1042 bytes src/vidalia/res/flags/ec.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/ee.png | Bin 1062 -> 1189 bytes src/vidalia/res/flags/eg.png | Bin 1062 -> 1063 bytes src/vidalia/res/flags/eh.png | Bin 0 -> 1174 bytes src/vidalia/res/flags/er.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/es.png | Bin 342 -> 1185 bytes src/vidalia/res/flags/et.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/eu.png | Bin 146 -> 1185 bytes src/vidalia/res/flags/fi.png | Bin 344 -> 1028 bytes src/vidalia/res/flags/fj.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/fk.png | Bin 0 -> 1176 bytes src/vidalia/res/flags/fm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/fo.png | Bin 1062 -> 1035 bytes src/vidalia/res/flags/fr.png | Bin 226 -> 1083 bytes src/vidalia/res/flags/ga.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gd.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ge.png | Bin 649 -> 1141 bytes src/vidalia/res/flags/gf.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/gg.png | Bin 0 -> 1021 bytes src/vidalia/res/flags/gh.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gi.png | Bin 1060 -> 1024 bytes src/vidalia/res/flags/gl.png | Bin 1059 -> 1057 bytes src/vidalia/res/flags/gm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gp.png | Bin 1051 -> 1173 bytes src/vidalia/res/flags/gq.png | Bin 0 -> 1165 bytes src/vidalia/res/flags/gr.png | Bin 1064 -> 1176 bytes src/vidalia/res/flags/gs.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/gt.png | Bin 1064 -> 1150 bytes src/vidalia/res/flags/gu.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/gw.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/gy.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/hk.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/hm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/hn.png | Bin 0 -> 1149 bytes src/vidalia/res/flags/hr.png | Bin 1062 -> 1149 bytes src/vidalia/res/flags/ht.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/hu.png | Bin 606 -> 1096 bytes src/vidalia/res/flags/id.png | Bin 1062 -> 1109 bytes src/vidalia/res/flags/ie.png | Bin 1063 -> 1102 bytes src/vidalia/res/flags/il.png | Bin 1063 -> 1065 bytes src/vidalia/res/flags/im.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/in.png | Bin 1064 -> 1156 bytes src/vidalia/res/flags/io.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/iq.png | Bin 1063 -> 1097 bytes src/vidalia/res/flags/ir.png | Bin 1064 -> 1132 bytes src/vidalia/res/flags/is.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/it.png | Bin 231 -> 1083 bytes src/vidalia/res/flags/je.png | Bin 0 -> 1106 bytes src/vidalia/res/flags/jm.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/jo.png | Bin 1063 -> 1158 bytes src/vidalia/res/flags/jp.png | Bin 669 -> 897 bytes src/vidalia/res/flags/ke.png | Bin 1060 -> 1182 bytes src/vidalia/res/flags/kg.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/kh.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/ki.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/km.png | Bin 0 -> 1180 bytes src/vidalia/res/flags/kn.png | Bin 0 -> 1179 bytes src/vidalia/res/flags/kp.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/kr.png | Bin 1061 -> 1058 bytes src/vidalia/res/flags/kw.png | Bin 1032 -> 1137 bytes src/vidalia/res/flags/ky.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/kz.png | Bin 1063 -> 1182 bytes src/vidalia/res/flags/la.png | Bin 0 -> 1189 bytes src/vidalia/res/flags/lb.png | Bin 1063 -> 1074 bytes src/vidalia/res/flags/lc.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/li.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/lk.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/lr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/ls.png | Bin 0 -> 1134 bytes src/vidalia/res/flags/lt.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/lu.png | Bin 1062 -> 1096 bytes src/vidalia/res/flags/lv.png | Bin 1053 -> 1185 bytes src/vidalia/res/flags/ly.png | Bin 644 -> 1185 bytes src/vidalia/res/flags/ma.png | Bin 104 -> 1185 bytes src/vidalia/res/flags/mc.png | Bin 1061 -> 1109 bytes src/vidalia/res/flags/md.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/me.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mf.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/mg.png | Bin 1062 -> 1113 bytes src/vidalia/res/flags/mh.png | Bin 0 -> 1198 bytes src/vidalia/res/flags/mk.png | Bin 294 -> 1185 bytes src/vidalia/res/flags/ml.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mn.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/mo.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/mp.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/mq.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/ms.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/mt.png | Bin 647 -> 1101 bytes src/vidalia/res/flags/mu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mv.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/mw.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/mx.png | Bin 1063 -> 1171 bytes src/vidalia/res/flags/my.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/mz.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/na.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/nc.png | Bin 1062 -> 1083 bytes src/vidalia/res/flags/ne.png | Bin 0 -> 1132 bytes src/vidalia/res/flags/nf.png | Bin 1062 -> 1182 bytes src/vidalia/res/flags/ng.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/ni.png | Bin 0 -> 1132 bytes src/vidalia/res/flags/nl.png | Bin 607 -> 1096 bytes src/vidalia/res/flags/no.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/np.png | Bin 104 -> 935 bytes src/vidalia/res/flags/nr.png | Bin 1059 -> 1185 bytes src/vidalia/res/flags/nu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/nz.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/om.png | Bin 1062 -> 1109 bytes src/vidalia/res/flags/pa.png | Bin 1062 -> 1171 bytes src/vidalia/res/flags/pe.png | Bin 1064 -> 1083 bytes src/vidalia/res/flags/pf.png | Bin 1064 -> 1062 bytes src/vidalia/res/flags/pg.png | Bin 0 -> 1130 bytes src/vidalia/res/flags/ph.png | Bin 1064 -> 1195 bytes src/vidalia/res/flags/pk.png | Bin 1062 -> 1129 bytes src/vidalia/res/flags/pl.png | Bin 583 -> 1182 bytes src/vidalia/res/flags/pm.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/pn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/pr.png | Bin 1064 -> 1176 bytes src/vidalia/res/flags/ps.png | Bin 0 -> 1129 bytes src/vidalia/res/flags/pt.png | Bin 355 -> 1182 bytes src/vidalia/res/flags/pw.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/py.png | Bin 1062 -> 1129 bytes src/vidalia/res/flags/qa.png | Bin 668 -> 1109 bytes src/vidalia/res/flags/re.png | Bin 0 -> 1083 bytes src/vidalia/res/flags/ro.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/rs.png | Bin 0 -> 1176 bytes src/vidalia/res/flags/ru.png | Bin 232 -> 1029 bytes src/vidalia/res/flags/rw.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/sa.png | Bin 1063 -> 1185 bytes src/vidalia/res/flags/sb.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/sc.png | Bin 0 -> 1198 bytes src/vidalia/res/flags/sd.png | Bin 1062 -> 1087 bytes src/vidalia/res/flags/se.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/sg.png | Bin 1062 -> 1112 bytes src/vidalia/res/flags/sh.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/si.png | Bin 1063 -> 1090 bytes src/vidalia/res/flags/sj.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/sk.png | Bin 1063 -> 1090 bytes src/vidalia/res/flags/sl.png | Bin 1063 -> 1093 bytes src/vidalia/res/flags/sm.png | Bin 946 -> 990 bytes src/vidalia/res/flags/sn.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/so.png | Bin 1054 -> 1185 bytes src/vidalia/res/flags/sr.png | Bin 0 -> 1182 bytes src/vidalia/res/flags/st.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/sv.png | Bin 0 -> 1129 bytes src/vidalia/res/flags/sy.png | Bin 104 -> 1096 bytes src/vidalia/res/flags/sz.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tc.png | Bin 1061 -> 1182 bytes src/vidalia/res/flags/td.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tf.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tg.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/th.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/tj.png | Bin 0 -> 1154 bytes src/vidalia/res/flags/tk.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tl.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/tn.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/to.png | Bin 670 -> 1179 bytes src/vidalia/res/flags/tr.png | Bin 1050 -> 1185 bytes src/vidalia/res/flags/tt.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/tv.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/tw.png | Bin 654 -> 1179 bytes src/vidalia/res/flags/tz.png | Bin 1061 -> 1179 bytes src/vidalia/res/flags/ua.png | Bin 1062 -> 1185 bytes src/vidalia/res/flags/ug.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/um.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/us.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/uy.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/uz.png | Bin 0 -> 1096 bytes src/vidalia/res/flags/va.png | Bin 1063 -> 1130 bytes src/vidalia/res/flags/vc.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ve.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/vg.png | Bin 1064 -> 1182 bytes src/vidalia/res/flags/vi.png | Bin 1064 -> 1168 bytes src/vidalia/res/flags/vn.png | Bin 1059 -> 1185 bytes src/vidalia/res/flags/vu.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/wf.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/ws.png | Bin 1048 -> 1185 bytes src/vidalia/res/flags/ye.png | Bin 1062 -> 1030 bytes src/vidalia/res/flags/yt.png | Bin 0 -> 1079 bytes src/vidalia/res/flags/za.png | Bin 1064 -> 1185 bytes src/vidalia/res/flags/zm.png | Bin 0 -> 1185 bytes src/vidalia/res/flags/zw.png | Bin 269 -> 1185 bytes 250 files changed, 417 insertions(+), 366 deletions(-)