[Maposmatic-dev] [PATCH] [ocitysmap] Updated Norwegian translation

[Jeroen van Rijn]

An updated translation for Bokmål (nb-NO) and a new Nynorsk (nn-NO) translation 
based on the nb-NO translation.
Fixes https://savannah.nongnu.org/bugs/?35372

All credit goes to Guttorm Flatabø <address@hidden>
Patch to MapOSMatic/www/settings.py to add Nynorsk and credit Guttorm to follow 
shortly.

Signed-off-by: Guttorm Flatabø <address@hidden>
Signed-off-by: Jeroen van Rijn <address@hidden>
---
 locale/nb/LC_MESSAGES/ocitysmap.po |   91 ++++++++++++-----------------------
 locale/nn/LC_MESSAGES/ocitysmap.po |   93 ++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+), 61 deletions(-)
 create mode 100644 locale/nn/LC_MESSAGES/ocitysmap.po

diff --git a/locale/nb/LC_MESSAGES/ocitysmap.po 
b/locale/nb/LC_MESSAGES/ocitysmap.po
index 7adbf9c..4ddbfcf 100644
--- a/locale/nb/LC_MESSAGES/ocitysmap.po
+++ b/locale/nb/LC_MESSAGES/ocitysmap.po
@@ -1,4 +1,3 @@
-# Amenities names used MapOSMatic translated to Norwegian Bokmål.
 # Copyright (C) 2010 Hans Nordhaug
 # This file is distributed under the same license as the maposmatic package.
 #
@@ -8,113 +7,83 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 23:23+CEST\n"
-"PO-Revision-Date: 2010-08-05 10:49+0100\n"
-"Last-Translator: Hans Fredrik Nordhaug <address@hidden>\n"
+"POT-Creation-Date: 2010-09-11 15:43+CEST\n"
+"PO-Revision-Date: 2012-01-25 21:24+0100\n"
+"Last-Translator: Guttorm Flatabø <address@hidden>\n"
 "Language-Team: Norwegian Bokmål <address@hidden>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ocitysmap2/indexlib/indexer.py:163
+#: ocitysmap2/indexlib/indexer.py:144
 msgid "Places of worship"
 msgstr "Steder for gudsdyrkelse"
 
-#: ocitysmap2/indexlib/indexer.py:164
+#: ocitysmap2/indexlib/indexer.py:145
 msgid "Place of worship"
 msgstr "Sted for gudsdyrkelse"
 
-#: ocitysmap2/indexlib/indexer.py:165
+#: ocitysmap2/indexlib/indexer.py:146
 msgid "Kindergarten"
 msgstr "Barnehage"
 
-#: ocitysmap2/indexlib/indexer.py:165 ocitysmap2/indexlib/indexer.py:166
-#: ocitysmap2/indexlib/indexer.py:167 ocitysmap2/indexlib/indexer.py:168
-#: ocitysmap2/indexlib/indexer.py:169
+#: ocitysmap2/indexlib/indexer.py:146
+#: ocitysmap2/indexlib/indexer.py:147
+#: ocitysmap2/indexlib/indexer.py:148
+#: ocitysmap2/indexlib/indexer.py:149
+#: ocitysmap2/indexlib/indexer.py:150
 msgid "Education"
 msgstr "Utdanning"
 
-#: ocitysmap2/indexlib/indexer.py:166
+#: ocitysmap2/indexlib/indexer.py:147
 msgid "School"
 msgstr "Skole"
 
-#: ocitysmap2/indexlib/indexer.py:167
+#: ocitysmap2/indexlib/indexer.py:148
 msgid "College"
-msgstr "Videregående"
+msgstr "Videregående skole"
 
-#: ocitysmap2/indexlib/indexer.py:168
+#: ocitysmap2/indexlib/indexer.py:149
 msgid "University"
 msgstr "Universitet"
 
-#: ocitysmap2/indexlib/indexer.py:169
+#: ocitysmap2/indexlib/indexer.py:150
 msgid "Library"
 msgstr "Bilbliotek"
 
-#: ocitysmap2/indexlib/indexer.py:170
+#: ocitysmap2/indexlib/indexer.py:151
 msgid "Town hall"
 msgstr "Rådhus"
 
-#: ocitysmap2/indexlib/indexer.py:170 ocitysmap2/indexlib/indexer.py:171
-#: ocitysmap2/indexlib/indexer.py:172 ocitysmap2/indexlib/indexer.py:174
+#: ocitysmap2/indexlib/indexer.py:151
+#: ocitysmap2/indexlib/indexer.py:152
+#: ocitysmap2/indexlib/indexer.py:153
+#: ocitysmap2/indexlib/indexer.py:155
 msgid "Public buildings"
 msgstr "Offentlige bygninger"
 
-#: ocitysmap2/indexlib/indexer.py:171
+#: ocitysmap2/indexlib/indexer.py:152
 msgid "Post office"
 msgstr "Postkontor"
 
-#: ocitysmap2/indexlib/indexer.py:173
+#: ocitysmap2/indexlib/indexer.py:154
 msgid "Public building"
 msgstr "Offentlig bygning"
 
-#: ocitysmap2/indexlib/indexer.py:174
+#: ocitysmap2/indexlib/indexer.py:155
 msgid "Police"
 msgstr "Politi"
 
-#: ocitysmap2/indexlib/indexer.py:379
-msgid "Villages"
-msgstr ""
-
-#: ocitysmap2/layoutlib/multi_page_renderer.py:484
-#, fuzzy
-msgid ""
-"Copyright © %(year)d MapOSMatic/OCitySMap developers.\n"
-"http://www.maposmatic.org\n";
-"\n"
-"Map data © %(year)d OpenStreetMap.org and contributors (cc-by-sa).\n"
-"http://www.openstreetmap.org\n";
-"\n"
-"Map rendered on: %(date)s. OSM data updated on: %(osmdate)s.\n"
-"The map may be incomplete or inaccurate. You can contribute to improve this "
-"map.\n"
-"See http://wiki.openstreetmap.org";
-msgstr ""
-"Du kan hjelpe til med å lage dette kartet bedre - se http://wiki.";
-"openstreetmap.org"
-
-#: ocitysmap2/layoutlib/multi_page_renderer.py:499
-#: ocitysmap2/layoutlib/single_page_renderers.py:306
-msgid "unknown"
-msgstr ""
-
-#: ocitysmap2/layoutlib/multi_page_renderer.py:574
-msgid "This page is intentionally left blank."
-msgstr ""
-
-#: ocitysmap2/layoutlib/single_page_renderers.py:293
-#, fuzzy
+#: ocitysmap2/layoutlib/renderers.py:555
 msgid ""
-"Copyright © %(year)d MapOSMatic/OCitySMap developers. Map data © %(year)d "
-"OpenStreetMap.org and contributors (cc-by-sa).\n"
-"Map rendered on: %(date)s. OSM data updated on: %(osmdate)s. The map may be "
-"incomplete or inaccurate. You can contribute to improve this map. See http://";
-"wiki.openstreetmap.org"
+"Copyright © %(year)d MapOSMatic/OCitySMap developers. Map data © %(year)d 
OpenStreetMap.org and contributors (cc-by-sa).\n"
+"This map has been rendered on %(date)s and may be incomplete or innacurate. 
You can contribute to improve this map. See http://wiki.openstreetmap.org";
 msgstr ""
-"Du kan hjelpe til med å lage dette kartet bedre - se http://wiki.";
-"openstreetmap.org"
+"Copyright © %(year)d MapOSMatic/OCitySMap utviklerene. Kartdata © %(year)d 
OpenStreetMap.org og bidragsytere (cc-by-sa).\n"
+"Dette kartet ble laget %(date)s og kan ha mangler og feil. Du kan være med å 
forbedre dette kartet. Se http://wiki.openstreetmap.org";
 
-#: ocitysmap2/layoutlib/single_page_renderers.py:634
+#: ocitysmap2/layoutlib/renderers.py:898
 msgid "Test gettext"
 msgstr ""
 
diff --git a/locale/nn/LC_MESSAGES/ocitysmap.po 
b/locale/nn/LC_MESSAGES/ocitysmap.po
new file mode 100644
index 0000000..0f381c8
--- /dev/null
+++ b/locale/nn/LC_MESSAGES/ocitysmap.po
@@ -0,0 +1,93 @@
+# Copyright (C) 2010 Hans Nordhaug
+# This file is distributed under the same license as the maposmatic package.
+#
+# Hans Fredrik Nordhaug <address@hidden>, 2010.
+# #
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-09-11 15:43+CEST\n"
+"PO-Revision-Date: 2012-01-25 21:26+0100\n"
+"Last-Translator: Guttorm Flatabø <address@hidden>\n"
+"Language-Team: Norwegian Bokmål <address@hidden>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ocitysmap2/indexlib/indexer.py:144
+msgid "Places of worship"
+msgstr "Stader for gudsdyrking"
+
+#: ocitysmap2/indexlib/indexer.py:145
+msgid "Place of worship"
+msgstr "Sted for gudsdyrking"
+
+#: ocitysmap2/indexlib/indexer.py:146
+msgid "Kindergarten"
+msgstr "Barnehage"
+
+#: ocitysmap2/indexlib/indexer.py:146
+#: ocitysmap2/indexlib/indexer.py:147
+#: ocitysmap2/indexlib/indexer.py:148
+#: ocitysmap2/indexlib/indexer.py:149
+#: ocitysmap2/indexlib/indexer.py:150
+msgid "Education"
+msgstr "Utdanning"
+
+#: ocitysmap2/indexlib/indexer.py:147
+msgid "School"
+msgstr "Skole"
+
+#: ocitysmap2/indexlib/indexer.py:148
+msgid "College"
+msgstr "Vidaregående skole"
+
+#: ocitysmap2/indexlib/indexer.py:149
+msgid "University"
+msgstr "Universitet"
+
+#: ocitysmap2/indexlib/indexer.py:150
+msgid "Library"
+msgstr "Bilbliotek"
+
+#: ocitysmap2/indexlib/indexer.py:151
+msgid "Town hall"
+msgstr "Rådhus"
+
+#: ocitysmap2/indexlib/indexer.py:151
+#: ocitysmap2/indexlib/indexer.py:152
+#: ocitysmap2/indexlib/indexer.py:153
+#: ocitysmap2/indexlib/indexer.py:155
+msgid "Public buildings"
+msgstr "Offentlege bygningar"
+
+#: ocitysmap2/indexlib/indexer.py:152
+msgid "Post office"
+msgstr "Postkontor"
+
+#: ocitysmap2/indexlib/indexer.py:154
+msgid "Public building"
+msgstr "Offentleg bygning"
+
+#: ocitysmap2/indexlib/indexer.py:155
+msgid "Police"
+msgstr "Politi"
+
+#: ocitysmap2/layoutlib/renderers.py:555
+msgid ""
+"Copyright © %(year)d MapOSMatic/OCitySMap developers. Map data © %(year)d 
OpenStreetMap.org and contributors (cc-by-sa).\n"
+"This map has been rendered on %(date)s and may be incomplete or innacurate. 
You can contribute to improve this map. See http://wiki.openstreetmap.org";
+msgstr ""
+"Copyright © %(year)d MapOSMatic/OCitySMap-utviklarane. Kartdata © %(year)d 
OpenStreetMap.org og bidragsytarar (cc-by-sa).\n"
+"Dette kartet vart laga %(date)s og kan ha manglar og feil. Du kan vera med å 
forbedra dette kartet. Sjå http://wiki.openstreetmap.org";
+
+#: ocitysmap2/layoutlib/renderers.py:898
+msgid "Test gettext"
+msgstr ""
+
+#~ msgid ""
+#~ "This map has been rendered on %s and may be incomplete or inaccurate."
+#~ msgstr ""
+#~ "Dette kartet ble tegnet %s og kan være ufullstendig eller unøyaktig."
-- 
1.7.10.rc1.22.gf5241