From: Emmanuel Rodriguez <emmanuel.rodriguez@gmail.com>
Date: Tue, 19 May 2009 09:22:37 +0000 (+0200)
Subject: The predefined map sources have the same in formation in the desc as in the map source.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=448f417f185c419d0ae5d008eaad1b74e054f663;p=libchamplain

The predefined map sources have the same in formation in the desc as in the map source.

The map names and licenses are the same now.
---

diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index a39bea5..0863e49 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -168,7 +168,7 @@ ChamplainMapSourceDesc OSM_MAPNIK_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK,
     "OpenStreetMap Mapnik",
-    "(CC) BY 2.0 OpenStreetMap contributor",
+    "(CC) BY 2.0 OpenStreetMap contributors",
     "http://creativecommons.org/licenses/by/2.0/",
     0,
     18,
@@ -182,7 +182,7 @@ ChamplainMapSourceDesc OSM_OSMARENDER_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
     "OpenStreetMap Osmarender",
-    "(CC) BY 2.0 OpenStreetMap contributor",
+    "(CC) BY 2.0 OpenStreetMap contributors",
     "http://creativecommons.org/licenses/by/2.0/",
     0,
     18,
@@ -196,7 +196,7 @@ ChamplainMapSourceDesc OSM_CYCLEMAP_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP,
     "OpenStreetMap Cycle Map",
-    "(CC) BY 2.0 OpenStreetMap contributor",
+    "(CC) BY 2.0 OpenStreetMap contributors",
     "http://creativecommons.org/licenses/by/2.0/",
     0,
     18,
@@ -210,7 +210,7 @@ ChamplainMapSourceDesc OAM_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OAM,
     "OpenAerialMap",
-    "(CC) BY 3.0 OpenAerialMap contributor",
+    "(CC) BY 3.0 OpenAerialMap contributors",
     "http://creativecommons.org/licenses/by/3.0/",
     0,
     17,
@@ -223,8 +223,8 @@ static
 ChamplainMapSourceDesc MFF_RELIEF_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_MFF_RELIEF,
-    "Maps For Free Relief",
-    "GNU Free Documentation Licence, version 1.2 or later",
+    "Maps for Free Relief",
+    "Map data available under GNU Free Documentation license, Version 1.2 or later",
     "http://www.gnu.org/copyleft/fdl.html",
     0,
     11,