4 files changed, 525 insertions, 269 deletions

diff --git a/net-p2p/deluge05/Makefile b/net-p2p/deluge05/Makefile
index 01b605fd3420..dbd728a02bf6 100644
--- a/net-p2p/deluge05/Makefile
+++ b/net-p2p/deluge05/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	deluge
-PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTVERSION=	0.5.4.1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/tarball/${PORTVERSION}/
 
diff --git a/net-p2p/deluge05/distinfo b/net-p2p/deluge05/distinfo
index 5b896700e5c5..30165ce8aa67 100644
--- a/net-p2p/deluge05/distinfo
+++ b/net-p2p/deluge05/distinfo
@@ -1,3 +1,3 @@
-MD5 (deluge-0.5.4.tar.gz) = 4037ed555f8849a0c92585ab2341be31
-SHA256 (deluge-0.5.4.tar.gz) = d8ae30370c27358d898c87a6bd2e8ae2164ec0859bd58abbd125192c7c1180fc
-SIZE (deluge-0.5.4.tar.gz) = 1133090
+MD5 (deluge-0.5.4.1.tar.gz) = e346c6f2c10b11be6cec581cd6671711
+SHA256 (deluge-0.5.4.1.tar.gz) = 5b627d7e79ff49160ff47107cff421649c942774317836e065982e90492b293d
+SIZE (deluge-0.5.4.1.tar.gz) = 15536378
diff --git a/net-p2p/deluge05/files/patch-libtorrent_src_storage.cpp b/net-p2p/deluge05/files/patch-libtorrent_src_storage.cpp
index 04d0678a9a88..bcfe5bf7c341 100644
--- a/net-p2p/deluge05/files/patch-libtorrent_src_storage.cpp
+++ b/net-p2p/deluge05/files/patch-libtorrent_src_storage.cpp
@@ -1,15 +1,15 @@
---- libtorrent/src/storage.cpp.orig	2007-08-06 17:01:24.000000000 -0500
-+++ libtorrent/src/storage.cpp	2007-08-06 17:05:26.000000000 -0500
-@@ -981,7 +981,7 @@
- 			return true;
+--- libtorrent/src/storage.cpp.orig	2007-08-11 01:51:04.000000000 -0500
++++ libtorrent/src/storage.cpp	2007-08-11 01:52:15.000000000 -0500
+@@ -1027,7 +1027,7 @@
+ 		return false;
  #endif
  
--#if defined(__APPLE__) || defined(__linux__)
-+#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__)
- 		// find the last existing directory of the save path
- 		fs::path query_path = p;
- 		while (!query_path.empty() && !exists(query_path))
-@@ -1058,7 +1058,11 @@
+-#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__)
+ 		struct statfs buf;
+ 		int err = statfs(query_path.native_directory_string().c_str(), &buf);
+ 		if (err == 0)
+@@ -1060,7 +1060,11 @@
  #endif
  
  		// TODO: POSIX implementation
diff --git a/net-p2p/deluge05/pkg-plist b/net-p2p/deluge05/pkg-plist
index 621f255b3baf..25386916b3df 100644
--- a/net-p2p/deluge05/pkg-plist
+++ b/net-p2p/deluge05/pkg-plist
@@ -24,6 +24,9 @@ bin/deluge
 %%PYTHON_SITELIBDIR%%/deluge/files.py
 %%PYTHON_SITELIBDIR%%/deluge/files.pyc
 %%PYTHON_SITELIBDIR%%/deluge/files.pyo
+%%PYTHON_SITELIBDIR%%/deluge/info.py
+%%PYTHON_SITELIBDIR%%/deluge/info.pyc
+%%PYTHON_SITELIBDIR%%/deluge/info.pyo
 %%PYTHON_SITELIBDIR%%/deluge/interface.py
 %%PYTHON_SITELIBDIR%%/deluge/interface.pyc
 %%PYTHON_SITELIBDIR%%/deluge/interface.pyo
@@ -62,253 +65,500 @@ share/applications/deluge.desktop
 %%DATADIR%%/pixmaps/deluge32.png
 %%DATADIR%%/pixmaps/deluge48.png
 %%DATADIR%%/pixmaps/downloading16.png
-%%DATADIR%%/pixmaps/flags/ad.png
-%%DATADIR%%/pixmaps/flags/ae.png
-%%DATADIR%%/pixmaps/flags/af.png
-%%DATADIR%%/pixmaps/flags/ag.png
-%%DATADIR%%/pixmaps/flags/ai.png
-%%DATADIR%%/pixmaps/flags/al.png
-%%DATADIR%%/pixmaps/flags/am.png
-%%DATADIR%%/pixmaps/flags/an.png
-%%DATADIR%%/pixmaps/flags/ao.png
-%%DATADIR%%/pixmaps/flags/aq.png
-%%DATADIR%%/pixmaps/flags/ar.png
-%%DATADIR%%/pixmaps/flags/as.png
-%%DATADIR%%/pixmaps/flags/at.png
-%%DATADIR%%/pixmaps/flags/au.png
-%%DATADIR%%/pixmaps/flags/aw.png
-%%DATADIR%%/pixmaps/flags/ax.png
-%%DATADIR%%/pixmaps/flags/az.png
-%%DATADIR%%/pixmaps/flags/ba.png
-%%DATADIR%%/pixmaps/flags/bb.png
-%%DATADIR%%/pixmaps/flags/bd.png
-%%DATADIR%%/pixmaps/flags/be.png
-%%DATADIR%%/pixmaps/flags/bf.png
-%%DATADIR%%/pixmaps/flags/bg.png
-%%DATADIR%%/pixmaps/flags/bh.png
-%%DATADIR%%/pixmaps/flags/bi.png
-%%DATADIR%%/pixmaps/flags/bj.png
-%%DATADIR%%/pixmaps/flags/bm.png
-%%DATADIR%%/pixmaps/flags/bn.png
-%%DATADIR%%/pixmaps/flags/bo.png
-%%DATADIR%%/pixmaps/flags/br.png
-%%DATADIR%%/pixmaps/flags/bs.png
-%%DATADIR%%/pixmaps/flags/bt.png
-%%DATADIR%%/pixmaps/flags/bv.png
-%%DATADIR%%/pixmaps/flags/bw.png
-%%DATADIR%%/pixmaps/flags/by.png
-%%DATADIR%%/pixmaps/flags/bz.png
-%%DATADIR%%/pixmaps/flags/ca.png
-%%DATADIR%%/pixmaps/flags/cc.png
-%%DATADIR%%/pixmaps/flags/cd.png
-%%DATADIR%%/pixmaps/flags/cf.png
-%%DATADIR%%/pixmaps/flags/cg.png
-%%DATADIR%%/pixmaps/flags/ch.png
-%%DATADIR%%/pixmaps/flags/ci.png
-%%DATADIR%%/pixmaps/flags/ck.png
-%%DATADIR%%/pixmaps/flags/cl.png
-%%DATADIR%%/pixmaps/flags/cm.png
-%%DATADIR%%/pixmaps/flags/cn.png
-%%DATADIR%%/pixmaps/flags/co.png
-%%DATADIR%%/pixmaps/flags/cr.png
-%%DATADIR%%/pixmaps/flags/cs.png
-%%DATADIR%%/pixmaps/flags/cu.png
-%%DATADIR%%/pixmaps/flags/cv.png
-%%DATADIR%%/pixmaps/flags/cx.png
-%%DATADIR%%/pixmaps/flags/cy.png
-%%DATADIR%%/pixmaps/flags/cz.png
-%%DATADIR%%/pixmaps/flags/de.png
-%%DATADIR%%/pixmaps/flags/dj.png
-%%DATADIR%%/pixmaps/flags/dk.png
-%%DATADIR%%/pixmaps/flags/dm.png
-%%DATADIR%%/pixmaps/flags/do.png
-%%DATADIR%%/pixmaps/flags/dz.png
-%%DATADIR%%/pixmaps/flags/ec.png
-%%DATADIR%%/pixmaps/flags/ee.png
-%%DATADIR%%/pixmaps/flags/eg.png
-%%DATADIR%%/pixmaps/flags/eh.png
-%%DATADIR%%/pixmaps/flags/er.png
-%%DATADIR%%/pixmaps/flags/es.png
-%%DATADIR%%/pixmaps/flags/et.png
-%%DATADIR%%/pixmaps/flags/fi.png
-%%DATADIR%%/pixmaps/flags/fj.png
-%%DATADIR%%/pixmaps/flags/fk.png
-%%DATADIR%%/pixmaps/flags/fm.png
-%%DATADIR%%/pixmaps/flags/fo.png
-%%DATADIR%%/pixmaps/flags/fr.png
-%%DATADIR%%/pixmaps/flags/fx.png
-%%DATADIR%%/pixmaps/flags/ga.png
-%%DATADIR%%/pixmaps/flags/gb.png
-%%DATADIR%%/pixmaps/flags/gd.png
-%%DATADIR%%/pixmaps/flags/ge.png
-%%DATADIR%%/pixmaps/flags/gf.png
-%%DATADIR%%/pixmaps/flags/gg.png
-%%DATADIR%%/pixmaps/flags/gh.png
-%%DATADIR%%/pixmaps/flags/gi.png
-%%DATADIR%%/pixmaps/flags/gl.png
-%%DATADIR%%/pixmaps/flags/gm.png
-%%DATADIR%%/pixmaps/flags/gn.png
-%%DATADIR%%/pixmaps/flags/gp.png
-%%DATADIR%%/pixmaps/flags/gq.png
-%%DATADIR%%/pixmaps/flags/gr.png
-%%DATADIR%%/pixmaps/flags/gs.png
-%%DATADIR%%/pixmaps/flags/gt.png
-%%DATADIR%%/pixmaps/flags/gu.png
-%%DATADIR%%/pixmaps/flags/gw.png
-%%DATADIR%%/pixmaps/flags/gy.png
-%%DATADIR%%/pixmaps/flags/hk.png
-%%DATADIR%%/pixmaps/flags/hm.png
-%%DATADIR%%/pixmaps/flags/hn.png
-%%DATADIR%%/pixmaps/flags/hr.png
-%%DATADIR%%/pixmaps/flags/ht.png
-%%DATADIR%%/pixmaps/flags/hu.png
-%%DATADIR%%/pixmaps/flags/id.png
-%%DATADIR%%/pixmaps/flags/ie.png
-%%DATADIR%%/pixmaps/flags/il.png
-%%DATADIR%%/pixmaps/flags/in.png
-%%DATADIR%%/pixmaps/flags/io.png
-%%DATADIR%%/pixmaps/flags/iq.png
-%%DATADIR%%/pixmaps/flags/ir.png
-%%DATADIR%%/pixmaps/flags/is.png
-%%DATADIR%%/pixmaps/flags/it.png
-%%DATADIR%%/pixmaps/flags/je.png
-%%DATADIR%%/pixmaps/flags/jm.png
-%%DATADIR%%/pixmaps/flags/jo.png
-%%DATADIR%%/pixmaps/flags/jp.png
-%%DATADIR%%/pixmaps/flags/ke.png
-%%DATADIR%%/pixmaps/flags/kg.png
-%%DATADIR%%/pixmaps/flags/kh.png
-%%DATADIR%%/pixmaps/flags/ki.png
-%%DATADIR%%/pixmaps/flags/km.png
-%%DATADIR%%/pixmaps/flags/kn.png
-%%DATADIR%%/pixmaps/flags/kp.png
-%%DATADIR%%/pixmaps/flags/kr.png
-%%DATADIR%%/pixmaps/flags/kw.png
-%%DATADIR%%/pixmaps/flags/ky.png
-%%DATADIR%%/pixmaps/flags/kz.png
-%%DATADIR%%/pixmaps/flags/la.png
-%%DATADIR%%/pixmaps/flags/lb.png
-%%DATADIR%%/pixmaps/flags/lc.png
-%%DATADIR%%/pixmaps/flags/li.png
-%%DATADIR%%/pixmaps/flags/lk.png
-%%DATADIR%%/pixmaps/flags/lr.png
-%%DATADIR%%/pixmaps/flags/ls.png
-%%DATADIR%%/pixmaps/flags/lt.png
-%%DATADIR%%/pixmaps/flags/lu.png
-%%DATADIR%%/pixmaps/flags/lv.png
-%%DATADIR%%/pixmaps/flags/ly.png
-%%DATADIR%%/pixmaps/flags/ma.png
-%%DATADIR%%/pixmaps/flags/mc.png
-%%DATADIR%%/pixmaps/flags/md.png
-%%DATADIR%%/pixmaps/flags/me.png
-%%DATADIR%%/pixmaps/flags/mg.png
-%%DATADIR%%/pixmaps/flags/mh.png
-%%DATADIR%%/pixmaps/flags/mk.png
-%%DATADIR%%/pixmaps/flags/ml.png
-%%DATADIR%%/pixmaps/flags/mm.png
-%%DATADIR%%/pixmaps/flags/mn.png
-%%DATADIR%%/pixmaps/flags/mo.png
-%%DATADIR%%/pixmaps/flags/mp.png
-%%DATADIR%%/pixmaps/flags/mq.png
-%%DATADIR%%/pixmaps/flags/mr.png
-%%DATADIR%%/pixmaps/flags/ms.png
-%%DATADIR%%/pixmaps/flags/mt.png
-%%DATADIR%%/pixmaps/flags/mu.png
-%%DATADIR%%/pixmaps/flags/mv.png
-%%DATADIR%%/pixmaps/flags/mw.png
-%%DATADIR%%/pixmaps/flags/mx.png
-%%DATADIR%%/pixmaps/flags/my.png
-%%DATADIR%%/pixmaps/flags/mz.png
-%%DATADIR%%/pixmaps/flags/na.png
-%%DATADIR%%/pixmaps/flags/nc.png
-%%DATADIR%%/pixmaps/flags/ne.png
-%%DATADIR%%/pixmaps/flags/nf.png
-%%DATADIR%%/pixmaps/flags/ng.png
-%%DATADIR%%/pixmaps/flags/ni.png
-%%DATADIR%%/pixmaps/flags/nl.png
-%%DATADIR%%/pixmaps/flags/no.png
-%%DATADIR%%/pixmaps/flags/np.png
-%%DATADIR%%/pixmaps/flags/nr.png
-%%DATADIR%%/pixmaps/flags/nu.png
-%%DATADIR%%/pixmaps/flags/nz.png
-%%DATADIR%%/pixmaps/flags/om.png
-%%DATADIR%%/pixmaps/flags/pa.png
-%%DATADIR%%/pixmaps/flags/pe.png
-%%DATADIR%%/pixmaps/flags/pf.png
-%%DATADIR%%/pixmaps/flags/pg.png
-%%DATADIR%%/pixmaps/flags/ph.png
-%%DATADIR%%/pixmaps/flags/pk.png
-%%DATADIR%%/pixmaps/flags/pl.png
-%%DATADIR%%/pixmaps/flags/pm.png
-%%DATADIR%%/pixmaps/flags/pn.png
-%%DATADIR%%/pixmaps/flags/pr.png
-%%DATADIR%%/pixmaps/flags/ps.png
-%%DATADIR%%/pixmaps/flags/pt.png
-%%DATADIR%%/pixmaps/flags/pw.png
-%%DATADIR%%/pixmaps/flags/py.png
-%%DATADIR%%/pixmaps/flags/qa.png
-%%DATADIR%%/pixmaps/flags/re.png
-%%DATADIR%%/pixmaps/flags/ro.png
-%%DATADIR%%/pixmaps/flags/rs.png
-%%DATADIR%%/pixmaps/flags/ru.png
-%%DATADIR%%/pixmaps/flags/rw.png
-%%DATADIR%%/pixmaps/flags/sa.png
-%%DATADIR%%/pixmaps/flags/sb.png
-%%DATADIR%%/pixmaps/flags/sc.png
-%%DATADIR%%/pixmaps/flags/sd.png
-%%DATADIR%%/pixmaps/flags/se.png
-%%DATADIR%%/pixmaps/flags/sg.png
-%%DATADIR%%/pixmaps/flags/sh.png
-%%DATADIR%%/pixmaps/flags/si.png
-%%DATADIR%%/pixmaps/flags/sj.png
-%%DATADIR%%/pixmaps/flags/sk.png
-%%DATADIR%%/pixmaps/flags/sl.png
-%%DATADIR%%/pixmaps/flags/sm.png
-%%DATADIR%%/pixmaps/flags/sn.png
-%%DATADIR%%/pixmaps/flags/so.png
-%%DATADIR%%/pixmaps/flags/sr.png
-%%DATADIR%%/pixmaps/flags/st.png
-%%DATADIR%%/pixmaps/flags/sv.png
-%%DATADIR%%/pixmaps/flags/sy.png
-%%DATADIR%%/pixmaps/flags/sz.png
-%%DATADIR%%/pixmaps/flags/tc.png
-%%DATADIR%%/pixmaps/flags/td.png
-%%DATADIR%%/pixmaps/flags/tf.png
-%%DATADIR%%/pixmaps/flags/tg.png
-%%DATADIR%%/pixmaps/flags/th.png
-%%DATADIR%%/pixmaps/flags/tj.png
-%%DATADIR%%/pixmaps/flags/tk.png
-%%DATADIR%%/pixmaps/flags/tl.png
-%%DATADIR%%/pixmaps/flags/tm.png
-%%DATADIR%%/pixmaps/flags/tn.png
-%%DATADIR%%/pixmaps/flags/to.png
-%%DATADIR%%/pixmaps/flags/tp.png
-%%DATADIR%%/pixmaps/flags/tr.png
-%%DATADIR%%/pixmaps/flags/tt.png
-%%DATADIR%%/pixmaps/flags/tv.png
-%%DATADIR%%/pixmaps/flags/tw.png
-%%DATADIR%%/pixmaps/flags/tz.png
-%%DATADIR%%/pixmaps/flags/ua.png
-%%DATADIR%%/pixmaps/flags/ug.png
-%%DATADIR%%/pixmaps/flags/um.png
-%%DATADIR%%/pixmaps/flags/us.png
-%%DATADIR%%/pixmaps/flags/uy.png
-%%DATADIR%%/pixmaps/flags/uz.png
-%%DATADIR%%/pixmaps/flags/va.png
-%%DATADIR%%/pixmaps/flags/vc.png
-%%DATADIR%%/pixmaps/flags/ve.png
-%%DATADIR%%/pixmaps/flags/vg.png
-%%DATADIR%%/pixmaps/flags/vi.png
-%%DATADIR%%/pixmaps/flags/vn.png
-%%DATADIR%%/pixmaps/flags/vu.png
-%%DATADIR%%/pixmaps/flags/wf.png
-%%DATADIR%%/pixmaps/flags/ws.png
-%%DATADIR%%/pixmaps/flags/ye.png
-%%DATADIR%%/pixmaps/flags/yt.png
-%%DATADIR%%/pixmaps/flags/yu.png
-%%DATADIR%%/pixmaps/flags/za.png
-%%DATADIR%%/pixmaps/flags/zm.png
-%%DATADIR%%/pixmaps/flags/zw.png
+%%DATADIR%%/pixmaps/flags18x12/ad.png
+%%DATADIR%%/pixmaps/flags18x12/ae.png
+%%DATADIR%%/pixmaps/flags18x12/af.png
+%%DATADIR%%/pixmaps/flags18x12/ag.png
+%%DATADIR%%/pixmaps/flags18x12/ai.png
+%%DATADIR%%/pixmaps/flags18x12/al.png
+%%DATADIR%%/pixmaps/flags18x12/am.png
+%%DATADIR%%/pixmaps/flags18x12/an.png
+%%DATADIR%%/pixmaps/flags18x12/ao.png
+%%DATADIR%%/pixmaps/flags18x12/aq.png
+%%DATADIR%%/pixmaps/flags18x12/ar.png
+%%DATADIR%%/pixmaps/flags18x12/as.png
+%%DATADIR%%/pixmaps/flags18x12/at.png
+%%DATADIR%%/pixmaps/flags18x12/au.png
+%%DATADIR%%/pixmaps/flags18x12/aw.png
+%%DATADIR%%/pixmaps/flags18x12/ax.png
+%%DATADIR%%/pixmaps/flags18x12/az.png
+%%DATADIR%%/pixmaps/flags18x12/ba.png
+%%DATADIR%%/pixmaps/flags18x12/bb.png
+%%DATADIR%%/pixmaps/flags18x12/bd.png
+%%DATADIR%%/pixmaps/flags18x12/be.png
+%%DATADIR%%/pixmaps/flags18x12/bf.png
+%%DATADIR%%/pixmaps/flags18x12/bg.png
+%%DATADIR%%/pixmaps/flags18x12/bh.png
+%%DATADIR%%/pixmaps/flags18x12/bi.png
+%%DATADIR%%/pixmaps/flags18x12/bj.png
+%%DATADIR%%/pixmaps/flags18x12/bm.png
+%%DATADIR%%/pixmaps/flags18x12/bn.png
+%%DATADIR%%/pixmaps/flags18x12/bo.png
+%%DATADIR%%/pixmaps/flags18x12/br.png
+%%DATADIR%%/pixmaps/flags18x12/bs.png
+%%DATADIR%%/pixmaps/flags18x12/bt.png
+%%DATADIR%%/pixmaps/flags18x12/bv.png
+%%DATADIR%%/pixmaps/flags18x12/bw.png
+%%DATADIR%%/pixmaps/flags18x12/by.png
+%%DATADIR%%/pixmaps/flags18x12/bz.png
+%%DATADIR%%/pixmaps/flags18x12/ca.png
+%%DATADIR%%/pixmaps/flags18x12/cc.png
+%%DATADIR%%/pixmaps/flags18x12/cd.png
+%%DATADIR%%/pixmaps/flags18x12/cf.png
+%%DATADIR%%/pixmaps/flags18x12/cg.png
+%%DATADIR%%/pixmaps/flags18x12/ch.png
+%%DATADIR%%/pixmaps/flags18x12/ci.png
+%%DATADIR%%/pixmaps/flags18x12/ck.png
+%%DATADIR%%/pixmaps/flags18x12/cl.png
+%%DATADIR%%/pixmaps/flags18x12/cm.png
+%%DATADIR%%/pixmaps/flags18x12/cn.png
+%%DATADIR%%/pixmaps/flags18x12/co.png
+%%DATADIR%%/pixmaps/flags18x12/cr.png
+%%DATADIR%%/pixmaps/flags18x12/cs.png
+%%DATADIR%%/pixmaps/flags18x12/cu.png
+%%DATADIR%%/pixmaps/flags18x12/cv.png
+%%DATADIR%%/pixmaps/flags18x12/cx.png
+%%DATADIR%%/pixmaps/flags18x12/cy.png
+%%DATADIR%%/pixmaps/flags18x12/cz.png
+%%DATADIR%%/pixmaps/flags18x12/de.png
+%%DATADIR%%/pixmaps/flags18x12/dj.png
+%%DATADIR%%/pixmaps/flags18x12/dk.png
+%%DATADIR%%/pixmaps/flags18x12/dm.png
+%%DATADIR%%/pixmaps/flags18x12/do.png
+%%DATADIR%%/pixmaps/flags18x12/dz.png
+%%DATADIR%%/pixmaps/flags18x12/ec.png
+%%DATADIR%%/pixmaps/flags18x12/ee.png
+%%DATADIR%%/pixmaps/flags18x12/eg.png
+%%DATADIR%%/pixmaps/flags18x12/eh.png
+%%DATADIR%%/pixmaps/flags18x12/er.png
+%%DATADIR%%/pixmaps/flags18x12/es.png
+%%DATADIR%%/pixmaps/flags18x12/et.png
+%%DATADIR%%/pixmaps/flags18x12/fi.png
+%%DATADIR%%/pixmaps/flags18x12/fj.png
+%%DATADIR%%/pixmaps/flags18x12/fk.png
+%%DATADIR%%/pixmaps/flags18x12/fm.png
+%%DATADIR%%/pixmaps/flags18x12/fo.png
+%%DATADIR%%/pixmaps/flags18x12/fr.png
+%%DATADIR%%/pixmaps/flags18x12/fx.png
+%%DATADIR%%/pixmaps/flags18x12/ga.png
+%%DATADIR%%/pixmaps/flags18x12/gb.png
+%%DATADIR%%/pixmaps/flags18x12/gd.png
+%%DATADIR%%/pixmaps/flags18x12/ge.png
+%%DATADIR%%/pixmaps/flags18x12/gf.png
+%%DATADIR%%/pixmaps/flags18x12/gg.png
+%%DATADIR%%/pixmaps/flags18x12/gh.png
+%%DATADIR%%/pixmaps/flags18x12/gi.png
+%%DATADIR%%/pixmaps/flags18x12/gl.png
+%%DATADIR%%/pixmaps/flags18x12/gm.png
+%%DATADIR%%/pixmaps/flags18x12/gn.png
+%%DATADIR%%/pixmaps/flags18x12/gp.png
+%%DATADIR%%/pixmaps/flags18x12/gq.png
+%%DATADIR%%/pixmaps/flags18x12/gr.png
+%%DATADIR%%/pixmaps/flags18x12/gs.png
+%%DATADIR%%/pixmaps/flags18x12/gt.png
+%%DATADIR%%/pixmaps/flags18x12/gu.png
+%%DATADIR%%/pixmaps/flags18x12/gw.png
+%%DATADIR%%/pixmaps/flags18x12/gy.png
+%%DATADIR%%/pixmaps/flags18x12/hk.png
+%%DATADIR%%/pixmaps/flags18x12/hm.png
+%%DATADIR%%/pixmaps/flags18x12/hn.png
+%%DATADIR%%/pixmaps/flags18x12/hr.png
+%%DATADIR%%/pixmaps/flags18x12/ht.png
+%%DATADIR%%/pixmaps/flags18x12/hu.png
+%%DATADIR%%/pixmaps/flags18x12/id.png
+%%DATADIR%%/pixmaps/flags18x12/ie.png
+%%DATADIR%%/pixmaps/flags18x12/il.png
+%%DATADIR%%/pixmaps/flags18x12/in.png
+%%DATADIR%%/pixmaps/flags18x12/io.png
+%%DATADIR%%/pixmaps/flags18x12/iq.png
+%%DATADIR%%/pixmaps/flags18x12/ir.png
+%%DATADIR%%/pixmaps/flags18x12/is.png
+%%DATADIR%%/pixmaps/flags18x12/it.png
+%%DATADIR%%/pixmaps/flags18x12/je.png
+%%DATADIR%%/pixmaps/flags18x12/jm.png
+%%DATADIR%%/pixmaps/flags18x12/jo.png
+%%DATADIR%%/pixmaps/flags18x12/jp.png
+%%DATADIR%%/pixmaps/flags18x12/ke.png
+%%DATADIR%%/pixmaps/flags18x12/kg.png
+%%DATADIR%%/pixmaps/flags18x12/kh.png
+%%DATADIR%%/pixmaps/flags18x12/ki.png
+%%DATADIR%%/pixmaps/flags18x12/km.png
+%%DATADIR%%/pixmaps/flags18x12/kn.png
+%%DATADIR%%/pixmaps/flags18x12/kp.png
+%%DATADIR%%/pixmaps/flags18x12/kr.png
+%%DATADIR%%/pixmaps/flags18x12/kw.png
+%%DATADIR%%/pixmaps/flags18x12/ky.png
+%%DATADIR%%/pixmaps/flags18x12/kz.png
+%%DATADIR%%/pixmaps/flags18x12/la.png
+%%DATADIR%%/pixmaps/flags18x12/lb.png
+%%DATADIR%%/pixmaps/flags18x12/lc.png
+%%DATADIR%%/pixmaps/flags18x12/li.png
+%%DATADIR%%/pixmaps/flags18x12/lk.png
+%%DATADIR%%/pixmaps/flags18x12/lr.png
+%%DATADIR%%/pixmaps/flags18x12/ls.png
+%%DATADIR%%/pixmaps/flags18x12/lt.png
+%%DATADIR%%/pixmaps/flags18x12/lu.png
+%%DATADIR%%/pixmaps/flags18x12/lv.png
+%%DATADIR%%/pixmaps/flags18x12/ly.png
+%%DATADIR%%/pixmaps/flags18x12/ma.png
+%%DATADIR%%/pixmaps/flags18x12/mc.png
+%%DATADIR%%/pixmaps/flags18x12/md.png
+%%DATADIR%%/pixmaps/flags18x12/me.png
+%%DATADIR%%/pixmaps/flags18x12/mg.png
+%%DATADIR%%/pixmaps/flags18x12/mh.png
+%%DATADIR%%/pixmaps/flags18x12/mk.png
+%%DATADIR%%/pixmaps/flags18x12/ml.png
+%%DATADIR%%/pixmaps/flags18x12/mm.png
+%%DATADIR%%/pixmaps/flags18x12/mn.png
+%%DATADIR%%/pixmaps/flags18x12/mo.png
+%%DATADIR%%/pixmaps/flags18x12/mp.png
+%%DATADIR%%/pixmaps/flags18x12/mq.png
+%%DATADIR%%/pixmaps/flags18x12/mr.png
+%%DATADIR%%/pixmaps/flags18x12/ms.png
+%%DATADIR%%/pixmaps/flags18x12/mt.png
+%%DATADIR%%/pixmaps/flags18x12/mu.png
+%%DATADIR%%/pixmaps/flags18x12/mv.png
+%%DATADIR%%/pixmaps/flags18x12/mw.png
+%%DATADIR%%/pixmaps/flags18x12/mx.png
+%%DATADIR%%/pixmaps/flags18x12/my.png
+%%DATADIR%%/pixmaps/flags18x12/mz.png
+%%DATADIR%%/pixmaps/flags18x12/na.png
+%%DATADIR%%/pixmaps/flags18x12/nc.png
+%%DATADIR%%/pixmaps/flags18x12/ne.png
+%%DATADIR%%/pixmaps/flags18x12/nf.png
+%%DATADIR%%/pixmaps/flags18x12/ng.png
+%%DATADIR%%/pixmaps/flags18x12/ni.png
+%%DATADIR%%/pixmaps/flags18x12/nl.png
+%%DATADIR%%/pixmaps/flags18x12/no.png
+%%DATADIR%%/pixmaps/flags18x12/np.png
+%%DATADIR%%/pixmaps/flags18x12/nr.png
+%%DATADIR%%/pixmaps/flags18x12/nu.png
+%%DATADIR%%/pixmaps/flags18x12/nz.png
+%%DATADIR%%/pixmaps/flags18x12/om.png
+%%DATADIR%%/pixmaps/flags18x12/pa.png
+%%DATADIR%%/pixmaps/flags18x12/pe.png
+%%DATADIR%%/pixmaps/flags18x12/pf.png
+%%DATADIR%%/pixmaps/flags18x12/pg.png
+%%DATADIR%%/pixmaps/flags18x12/ph.png
+%%DATADIR%%/pixmaps/flags18x12/pk.png
+%%DATADIR%%/pixmaps/flags18x12/pl.png
+%%DATADIR%%/pixmaps/flags18x12/pm.png
+%%DATADIR%%/pixmaps/flags18x12/pn.png
+%%DATADIR%%/pixmaps/flags18x12/pr.png
+%%DATADIR%%/pixmaps/flags18x12/ps.png
+%%DATADIR%%/pixmaps/flags18x12/pt.png
+%%DATADIR%%/pixmaps/flags18x12/pw.png
+%%DATADIR%%/pixmaps/flags18x12/py.png
+%%DATADIR%%/pixmaps/flags18x12/qa.png
+%%DATADIR%%/pixmaps/flags18x12/re.png
+%%DATADIR%%/pixmaps/flags18x12/ro.png
+%%DATADIR%%/pixmaps/flags18x12/rs.png
+%%DATADIR%%/pixmaps/flags18x12/ru.png
+%%DATADIR%%/pixmaps/flags18x12/rw.png
+%%DATADIR%%/pixmaps/flags18x12/sa.png
+%%DATADIR%%/pixmaps/flags18x12/sb.png
+%%DATADIR%%/pixmaps/flags18x12/sc.png
+%%DATADIR%%/pixmaps/flags18x12/sd.png
+%%DATADIR%%/pixmaps/flags18x12/se.png
+%%DATADIR%%/pixmaps/flags18x12/sg.png
+%%DATADIR%%/pixmaps/flags18x12/sh.png
+%%DATADIR%%/pixmaps/flags18x12/si.png
+%%DATADIR%%/pixmaps/flags18x12/sj.png
+%%DATADIR%%/pixmaps/flags18x12/sk.png
+%%DATADIR%%/pixmaps/flags18x12/sl.png
+%%DATADIR%%/pixmaps/flags18x12/sm.png
+%%DATADIR%%/pixmaps/flags18x12/sn.png
+%%DATADIR%%/pixmaps/flags18x12/so.png
+%%DATADIR%%/pixmaps/flags18x12/sr.png
+%%DATADIR%%/pixmaps/flags18x12/st.png
+%%DATADIR%%/pixmaps/flags18x12/sv.png
+%%DATADIR%%/pixmaps/flags18x12/sy.png
+%%DATADIR%%/pixmaps/flags18x12/sz.png
+%%DATADIR%%/pixmaps/flags18x12/tc.png
+%%DATADIR%%/pixmaps/flags18x12/td.png
+%%DATADIR%%/pixmaps/flags18x12/tf.png
+%%DATADIR%%/pixmaps/flags18x12/tg.png
+%%DATADIR%%/pixmaps/flags18x12/th.png
+%%DATADIR%%/pixmaps/flags18x12/tj.png
+%%DATADIR%%/pixmaps/flags18x12/tk.png
+%%DATADIR%%/pixmaps/flags18x12/tl.png
+%%DATADIR%%/pixmaps/flags18x12/tm.png
+%%DATADIR%%/pixmaps/flags18x12/tn.png
+%%DATADIR%%/pixmaps/flags18x12/to.png
+%%DATADIR%%/pixmaps/flags18x12/tp.png
+%%DATADIR%%/pixmaps/flags18x12/tr.png
+%%DATADIR%%/pixmaps/flags18x12/tt.png
+%%DATADIR%%/pixmaps/flags18x12/tv.png
+%%DATADIR%%/pixmaps/flags18x12/tw.png
+%%DATADIR%%/pixmaps/flags18x12/tz.png
+%%DATADIR%%/pixmaps/flags18x12/ua.png
+%%DATADIR%%/pixmaps/flags18x12/ug.png
+%%DATADIR%%/pixmaps/flags18x12/um.png
+%%DATADIR%%/pixmaps/flags18x12/us.png
+%%DATADIR%%/pixmaps/flags18x12/uy.png
+%%DATADIR%%/pixmaps/flags18x12/uz.png
+%%DATADIR%%/pixmaps/flags18x12/va.png
+%%DATADIR%%/pixmaps/flags18x12/vc.png
+%%DATADIR%%/pixmaps/flags18x12/ve.png
+%%DATADIR%%/pixmaps/flags18x12/vg.png
+%%DATADIR%%/pixmaps/flags18x12/vi.png
+%%DATADIR%%/pixmaps/flags18x12/vn.png
+%%DATADIR%%/pixmaps/flags18x12/vu.png
+%%DATADIR%%/pixmaps/flags18x12/wf.png
+%%DATADIR%%/pixmaps/flags18x12/ws.png
+%%DATADIR%%/pixmaps/flags18x12/ye.png
+%%DATADIR%%/pixmaps/flags18x12/yt.png
+%%DATADIR%%/pixmaps/flags18x12/yu.png
+%%DATADIR%%/pixmaps/flags18x12/za.png
+%%DATADIR%%/pixmaps/flags18x12/zm.png
+%%DATADIR%%/pixmaps/flags18x12/zw.png
+%%DATADIR%%/pixmaps/flags25x15/ad.png
+%%DATADIR%%/pixmaps/flags25x15/ae.png
+%%DATADIR%%/pixmaps/flags25x15/af.png
+%%DATADIR%%/pixmaps/flags25x15/ag.png
+%%DATADIR%%/pixmaps/flags25x15/ai.png
+%%DATADIR%%/pixmaps/flags25x15/al.png
+%%DATADIR%%/pixmaps/flags25x15/am.png
+%%DATADIR%%/pixmaps/flags25x15/an.png
+%%DATADIR%%/pixmaps/flags25x15/ao.png
+%%DATADIR%%/pixmaps/flags25x15/aq.png
+%%DATADIR%%/pixmaps/flags25x15/ar.png
+%%DATADIR%%/pixmaps/flags25x15/as.png
+%%DATADIR%%/pixmaps/flags25x15/at.png
+%%DATADIR%%/pixmaps/flags25x15/au.png
+%%DATADIR%%/pixmaps/flags25x15/aw.png
+%%DATADIR%%/pixmaps/flags25x15/ax.png
+%%DATADIR%%/pixmaps/flags25x15/az.png
+%%DATADIR%%/pixmaps/flags25x15/ba.png
+%%DATADIR%%/pixmaps/flags25x15/bb.png
+%%DATADIR%%/pixmaps/flags25x15/bd.png
+%%DATADIR%%/pixmaps/flags25x15/be.png
+%%DATADIR%%/pixmaps/flags25x15/bf.png
+%%DATADIR%%/pixmaps/flags25x15/bg.png
+%%DATADIR%%/pixmaps/flags25x15/bh.png
+%%DATADIR%%/pixmaps/flags25x15/bi.png
+%%DATADIR%%/pixmaps/flags25x15/bj.png
+%%DATADIR%%/pixmaps/flags25x15/bm.png
+%%DATADIR%%/pixmaps/flags25x15/bn.png
+%%DATADIR%%/pixmaps/flags25x15/bo.png
+%%DATADIR%%/pixmaps/flags25x15/br.png
+%%DATADIR%%/pixmaps/flags25x15/bs.png
+%%DATADIR%%/pixmaps/flags25x15/bt.png
+%%DATADIR%%/pixmaps/flags25x15/bv.png
+%%DATADIR%%/pixmaps/flags25x15/bw.png
+%%DATADIR%%/pixmaps/flags25x15/by.png
+%%DATADIR%%/pixmaps/flags25x15/bz.png
+%%DATADIR%%/pixmaps/flags25x15/ca.png
+%%DATADIR%%/pixmaps/flags25x15/cc.png
+%%DATADIR%%/pixmaps/flags25x15/cd.png
+%%DATADIR%%/pixmaps/flags25x15/cf.png
+%%DATADIR%%/pixmaps/flags25x15/cg.png
+%%DATADIR%%/pixmaps/flags25x15/ch.png
+%%DATADIR%%/pixmaps/flags25x15/ci.png
+%%DATADIR%%/pixmaps/flags25x15/ck.png
+%%DATADIR%%/pixmaps/flags25x15/cl.png
+%%DATADIR%%/pixmaps/flags25x15/cm.png
+%%DATADIR%%/pixmaps/flags25x15/cn.png
+%%DATADIR%%/pixmaps/flags25x15/co.png
+%%DATADIR%%/pixmaps/flags25x15/cr.png
+%%DATADIR%%/pixmaps/flags25x15/cs.png
+%%DATADIR%%/pixmaps/flags25x15/cu.png
+%%DATADIR%%/pixmaps/flags25x15/cv.png
+%%DATADIR%%/pixmaps/flags25x15/cx.png
+%%DATADIR%%/pixmaps/flags25x15/cy.png
+%%DATADIR%%/pixmaps/flags25x15/cz.png
+%%DATADIR%%/pixmaps/flags25x15/de.png
+%%DATADIR%%/pixmaps/flags25x15/dj.png
+%%DATADIR%%/pixmaps/flags25x15/dk.png
+%%DATADIR%%/pixmaps/flags25x15/dm.png
+%%DATADIR%%/pixmaps/flags25x15/do.png
+%%DATADIR%%/pixmaps/flags25x15/dz.png
+%%DATADIR%%/pixmaps/flags25x15/ec.png
+%%DATADIR%%/pixmaps/flags25x15/ee.png
+%%DATADIR%%/pixmaps/flags25x15/eg.png
+%%DATADIR%%/pixmaps/flags25x15/eh.png
+%%DATADIR%%/pixmaps/flags25x15/er.png
+%%DATADIR%%/pixmaps/flags25x15/es.png
+%%DATADIR%%/pixmaps/flags25x15/et.png
+%%DATADIR%%/pixmaps/flags25x15/fi.png
+%%DATADIR%%/pixmaps/flags25x15/fj.png
+%%DATADIR%%/pixmaps/flags25x15/fk.png
+%%DATADIR%%/pixmaps/flags25x15/fm.png
+%%DATADIR%%/pixmaps/flags25x15/fo.png
+%%DATADIR%%/pixmaps/flags25x15/fr.png
+%%DATADIR%%/pixmaps/flags25x15/fx.png
+%%DATADIR%%/pixmaps/flags25x15/ga.png
+%%DATADIR%%/pixmaps/flags25x15/gb.png
+%%DATADIR%%/pixmaps/flags25x15/gd.png
+%%DATADIR%%/pixmaps/flags25x15/ge.png
+%%DATADIR%%/pixmaps/flags25x15/gf.png
+%%DATADIR%%/pixmaps/flags25x15/gg.png
+%%DATADIR%%/pixmaps/flags25x15/gh.png
+%%DATADIR%%/pixmaps/flags25x15/gi.png
+%%DATADIR%%/pixmaps/flags25x15/gl.png
+%%DATADIR%%/pixmaps/flags25x15/gm.png
+%%DATADIR%%/pixmaps/flags25x15/gn.png
+%%DATADIR%%/pixmaps/flags25x15/gp.png
+%%DATADIR%%/pixmaps/flags25x15/gq.png
+%%DATADIR%%/pixmaps/flags25x15/gr.png
+%%DATADIR%%/pixmaps/flags25x15/gs.png
+%%DATADIR%%/pixmaps/flags25x15/gt.png
+%%DATADIR%%/pixmaps/flags25x15/gu.png
+%%DATADIR%%/pixmaps/flags25x15/gw.png
+%%DATADIR%%/pixmaps/flags25x15/gy.png
+%%DATADIR%%/pixmaps/flags25x15/hk.png
+%%DATADIR%%/pixmaps/flags25x15/hm.png
+%%DATADIR%%/pixmaps/flags25x15/hn.png
+%%DATADIR%%/pixmaps/flags25x15/hr.png
+%%DATADIR%%/pixmaps/flags25x15/ht.png
+%%DATADIR%%/pixmaps/flags25x15/hu.png
+%%DATADIR%%/pixmaps/flags25x15/id.png
+%%DATADIR%%/pixmaps/flags25x15/ie.png
+%%DATADIR%%/pixmaps/flags25x15/il.png
+%%DATADIR%%/pixmaps/flags25x15/in.png
+%%DATADIR%%/pixmaps/flags25x15/io.png
+%%DATADIR%%/pixmaps/flags25x15/iq.png
+%%DATADIR%%/pixmaps/flags25x15/ir.png
+%%DATADIR%%/pixmaps/flags25x15/is.png
+%%DATADIR%%/pixmaps/flags25x15/it.png
+%%DATADIR%%/pixmaps/flags25x15/je.png
+%%DATADIR%%/pixmaps/flags25x15/jm.png
+%%DATADIR%%/pixmaps/flags25x15/jo.png
+%%DATADIR%%/pixmaps/flags25x15/jp.png
+%%DATADIR%%/pixmaps/flags25x15/ke.png
+%%DATADIR%%/pixmaps/flags25x15/kg.png
+%%DATADIR%%/pixmaps/flags25x15/kh.png
+%%DATADIR%%/pixmaps/flags25x15/ki.png
+%%DATADIR%%/pixmaps/flags25x15/km.png
+%%DATADIR%%/pixmaps/flags25x15/kn.png
+%%DATADIR%%/pixmaps/flags25x15/kp.png
+%%DATADIR%%/pixmaps/flags25x15/kr.png
+%%DATADIR%%/pixmaps/flags25x15/kw.png
+%%DATADIR%%/pixmaps/flags25x15/ky.png
+%%DATADIR%%/pixmaps/flags25x15/kz.png
+%%DATADIR%%/pixmaps/flags25x15/la.png
+%%DATADIR%%/pixmaps/flags25x15/lb.png
+%%DATADIR%%/pixmaps/flags25x15/lc.png
+%%DATADIR%%/pixmaps/flags25x15/li.png
+%%DATADIR%%/pixmaps/flags25x15/lk.png
+%%DATADIR%%/pixmaps/flags25x15/lr.png
+%%DATADIR%%/pixmaps/flags25x15/ls.png
+%%DATADIR%%/pixmaps/flags25x15/lt.png
+%%DATADIR%%/pixmaps/flags25x15/lu.png
+%%DATADIR%%/pixmaps/flags25x15/lv.png
+%%DATADIR%%/pixmaps/flags25x15/ly.png
+%%DATADIR%%/pixmaps/flags25x15/ma.png
+%%DATADIR%%/pixmaps/flags25x15/mc.png
+%%DATADIR%%/pixmaps/flags25x15/md.png
+%%DATADIR%%/pixmaps/flags25x15/me.png
+%%DATADIR%%/pixmaps/flags25x15/mg.png
+%%DATADIR%%/pixmaps/flags25x15/mh.png
+%%DATADIR%%/pixmaps/flags25x15/mk.png
+%%DATADIR%%/pixmaps/flags25x15/ml.png
+%%DATADIR%%/pixmaps/flags25x15/mm.png
+%%DATADIR%%/pixmaps/flags25x15/mn.png
+%%DATADIR%%/pixmaps/flags25x15/mo.png
+%%DATADIR%%/pixmaps/flags25x15/mp.png
+%%DATADIR%%/pixmaps/flags25x15/mq.png
+%%DATADIR%%/pixmaps/flags25x15/mr.png
+%%DATADIR%%/pixmaps/flags25x15/ms.png
+%%DATADIR%%/pixmaps/flags25x15/mt.png
+%%DATADIR%%/pixmaps/flags25x15/mu.png
+%%DATADIR%%/pixmaps/flags25x15/mv.png
+%%DATADIR%%/pixmaps/flags25x15/mw.png
+%%DATADIR%%/pixmaps/flags25x15/mx.png
+%%DATADIR%%/pixmaps/flags25x15/my.png
+%%DATADIR%%/pixmaps/flags25x15/mz.png
+%%DATADIR%%/pixmaps/flags25x15/na.png
+%%DATADIR%%/pixmaps/flags25x15/nc.png
+%%DATADIR%%/pixmaps/flags25x15/ne.png
+%%DATADIR%%/pixmaps/flags25x15/nf.png
+%%DATADIR%%/pixmaps/flags25x15/ng.png
+%%DATADIR%%/pixmaps/flags25x15/ni.png
+%%DATADIR%%/pixmaps/flags25x15/nl.png
+%%DATADIR%%/pixmaps/flags25x15/no.png
+%%DATADIR%%/pixmaps/flags25x15/np.png
+%%DATADIR%%/pixmaps/flags25x15/nr.png
+%%DATADIR%%/pixmaps/flags25x15/nu.png
+%%DATADIR%%/pixmaps/flags25x15/nz.png
+%%DATADIR%%/pixmaps/flags25x15/om.png
+%%DATADIR%%/pixmaps/flags25x15/pa.png
+%%DATADIR%%/pixmaps/flags25x15/pe.png
+%%DATADIR%%/pixmaps/flags25x15/pf.png
+%%DATADIR%%/pixmaps/flags25x15/pg.png
+%%DATADIR%%/pixmaps/flags25x15/ph.png
+%%DATADIR%%/pixmaps/flags25x15/pk.png
+%%DATADIR%%/pixmaps/flags25x15/pl.png
+%%DATADIR%%/pixmaps/flags25x15/pm.png
+%%DATADIR%%/pixmaps/flags25x15/pn.png
+%%DATADIR%%/pixmaps/flags25x15/pr.png
+%%DATADIR%%/pixmaps/flags25x15/ps.png
+%%DATADIR%%/pixmaps/flags25x15/pt.png
+%%DATADIR%%/pixmaps/flags25x15/pw.png
+%%DATADIR%%/pixmaps/flags25x15/py.png
+%%DATADIR%%/pixmaps/flags25x15/qa.png
+%%DATADIR%%/pixmaps/flags25x15/re.png
+%%DATADIR%%/pixmaps/flags25x15/ro.png
+%%DATADIR%%/pixmaps/flags25x15/rs.png
+%%DATADIR%%/pixmaps/flags25x15/ru.png
+%%DATADIR%%/pixmaps/flags25x15/rw.png
+%%DATADIR%%/pixmaps/flags25x15/sa.png
+%%DATADIR%%/pixmaps/flags25x15/sb.png
+%%DATADIR%%/pixmaps/flags25x15/sc.png
+%%DATADIR%%/pixmaps/flags25x15/sd.png
+%%DATADIR%%/pixmaps/flags25x15/se.png
+%%DATADIR%%/pixmaps/flags25x15/sg.png
+%%DATADIR%%/pixmaps/flags25x15/sh.png
+%%DATADIR%%/pixmaps/flags25x15/si.png
+%%DATADIR%%/pixmaps/flags25x15/sj.png
+%%DATADIR%%/pixmaps/flags25x15/sk.png
+%%DATADIR%%/pixmaps/flags25x15/sl.png
+%%DATADIR%%/pixmaps/flags25x15/sm.png
+%%DATADIR%%/pixmaps/flags25x15/sn.png
+%%DATADIR%%/pixmaps/flags25x15/so.png
+%%DATADIR%%/pixmaps/flags25x15/sr.png
+%%DATADIR%%/pixmaps/flags25x15/st.png
+%%DATADIR%%/pixmaps/flags25x15/sv.png
+%%DATADIR%%/pixmaps/flags25x15/sy.png
+%%DATADIR%%/pixmaps/flags25x15/sz.png
+%%DATADIR%%/pixmaps/flags25x15/tc.png
+%%DATADIR%%/pixmaps/flags25x15/td.png
+%%DATADIR%%/pixmaps/flags25x15/tf.png
+%%DATADIR%%/pixmaps/flags25x15/tg.png
+%%DATADIR%%/pixmaps/flags25x15/th.png
+%%DATADIR%%/pixmaps/flags25x15/tj.png
+%%DATADIR%%/pixmaps/flags25x15/tk.png
+%%DATADIR%%/pixmaps/flags25x15/tl.png
+%%DATADIR%%/pixmaps/flags25x15/tm.png
+%%DATADIR%%/pixmaps/flags25x15/tn.png
+%%DATADIR%%/pixmaps/flags25x15/to.png
+%%DATADIR%%/pixmaps/flags25x15/tp.png
+%%DATADIR%%/pixmaps/flags25x15/tr.png
+%%DATADIR%%/pixmaps/flags25x15/tt.png
+%%DATADIR%%/pixmaps/flags25x15/tv.png
+%%DATADIR%%/pixmaps/flags25x15/tw.png
+%%DATADIR%%/pixmaps/flags25x15/tz.png
+%%DATADIR%%/pixmaps/flags25x15/ua.png
+%%DATADIR%%/pixmaps/flags25x15/ug.png
+%%DATADIR%%/pixmaps/flags25x15/um.png
+%%DATADIR%%/pixmaps/flags25x15/us.png
+%%DATADIR%%/pixmaps/flags25x15/uy.png
+%%DATADIR%%/pixmaps/flags25x15/uz.png
+%%DATADIR%%/pixmaps/flags25x15/va.png
+%%DATADIR%%/pixmaps/flags25x15/vc.png
+%%DATADIR%%/pixmaps/flags25x15/ve.png
+%%DATADIR%%/pixmaps/flags25x15/vg.png
+%%DATADIR%%/pixmaps/flags25x15/vi.png
+%%DATADIR%%/pixmaps/flags25x15/vn.png
+%%DATADIR%%/pixmaps/flags25x15/vu.png
+%%DATADIR%%/pixmaps/flags25x15/wf.png
+%%DATADIR%%/pixmaps/flags25x15/ws.png
+%%DATADIR%%/pixmaps/flags25x15/ye.png
+%%DATADIR%%/pixmaps/flags25x15/yt.png
+%%DATADIR%%/pixmaps/flags25x15/yu.png
+%%DATADIR%%/pixmaps/flags25x15/za.png
+%%DATADIR%%/pixmaps/flags25x15/zm.png
+%%DATADIR%%/pixmaps/flags25x15/zw.png
 %%DATADIR%%/pixmaps/inactive16.png
 %%DATADIR%%/pixmaps/seeding16.png
 %%DATADIR%%/plugins/BlocklistImport/__init__.py
@@ -325,27 +575,32 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/EventLogging/__init__.py
 %%DATADIR%%/plugins/EventLogging/event_logging_preferences.glade
 %%DATADIR%%/plugins/EventLogging/tab_log.py
+%%DATADIR%%/plugins/ExtraStats/__init__.py
+%%DATADIR%%/plugins/ExtraStats/stats_preferences.glade
 %%DATADIR%%/plugins/Locations/__init__.py
 %%DATADIR%%/plugins/Locations/plugin.py
 %%DATADIR%%/plugins/NetworkGraph/__init__.py
 %%DATADIR%%/plugins/NetworkGraph/tab_graph.py
 %%DATADIR%%/plugins/NetworkHealth/__init__.py
 %%DATADIR%%/plugins/NetworkHealth/plugin.py
-%%DATADIR%%/plugins/RSS/__init__.py
-%%DATADIR%%/plugins/RSS/feedparser.py
-%%DATADIR%%/plugins/RSS/plugin.py
-%%DATADIR%%/plugins/RSS/rss.glade
-%%DATADIR%%/plugins/RSS/rss.png
+%%DATADIR%%/plugins/SimpleRSS/__init__.py
+%%DATADIR%%/plugins/SimpleRSS/feedparser.py
+%%DATADIR%%/plugins/SimpleRSS/plugin.py
+%%DATADIR%%/plugins/SimpleRSS/rss.glade
+%%DATADIR%%/plugins/SimpleRSS/rss.png
 %%DATADIR%%/plugins/SpeedLimiter/__init__.py
 %%DATADIR%%/plugins/TorrentCreator/__init__.py
 %%DATADIR%%/plugins/TorrentCreator/torrentcreator.glade
 %%DATADIR%%/plugins/TorrentFiles/__init__.py
+%%DATADIR%%/plugins/TorrentFiles/files_preferences.glade
 %%DATADIR%%/plugins/TorrentFiles/tab_files.py
 %%DATADIR%%/plugins/TorrentNotification/__init__.py
 %%DATADIR%%/plugins/TorrentNotification/notification_preferences.glade
 %%DATADIR%%/plugins/TorrentPeers/__init__.py
+%%DATADIR%%/plugins/TorrentPeers/peers_preferences.glade
 %%DATADIR%%/plugins/TorrentPeers/tab_peers.py
 %%DATADIR%%/plugins/TorrentPieces/__init__.py
+%%DATADIR%%/plugins/TorrentPieces/pieces_preferences.glade
 %%DATADIR%%/plugins/TorrentPieces/tab_pieces.py
 %%DATADIR%%/plugins/TorrentSearch/__init__.py
 %%DATADIR%%/plugins/TorrentSearch/plugin.py
@@ -415,15 +670,17 @@ share/pixmaps/deluge.png
 @dirrm %%DATADIR%%/plugins/TorrentFiles
 @dirrm %%DATADIR%%/plugins/TorrentCreator
 @dirrm %%DATADIR%%/plugins/SpeedLimiter
-@dirrm %%DATADIR%%/plugins/RSS
+@dirrm %%DATADIR%%/plugins/SimpleRSS
 @dirrm %%DATADIR%%/plugins/NetworkHealth
 @dirrm %%DATADIR%%/plugins/NetworkGraph
 @dirrm %%DATADIR%%/plugins/Locations
+@dirrm %%DATADIR%%/plugins/ExtraStats
 @dirrm %%DATADIR%%/plugins/EventLogging
 @dirrm %%DATADIR%%/plugins/DesiredRatio
 @dirrm %%DATADIR%%/plugins/BlocklistImport
 @dirrmtry %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/pixmaps/flags
+@dirrm %%DATADIR%%/pixmaps/flags25x15
+@dirrm %%DATADIR%%/pixmaps/flags18x12
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/glade
 @dirrmtry %%DATADIR%%