133499 – mistake in country data for serbia/europe

Bug 133499 - mistake in country data for serbia/europe

Summary: mistake in country data for serbia/europe

Status:	RESOLVED FIXED

Alias:	None

Product:	kgeography
Classification:	Applications
Component:	general (show other bugs)
Version:	0.4.1
Platform:	unspecified Linux

Importance:	NOR normal
Target Milestone:	---
Assignee:	Albert Astals Cid

URL:
Keywords:

Depends on:
Blocks:

Reported:	2006-09-03 13:55 UTC by Raphael
Modified:	2006-09-03 20:45 UTC (History)
CC List:	0 users

See Also:
Latest Commit:
Version Fixed In:

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.

Description Raphael 2006-09-03 13:55:17 UTC

Version:           0.4.1 (using KDE 3.5.4, Kubuntu Package 4:3.5.4-0ubuntu2~dapper1 )
Compiler:          Target: i486-linux-gnu
OS:                Linux (i686) release 2.6.15-26-k7

Hello,
Serbia and Montenegro have split up in summer 2006 which is not yet reflected in the program (see e.g. http://en.wikipedia.org/wiki/Serbia)
best regards,
raph

Comment 1 Albert Astals Cid 2006-09-03 20:31:25 UTC

SVN commit 580513 by aacid:

Fix bug 133499, serbia and montenegro are not together since summer 2006

Will ask the translators if it is ok to backport for KDE 3.5.5

BUGS: 133499


 M  +12 -42    europe.kgm  
 M             europe.png  
 M  +2 -1      flags/CMakeLists.txt  
 AM            flags/montenegro.png  
 AM            flags/serbia.png  
 D             flags/serbiamontenegro_3x2.png  
 AM            flags/svg/serbia.svgz  
 D             flags/svg/serbiamontenegro_3x2.svgz  
 M  +12 -2     world.kgm  
 M             world.png  


--- trunk/KDE/kdeedu/kgeography/data/europe.kgm #580512:580513
@@ -48,16 +48,6 @@
 		</color>
 	</division>
 	<division>
-		<name>Andorra</name>
-		<flag>andorra.png</flag>
-		<capital>Andorra la Vella</capital>
-		<color>
-			<red>7</red>
-			<green>78</green>
-			<blue>5</blue>
-		</color>
-	</division>
-	<division>
 		<name>Austria</name>
 		<flag>austria.png</flag>
 		<capital>Vienna</capital>
@@ -248,16 +238,6 @@
 		</color>
 	</division>
 	<division>
-		<name>Liechtenstein</name>
-		<flag>liechtenstein.png</flag>
-		<capital>Vaduz</capital>
-		<color>
-			<red>192</red>
-			<green>195</green>
-			<blue>194</blue>
-		</color>
-	</division>
-	<division>
 		<name>Lithuania</name>
 		<flag>lithuania.png</flag>
 		<capital>Vilnius</capital>
@@ -288,16 +268,6 @@
 		</color>
 	</division>
 	<division>
-		<name>Monaco</name>
-		<flag>Monaco.png</flag>
-		<capital>Monaco</capital>
-		<color>
-			<red>181</red>
-			<green>121</green>
-			<blue>215</blue>
-		</color>
-	</division>
-	<division>
 		<name>Morocco</name>
 		<ignore>yes</ignore>
 		<color>
@@ -377,8 +347,8 @@
 		</color>
 	</division>
 	<division>
-		<name>Serbia and Montenegro</name>
-		<flag>serbiamontenegro_3x2.png</flag>
+		<name>Serbia</name>
+		<flag>serbia.png</flag>
 		<capital>Belgrade</capital>
 		<color>
 			<red>120</red>
@@ -387,6 +357,16 @@
 		</color>
 	</division>
 	<division>
+		<name>Montenegro</name>
+		<flag>montenegro.png</flag>
+		<capital>Podgorica</capital>
+		<color>
+			<red>255</red>
+			<green>12</green>
+			<blue>12</blue>
+		</color>
+	</division>
+	<division>
 		<name>Slovakia</name>
 		<flag>slovakia.png</flag>
 		<capital>Bratislava</capital>
@@ -484,14 +464,4 @@
 			<blue>50</blue>
 		</color>
 	</division>
-	<division>
-		<name>Vatican City</name>
-		<flag>Vatican.png</flag>
-		<capital>Vatican City</capital>
-		<color>
-			<red>251</red>
-			<green>175</green>
-			<blue>177</blue>
-		</color>
-	</division>
 </map>
--- trunk/KDE/kdeedu/kgeography/data/flags/CMakeLists.txt #580512:580513
@@ -37,7 +37,8 @@
    barbados.png
    estonia.png
    luxembourg.png
-   serbiamontenegro_3x2.png
+   serbia.png
+   montenegro.png
    ethiopia.png
    macedonia.png
    sierra_leone.png
** trunk/KDE/kdeedu/kgeography/data/flags/montenegro.png #property svn:mime-type
   + application/octet-stream
** trunk/KDE/kdeedu/kgeography/data/flags/serbia.png #property svn:mime-type
   + application/octet-stream
** trunk/KDE/kdeedu/kgeography/data/flags/svg/serbia.svgz #property svn:mime-type
   + application/octet-stream
--- trunk/KDE/kdeedu/kgeography/data/world.kgm #580512:580513
@@ -940,8 +940,8 @@
 		</color>
 	</division>
 	<division>
-		<name>Serbia and Montenegro</name>
-		<flag>serbiamontenegro_3x2.png</flag>
+		<name>Serbia</name>
+		<flag>serbia.png</flag>
 		<capital>Belgrade</capital>
 		<color>
 			<red>120</red>
@@ -950,6 +950,16 @@
 		</color>
 	</division>
 	<division>
+		<name>Montenegro</name>
+		<flag>montenegro.png</flag>
+		<capital>Podgorica</capital>
+		<color>
+			<red>255</red>
+			<green>12</green>
+			<blue>12</blue>
+		</color>
+	</division>
+	<division>
 		<name>Slovakia</name>
 		<flag>slovakia.png</flag>
 		<capital>Bratislava</capital>

Comment 2 Albert Astals Cid 2006-09-03 20:45:10 UTC

SVN commit 580514 by aacid:

fix damage done to europe map when fixing 133499
CCBUGS: 133499


 M  +40 -0     europe.kgm  
 M             europe.png  


--- trunk/KDE/kdeedu/kgeography/data/europe.kgm #580513:580514
@@ -48,6 +48,16 @@
 		</color>
 	</division>
 	<division>
+		<name>Andorra</name>
+		<flag>andorra.png</flag>
+		<capital>Andorra la Vella</capital>
+		<color>
+			<red>7</red>
+			<green>78</green>
+			<blue>5</blue>
+		</color>
+	</division>
+	<division>
 		<name>Austria</name>
 		<flag>austria.png</flag>
 		<capital>Vienna</capital>
@@ -238,6 +248,16 @@
 		</color>
 	</division>
 	<division>
+		<name>Liechtenstein</name>
+		<flag>liechtenstein.png</flag>
+		<capital>Vaduz</capital>
+		<color>
+			<red>192</red>
+			<green>195</green>
+			<blue>194</blue>
+		</color>
+	</division>
+	<division>
 		<name>Lithuania</name>
 		<flag>lithuania.png</flag>
 		<capital>Vilnius</capital>
@@ -268,6 +288,16 @@
 		</color>
 	</division>
 	<division>
+		<name>Monaco</name>
+		<flag>Monaco.png</flag>
+		<capital>Monaco</capital>
+		<color>
+			<red>181</red>
+			<green>121</green>
+			<blue>215</blue>
+		</color>
+	</division>
+	<division>
 		<name>Morocco</name>
 		<ignore>yes</ignore>
 		<color>
@@ -464,4 +494,14 @@
 			<blue>50</blue>
 		</color>
 	</division>
+	<division>
+		<name>Vatican City</name>
+		<flag>Vatican.png</flag>
+		<capital>Vatican City</capital>
+		<color>
+			<red>251</red>
+			<green>175</green>
+			<blue>177</blue>
+		</color>
+	</division>
 </map>