[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH] [maposmatic] Updated Norwegian translation cred
|
From: |
Jeroen van Rijn |
|
Subject: |
[Maposmatic-dev] [PATCH] [maposmatic] Updated Norwegian translation credits |
|
Date: |
Sat, 7 Apr 2012 19:17:30 +0200 |
Guttorm Flatabø sent in updated translations for OcitySMap 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
This patch credits Guttorm Flatabø <address@hidden> in about.html
and updates django.po to add 'norvegian nynorsk translation'.
Signed-off-by: Guttorm Flatabø <address@hidden>
Signed-off-by: Jeroen van Rijn <address@hidden>
---
www/locale/ar/LC_MESSAGES/django.po | 16 +-
www/locale/ca/LC_MESSAGES/django.po | 17 +-
www/locale/de/LC_MESSAGES/django.po | 357 +++++++++++++++++++---------
www/locale/es/LC_MESSAGES/django.po | 17 +-
www/locale/fr/LC_MESSAGES/django.po | 404 +++++++++++++++++++++++---------
www/locale/hr_HR/LC_MESSAGES/django.po | 16 +-
www/locale/id/LC_MESSAGES/django.po | 17 +-
www/locale/it/LC_MESSAGES/django.po | 16 +-
www/locale/nb/LC_MESSAGES/django.po | 17 +-
www/locale/nl_NL/LC_MESSAGES/django.po | 25 +-
www/locale/pl/LC_MESSAGES/django.po | 17 +-
www/locale/pt_BR/LC_MESSAGES/django.po | 325 +++++++++++++++++--------
www/locale/ru/LC_MESSAGES/django.po | 322 +++++++++++++++++--------
www/templates/maposmatic/about.html | 2 +
14 files changed, 1088 insertions(+), 480 deletions(-)
diff --git a/www/locale/ar/LC_MESSAGES/django.po
b/www/locale/ar/LC_MESSAGES/django.po
index 586ec77..df2d4fb 100644
--- a/www/locale/ar/LC_MESSAGES/django.po
+++ b/www/locale/ar/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2010-01-12 17:29+0300\n"
"Last-Translator: Bassem JARKAS <address@hidden>\n"
"Language-Team: Arabic Translation\n"
@@ -420,11 +420,15 @@ msgstr ""
msgid "indonesian translation"
msgstr ""
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
msgid "norvegian bokmål translation"
msgstr ""
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+msgid "norvegian nynorsk translation"
+msgstr ""
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr ""
@@ -457,15 +461,15 @@ msgstr "الخرائط"
msgid "MapOSMatic maps feed"
msgstr ""
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
#, fuzzy
msgid "Create a new map!"
msgstr "أنشئ خريطة"
diff --git a/www/locale/ca/LC_MESSAGES/django.po
b/www/locale/ca/LC_MESSAGES/django.po
index cb287e4..b0aee01 100644
--- a/www/locale/ca/LC_MESSAGES/django.po
+++ b/www/locale/ca/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2010-10-20 11:43+0200\n"
"Last-Translator: Joan Montané <joan--sense-spam--montane.cat>\n"
"Language-Team: Català <joan--sense-spam--montane.cat>\n"
@@ -510,12 +510,17 @@ msgstr "traducció al polonès"
msgid "indonesian translation"
msgstr "traducció al rus"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
#, fuzzy
msgid "norvegian bokmål translation"
msgstr "traducció al rus"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "traducció al rus"
+
+#: templates/maposmatic/about.html:196
#, fuzzy
msgid "printable stylesheet"
msgstr "Full d'estil"
@@ -553,15 +558,15 @@ msgstr "Mapes"
msgid "MapOSMatic maps feed"
msgstr "Alimentador de mapes del MapOSMatic"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "La base de dades, ara per ara, no conté cap mapa renderitzat."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr "No hi ha cap mapa coincident amb la vostra cerca."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "Create a new map!"
msgstr "Crea un mapa nou!"
diff --git a/www/locale/de/LC_MESSAGES/django.po
b/www/locale/de/LC_MESSAGES/django.po
index 97eab76..e564a7e 100644
--- a/www/locale/de/LC_MESSAGES/django.po
+++ b/www/locale/de/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 11:26+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2012-04-01 20:30+0100\n"
"Last-Translator: malenki <address@hidden>\n"
"Language-Team: <address@hidden>\n"
@@ -96,10 +96,11 @@ msgstr "Straßenverzeichnis von %(title)s (format
%(format)s)"
#: maposmatic/nominatim.py:229
msgid "Administrative area too big for rendering"
-msgstr "Das von der Verwaltungsgrenze umfasste Gebiet ist zu groß, um
gerendert zu werden."
+msgstr ""
+"Das von der Verwaltungsgrenze umfasste Gebiet ist zu groß, um gerendert zu "
+"werden."
-#: maposmatic/nominatim.py:285
-#: maposmatic/nominatim.py:299
+#: maposmatic/nominatim.py:285 maposmatic/nominatim.py:299
msgid "No administrative boundary"
msgstr "Keine Verwaltungsgrenze vorhanden."
@@ -132,24 +133,31 @@ msgid "Rendering was successful."
msgstr "Rendervorgang erfolgreich."
#: maposmatic/templatetags/extratags.py:41
-msgid "Rendering failed! Please contact address@hidden for more information."
-msgstr "Rendervorgang fehlgeschlagen! Bitte benachrichtigen Sie address@hidden"
+msgid ""
+"Rendering failed! Please contact address@hidden for more information."
+msgstr ""
+"Rendervorgang fehlgeschlagen! Bitte benachrichtigen Sie address@hidden"
+"org."
#: maposmatic/templatetags/extratags.py:44
-msgid "Rendering is obsolete: the rendering was successful, but the files are
no longer available."
-msgstr "Der Rendervorgang war erfolgreich, aber die erzeugten Dateien sind
nicht mehr verfügbar."
+msgid ""
+"Rendering is obsolete: the rendering was successful, but the files are no "
+"longer available."
+msgstr ""
+"Der Rendervorgang war erfolgreich, aber die erzeugten Dateien sind nicht "
+"mehr verfügbar."
#: maposmatic/templatetags/extratags.py:46
-msgid "Obsolete failed rendering: the rendering failed, and the incomplete
files have been removed."
+msgid ""
+"Obsolete failed rendering: the rendering failed, and the incomplete files "
+"have been removed."
msgstr "Der Rendervorgang schlug fehl, die erzeugten Dateien wurden entfernt."
#: maposmatic/templatetags/extratags.py:48
msgid "The rendering was cancelled by the user."
msgstr "Rendervorgang wurde vom Nutzer abgebrochen."
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:59
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:59
msgid "Home"
msgstr "Start"
@@ -185,8 +193,7 @@ msgstr "Interner Serverfehler <em>500</em>"
msgid "There's been an error."
msgstr "Ein Fehler ist aufgetreten."
-#: templates/maposmatic/about.html:35
-#: templates/maposmatic/base.html:65
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:65
msgid "About"
msgstr "Über"
@@ -195,26 +202,33 @@ msgid "History"
msgstr "Entstehung"
#: templates/maposmatic/about.html:39
-#, python-format
+#, fuzzy, python-format
msgid ""
"MapOSMatic has been started thanks to an idea of\n"
"Gilles Lamiral, an <a\n"
"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> and free\n"
"software contributor of Rennes area, France. From his idea, a group of\n"
"crazy <a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\";>hackers</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture";
+"%29\">hackers</a>\n"
"met together during a one-week <em>Hackfest</em> in August 2009 and\n"
"brought the idea of Gilles Lamiral to life by writing the code and\n"
"named the project <strong>MapOSMatic</strong>. The group of crazy\n"
"hackers would like to thank Gilles for sharing his bright\n"
"idea!"
msgstr ""
-"MapOSMatic entstand dank einer Idee von Gilles Lamiral, einem Mitarbeiter
von\n"
-" <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> und Freier
Software bei Rennes in Frankreich.\n"
-" Zu seiner Idee fand sich eine Gruppe von <a
href=\"http://de.wikipedia.org/wiki/Hacker%23Free-Software-_und_Open-Source-Hackerkultur\";>Hackern</a>\n"
-" während eines einwöchigen <em>Hackfests</em> im August 2009. Sie hauchten
Gilles' Idee Leben ein,\n"
-" indem sie den Code schrieben und das Projekt <strong>MapOSMatic</strong>
nannten.\n"
-" Die Gruppe der <em>Hacker</em> möchte Gilles dafür danken, dass er seine
geniale Idee teilte."
+"MapOSMatic entstand dank einer Idee von Gilles Lamiral, einem Mitarbeiter "
+"von\n"
+" <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> und Freier "
+"Software bei Rennes in Frankreich.\n"
+" Zu seiner Idee fand sich eine Gruppe von <a href=\"http://de.wikipedia.org/";
+"wiki/Hacker%23Free-Software-_und_Open-Source-Hackerkultur\">Hackern</a>\n"
+" während eines einwöchigen <em>Hackfests</em> im August 2009. Sie hauchten "
+"Gilles' Idee Leben ein,\n"
+" indem sie den Code schrieben und das Projekt <strong>MapOSMatic</strong> "
+"nannten.\n"
+" Die Gruppe der <em>Hacker</em> möchte Gilles dafür danken, dass er seine "
+"geniale Idee teilte."
#: templates/maposmatic/about.html:53
msgid ""
@@ -224,7 +238,8 @@ msgid ""
msgstr ""
"Natürlich ist MapOSMatic völlig freie Software,\n"
" lizenziert unter den Bedingungen der\n"
-" <a
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
+" <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</"
+"a>.\n"
#: templates/maposmatic/about.html:60
msgid "How does it work?"
@@ -246,12 +261,15 @@ msgid ""
msgstr ""
"Auf unserem Server läuft ein\n"
" <a href=\"http://www.postgresql.org\";>PostgreSQL</a>-Server mit der\n"
-" <a href=\"http://postgis.refractions.net\";>PostGIS</a>-Erweiterung. In
diesen\n"
+" <a href=\"http://postgis.refractions.net\";>PostGIS</a>-Erweiterung. In "
+"diesen\n"
" PostgreSQL-Server haben wir unter Verwendung des\n"
-" <a
href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\";>osm2pgsql</a>-Tools\n"
+" <a href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\";>osm2pgsql</a>-"
+"Tools\n"
" die <a href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\";>\n"
" OpenStreetMap-Daten der gesamten Welt</a> geladen. Mit diesem Tool\n"
-" werden auch die <a href=\"http://planet.openstreetmap.org/daily/\";>täglichen
diffs</a> \n"
+" werden auch die <a href=\"http://planet.openstreetmap.org/daily/";
+"\">täglichen diffs</a> \n"
" der OSM-Datenbank eingepflegt. So ist es MapOSMatic möglich, \n"
" Stadtpläne mit den neuesten Beiträgen der OpenStreetMap-User zu erzeugen."
@@ -260,22 +278,27 @@ msgid ""
"For the map rendering, we use the\n"
"famous <a href=\"http://www.mapnik.org\";>Mapnik</a> with the OpenStreetMap\n"
"stylesheet\n"
-"available <a
href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\";>in\n"
+"available <a href=\"http://svn.openstreetmap.org/applications/rendering/";
+"mapnik\">in\n"
"OpenStreetMap Subversion repository</a>. Using Mapnik\n"
"and <a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, we\n"
"built <i>OCitySMap</i>, a Python module that:"
msgstr ""
"Um den Plan zu rendern, nutzen wir das berühmte <a\n"
-" href=\"http://www.mapnik.org\";>Mapnik</a> mit dem OpenStreetMap-Stylesheet,
das im\n"
+" href=\"http://www.mapnik.org\";>Mapnik</a> mit dem OpenStreetMap-Stylesheet, "
+"das im\n"
" <a href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\";>\n"
" OpenStreetMap Subversion-Repository </a> zu finden ist.\n"
-" Unter Verwendung von Mapnik und <a
href=\"http://cairographics.org/pycairo/\";>Cairo</a> entwickelten wir
<i>OCitySMap</i>, ein Python-Modul, das:"
+" Unter Verwendung von Mapnik und <a href=\"http://cairographics.org/pycairo/";
+"\">Cairo</a> entwickelten wir <i>OCitySMap</i>, ein Python-Modul, das:"
#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
-msgstr "die Straßen anhand der OpenStreetMap-Daten und des OpenStreetMap
Mapnik-Stylesheets rendert;"
+msgstr ""
+"die Straßen anhand der OpenStreetMap-Daten und des OpenStreetMap Mapnik-"
+"Stylesheets rendert;"
#: templates/maposmatic/about.html:89
msgid ""
@@ -292,7 +315,9 @@ msgstr ""
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
-msgstr "Gebiete außerhalb der Stadt ausgraut, sofern wir deren administrative
Grenze finden;"
+msgstr ""
+"Gebiete außerhalb der Stadt ausgraut, sofern wir deren administrative Grenze "
+"finden;"
#: templates/maposmatic/about.html:95
msgid ""
@@ -317,7 +342,8 @@ msgstr ""
" seine eigenen Stadtpläne rendern kann.\n"
" Da die Installation der verschiedenen Komponenten relativ kompliziert ist,\n"
" wurde ein darauf basierender Webservice erstellt,\n"
-" so dass Endnutzer OpenStreetMap-Stadtpläne einfach erstellen und benutzen
können."
+" so dass Endnutzer OpenStreetMap-Stadtpläne einfach erstellen und benutzen "
+"können."
#: templates/maposmatic/about.html:110
msgid ""
@@ -333,9 +359,13 @@ msgid ""
msgstr ""
"Dieser Webservice wurde <i>MapOSMatic</i> genannt,\n"
" wie <i>map-o-matic</i>, aber mit einer Referenz an OpenStreetMap (OSM).\n"
-" Der Webservice wurde unter Benutzung von <a
href=\"http://www.djangoproject.com\";>Django</a>\n"
-" in Python geschrieben. Er speichert die Renderanfragen und zeigt deren
Ergebnisse an.\n"
-" Das Rendern selbst findet asynchron durch den <i>maposmaticd</i>-Daemon
statt.Dieser Daemon bearbeitet nur eine Anfrage auf einmal, da durch das
Rendern hohe Prozessor- und In-/Output-Last entsteht."
+" Der Webservice wurde unter Benutzung von <a href=\"http://www.djangoproject.";
+"com\">Django</a>\n"
+" in Python geschrieben. Er speichert die Renderanfragen und zeigt deren "
+"Ergebnisse an.\n"
+" Das Rendern selbst findet asynchron durch den <i>maposmaticd</i>-Daemon "
+"statt.Dieser Daemon bearbeitet nur eine Anfrage auf einmal, da durch das "
+"Rendern hohe Prozessor- und In-/Output-Last entsteht."
#: templates/maposmatic/about.html:122
msgid ""
@@ -362,8 +392,10 @@ msgid ""
"contribute. Here are the few starting points to help\n"
"us:"
msgstr ""
-"Wie oben erwähnt sind <i>OCitySMap</i> und <i>MapOSMatic</i> Freie
Software.\n"
-" Sie sind eingeladen, sich daran zu beteiligen. Hier ein paar Ansatzpunkte,
wo Sie beginnen können:"
+"Wie oben erwähnt sind <i>OCitySMap</i> und <i>MapOSMatic</i> Freie "
+"Software.\n"
+" Sie sind eingeladen, sich daran zu beteiligen. Hier ein paar Ansatzpunkte, "
+"wo Sie beginnen können:"
#: templates/maposmatic/about.html:140
msgid ""
@@ -389,11 +421,13 @@ msgstr ""
#: templates/maposmatic/about.html:147
msgid ""
"The <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>development\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
+"\">development\n"
" mailing-list</a>;"
msgstr ""
"Die <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>Entwickler-Mailingliste
(in Englisch)</a> ;"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
+"\">Entwickler-Mailingliste (in Englisch)</a> ;"
#: templates/maposmatic/about.html:150
msgid ""
@@ -404,12 +438,14 @@ msgstr "Der IRC-Channel <code>#maposmatic</code> auf
Freenode;"
#: templates/maposmatic/about.html:152
msgid ""
"The <a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git";
+"\">OCitySMap\n"
" Git repository</a>, which can be cloned using <tt>git clone\n"
" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
msgstr ""
"Das <a\n"
-" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>OCitySMap
Git-Repository</a>,\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git";
+"\">OCitySMap Git-Repository</a>,\n"
" das mit folgender Befehlszeile heruntergeladen werden kann:\n"
"<tt>git clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
@@ -420,7 +456,8 @@ msgid ""
" Git repository</a>, which can be cloned using\n"
" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
msgstr ""
-"Das <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic
Git-Repository</a>,\n"
+"Das <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic "
+"Git-Repository</a>,\n"
" das mit folgender Befehlszeile heruntergeladen werden kann:\n"
" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
@@ -462,8 +499,7 @@ msgstr "russische Übersetzung"
msgid "arabic translation"
msgstr "arabische Übersetzung"
-#: templates/maposmatic/about.html:186
-#: templates/maposmatic/about.html:187
+#: templates/maposmatic/about.html:186 templates/maposmatic/about.html:187
msgid "brasilian portuguese translation"
msgstr "Übersetzung in brasilianisches Portugiesisch"
@@ -487,11 +523,16 @@ msgstr "polnische Übersetzung"
msgid "indonesian translation"
msgstr "indonesische Übersetzung"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
msgid "norvegian bokmål translation"
msgstr "norwegische (Bokmål) Übersetzung"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "norwegische (Bokmål) Übersetzung"
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr "Darstellungsstil"
@@ -500,10 +541,14 @@ msgid "Job list"
msgstr "Liste der Rendervorgänge"
#: templates/maposmatic/all_jobs.html:39
-msgid "This page gives the status of the rendering queue, showing all requests
received during the last 24 hours as well as all unprocessed requests without
time limit. They are ordered starting from the most recent ones."
+msgid ""
+"This page gives the status of the rendering queue, showing all requests "
+"received during the last 24 hours as well as all unprocessed requests "
+"without time limit. They are ordered starting from the most recent ones."
msgstr ""
"Diese Seite zeigt den Status aller innerhalb der letzten 24 Stunden\n"
-" eingegangenen Renderanfragen sowie alle unverarbeiteten Anfragen ohne
Zeitlimit. \n"
+" eingegangenen Renderanfragen sowie alle unverarbeiteten Anfragen ohne "
+"Zeitlimit. \n"
"Die neuesten Anfragen werden als erste angezeigt."
#: templates/maposmatic/all_jobs.html:54
@@ -512,13 +557,11 @@ msgid ""
"hours."
msgstr "Keine Renderanfragen innerhalb der letzten 24 Stunden."
-#: templates/maposmatic/all_maps.html:34
-#: templates/maposmatic/index.html:61
+#: templates/maposmatic/all_maps.html:34 templates/maposmatic/index.html:61
msgid "Search"
msgstr "Suche"
-#: templates/maposmatic/all_maps.html:38
-#: templates/maposmatic/base.html:62
+#: templates/maposmatic/all_maps.html:38 templates/maposmatic/base.html:62
msgid "Maps"
msgstr "Pläne"
@@ -526,15 +569,15 @@ msgstr "Pläne"
msgid "MapOSMatic maps feed"
msgstr "MapOSMatic Stadtplan-Feed"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "Momentan enthält unsere Datenbank keine gerenderten Pläne."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr "Keinen Pläne zu Ihrem Suchbegriff gefunden."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "Create a new map!"
msgstr "Einen neuen Plan erstellen!"
@@ -554,22 +597,29 @@ msgstr "Rendervorgänge"
msgid "News"
msgstr "Aktuelles"
-#: templates/maposmatic/base.html:64
-#: templates/maposmatic/donate.html:30
+#: templates/maposmatic/base.html:64 templates/maposmatic/donate.html:30
msgid "Donate"
msgstr "Spenden"
#: templates/maposmatic/base.html:80
-msgid "The MapOSMatic rendering daemon is currently not running! Jobs will be
queued until the rendering daemon is back up."
-msgstr "Der MapOSMatic Render-Dienst ist momentan nicht aktiv. Neue Aufträge
werden in die Warteschlange eingereiht, bis der Dienst wieder verfügbar ist."
+msgid ""
+"The MapOSMatic rendering daemon is currently not running! Jobs will be "
+"queued until the rendering daemon is back up."
+msgstr ""
+"Der MapOSMatic Render-Dienst ist momentan nicht aktiv. Neue Aufträge werden "
+"in die Warteschlange eingereiht, bis der Dienst wieder verfügbar ist."
#: templates/maposmatic/base.html:91
msgid "Donate to MapOSMatic"
msgstr "An MapOSMatic spenden"
#: templates/maposmatic/base.html:101
-msgid "You can donate to help us improve the service. See our <a
href=\"/donate\">donation</a> page."
-msgstr "Sie können spenden um uns zu helfen, diesen Dienst zu verbessern.
Details dazu auf unserer <a href=\"/donate\">Spenden-</a>Seite."
+msgid ""
+"You can donate to help us improve the service. See our <a href=\"/donate"
+"\">donation</a> page."
+msgstr ""
+"Sie können spenden um uns zu helfen, diesen Dienst zu verbessern. Details "
+"dazu auf unserer <a href=\"/donate\">Spenden-</a>Seite."
#: templates/maposmatic/base.html:106
msgid "OSM database status"
@@ -639,10 +689,12 @@ msgid ""
"organization to support the project."
msgstr ""
"Sie werden eine Email bezüglich Ihrer Spende erhalten\n"
-" Diese Email wird bestätigen, dass <i>Thomas Petazzoni</i> die Spende
erhalten hat.\n"
+" Diese Email wird bestätigen, dass <i>Thomas Petazzoni</i> die Spende "
+"erhalten hat.\n"
" Er ist der für Spenden und Finanzen verantwortliche MapOSMatic-Entwickler.\n"
" MapOSMatic ist noch immer eine informelle Gruppe von Entwicklern.\n"
-" Wir haben (noch) keine gemeinnützige Organisation zur Unterstützung von
MapOSMatic gegründet."
+" Wir haben (noch) keine gemeinnützige Organisation zur Unterstützung von "
+"MapOSMatic gegründet."
#: templates/maposmatic/donate.html:31
msgid "Why donations are useful?"
@@ -650,28 +702,67 @@ msgstr "Warum sind Spenden nützlich?"
#: templates/maposmatic/donate.html:35
#, python-format
-msgid "MapOSMatic is a project entirely developed and maintained by a team of
volunteers (see our <a href=\"%(about_url)s\">About</a> page for details).
However, running the MapOSMatic service and making improvements to it have
various costs beyond the time of the volunteer developers."
-msgstr "MapOSMatic ist ein Projekt, das vollständig von einem Team
Freiwilliger entwickelt und gewartet wird. Näheres dazu auf der <a
href=\"%(about_url)s\">Über</a>-Seite. Allerdings verursacht das Betreiben und
Verbessern des MapOSMatic-Dienstes Aufwendungen, die über die Zeit der
freiwilligen Entwickler hinausgehen."
+msgid ""
+"MapOSMatic is a project entirely developed and maintained by a team of "
+"volunteers (see our <a href=\"%(about_url)s\">About</a> page for details). "
+"However, running the MapOSMatic service and making improvements to it have "
+"various costs beyond the time of the volunteer developers."
+msgstr ""
+"MapOSMatic ist ein Projekt, das vollständig von einem Team Freiwilliger "
+"entwickelt und gewartet wird. Näheres dazu auf der <a href=\"%(about_url)s"
+"\">Über</a>-Seite. Allerdings verursacht das Betreiben und Verbessern des "
+"MapOSMatic-Dienstes Aufwendungen, die über die Zeit der freiwilligen "
+"Entwickler hinausgehen."
#: templates/maposmatic/donate.html:37
msgid "Therefore, we are currently seeking donations to help us funding:"
msgstr "Deshalb bitten wir derzeit um Spenden für:"
#: templates/maposmatic/donate.html:40
-msgid "Acquisition of a Solid-State Disk for the storage of our local copy of
the OpenStreetMap database. A SSD drive performs 40 to 50 times better than the
conventional hard drive we are using today, and would therefore help us to
reduce the lag between our local database and the official one, providing more
up-to-date maps. The cost of such hardware is about 500 to 700 €."
-msgstr "Anschaffung einer Solid State Disk für unsere lokale Kopie der
OpenStreetMap-Datenbank. Ein SSD-Laufwerk ist 40- bis 50-mal leistungsfähiger
als die konventionelle Festplatte, die derzeit verwendet wird. Deshalb würde
ein SSD-Laufwerk zu einem geringeren Rückstand von unserer zur offiziellen
Datenbank und zu aktuelleren Karten verhelfen."
+msgid ""
+"Acquisition of a Solid-State Disk for the storage of our local copy of the "
+"OpenStreetMap database. A SSD drive performs 40 to 50 times better than the "
+"conventional hard drive we are using today, and would therefore help us to "
+"reduce the lag between our local database and the official one, providing "
+"more up-to-date maps. The cost of such hardware is about 500 to 700 €."
+msgstr ""
+"Anschaffung einer Solid State Disk für unsere lokale Kopie der OpenStreetMap-"
+"Datenbank. Ein SSD-Laufwerk ist 40- bis 50-mal leistungsfähiger als die "
+"konventionelle Festplatte, die derzeit verwendet wird. Deshalb würde ein SSD-"
+"Laufwerk zu einem geringeren Rückstand von unserer zur offiziellen Datenbank "
+"und zu aktuelleren Karten verhelfen."
#: templates/maposmatic/donate.html:42
-msgid "Participation to the transportation expenses of the MapOSMatic
developers when they gather for <i>hackfests</i> (meeting of developers). You
can read our <a href=\"http://news.maposmatic.org\";>blog</a> to learn more
about what we achieve during those hackfests. We usually implement a huge
number of improvements, new features and bug fixes during those meetings. They
take place during the holidays of the developers, and we would like to at least
compensate their travel expenses."
-msgstr "Beteiligung an den Fahrtkosten der MapOSMatic-Entwickler, wenn sie
<i>Hackfests</i> (Treffen von Entwicklern) besuchen. Lesen Sie unser <a
href=\"http://news.maposmatic.org\";>Blog</a>um zu lernen, was wir während
dieser Hackfests erreichen. Üblicherweise implementieren wir eine große Zahl
von Verbesserungen, neuer Features und beseitigen Fehler. Diese Treffen finden
während des Urlaubs der Entwickler statt und wir möchten ihnen zumindest die
Fahrtkosten erstatten."
+msgid ""
+"Participation to the transportation expenses of the MapOSMatic developers "
+"when they gather for <i>hackfests</i> (meeting of developers). You can read "
+"our <a href=\"http://news.maposmatic.org\";>blog</a> to learn more about what "
+"we achieve during those hackfests. We usually implement a huge number of "
+"improvements, new features and bug fixes during those meetings. They take "
+"place during the holidays of the developers, and we would like to at least "
+"compensate their travel expenses."
+msgstr ""
+"Beteiligung an den Fahrtkosten der MapOSMatic-Entwickler, wenn sie "
+"<i>Hackfests</i> (Treffen von Entwicklern) besuchen. Lesen Sie unser <a href="
+"\"http://news.maposmatic.org\";>Blog</a>um zu lernen, was wir während dieser "
+"Hackfests erreichen. Üblicherweise implementieren wir eine große Zahl von "
+"Verbesserungen, neuer Features und beseitigen Fehler. Diese Treffen finden "
+"während des Urlaubs der Entwickler statt und wir möchten ihnen zumindest die "
+"Fahrtkosten erstatten."
#: templates/maposmatic/donate.html:46
msgid "Donating?"
msgstr "Spenden?"
#: templates/maposmatic/donate.html:48
-msgid "Donations can be done through the well-known <a
href=\"http://www.paypal.com\";>PayPal</a> service. We accept donations of any
amount: all donations are helpful, even the smallest ones."
-msgstr "Gespendet werden kann über den bekannten <a
href=\"http://www.paypal.com\";>PayPal</a>-Dienst. Wir akzeptieren Spenden in
jeder Höhe: Alle Spenden sind hilfreich, auch die kleinsten."
+msgid ""
+"Donations can be done through the well-known <a href=\"http://www.paypal.com";
+"\">PayPal</a> service. We accept donations of any amount: all donations are "
+"helpful, even the smallest ones."
+msgstr ""
+"Gespendet werden kann über den bekannten <a href=\"http://www.paypal.com";
+"\">PayPal</a>-Dienst. Wir akzeptieren Spenden in jeder Höhe: Alle Spenden "
+"sind hilfreich, auch die kleinsten."
#: templates/maposmatic/index.html:33
msgid "Introduction"
@@ -682,30 +773,56 @@ msgid "City map"
msgstr "Stadtplan"
#: templates/maposmatic/index.html:42
-msgid "MapOSMatic is a free software web service that allows you to generate
maps of cities using <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>
data. MapOSMatic can generate two kinds of maps: :"
+msgid ""
+"MapOSMatic is a free software web service that allows you to generate maps "
+"of cities using <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> "
+"data. MapOSMatic can generate two kinds of maps: :"
msgstr ""
-"MapOSMatic ist ein freier Webservice der es Ihnen ermöglicht, Stadtpläne
unter Benutzung der\n"
-" <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>-Daten zu
generieren.\n"
+"MapOSMatic ist ein freier Webservice der es Ihnen ermöglicht, Stadtpläne "
+"unter Benutzung der\n"
+" <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>-Daten zu "
+"generieren.\n"
" MapOSMatic kann zwei Arten von Karten erzeugen:"
#: templates/maposmatic/index.html:46
-msgid "Single page posters, where the map and the street index are rendered
side by side. The map itself is split in squares so that streets are easy to
find. This format is typically useful for printing on large paper sheets."
-msgstr "Einseitige Poster, auf denen Plan und Straßenindex nebeneinander
dargestellt werden. Der Plan wird in Quadrate aufgeteilt, so dass Straßen
einfach zu finden sind. Dieses Format wird üblicherweise für großformatige
Ausdrucke verwendet."
+msgid ""
+"Single page posters, where the map and the street index are rendered side by "
+"side. The map itself is split in squares so that streets are easy to find. "
+"This format is typically useful for printing on large paper sheets."
+msgstr ""
+"Einseitige Poster, auf denen Plan und Straßenindex nebeneinander dargestellt "
+"werden. Der Plan wird in Quadrate aufgeteilt, so dass Straßen einfach zu "
+"finden sind. Dieses Format wird üblicherweise für großformatige Ausdrucke "
+"verwendet."
#: templates/maposmatic/index.html:48
-msgid "Multiple page booklets, where the map and the street index are split
into several pages. This format is typically useful for printing on standard
paper sheets."
-msgstr "Mehrseitige Broschüren, in denen der Plan und der Straßenindex auf
mehrere Seiten verteilt werden. Dieses Format ist nützlich, um auf
Standard-Papierformaten zu drucken."
+msgid ""
+"Multiple page booklets, where the map and the street index are split into "
+"several pages. This format is typically useful for printing on standard "
+"paper sheets."
+msgstr ""
+"Mehrseitige Broschüren, in denen der Plan und der Straßenindex auf mehrere "
+"Seiten verteilt werden. Dieses Format ist nützlich, um auf Standard-"
+"Papierformaten zu drucken."
#: templates/maposmatic/index.html:52
-msgid "The generated maps are available in PNG, PDF and SVG formats and are
ready to be printed."
-msgstr "Die erzeugten Pläne sind als PNG, PDF und SVG verfügbar und
druckfertig."
+msgid ""
+"The generated maps are available in PNG, PDF and SVG formats and are ready "
+"to be printed."
+msgstr ""
+"Die erzeugten Pläne sind als PNG, PDF und SVG verfügbar und druckfertig."
#: templates/maposmatic/index.html:56
-msgid "As the data used to generate maps is coming from OpenStreetMap, you can
freely (under the <a href=\"http://wiki.openstreetmap.org/wiki/License\";>terms
of OpenStreetMap license</a>) reuse, sell, modify, ... the generated maps."
+msgid ""
+"As the data used to generate maps is coming from OpenStreetMap, you can "
+"freely (under the <a href=\"http://wiki.openstreetmap.org/wiki/License";
+"\">terms of OpenStreetMap license</a>) reuse, sell, modify, ... the "
+"generated maps."
msgstr ""
"Da OpenStreetMap-Daten benutzt werden um die Pläne zu erzeugen,\n"
" dürfen Sie diese unter den\n"
-" <a href=\"http://wiki.openstreetmap.org/wiki/License\";>Bedingungen der
OpenStreetMap-Lizenz</a>\n"
+" <a href=\"http://wiki.openstreetmap.org/wiki/License\";>Bedingungen der "
+"OpenStreetMap-Lizenz</a>\n"
" benutzen, verkaufen, verändern..."
#: templates/maposmatic/index.html:60
@@ -720,15 +837,17 @@ msgstr "Finde Plan"
msgid "More details"
msgstr "Mehr Informationen"
-#: templates/maposmatic/job-page.html:39
-#: templates/maposmatic/job.html:35
+#: templates/maposmatic/job-page.html:39 templates/maposmatic/job.html:35
#: templates/maposmatic/map.html:35
msgid "Recreate map"
msgstr "Plan neu erstellen"
#: templates/maposmatic/job-page.html:48
-msgid "You have been redirected to a similar map, rendered less than 24 hours
ago."
-msgstr "Sie wurden zu einem ähnlichen Plan weitergeleitet, der vor weniger als
24 Stunden erzeugt wurde."
+msgid ""
+"You have been redirected to a similar map, rendered less than 24 hours ago."
+msgstr ""
+"Sie wurden zu einem ähnlichen Plan weitergeleitet, der vor weniger als 24 "
+"Stunden erzeugt wurde."
#: templates/maposmatic/job-page.html:56
msgid "Refresh the status"
@@ -736,8 +855,12 @@ msgstr "Renderstatus aktualisieren"
#: templates/maposmatic/job-page.html:56
#, python-format
-msgid "(the page will refresh automatically every %(refresh)s seconds until
the rendering is completed)."
-msgstr "(die Seite wird alle %(refresh)s Sekunden automatisch neu geladen, bis
der Rendervorgang abgeschlossen ist)."
+msgid ""
+"(the page will refresh automatically every %(refresh)s seconds until the "
+"rendering is completed)."
+msgstr ""
+"(die Seite wird alle %(refresh)s Sekunden automatisch neu geladen, bis der "
+"Rendervorgang abgeschlossen ist)."
#: templates/maposmatic/job.html:48
msgid "Reported error: "
@@ -780,42 +903,44 @@ msgstr "abgebrochen am"
msgid "rendering took %(rendering)s"
msgstr "Der Rendervorgang dauerte %(rendering)s"
-#: templates/maposmatic/job.html:79
-#: templates/maposmatic/map-feed.html:44
+#: templates/maposmatic/job.html:79 templates/maposmatic/map-feed.html:44
#: templates/maposmatic/map.html:57
msgid "Files: "
msgstr "Dateien:"
-#: templates/maposmatic/job.html:81
-#: templates/maposmatic/map-feed.html:46
+#: templates/maposmatic/job.html:81 templates/maposmatic/map-feed.html:46
#: templates/maposmatic/map.html:59
msgid "Map: "
msgstr "Plan:"
-#: templates/maposmatic/job.html:82
-#: templates/maposmatic/map-feed.html:47
+#: templates/maposmatic/job.html:82 templates/maposmatic/map-feed.html:47
#: templates/maposmatic/map.html:60
msgid "Index: "
msgstr "Index:"
-#: templates/maposmatic/job.html:85
-#: templates/maposmatic/map-feed.html:50
+#: templates/maposmatic/job.html:85 templates/maposmatic/map-feed.html:50
#: templates/maposmatic/map.html:63
-msgid "No index was generated because no information was available in
OpenStreetMap to create one. Feel free to contribute the missing data yourself.
See the <a href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>OSM
Wiki</a> for a start. "
-msgstr "Es wurde kein Index erstellt, da in OpenStreetMap die Daten dazu
fehlen. Sie können fehlenden Daten selbst eintragen. Einen guten Einstieg
bietet das OSM-Wiki an <a
href=\"http://wiki.openstreetmap.org/wiki/DE:Getting_Involved\";>dieser
Stelle</a>."
+msgid ""
+"No index was generated because no information was available in OpenStreetMap "
+"to create one. Feel free to contribute the missing data yourself. See the <a "
+"href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>OSM Wiki</a> "
+"for a start. "
+msgstr ""
+"Es wurde kein Index erstellt, da in OpenStreetMap die Daten dazu fehlen. Sie "
+"können fehlenden Daten selbst eintragen. Einen guten Einstieg bietet das OSM-"
+"Wiki an <a href=\"http://wiki.openstreetmap.org/wiki/DE:Getting_Involved";
+"\">dieser Stelle</a>."
#: templates/maposmatic/job.html:88
msgid "View on OpenStreetMap"
msgstr "Auf OpenStreetMap anzeigen"
-#: templates/maposmatic/job.html:92
-#: templates/maposmatic/map-feed.html:53
+#: templates/maposmatic/job.html:92 templates/maposmatic/map-feed.html:53
#: templates/maposmatic/map.html:66
msgid "The generated files are no longer available."
msgstr "Die erzeugten Dateien sind nicht mehr verfügbar."
-#: templates/maposmatic/map-feed.html:41
-#: templates/maposmatic/map.html:54
+#: templates/maposmatic/map-feed.html:41 templates/maposmatic/map.html:54
msgid "Rendering completed on"
msgstr "Rendervorgang beendet am"
@@ -831,13 +956,11 @@ msgstr "Ort"
msgid "Title"
msgstr "Name"
-#: templates/maposmatic/new.html:51
-#: templates/maposmatic/new.html.py:123
+#: templates/maposmatic/new.html:51 templates/maposmatic/new.html.py:123
msgid "Layout"
msgstr "Layout"
-#: templates/maposmatic/new.html:54
-#: templates/maposmatic/new.html.py:128
+#: templates/maposmatic/new.html:54 templates/maposmatic/new.html.py:128
msgid "Stylesheet"
msgstr "Darstellungsstil"
@@ -845,8 +968,7 @@ msgstr "Darstellungsstil"
msgid "Paper size"
msgstr "Ausrichtung"
-#: templates/maposmatic/new.html:60
-#: templates/maposmatic/new.html.py:145
+#: templates/maposmatic/new.html:60 templates/maposmatic/new.html.py:145
msgid "Language"
msgstr "Sprache"
@@ -872,12 +994,15 @@ msgstr "Es gibt zwei Möglichkeiten, die zu rendernde
Stadt auszuwählen:"
msgid ""
"Latitude and longitude of the top left and bottom right\n"
" corners of the area to render."
-msgstr "Geografische Koordinaten der oberen linken und unteren rechten Ecke
des zu rendernden Gebietes."
+msgstr ""
+"Geografische Koordinaten der oberen linken und unteren rechten Ecke des zu "
+"rendernden Gebietes."
#: templates/maposmatic/new.html:95
msgid ""
"You can use <tt>Shift+drag</tt> to zoom on a specific\n"
-" area of the map. Then, you must select with <tt>Control+drag</tt>
the\n"
+" area of the map. Then, you must select with <tt>Control+drag</tt> "
+"the\n"
" limits of the area you wish to render."
msgstr ""
"Sie können <tt>Umsch+Ziehen</tt> benutzen, \n"
@@ -898,8 +1023,16 @@ msgid "No results."
msgstr "Keine Ergebnisse."
#: templates/maposmatic/new.html:113
-msgid "Wondering why you can't choose some of these results?<br />Their
administrative boundaries are missing from the OSM database.<br />Look at the
<a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more
details."
-msgstr "Fragen Sie sich, warum Sie einige dieser Ergebnisse nicht auswählen
können?<br />In der OSM-Datenbank fehlen deren Verwaltungsgrenzen.<br />Mehr
Details finden Sie in der <a
href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a>."
+msgid ""
+"Wondering why you can't choose some of these results?<br />Their "
+"administrative boundaries are missing from the OSM database.<br />Look at "
+"the <a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more "
+"details."
+msgstr ""
+"Fragen Sie sich, warum Sie einige dieser Ergebnisse nicht auswählen können?"
+"<br />In der OSM-Datenbank fehlen deren Verwaltungsgrenzen.<br />Mehr "
+"Details finden Sie in der <a href=\"http://wiki.maposmatic.org/doku.php?";
+"id=faq\">FAQ</a>."
#: templates/maposmatic/new.html:118
msgid "Map title"
diff --git a/www/locale/es/LC_MESSAGES/django.po
b/www/locale/es/LC_MESSAGES/django.po
index 1e9717d..a9b10fd 100644
--- a/www/locale/es/LC_MESSAGES/django.po
+++ b/www/locale/es/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2009-12-26 20:47+0100\n"
"Last-Translator: Jean-Guilhem Cailton <address@hidden>\n"
"Language-Team: ES <address@hidden>\n"
@@ -516,12 +516,17 @@ msgstr "traducción al polaco"
msgid "indonesian translation"
msgstr "traducción al ruso"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
#, fuzzy
msgid "norvegian bokmål translation"
msgstr "traducción al ruso"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "traducción al ruso"
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr ""
@@ -557,15 +562,15 @@ msgstr "Mapas"
msgid "MapOSMatic maps feed"
msgstr ""
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
#, fuzzy
msgid "Create a new map!"
msgstr "Crear un mapa"
diff --git a/www/locale/fr/LC_MESSAGES/django.po
b/www/locale/fr/LC_MESSAGES/django.po
index 73b328c..ca73a48 100644
--- a/www/locale/fr/LC_MESSAGES/django.po
+++ b/www/locale/fr/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2012-04-01 15:58+0100\n"
"Last-Translator: Thomas Petazzoni <address@hidden>\n"
"Language-Team: FR <address@hidden>\n"
@@ -96,8 +96,7 @@ msgstr "Index des rues pour %(title)s (format %(format)s)"
msgid "Administrative area too big for rendering"
msgstr "Zone géographique trop vaste pour être rendue"
-#: maposmatic/nominatim.py:285
-#: maposmatic/nominatim.py:299
+#: maposmatic/nominatim.py:285 maposmatic/nominatim.py:299
msgid "No administrative boundary"
msgstr "Pas de limite administrative disponible"
@@ -130,24 +129,33 @@ msgid "Rendering was successful."
msgstr "Rendu terminé avec succès."
#: maposmatic/templatetags/extratags.py:41
-msgid "Rendering failed! Please contact address@hidden for more information."
-msgstr "Le rendu a échoué ! Merci de contacter address@hidden pour plus
d'informations."
+msgid ""
+"Rendering failed! Please contact address@hidden for more information."
+msgstr ""
+"Le rendu a échoué ! Merci de contacter address@hidden pour plus "
+"d'informations."
#: maposmatic/templatetags/extratags.py:44
-msgid "Rendering is obsolete: the rendering was successful, but the files are
no longer available."
-msgstr "Le rendu est obsolète : le rendu s'est terminé avec succès, mais les
fichiers générés ne sont plus disponibles."
+msgid ""
+"Rendering is obsolete: the rendering was successful, but the files are no "
+"longer available."
+msgstr ""
+"Le rendu est obsolète : le rendu s'est terminé avec succès, mais les "
+"fichiers générés ne sont plus disponibles."
#: maposmatic/templatetags/extratags.py:46
-msgid "Obsolete failed rendering: the rendering failed, and the incomplete
files have been removed."
-msgstr "Rendu échoué et obsolète : le rendu a échoué, et les fichiers
incomplets ont été supprimés."
+msgid ""
+"Obsolete failed rendering: the rendering failed, and the incomplete files "
+"have been removed."
+msgstr ""
+"Rendu échoué et obsolète : le rendu a échoué, et les fichiers "
+"incomplets ont été supprimés."
#: maposmatic/templatetags/extratags.py:48
msgid "The rendering was cancelled by the user."
msgstr "Le rendu a été annulé par l'utilisateur."
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:59
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:59
msgid "Home"
msgstr "Accueil"
@@ -183,8 +191,7 @@ msgstr "Erreur interne <em>500</em>"
msgid "There's been an error."
msgstr "Une erreur est apparue."
-#: templates/maposmatic/about.html:35
-#: templates/maposmatic/base.html:65
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:65
msgid "About"
msgstr "À propos..."
@@ -193,27 +200,38 @@ msgid "History"
msgstr "Historique"
#: templates/maposmatic/about.html:39
-#, python-format
+#, fuzzy, python-format
msgid ""
"MapOSMatic has been started thanks to an idea of\n"
"Gilles Lamiral, an <a\n"
"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> and free\n"
"software contributor of Rennes area, France. From his idea, a group of\n"
"crazy <a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\";>hackers</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture";
+"%29\">hackers</a>\n"
"met together during a one-week <em>Hackfest</em> in August 2009 and\n"
"brought the idea of Gilles Lamiral to life by writing the code and\n"
"named the project <strong>MapOSMatic</strong>. The group of crazy\n"
"hackers would like to thank Gilles for sharing his bright\n"
"idea!"
-msgstr "MapOSMatic a été lancé grâce à une idée de Gilles Lamiral, un
contributeur à <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> et au
Logiciel Libre de la région rennaise en France. À partir de son idée, un groupe
de <a
href=\"http://fr.wikipedia.org/wiki/Hacker_%28universit%C3%A9%29\";>hackers</a>
fous s'est réuni durant une <em>Hackfest</em> d'une semaine en août 2009 et a
transformé l'idée de Gilles en réalité. Le groupe de <em>hackers</em> fous
souhaite remercier Gilles d'avoir partagé cette brillante idée !"
+msgstr ""
+"MapOSMatic a été lancé grâce à une idée de Gilles Lamiral, un contributeur à "
+"<a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> et au Logiciel "
+"Libre de la région rennaise en France. À partir de son idée, un groupe de <a "
+"href=\"http://fr.wikipedia.org/wiki/Hacker_%28universit%C3%A9%29\";>hackers</"
+"a> fous s'est réuni durant une <em>Hackfest</em> d'une semaine en août 2009 "
+"et a transformé l'idée de Gilles en réalité. Le groupe de <em>hackers</em> "
+"fous souhaite remercier Gilles d'avoir partagé cette brillante idée !"
#: templates/maposmatic/about.html:53
msgid ""
"Of course, MapOSMatic is fully free software,\n"
"licensed under the <a\n"
"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
-msgstr "Bien entendu, MapOSMatic est un Logiciel Libre, disponible sous les
termes de la licence <a
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
+msgstr ""
+"Bien entendu, MapOSMatic est un Logiciel Libre, disponible sous les termes "
+"de la licence <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html";
+"\">AGPLv3</a>.\n"
#: templates/maposmatic/about.html:60
msgid "How does it work?"
@@ -233,30 +251,43 @@ msgid ""
"the database, which allows to keep it up to date with the new\n"
"contributions of OpenStreetMap users."
msgstr ""
-"Sur notre serveur, nous disposons d'un serveur <a
href=\"http://www.postgresql.org\";>PostgreSQL</a> avec l'extension <a
href=\"http://postgis.refractions.net\";>PostGIS</a>. Sur ce serveur PostgreSQL,
nous avons chargé l'intégralité des <a
href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\";>données OpenStreetMap
pour le monde entier</a> en utilisant l'outil <a\n"
-"href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\";>osm2pgsql</a>. Ce même
outil est utilisé pour appliquer les <a\n"
-"href=\"http://planet.openstreetmap.org/daily/\";>différences journalières</a>
de la base de données, ce qui nous permet de conserver celle-ci à jour avec les
nouvelles contributions des utilisateurs OpenStreetMap."
+"Sur notre serveur, nous disposons d'un serveur <a href=\"http://www.";
+"postgresql.org\">PostgreSQL</a> avec l'extension <a href=\"http://postgis.";
+"refractions.net\">PostGIS</a>. Sur ce serveur PostgreSQL, nous avons chargé "
+"l'intégralité des <a href=\"http://wiki.openstreetmap.org/wiki/Planet.osm";
+"\">données OpenStreetMap pour le monde entier</a> en utilisant l'outil <a\n"
+"href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\";>osm2pgsql</a>. Ce même "
+"outil est utilisé pour appliquer les <a\n"
+"href=\"http://planet.openstreetmap.org/daily/\";>différences journalières</a> "
+"de la base de données, ce qui nous permet de conserver celle-ci à jour avec "
+"les nouvelles contributions des utilisateurs OpenStreetMap."
#: templates/maposmatic/about.html:77
msgid ""
"For the map rendering, we use the\n"
"famous <a href=\"http://www.mapnik.org\";>Mapnik</a> with the OpenStreetMap\n"
"stylesheet\n"
-"available <a
href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\";>in\n"
+"available <a href=\"http://svn.openstreetmap.org/applications/rendering/";
+"mapnik\">in\n"
"OpenStreetMap Subversion repository</a>. Using Mapnik\n"
"and <a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, we\n"
"built <i>OCitySMap</i>, a Python module that:"
msgstr ""
"Pour le rendu de la carte, nous utilisons le célèbre <a\n"
-"href=\"http://www.mapnik.org\";>Mapnik</a>, accompagné de la feuille de style
OpenStreetMap disponible <a\n"
+"href=\"http://www.mapnik.org\";>Mapnik</a>, accompagné de la feuille de style "
+"OpenStreetMap disponible <a\n"
"href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\";>dans le\n"
-"dépôt Subversion d'OpenStreetMap</a>. En utilisant Mapnik et <a
href=\"http://cairographics.org/pycairo/\";>Cairo</a>, nous avons développé
<i>OCitySMap</i>, un module Python qui :"
+"dépôt Subversion d'OpenStreetMap</a>. En utilisant Mapnik et <a href="
+"\"http://cairographics.org/pycairo/\";>Cairo</a>, nous avons développé "
+"<i>OCitySMap</i>, un module Python qui :"
#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
-msgstr "Effectue le rendu de la carte en utilisant les données OpenStreetMap
et la feuille de style OpenStreetMap pour Mapnik ;"
+msgstr ""
+"Effectue le rendu de la carte en utilisant les données OpenStreetMap et la "
+"feuille de style OpenStreetMap pour Mapnik ;"
#: templates/maposmatic/about.html:89
msgid ""
@@ -264,20 +295,27 @@ msgid ""
" of 500 meters squares, the labels of the squares, and a few other\n"
" informations on the map (copyright, scale,\n"
" etc.);"
-msgstr "Effectue le rendu, au-dessus de la carte et en utilisant Mapnik, d'une
grille de carrés de 500 mètres de coté, des légendes de ces carrés et de
quelques autres informations (droits d'auteur, échelle, etc.) ;"
+msgstr ""
+"Effectue le rendu, au-dessus de la carte et en utilisant Mapnik, d'une "
+"grille de carrés de 500 mètres de coté, des légendes de ces carrés et de "
+"quelques autres informations (droits d'auteur, échelle, etc.) ;"
#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
-msgstr "Ajoute un pourtour gris autour de la ville si nous avons ses limites
administratives ;"
+msgstr ""
+"Ajoute un pourtour gris autour de la ville si nous avons ses limites "
+"administratives ;"
#: templates/maposmatic/about.html:95
msgid ""
"Renders an index of the streets, based on\n"
" OpenStreetMap data and the intersection of the streets with the\n"
" squares on the map."
-msgstr "Génère un index des rues basé sur les données OpenStreetMap et leur
intersection avec les carrés de la carte."
+msgstr ""
+"Génère un index des rues basé sur les données OpenStreetMap et leur "
+"intersection avec les carrés de la carte."
#: templates/maposmatic/about.html:101
msgid ""
@@ -287,7 +325,13 @@ msgid ""
"components is quite complicated, a small web service has been created\n"
"on top of it so that end-users can easily generate and use\n"
"OpenStreetMap city maps."
-msgstr "Le module Python peut être utilisé au travers d'un outil en ligne de
commande fourni avec OCitySMap, si bien que chacun peut faire fonctionner sa
propre chaîne de rendu de carte de villes. Cependant, l'installation des
différents composants étant relativement complexe, un petit service Web a été
créé pour permettre aux utilisateurs finaux de générer et d'utiliser facilement
des cartes de ville OpenStreetMap."
+msgstr ""
+"Le module Python peut être utilisé au travers d'un outil en ligne de "
+"commande fourni avec OCitySMap, si bien que chacun peut faire fonctionner sa "
+"propre chaîne de rendu de carte de villes. Cependant, l'installation des "
+"différents composants étant relativement complexe, un petit service Web a "
+"été créé pour permettre aux utilisateurs finaux de générer et d'utiliser "
+"facilement des cartes de ville OpenStreetMap."
#: templates/maposmatic/about.html:110
msgid ""
@@ -300,7 +344,15 @@ msgid ""
"through the <i>maposmaticd</i> daemon. This daemon does only one\n"
"rendering at a time, which is very important because of the CPU and I/O\n"
"intensive nature of the map rendering process."
-msgstr "Ce service Web a été appelé <i>MapOSMatic</i>, comme
<i>map-o-matic</i> mais avec une référence à OpenStreetMap (OSM). Le service
Web est écrit en Python en utilisant <a
href=\"http://www.djangoproject.com\";>Django</a> et est chargé de stocker les
demandes de rendu et d'afficher le résultat de ces demandes. Le rendu en tant
que tel est effectué de manière asynchrone par le démon <i>maposmaticd</i>, de
manière à ce qu'un seul rendu soit effectué à un instant donné, ce qui est très
important étant donné la nature très intensive en charge processeur et
d'entrées-sorties du processus de rendu."
+msgstr ""
+"Ce service Web a été appelé <i>MapOSMatic</i>, comme <i>map-o-matic</i> mais "
+"avec une référence à OpenStreetMap (OSM). Le service Web est écrit en Python "
+"en utilisant <a href=\"http://www.djangoproject.com\";>Django</a> et est "
+"chargé de stocker les demandes de rendu et d'afficher le résultat de ces "
+"demandes. Le rendu en tant que tel est effectué de manière asynchrone par le "
+"démon <i>maposmaticd</i>, de manière à ce qu'un seul rendu soit effectué à "
+"un instant donné, ce qui est très important étant donné la nature très "
+"intensive en charge processeur et d'entrées-sorties du processus de rendu."
#: templates/maposmatic/about.html:122
msgid ""
@@ -312,8 +364,10 @@ msgid ""
msgstr ""
"Pour le moteur de recherche de ville, nous utilisons le très pratique \n"
"service <a href=\"http://nominatim.openstreetmap.org\";>Nominatim</a>. Ce \n"
-"service a rendu très simple l'ajout d'un moteur de recherche permettant de
choisir \n"
-"parmi plusieurs villes de même nom, en offrant des informations sur la
localisation de la ville."
+"service a rendu très simple l'ajout d'un moteur de recherche permettant de "
+"choisir \n"
+"parmi plusieurs villes de même nom, en offrant des informations sur la "
+"localisation de la ville."
#: templates/maposmatic/about.html:130
msgid "Contributing"
@@ -325,7 +379,10 @@ msgid ""
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
"contribute. Here are the few starting points to help\n"
"us:"
-msgstr "Comme indiqué ci-dessus, <i>OCitySMap</i> et <i>MapOSMatic</i> sont
des Logiciels Libres, vous êtes donc invités à y contribuer. Voici quelques
points de départ pour nous aider :"
+msgstr ""
+"Comme indiqué ci-dessus, <i>OCitySMap</i> et <i>MapOSMatic</i> sont des "
+"Logiciels Libres, vous êtes donc invités à y contribuer. Voici quelques "
+"points de départ pour nous aider :"
#: templates/maposmatic/about.html:140
msgid ""
@@ -333,7 +390,9 @@ msgid ""
" <a href=\"http://wiki.maposmatic.org\";>MapOSMatic Wiki</a>,\n"
" which contains valuable technical information and documents about\n"
" MapOSMatic;"
-msgstr "Le <a href=\"http://wiki.maposmatic.org\";>Wiki de MapOSMatic</a>, qui
offre de nombreuses informations et documentations techniques sur
MapOSMatic ;"
+msgstr ""
+"Le <a href=\"http://wiki.maposmatic.org\";>Wiki de MapOSMatic</a>, qui offre "
+"de nombreuses informations et documentations techniques sur MapOSMatic ;"
#: templates/maposmatic/about.html:144
msgid ""
@@ -348,11 +407,13 @@ msgstr ""
#: templates/maposmatic/about.html:147
msgid ""
"The <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>development\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
+"\">development\n"
" mailing-list</a>;"
msgstr ""
"La <a\n"
-" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>liste de
diffusion pour le développement (en langue anglaise)</a> ;"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>liste de "
+"diffusion pour le développement (en langue anglaise)</a> ;"
#: templates/maposmatic/about.html:150
msgid ""
@@ -363,12 +424,15 @@ msgstr "Le canal IRC <tt>#maposmatic</tt> sur le réseau
Freenode ;"
#: templates/maposmatic/about.html:152
msgid ""
"The <a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git";
+"\">OCitySMap\n"
" Git repository</a>, which can be cloned using <tt>git clone\n"
" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
msgstr ""
"Le <a\n"
-" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>dépôt
Git OCitySMap</a>, qui peut être cloné via « <tt>git clone
git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt> » ;"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>dépôt "
+"Git OCitySMap</a>, qui peut être cloné via « <tt>git clone git://git.sv.gnu."
+"org/maposmatic/ocitysmap.git</tt> » ;"
#: templates/maposmatic/about.html:156
msgid ""
@@ -376,7 +440,10 @@ msgid ""
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
-msgstr "Le <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>dépôt
Git MapOSMatic</a>, qui peut être cloné via « <tt>git clone
git://git.sv.gnu.org/maposmatic.git</tt> » ;"
+msgstr ""
+"Le <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>dépôt Git "
+"MapOSMatic</a>, qui peut être cloné via « <tt>git clone git://git.sv.gnu.org/"
+"maposmatic.git</tt> » ;"
#: templates/maposmatic/about.html:160
msgid ""
@@ -416,8 +483,7 @@ msgstr "traduction Russe"
msgid "arabic translation"
msgstr "traduction Arabe"
-#: templates/maposmatic/about.html:186
-#: templates/maposmatic/about.html:187
+#: templates/maposmatic/about.html:186 templates/maposmatic/about.html:187
msgid "brasilian portuguese translation"
msgstr "traduction Portugaise (Brésil)"
@@ -441,11 +507,16 @@ msgstr "traduction Polonaise"
msgid "indonesian translation"
msgstr "traduction Indonésienne"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
msgid "norvegian bokmål translation"
msgstr "traduction Norvégien Bokmål"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "traduction Norvégien Bokmål"
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr "feuille de style pour l'impression"
@@ -454,8 +525,15 @@ msgid "Job list"
msgstr "Liste des rendus"
#: templates/maposmatic/all_jobs.html:39
-msgid "This page gives the status of the rendering queue, showing all requests
received during the last 24 hours as well as all unprocessed requests without
time limit. They are ordered starting from the most recent ones."
-msgstr "Cette page donne l'état de la file de rendu, affichant toutes les
demandes de rendu reçues durant les dernières 24 heures, ainsi que toutes les
demandes de rendu non traitées, sans limite de temps. Les demandes de rendu les
plus récentes sont affichés en premier."
+msgid ""
+"This page gives the status of the rendering queue, showing all requests "
+"received during the last 24 hours as well as all unprocessed requests "
+"without time limit. They are ordered starting from the most recent ones."
+msgstr ""
+"Cette page donne l'état de la file de rendu, affichant toutes les demandes "
+"de rendu reçues durant les dernières 24 heures, ainsi que toutes les "
+"demandes de rendu non traitées, sans limite de temps. Les demandes de rendu "
+"les plus récentes sont affichés en premier."
#: templates/maposmatic/all_jobs.html:54
msgid ""
@@ -463,13 +541,11 @@ msgid ""
"hours."
msgstr "Pas de demande de rendu de carte durant les dernières 24 heures."
-#: templates/maposmatic/all_maps.html:34
-#: templates/maposmatic/index.html:61
+#: templates/maposmatic/all_maps.html:34 templates/maposmatic/index.html:61
msgid "Search"
msgstr "Recherche"
-#: templates/maposmatic/all_maps.html:38
-#: templates/maposmatic/base.html:62
+#: templates/maposmatic/all_maps.html:38 templates/maposmatic/base.html:62
msgid "Maps"
msgstr "Cartes"
@@ -477,15 +553,15 @@ msgstr "Cartes"
msgid "MapOSMatic maps feed"
msgstr "Flux RSS des cartes MapOSMatic"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "Notre base de données ne contient aucun rendu pour l'instant."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr "Aucune carte ne correspond à votre recherche."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "Create a new map!"
msgstr "Créer une nouvelle carte !"
@@ -505,22 +581,30 @@ msgstr "Rendus"
msgid "News"
msgstr "Actualités"
-#: templates/maposmatic/base.html:64
-#: templates/maposmatic/donate.html:30
+#: templates/maposmatic/base.html:64 templates/maposmatic/donate.html:30
msgid "Donate"
msgstr "Faire un don"
#: templates/maposmatic/base.html:80
-msgid "The MapOSMatic rendering daemon is currently not running! Jobs will be
queued until the rendering daemon is back up."
-msgstr "Le démon de rendu MapOSMatic n'est pas actuellement en fonction ! Les
requêtes seront mises en file d'attente jusqu'à ce que le démon soit de nouveau
opérationnel."
+msgid ""
+"The MapOSMatic rendering daemon is currently not running! Jobs will be "
+"queued until the rendering daemon is back up."
+msgstr ""
+"Le démon de rendu MapOSMatic n'est pas actuellement en fonction ! Les "
+"requêtes seront mises en file d'attente jusqu'à ce que le démon soit de "
+"nouveau opérationnel."
#: templates/maposmatic/base.html:91
msgid "Donate to MapOSMatic"
msgstr "Faire un don à MapOSMatic"
#: templates/maposmatic/base.html:101
-msgid "You can donate to help us improve the service. See our <a
href=\"/donate\">donation</a> page."
-msgstr "Vous pouvez faire un don pour nous aider à améliorer ce service. Voir
notre <a href=\"/donate\">page de dons</a>."
+msgid ""
+"You can donate to help us improve the service. See our <a href=\"/donate"
+"\">donation</a> page."
+msgstr ""
+"Vous pouvez faire un don pour nous aider à améliorer ce service. Voir notre "
+"<a href=\"/donate\">page de dons</a>."
#: templates/maposmatic/base.html:106
msgid "OSM database status"
@@ -576,7 +660,9 @@ msgstr "Merci pour votre don!"
msgid ""
"We have received your donation, thanks for your\n"
"support to the MapOSMatic project!"
-msgstr "Nous avons bien reçu votre don, merci pour votre soutien au projet
MapOSMatic!"
+msgstr ""
+"Nous avons bien reçu votre don, merci pour votre soutien au projet "
+"MapOSMatic!"
#: templates/maposmatic/donate-thanks.html:35
msgid ""
@@ -586,7 +672,12 @@ msgid ""
"in charge of donations and funds. MapOSMatic is still an informal\n"
"gathering of developers, and we have not (yet) created a non-profit\n"
"organization to support the project."
-msgstr "Vous allez recevoir un e-mail de notification concernant votre don.
Cet e-mail indiquera que le don a été reçu par <i>Thomas Petazzoni</i>, qui est
le développeur MapOSMatic chargé des dons et du financement. MapOSMatic est
toujours un regroupement informel de développeurs, et nous n'avons pas (encore)
mis en place de structure juridique pour soutenir le projet."
+msgstr ""
+"Vous allez recevoir un e-mail de notification concernant votre don. Cet e-"
+"mail indiquera que le don a été reçu par <i>Thomas Petazzoni</i>, qui est le "
+"développeur MapOSMatic chargé des dons et du financement. MapOSMatic est "
+"toujours un regroupement informel de développeurs, et nous n'avons pas "
+"(encore) mis en place de structure juridique pour soutenir le projet."
#: templates/maposmatic/donate.html:31
msgid "Why donations are useful?"
@@ -594,28 +685,71 @@ msgstr "Pourquoi faire un don ?"
#: templates/maposmatic/donate.html:35
#, python-format
-msgid "MapOSMatic is a project entirely developed and maintained by a team of
volunteers (see our <a href=\"%(about_url)s\">About</a> page for details).
However, running the MapOSMatic service and making improvements to it have
various costs beyond the time of the volunteer developers."
-msgstr "MapOSMatic est un projet entièrement développé et réalisé par une
équipe de volontaires (voir notre <a href=\"%(about_url)s\">page À Propos</a>
pour des détails). Au-delà du bénévolat des développeurs, l'entretien et
l'amélioration du service MapOSMatic entraînent des coûts matériels et
logistiques."
+msgid ""
+"MapOSMatic is a project entirely developed and maintained by a team of "
+"volunteers (see our <a href=\"%(about_url)s\">About</a> page for details). "
+"However, running the MapOSMatic service and making improvements to it have "
+"various costs beyond the time of the volunteer developers."
+msgstr ""
+"MapOSMatic est un projet entièrement développé et réalisé par une équipe de "
+"volontaires (voir notre <a href=\"%(about_url)s\">page À Propos</a> pour des "
+"détails). Au-delà du bénévolat des développeurs, l'entretien et "
+"l'amélioration du service MapOSMatic entraînent des coûts matériels et "
+"logistiques."
#: templates/maposmatic/donate.html:37
msgid "Therefore, we are currently seeking donations to help us funding:"
-msgstr "Pour cette raison, nous recherchons actuellement des dons pour nous
aider à financer :"
+msgstr ""
+"Pour cette raison, nous recherchons actuellement des dons pour nous aider à "
+"financer :"
#: templates/maposmatic/donate.html:40
-msgid "Acquisition of a Solid-State Disk for the storage of our local copy of
the OpenStreetMap database. A SSD drive performs 40 to 50 times better than the
conventional hard drive we are using today, and would therefore help us to
reduce the lag between our local database and the official one, providing more
up-to-date maps. The cost of such hardware is about 500 to 700 €."
-msgstr "Achat d'un disque SSD pour le stockage de notre copie locale de la
base de données OpenStreetMap. Un tel disque offre des performances environ 40
à 50 fois meilleures que le disque dur conventionnel que nous utilisons
aujourd'hui. Cela nous aiderait ainsi à reduire le retard de notre base de
données par rapport à celle d'OpenStreetMap et donc à fournir des cartes plus à
jour. Le coût d'un tel matériel est d'environ 500 à 700 €."
+msgid ""
+"Acquisition of a Solid-State Disk for the storage of our local copy of the "
+"OpenStreetMap database. A SSD drive performs 40 to 50 times better than the "
+"conventional hard drive we are using today, and would therefore help us to "
+"reduce the lag between our local database and the official one, providing "
+"more up-to-date maps. The cost of such hardware is about 500 to 700 €."
+msgstr ""
+"Achat d'un disque SSD pour le stockage de notre copie locale de la base de "
+"données OpenStreetMap. Un tel disque offre des performances environ 40 à 50 "
+"fois meilleures que le disque dur conventionnel que nous utilisons "
+"aujourd'hui. Cela nous aiderait ainsi à reduire le retard de notre base de "
+"données par rapport à celle d'OpenStreetMap et donc à fournir des cartes "
+"plus à jour. Le coût d'un tel matériel est d'environ 500 à 700 €."
#: templates/maposmatic/donate.html:42
-msgid "Participation to the transportation expenses of the MapOSMatic
developers when they gather for <i>hackfests</i> (meeting of developers). You
can read our <a href=\"http://news.maposmatic.org\";>blog</a> to learn more
about what we achieve during those hackfests. We usually implement a huge
number of improvements, new features and bug fixes during those meetings. They
take place during the holidays of the developers, and we would like to at least
compensate their travel expenses."
-msgstr "Participation aux frais de déplacement des développeurs MapOSMatic
lorsqu'ils se réunissent pour des <i>hackfests</i> (réunion de développeurs).
Vous pouvez en savoir plus sur ce que nous réalisons lors de ces hackfests en
<a href=\"http://news.maposmatic.org\";>consultant notre blog</a>. C'est durant
ces réunions que nous implémentons un grand nombre d'améliorations, de
nouvelles fonctionnalités et de corrections de bugs. Ces hackfests ont lieu
durant les congés des développeurs, et nous souhaiterions pouvoir au moins
compenser les frais de déplacement."
+msgid ""
+"Participation to the transportation expenses of the MapOSMatic developers "
+"when they gather for <i>hackfests</i> (meeting of developers). You can read "
+"our <a href=\"http://news.maposmatic.org\";>blog</a> to learn more about what "
+"we achieve during those hackfests. We usually implement a huge number of "
+"improvements, new features and bug fixes during those meetings. They take "
+"place during the holidays of the developers, and we would like to at least "
+"compensate their travel expenses."
+msgstr ""
+"Participation aux frais de déplacement des développeurs MapOSMatic "
+"lorsqu'ils se réunissent pour des <i>hackfests</i> (réunion de "
+"développeurs). Vous pouvez en savoir plus sur ce que nous réalisons lors de "
+"ces hackfests en <a href=\"http://news.maposmatic.org\";>consultant notre "
+"blog</a>. C'est durant ces réunions que nous implémentons un grand nombre "
+"d'améliorations, de nouvelles fonctionnalités et de corrections de bugs. Ces "
+"hackfests ont lieu durant les congés des développeurs, et nous souhaiterions "
+"pouvoir au moins compenser les frais de déplacement."
#: templates/maposmatic/donate.html:46
msgid "Donating?"
msgstr "Faire un don ?"
#: templates/maposmatic/donate.html:48
-msgid "Donations can be done through the well-known <a
href=\"http://www.paypal.com\";>PayPal</a> service. We accept donations of any
amount: all donations are helpful, even the smallest ones."
-msgstr "Les dons peuvent être réalisés via l'incontournable plateforme <a
href=\"http://www.paypal.com\";>PayPal</a>. Nous acceptons les dons de tout
montant: tous les dons sont utiles, même les plus petits."
+msgid ""
+"Donations can be done through the well-known <a href=\"http://www.paypal.com";
+"\">PayPal</a> service. We accept donations of any amount: all donations are "
+"helpful, even the smallest ones."
+msgstr ""
+"Les dons peuvent être réalisés via l'incontournable plateforme <a href="
+"\"http://www.paypal.com\";>PayPal</a>. Nous acceptons les dons de tout "
+"montant: tous les dons sont utiles, même les plus petits."
#: templates/maposmatic/index.html:33
msgid "Introduction"
@@ -626,24 +760,56 @@ msgid "City map"
msgstr "Carte de la ville"
#: templates/maposmatic/index.html:42
-msgid "MapOSMatic is a free software web service that allows you to generate
maps of cities using <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>
data. MapOSMatic can generate two kinds of maps: :"
-msgstr "MapOSMatic est un service Web en Logiciel Libre qui vous permet de
générer des cartes de villes en utilisant les données <a
href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>. MapOSMatic peut
générer deux types de cartes :"
+msgid ""
+"MapOSMatic is a free software web service that allows you to generate maps "
+"of cities using <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> "
+"data. MapOSMatic can generate two kinds of maps: :"
+msgstr ""
+"MapOSMatic est un service Web en Logiciel Libre qui vous permet de générer "
+"des cartes de villes en utilisant les données <a href=\"http://www.";
+"openstreetmap.org\">OpenStreetMap</a>. MapOSMatic peut générer deux types de "
+"cartes :"
#: templates/maposmatic/index.html:46
-msgid "Single page posters, where the map and the street index are rendered
side by side. The map itself is split in squares so that streets are easy to
find. This format is typically useful for printing on large paper sheets."
-msgstr "Posters sur une seule page, où la carte et l'index des rues sont
disposés côte à côte. La carte est recouverte d'une grille facilitant la
recherche d'une rue. Ce format est bien adapté à l'impression sur des papiers
grand format."
+msgid ""
+"Single page posters, where the map and the street index are rendered side by "
+"side. The map itself is split in squares so that streets are easy to find. "
+"This format is typically useful for printing on large paper sheets."
+msgstr ""
+"Posters sur une seule page, où la carte et l'index des rues sont disposés "
+"côte à côte. La carte est recouverte d'une grille facilitant la recherche "
+"d'une rue. Ce format est bien adapté à l'impression sur des papiers grand "
+"format."
#: templates/maposmatic/index.html:48
-msgid "Multiple page booklets, where the map and the street index are split
into several pages. This format is typically useful for printing on standard
paper sheets."
-msgstr "Livrets prêts à relier, où la carte et l'index des rues sont découpés
sur plusieurs pages. Ce format est bien adapté à l'impression sur des formats
de papier standards."
+msgid ""
+"Multiple page booklets, where the map and the street index are split into "
+"several pages. This format is typically useful for printing on standard "
+"paper sheets."
+msgstr ""
+"Livrets prêts à relier, où la carte et l'index des rues sont découpés sur "
+"plusieurs pages. Ce format est bien adapté à l'impression sur des formats de "
+"papier standards."
#: templates/maposmatic/index.html:52
-msgid "The generated maps are available in PNG, PDF and SVG formats and are
ready to be printed."
-msgstr "Les cartes générées sont disponibles aux formats PNG, PDF et SVG et
sont prêtes à être imprimées."
+msgid ""
+"The generated maps are available in PNG, PDF and SVG formats and are ready "
+"to be printed."
+msgstr ""
+"Les cartes générées sont disponibles aux formats PNG, PDF et SVG et sont "
+"prêtes à être imprimées."
#: templates/maposmatic/index.html:56
-msgid "As the data used to generate maps is coming from OpenStreetMap, you can
freely (under the <a href=\"http://wiki.openstreetmap.org/wiki/License\";>terms
of OpenStreetMap license</a>) reuse, sell, modify, ... the generated maps."
-msgstr "Les données utilisées pour la génération des cartes provenant
d'OpenStreetMap, vous pouvez librement réutiliser, vendre, modifier, ... les
cartes générées (en respectant la <a
href=\"http://wiki.openstreetmap.org/wiki/License\";>licence OpenStreetMap</a>)."
+msgid ""
+"As the data used to generate maps is coming from OpenStreetMap, you can "
+"freely (under the <a href=\"http://wiki.openstreetmap.org/wiki/License";
+"\">terms of OpenStreetMap license</a>) reuse, sell, modify, ... the "
+"generated maps."
+msgstr ""
+"Les données utilisées pour la génération des cartes provenant "
+"d'OpenStreetMap, vous pouvez librement réutiliser, vendre, modifier, ... les "
+"cartes générées (en respectant la <a href=\"http://wiki.openstreetmap.org/";
+"wiki/License\">licence OpenStreetMap</a>)."
#: templates/maposmatic/index.html:60
msgid "Create a map"
@@ -657,15 +823,17 @@ msgstr "Chercher une carte"
msgid "More details"
msgstr "Plus d'informations"
-#: templates/maposmatic/job-page.html:39
-#: templates/maposmatic/job.html:35
+#: templates/maposmatic/job-page.html:39 templates/maposmatic/job.html:35
#: templates/maposmatic/map.html:35
msgid "Recreate map"
msgstr "Regénérer la carte"
#: templates/maposmatic/job-page.html:48
-msgid "You have been redirected to a similar map, rendered less than 24 hours
ago."
-msgstr "Vous avez été redirigé vers une carte similaire, créée il y a moins de
24 heures."
+msgid ""
+"You have been redirected to a similar map, rendered less than 24 hours ago."
+msgstr ""
+"Vous avez été redirigé vers une carte similaire, créée il y a moins de 24 "
+"heures."
#: templates/maposmatic/job-page.html:56
msgid "Refresh the status"
@@ -673,8 +841,12 @@ msgstr "Rafraîchir l'état du rendu"
#: templates/maposmatic/job-page.html:56
#, python-format
-msgid "(the page will refresh automatically every %(refresh)s seconds until
the rendering is completed)."
-msgstr "(la page se rechargera automatiquement toutes les %(refresh)s secondes
jusqu'à ce que le rendu soit terminé)."
+msgid ""
+"(the page will refresh automatically every %(refresh)s seconds until the "
+"rendering is completed)."
+msgstr ""
+"(la page se rechargera automatiquement toutes les %(refresh)s secondes "
+"jusqu'à ce que le rendu soit terminé)."
#: templates/maposmatic/job.html:48
msgid "Reported error: "
@@ -717,42 +889,44 @@ msgstr "Annulé le"
msgid "rendering took %(rendering)s"
msgstr "%(rendering)s de rendu"
-#: templates/maposmatic/job.html:79
-#: templates/maposmatic/map-feed.html:44
+#: templates/maposmatic/job.html:79 templates/maposmatic/map-feed.html:44
#: templates/maposmatic/map.html:57
msgid "Files: "
msgstr "Fichiers : "
-#: templates/maposmatic/job.html:81
-#: templates/maposmatic/map-feed.html:46
+#: templates/maposmatic/job.html:81 templates/maposmatic/map-feed.html:46
#: templates/maposmatic/map.html:59
msgid "Map: "
msgstr "Cartes : "
-#: templates/maposmatic/job.html:82
-#: templates/maposmatic/map-feed.html:47
+#: templates/maposmatic/job.html:82 templates/maposmatic/map-feed.html:47
#: templates/maposmatic/map.html:60
msgid "Index: "
msgstr "Index : "
-#: templates/maposmatic/job.html:85
-#: templates/maposmatic/map-feed.html:50
+#: templates/maposmatic/job.html:85 templates/maposmatic/map-feed.html:50
#: templates/maposmatic/map.html:63
-msgid "No index was generated because no information was available in
OpenStreetMap to create one. Feel free to contribute the missing data yourself.
See the <a href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>OSM
Wiki</a> for a start. "
-msgstr "Aucun index n'a été généré parce qu'il manque les informations dans
OpenStreetMap pour pouvoir en générer un. N'hésitez pas à contribuer les
données manquantes. Pour plus d'informations, refférer-vous au <a
href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>Wiki OSM</a>. "
+msgid ""
+"No index was generated because no information was available in OpenStreetMap "
+"to create one. Feel free to contribute the missing data yourself. See the <a "
+"href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>OSM Wiki</a> "
+"for a start. "
+msgstr ""
+"Aucun index n'a été généré parce qu'il manque les informations dans "
+"OpenStreetMap pour pouvoir en générer un. N'hésitez pas à contribuer les "
+"données manquantes. Pour plus d'informations, refférer-vous au <a href="
+"\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>Wiki OSM</a>. "
#: templates/maposmatic/job.html:88
msgid "View on OpenStreetMap"
msgstr "Voir sur OpenStreetMap"
-#: templates/maposmatic/job.html:92
-#: templates/maposmatic/map-feed.html:53
+#: templates/maposmatic/job.html:92 templates/maposmatic/map-feed.html:53
#: templates/maposmatic/map.html:66
msgid "The generated files are no longer available."
msgstr "Les fichiers générés ne sont plus disponibles."
-#: templates/maposmatic/map-feed.html:41
-#: templates/maposmatic/map.html:54
+#: templates/maposmatic/map-feed.html:41 templates/maposmatic/map.html:54
msgid "Rendering completed on"
msgstr "Rendu terminé le"
@@ -768,13 +942,11 @@ msgstr "Emplacement"
msgid "Title"
msgstr "Titre"
-#: templates/maposmatic/new.html:51
-#: templates/maposmatic/new.html.py:123
+#: templates/maposmatic/new.html:51 templates/maposmatic/new.html.py:123
msgid "Layout"
msgstr "Disposition"
-#: templates/maposmatic/new.html:54
-#: templates/maposmatic/new.html.py:128
+#: templates/maposmatic/new.html:54 templates/maposmatic/new.html.py:128
msgid "Stylesheet"
msgstr "Feuille de style"
@@ -782,8 +954,7 @@ msgstr "Feuille de style"
msgid "Paper size"
msgstr "Taille du papier"
-#: templates/maposmatic/new.html:60
-#: templates/maposmatic/new.html.py:145
+#: templates/maposmatic/new.html:60 templates/maposmatic/new.html.py:145
msgid "Language"
msgstr "Langue"
@@ -816,23 +987,36 @@ msgstr ""
#: templates/maposmatic/new.html:95
msgid ""
"You can use <tt>Shift+drag</tt> to zoom on a specific\n"
-" area of the map. Then, you must select with <tt>Control+drag</tt>
the\n"
+" area of the map. Then, you must select with <tt>Control+drag</tt> "
+"the\n"
" limits of the area you wish to render."
-msgstr "Vous pouvez utiliser <tt>Shift+cliquer-déplacer</tt> pour zoomer sur
une zone spécifique de la carte. Vous devez ensuite sélectionner les limites de
la zone que vous souhaitez rendre avec <tt>Contrôle+cliquer-déplacer</tt>."
+msgstr ""
+"Vous pouvez utiliser <tt>Shift+cliquer-déplacer</tt> pour zoomer sur une "
+"zone spécifique de la carte. Vous devez ensuite sélectionner les limites de "
+"la zone que vous souhaitez rendre avec <tt>Contrôle+cliquer-déplacer</tt>."
#: templates/maposmatic/new.html:101
msgid ""
"Area too big to be rendered. Please select a\n"
" smaller area."
-msgstr "Zone trop vaste pour être rendue. Veuillez sélectionner une zone plus
petite."
+msgstr ""
+"Zone trop vaste pour être rendue. Veuillez sélectionner une zone plus petite."
#: templates/maposmatic/new.html:112
msgid "No results."
msgstr "Aucun résultat."
#: templates/maposmatic/new.html:113
-msgid "Wondering why you can't choose some of these results?<br />Their
administrative boundaries are missing from the OSM database.<br />Look at the
<a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more
details."
-msgstr "Impossible de sélectionner certains de ces résultats?<br/>Leurs
limites administratives sont manquantes dans la base OSM.<br/>Consultez notre
<a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> pour plus de
détails."
+msgid ""
+"Wondering why you can't choose some of these results?<br />Their "
+"administrative boundaries are missing from the OSM database.<br />Look at "
+"the <a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more "
+"details."
+msgstr ""
+"Impossible de sélectionner certains de ces résultats?<br/>Leurs limites "
+"administratives sont manquantes dans la base OSM.<br/>Consultez notre <a "
+"href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> pour plus de "
+"détails."
#: templates/maposmatic/new.html:118
msgid "Map title"
diff --git a/www/locale/hr_HR/LC_MESSAGES/django.po
b/www/locale/hr_HR/LC_MESSAGES/django.po
index 80561b9..303122b 100644
--- a/www/locale/hr_HR/LC_MESSAGES/django.po
+++ b/www/locale/hr_HR/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2010-02-09 20:43+0100\n"
"Last-Translator: David MENTRÉ <address@hidden>\n"
"Language-Team: FR <address@hidden>\n"
@@ -516,11 +516,15 @@ msgstr ""
msgid "indonesian translation"
msgstr ""
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
msgid "norvegian bokmål translation"
msgstr ""
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+msgid "norvegian nynorsk translation"
+msgstr ""
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr ""
@@ -557,15 +561,15 @@ msgstr "Karte"
msgid "MapOSMatic maps feed"
msgstr ""
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
#, fuzzy
msgid "Create a new map!"
msgstr "Izradi kartu"
diff --git a/www/locale/id/LC_MESSAGES/django.po
b/www/locale/id/LC_MESSAGES/django.po
index 1d77b3b..ed66e8c 100644
--- a/www/locale/id/LC_MESSAGES/django.po
+++ b/www/locale/id/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2012-12-23 22:18-0800\n"
"Last-Translator: Jeff Haack <address@hidden>\n"
"Language-Team: MapOSMatic <address@hidden>\n"
@@ -546,12 +546,17 @@ msgstr "terjemahan bahasa Polandia"
msgid "indonesian translation"
msgstr "terjemahan bahasa Rusia"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
#, fuzzy
msgid "norvegian bokmål translation"
msgstr "terjemahan bahasa Rusia"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "terjemahan bahasa Rusia"
+
+#: templates/maposmatic/about.html:196
#, fuzzy
msgid "printable stylesheet"
msgstr "Stylesheet"
@@ -590,15 +595,15 @@ msgstr "Peta"
msgid "MapOSMatic maps feed"
msgstr "MapOSMatic maps feed"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "Saat ini database kami tidak memiliki peta yang telah dirender."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr "Tidak ada peta yang cocok dengan query Anda."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
#, fuzzy
msgid "Create a new map!"
msgstr "Buat peta baru!"
diff --git a/www/locale/it/LC_MESSAGES/django.po
b/www/locale/it/LC_MESSAGES/django.po
index 4d3e544..337ebb2 100644
--- a/www/locale/it/LC_MESSAGES/django.po
+++ b/www/locale/it/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2009-12-25 11:49+0100\n"
"Last-Translator: Thomas Petazzoni <address@hidden>\n"
"Language-Team: IT <address@hidden>\n"
@@ -458,11 +458,15 @@ msgstr ""
msgid "indonesian translation"
msgstr ""
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
msgid "norvegian bokmål translation"
msgstr ""
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+msgid "norvegian nynorsk translation"
+msgstr ""
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr ""
@@ -496,15 +500,15 @@ msgstr "Mappe"
msgid "MapOSMatic maps feed"
msgstr ""
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "Create a new map!"
msgstr ""
diff --git a/www/locale/nb/LC_MESSAGES/django.po
b/www/locale/nb/LC_MESSAGES/django.po
index eec57af..2c9693a 100644
--- a/www/locale/nb/LC_MESSAGES/django.po
+++ b/www/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2010-08-05 14:38+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <address@hidden>\n"
"Language-Team: Norwegian Bokmål <address@hidden>\n"
@@ -467,12 +467,17 @@ msgstr "polsk oversettelse"
msgid "indonesian translation"
msgstr "russisk oversettelse"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
#, fuzzy
msgid "norvegian bokmål translation"
msgstr "russisk oversettelse"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "russisk oversettelse"
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr ""
@@ -508,15 +513,15 @@ msgstr "Kart"
msgid "MapOSMatic maps feed"
msgstr "MapOSMatic kart-feed"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "Vår database inneholder ingen ferdigtegnede kart for øyeblikket."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
#, fuzzy
msgid "Create a new map!"
msgstr "Opprett kart"
diff --git a/www/locale/nl_NL/LC_MESSAGES/django.po
b/www/locale/nl_NL/LC_MESSAGES/django.po
index e0a4a22..9f01a2c 100644
--- a/www/locale/nl_NL/LC_MESSAGES/django.po
+++ b/www/locale/nl_NL/LC_MESSAGES/django.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 01:39+0200\n"
-"PO-Revision-Date: 2012-04-02 23:29+0100\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
+"PO-Revision-Date: 2012-04-07 19:03+0100\n"
"Last-Translator: Jeroen van Rijn <address@hidden>\n"
"Language-Team: MapOSMatic Dutch Translation team\n"
"Language: nl\n"
@@ -51,13 +51,13 @@ msgid "Bounding box"
msgstr "Kader"
#: maposmatic/forms.py:60
-msgid "Landscape"
-msgstr "Landschap"
-
-#: maposmatic/forms.py:61
msgid "Portrait"
msgstr "Portret"
+#: maposmatic/forms.py:61
+msgid "Landscape"
+msgstr "Landschap"
+
#: maposmatic/forms.py:73
msgid "Area"
msgstr "Gebied"
@@ -496,10 +496,15 @@ msgid "indonesian translation"
msgstr "indonesische vertaling"
#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:194
msgid "norvegian bokmål translation"
msgstr "noorse (bokmål) vertaling"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+msgid "norvegian nynorsk translation"
+msgstr "noorse (nynorsk) vertaling"
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr "afdrukbaar stijlblad"
@@ -533,15 +538,15 @@ msgstr "Kaarten"
msgid "MapOSMatic maps feed"
msgstr "MapOSMatic kaarten webfeed"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "Onze database bevat op het moment geen gereproduceerde kaarten."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr "Geen kaart voldoet aan uw vraag."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "Create a new map!"
msgstr "Maak nieuwe kaart!"
diff --git a/www/locale/pl/LC_MESSAGES/django.po
b/www/locale/pl/LC_MESSAGES/django.po
index b90b881..9be962d 100644
--- a/www/locale/pl/LC_MESSAGES/django.po
+++ b/www/locale/pl/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2010-07-07 18:32+0200\n"
"Last-Translator: Łukasz Jernaś <address@hidden>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -496,12 +496,17 @@ msgstr "tłumaczenie na język polski"
msgid "indonesian translation"
msgstr "tłumaczenie na język rosyjski"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
#, fuzzy
msgid "norvegian bokmål translation"
msgstr "tłumaczenie na język rosyjski"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "tłumaczenie na język rosyjski"
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr ""
@@ -537,15 +542,15 @@ msgstr "Mapy"
msgid "MapOSMatic maps feed"
msgstr "Kanał MapOSMatic"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "Nasza baza danych aktualnie nie zawiera żadnych utworzonych map."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr ""
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
#, fuzzy
msgid "Create a new map!"
msgstr "Tworzenie mapy"
diff --git a/www/locale/pt_BR/LC_MESSAGES/django.po
b/www/locale/pt_BR/LC_MESSAGES/django.po
index e6c6054..1636578 100644
--- a/www/locale/pt_BR/LC_MESSAGES/django.po
+++ b/www/locale/pt_BR/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 15:58+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2012-04-02 21:44-0300\n"
"Last-Translator: Rodrigo de Avila <address@hidden>\n"
"Language-Team: PT <address@hidden>\n"
@@ -96,8 +96,7 @@ msgstr "Índice de ruas pelo %(title)s (format %(format)s)"
msgid "Administrative area too big for rendering"
msgstr "Área administrativa muito grande para renderizar"
-#: maposmatic/nominatim.py:285
-#: maposmatic/nominatim.py:299
+#: maposmatic/nominatim.py:285 maposmatic/nominatim.py:299
msgid "No administrative boundary"
msgstr "Sem limite administrativo"
@@ -130,24 +129,33 @@ msgid "Rendering was successful."
msgstr "Renderização concluída com sucesso."
#: maposmatic/templatetags/extratags.py:41
-msgid "Rendering failed! Please contact address@hidden for more information."
-msgstr "A renderização falhou! or favor contate address@hidden para mais
informações."
+msgid ""
+"Rendering failed! Please contact address@hidden for more information."
+msgstr ""
+"A renderização falhou! or favor contate address@hidden para mais "
+"informações."
#: maposmatic/templatetags/extratags.py:44
-msgid "Rendering is obsolete: the rendering was successful, but the files are
no longer available."
-msgstr "A renderização é obsoleta: ela foi bem sucedida, mas os arquivos não
estão mais disponíveis"
+msgid ""
+"Rendering is obsolete: the rendering was successful, but the files are no "
+"longer available."
+msgstr ""
+"A renderização é obsoleta: ela foi bem sucedida, mas os arquivos não estão "
+"mais disponíveis"
#: maposmatic/templatetags/extratags.py:46
-msgid "Obsolete failed rendering: the rendering failed, and the incomplete
files have been removed."
-msgstr "Falhas de renderização obsoleta: a renderização falhou, e os arquivos
incompletos foram removidos"
+msgid ""
+"Obsolete failed rendering: the rendering failed, and the incomplete files "
+"have been removed."
+msgstr ""
+"Falhas de renderização obsoleta: a renderização falhou, e os arquivos "
+"incompletos foram removidos"
#: maposmatic/templatetags/extratags.py:48
msgid "The rendering was cancelled by the user."
msgstr "A renderização foi cancelada pelo usuário."
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:59
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:59
msgid "Home"
msgstr "Início"
@@ -183,8 +191,7 @@ msgstr "Erro no servidor <em>(500)</em>"
msgid "There's been an error."
msgstr "Um erro aconteceu."
-#: templates/maposmatic/about.html:35
-#: templates/maposmatic/base.html:65
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:65
msgid "About"
msgstr "Sobre"
@@ -193,14 +200,15 @@ msgid "History"
msgstr "Histórico"
#: templates/maposmatic/about.html:39
-#, python-format
+#, fuzzy, python-format
msgid ""
"MapOSMatic has been started thanks to an idea of\n"
"Gilles Lamiral, an <a\n"
"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> and free\n"
"software contributor of Rennes area, France. From his idea, a group of\n"
"crazy <a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\";>hackers</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture";
+"%29\">hackers</a>\n"
"met together during a one-week <em>Hackfest</em> in August 2009 and\n"
"brought the idea of Gilles Lamiral to life by writing the code and\n"
"named the project <strong>MapOSMatic</strong>. The group of crazy\n"
@@ -209,12 +217,17 @@ msgid ""
msgstr ""
"O MapOSMatic começou graças a uma ideia de\n"
"Gilles Lamiral, um colaborador\n"
-"do <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> e de software
livre\n"
+"do <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> e de software "
+"livre\n"
"da região de Rennes, na França. Dessa ideia, um grupo de \n"
-"<a
href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\";>hackers</a>\n"
-"malucos se encontraram durante uma semana na <em>Hackfest</em> em Agosto de
2009 e\n"
-"trouxeram a ideia de Gilles Lamiral à vida escrevendo o código e nomeando o
projeto\n"
-"<strong>MapOSMatic</strong>. O grupo de hackers malucos gostaria de agradecer
a Gilles\n"
+"<a href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture";
+"%29\">hackers</a>\n"
+"malucos se encontraram durante uma semana na <em>Hackfest</em> em Agosto de "
+"2009 e\n"
+"trouxeram a ideia de Gilles Lamiral à vida escrevendo o código e nomeando o "
+"projeto\n"
+"<strong>MapOSMatic</strong>. O grupo de hackers malucos gostaria de "
+"agradecer a Gilles\n"
"por compartilhar sua brilhante ideia!"
#: templates/maposmatic/about.html:53
@@ -249,12 +262,14 @@ msgstr ""
"href=\"http://www.postgresql.org\";>PostgreSQL</a>, com a extensão <a\n"
"href=\"http://postgis.refractions.net\";>PostGIS</a>. Neste servidor\n"
"PostgreSQL, nós carregamos os <a\n"
-"href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\";>dados do
OpenStreetMap\n"
+"href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\";>dados do "
+"OpenStreetMap\n"
"de todo o mundo</a> usando a ferramenta <a\n"
"href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\";>osm2pgsql</a>.\n"
"A mesma ferramenta é usada para aplicar as <a\n"
"href=\"http://planet.openstreetmap.org/daily/\";>atualizações diárias</a> no\n"
-"banco de dados, o que nos permite estar atualizados com as novas
contribuições\n"
+"banco de dados, o que nos permite estar atualizados com as novas "
+"contribuições\n"
"dos colaboradores do OpenStreetMap."
#: templates/maposmatic/about.html:77
@@ -262,15 +277,19 @@ msgid ""
"For the map rendering, we use the\n"
"famous <a href=\"http://www.mapnik.org\";>Mapnik</a> with the OpenStreetMap\n"
"stylesheet\n"
-"available <a
href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\";>in\n"
+"available <a href=\"http://svn.openstreetmap.org/applications/rendering/";
+"mapnik\">in\n"
"OpenStreetMap Subversion repository</a>. Using Mapnik\n"
"and <a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, we\n"
"built <i>OCitySMap</i>, a Python module that:"
msgstr ""
"Para a renderização do mapa, usamos o famoso <a\n"
-"href=\"http://www.mapnik.org\";>Mapnik</a> com a folha de estilos do
OpenStreetMap disponível no <a\n"
-"href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\";>repositório
Subversion do OpenStreetMap</a>.\n"
-"Usando Mapnik e <a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, nós
desenvolvemos o <i>OCitySMap</i>, um módulo Python que:"
+"href=\"http://www.mapnik.org\";>Mapnik</a> com a folha de estilos do "
+"OpenStreetMap disponível no <a\n"
+"href=\"http://svn.openstreetmap.org/applications/rendering/mapnik";
+"\">repositório Subversion do OpenStreetMap</a>.\n"
+"Usando Mapnik e <a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, nós "
+"desenvolvemos o <i>OCitySMap</i>, um módulo Python que:"
#: templates/maposmatic/about.html:87
msgid ""
@@ -357,7 +376,8 @@ msgid ""
"providing informations on the city location."
msgstr ""
"Como motor de busca de cidades, nós usamos o maravilhoso serviço\n"
-"<a href=\"http://nominatim.openstreetmap.org\";>Nominatim</a>. Este serviço
torna realmente simples\n"
+"<a href=\"http://nominatim.openstreetmap.org\";>Nominatim</a>. Este serviço "
+"torna realmente simples\n"
"prover uma interface de busca que permita selecionar múltiplas cidades\n"
"com o mesmo nome, ao prover informações sobre a localização da cidade."
@@ -401,11 +421,13 @@ msgstr ""
#: templates/maposmatic/about.html:147
msgid ""
"The <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>development\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
+"\">development\n"
" mailing-list</a>;"
msgstr ""
"A <a\n"
-" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>lista de
email\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>lista de "
+"email\n"
" de desenvolvimento</a> (em inglês);"
#: templates/maposmatic/about.html:150
@@ -419,12 +441,14 @@ msgstr ""
#: templates/maposmatic/about.html:152
msgid ""
"The <a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git";
+"\">OCitySMap\n"
" Git repository</a>, which can be cloned using <tt>git clone\n"
" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
msgstr ""
"O <a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>repositório
Git do\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git";
+"\">repositório Git do\n"
" OCitySMap</a>, que pode ser clonado com\n"
" <tt>git clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
@@ -436,7 +460,8 @@ msgid ""
" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
msgstr ""
"O <a\n"
-" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>repositório Git
do\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>repositório Git "
+"do\n"
" MapOSMatic</a>, que pode ser clonado com\n"
" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
@@ -478,8 +503,7 @@ msgstr "tradução para o russo"
msgid "arabic translation"
msgstr "tradução para o árabe"
-#: templates/maposmatic/about.html:186
-#: templates/maposmatic/about.html:187
+#: templates/maposmatic/about.html:186 templates/maposmatic/about.html:187
msgid "brasilian portuguese translation"
msgstr "tradução para o português brasileiro"
@@ -503,11 +527,16 @@ msgstr "tradução para o polonês"
msgid "indonesian translation"
msgstr "tradução para o indonésio"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
msgid "norvegian bokmål translation"
msgstr "tradução para norvegian bokmål"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "tradução para norvegian bokmål"
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr "folha de estilo para impressora"
@@ -516,8 +545,14 @@ msgid "Job list"
msgstr "Fila de trabalhos"
#: templates/maposmatic/all_jobs.html:39
-msgid "This page gives the status of the rendering queue, showing all requests
received during the last 24 hours as well as all unprocessed requests without
time limit. They are ordered starting from the most recent ones."
-msgstr "Esta página mostra o status da fila de renderização, mostrando todos
os pedidos recebidos nas últimas 24 horas, assim como os pedidos não
processados, sem data-limite. Eles estão ordenados a partir do mais recente."
+msgid ""
+"This page gives the status of the rendering queue, showing all requests "
+"received during the last 24 hours as well as all unprocessed requests "
+"without time limit. They are ordered starting from the most recent ones."
+msgstr ""
+"Esta página mostra o status da fila de renderização, mostrando todos os "
+"pedidos recebidos nas últimas 24 horas, assim como os pedidos não "
+"processados, sem data-limite. Eles estão ordenados a partir do mais recente."
#: templates/maposmatic/all_jobs.html:54
msgid ""
@@ -527,13 +562,11 @@ msgstr ""
"Nenhum pedido de renderização de mapas desde\n"
"as últimas 24 horas."
-#: templates/maposmatic/all_maps.html:34
-#: templates/maposmatic/index.html:61
+#: templates/maposmatic/all_maps.html:34 templates/maposmatic/index.html:61
msgid "Search"
msgstr "Procurar"
-#: templates/maposmatic/all_maps.html:38
-#: templates/maposmatic/base.html:62
+#: templates/maposmatic/all_maps.html:38 templates/maposmatic/base.html:62
msgid "Maps"
msgstr "Mapas"
@@ -541,15 +574,15 @@ msgstr "Mapas"
msgid "MapOSMatic maps feed"
msgstr "Feed de mapas do MapOSMatic"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "Nossa base de dados não contém nenhum mapa neste momento."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr "Nenhum mapa coincide com sua pesquisa."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "Create a new map!"
msgstr "Criar um novo mapa\""
@@ -569,22 +602,29 @@ msgstr "Trabalhos"
msgid "News"
msgstr "Notícias"
-#: templates/maposmatic/base.html:64
-#: templates/maposmatic/donate.html:30
+#: templates/maposmatic/base.html:64 templates/maposmatic/donate.html:30
msgid "Donate"
msgstr "Fazer uma Doação"
#: templates/maposmatic/base.html:80
-msgid "The MapOSMatic rendering daemon is currently not running! Jobs will be
queued until the rendering daemon is back up."
-msgstr "O serviço de renderização do MapOSMatic não está rodando! Os trabalhos
ficarão na fila até que o serviço de renderização volte a funcionar."
+msgid ""
+"The MapOSMatic rendering daemon is currently not running! Jobs will be "
+"queued until the rendering daemon is back up."
+msgstr ""
+"O serviço de renderização do MapOSMatic não está rodando! Os trabalhos "
+"ficarão na fila até que o serviço de renderização volte a funcionar."
#: templates/maposmatic/base.html:91
msgid "Donate to MapOSMatic"
msgstr "Fazer uma doação ao MapOSMatic"
#: templates/maposmatic/base.html:101
-msgid "You can donate to help us improve the service. See our <a
href=\"/donate\">donation</a> page."
-msgstr "Você pode fazer uma doação para nos ajudar a melhorar o serviço. Veja
a nossa página de <a href=\"/donate\">doações</a>."
+msgid ""
+"You can donate to help us improve the service. See our <a href=\"/donate"
+"\">donation</a> page."
+msgstr ""
+"Você pode fazer uma doação para nos ajudar a melhorar o serviço. Veja a "
+"nossa página de <a href=\"/donate\">doações</a>."
#: templates/maposmatic/base.html:106
msgid "OSM database status"
@@ -666,28 +706,67 @@ msgstr "Porque as doações são úteis?"
#: templates/maposmatic/donate.html:35
#, python-format
-msgid "MapOSMatic is a project entirely developed and maintained by a team of
volunteers (see our <a href=\"%(about_url)s\">About</a> page for details).
However, running the MapOSMatic service and making improvements to it have
various costs beyond the time of the volunteer developers."
-msgstr "O MapOSMatic é um projeto desenvolvido e mantido inteiramente por um
time de voluntários (veja na nossa página <a href=\"%(about_url)s\">Sobre</a>
para detalhes). No entanto, executar o serviço do MapOSMatic e fazer melhorias
nele tem vários custos além do tempo destes desenvolvedores voluntários."
+msgid ""
+"MapOSMatic is a project entirely developed and maintained by a team of "
+"volunteers (see our <a href=\"%(about_url)s\">About</a> page for details). "
+"However, running the MapOSMatic service and making improvements to it have "
+"various costs beyond the time of the volunteer developers."
+msgstr ""
+"O MapOSMatic é um projeto desenvolvido e mantido inteiramente por um time de "
+"voluntários (veja na nossa página <a href=\"%(about_url)s\">Sobre</a> para "
+"detalhes). No entanto, executar o serviço do MapOSMatic e fazer melhorias "
+"nele tem vários custos além do tempo destes desenvolvedores voluntários."
#: templates/maposmatic/donate.html:37
msgid "Therefore, we are currently seeking donations to help us funding:"
msgstr "Por isso, atualmente estamos por doações para nos ajudar a financiar:"
#: templates/maposmatic/donate.html:40
-msgid "Acquisition of a Solid-State Disk for the storage of our local copy of
the OpenStreetMap database. A SSD drive performs 40 to 50 times better than the
conventional hard drive we are using today, and would therefore help us to
reduce the lag between our local database and the official one, providing more
up-to-date maps. The cost of such hardware is about 500 to 700 €."
-msgstr "A aquisição de um disco em estado sólido para armazenar a nossa cópia
local da base de dados do OpenStreetMap. Um drive SSD tem performance 40 ou 50
vezes melhor que um disco rígido convencional usado hoje, e vai nos ajudar a
diminuir a diferença entre a nossa base local e a oficial, provendo assim mapas
mais atualizados. O custo deste drive está em torno de 500 a 700 €."
+msgid ""
+"Acquisition of a Solid-State Disk for the storage of our local copy of the "
+"OpenStreetMap database. A SSD drive performs 40 to 50 times better than the "
+"conventional hard drive we are using today, and would therefore help us to "
+"reduce the lag between our local database and the official one, providing "
+"more up-to-date maps. The cost of such hardware is about 500 to 700 €."
+msgstr ""
+"A aquisição de um disco em estado sólido para armazenar a nossa cópia local "
+"da base de dados do OpenStreetMap. Um drive SSD tem performance 40 ou 50 "
+"vezes melhor que um disco rígido convencional usado hoje, e vai nos ajudar a "
+"diminuir a diferença entre a nossa base local e a oficial, provendo assim "
+"mapas mais atualizados. O custo deste drive está em torno de 500 a 700 €."
#: templates/maposmatic/donate.html:42
-msgid "Participation to the transportation expenses of the MapOSMatic
developers when they gather for <i>hackfests</i> (meeting of developers). You
can read our <a href=\"http://news.maposmatic.org\";>blog</a> to learn more
about what we achieve during those hackfests. We usually implement a huge
number of improvements, new features and bug fixes during those meetings. They
take place during the holidays of the developers, and we would like to at least
compensate their travel expenses."
-msgstr "Participação nos custos de transporte dos desenvolvedores do
MapOSMatic quando forem organizados <i>hackfests</i> (reuniões de
desenvolvedores). Você pode ler nosso <a
href=\"http://news.maposmatic.org\";>blog</a> para aprender mais sobre o que nós
fazemos durante estes hackfests. Nós normalmente implementamos um número grande
de melhorias, novas funcionalidades e correções de bugs durante estas reuniões.
Elas são feitas durante os feriados dos desenvolvedores, e nós gostaríamos de,
pelo menos, compensar seus gastos com transporte."
+msgid ""
+"Participation to the transportation expenses of the MapOSMatic developers "
+"when they gather for <i>hackfests</i> (meeting of developers). You can read "
+"our <a href=\"http://news.maposmatic.org\";>blog</a> to learn more about what "
+"we achieve during those hackfests. We usually implement a huge number of "
+"improvements, new features and bug fixes during those meetings. They take "
+"place during the holidays of the developers, and we would like to at least "
+"compensate their travel expenses."
+msgstr ""
+"Participação nos custos de transporte dos desenvolvedores do MapOSMatic "
+"quando forem organizados <i>hackfests</i> (reuniões de desenvolvedores). "
+"Você pode ler nosso <a href=\"http://news.maposmatic.org\";>blog</a> para "
+"aprender mais sobre o que nós fazemos durante estes hackfests. Nós "
+"normalmente implementamos um número grande de melhorias, novas "
+"funcionalidades e correções de bugs durante estas reuniões. Elas são feitas "
+"durante os feriados dos desenvolvedores, e nós gostaríamos de, pelo menos, "
+"compensar seus gastos com transporte."
#: templates/maposmatic/donate.html:46
msgid "Donating?"
msgstr "Quer fazer uma doação?"
#: templates/maposmatic/donate.html:48
-msgid "Donations can be done through the well-known <a
href=\"http://www.paypal.com\";>PayPal</a> service. We accept donations of any
amount: all donations are helpful, even the smallest ones."
-msgstr "Doações podem ser feitas pelo bem conhecido serviço <a
href=\"http://www.paypal.com\";>PayPal</a>. Nós aceitamos doações de qualquer
quantia: todas elas são de grande ajuda, mesmo as menores."
+msgid ""
+"Donations can be done through the well-known <a href=\"http://www.paypal.com";
+"\">PayPal</a> service. We accept donations of any amount: all donations are "
+"helpful, even the smallest ones."
+msgstr ""
+"Doações podem ser feitas pelo bem conhecido serviço <a href=\"http://www.";
+"paypal.com\">PayPal</a>. Nós aceitamos doações de qualquer quantia: todas "
+"elas são de grande ajuda, mesmo as menores."
#: templates/maposmatic/index.html:33
msgid "Introduction"
@@ -698,24 +777,55 @@ msgid "City map"
msgstr "Mapa de cidade"
#: templates/maposmatic/index.html:42
-msgid "MapOSMatic is a free software web service that allows you to generate
maps of cities using <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>
data. MapOSMatic can generate two kinds of maps: :"
-msgstr "O MapOSMatic é um serviço web baseado em software livre que permite
gerar mapas de cidades usando dados do <a
href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>. O MapOSMatic pode
gerar dois tipos de mapas:"
+msgid ""
+"MapOSMatic is a free software web service that allows you to generate maps "
+"of cities using <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> "
+"data. MapOSMatic can generate two kinds of maps: :"
+msgstr ""
+"O MapOSMatic é um serviço web baseado em software livre que permite gerar "
+"mapas de cidades usando dados do <a href=\"http://www.openstreetmap.org";
+"\">OpenStreetMap</a>. O MapOSMatic pode gerar dois tipos de mapas:"
#: templates/maposmatic/index.html:46
-msgid "Single page posters, where the map and the street index are rendered
side by side. The map itself is split in squares so that streets are easy to
find. This format is typically useful for printing on large paper sheets."
-msgstr "Pôsters de uma página. onde o mapa e o índice de ruas são renderizados
lado a lado. O mapa em si é dividido em quadrados, para que as ruas fiquem
fáceis de serem encontradas. Este formato é tipicamente útil para impressão em
folhas grandes de papel."
+msgid ""
+"Single page posters, where the map and the street index are rendered side by "
+"side. The map itself is split in squares so that streets are easy to find. "
+"This format is typically useful for printing on large paper sheets."
+msgstr ""
+"Pôsters de uma página. onde o mapa e o índice de ruas são renderizados lado "
+"a lado. O mapa em si é dividido em quadrados, para que as ruas fiquem fáceis "
+"de serem encontradas. Este formato é tipicamente útil para impressão em "
+"folhas grandes de papel."
#: templates/maposmatic/index.html:48
-msgid "Multiple page booklets, where the map and the street index are split
into several pages. This format is typically useful for printing on standard
paper sheets."
-msgstr "Vários folhetos de página, onde o mapa e o índice de ruas são
divididos em diversas páginas. Este formato é tipicamente útil para impressão
em folhas de papel de tamanho normal."
+msgid ""
+"Multiple page booklets, where the map and the street index are split into "
+"several pages. This format is typically useful for printing on standard "
+"paper sheets."
+msgstr ""
+"Vários folhetos de página, onde o mapa e o índice de ruas são divididos em "
+"diversas páginas. Este formato é tipicamente útil para impressão em folhas "
+"de papel de tamanho normal."
#: templates/maposmatic/index.html:52
-msgid "The generated maps are available in PNG, PDF and SVG formats and are
ready to be printed."
-msgstr "Os mapas gerados estão disponíveis nos formatos PNG, PDF e SVG e estão
prontos para serem impressos."
+msgid ""
+"The generated maps are available in PNG, PDF and SVG formats and are ready "
+"to be printed."
+msgstr ""
+"Os mapas gerados estão disponíveis nos formatos PNG, PDF e SVG e estão "
+"prontos para serem impressos."
#: templates/maposmatic/index.html:56
-msgid "As the data used to generate maps is coming from OpenStreetMap, you can
freely (under the <a href=\"http://wiki.openstreetmap.org/wiki/License\";>terms
of OpenStreetMap license</a>) reuse, sell, modify, ... the generated maps."
-msgstr "Como os dados utilizados para gerar os mapas vem do OpenStreetMap,
você poderá reutilizr, vender, modificar... os mapas gerados de forma livre
(desde que respeite os termos da <a
href=\"http://wiki.openstreetmap.org/wiki/License\";>licença do
OpenStreetMap</a>)."
+msgid ""
+"As the data used to generate maps is coming from OpenStreetMap, you can "
+"freely (under the <a href=\"http://wiki.openstreetmap.org/wiki/License";
+"\">terms of OpenStreetMap license</a>) reuse, sell, modify, ... the "
+"generated maps."
+msgstr ""
+"Como os dados utilizados para gerar os mapas vem do OpenStreetMap, você "
+"poderá reutilizr, vender, modificar... os mapas gerados de forma livre "
+"(desde que respeite os termos da <a href=\"http://wiki.openstreetmap.org/";
+"wiki/License\">licença do OpenStreetMap</a>)."
#: templates/maposmatic/index.html:60
msgid "Create a map"
@@ -729,15 +839,17 @@ msgstr "Encontrar um mapa"
msgid "More details"
msgstr "Mais detalhes"
-#: templates/maposmatic/job-page.html:39
-#: templates/maposmatic/job.html:35
+#: templates/maposmatic/job-page.html:39 templates/maposmatic/job.html:35
#: templates/maposmatic/map.html:35
msgid "Recreate map"
msgstr "Recriar o mapa"
#: templates/maposmatic/job-page.html:48
-msgid "You have been redirected to a similar map, rendered less than 24 hours
ago."
-msgstr "Você foi redirecionado a um mapa similar, renderizado a menos de 24
horas atrás."
+msgid ""
+"You have been redirected to a similar map, rendered less than 24 hours ago."
+msgstr ""
+"Você foi redirecionado a um mapa similar, renderizado a menos de 24 horas "
+"atrás."
#: templates/maposmatic/job-page.html:56
msgid "Refresh the status"
@@ -745,8 +857,12 @@ msgstr "Atualizar o status"
#: templates/maposmatic/job-page.html:56
#, python-format
-msgid "(the page will refresh automatically every %(refresh)s seconds until
the rendering is completed)."
-msgstr "(a página será atualizada automaticamente a cada %(refresh)s segundos,
até que a renderização esteja completa)."
+msgid ""
+"(the page will refresh automatically every %(refresh)s seconds until the "
+"rendering is completed)."
+msgstr ""
+"(a página será atualizada automaticamente a cada %(refresh)s segundos, até "
+"que a renderização esteja completa)."
#: templates/maposmatic/job.html:48
msgid "Reported error: "
@@ -789,42 +905,44 @@ msgstr "Cancelado em"
msgid "rendering took %(rendering)s"
msgstr "renderização demorou %(rendering)s"
-#: templates/maposmatic/job.html:79
-#: templates/maposmatic/map-feed.html:44
+#: templates/maposmatic/job.html:79 templates/maposmatic/map-feed.html:44
#: templates/maposmatic/map.html:57
msgid "Files: "
msgstr "Arquivos:"
-#: templates/maposmatic/job.html:81
-#: templates/maposmatic/map-feed.html:46
+#: templates/maposmatic/job.html:81 templates/maposmatic/map-feed.html:46
#: templates/maposmatic/map.html:59
msgid "Map: "
msgstr "Mapa:"
-#: templates/maposmatic/job.html:82
-#: templates/maposmatic/map-feed.html:47
+#: templates/maposmatic/job.html:82 templates/maposmatic/map-feed.html:47
#: templates/maposmatic/map.html:60
msgid "Index: "
msgstr "Índice:"
-#: templates/maposmatic/job.html:85
-#: templates/maposmatic/map-feed.html:50
+#: templates/maposmatic/job.html:85 templates/maposmatic/map-feed.html:50
#: templates/maposmatic/map.html:63
-msgid "No index was generated because no information was available in
OpenStreetMap to create one. Feel free to contribute the missing data yourself.
See the <a href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>OSM
Wiki</a> for a start. "
-msgstr "Nenhum índice foi gerado porque não há nenhuma informação disponível
no OpenStreetMap para criá-lo. Fique à vontade para contribuir com os dados
faltantes. Veja no <a
href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>Wiki do OSM</a>
como começar. "
+msgid ""
+"No index was generated because no information was available in OpenStreetMap "
+"to create one. Feel free to contribute the missing data yourself. See the <a "
+"href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>OSM Wiki</a> "
+"for a start. "
+msgstr ""
+"Nenhum índice foi gerado porque não há nenhuma informação disponível no "
+"OpenStreetMap para criá-lo. Fique à vontade para contribuir com os dados "
+"faltantes. Veja no <a href=\"http://wiki.openstreetmap.org/wiki/";
+"Getting_Involved\">Wiki do OSM</a> como começar. "
#: templates/maposmatic/job.html:88
msgid "View on OpenStreetMap"
msgstr "Ver no OpenStreetMap"
-#: templates/maposmatic/job.html:92
-#: templates/maposmatic/map-feed.html:53
+#: templates/maposmatic/job.html:92 templates/maposmatic/map-feed.html:53
#: templates/maposmatic/map.html:66
msgid "The generated files are no longer available."
msgstr "Os arquivos gerados não estão mais disponíveis."
-#: templates/maposmatic/map-feed.html:41
-#: templates/maposmatic/map.html:54
+#: templates/maposmatic/map-feed.html:41 templates/maposmatic/map.html:54
msgid "Rendering completed on"
msgstr "Renderização encerrada em"
@@ -840,13 +958,11 @@ msgstr "Localidade"
msgid "Title"
msgstr "Título"
-#: templates/maposmatic/new.html:51
-#: templates/maposmatic/new.html.py:123
+#: templates/maposmatic/new.html:51 templates/maposmatic/new.html.py:123
msgid "Layout"
msgstr "Layout"
-#: templates/maposmatic/new.html:54
-#: templates/maposmatic/new.html.py:128
+#: templates/maposmatic/new.html:54 templates/maposmatic/new.html.py:128
msgid "Stylesheet"
msgstr "Folha de estilo"
@@ -854,8 +970,7 @@ msgstr "Folha de estilo"
msgid "Paper size"
msgstr "Tamanho do papel"
-#: templates/maposmatic/new.html:60
-#: templates/maposmatic/new.html.py:145
+#: templates/maposmatic/new.html:60 templates/maposmatic/new.html.py:145
msgid "Language"
msgstr "Idioma"
@@ -890,11 +1005,13 @@ msgstr ""
#: templates/maposmatic/new.html:95
msgid ""
"You can use <tt>Shift+drag</tt> to zoom on a specific\n"
-" area of the map. Then, you must select with <tt>Control+drag</tt>
the\n"
+" area of the map. Then, you must select with <tt>Control+drag</tt> "
+"the\n"
" limits of the area you wish to render."
msgstr ""
"Você pode usar <tt>Shift+arrastar</tt> para dar zoom em uma área específica\n"
-" do mapa. Ou então você também pode usar <tt>Control+arrastar</tt>
para desenhar os limites da área a renderizar."
+" do mapa. Ou então você também pode usar <tt>Control+arrastar</tt> "
+"para desenhar os limites da área a renderizar."
#: templates/maposmatic/new.html:101
msgid ""
@@ -909,8 +1026,16 @@ msgid "No results."
msgstr "Nenhum resultado encontrado."
#: templates/maposmatic/new.html:113
-msgid "Wondering why you can't choose some of these results?<br />Their
administrative boundaries are missing from the OSM database.<br />Look at the
<a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more
details."
-msgstr "Não sabe porque não consegue escolher alguns destes resultados?<br
/>Não existem os limites administrativos na base de dados do OSM.<br />Dê uma
olhada no nosso <a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a>
para mais detalhes."
+msgid ""
+"Wondering why you can't choose some of these results?<br />Their "
+"administrative boundaries are missing from the OSM database.<br />Look at "
+"the <a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more "
+"details."
+msgstr ""
+"Não sabe porque não consegue escolher alguns destes resultados?<br />Não "
+"existem os limites administrativos na base de dados do OSM.<br />Dê uma "
+"olhada no nosso <a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</"
+"a> para mais detalhes."
#: templates/maposmatic/new.html:118
msgid "Map title"
diff --git a/www/locale/ru/LC_MESSAGES/django.po
b/www/locale/ru/LC_MESSAGES/django.po
index c7f4a6d..db68a9f 100644
--- a/www/locale/ru/LC_MESSAGES/django.po
+++ b/www/locale/ru/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 11:26+0200\n"
+"POT-Creation-Date: 2012-04-07 19:01+0200\n"
"PO-Revision-Date: 2012-04-01 22:04+0300\n"
"Last-Translator: Konstantin Mochalov <address@hidden>\n"
"Language-Team: RUSSIAN <address@hidden>\n"
@@ -98,8 +98,7 @@ msgstr "Указатель %(title)s %(format)s"
msgid "Administrative area too big for rendering"
msgstr "Административная граница слишком велика для отрисовки"
-#: maposmatic/nominatim.py:285
-#: maposmatic/nominatim.py:299
+#: maposmatic/nominatim.py:285 maposmatic/nominatim.py:299
msgid "No administrative boundary"
msgstr "Нет административной границы"
@@ -132,24 +131,33 @@ msgid "Rendering was successful."
msgstr "Отрисовка завершена удачно."
#: maposmatic/templatetags/extratags.py:41
-msgid "Rendering failed! Please contact address@hidden for more information."
-msgstr "Отрисовка завершилась неудачно, пожалуйста сообщите на address@hidden"
+msgid ""
+"Rendering failed! Please contact address@hidden for more information."
+msgstr ""
+"Отрисовка завершилась неудачно, пожалуйста сообщите на address@hidden"
+"org."
#: maposmatic/templatetags/extratags.py:44
-msgid "Rendering is obsolete: the rendering was successful, but the files are
no longer available."
-msgstr "Отрисованная карта устарела: отрисовка была удачно, но файлы больше
недоступны."
+msgid ""
+"Rendering is obsolete: the rendering was successful, but the files are no "
+"longer available."
+msgstr ""
+"Отрисованная карта устарела: отрисовка была удачно, но файлы больше "
+"недоступны."
#: maposmatic/templatetags/extratags.py:46
-msgid "Obsolete failed rendering: the rendering failed, and the incomplete
files have been removed."
-msgstr "Устаревшая неудачная отрисовка: если отрисовка завершилась неудачно, и
неполные файлы были удалены."
+msgid ""
+"Obsolete failed rendering: the rendering failed, and the incomplete files "
+"have been removed."
+msgstr ""
+"Устаревшая неудачная отрисовка: если отрисовка завершилась неудачно, и "
+"неполные файлы были удалены."
#: maposmatic/templatetags/extratags.py:48
msgid "The rendering was cancelled by the user."
msgstr "Отрисовка отменена пользователем."
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:59
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:59
msgid "Home"
msgstr "Домой"
@@ -185,8 +193,7 @@ msgstr "Ошибка сервера <em>(500)</em>"
msgid "There's been an error."
msgstr "Произошла ошибка."
-#: templates/maposmatic/about.html:35
-#: templates/maposmatic/base.html:65
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:65
msgid "About"
msgstr "О сервисе"
@@ -195,14 +202,15 @@ msgid "History"
msgstr "История"
#: templates/maposmatic/about.html:39
-#, python-format
+#, fuzzy, python-format
msgid ""
"MapOSMatic has been started thanks to an idea of\n"
"Gilles Lamiral, an <a\n"
"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> and free\n"
"software contributor of Rennes area, France. From his idea, a group of\n"
"crazy <a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\";>hackers</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture";
+"%29\">hackers</a>\n"
"met together during a one-week <em>Hackfest</em> in August 2009 and\n"
"brought the idea of Gilles Lamiral to life by writing the code and\n"
"named the project <strong>MapOSMatic</strong>. The group of crazy\n"
@@ -211,11 +219,14 @@ msgid ""
msgstr ""
"MapOSMatic появился благодаря идее\n"
"Gilles Lamiral, контрибьютору <a\n"
-"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> и разработчику
свободного ПО из\n"
+"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> и разработчику "
+"свободного ПО из\n"
"Rennes, Франция. С его идеи, группа сумасшедших <a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\";>хакеров</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture";
+"%29\">хакеров</a>\n"
"собралась в одно-недельный <em>Hackfest</em> в августе 2009 и\n"
-"назвала проект <strong>MapOSMatic</strong>. Группа сумасшедших хакеров
благодарит Gilles\n"
+"назвала проект <strong>MapOSMatic</strong>. Группа сумасшедших хакеров "
+"благодарит Gilles\n"
"за то что он поделился своей идеей!"
#: templates/maposmatic/about.html:53
@@ -248,13 +259,15 @@ msgid ""
msgstr ""
"На нашем сервере мы используем базу данных <a\n"
"href=\"http://www.postgresql.org\";>PostgreSQL</a> с расширением <a\n"
-"href=\"http://postgis.refractions.net\";>PostGIS</a> extension. В этот
сервер\n"
+"href=\"http://postgis.refractions.net\";>PostGIS</a> extension. В этот "
+"сервер\n"
"PostgreSQL мы загрузили <a\n"
"href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\";>данные OpenStreetMap\n"
"для всего мира</a> используя утилиту <a\n"
"href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\";>osm2pgsql</a>\n"
". Та же утилита используется для применения <a\n"
-"href=\"http://planet.openstreetmap.org/daily/\";>ежедневных изменений</a>
базы\n"
+"href=\"http://planet.openstreetmap.org/daily/\";>ежедневных изменений</a> "
+"базы\n"
"данных, что позволяет нам поддерживать в актуальном состоянии нашу базу,\n"
"загружая посление изменения в OpenStreetMap."
@@ -263,16 +276,20 @@ msgid ""
"For the map rendering, we use the\n"
"famous <a href=\"http://www.mapnik.org\";>Mapnik</a> with the OpenStreetMap\n"
"stylesheet\n"
-"available <a
href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\";>in\n"
+"available <a href=\"http://svn.openstreetmap.org/applications/rendering/";
+"mapnik\">in\n"
"OpenStreetMap Subversion repository</a>. Using Mapnik\n"
"and <a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, we\n"
"built <i>OCitySMap</i>, a Python module that:"
msgstr ""
"Для отрисовки карт мы используем знаменитый\n"
-"<a href=\"http://www.mapnik.org\";>Mapnik</a> с таблицей стилей
OpenStreetMap\n"
-"доступной в <a
href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\";>Subversion-репозитарии\n"
+"<a href=\"http://www.mapnik.org\";>Mapnik</a> с таблицей стилей "
+"OpenStreetMap\n"
+"доступной в <a href=\"http://svn.openstreetmap.org/applications/rendering/";
+"mapnik\">Subversion-репозитарии\n"
"OpenStreetMap</a>. Используя Mapnik и\n"
-"<a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, мы создали
Python-модуль\n"
+"<a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, мы создали Python-"
+"модуль\n"
"<i>OCitySMap</i>, который:"
#: templates/maposmatic/about.html:87
@@ -323,8 +340,10 @@ msgstr ""
"Этот Python-модуль может использоваться с помощью утилиты командной\n"
"строки, входящей в OCitySMap, так что любой может настроить свою систему\n"
"отрисовки карт городов. Однако, установка различных компонентов довольно\n"
-"сложна, поэтому мы создали небольшой вебсервис поверх этого модуля, с
помощью\n"
-"которого пользователи смогут просто сгенерировать и использовать карты
городов\n"
+"сложна, поэтому мы создали небольшой вебсервис поверх этого модуля, с "
+"помощью\n"
+"которого пользователи смогут просто сгенерировать и использовать карты "
+"городов\n"
"из OpenStreetMap."
#: templates/maposmatic/about.html:110
@@ -340,7 +359,8 @@ msgid ""
"intensive nature of the map rendering process."
msgstr ""
"Вебсервис называется <i>MapOSMatic</i>,\n"
-"как <i>map-o-matic</i>, но с указанием принадлежности к OpenStreetMap
(OSM).\n"
+"как <i>map-o-matic</i>, но с указанием принадлежности к OpenStreetMap "
+"(OSM).\n"
"Вебсервис написан на Python\n"
"с использованием <a href=\"http://www.djangoproject.com\";>Django</a>. Он\n"
"отвечает за сохранение запросов на отрисовку и показ результатов\n"
@@ -403,11 +423,13 @@ msgstr ""
#: templates/maposmatic/about.html:147
msgid ""
"The <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>development\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
+"\">development\n"
" mailing-list</a>;"
msgstr ""
"<a\n"
-" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>Список
рассылки\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>Список "
+"рассылки\n"
" посвященный разработке</a>;"
#: templates/maposmatic/about.html:150
@@ -421,12 +443,14 @@ msgstr ""
#: templates/maposmatic/about.html:152
msgid ""
"The <a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git";
+"\">OCitySMap\n"
" Git repository</a>, which can be cloned using <tt>git clone\n"
" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
msgstr ""
"<a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>Git-репозитарий
OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>Git-"
+"репозитарий OCitySMap\n"
" </a>, который можно склонировать командой <tt>git clone\n"
" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
@@ -438,7 +462,8 @@ msgid ""
" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
msgstr ""
"<a\n"
-" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>Git-репозитарий
MapOSMatic\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>Git-репозитарий "
+"MapOSMatic\n"
" </a>, который можно склонировать командой\n"
" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
@@ -480,8 +505,7 @@ msgstr "перевод на русский"
msgid "arabic translation"
msgstr "перевод на арабский"
-#: templates/maposmatic/about.html:186
-#: templates/maposmatic/about.html:187
+#: templates/maposmatic/about.html:186 templates/maposmatic/about.html:187
msgid "brasilian portuguese translation"
msgstr "перевод на бразильский португальский"
@@ -505,11 +529,16 @@ msgstr "перевод на польский"
msgid "indonesian translation"
msgstr "перевод на индонезийский"
-#: templates/maposmatic/about.html:193
+#: templates/maposmatic/about.html:193 templates/maposmatic/about.html:194
msgid "norvegian bokmål translation"
msgstr "перевод на норвежский букмол"
-#: templates/maposmatic/about.html:194
+#: templates/maposmatic/about.html:195
+#, fuzzy
+msgid "norvegian nynorsk translation"
+msgstr "перевод на норвежский букмол"
+
+#: templates/maposmatic/about.html:196
msgid "printable stylesheet"
msgstr "таблица стилей для печати"
@@ -518,8 +547,14 @@ msgid "Job list"
msgstr "Список заданий"
#: templates/maposmatic/all_jobs.html:39
-msgid "This page gives the status of the rendering queue, showing all requests
received during the last 24 hours as well as all unprocessed requests without
time limit. They are ordered starting from the most recent ones."
-msgstr "Эта страница показывает состояние очереди отрисовки, показывая все
запросы за последние 24 часа, а также все невыполненые запросы без ограничения
интервала времени. Они упорядочены начиная от самых новых."
+msgid ""
+"This page gives the status of the rendering queue, showing all requests "
+"received during the last 24 hours as well as all unprocessed requests "
+"without time limit. They are ordered starting from the most recent ones."
+msgstr ""
+"Эта страница показывает состояние очереди отрисовки, показывая все запросы "
+"за последние 24 часа, а также все невыполненые запросы без ограничения "
+"интервала времени. Они упорядочены начиная от самых новых."
#: templates/maposmatic/all_jobs.html:54
msgid ""
@@ -529,13 +564,11 @@ msgstr ""
"Не было запросов на отрисовку карты в последние 24\n"
"часа."
-#: templates/maposmatic/all_maps.html:34
-#: templates/maposmatic/index.html:61
+#: templates/maposmatic/all_maps.html:34 templates/maposmatic/index.html:61
msgid "Search"
msgstr "Поиск"
-#: templates/maposmatic/all_maps.html:38
-#: templates/maposmatic/base.html:62
+#: templates/maposmatic/all_maps.html:38 templates/maposmatic/base.html:62
msgid "Maps"
msgstr "Карты"
@@ -543,15 +576,15 @@ msgstr "Карты"
msgid "MapOSMatic maps feed"
msgstr "Лента карт MapOSMatic"
-#: templates/maposmatic/all_maps.html:52
+#: templates/maposmatic/all_maps.html:53
msgid "Our database does not contain any rendered maps for the moment."
msgstr "Наша база данных не содержит отрисованных карт в данный момент."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "No map matches your query."
msgstr "По вашему запросу не найдено карт."
-#: templates/maposmatic/all_maps.html:54
+#: templates/maposmatic/all_maps.html:55
msgid "Create a new map!"
msgstr "Создать новую карту!"
@@ -571,22 +604,30 @@ msgstr "Задания"
msgid "News"
msgstr "Новости"
-#: templates/maposmatic/base.html:64
-#: templates/maposmatic/donate.html:30
+#: templates/maposmatic/base.html:64 templates/maposmatic/donate.html:30
msgid "Donate"
msgstr "Пожертвовать"
#: templates/maposmatic/base.html:80
-msgid "The MapOSMatic rendering daemon is currently not running! Jobs will be
queued until the rendering daemon is back up."
-msgstr "Демон отрисовки MapOSMatic в данный момент не запущен! Задания будут
добавлены в очередь до времени пока демон будет возвращен в рабочее состояние."
+msgid ""
+"The MapOSMatic rendering daemon is currently not running! Jobs will be "
+"queued until the rendering daemon is back up."
+msgstr ""
+"Демон отрисовки MapOSMatic в данный момент не запущен! Задания будут "
+"добавлены в очередь до времени пока демон будет возвращен в рабочее "
+"состояние."
#: templates/maposmatic/base.html:91
msgid "Donate to MapOSMatic"
msgstr "Пожертвовать MapOSMatic"
#: templates/maposmatic/base.html:101
-msgid "You can donate to help us improve the service. See our <a
href=\"/donate\">donation</a> page."
-msgstr "Вы можете пожертвовать чтобы помочь нам улучшить сервис. Смотрите нашу
страницу <a href=\"/donate\">пожертвования</a>."
+msgid ""
+"You can donate to help us improve the service. See our <a href=\"/donate"
+"\">donation</a> page."
+msgstr ""
+"Вы можете пожертвовать чтобы помочь нам улучшить сервис. Смотрите нашу "
+"страницу <a href=\"/donate\">пожертвования</a>."
#: templates/maposmatic/base.html:106
msgid "OSM database status"
@@ -668,28 +709,66 @@ msgstr "Почему нам нужны пожертвования?"
#: templates/maposmatic/donate.html:35
#, python-format
-msgid "MapOSMatic is a project entirely developed and maintained by a team of
volunteers (see our <a href=\"%(about_url)s\">About</a> page for details).
However, running the MapOSMatic service and making improvements to it have
various costs beyond the time of the volunteer developers."
-msgstr "MapOSMatic — проект, полностью разрабатываемый и поддерживаемый
командой добровольцев (смотрите нашу страницу <a href=\"%(about_url)s\">О
проекте</a>). Но поддержание в работе сервиса MapOSMatic и улучшение его
требует, кроме времени разработчиков-добровольцев, различных затрат."
+msgid ""
+"MapOSMatic is a project entirely developed and maintained by a team of "
+"volunteers (see our <a href=\"%(about_url)s\">About</a> page for details). "
+"However, running the MapOSMatic service and making improvements to it have "
+"various costs beyond the time of the volunteer developers."
+msgstr ""
+"MapOSMatic — проект, полностью разрабатываемый и поддерживаемый командой "
+"добровольцев (смотрите нашу страницу <a href=\"%(about_url)s\">О проекте</"
+"a>). Но поддержание в работе сервиса MapOSMatic и улучшение его требует, "
+"кроме времени разработчиков-добровольцев, различных затрат."
#: templates/maposmatic/donate.html:37
msgid "Therefore, we are currently seeking donations to help us funding:"
msgstr "Поэтому мы в данный момент ищем пожертвования чтобы собрать деньги на:"
#: templates/maposmatic/donate.html:40
-msgid "Acquisition of a Solid-State Disk for the storage of our local copy of
the OpenStreetMap database. A SSD drive performs 40 to 50 times better than the
conventional hard drive we are using today, and would therefore help us to
reduce the lag between our local database and the official one, providing more
up-to-date maps. The cost of such hardware is about 500 to 700 €."
-msgstr "Приобретение твердотельного накопителя для хранения нашей копии базы
данных OpenStreetMap. SSD-накопитель работает в 40-50 раз быстрее чем обычный
жесткий диск, который мы используем сегодня, и это поможет нам уменьшить
задержку между нашей локальной базой данных и официальной, давая более свежие
карты. Стоимость этого оборудования примерно от 500 до 700 €."
+msgid ""
+"Acquisition of a Solid-State Disk for the storage of our local copy of the "
+"OpenStreetMap database. A SSD drive performs 40 to 50 times better than the "
+"conventional hard drive we are using today, and would therefore help us to "
+"reduce the lag between our local database and the official one, providing "
+"more up-to-date maps. The cost of such hardware is about 500 to 700 €."
+msgstr ""
+"Приобретение твердотельного накопителя для хранения нашей копии базы данных "
+"OpenStreetMap. SSD-накопитель работает в 40-50 раз быстрее чем обычный "
+"жесткий диск, который мы используем сегодня, и это поможет нам уменьшить "
+"задержку между нашей локальной базой данных и официальной, давая более "
+"свежие карты. Стоимость этого оборудования примерно от 500 до 700 €."
#: templates/maposmatic/donate.html:42
-msgid "Participation to the transportation expenses of the MapOSMatic
developers when they gather for <i>hackfests</i> (meeting of developers). You
can read our <a href=\"http://news.maposmatic.org\";>blog</a> to learn more
about what we achieve during those hackfests. We usually implement a huge
number of improvements, new features and bug fixes during those meetings. They
take place during the holidays of the developers, and we would like to at least
compensate their travel expenses."
-msgstr "Транспортные расходы разработчиков MapOSMatic, когда они собираются на
<i>хакфесты</i> (собрания разработчиков). Вы можете посмотреть наш <a
href=\"http://news.maposmatic.org\";>блог</a> чтобы узнать больше что мы делаем
на этих хакфестах. Обычно мы разрабатываем большое количество улучшений, новой
функциональности и исправлений багов во время этих собраний. Они проводятся во
время выходных дней разработчиков, и мы хотим покрыть хотя бы расходы на
транспорт."
+msgid ""
+"Participation to the transportation expenses of the MapOSMatic developers "
+"when they gather for <i>hackfests</i> (meeting of developers). You can read "
+"our <a href=\"http://news.maposmatic.org\";>blog</a> to learn more about what "
+"we achieve during those hackfests. We usually implement a huge number of "
+"improvements, new features and bug fixes during those meetings. They take "
+"place during the holidays of the developers, and we would like to at least "
+"compensate their travel expenses."
+msgstr ""
+"Транспортные расходы разработчиков MapOSMatic, когда они собираются на "
+"<i>хакфесты</i> (собрания разработчиков). Вы можете посмотреть наш <a href="
+"\"http://news.maposmatic.org\";>блог</a> чтобы узнать больше что мы делаем на "
+"этих хакфестах. Обычно мы разрабатываем большое количество улучшений, новой "
+"функциональности и исправлений багов во время этих собраний. Они проводятся "
+"во время выходных дней разработчиков, и мы хотим покрыть хотя бы расходы на "
+"транспорт."
#: templates/maposmatic/donate.html:46
msgid "Donating?"
msgstr "Пожертвовать?"
#: templates/maposmatic/donate.html:48
-msgid "Donations can be done through the well-known <a
href=\"http://www.paypal.com\";>PayPal</a> service. We accept donations of any
amount: all donations are helpful, even the smallest ones."
-msgstr "Пожертвования могут производиться через известный сервис <a
href=\"http://www.paypal.com\";>PayPal</a>. Мы принимаем пожертвования на любую
сумму: все пожертвования будут полезны нам, даже самые малые."
+msgid ""
+"Donations can be done through the well-known <a href=\"http://www.paypal.com";
+"\">PayPal</a> service. We accept donations of any amount: all donations are "
+"helpful, even the smallest ones."
+msgstr ""
+"Пожертвования могут производиться через известный сервис <a href=\"http://";
+"www.paypal.com\">PayPal</a>. Мы принимаем пожертвования на любую сумму: все "
+"пожертвования будут полезны нам, даже самые малые."
#: templates/maposmatic/index.html:33
msgid "Introduction"
@@ -700,24 +779,53 @@ msgid "City map"
msgstr "Карта города"
#: templates/maposmatic/index.html:42
-msgid "MapOSMatic is a free software web service that allows you to generate
maps of cities using <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>
data. MapOSMatic can generate two kinds of maps: :"
-msgstr "MapOSMatic — основанный на свободном ПО вебсервис, позволяющий
генерировать карты городов используя данные <a
href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>. MapOSMatic позволяет
создавать два следующих типа карт: :"
+msgid ""
+"MapOSMatic is a free software web service that allows you to generate maps "
+"of cities using <a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> "
+"data. MapOSMatic can generate two kinds of maps: :"
+msgstr ""
+"MapOSMatic — основанный на свободном ПО вебсервис, позволяющий генерировать "
+"карты городов используя данные <a href=\"http://www.openstreetmap.org";
+"\">OpenStreetMap</a>. MapOSMatic позволяет создавать два следующих типа "
+"карт: :"
#: templates/maposmatic/index.html:46
-msgid "Single page posters, where the map and the street index are rendered
side by side. The map itself is split in squares so that streets are easy to
find. This format is typically useful for printing on large paper sheets."
-msgstr "Плакаты из одной страницы, где карта и указатель улиц расположены
рядом друг с другом. Сама карта разделена на квадраты, так что улицы легко
найти. Этот формат обычно удобен для печати на больших листах бумаги."
+msgid ""
+"Single page posters, where the map and the street index are rendered side by "
+"side. The map itself is split in squares so that streets are easy to find. "
+"This format is typically useful for printing on large paper sheets."
+msgstr ""
+"Плакаты из одной страницы, где карта и указатель улиц расположены рядом друг "
+"с другом. Сама карта разделена на квадраты, так что улицы легко найти. Этот "
+"формат обычно удобен для печати на больших листах бумаги."
#: templates/maposmatic/index.html:48
-msgid "Multiple page booklets, where the map and the street index are split
into several pages. This format is typically useful for printing on standard
paper sheets."
-msgstr "Буклеты из нескольких страниц, где карта и указатель улиц разделены на
несколько страниц. Этот формат удобен для печати на обычных бумажных листах."
+msgid ""
+"Multiple page booklets, where the map and the street index are split into "
+"several pages. This format is typically useful for printing on standard "
+"paper sheets."
+msgstr ""
+"Буклеты из нескольких страниц, где карта и указатель улиц разделены на "
+"несколько страниц. Этот формат удобен для печати на обычных бумажных листах."
#: templates/maposmatic/index.html:52
-msgid "The generated maps are available in PNG, PDF and SVG formats and are
ready to be printed."
-msgstr "Сгенерированные карты доступны в форматах PNG, PDF и SVG и готовы для
печати."
+msgid ""
+"The generated maps are available in PNG, PDF and SVG formats and are ready "
+"to be printed."
+msgstr ""
+"Сгенерированные карты доступны в форматах PNG, PDF и SVG и готовы для печати."
#: templates/maposmatic/index.html:56
-msgid "As the data used to generate maps is coming from OpenStreetMap, you can
freely (under the <a href=\"http://wiki.openstreetmap.org/wiki/License\";>terms
of OpenStreetMap license</a>) reuse, sell, modify, ... the generated maps."
-msgstr "Так как для генерации карты используются данные из OpenStreetMap, вы
можете свободно (под условиями <a
href=\"http://wiki.openstreetmap.org/wiki/License\";>лицензии
OpenStreetMap)</a>) использовать, продавать, модифицировать, ...
сгенерированные карты."
+msgid ""
+"As the data used to generate maps is coming from OpenStreetMap, you can "
+"freely (under the <a href=\"http://wiki.openstreetmap.org/wiki/License";
+"\">terms of OpenStreetMap license</a>) reuse, sell, modify, ... the "
+"generated maps."
+msgstr ""
+"Так как для генерации карты используются данные из OpenStreetMap, вы можете "
+"свободно (под условиями <a href=\"http://wiki.openstreetmap.org/wiki/License";
+"\">лицензии OpenStreetMap)</a>) использовать, продавать, модифицировать, ... "
+"сгенерированные карты."
#: templates/maposmatic/index.html:60
msgid "Create a map"
@@ -731,15 +839,17 @@ msgstr "Найти карту"
msgid "More details"
msgstr "Подробнее"
-#: templates/maposmatic/job-page.html:39
-#: templates/maposmatic/job.html:35
+#: templates/maposmatic/job-page.html:39 templates/maposmatic/job.html:35
#: templates/maposmatic/map.html:35
msgid "Recreate map"
msgstr "Создать заново карту"
#: templates/maposmatic/job-page.html:48
-msgid "You have been redirected to a similar map, rendered less than 24 hours
ago."
-msgstr "Вы были перенаправлены на похожую карту, отрисованную менее чем 24
часа назад."
+msgid ""
+"You have been redirected to a similar map, rendered less than 24 hours ago."
+msgstr ""
+"Вы были перенаправлены на похожую карту, отрисованную менее чем 24 часа "
+"назад."
#: templates/maposmatic/job-page.html:56
msgid "Refresh the status"
@@ -747,8 +857,12 @@ msgstr "Обновить состояние"
#: templates/maposmatic/job-page.html:56
#, python-format
-msgid "(the page will refresh automatically every %(refresh)s seconds until
the rendering is completed)."
-msgstr "(эта страница будет перезагружаться автоматически каждые %(refresh)s
секунд, пока отрисовка не завершится)."
+msgid ""
+"(the page will refresh automatically every %(refresh)s seconds until the "
+"rendering is completed)."
+msgstr ""
+"(эта страница будет перезагружаться автоматически каждые %(refresh)s секунд, "
+"пока отрисовка не завершится)."
#: templates/maposmatic/job.html:48
msgid "Reported error: "
@@ -791,42 +905,44 @@ msgstr "Отменено"
msgid "rendering took %(rendering)s"
msgstr "отрисовка заняла %(rendering)s"
-#: templates/maposmatic/job.html:79
-#: templates/maposmatic/map-feed.html:44
+#: templates/maposmatic/job.html:79 templates/maposmatic/map-feed.html:44
#: templates/maposmatic/map.html:57
msgid "Files: "
msgstr "Файлы:"
-#: templates/maposmatic/job.html:81
-#: templates/maposmatic/map-feed.html:46
+#: templates/maposmatic/job.html:81 templates/maposmatic/map-feed.html:46
#: templates/maposmatic/map.html:59
msgid "Map: "
msgstr "Карта:"
-#: templates/maposmatic/job.html:82
-#: templates/maposmatic/map-feed.html:47
+#: templates/maposmatic/job.html:82 templates/maposmatic/map-feed.html:47
#: templates/maposmatic/map.html:60
msgid "Index: "
msgstr "Указатель:"
-#: templates/maposmatic/job.html:85
-#: templates/maposmatic/map-feed.html:50
+#: templates/maposmatic/job.html:85 templates/maposmatic/map-feed.html:50
#: templates/maposmatic/map.html:63
-msgid "No index was generated because no information was available in
OpenStreetMap to create one. Feel free to contribute the missing data yourself.
See the <a href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>OSM
Wiki</a> for a start. "
-msgstr "Указатель улиц не был сгенерирован, потому что оказалось недостаточно
информации в OpenStreetMap для его создания. Вы можете участвовать в дополнении
этих данных. См. <a
href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>вики OSM</a> как
начать."
+msgid ""
+"No index was generated because no information was available in OpenStreetMap "
+"to create one. Feel free to contribute the missing data yourself. See the <a "
+"href=\"http://wiki.openstreetmap.org/wiki/Getting_Involved\";>OSM Wiki</a> "
+"for a start. "
+msgstr ""
+"Указатель улиц не был сгенерирован, потому что оказалось недостаточно "
+"информации в OpenStreetMap для его создания. Вы можете участвовать в "
+"дополнении этих данных. См. <a href=\"http://wiki.openstreetmap.org/wiki/";
+"Getting_Involved\">вики OSM</a> как начать."
#: templates/maposmatic/job.html:88
msgid "View on OpenStreetMap"
msgstr "Посмотреть на OpenStreetMap"
-#: templates/maposmatic/job.html:92
-#: templates/maposmatic/map-feed.html:53
+#: templates/maposmatic/job.html:92 templates/maposmatic/map-feed.html:53
#: templates/maposmatic/map.html:66
msgid "The generated files are no longer available."
msgstr "Сгенерированные файлы больше не доступны."
-#: templates/maposmatic/map-feed.html:41
-#: templates/maposmatic/map.html:54
+#: templates/maposmatic/map-feed.html:41 templates/maposmatic/map.html:54
msgid "Rendering completed on"
msgstr "Отрисовка завершена"
@@ -842,13 +958,11 @@ msgstr "Местность"
msgid "Title"
msgstr "Название"
-#: templates/maposmatic/new.html:51
-#: templates/maposmatic/new.html.py:123
+#: templates/maposmatic/new.html:51 templates/maposmatic/new.html.py:123
msgid "Layout"
msgstr "Расположение"
-#: templates/maposmatic/new.html:54
-#: templates/maposmatic/new.html.py:128
+#: templates/maposmatic/new.html:54 templates/maposmatic/new.html.py:128
msgid "Stylesheet"
msgstr "Таблица стилей"
@@ -856,8 +970,7 @@ msgstr "Таблица стилей"
msgid "Paper size"
msgstr "Размер бумаги"
-#: templates/maposmatic/new.html:60
-#: templates/maposmatic/new.html.py:145
+#: templates/maposmatic/new.html:60 templates/maposmatic/new.html.py:145
msgid "Language"
msgstr "Язык"
@@ -892,11 +1005,13 @@ msgstr ""
#: templates/maposmatic/new.html:95
msgid ""
"You can use <tt>Shift+drag</tt> to zoom on a specific\n"
-" area of the map. Then, you must select with <tt>Control+drag</tt>
the\n"
+" area of the map. Then, you must select with <tt>Control+drag</tt> "
+"the\n"
" limits of the area you wish to render."
msgstr ""
"Вы можете использовать <tt>Shift+потянуть мышью</tt> чтобы увеличить нужную\n"
-" область карты. Затем, вы должны выбрать с <tt>Control+понятуть
мышью</tt> границы\n"
+" область карты. Затем, вы должны выбрать с <tt>Control+понятуть мышью</"
+"tt> границы\n"
" области, которую хотите отрисовать."
#: templates/maposmatic/new.html:101
@@ -912,8 +1027,15 @@ msgid "No results."
msgstr "Результатов не найдено."
#: templates/maposmatic/new.html:113
-msgid "Wondering why you can't choose some of these results?<br />Their
administrative boundaries are missing from the OSM database.<br />Look at the
<a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more
details."
-msgstr "Почему вы не можете выбрать одни из этих результатов?<br />Их
административные границы отсутствуют в базе данныхOSM.<br />См. <a
href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> для подробностей."
+msgid ""
+"Wondering why you can't choose some of these results?<br />Their "
+"administrative boundaries are missing from the OSM database.<br />Look at "
+"the <a href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more "
+"details."
+msgstr ""
+"Почему вы не можете выбрать одни из этих результатов?<br />Их "
+"административные границы отсутствуют в базе данныхOSM.<br />См. <a href="
+"\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> для подробностей."
#: templates/maposmatic/new.html:118
msgid "Map title"
diff --git a/www/templates/maposmatic/about.html
b/www/templates/maposmatic/about.html
index f6250a4..6761a61 100644
--- a/www/templates/maposmatic/about.html
+++ b/www/templates/maposmatic/about.html
@@ -191,6 +191,8 @@ us:{% endblocktrans %}
<li>Łukasz Jernaś ({%trans "polish translation" %})</li>
<li>Jeff Haack ({%trans "indonesian translation" %})</li>
<li>Hans F. Nordhaug ({%trans "norvegian bokmål translation" %})</li>
+ <li>Guttorm Flatabø ({%trans "norvegian bokmål translation" %},
+ {%trans "norvegian nynorsk translation" %})</li>
<li>Sylvain Collilieux ({%trans "printable stylesheet" %})</li>
</ul>
</td>
--
1.7.10.rc1.22.gf5241
Re: [Maposmatic-dev] [PATCH] [ocitysmap] Updated Norwegian translation, Thomas Petazzoni, 2012/04/10