4 files changed, 160 insertions, 597 deletions

diff --git a/games/kgeography/Makefile b/games/kgeography/Makefile
index b41d6240a598..ffcf218242a5 100644
--- a/games/kgeography/Makefile
+++ b/games/kgeography/Makefile
@@ -4,25 +4,17 @@
 #
 # $FreeBSD$
 
-PORTNAME=		kgeography
-PORTVERSION=	0.2
-CATEGORIES=		games kde
+PORTNAME=	kgeography
+PORTVERSION=	0.3
+CATEGORIES=	games kde
 MASTER_SITES=	http://download.berlios.de/kgeography/
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Geography learning tool
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Geography learning tool
 
-USE_BZIP2=			yes
+USE_BZIP2=	yes
 USE_KDELIBS_VER=	3
-GNU_CONFIGURE=		yes
-USE_GMAKE=			yes
-USE_REINPLACE=		yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-EXTRA_PATCHES=	${PORTSDIR}/x11/kde3/files/extrapatch-configure
-
-post-patch:
-	${REINPLACE_CMD} -e "s,xx,," ${WRKSRC}/po/Makefile.in
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/kgeography/distinfo b/games/kgeography/distinfo
index 6886d57f7708..dd114706a410 100644
--- a/games/kgeography/distinfo
+++ b/games/kgeography/distinfo
@@ -1,2 +1,2 @@
-MD5 (kgeography-0.2.tar.bz2) = 7f863fd938eb9851cb6865aa8127b0d7
-SIZE (kgeography-0.2.tar.bz2) = 1414083
+MD5 (kgeography-0.3.tar.bz2) = 9dc7d0db4a0c2459aa6a01b57b0cabf2
+SIZE (kgeography-0.3.tar.bz2) = 1491003
diff --git a/games/kgeography/files/patch-map-rename b/games/kgeography/files/patch-map-rename
deleted file mode 100644
index a2f84c9a0ac8..000000000000
--- a/games/kgeography/files/patch-map-rename
+++ /dev/null
@@ -1,466 +0,0 @@
-diff -u kgeography/src.orig/askwidget.cpp kgeography/src/askwidget.cpp
---- kgeography/src.orig/askwidget.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/askwidget.cpp	Thu Dec  2 16:15:02 2004
-@@ -16,7 +16,7 @@
- #include "askwidget.h"
- #include "map.h"
- 
--askWidget::askWidget(QWidget *parent, map *m, QWidget *w, uint count, bool showLabel) : QWidget(parent), p_map(m), p_count(count)
-+askWidget::askWidget(QWidget *parent, kgeomap *m, QWidget *w, uint count, bool showLabel) : QWidget(parent), p_map(m), p_count(count)
- {
- 	if (showLabel)
- 	{
-diff -u kgeography/src.orig/askwidget.h kgeography/src/askwidget.h
---- kgeography/src.orig/askwidget.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/askwidget.h	Thu Dec  2 15:53:30 2004
-@@ -15,13 +15,13 @@
- 
- class QLabel;
- 
--class map;
-+class kgeomap;
- 
- class askWidget : public QWidget
- {
- Q_OBJECT
- 	public:
--		askWidget(QWidget *parent, map *m, QWidget *w, uint count, bool showLabel = true);
-+		askWidget(QWidget *parent, kgeomap *m, QWidget *w, uint count, bool showLabel = true);
- 		virtual ~askWidget();
- 		
- 		void showAnswersMessageBox();
-@@ -44,7 +44,7 @@
- 		void questionAnswered(bool wasCorrect);
- 		void resetAnswers();
- 	
--		map *p_map;
-+		kgeomap *p_map;
- 	
- 	private:
- 		void updateLabel();
-diff -u kgeography/src.orig/boxasker.cpp kgeography/src/boxasker.cpp
---- kgeography/src.orig/boxasker.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/boxasker.cpp	Thu Dec  2 16:17:20 2004
-@@ -22,7 +22,7 @@
- #include "boxasker.h"
- #include "map.h"
- 
--boxAsker::boxAsker(QWidget *parent, map *m, QWidget *w, uint count) : askWidget(parent, m, w, count)
-+boxAsker::boxAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count) : askWidget(parent, m, w, count)
- {
- 	p_lay = new QVBoxLayout(this);
- 	
-diff -u kgeography/src.orig/boxasker.h kgeography/src/boxasker.h
---- kgeography/src.orig/boxasker.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/boxasker.h	Thu Dec  2 15:54:16 2004
-@@ -23,7 +23,7 @@
- {
- Q_OBJECT
- 	public:
--		boxAsker(QWidget *parent, map *m, QWidget *w, uint count);
-+		boxAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count);
- 		~boxAsker();
- 	
- 	protected:
-diff -u kgeography/src.orig/capitaldivisionasker.cpp kgeography/src/capitaldivisionasker.cpp
---- kgeography/src.orig/capitaldivisionasker.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/capitaldivisionasker.cpp	Thu Dec  2 16:16:32 2004
-@@ -15,7 +15,7 @@
- #include "capitaldivisionasker.h"
- #include "map.h"
- 
--capitalDivisionAsker::capitalDivisionAsker(QWidget *parent, map *m, QWidget *w, uint count) : boxAsker(parent, m, w, count)
-+capitalDivisionAsker::capitalDivisionAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count) : boxAsker(parent, m, w, count)
- {
- 	init();
- }
-diff -u kgeography/src.orig/capitaldivisionasker.h kgeography/src/capitaldivisionasker.h
---- kgeography/src.orig/capitaldivisionasker.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/capitaldivisionasker.h	Thu Dec  2 16:08:56 2004
-@@ -18,7 +18,7 @@
- class capitalDivisionAsker : public boxAsker
- {
- 	public:
--		capitalDivisionAsker(QWidget *parent, map *m, QWidget *w, uint count);
-+		capitalDivisionAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count);
- 
- 	protected:
- 		void nextBoxAskerQuestionHook(QString division, int i, bool isAnswer);
-diff -u kgeography/src.orig/divisioncapitalasker.cpp kgeography/src/divisioncapitalasker.cpp
---- kgeography/src.orig/divisioncapitalasker.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/divisioncapitalasker.cpp	Thu Dec  2 16:16:55 2004
-@@ -15,7 +15,7 @@
- #include "divisioncapitalasker.h"
- #include "map.h"
- 
--divisionCapitalAsker::divisionCapitalAsker(QWidget *parent, map *m, QWidget *w, uint count) : boxAsker(parent, m, w, count)
-+divisionCapitalAsker::divisionCapitalAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count) : boxAsker(parent, m, w, count)
- {
- 	init();
- }
-diff -u kgeography/src.orig/divisioncapitalasker.h kgeography/src/divisioncapitalasker.h
---- kgeography/src.orig/divisioncapitalasker.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/divisioncapitalasker.h	Thu Dec  2 16:09:20 2004
-@@ -16,7 +16,7 @@
- class divisionCapitalAsker : public boxAsker
- {
- 	public:
--		divisionCapitalAsker(QWidget *parent, map *m, QWidget *w, uint count);
-+		divisionCapitalAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count);
- 
- 	protected:
- 		void nextBoxAskerQuestionHook(QString division, int i, bool isAnswer);
-diff -u kgeography/src.orig/divisionflagasker.cpp kgeography/src/divisionflagasker.cpp
---- kgeography/src.orig/divisionflagasker.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/divisionflagasker.cpp	Thu Dec  2 16:17:51 2004
-@@ -16,7 +16,7 @@
- #include "divisionflagasker.h"
- #include "map.h"
- 
--divisionFlagAsker::divisionFlagAsker(QWidget *parent, map *m, QWidget *w, uint count) : boxAsker(parent, m, w, count)
-+divisionFlagAsker::divisionFlagAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count) : boxAsker(parent, m, w, count)
- {
- 	init();
- }
-diff -u kgeography/src.orig/divisionflagasker.h kgeography/src/divisionflagasker.h
---- kgeography/src.orig/divisionflagasker.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/divisionflagasker.h	Thu Dec  2 16:09:43 2004
-@@ -16,7 +16,7 @@
- class divisionFlagAsker : public boxAsker
- {
- 	public:
--		divisionFlagAsker(QWidget *parent, map *m, QWidget *w, uint count);
-+		divisionFlagAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count);
- 	
- 	protected:
- 		void nextBoxAskerQuestionHook(QString division, int i, bool isAnswer);
-diff -u kgeography/src.orig/flagdivisionasker.cpp kgeography/src/flagdivisionasker.cpp
---- kgeography/src.orig/flagdivisionasker.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/flagdivisionasker.cpp	Thu Dec  2 16:14:32 2004
-@@ -17,7 +17,7 @@
- #include "flagdivisionasker.h"
- #include "map.h"
- 
--flagDivisionAsker::flagDivisionAsker(QWidget *parent, map *m, QWidget *w, uint count) : boxAsker(parent, m, w, count)
-+flagDivisionAsker::flagDivisionAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count) : boxAsker(parent, m, w, count)
- {
- 	p_flag = new QWidget(this);
- 	p_lay -> insertWidget(0, p_flag);
-diff -u kgeography/src.orig/flagdivisionasker.h kgeography/src/flagdivisionasker.h
---- kgeography/src.orig/flagdivisionasker.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/flagdivisionasker.h	Thu Dec  2 16:10:07 2004
-@@ -16,7 +16,7 @@
- class flagDivisionAsker : public boxAsker
- {
- 	public:
--		flagDivisionAsker(QWidget *parent, map *m, QWidget *w, uint count);
-+		flagDivisionAsker(QWidget *parent, kgeomap *m, QWidget *w, uint count);
- 	
- 	protected:
- 		void cleanHook();
-diff -u kgeography/src.orig/kgeography.cpp kgeography/src/kgeography.cpp
---- kgeography/src.orig/kgeography.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/kgeography.cpp	Thu Dec  2 16:12:37 2004
-@@ -232,7 +232,7 @@
- 	connect(p_move, SIGNAL(toggled(bool)), p_askWidget, SLOT(setMovement(bool)));
- }
- 
--void kgeography::setMap(map *m)
-+void kgeography::setMap(kgeomap *m)
- {
- 	kgeographySettings *set = kgeographySettings::self();
- 	set -> setLastMap(m -> getFile());
-diff -u kgeography/src.orig/kgeography.h kgeography/src/kgeography.h
---- kgeography/src.orig/kgeography.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/kgeography.h	Thu Dec  2 15:46:29 2004
-@@ -21,7 +21,7 @@
- class QLabel;
- class QVBox;
- 
--class map;
-+class kgeomap;
- class askWidget;
- 
- class kgeography : public KMainWindow
-@@ -44,7 +44,7 @@
- 	private:
- 		void putAskWidget();
- 		void removeOldAskWidget();
--		void setMap(map *m);
-+		void setMap(kgeomap *m);
- 		
- 		QHBox *p_bigWidget;
- 		QVBox *p_rightWidget;
-@@ -59,7 +59,7 @@
- 		KToggleAction *p_zoom, *p_move;
- 		QLabel *p_currentMap;
- 	
--		map *p_map;
-+		kgeomap *p_map;
- 		askWidget *p_askWidget;
- };
- 
-diff -u kgeography/src.orig/map.cpp kgeography/src/map.cpp
---- kgeography/src.orig/map.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/map.cpp	Thu Dec  2 15:50:06 2004
-@@ -18,13 +18,13 @@
- #include "division.h"
- #include "map.h"
- 
--map::map()
-+kgeomap::kgeomap()
- {
- 	p_count = 0;
- 	p_hasAllFlags = true;
- }
- 
--map::~map()
-+kgeomap::~kgeomap()
- {
- 	QMap<QRgb, division*>::iterator it;
- 	it = p_colorMap.begin();
-@@ -36,7 +36,7 @@
- 	}
- }
- 
--bool map::addDivision(division *c)
-+bool kgeomap::addDivision(division *c)
- {
- 	bool b;
- 	if (p_nameMap.find(c -> getName()) == p_nameMap.end() && 
-@@ -52,58 +52,58 @@
- 	return b;
- }
- 
--void map::setFile(const QString &s)
-+void kgeomap::setFile(const QString &s)
- {
- 	p_file = s;
- }
- 
--bool map::setMapFile(const QString &s)
-+bool kgeomap::setMapFile(const QString &s)
- {
- 	p_mapFile = s;
- 	return QFile::exists(s);
- }
- 
--void map::setName(const QString &s)
-+void kgeomap::setName(const QString &s)
- {
- 	p_name = s;
- }
- 
--uint map::count() const
-+uint kgeomap::count() const
- {
- 	return p_count;
- }
- 
--bool map::hasAllFlags() const
-+bool kgeomap::hasAllFlags() const
- {
- 	return p_hasAllFlags;
- }
- 
--QString map::getDivisionFlagFile(const QString &s) const
-+QString kgeomap::getDivisionFlagFile(const QString &s) const
- {
- 	return p_nameMap[s] -> getFlagFile();
- }
- 
--QString map::getDivisionCapital(const QString &s) const
-+QString kgeomap::getDivisionCapital(const QString &s) const
- {
- 	return p_nameMap[s] -> getCapital();
- }
- 
--QString map::getFile() const
-+QString kgeomap::getFile() const
- {
- 	return p_file;
- }
- 
--QString map::getMapFile() const
-+QString kgeomap::getMapFile() const
- {
- 	return p_mapFile;
- }
- 
--QString map::getName() const
-+QString kgeomap::getName() const
- {
- 	return i18n(p_name);
- }
- 
--QString map::getRandomDivision() const
-+QString kgeomap::getRandomDivision() const
- {
- 	QValueList<division*> aux;
- 	int i = (int)((float)p_nameMap.size() * kapp -> random() / (RAND_MAX + 1.0));
-@@ -112,7 +112,7 @@
- 	else return aux[i] -> getName();
- }
- 
--QString map::getWhatIs(QRgb c, bool all) const
-+QString kgeomap::getWhatIs(QRgb c, bool all) const
- {
- 	QMap<QRgb, division*>::const_iterator it;
- 	it = p_colorMap.find(c);
-diff -u kgeography/src.orig/map.h kgeography/src/map.h
---- kgeography/src.orig/map.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/map.h	Thu Dec  2 15:47:52 2004
-@@ -16,11 +16,11 @@
- 
- class division;
- 
--class map
-+class kgeomap
- {
- 	public:
--		map();
--		~map();
-+		kgeomap();
-+		~kgeomap();
- 		
- 		bool addDivision(division *d);
- 		
-diff -u kgeography/src.orig/mapasker.cpp kgeography/src/mapasker.cpp
---- kgeography/src.orig/mapasker.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/mapasker.cpp	Thu Dec  2 16:15:52 2004
-@@ -19,7 +19,7 @@
- #include "mapasker.h"
- #include "mapwidget.h"
- 
--mapAsker::mapAsker(QWidget *parent, map *m, QWidget *w, bool asker, uint count) : askWidget(parent, m, w, count, asker), p_popupManager(this), p_asker(asker)
-+mapAsker::mapAsker(QWidget *parent, kgeomap *m, QWidget *w, bool asker, uint count) : askWidget(parent, m, w, count, asker), p_popupManager(this), p_asker(asker)
- {
- 	QGridLayout *lay = new QGridLayout(this, 2, 2);
- 	
-diff -u kgeography/src.orig/mapasker.h kgeography/src/mapasker.h
---- kgeography/src.orig/mapasker.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/mapasker.h	Thu Dec  2 16:10:44 2004
-@@ -25,7 +25,7 @@
- {
- Q_OBJECT
- 	public:
--		mapAsker(QWidget *parent, map *m, QWidget *w, bool asker, uint count = 0);
-+		mapAsker(QWidget *parent, kgeomap *m, QWidget *w, bool asker, uint count = 0);
- 	
- 	protected:
- 		void clean();
-diff -u kgeography/src.orig/mapchooser.cpp kgeography/src/mapchooser.cpp
---- kgeography/src.orig/mapchooser.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/mapchooser.cpp	Thu Dec  2 16:13:51 2004
-@@ -23,7 +23,7 @@
- {
- 	QHBox *mainHB;
- 	QStringList list;
--	map *m;
-+	kgeomap *m;
- 	QWidget *mapArea;
- 	QGridLayout *mapLay;
- 	
-@@ -70,9 +70,9 @@
- 	p_maps.clear();
- }
- 
--map *mapChooser::getMap()
-+kgeomap *mapChooser::getMap()
- {
--	map *m;
-+	kgeomap *m;
- 	m = p_maps[p_listBox -> currentText()];
- 	p_maps.remove(p_listBox -> currentText());
- 	return m;
-@@ -80,7 +80,7 @@
- 
- void mapChooser::putImage(const QString &mapName)
- {
--	map *m;
-+	kgeomap *m;
- 	m = p_maps[mapName];
- 	QImage image(m -> getMapFile());
- 	image = image.smoothScale(300, 225, QImage::ScaleMin);
---- kgeography/src.orig/mapchooser.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/mapchooser.h	Thu Dec  2 16:11:24 2004
-@@ -24,7 +24,7 @@
- 		mapChooser(QWidget *parent);
- 		~mapChooser();
- 
--		map *getMap();
-+		kgeomap *getMap();
- 	
- 	private slots:
- 		void putImage(const QString &mapName);
-@@ -33,7 +33,7 @@
- 		QListBox *p_listBox;
- 		QWidget *p_image;
- 		mapReader p_reader;
--		QDict<map> p_maps;
-+		QDict<kgeomap> p_maps;
- };
- 
- #endif
-diff -u kgeography/src.orig/mapparser.cpp kgeography/src/mapparser.cpp
---- kgeography/src.orig/mapparser.cpp	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/mapparser.cpp	Thu Dec  2 15:52:26 2004
-@@ -22,7 +22,7 @@
- bool mapReader::parseMap(QString path)
- {
- 	QString aux;
--	p_map = new map();
-+	p_map = new kgeomap();
- 	p_map -> setFile(path);
- 	aux = path.left(path.findRev('/') + 1); // aux = path but without the file name
- 	mapParser handler(p_map, aux);
-@@ -46,14 +46,14 @@
- 	return p_error;
- }
- 
--map *mapReader::getMap()
-+kgeomap *mapReader::getMap()
- {
- 	return p_map;
- }
- 
- /* mapParser */
- 
--mapParser::mapParser(map *m, QString &path) : QXmlDefaultHandler(), p_map(m), p_path(path)
-+mapParser::mapParser(kgeomap *m, QString &path) : QXmlDefaultHandler(), p_map(m), p_path(path)
- {
- }
- 
-diff -u kgeography/src.orig/mapparser.h kgeography/src/mapparser.h
---- kgeography/src.orig/mapparser.h	Tue Jul 27 00:17:14 2004
-+++ kgeography/src/mapparser.h	Thu Dec  2 15:51:06 2004
-@@ -24,17 +24,17 @@
- 		
- 		bool parseMap(QString path);
- 		QString getError();
--		map *getMap();
-+		kgeomap *getMap();
- 	
- 	private:
- 		QString p_error;
--		map *p_map;
-+		kgeomap *p_map;
- };
- 
- class mapParser : public QXmlDefaultHandler
- {
- 	public:
--		mapParser(map *m, QString &path);
-+		mapParser(kgeomap *m, QString &path);
- 		bool startDocument();
- 		bool startElement(const QString&, const QString&, const QString&, const QXmlAttributes&);
- 		bool endElement(const QString &, const QString &name, const QString &);
-@@ -48,7 +48,7 @@
- 		
- 		division *p_division;
- 		int p_red, p_green, p_blue;
--		map *p_map;
-+		kgeomap *p_map;
- 		bool p_allowChars, p_mapNameSet, p_mapFileSet;
- 		bool p_divisionNameSet, p_colorSet, p_divisionIgnoreSet, p_flagFileSet, p_capitalSet;
- 		QString &p_path, p_error, p_contents, p_previousTags;
diff --git a/games/kgeography/pkg-plist b/games/kgeography/pkg-plist
index e712aac96b9d..de683b7b8452 100644
--- a/games/kgeography/pkg-plist
+++ b/games/kgeography/pkg-plist
@@ -1,177 +1,214 @@
 bin/kgeography
-share/config.kcfg/kgeography.kcfg
 share/applications/kde/kgeography.desktop
-share/apps/kgeography/kgeographyui.rc
+share/apps/kgeography/africa.kgm
+share/apps/kgeography/africa.png
+share/apps/kgeography/europe.kgm
+share/apps/kgeography/europe.png
 share/apps/kgeography/flags/albania.png
-share/apps/kgeography/flags/djibouti.png
-share/apps/kgeography/flags/latvia.png
-share/apps/kgeography/flags/saarland.png
 share/apps/kgeography/flags/algeria.png
-share/apps/kgeography/flags/dominicanrepublic.png
-share/apps/kgeography/flags/lebanon.png
-share/apps/kgeography/flags/san_marino.png
 share/apps/kgeography/flags/angola.png
-share/apps/kgeography/flags/dominica.png
-share/apps/kgeography/flags/lesotho.png
-share/apps/kgeography/flags/saudiarabia.png
 share/apps/kgeography/flags/antigua.png
-share/apps/kgeography/flags/egypt.png
-share/apps/kgeography/flags/liberia.png
-share/apps/kgeography/flags/saxony_anhalt.png
+share/apps/kgeography/flags/argentina.png
 share/apps/kgeography/flags/austria.png
-share/apps/kgeography/flags/el_salvador.png
-share/apps/kgeography/flags/libya.png
-share/apps/kgeography/flags/saxony.png
 share/apps/kgeography/flags/baden_wurttemberg.png
-share/apps/kgeography/flags/equatorial_guinea.png
-share/apps/kgeography/flags/lithuania.png
-share/apps/kgeography/flags/schleswig_holstein.png
 share/apps/kgeography/flags/bahamas.png
-share/apps/kgeography/flags/eritrea.png
-share/apps/kgeography/flags/lower_saxony.png
-share/apps/kgeography/flags/senegal.png
 share/apps/kgeography/flags/barbados.png
-share/apps/kgeography/flags/estonia.png
-share/apps/kgeography/flags/luxembourg.png
-share/apps/kgeography/flags/serbiamontenegro_3x2.png
 share/apps/kgeography/flags/bavaria.png
-share/apps/kgeography/flags/ethiopia.png
-share/apps/kgeography/flags/macedonia.png
-share/apps/kgeography/flags/sierra_leone.png
 share/apps/kgeography/flags/belarus.png
-share/apps/kgeography/flags/finland.png
-share/apps/kgeography/flags/madagascar.png
-share/apps/kgeography/flags/slovakia.png
 share/apps/kgeography/flags/belgium.png
-share/apps/kgeography/flags/france.png
-share/apps/kgeography/flags/malawi.png
-share/apps/kgeography/flags/slovenia.png
 share/apps/kgeography/flags/belize.png
-share/apps/kgeography/flags/gabon.png
-share/apps/kgeography/flags/mali.png
-share/apps/kgeography/flags/somalia.png
 share/apps/kgeography/flags/benin.png
-share/apps/kgeography/flags/gambia.png
-share/apps/kgeography/flags/mauritania.png
-share/apps/kgeography/flags/southafrica.png
 share/apps/kgeography/flags/berlin.png
-share/apps/kgeography/flags/germany.png
-share/apps/kgeography/flags/mecklenburg_western_pomerania.png
-share/apps/kgeography/flags/spain.png
+share/apps/kgeography/flags/bolivia.png
 share/apps/kgeography/flags/bosnia_herzegovina.png
-share/apps/kgeography/flags/ghana.png
-share/apps/kgeography/flags/mexico.png
-share/apps/kgeography/flags/sudan.png
 share/apps/kgeography/flags/botswana.png
-share/apps/kgeography/flags/greece.png
-share/apps/kgeography/flags/moldova.png
-share/apps/kgeography/flags/swaziland.png
-share/apps/kgeography/flags/uk.png
 share/apps/kgeography/flags/brandenburg.png
-share/apps/kgeography/flags/guatemala.png
-share/apps/kgeography/flags/morocco.png
-share/apps/kgeography/flags/sweden.png
+share/apps/kgeography/flags/brazil.png
 share/apps/kgeography/flags/bremen.png
-share/apps/kgeography/flags/guineabissau.png
-share/apps/kgeography/flags/mozambique.png
-share/apps/kgeography/flags/switzerland.png
 share/apps/kgeography/flags/bulgaria.png
-share/apps/kgeography/flags/guinea.png
-share/apps/kgeography/flags/namibia.png
-share/apps/kgeography/flags/syria.png
 share/apps/kgeography/flags/burkina.png
-share/apps/kgeography/flags/haiti.png
-share/apps/kgeography/flags/netherlands.png
-share/apps/kgeography/flags/tanzania.png
 share/apps/kgeography/flags/burundi.png
-share/apps/kgeography/flags/hamburg.png
-share/apps/kgeography/flags/nicaragua.png
-share/apps/kgeography/flags/thuringia.png
 share/apps/kgeography/flags/cameroon.png
-share/apps/kgeography/flags/hesse.png
-share/apps/kgeography/flags/nigeria.png
-share/apps/kgeography/flags/togo.png
 share/apps/kgeography/flags/canada.png
-share/apps/kgeography/flags/honduras.png
-share/apps/kgeography/flags/niger.png
-share/apps/kgeography/flags/trinidad_tobago.png
 share/apps/kgeography/flags/central_african_republic.png
-share/apps/kgeography/flags/hungary.png
-share/apps/kgeography/flags/north_rhine_westphalia.png
-share/apps/kgeography/flags/tunisia.png
 share/apps/kgeography/flags/chad.png
-share/apps/kgeography/flags/iceland.png
-share/apps/kgeography/flags/norway.png
-share/apps/kgeography/flags/turkey.png
+share/apps/kgeography/flags/chile.png
+share/apps/kgeography/flags/colombia.png
 share/apps/kgeography/flags/congo_brazzaville.png
-share/apps/kgeography/flags/iran.png
-share/apps/kgeography/flags/oman.png
-share/apps/kgeography/flags/turkmenistan.png
 share/apps/kgeography/flags/congo_kinshasa.png
-share/apps/kgeography/flags/iraq.png
-share/apps/kgeography/flags/panama.png
-share/apps/kgeography/flags/uganda.png
-share/apps/kgeography/flags/usa.png
 share/apps/kgeography/flags/costa_rica.png
-share/apps/kgeography/flags/ireland.png
-share/apps/kgeography/flags/poland.png
 share/apps/kgeography/flags/cote_divoire.png
-share/apps/kgeography/flags/israel.png
-share/apps/kgeography/flags/portugal.png
-share/apps/kgeography/flags/ukraine.png
 share/apps/kgeography/flags/croatia.png
-share/apps/kgeography/flags/italy.png
-share/apps/kgeography/flags/qatar.png
 share/apps/kgeography/flags/cuba_3x2.png
-share/apps/kgeography/flags/jamaica.png
-share/apps/kgeography/flags/rhineland_palatinate.png
-share/apps/kgeography/flags/western_sahara.png
 share/apps/kgeography/flags/cyprus_4x3.png
-share/apps/kgeography/flags/jordan.png
-share/apps/kgeography/flags/romania.png
-share/apps/kgeography/flags/yemen.png
 share/apps/kgeography/flags/czech.png
-share/apps/kgeography/flags/kenya.png
-share/apps/kgeography/flags/russia.png
-share/apps/kgeography/flags/zambia.png
 share/apps/kgeography/flags/denmark.png
+share/apps/kgeography/flags/djibouti.png
+share/apps/kgeography/flags/dominica.png
+share/apps/kgeography/flags/dominicanrepublic.png
+share/apps/kgeography/flags/ecuador.png
+share/apps/kgeography/flags/egypt.png
+share/apps/kgeography/flags/el_salvador.png
+share/apps/kgeography/flags/equatorial_guinea.png
+share/apps/kgeography/flags/eritrea.png
+share/apps/kgeography/flags/estonia.png
+share/apps/kgeography/flags/ethiopia.png
+share/apps/kgeography/flags/finland.png
+share/apps/kgeography/flags/france.png
+share/apps/kgeography/flags/gabon.png
+share/apps/kgeography/flags/gambia.png
+share/apps/kgeography/flags/germany.png
+share/apps/kgeography/flags/ghana.png
+share/apps/kgeography/flags/greece.png
+share/apps/kgeography/flags/guatemala.png
+share/apps/kgeography/flags/guinea.png
+share/apps/kgeography/flags/guineabissau.png
+share/apps/kgeography/flags/guyana.png
+share/apps/kgeography/flags/haiti.png
+share/apps/kgeography/flags/hamburg.png
+share/apps/kgeography/flags/hesse.png
+share/apps/kgeography/flags/honduras.png
+share/apps/kgeography/flags/hungary.png
+share/apps/kgeography/flags/iceland.png
+share/apps/kgeography/flags/iran.png
+share/apps/kgeography/flags/iraq.png
+share/apps/kgeography/flags/ireland.png
+share/apps/kgeography/flags/israel.png
+share/apps/kgeography/flags/italy.png
+share/apps/kgeography/flags/jamaica.png
+share/apps/kgeography/flags/jordan.png
+share/apps/kgeography/flags/kenya.png
 share/apps/kgeography/flags/kuwait.png
+share/apps/kgeography/flags/latvia.png
+share/apps/kgeography/flags/lebanon.png
+share/apps/kgeography/flags/lesotho.png
+share/apps/kgeography/flags/liberia.png
+share/apps/kgeography/flags/libya.png
+share/apps/kgeography/flags/lithuania.png
+share/apps/kgeography/flags/lower_saxony.png
+share/apps/kgeography/flags/luxembourg.png
+share/apps/kgeography/flags/macedonia.png
+share/apps/kgeography/flags/madagascar.png
+share/apps/kgeography/flags/malawi.png
+share/apps/kgeography/flags/mali.png
+share/apps/kgeography/flags/mauritania.png
+share/apps/kgeography/flags/mecklenburg_western_pomerania.png
+share/apps/kgeography/flags/mexico.png
+share/apps/kgeography/flags/moldova.png
+share/apps/kgeography/flags/morocco.png
+share/apps/kgeography/flags/mozambique.png
+share/apps/kgeography/flags/namibia.png
+share/apps/kgeography/flags/netherlands.png
+share/apps/kgeography/flags/nicaragua.png
+share/apps/kgeography/flags/niger.png
+share/apps/kgeography/flags/nigeria.png
+share/apps/kgeography/flags/north_rhine_westphalia.png
+share/apps/kgeography/flags/norway.png
+share/apps/kgeography/flags/oman.png
+share/apps/kgeography/flags/panama.png
+share/apps/kgeography/flags/paraguay.png
+share/apps/kgeography/flags/peru.png
+share/apps/kgeography/flags/poland.png
+share/apps/kgeography/flags/portugal.png
+share/apps/kgeography/flags/qatar.png
+share/apps/kgeography/flags/rhineland_palatinate.png
+share/apps/kgeography/flags/romania.png
+share/apps/kgeography/flags/russia.png
 share/apps/kgeography/flags/rwanda.png
+share/apps/kgeography/flags/saarland.png
+share/apps/kgeography/flags/san_marino.png
+share/apps/kgeography/flags/saudiarabia.png
+share/apps/kgeography/flags/saxony.png
+share/apps/kgeography/flags/saxony_anhalt.png
+share/apps/kgeography/flags/schleswig_holstein.png
+share/apps/kgeography/flags/senegal.png
+share/apps/kgeography/flags/serbiamontenegro_3x2.png
+share/apps/kgeography/flags/sierra_leone.png
+share/apps/kgeography/flags/slovakia.png
+share/apps/kgeography/flags/slovenia.png
+share/apps/kgeography/flags/somalia.png
+share/apps/kgeography/flags/southafrica.png
+share/apps/kgeography/flags/spain.png
+share/apps/kgeography/flags/sudan.png
+share/apps/kgeography/flags/suriname.png
+share/apps/kgeography/flags/swaziland.png
+share/apps/kgeography/flags/sweden.png
+share/apps/kgeography/flags/switzerland.png
+share/apps/kgeography/flags/syria.png
+share/apps/kgeography/flags/tanzania.png
+share/apps/kgeography/flags/thuringia.png
+share/apps/kgeography/flags/togo.png
+share/apps/kgeography/flags/trinidad_tobago.png
+share/apps/kgeography/flags/tunisia.png
+share/apps/kgeography/flags/turkey.png
+share/apps/kgeography/flags/turkmenistan.png
+share/apps/kgeography/flags/uganda.png
+share/apps/kgeography/flags/uk.png
+share/apps/kgeography/flags/ukraine.png
+share/apps/kgeography/flags/uruguay.png
+share/apps/kgeography/flags/usa.png
+share/apps/kgeography/flags/venezuela.png
+share/apps/kgeography/flags/western_sahara.png
+share/apps/kgeography/flags/yemen.png
+share/apps/kgeography/flags/zambia.png
 share/apps/kgeography/flags/zimbabwe.png
-share/apps/kgeography/africa.png
-share/apps/kgeography/europe.png
-share/apps/kgeography/france.png
-share/apps/kgeography/germany.png
-share/apps/kgeography/ncamerica.png
-share/apps/kgeography/spain.png
-share/apps/kgeography/usa.png
-share/apps/kgeography/africa.kgm
-share/apps/kgeography/europe.kgm
 share/apps/kgeography/france.kgm
+share/apps/kgeography/france.png
 share/apps/kgeography/germany.kgm
+share/apps/kgeography/germany.png
+share/apps/kgeography/italy.kgm
+share/apps/kgeography/italy.png
+share/apps/kgeography/kgeographyui.rc
 share/apps/kgeography/ncamerica.kgm
+share/apps/kgeography/ncamerica.png
+share/apps/kgeography/southamerica.kgm
+share/apps/kgeography/southamerica.png
 share/apps/kgeography/spain.kgm
+share/apps/kgeography/spain.png
 share/apps/kgeography/usa.kgm
-share/icons/crystalsvg/32x32/apps/kgeography.png
+share/apps/kgeography/usa.png
+share/config.kcfg/kgeography.kcfg
+share/icons/crystalsvg/128x128/apps/kgeography.png
 share/icons/crystalsvg/16x16/apps/kgeography.png
+share/icons/crystalsvg/32x32/apps/kgeography.png
 share/icons/crystalsvg/48x48/apps/kgeography.png
 share/icons/crystalsvg/64x64/apps/kgeography.png
-share/icons/crystalsvg/128x128/apps/kgeography.png
 share/locale/az/LC_MESSAGES/kgeography.mo
+share/locale/br/LC_MESSAGES/kgeography.mo
 share/locale/ca/LC_MESSAGES/kgeography.mo
+share/locale/cs/LC_MESSAGES/kgeography.mo
+share/locale/cy/LC_MESSAGES/kgeography.mo
 share/locale/da/LC_MESSAGES/kgeography.mo
+share/locale/de/LC_MESSAGES/kgeography.mo
 share/locale/en_GB/LC_MESSAGES/kgeography.mo
 share/locale/es/LC_MESSAGES/kgeography.mo
 share/locale/et/LC_MESSAGES/kgeography.mo
 share/locale/fr/LC_MESSAGES/kgeography.mo
+share/locale/ga/LC_MESSAGES/kgeography.mo
 share/locale/is/LC_MESSAGES/kgeography.mo
 share/locale/it/LC_MESSAGES/kgeography.mo
 share/locale/ja/LC_MESSAGES/kgeography.mo
 share/locale/nl/LC_MESSAGES/kgeography.mo
+share/locale/pa/LC_MESSAGES/kgeography.mo
 share/locale/pt/LC_MESSAGES/kgeography.mo
 share/locale/ro/LC_MESSAGES/kgeography.mo
 share/locale/ru/LC_MESSAGES/kgeography.mo
+share/locale/sr/LC_MESSAGES/kgeography.mo
 share/locale/sv/LC_MESSAGES/kgeography.mo
 share/locale/ta/LC_MESSAGES/kgeography.mo
 @dirrm share/apps/kgeography/flags
 @dirrm share/apps/kgeography
+@unexec rmdir %D/share/locale/ta/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ta 2>/dev/null || true
+@unexec rmdir %D/share/locale/pa/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pa 2>/dev/null || true
+@unexec rmdir %D/share/locale/is/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/is 2>/dev/null || true
+@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ga 2>/dev/null || true
+@unexec rmdir %D/share/locale/en_GB/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/en 2>/dev/null || true
+@unexec rmdir %D/share/locale/cy/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cy 2>/dev/null || true
+@unexec rmdir %D/share/locale/az/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/az 2>/dev/null || true