maposmatic-dev
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Maposmatic-dev] [PATCH maposmatic 2/3] Added link under 'Latest news' h

From: David Decotigny
Subject: [Maposmatic-dev] [PATCH maposmatic 2/3] Added link under 'Latest news' header
Date: Sat, 9 Jan 2010 18:06:35 +0100 
From: David Decotigny <address@hidden>

Also updated all the known translations.
---
 www/locale/ar/LC_MESSAGES/django.po    |  116 +++++++++---------
 www/locale/ca/LC_MESSAGES/django.po    |   46 +++++---
 www/locale/de/LC_MESSAGES/django.po    |  194 +++++++++++++++++++-----------
 www/locale/fr/LC_MESSAGES/django.po    |   46 +++++---
 www/locale/it/LC_MESSAGES/django.po    |   43 ++++---
 www/locale/nl_NL/LC_MESSAGES/django.po |  138 ++++++++++++----------
 www/locale/pt_BR/LC_MESSAGES/django.po |  209 +++++++++++++++++++-------------
 www/locale/ru/LC_MESSAGES/django.po    |  177 ++++++++++++++++-----------
 www/maposmatic.wsgi                    |   35 ++++++
 www/templates/maposmatic/base.html     |    2 +-
 10 files changed, 609 insertions(+), 397 deletions(-)
 create mode 100644 www/maposmatic.wsgi

diff --git a/www/locale/ar/LC_MESSAGES/django.po 
b/www/locale/ar/LC_MESSAGES/django.po
index 269e31e..c68ec50 100644
--- a/www/locale/ar/LC_MESSAGES/django.po
+++ b/www/locale/ar/LC_MESSAGES/django.po
@@ -6,19 +6,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-05 21:38+0100\n"
+"POT-Creation-Date: 2010-01-09 17:25+0100\n"
 "PO-Revision-Date: 2010-01-06 09:03+0300\n"
 "Last-Translator: Bassem JARKAS <address@hidden>\n"
 "Language-Team: Arabic Translation\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.5.0\n"
 
-#: settings.py:139
+#: settings.py:152
 msgid "No localization"
 msgstr "لا يوجد ترجمة"
 
@@ -79,8 +79,8 @@ msgstr "نجح العرض"
 
 #: maposmatic/templatetags/extratags.py:47
 msgid ""
-"Rendering failed, please contact <a "
-"href=\"mailto:address@hidden";>address@hidden</a>"
+"Rendering failed, please contact <a href=\"mailto:address@hidden";
+"\">address@hidden</a>"
 msgstr ""
 
 #: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:53
@@ -119,7 +119,7 @@ msgstr "خطأ الخادم <em>(500)</em>"
 msgid "There's been an error."
 msgstr "كان هناك خطأ."
 
-#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:58
 msgid "About"
 msgstr "حول MapOSMatic"
 
@@ -134,8 +134,8 @@ msgid ""
 "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"
@@ -146,8 +146,8 @@ msgstr ""
 #: templates/maposmatic/about.html:51
 msgid ""
 "Of course, MapOSMatic is fully free software,\n"
-"licensed under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
+"licensed under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.";
+"html\">AGPLv3</a>."
 msgstr ""
 
 #: templates/maposmatic/about.html:54
@@ -174,8 +174,8 @@ 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:"
@@ -262,7 +262,8 @@ msgstr ""
 #: templates/maposmatic/about.html:131
 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 ""
 
@@ -275,7 +276,8 @@ msgstr ""
 #: templates/maposmatic/about.html:138
 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 <code>git clone\n"
 "  git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
 msgstr ""
@@ -290,16 +292,23 @@ msgstr ""
 
 #: templates/maposmatic/about.html:148
 msgid ""
+"The <a\n"
+"  href=\"http://doc.maposmatic.org\";>MapOSMatic Wiki</a>, where you can read "
+"documentation and technical information about MapOSMatic;"
+msgstr ""
+
+#: templates/maposmatic/about.html:151
+msgid ""
 "<a\n"
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  and ideas</a>."
 msgstr ""
 
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:157
 msgid "Authors"
 msgstr "المؤلّفون"
 
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:169
 msgid "Contributors"
 msgstr "المساهمون"
 
@@ -380,7 +389,7 @@ msgstr ""
 msgid "Maps"
 msgstr "الخرائط"
 
-#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:126
+#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:115
 msgid "Thumbnail"
 msgstr "مصغرة"
 
@@ -388,7 +397,7 @@ msgstr "مصغرة"
 msgid "Files"
 msgstr "الملفات"
 
-#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:141
+#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:130
 msgid "The generated files are no longer available"
 msgstr "الملفات التي تم إنشاؤها لم تعد متوفرة"
 
@@ -404,19 +413,23 @@ msgstr "المهام"
 msgid "News"
 msgstr "الأخبار"
 
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:57
+msgid "Wiki"
+msgstr ""
+
+#: templates/maposmatic/base.html:70
 msgid "Random map"
 msgstr "خريطة عشوائية"
 
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:80
 msgid "No random map found."
 msgstr "لم يتم العثور على أي خريطة عشوائي."
 
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "آخر الأخبار"
+#: templates/maposmatic/base.html:85
+msgid "Latest <a href=\"http://news.maposmatic.org\";>news</a>"
+msgstr "آخر <a href=\"http://news.maposmatic.org\";>الأخبار</a>"
 
-#: templates/maposmatic/base.html:89
+#: templates/maposmatic/base.html:90
 #, python-format
 msgid ""
 "\n"
@@ -424,23 +437,23 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:100
 msgid "Contact"
 msgstr "اتصال"
 
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:102
 msgid "Mail:"
 msgstr "البريد:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "IRC:"
 msgstr "أي أر سي:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "on"
 msgstr "على"
 
-#: templates/maposmatic/base.html:108
+#: templates/maposmatic/base.html:109
 msgid "Language:"
 msgstr "اللغة:"
 
@@ -594,74 +607,55 @@ msgstr ""
 msgid "Map <i>%(job_t)s</i> Status"
 msgstr ""
 
-#: templates/maposmatic/job.html:44
+#: templates/maposmatic/job.html:43
 msgid ""
 "You have been redirected to a similar map, rendered less than 24 hours ago."
 msgstr ""
 
-#: templates/maposmatic/job.html:47
-msgid ""
-"You have been redirected to a similar rendering request, submitted less than "
-"24 hours ago. This request failed and we therefore prevent running the same "
-"request again. Please contact us at <a href="
-msgstr ""
-
-#: templates/maposmatic/job.html:50
-msgid ""
-"You have been redirected to a similar rendering request, submitted less than "
-"24 hours ago, and currently waiting to be processed."
-msgstr ""
-
-#: templates/maposmatic/job.html:53
-msgid ""
-"You have been redirected to a similar rendering request, submitted less than "
-"24 hours ago, and currently being processed."
-msgstr ""
-
-#: templates/maposmatic/job.html:62
+#: templates/maposmatic/job.html:51
 msgid "Refresh the status"
 msgstr "حدّث الحالة"
 
-#: templates/maposmatic/job.html:67
+#: templates/maposmatic/job.html:56
 msgid "Map title"
 msgstr "عنوان الخريطة"
 
-#: templates/maposmatic/job.html:72
+#: templates/maposmatic/job.html:61
 msgid "Administrative city"
 msgstr "مدينة إدارية"
 
-#: templates/maposmatic/job.html:77
+#: templates/maposmatic/job.html:66
 msgid "Bounding-box coordinates"
 msgstr "إحداثيات مربع الإحاطة"
 
-#: templates/maposmatic/job.html:87
+#: templates/maposmatic/job.html:76
 msgid "Status"
 msgstr "الحالة"
 
-#: templates/maposmatic/job.html:91
+#: templates/maposmatic/job.html:80
 msgid "Submission time"
 msgstr "وقت الإرسال"
 
-#: templates/maposmatic/job.html:95
+#: templates/maposmatic/job.html:84
 msgid "Start of rendering time"
 msgstr "وقت بدء العرض"
 
-#: templates/maposmatic/job.html:98 templates/maposmatic/job.html.py:111
+#: templates/maposmatic/job.html:87 templates/maposmatic/job.html.py:100
 msgid "Rendering not started yet"
 msgstr "العرض لم يبدأ بعد"
 
-#: templates/maposmatic/job.html:105
+#: templates/maposmatic/job.html:94
 msgid "End of rendering time"
 msgstr "وقت نهاية العرض"
 
-#: templates/maposmatic/job.html:114
+#: templates/maposmatic/job.html:103
 msgid "Rendering not finished yet"
 msgstr "العرض لم ينته بعد"
 
-#: templates/maposmatic/job.html:120
+#: templates/maposmatic/job.html:109
 msgid "Current position in queue"
 msgstr "الموضع الحالي في الانتظار"
 
-#: templates/maposmatic/job.html:134
+#: templates/maposmatic/job.html:123
 msgid "Result files"
 msgstr "ملفات النتيجة"
diff --git a/www/locale/ca/LC_MESSAGES/django.po 
b/www/locale/ca/LC_MESSAGES/django.po
index b490334..2ada3bc 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: 2010-01-05 22:05+0100\n"
+"POT-Creation-Date: 2010-01-09 17:25+0100\n"
 "PO-Revision-Date: 2010-01-05 22:00+0100\n"
 "Last-Translator: Thomas Petazzoni <address@hidden>\n"
 "Language-Team: CA <>\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:140
+#: settings.py:152
 msgid "No localization"
 msgstr "Sense localització"
 
@@ -132,7 +132,7 @@ msgstr "S'ha produït un error al servidor (500)"
 msgid "There's been an error."
 msgstr "S'ha produït un en error."
 
-#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:58
 msgid "About"
 msgstr "Quant a"
 
@@ -377,6 +377,13 @@ msgstr ""
 
 #: templates/maposmatic/about.html:148
 msgid ""
+"The <a\n"
+"  href=\"http://doc.maposmatic.org\";>MapOSMatic Wiki</a>, where you can read "
+"documentation and technical information about MapOSMatic;"
+msgstr ""
+
+#: templates/maposmatic/about.html:151
+msgid ""
 "<a\n"
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  and ideas</a>."
@@ -384,11 +391,11 @@ msgstr ""
 "<a href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>llista de "
 "temes per fer i idees</a>."
 
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:157
 msgid "Authors"
 msgstr "Autors"
 
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:169
 msgid "Contributors"
 msgstr "Col·laboradors"
 
@@ -495,19 +502,23 @@ msgstr "Tasques"
 msgid "News"
 msgstr "Notícies"
 
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:57
+msgid "Wiki"
+msgstr ""
+
+#: templates/maposmatic/base.html:70
 msgid "Random map"
 msgstr "Mapa aleatori"
 
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:80
 msgid "No random map found."
 msgstr "No s'ha trobat cap mapa aleatori."
 
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "Últimes notícies"
+#: templates/maposmatic/base.html:85
+msgid "Latest <a href=\"http://news.maposmatic.org\";>news</a>"
+msgstr "Últimes <a href=\"http://news.maposmatic.org\";>notícies</a>"
 
-#: templates/maposmatic/base.html:89
+#: templates/maposmatic/base.html:90
 #, python-format
 msgid ""
 "\n"
@@ -518,23 +529,23 @@ msgstr ""
 "    publicat fa %(date)s\n"
 "    "
 
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:100
 msgid "Contact"
 msgstr "Contacte"
 
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:102
 msgid "Mail:"
 msgstr "Correu:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "IRC:"
 msgstr "IRC:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "on"
 msgstr "a"
 
-#: templates/maposmatic/base.html:108
+#: templates/maposmatic/base.html:109
 msgid "Language:"
 msgstr "Llengua:"
 
@@ -753,6 +764,9 @@ msgstr "Possició actual a la cua"
 msgid "Result files"
 msgstr "Fitxers generats"
 
+#~ msgid "Latest news"
+#~ msgstr "Últimes notícies"
+
 #~ msgid ""
 #~ "You have been redirected to a similar rendering request, submitted less "
 #~ "than 24 hours ago, and currently waiting to be processed."
diff --git a/www/locale/de/LC_MESSAGES/django.po 
b/www/locale/de/LC_MESSAGES/django.po
index b50248a..9435c28 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: 2009-12-26 20:47+0100\n"
+"POT-Creation-Date: 2010-01-09 17:25+0100\n"
 "PO-Revision-Date: 2010-01-04 21:10+0100\n"
 "Last-Translator: malenki <address@hidden>\n"
 "Language-Team:  <address@hidden>\n"
@@ -30,7 +30,7 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: settings.py:140
+#: settings.py:152
 msgid "No localization"
 msgstr "Keine Übersetzung"
 
@@ -97,9 +97,7 @@ msgstr ""
 "Rendern fehlgeschlagen, bitte kontaktieren Sie <a href=\"mailto:";
 "address@hidden">address@hidden</a>"
 
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:53
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:53
 msgid "Home"
 msgstr "Start"
 
@@ -135,8 +133,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:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:58
 msgid "About"
 msgstr "Über"
 
@@ -151,24 +148,32 @@ msgid ""
 "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:51
 msgid ""
 "Of course, MapOSMatic is fully free software,\n"
-"licensed under the <a 
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
+"licensed under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.";
+"html\">AGPLv3</a>."
 msgstr ""
 "Natürlich ist MapOSMatic Freie Software,\n"
 " lizenziert unter den Bedingungen der\n"
@@ -194,12 +199,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."
 
@@ -208,22 +216,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:78
 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:81
 msgid ""
@@ -240,7 +253,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:89
 msgid ""
@@ -265,7 +280,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:102
 msgid ""
@@ -281,9 +297,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:112
 msgid ""
@@ -310,8 +330,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, 
wie Sie uns helfen 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, "
+"wie Sie uns helfen können:"
 
 #: templates/maposmatic/about.html:127
 msgid ""
@@ -325,11 +347,13 @@ msgstr ""
 #: templates/maposmatic/about.html:131
 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>&nbsp;;"
+"  href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
+"\">Entwickler-Mailingliste (in Englisch)</a>&nbsp;;"
 
 #: templates/maposmatic/about.html:135
 msgid ""
@@ -340,12 +364,14 @@ msgstr "Der IRC-Channel <code>#maposmatic</code> auf 
Freenode;"
 #: templates/maposmatic/about.html:138
 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 <code>git clone\n"
 "  git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
 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"
 " « <code>git clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</code> »;"
 
@@ -356,12 +382,20 @@ msgid ""
 "  Git repository</a>, which can be cloned using\n"
 "  <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
 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"
 " « <code>git clone git://git.sv.gnu.org/maposmatic.git</code> »;"
 
 #: templates/maposmatic/about.html:148
 msgid ""
+"The <a\n"
+"  href=\"http://doc.maposmatic.org\";>MapOSMatic Wiki</a>, where you can read "
+"documentation and technical information about MapOSMatic;"
+msgstr ""
+
+#: templates/maposmatic/about.html:151
+msgid ""
 "<a\n"
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  and ideas</a>."
@@ -370,11 +404,11 @@ msgstr ""
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>ToDo-Liste\n"
 "  und Ideen</a>."
 
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:157
 msgid "Authors"
 msgstr "Autoren"
 
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:169
 msgid "Contributors"
 msgstr "Mitwirkende"
 
@@ -391,13 +425,11 @@ msgstr ""
 "Diese Seite zeigt den Status aller innerhalb der letzten 24 Stunden\n"
 " eingegangenen Renderanfragen, beginnend mit der neuesten."
 
-#: templates/maposmatic/all_jobs.html:49
-#: templates/maposmatic/all_maps.html:40
+#: templates/maposmatic/all_jobs.html:49 templates/maposmatic/all_maps.html:40
 msgid "Title"
 msgstr "Name"
 
-#: templates/maposmatic/all_jobs.html:50
-#: templates/maposmatic/all_maps.html:41
+#: templates/maposmatic/all_jobs.html:50 templates/maposmatic/all_maps.html:41
 msgid "Location"
 msgstr "Ort"
 
@@ -455,8 +487,7 @@ msgid ""
 "hours."
 msgstr "Keine Renderanfragen innerhalb der letzten 24 Stunden."
 
-#: templates/maposmatic/all_maps.html:35
-#: templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:35 templates/maposmatic/base.html:55
 msgid "Maps"
 msgstr "Pläne"
 
@@ -484,19 +515,23 @@ msgstr "Rendervorgänge"
 msgid "News"
 msgstr "Aktuelles"
 
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:57
+msgid "Wiki"
+msgstr ""
+
+#: templates/maposmatic/base.html:70
 msgid "Random map"
 msgstr "Zufälliger Plan"
 
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:80
 msgid "No random map found."
 msgstr "Keinen zufälligen Plan gefunden."
 
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "Aktuelles"
+#: templates/maposmatic/base.html:85
+msgid "Latest <a href=\"http://news.maposmatic.org\";>news</a>"
+msgstr "<a href=\"http://news.maposmatic.org\";>Aktuelles</a>"
 
-#: templates/maposmatic/base.html:89
+#: templates/maposmatic/base.html:90
 #, python-format
 msgid ""
 "\n"
@@ -506,41 +541,43 @@ msgstr ""
 "\n"
 "    vor %(date)s veröffentlicht"
 
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:100
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:102
 msgid "Mail:"
 msgstr "E-Mail:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "IRC:"
 msgstr "IRC:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "on"
 msgstr "auf"
 
-#: templates/maposmatic/base.html:108
+#: templates/maposmatic/base.html:109
 msgid "Language:"
 msgstr "Sprache:"
 
 #: templates/maposmatic/index.html:227
-msgid "This place cannot be rendered by MapOSMatic, administrative boundary 
missing. Please contribute !"
-msgstr "Ein Plan dieses Ortes kann von MapOSMatic nicht erzeugt werden, da die 
Verwaltungsgrenzen fehlen. Bitte helfen Sie mit!"
+msgid ""
+"This place cannot be rendered by MapOSMatic, administrative boundary "
+"missing. Please contribute !"
+msgstr ""
+"Ein Plan dieses Ortes kann von MapOSMatic nicht erzeugt werden, da die "
+"Verwaltungsgrenzen fehlen. Bitte helfen Sie mit!"
 
 #: templates/maposmatic/index.html:240
 msgid "No results found."
 msgstr "Kein Ort gefunden."
 
-#: templates/maposmatic/index.html:252
-#: templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
 msgid "Generate"
 msgstr "Erzeugen"
 
-#: templates/maposmatic/index.html:258
-#: templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
 msgid "Please fill in the form before trying to proceed"
 msgstr "Bitte füllen Sie das Formular aus, bevor Sie versuchen fortzufahren."
 
@@ -563,13 +600,18 @@ msgid ""
 "<a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> data. A city map\n"
 "is made of two pages:"
 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 
erzeugen.\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 "
+"erzeugen.\n"
 " Ein Stadtplan besteht aus zwei Seiten:"
 
 #: templates/maposmatic/index.html:305
-msgid "The map itself, splitted in squares allowing to easily look for 
streets;"
-msgstr "Dem Plan selbst, aufgeteilt in Quadrate, um leicht nach Straßen 
suchen zu können;"
+msgid ""
+"The map itself, splitted in squares allowing to easily look for streets;"
+msgstr ""
+"Dem Plan selbst, aufgeteilt in Quadrate, um leicht nach Straßen suchen zu "
+"können;"
 
 #: templates/maposmatic/index.html:306
 msgid "An index of the streets with references to the squares on the map."
@@ -579,7 +621,8 @@ msgstr "Dem Straßenverzeichnis, das sich auf die 
Planquadrate bezieht."
 msgid ""
 "The generated maps are available in PNG, PDF and\n"
 "SVG formats and are ready to be printed."
-msgstr "Die erzeugten Pläne sind als PNG, PDF und SVG verfügbar und 
druckfertig."
+msgstr ""
+"Die erzeugten Pläne sind als PNG, PDF und SVG verfügbar und druckfertig."
 
 #: templates/maposmatic/index.html:312
 msgid ""
@@ -591,7 +634,8 @@ msgid ""
 msgstr ""
 "Da OpenStreetMap-Daten benutzt werden um die Pläne zu erzeugen,\n"
 " dürfen Sie diese unter den Bedingungen der\n"
-" <a 
href=\"http://wiki.openstreetmap.org/wiki/License\";>OpenStreetMap-Lizenz</a>\n"
+" <a href=\"http://wiki.openstreetmap.org/wiki/License\";>OpenStreetMap-"
+"Lizenz</a>\n"
 " benutzen, verkaufen, verändern..."
 
 #: templates/maposmatic/index.html:318
@@ -680,8 +724,11 @@ msgid "Map <i>%(job_t)s</i> Status"
 msgstr "Rendervorgang bei <i>%(job_t)s</i>"
 
 #: templates/maposmatic/job.html:43
-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.html:51
 msgid "Refresh the status"
@@ -711,8 +758,7 @@ msgstr "Datum der Anforderung"
 msgid "Start of rendering time"
 msgstr "Beginn des Rendervorgangs"
 
-#: templates/maposmatic/job.html:87
-#: templates/maposmatic/job.html.py:100
+#: templates/maposmatic/job.html:87 templates/maposmatic/job.html.py:100
 msgid "Rendering not started yet"
 msgstr "Rendervorgang noch nicht begonnen"
 
@@ -732,6 +778,9 @@ msgstr "Aktuelle Position in der Warteschlange"
 msgid "Result files"
 msgstr "Erzeugte Dateien:"
 
+#~ msgid "Latest news"
+#~ msgstr "Aktuelles"
+
 #~ msgid "ETA before rendering"
 #~ msgstr "Voraussichtlicher Beginn des Rendervorgangs"
 
@@ -743,10 +792,13 @@ msgstr "Erzeugte Dateien:"
 #~ msgstr ""
 #~ "Keine administrativen Grenzen für diese Stadt gefunden. Versuchen Sie es "
 #~ "mit korrekter Groß-/Kleinschreibung."
+
 #~ msgid "Sorry, only cities in France can be rendered for the moment"
 #~ msgstr "Leider können derzeit nur französische Städte gerendert werden."
+
 #~ msgid "Rendering failed, reason: <i>%(errmsg)s</i>"
 #~ msgstr "Rendern aus folgendem Grund fehlgeschlagen : <i>%(errmsg)s</i>"
+
 #~ msgid ""
 #~ "Using an administrative boundary. It allows to get a\n"
 #~ "  map with precise boundaries of the city, but they are for the moment\n"
@@ -766,10 +818,12 @@ msgstr "Erzeugte Dateien:"
 #~ "(keine abweichende Großschreibung und diakritische Zeichen erlaubt).\n"
 #~ "Funktionierende Beispiele sind:\n"
 #~ "<code>Chavagne</code>, <code>Bénodet</code> or <code>Sanguinet</code>."
+
 #~ msgid "Generated maps"
 #~ msgstr "Cartes générées"
+
 #~ msgid "Links:"
 #~ msgstr "Liens :"
+
 #~ msgid "Design by"
 #~ msgstr "Style :"
-
diff --git a/www/locale/fr/LC_MESSAGES/django.po 
b/www/locale/fr/LC_MESSAGES/django.po
index 9422d95..86a32de 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: 2010-01-05 22:05+0100\n"
+"POT-Creation-Date: 2010-01-09 17:25+0100\n"
 "PO-Revision-Date: 2009-12-26 20:47+0100\n"
 "Last-Translator: Thomas Petazzoni <address@hidden>\n"
 "Language-Team: FR <address@hidden>\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:140
+#: settings.py:152
 msgid "No localization"
 msgstr "Pas de traduction"
 
@@ -131,7 +131,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:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:58
 msgid "About"
 msgstr "À propos..."
 
@@ -376,6 +376,13 @@ msgstr ""
 
 #: templates/maposmatic/about.html:148
 msgid ""
+"The <a\n"
+"  href=\"http://doc.maposmatic.org\";>MapOSMatic Wiki</a>, where you can read "
+"documentation and technical information about MapOSMatic;"
+msgstr ""
+
+#: templates/maposmatic/about.html:151
+msgid ""
 "<a\n"
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  and ideas</a>."
@@ -384,11 +391,11 @@ msgstr ""
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  et idées</a>."
 
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:157
 msgid "Authors"
 msgstr "Auteurs"
 
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:169
 msgid "Contributors"
 msgstr "Contributeurs"
 
@@ -495,19 +502,23 @@ msgstr "Rendus"
 msgid "News"
 msgstr "Actualités"
 
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:57
+msgid "Wiki"
+msgstr ""
+
+#: templates/maposmatic/base.html:70
 msgid "Random map"
 msgstr "Carte au hasard"
 
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:80
 msgid "No random map found."
 msgstr "Aucune carte trouvée."
 
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "Dernières actualités"
+#: templates/maposmatic/base.html:85
+msgid "Latest <a href=\"http://news.maposmatic.org\";>news</a>"
+msgstr "Dernières <a href=\"http://news.maposmatic.org\";>actualités</a>"
 
-#: templates/maposmatic/base.html:89
+#: templates/maposmatic/base.html:90
 #, python-format
 msgid ""
 "\n"
@@ -517,23 +528,23 @@ msgstr ""
 "\n"
 "publié il y a %(date)s"
 
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:100
 msgid "Contact"
 msgstr "Contact"
 
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:102
 msgid "Mail:"
 msgstr "Email :"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "IRC:"
 msgstr "IRC :"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "on"
 msgstr "sur"
 
-#: templates/maposmatic/base.html:108
+#: templates/maposmatic/base.html:109
 msgid "Language:"
 msgstr "Langue&nbsp;:"
 
@@ -750,3 +761,6 @@ msgstr "Position dans la file d'attente"
 #: templates/maposmatic/job.html:123
 msgid "Result files"
 msgstr "Fichiers générés"
+
+#~ msgid "Latest news"
+#~ msgstr "Dernières actualités"
diff --git a/www/locale/it/LC_MESSAGES/django.po 
b/www/locale/it/LC_MESSAGES/django.po
index 8fc213a..84cf882 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: 2010-01-05 22:05+0100\n"
+"POT-Creation-Date: 2010-01-09 17:25+0100\n"
 "PO-Revision-Date: 2009-12-25 11:49+0100\n"
 "Last-Translator: Thomas Petazzoni <address@hidden>\n"
 "Language-Team: IT <address@hidden>\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:140
+#: settings.py:152
 msgid "No localization"
 msgstr "Nessuna traduzione"
 
@@ -132,7 +132,7 @@ msgstr "Errore del server <em>(500)</em>"
 msgid "There's been an error."
 msgstr "Si è verificato un errore."
 
-#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:58
 msgid "About"
 msgstr "Informazioni"
 
@@ -329,16 +329,23 @@ msgstr ""
 
 #: templates/maposmatic/about.html:148
 msgid ""
+"The <a\n"
+"  href=\"http://doc.maposmatic.org\";>MapOSMatic Wiki</a>, where you can read "
+"documentation and technical information about MapOSMatic;"
+msgstr ""
+
+#: templates/maposmatic/about.html:151
+msgid ""
 "<a\n"
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  and ideas</a>."
 msgstr ""
 
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:157
 msgid "Authors"
 msgstr ""
 
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:169
 msgid "Contributors"
 msgstr ""
 
@@ -443,19 +450,23 @@ msgstr "Risultati"
 msgid "News"
 msgstr "Attualità"
 
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:57
+msgid "Wiki"
+msgstr ""
+
+#: templates/maposmatic/base.html:70
 msgid "Random map"
 msgstr ""
 
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:80
 msgid "No random map found."
 msgstr ""
 
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr ""
+#: templates/maposmatic/base.html:85
+msgid "Latest <a href=\"http://news.maposmatic.org\";>news</a>"
+msgstr "<a href=\"http://news.maposmatic.org\";>Attualità</a>"
 
-#: templates/maposmatic/base.html:89
+#: templates/maposmatic/base.html:90
 #, python-format
 msgid ""
 "\n"
@@ -463,23 +474,23 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:100
 msgid "Contact"
 msgstr ""
 
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:102
 msgid "Mail:"
 msgstr ""
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "IRC:"
 msgstr ""
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "on"
 msgstr ""
 
-#: templates/maposmatic/base.html:108
+#: templates/maposmatic/base.html:109
 msgid "Language:"
 msgstr ""
 
diff --git a/www/locale/nl_NL/LC_MESSAGES/django.po 
b/www/locale/nl_NL/LC_MESSAGES/django.po
index 9928771..468eaf2 100644
--- a/www/locale/nl_NL/LC_MESSAGES/django.po
+++ b/www/locale/nl_NL/LC_MESSAGES/django.po
@@ -19,18 +19,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mapOSMatic 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-05 22:05+0100\n"
+"POT-Creation-Date: 2010-01-09 17:25+0100\n"
 "PO-Revision-Date: 2010-01-07 19:15+0200\n"
 "Last-Translator: Jeroen van Rijn <address@hidden>\n"
 "Language-Team: MapOSMatic Dutch Translation team\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.5.0\n"
 
-#: settings.py:140
+#: settings.py:152
 msgid "No localization"
 msgstr "Geen vertaling"
 
@@ -92,8 +92,8 @@ msgstr "Reproductie is succesvol afgerond"
 
 #: maposmatic/templatetags/extratags.py:47
 msgid ""
-"Rendering failed, please contact <a "
-"href=\"mailto:address@hidden";>address@hidden</a>"
+"Rendering failed, please contact <a href=\"mailto:address@hidden";
+"\">address@hidden</a>"
 msgstr ""
 "De reproductie van uw kaart is mislukt, gelieve contact op te nemen met <a "
 "href=\"mailto:address@hidden";>address@hidden</a>"
@@ -134,7 +134,7 @@ msgstr "Interne fout <em>500</em>"
 msgid "There's been an error."
 msgstr "Er is een fout opgetreden."
 
-#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:58
 msgid "About"
 msgstr "Over..."
 
@@ -149,8 +149,8 @@ msgid ""
 "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"
@@ -158,23 +158,23 @@ msgid ""
 "idea!"
 msgstr ""
 "MapOSMatic is gestart naar een idee van Gilles Lamiral, een bijdrager aan <a "
-"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> en Vrije Software uit 
"
-"de regio Rennes in Frankrijk. Tijdens een weeklang <em>Hackfest</em> "
-"gehouden in Augustus 2009, zijn een groep gekke <a "
-"href=\"http://nl.wikipedia.org/wiki/Hacker\";>hackers</a> aan de slag gegaan "
-"met zijn idee; het idee van Gilles werd in broncode en realiteit omgezet, ze "
-"noemden het project <strong>MapOSMatic</strong>. De group <em>hackers</em> "
-"wenst Gilles te bedanken voor het delen van zijn briljant idee!"
+"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a> en Vrije Software "
+"uit de regio Rennes in Frankrijk. Tijdens een weeklang <em>Hackfest</em> "
+"gehouden in Augustus 2009, zijn een groep gekke <a href=\"http://nl.";
+"wikipedia.org/wiki/Hacker\">hackers</a> aan de slag gegaan met zijn idee; "
+"het idee van Gilles werd in broncode en realiteit omgezet, ze noemden het "
+"project <strong>MapOSMatic</strong>. De group <em>hackers</em> wenst Gilles "
+"te bedanken voor het delen van zijn briljant idee!"
 
 #: templates/maposmatic/about.html:51
 msgid ""
 "Of course, MapOSMatic is fully free software,\n"
-"licensed under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
+"licensed under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.";
+"html\">AGPLv3</a>."
 msgstr ""
 "Natuurlijk is MapOSMatic volledig Vrije Software, verspreid onder de "
-"voorwaarden van de <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
+"voorwaarden van de <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.";
+"html\">AGPLv3</a>."
 
 #: templates/maposmatic/about.html:54
 msgid "How does it work?"
@@ -194,12 +194,11 @@ msgid ""
 "the database, which allows to keep it up to date with the new\n"
 "contributions of OpenStreetMap users."
 msgstr ""
-"Op onze hardware draaien we een <a "
-"href=\"http://www.postgresql.org\";>PostgreSQL</a> server met de <a "
-"href=\"http://postgis.refractions.net\";>PostGIS</a> uitbreiding. In deze "
-"database hebben we de kaartgegevens van <a "
-"href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\";>OpenStreetMap voor de "
-"gehele wereld</a> geladen met gebruik van het hulpprogramma <a\n"
+"Op onze hardware draaien we een <a href=\"http://www.postgresql.org";
+"\">PostgreSQL</a> server met de <a href=\"http://postgis.refractions.net";
+"\">PostGIS</a> uitbreiding. In deze database hebben we de kaartgegevens van "
+"<a href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\";>OpenStreetMap voor "
+"de gehele wereld</a> geladen met gebruik van het hulpprogramma <a\n"
 "href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\";>osm2pgsql</a>. Dit "
 "zelfde programma werkt de <a\n"
 "href=\"http://planet.openstreetmap.org/daily/\";>dagelijkse verschillen</a> "
@@ -211,8 +210,8 @@ 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:"
@@ -291,8 +290,8 @@ msgid ""
 msgstr ""
 "Deze web service is <i>MapOSMatic</i> genoemd, naar <i>map-o-matic</i> maar "
 "met een verwijzing naar OpenStreetMap (OSM). Deze web service is in Python "
-"geschreven met behulp van <a href=\"http://www.djangoproject.com\";>Django</a> 
"
-"en is verantwoordelijk voor het verwerken en weergeven van aanvragen voor "
+"geschreven met behulp van <a href=\"http://www.djangoproject.com\";>Django</"
+"a> en is verantwoordelijk voor het verwerken en weergeven van aanvragen voor "
 "kaartproductie. Het reproduceren van de kaart zelf gebeurd asynschroon via "
 "de <i>maposmaticd</i> daemon; deze verwerkt de opdrachten een voor een, "
 "omdat het maken van een kaart een intensief proces is welke veel vraagt van "
@@ -306,12 +305,11 @@ msgid ""
 "allows to select between multiple cities of the same name, by\n"
 "providing informations on the city location."
 msgstr ""
-"Voor de zoekmachine om plaatsen te vinden gebruiken we de geweldige <a "
-"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. Deze "
-"service heeft het erg gemakkelijk gemaakt om een fijne zoekmachine aan te "
-"bieden die toestaat om te kiezen tussen meerdere plaatsen met dezelfde naam "
-"door informatie te verschaffen over de locatie waar deze plaatsen zich "
-"bevinden."
+"Voor de zoekmachine om plaatsen te vinden gebruiken we de geweldige <a href="
+"\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. Deze service "
+"heeft het erg gemakkelijk gemaakt om een fijne zoekmachine aan te bieden die "
+"toestaat om te kiezen tussen meerdere plaatsen met dezelfde naam door "
+"informatie te verschaffen over de locatie waar deze plaatsen zich bevinden."
 
 #: templates/maposmatic/about.html:118
 msgid "Contributing"
@@ -341,7 +339,8 @@ msgstr ""
 #: templates/maposmatic/about.html:131
 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 ""
 "De <a\n"
@@ -357,14 +356,15 @@ msgstr "Het <code>#maposmatic</code> IRC-kanaal op 
Freenode;"
 #: templates/maposmatic/about.html:138
 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 <code>git clone\n"
 "  git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
 msgstr ""
 "De <a\n"
-"  
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\";>OCitySMap "
-"Git depot</a>, welke gekloond kan worden via via « <code>git clone "
-"git://git.sv.gnu.org/maposmatic/ocitysmap.git</code> »&nbsp;;"
+"  href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git";
+"\">OCitySMap Git depot</a>, welke gekloond kan worden via via « <code>git "
+"clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</code> »&nbsp;;"
 
 #: templates/maposmatic/about.html:143
 msgid ""
@@ -373,12 +373,19 @@ msgid ""
 "  Git repository</a>, which can be cloned using\n"
 "  <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
 msgstr ""
-"De <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic Git 
"
-"depot</a>, welke gekloond kan worden via « <code>git clone "
-"git://git.sv.gnu.org/maposmatic.git</code> »&nbsp;;"
+"De <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic "
+"Git depot</a>, welke gekloond kan worden via « <code>git clone git://git.sv."
+"gnu.org/maposmatic.git</code> »&nbsp;;"
 
 #: templates/maposmatic/about.html:148
 msgid ""
+"The <a\n"
+"  href=\"http://doc.maposmatic.org\";>MapOSMatic Wiki</a>, where you can read "
+"documentation and technical information about MapOSMatic;"
+msgstr ""
+
+#: templates/maposmatic/about.html:151
+msgid ""
 "<a\n"
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  and ideas</a>."
@@ -387,11 +394,11 @@ msgstr ""
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>Taken- en "
 "ideeenlijst</a>."
 
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:157
 msgid "Authors"
 msgstr "Auteurs"
 
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:169
 msgid "Contributors"
 msgstr "Bijdragers"
 
@@ -498,19 +505,23 @@ msgstr "Opdrachten"
 msgid "News"
 msgstr "Nieuws"
 
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:57
+msgid "Wiki"
+msgstr ""
+
+#: templates/maposmatic/base.html:70
 msgid "Random map"
 msgstr "Willekeurge kaart"
 
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:80
 msgid "No random map found."
 msgstr "Geen kaart gevonden."
 
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "Laatste nieuws"
+#: templates/maposmatic/base.html:85
+msgid "Latest <a href=\"http://news.maposmatic.org\";>news</a>"
+msgstr "Laatste <a href=\"http://news.maposmatic.org\";>nieuws</a>"
 
-#: templates/maposmatic/base.html:89
+#: templates/maposmatic/base.html:90
 #, python-format
 msgid ""
 "\n"
@@ -520,23 +531,23 @@ msgstr ""
 "\n"
 "%(date)s geleden gepubliceerd"
 
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:100
 msgid "Contact"
 msgstr "Contact"
 
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:102
 msgid "Mail:"
 msgstr "Email :"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "IRC:"
 msgstr "IRC :"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "on"
 msgstr "op"
 
-#: templates/maposmatic/base.html:108
+#: templates/maposmatic/base.html:109
 msgid "Language:"
 msgstr "Taal:"
 
@@ -580,9 +591,9 @@ msgid ""
 "is made of two pages:"
 msgstr ""
 "MapOSMatic is een web service en Vrije Software die u toestaat om kaarten "
-"van plaatsen te genereren met gebruikmaking van informatie van <a "
-"href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>. Een stadskaart "
-"bestaat uit twee paginas:"
+"van plaatsen te genereren met gebruikmaking van informatie van <a href="
+"\"http://www.openstreetmap.org\";>OpenStreetMap</a>. Een stadskaart bestaat "
+"uit twee paginas:"
 
 #: templates/maposmatic/index.html:305
 msgid ""
@@ -611,9 +622,9 @@ msgid ""
 "maps."
 msgstr ""
 "De gegevens die gebruikt worden om de kaarten te maken komen van "
-"OpenStreetMap, het staat u vrij om (onder de voorwaarden van de <a "
-"href=\"http://wiki.openstreetmap.org/wiki/License\";>OpenStreetMap "
-"licentie</a>) de kaarten te hergebruiken, verkopen, dan wel aanpassen."
+"OpenStreetMap, het staat u vrij om (onder de voorwaarden van de <a href="
+"\"http://wiki.openstreetmap.org/wiki/License\";>OpenStreetMap licentie</a>) "
+"de kaarten te hergebruiken, verkopen, dan wel aanpassen."
 
 #: templates/maposmatic/index.html:318
 msgid "More details"
@@ -754,3 +765,6 @@ msgstr "Positie van uw aanvraag in de wachtrij"
 #: templates/maposmatic/job.html:123
 msgid "Result files"
 msgstr "Gegenereerde bestanden"
+
+#~ msgid "Latest news"
+#~ msgstr "Laatste nieuws"
diff --git a/www/locale/pt_BR/LC_MESSAGES/django.po 
b/www/locale/pt_BR/LC_MESSAGES/django.po
index c0aaadc..635c952 100644
--- a/www/locale/pt_BR/LC_MESSAGES/django.po
+++ b/www/locale/pt_BR/LC_MESSAGES/django.po
@@ -20,15 +20,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mapOSMatic 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-26 20:47+0100\n"
+"POT-Creation-Date: 2010-01-09 17:25+0100\n"
 "PO-Revision-Date: 2009-12-26 20:47+0100\n"
-"Last-Translator: Arlindo \"Nighto\" Pereira <address@hidden>\n"
+"Last-Translator: Arlindo \"Nighto\" Pereira <address@hidden"
+"com>\n"
 "Language-Team: PT <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:139
+#: settings.py:152
 msgid "No localization"
 msgstr "Sem tradução"
 
@@ -88,12 +89,14 @@ msgid "Rendering successful"
 msgstr "Renderização concluída com sucesso"
 
 #: maposmatic/templatetags/extratags.py:47
-msgid "Rendering failed, please contact <a 
href=\"mailto:address@hidden";>address@hidden</a>"
-msgstr "A renderização falhou, por favor contate <a 
href=\"mailto:address@hidden";>address@hidden</a>"
+msgid ""
+"Rendering failed, please contact <a href=\"mailto:address@hidden";
+"\">address@hidden</a>"
+msgstr ""
+"A renderização falhou, por favor contate <a href=\"mailto:address@hidden";
+"org\">address@hidden</a>"
 
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:53
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:53
 msgid "Home"
 msgstr "Início"
 
@@ -129,8 +132,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:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:58
 msgid "About"
 msgstr "Sobre"
 
@@ -145,7 +147,8 @@ msgid ""
 "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"
@@ -153,21 +156,28 @@ msgid ""
 "idea!"
 msgstr ""
 "O MapOSMatic começou graças a uma ideia de Gilles Lamiral, um 
contribuidor\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:51
 msgid ""
 "Of course, MapOSMatic is fully free software,\n"
-"licensed under the <a 
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
+"licensed under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.";
+"html\">AGPLv3</a>."
 msgstr ""
 "Certamente, MapOSMatic é software livre, disponível\n"
-"nos termos da licença <a 
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
+"nos termos da licença <a href=\"http://www.fsf.org/licensing/licenses/agpl-";
+"3.0.html\">AGPLv3</a>."
 
 #: templates/maposmatic/about.html:54
 msgid "How does it work?"
@@ -191,12 +201,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 usuários do OpenStreetMap."
 
 #: templates/maposmatic/about.html:68
@@ -204,15 +216,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:78
 msgid ""
@@ -299,7 +315,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."
 
@@ -331,29 +348,32 @@ msgstr ""
 #: templates/maposmatic/about.html:131
 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:135
 msgid ""
 "The IRC channel <code>#maposmatic</code> on\n"
 "  Freenode;"
-msgstr ""
-"O canal IRC <code>#maposmatic</code> na rede Freenode;"
+msgstr "O canal IRC <code>#maposmatic</code> na rede Freenode;"
 
 #: templates/maposmatic/about.html:138
 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 <code>git clone\n"
 "  git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
 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"
 "  <code>git clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
 
@@ -365,12 +385,20 @@ msgid ""
 "  <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
 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"
 "  <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
 
 #: templates/maposmatic/about.html:148
 msgid ""
+"The <a\n"
+"  href=\"http://doc.maposmatic.org\";>MapOSMatic Wiki</a>, where you can read "
+"documentation and technical information about MapOSMatic;"
+msgstr ""
+
+#: templates/maposmatic/about.html:151
+msgid ""
 "<a\n"
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  and ideas</a>."
@@ -379,11 +407,11 @@ msgstr ""
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  e ideias</a>."
 
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:157
 msgid "Authors"
 msgstr "Autores"
 
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:169
 msgid "Contributors"
 msgstr "Contribuidores"
 
@@ -401,13 +429,11 @@ msgstr ""
 "de renderização recebidos durante as últimas 24 horas,\n"
 "começando do mais recente."
 
-#: templates/maposmatic/all_jobs.html:49
-#: templates/maposmatic/all_maps.html:40
+#: templates/maposmatic/all_jobs.html:49 templates/maposmatic/all_maps.html:40
 msgid "Title"
 msgstr "Título"
 
-#: templates/maposmatic/all_jobs.html:50
-#: templates/maposmatic/all_maps.html:41
+#: templates/maposmatic/all_jobs.html:50 templates/maposmatic/all_maps.html:41
 msgid "Location"
 msgstr "Localidade"
 
@@ -431,39 +457,35 @@ msgstr "Renderização finalizada em"
 msgid "Position in queue"
 msgstr "Posição na fila"
 
-#: templates/maposmatic/all_jobs.html:56
-msgid "ETA before rendering"
-msgstr "Tempo estimado antes de renderizar"
-
-#: templates/maposmatic/all_jobs.html:79
+#: templates/maposmatic/all_jobs.html:78
 msgid "not started"
 msgstr "não iniciado"
 
-#: templates/maposmatic/all_jobs.html:88
+#: templates/maposmatic/all_jobs.html:87
 msgid "not finished"
 msgstr "não terminado"
 
-#: templates/maposmatic/all_jobs.html:109
+#: templates/maposmatic/all_jobs.html:103
 #: templates/maposmatic/all_maps.html:82
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/maposmatic/all_jobs.html:113
+#: templates/maposmatic/all_jobs.html:107
 #: templates/maposmatic/all_maps.html:86
 msgid "Page"
 msgstr "Página"
 
-#: templates/maposmatic/all_jobs.html:113
+#: templates/maposmatic/all_jobs.html:107
 #: templates/maposmatic/all_maps.html:86
 msgid "of"
 msgstr "de"
 
-#: templates/maposmatic/all_jobs.html:117
+#: templates/maposmatic/all_jobs.html:111
 #: templates/maposmatic/all_maps.html:90
 msgid "Next"
 msgstr "Próxima"
 
-#: templates/maposmatic/all_jobs.html:123
+#: templates/maposmatic/all_jobs.html:117
 msgid ""
 "No map rendering request since the last 24\n"
 "hours."
@@ -471,13 +493,11 @@ msgstr ""
 "Nenhum pedido de renderização de mapas desde\n"
 "as últimas 24 horas."
 
-#: templates/maposmatic/all_maps.html:35
-#: templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:35 templates/maposmatic/base.html:55
 msgid "Maps"
 msgstr "Mapas"
 
-#: templates/maposmatic/all_maps.html:42
-#: templates/maposmatic/job.html:119
+#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:115
 msgid "Thumbnail"
 msgstr "Miniatura"
 
@@ -485,8 +505,7 @@ msgstr "Miniatura"
 msgid "Files"
 msgstr "Arquivos"
 
-#: templates/maposmatic/all_maps.html:71
-#: templates/maposmatic/job.html:134
+#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:130
 msgid "The generated files are no longer available"
 msgstr "Os arquivos gerados não estão mais disponíveis"
 
@@ -502,19 +521,23 @@ msgstr "Trabalhos"
 msgid "News"
 msgstr "Notícias"
 
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:57
+msgid "Wiki"
+msgstr ""
+
+#: templates/maposmatic/base.html:70
 msgid "Random map"
 msgstr "Mapa aleatório"
 
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:80
 msgid "No random map found."
 msgstr "Nenhum mapa aleatório encontrado."
 
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "Últimas notícias"
+#: templates/maposmatic/base.html:85
+msgid "Latest <a href=\"http://news.maposmatic.org\";>news</a>"
+msgstr "Últimas <a href=\"http://news.maposmatic.org\";>notícias</a>"
 
-#: templates/maposmatic/base.html:89
+#: templates/maposmatic/base.html:90
 #, python-format
 msgid ""
 "\n"
@@ -525,41 +548,43 @@ msgstr ""
 "    publicado a %(date)s atrás\n"
 "    "
 
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:100
 msgid "Contact"
 msgstr "Contato"
 
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:102
 msgid "Mail:"
 msgstr "Email:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "IRC:"
 msgstr "IRC:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "on"
 msgstr "no"
 
-#: templates/maposmatic/base.html:108
+#: templates/maposmatic/base.html:109
 msgid "Language:"
 msgstr "Idioma:"
 
 #: templates/maposmatic/index.html:227
-msgid "This place cannot be rendered by MapOSMatic, administrative boundary 
missing. Please contribute !"
-msgstr "Esta cudade não pode ser renderizada pelo MapOSMatic por não 
constarem seus dados de fronteira. Por favor contribua!"
+msgid ""
+"This place cannot be rendered by MapOSMatic, administrative boundary "
+"missing. Please contribute !"
+msgstr ""
+"Esta cudade não pode ser renderizada pelo MapOSMatic por não constarem seus 
"
+"dados de fronteira. Por favor contribua!"
 
 #: templates/maposmatic/index.html:240
 msgid "No results found."
 msgstr "Nenhum resultado encontrado."
 
-#: templates/maposmatic/index.html:252
-#: templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
 msgid "Generate"
 msgstr "Gerar"
 
-#: templates/maposmatic/index.html:258
-#: templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
 msgid "Please fill in the form before trying to proceed"
 msgstr "Por favor preencha o formulário abaixo antes de prosseguir"
 
@@ -583,12 +608,16 @@ msgid ""
 "is made of two pages:"
 msgstr ""
 "MapOSMatic é um serviço livre que permite gerar\n"
-"mapas de cidades usando dados do <a 
href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>.\n"
+"mapas de cidades usando dados do <a href=\"http://www.openstreetmap.org";
+"\">OpenStreetMap</a>.\n"
 "Um mapa de cidade é constituído de duas páginas:"
 
 #: templates/maposmatic/index.html:305
-msgid "The map itself, splitted in squares allowing to easily look for 
streets;"
-msgstr "O mapa em si, dividido em quadrados permitindo procurar pelas ruas 
rapidamente;"
+msgid ""
+"The map itself, splitted in squares allowing to easily look for streets;"
+msgstr ""
+"O mapa em si, dividido em quadrados permitindo procurar pelas ruas "
+"rapidamente;"
 
 #: templates/maposmatic/index.html:306
 msgid "An index of the streets with references to the squares on the map."
@@ -612,7 +641,8 @@ msgid ""
 msgstr ""
 "Como os dados utilizados para gerar os mapas vem do\n"
 "OpenStreetMap, você poderá reutilizá-los, vendê-los,\n"
-"os mapas gerados, respeitando os termos da <a 
href=\"http://wiki.openstreetmap.org/wiki/License\";>licença do\n"
+"os mapas gerados, respeitando os termos da <a href=\"http://wiki.";
+"openstreetmap.org/wiki/License\">licença do\n"
 "OpenStreetMap</a>."
 
 #: templates/maposmatic/index.html:318
@@ -654,7 +684,8 @@ msgid ""
 "that are country specific."
 msgstr ""
 "<em>MapOSMatic</em> cobre todo o mundo, mas precisamos\n"
-"de contribuidores para traduzir e adaptar algumas partes do 
<em>MapOSMatic</em>\n"
+"de contribuidores para traduzir e adaptar algumas partes do <em>MapOSMatic</"
+"em>\n"
 "que são específicas de cada país."
 
 #: templates/maposmatic/index.html:380
@@ -702,8 +733,11 @@ msgid "Map <i>%(job_t)s</i> Status"
 msgstr "Statusw do mapa <i>%(job_t)s</i>"
 
 #: templates/maposmatic/job.html:43
-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.html:51
 msgid "Refresh the status"
@@ -733,8 +767,7 @@ msgstr "Data de submissão"
 msgid "Start of rendering time"
 msgstr "Data do começo da renderização"
 
-#: templates/maposmatic/job.html:87
-#: templates/maposmatic/job.html.py:100
+#: templates/maposmatic/job.html:87 templates/maposmatic/job.html.py:100
 msgid "Rendering not started yet"
 msgstr "Renderização ainda não iniciada"
 
@@ -750,11 +783,15 @@ msgstr "Renderização ainda não terminada"
 msgid "Current position in queue"
 msgstr "Posição atual na fila"
 
-#: templates/maposmatic/job.html:113
-msgid "Estimated rendering time completion"
-msgstr "Tempo estimado para a renderização"
-
-#: templates/maposmatic/job.html:127
+#: templates/maposmatic/job.html:123
 msgid "Result files"
 msgstr "Arquivos gerados"
 
+#~ msgid "ETA before rendering"
+#~ msgstr "Tempo estimado antes de renderizar"
+
+#~ msgid "Latest news"
+#~ msgstr "Últimas notícias"
+
+#~ msgid "Estimated rendering time completion"
+#~ msgstr "Tempo estimado para a renderização"
diff --git a/www/locale/ru/LC_MESSAGES/django.po 
b/www/locale/ru/LC_MESSAGES/django.po
index 0017ad5..7a42126 100644
--- a/www/locale/ru/LC_MESSAGES/django.po
+++ b/www/locale/ru/LC_MESSAGES/django.po
@@ -19,8 +19,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mapOSMatic 0.1\n"
-"Report-Msgid-Bugs-To: Konstantin Mochalov <address@hidden>\n"
-"POT-Creation-Date: 2010-01-05 23:26+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-09 17:25+0100\n"
 "PO-Revision-Date: 2010-01-06 00:28+0300\n"
 "Last-Translator: Konstantin Mochalov <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:139
+#: settings.py:152
 msgid "No localization"
 msgstr "Без локализации"
 
@@ -88,12 +88,14 @@ msgid "Rendering successful"
 msgstr "Отрисовка завершена удачно"
 
 #: maposmatic/templatetags/extratags.py:47
-msgid "Rendering failed, please contact <a 
href=\"mailto:address@hidden";>address@hidden</a>"
-msgstr "Отрисовка завершилась неудачно, 
пожалуйста сообщите на <a 
href=\"mailto:address@hidden";>address@hidden</a>"
+msgid ""
+"Rendering failed, please contact <a href=\"mailto:address@hidden";
+"\">address@hidden</a>"
+msgstr ""
+"Отрисовка завершилась неудачно, 
пожалуйста сообщите на <a href=\"mailto:";
+"address@hidden">address@hidden</a>"
 
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:53
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:53
 msgid "Home"
 msgstr "Домой"
 
@@ -129,8 +131,7 @@ msgstr "Ошибка сервера <em>(500)</em>"
 msgid "There's been an error."
 msgstr "Произошла ошибка."
 
-#: templates/maposmatic/about.html:35
-#: templates/maposmatic/base.html:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:58
 msgid "About"
 msgstr "О сервисе"
 
@@ -145,7 +146,8 @@ msgid ""
 "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"
@@ -154,20 +156,25 @@ 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 area, Франция. С его идеи, группа 
сумасшедших <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:51
 msgid ""
 "Of course, MapOSMatic is fully free software,\n"
-"licensed under the <a 
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
+"licensed under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.";
+"html\">AGPLv3</a>."
 msgstr ""
 "Конечно, MapOSMatic полностью свободное 
программное обеспечение,\n"
-"распространяемое по <a 
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
+"распространяемое по <a 
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.";
+"html\">AGPLv3</a>."
 
 #: templates/maposmatic/about.html:54
 msgid "How does it work?"
@@ -189,13 +196,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."
 
@@ -204,16 +213,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:78
@@ -264,8 +277,10 @@ msgstr ""
 "Этот Python-модуль может использоваться с 
помощью утилиты командной\n"
 "строки, входящей в OCitySMap, так что любой 
может настроить свою систему\n"
 "отрисовки карт городов. Однако, установка 
различных компонентов довольно\n"
-"сложна, поэтому мы создали небольшой 
вебсервис поверх этого модуля, с помощью\n"
-"которого пользователи смогут просто 
сгенерировать и использовать карты 
городов\n"
+"сложна, поэтому мы создали небольшой 
вебсервис поверх этого модуля, с "
+"помощью\n"
+"которого пользователи смогут просто 
сгенерировать и использовать карты "
+"городов\n"
 "из OpenStreetMap."
 
 #: templates/maposmatic/about.html:102
@@ -281,7 +296,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"
@@ -333,11 +349,13 @@ msgstr ""
 #: templates/maposmatic/about.html:131
 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:135
@@ -351,12 +369,14 @@ msgstr ""
 #: templates/maposmatic/about.html:138
 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 <code>git clone\n"
 "  git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
 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>, который можно склонировать командой\n"
 "  <code>git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
 
@@ -368,12 +388,20 @@ msgid ""
 "  <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
 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"
 "  <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
 
 #: templates/maposmatic/about.html:148
 msgid ""
+"The <a\n"
+"  href=\"http://doc.maposmatic.org\";>MapOSMatic Wiki</a>, where you can read "
+"documentation and technical information about MapOSMatic;"
+msgstr ""
+
+#: templates/maposmatic/about.html:151
+msgid ""
 "<a\n"
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
 "  and ideas</a>."
@@ -382,11 +410,11 @@ msgstr ""
 "  
href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-список\n"
 "  и идеи</a>."
 
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:157
 msgid "Authors"
 msgstr "Авторы"
 
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:169
 msgid "Contributors"
 msgstr "Соавторы"
 
@@ -403,13 +431,11 @@ msgstr ""
 "Эта страница показывает состояние всех 
запросов на отрисовку,\n"
 "полученных за последние 24 часа, начиная с 
самого нового."
 
-#: templates/maposmatic/all_jobs.html:49
-#: templates/maposmatic/all_maps.html:40
+#: templates/maposmatic/all_jobs.html:49 templates/maposmatic/all_maps.html:40
 msgid "Title"
 msgstr "Название"
 
-#: templates/maposmatic/all_jobs.html:50
-#: templates/maposmatic/all_maps.html:41
+#: templates/maposmatic/all_jobs.html:50 templates/maposmatic/all_maps.html:41
 msgid "Location"
 msgstr "Местность"
 
@@ -469,13 +495,11 @@ msgstr ""
 "Не было запросов на отрисовку карты в 
последние 24\n"
 "часа."
 
-#: templates/maposmatic/all_maps.html:35
-#: templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:35 templates/maposmatic/base.html:55
 msgid "Maps"
 msgstr "Карты"
 
-#: templates/maposmatic/all_maps.html:42
-#: templates/maposmatic/job.html:115
+#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:115
 msgid "Thumbnail"
 msgstr "Эскиз"
 
@@ -483,8 +507,7 @@ msgstr "Эскиз"
 msgid "Files"
 msgstr "Файлы"
 
-#: templates/maposmatic/all_maps.html:71
-#: templates/maposmatic/job.html:130
+#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:130
 msgid "The generated files are no longer available"
 msgstr "Сгенерированные файлы больше не 
доступны"
 
@@ -500,19 +523,23 @@ msgstr "Задания"
 msgid "News"
 msgstr "Новости"
 
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:57
+msgid "Wiki"
+msgstr ""
+
+#: templates/maposmatic/base.html:70
 msgid "Random map"
 msgstr "Случайная карта"
 
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:80
 msgid "No random map found."
 msgstr "Не найдено случайной карты."
 
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "Последние новости"
+#: templates/maposmatic/base.html:85
+msgid "Latest <a href=\"http://news.maposmatic.org\";>news</a>"
+msgstr "Последние <a 
href=\"http://news.maposmatic.org\";>новости</a>"
 
-#: templates/maposmatic/base.html:89
+#: templates/maposmatic/base.html:90
 #, python-format
 msgid ""
 "\n"
@@ -523,41 +550,43 @@ msgstr ""
 "    опубликовано %(date)s назад\n"
 "    "
 
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:100
 msgid "Contact"
 msgstr "Связаться"
 
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:102
 msgid "Mail:"
 msgstr "Почта:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "IRC:"
 msgstr "IRC:"
 
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:103
 msgid "on"
 msgstr "вкл"
 
-#: templates/maposmatic/base.html:108
+#: templates/maposmatic/base.html:109
 msgid "Language:"
 msgstr "Язык:"
 
 #: templates/maposmatic/index.html:227
-msgid "This place cannot be rendered by MapOSMatic, administrative boundary 
missing. Please contribute !"
-msgstr "Это место не может быть отрисовано 
MapOSMatic, отсутствует административная 
граница. Пожалуйста, отметьте ее на OpenStreetMap!"
+msgid ""
+"This place cannot be rendered by MapOSMatic, administrative boundary "
+"missing. Please contribute !"
+msgstr ""
+"Это место не может быть отрисовано MapOSMatic, 
отсутствует административная "
+"граница. Пожалуйста, отметьте ее на 
OpenStreetMap!"
 
 #: templates/maposmatic/index.html:240
 msgid "No results found."
 msgstr "Результатов не найдено."
 
-#: templates/maposmatic/index.html:252
-#: templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
 msgid "Generate"
 msgstr "Создать"
 
-#: templates/maposmatic/index.html:258
-#: templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
 msgid "Please fill in the form before trying to proceed"
 msgstr "Пожалуйста, заполните форму"
 
@@ -582,11 +611,13 @@ msgid ""
 msgstr ""
 "MapOSMatic — основанный на свободном ПО 
вебсервис,\n"
 "позволяющий генерировать карты городов 
используя данные\n"
-"<a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>. 
Созданная карта города\n"
+"<a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>. 
Созданная карта "
+"города\n"
 "включает две страницы:"
 
 #: templates/maposmatic/index.html:305
-msgid "The map itself, splitted in squares allowing to easily look for 
streets;"
+msgid ""
+"The map itself, splitted in squares allowing to easily look for streets;"
 msgstr "Сама карта, разделенная на квадраты, 
позволяющие находить улицы."
 
 #: templates/maposmatic/index.html:306
@@ -611,7 +642,8 @@ msgid ""
 msgstr ""
 "Так как для генерации карты используются 
данные из OpenStreetMap,\n"
 "вы можете свободно (под условиями <a\n"
-"href=\"http://wiki.openstreetmap.org/wiki/License\";>лицензии 
OpenStreetMap)</a>)\n"
+"href=\"http://wiki.openstreetmap.org/wiki/License\";>лицензии 
OpenStreetMap)</"
+"a>)\n"
 "использовать, продавать, модифицировать, 
... сгенерированные\n"
 "карты."
 
@@ -654,7 +686,8 @@ msgid ""
 "that are country specific."
 msgstr ""
 "<em>MapOSMatic</em> покрывает весь мир, но нам 
нужны\n"
-"желающие помочь в переводах на языки и 
адаптации некоторых частей <em>MapOSMatic</em>,\n"
+"желающие помочь в переводах на языки и 
адаптации некоторых частей "
+"<em>MapOSMatic</em>,\n"
 "которые специфичны для отдельных стран."
 
 #: templates/maposmatic/index.html:380
@@ -695,8 +728,10 @@ msgid ""
 msgstr ""
 "Как только задание в очередь на отрисовку 
создастся, \n"
 "вы будете направлены на страницу, 
показывающую состояние задания 
отрисовки.\n"
-"Как только отрисовка завершится (это 
может занять некоторое время в 
зависимости\n"
-"от загруженности очереди), эта страница 
будет содержать ссылки на 
сгенерированную\n"
+"Как только отрисовка завершится (это 
может занять некоторое время в "
+"зависимости\n"
+"от загруженности очереди), эта страница 
будет содержать ссылки на "
+"сгенерированную\n"
 "карту."
 
 #: templates/maposmatic/job.html:38
@@ -705,8 +740,11 @@ msgid "Map <i>%(job_t)s</i> Status"
 msgstr "Состояние карты <i>%(job_t)s</i>"
 
 #: templates/maposmatic/job.html:43
-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.html:51
 msgid "Refresh the status"
@@ -736,8 +774,7 @@ msgstr "Время создания"
 msgid "Start of rendering time"
 msgstr "Время начала отрисовки"
 
-#: templates/maposmatic/job.html:87
-#: templates/maposmatic/job.html.py:100
+#: templates/maposmatic/job.html:87 templates/maposmatic/job.html.py:100
 msgid "Rendering not started yet"
 msgstr "Отрисовка еще не начата"
 
@@ -757,3 +794,5 @@ msgstr "Текущая позиция в очереди"
 msgid "Result files"
 msgstr "Файлы результата"
 
+#~ msgid "Latest news"
+#~ msgstr "Последние новости"
diff --git a/www/maposmatic.wsgi b/www/maposmatic.wsgi
new file mode 100644
index 0000000..cc77173
--- /dev/null
+++ b/www/maposmatic.wsgi
@@ -0,0 +1,35 @@
+# coding: utf-8
+
+# maposmatic, the web front-end of the MapOSMatic city map generation system
+# Copyright (C) 2009  David Decotigny
+# Copyright (C) 2009  Frédéric Lehobey
+# Copyright (C) 2009  David Mentré
+# Copyright (C) 2009  Maxime Petazzoni
+# Copyright (C) 2009  Thomas Petazzoni
+# Copyright (C) 2009  Gaël Utard
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os, sys
+
+sys.path.append("/home/d2/Downloads/git/maposmatic")
+sys.path.append("/home/d2/Downloads/git/ocitysmap")
+print sys.path
+
+os.environ["DJANGO_SETTINGS_MODULE"] = 'www.settings'
+os.environ["MAPOSMATIC_LOG_FILE"] = "/tmp/maposmatic-www.log"
+
+import django.core.handlers.wsgi
+
+application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/www/templates/maposmatic/base.html 
b/www/templates/maposmatic/base.html
index a9c6a12..3eb189d 100644
--- a/www/templates/maposmatic/base.html
+++ b/www/templates/maposmatic/base.html
@@ -82,7 +82,7 @@
 </div>
 
 <div class="box">
-  <h2>{% trans "Latest news" %}</h2>
+  <h2>{% trans 'Latest <a href="http://news.maposmatic.org";>news</a>' %}</h2>
   <ul>
     {% for entry in blogposts %}
     <li><a href="{{ entry.link }}">{{ entry.title }}</a><br/>
-- 
1.6.4.4
reply via email to
[Prev in Thread] Current Thread [Next in Thread]