[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH 10/24] Updated translations to follow the small
|
From: |
Maxime Petazzoni |
|
Subject: |
[Maposmatic-dev] [PATCH 10/24] Updated translations to follow the small changes made during the redesign. |
|
Date: |
Sun, 10 Jan 2010 15:54:04 +0100 |
---
www/locale/ar/LC_MESSAGES/django.po | 189 ++++++------
www/locale/ca/LC_MESSAGES/django.po | 197 ++++++------
www/locale/de/LC_MESSAGES/django.po | 197 ++++++------
www/locale/fr/LC_MESSAGES/django.po | 199 ++++++------
www/locale/it/LC_MESSAGES/django.po | 177 +++++------
www/locale/nl_NL/LC_MESSAGES/django.po | 518 ++++++++++++++++--------------
www/locale/pt_BR/LC_MESSAGES/django.po | 547 ++++++++++++++++++--------------
www/locale/ru/LC_MESSAGES/django.po | 197 ++++++------
8 files changed, 1152 insertions(+), 1069 deletions(-)
diff --git a/www/locale/ar/LC_MESSAGES/django.po
b/www/locale/ar/LC_MESSAGES/django.po
index 54d1e09..937a115 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: 2010-01-07 13:05+0100\n"
+"POT-Creation-Date: 2010-01-08 16:33+0100\n"
"PO-Revision-Date: 2010-01-06 09:03+0300\n"
"Last-Translator: Bassem JARKAS <address@hidden>\n"
"Language-Team: Arabic Translation\n"
@@ -18,7 +18,7 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Virtaal 0.5.0\n"
-#: settings.py:147
+#: settings.py:152
msgid "No localization"
msgstr "Ùا ÙÙجد ترجÙ
Ø©"
@@ -81,7 +81,7 @@ msgstr "ÙØ¬Ø Ø§Ùعرض"
msgid "Rendering failed, please contact address@hidden"
msgstr ""
-#: 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:63
msgid "Home"
msgstr "اÙصÙØØ© اÙرئÙسÙØ©"
@@ -117,11 +117,11 @@ 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:67
msgid "About"
msgstr "ØÙÙ MapOSMatic"
-#: templates/maposmatic/about.html:37
+#: templates/maposmatic/about.html:36
msgid "History"
msgstr "اÙتارÙØ®"
@@ -141,18 +141,18 @@ msgid ""
"idea!"
msgstr ""
-#: templates/maposmatic/about.html:51
+#: templates/maposmatic/about.html:53
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\n"
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
msgstr ""
-#: templates/maposmatic/about.html:54
+#: templates/maposmatic/about.html:60
msgid "How does it work?"
msgstr "ÙÙ٠تعÙ
ÙØ"
-#: templates/maposmatic/about.html:56
+#: templates/maposmatic/about.html:63
msgid ""
"On our server, we run a <a\n"
"href=\"http://www.postgresql.org\";>PostgreSQL</a> server, with the <a\n"
@@ -167,7 +167,7 @@ msgid ""
"contributions of OpenStreetMap users."
msgstr ""
-#: templates/maposmatic/about.html:68
+#: 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"
@@ -179,13 +179,13 @@ msgid ""
"built <i>OCitySMap</i>, a Python module that:"
msgstr ""
-#: templates/maposmatic/about.html:78
+#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
msgstr ""
-#: templates/maposmatic/about.html:81
+#: templates/maposmatic/about.html:89
msgid ""
"Renders on top of the map, using Mapnik, the grid\n"
" of 500 meters squares, the labels of the squares, and a few other\n"
@@ -193,20 +193,20 @@ msgid ""
" etc.);"
msgstr ""
-#: templates/maposmatic/about.html:86
+#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
msgstr ""
-#: templates/maposmatic/about.html:89
+#: 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 ""
-#: templates/maposmatic/about.html:95
+#: templates/maposmatic/about.html:101
msgid ""
"This Python module can be used through a command-line\n"
"tool provided with OCitySMap, so everyone can run its own city-map\n"
@@ -216,7 +216,7 @@ msgid ""
"OpenStreetMap city maps."
msgstr ""
-#: templates/maposmatic/about.html:102
+#: templates/maposmatic/about.html:110
msgid ""
"This web service has been called <i>MapOSMatic</i>,\n"
"like <i>map-o-matic</i> but with a reference to OpenStreetMap (OSM). The\n"
@@ -229,7 +229,7 @@ msgid ""
"intensive nature of the map rendering process."
msgstr ""
-#: templates/maposmatic/about.html:112
+#: templates/maposmatic/about.html:122
msgid ""
"For the city search engine, we use the wonderful <a\n"
"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. This\n"
@@ -238,11 +238,11 @@ msgid ""
"providing informations on the city location."
msgstr ""
-#: templates/maposmatic/about.html:118
+#: templates/maposmatic/about.html:130
msgid "Contributing"
msgstr "اÙÙ
ساÙÙ
Ø©"
-#: templates/maposmatic/about.html:120
+#: templates/maposmatic/about.html:133
msgid ""
"As stated above, both <i>OCitySMap</i> and\n"
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
@@ -250,14 +250,14 @@ msgid ""
"us:"
msgstr ""
-#: templates/maposmatic/about.html:127
+#: templates/maposmatic/about.html:140
msgid ""
"The <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project on\n"
" Savannah</a>;"
msgstr ""
-#: templates/maposmatic/about.html:131
+#: templates/maposmatic/about.html:143
msgid ""
"The <a\n"
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
@@ -265,41 +265,41 @@ msgid ""
" mailing-list</a>;"
msgstr ""
-#: templates/maposmatic/about.html:135
+#: templates/maposmatic/about.html:146
msgid ""
-"The IRC channel <code>#maposmatic</code> on\n"
+"The IRC channel <tt>#maposmatic</tt> on\n"
" Freenode;"
msgstr ""
-#: templates/maposmatic/about.html:138
+#: templates/maposmatic/about.html:148
msgid ""
"The <a\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>;"
+" Git repository</a>, which can be cloned using <tt>git clone\n"
+" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
msgstr ""
-#: templates/maposmatic/about.html:143
+#: templates/maposmatic/about.html:152
msgid ""
"The <a\n"
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
-" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
+" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
msgstr ""
-#: templates/maposmatic/about.html:148
+#: templates/maposmatic/about.html:156
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:163
msgid "Authors"
msgstr "اÙÙ
ؤÙÙÙÙÙ"
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:174
msgid "Contributors"
msgstr "اÙÙ
ساÙÙ
ÙÙ"
@@ -307,30 +307,30 @@ msgstr "اÙÙ
ساÙÙ
ÙÙ"
msgid "Job list"
msgstr "ÙائÙ
Ø© اÙÙ
ÙاÙ
"
-#: templates/maposmatic/all_jobs.html:42
+#: templates/maposmatic/all_jobs.html:41
msgid ""
"This page gives the status of all the rendering\n"
"requests received during the last 24 hours, starting from the most\n"
"recent one."
msgstr ""
-#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:57
+#: templates/maposmatic/all_jobs.html:54 templates/maposmatic/all_maps.html:57
msgid "Previous"
msgstr "اÙسابÙ"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "Page"
msgstr "اÙصÙØØ©"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "of"
msgstr "Ù
Ù"
-#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:65
+#: templates/maposmatic/all_jobs.html:56 templates/maposmatic/all_maps.html:65
msgid "Next"
msgstr "اÙتاÙÙ"
-#: templates/maposmatic/all_jobs.html:71
+#: templates/maposmatic/all_jobs.html:62
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -345,7 +345,7 @@ msgstr "ابØØ«"
msgid "Search coming soon!"
msgstr ""
-#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:65
msgid "Maps"
msgstr "اÙخرائط"
@@ -358,89 +358,82 @@ msgstr ""
msgid "No map starts with %(current_letter)s in our database!"
msgstr ""
-#: templates/maposmatic/base.html:49
+#: templates/maposmatic/base.html:53
msgid "Your free city maps!"
msgstr "خرائط Ù
دÙÙت٠اÙØرة!"
-#: templates/maposmatic/base.html:54
+#: templates/maposmatic/base.html:64
msgid "Jobs"
msgstr "اÙÙ
ÙاÙ
"
-#: templates/maposmatic/base.html:56
+#: templates/maposmatic/base.html:66
msgid "News"
msgstr "اÙأخبار"
-#: templates/maposmatic/base.html:69
-msgid "Random map"
-msgstr "خرÙطة عشÙائÙØ©"
-
-#: templates/maposmatic/base.html:79
-msgid "No random map found."
-msgstr "ÙÙ
ÙتÙ
اÙعثÙر عÙ٠أ٠خرÙطة عشÙائÙ."
-
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "آخر اÙأخبار"
-
-#: templates/maposmatic/base.html:89
-#, python-format
-msgid ""
-"\n"
-" published %(date)s ago\n"
-" "
-msgstr ""
-
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:77
msgid "Contact"
msgstr "اتصاÙ"
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:79
msgid "Mail:"
msgstr "اÙبرÙد:"
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:80
msgid "IRC:"
msgstr "أ٠أر سÙ:"
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:80
msgid "on"
msgstr "عÙÙ"
-#: templates/maposmatic/base.html:108
-msgid "Language:"
-msgstr "اÙÙغة:"
+#: templates/maposmatic/base.html:85
+msgid "Random map"
+msgstr "خرÙطة عشÙائÙØ©"
+
+#: templates/maposmatic/base.html:92
+msgid "No random map found."
+msgstr "ÙÙ
ÙتÙ
اÙعثÙر عÙ٠أ٠خرÙطة عشÙائÙ."
+
+#: templates/maposmatic/base.html:97
+msgid "Latest news"
+msgstr "آخر اÙأخبار"
+
+#: templates/maposmatic/base.html:102
+#, python-format
+msgid "published %(date)s ago"
+msgstr ""
-#: templates/maposmatic/index.html:227
+#: templates/maposmatic/index.html:225
msgid ""
"This place cannot be rendered by MapOSMatic, administrative boundary "
"missing. Please contribute !"
msgstr ""
-#: templates/maposmatic/index.html:240
+#: templates/maposmatic/index.html:238
msgid "No results found."
msgstr "ÙÙ
ÙتÙ
اÙعثÙر عÙÙ Ùتائج."
-#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:250 templates/maposmatic/index.html:323
msgid "Generate"
msgstr "تÙÙÙد"
-#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:256 templates/maposmatic/index.html:324
msgid "Please fill in the form before trying to proceed"
msgstr "Ùرج٠Ù
ÙØ¡ اÙÙÙ
Ùذج Ùب٠Ù
ØاÙÙØ© اÙتÙÙÙØ°"
-#: templates/maposmatic/index.html:274
+#: templates/maposmatic/index.html:267
msgid "Introduction"
msgstr "اÙÙ
ÙدÙ
Ø©"
-#: templates/maposmatic/index.html:284
+#: templates/maposmatic/index.html:277
msgid "City Map"
msgstr "خرÙطة اÙÙ
دÙÙØ©"
-#: templates/maposmatic/index.html:290
+#: templates/maposmatic/index.html:281
msgid "Streets index"
msgstr "ÙÙرس اÙØ´Ùارع"
-#: templates/maposmatic/index.html:299
+#: templates/maposmatic/index.html:289
msgid ""
"MapOSMatic is a free software web service that\n"
"allows you to generate maps of cities using\n"
@@ -451,22 +444,22 @@ msgstr ""
"<a href=\"http://www.openstreetmap.org\";>خرÙطة اÙشارع اÙÙ
ÙتÙØØ©</a>. خرÙطة "
"اÙÙ
دÙÙØ© تتÙÙÙ Ù
٠صÙØتÙÙ:"
-#: templates/maposmatic/index.html:305
+#: templates/maposmatic/index.html:296
msgid ""
"The map itself, splitted in squares allowing to easily look for streets;"
msgstr "اÙخرÙطة ÙÙسÙا Ù
ÙسÙ
Ø© Ø¥ÙÙ Ù
ربعات تسÙ
Ø ÙÙ
اÙبØØ« بسÙÙÙØ© ع٠اÙØ´ÙارعØ"
-#: templates/maposmatic/index.html:306
+#: templates/maposmatic/index.html:297
msgid "An index of the streets with references to the squares on the map."
msgstr "ÙÙرس اÙØ´Ùارع Ù
ع اÙإشارة Ø¥Ù٠اÙÙ
ربعات
عÙ٠اÙخرÙطة."
-#: templates/maposmatic/index.html:309
+#: templates/maposmatic/index.html:301
msgid ""
"The generated maps are available in PNG, PDF and\n"
"SVG formats and are ready to be printed."
msgstr "اÙخرائط اÙÙ
ÙÙÙدة Ù
تاØØ© باÙصÙغ PNGØ PDF Ù
SVG ÙÙ٠جاÙزة ÙÙطباعة."
-#: templates/maposmatic/index.html:312
+#: templates/maposmatic/index.html:306
msgid ""
"As the data used to generate maps is coming from\n"
"OpenStreetMap, you can freely (under the <a\n"
@@ -479,39 +472,39 @@ msgstr ""
"href=\"http://wiki.openstreetmap.org/wiki/License\";>شرÙØ· رخصة
خرÙطة اÙشارع "
"اÙÙ
ÙتÙØØ©</a>) إعادة استخداÙ
أ٠بÙع أ٠تعدÙÙ
Ø£Ù... اÙخرائط اÙÙ
ÙÙÙدة."
-#: templates/maposmatic/index.html:318
+#: templates/maposmatic/index.html:313
msgid "More details"
msgstr "اÙÙ
زÙد Ù
٠اÙتÙاصÙÙ"
-#: templates/maposmatic/index.html:320
+#: templates/maposmatic/index.html:316
msgid "Generate your own map"
msgstr "ÙÙÙد خرÙطتÙ"
-#: templates/maposmatic/index.html:327
+#: templates/maposmatic/index.html:320
msgid "Area selection mode:"
msgstr "ÙÙ
Ø· اختÙار اÙÙ
ÙØ·ÙØ©:"
-#: templates/maposmatic/index.html:339
+#: templates/maposmatic/index.html:334
msgid "City name:"
msgstr "اسÙ
اÙÙ
دÙÙØ©:"
-#: templates/maposmatic/index.html:342
+#: templates/maposmatic/index.html:338
msgid "search"
msgstr "ابØØ«"
-#: templates/maposmatic/index.html:348
+#: templates/maposmatic/index.html:344
msgid "Title of the map:"
msgstr "عÙÙا٠اÙخرÙطة:"
-#: templates/maposmatic/index.html:354
+#: templates/maposmatic/index.html:350
msgid "Bounding box:"
msgstr "Ù
ربع اÙØ¥Øاطة:"
-#: templates/maposmatic/index.html:366
+#: templates/maposmatic/index.html:361
msgid "Map Index Language:"
msgstr "Ùغة ÙÙرس اÙخرÙطة:"
-#: templates/maposmatic/index.html:376
+#: templates/maposmatic/index.html:372
msgid ""
"<em>MapOSMatic</em> covers the whole world but we need\n"
"contributors to translate and adapt the few parts of <em>MapOSMatic</em>\n"
@@ -520,13 +513,13 @@ msgstr ""
"<em>MapOSMatic</em> Ùغط٠اÙعاÙÙ
ÙÙÙ ÙÙÙÙÙا بØاجة
Ø¥ÙÙ Ù
ساÙÙ
ÙÙ ÙترجÙ
Ø© ÙتطÙÙع "
"بعض Ù
٠أÙساÙ
<em>MapOSMatic</em> اÙت٠تخص اÙبÙداÙ."
-#: templates/maposmatic/index.html:380
+#: templates/maposmatic/index.html:378
msgid ""
"To select the city to be rendered, two modes are\n"
"available:"
msgstr "ÙÙجد ÙضعÙÙ ÙاختÙار اÙÙ
دÙÙØ© اÙت٠ستعرض:"
-#: templates/maposmatic/index.html:385
+#: templates/maposmatic/index.html:383
msgid ""
"<em>Using an administrative boundary</em>. It allows\n"
" to get a map with precise boundaries of the city when such limits are\n"
@@ -537,13 +530,12 @@ msgstr ""
"ÙÙÙ
دÙÙØ© عÙدÙ
ا تÙÙÙ Ùذ٠اÙØدÙد Ù
تاØØ© ÙÙ
Ùاعدة اÙبÙاÙات. غÙر Ø°ÙÙØ Ø£Ùت بØاجة "
"Ø¥Ù٠استخداÙ
Ù
ربع اÙØ¥Øاطة."
-#: templates/maposmatic/index.html:390
-msgid ""
-"<em>Using a traditional bounding\n"
-" box</em>."
+#: templates/maposmatic/index.html:387
+#, fuzzy
+msgid "<em>Using a traditional bounding box</em>."
msgstr "<em>باستخداÙ
Ù
ربع اÙØ¥Øاطة اÙتÙÙÙدÙ</em>."
-#: templates/maposmatic/index.html:395
+#: templates/maposmatic/index.html:391
msgid ""
"Once the rendering is submitted, you will be brought\n"
"to a page giving the status of your rendering request. As soon as the\n"
@@ -630,6 +622,9 @@ msgstr "اÙÙ
ÙÙات اÙت٠تÙ
Ø¥ÙشاؤÙا ÙÙ
تعد Ù
تÙÙرة"
msgid "Rendering completed on"
msgstr "بدأ اÙعرض ÙÙ"
+#~ msgid "Language:"
+#~ msgstr "اÙÙغة:"
+
#~ msgid "Title"
#~ msgstr "اÙعÙÙاÙ"
diff --git a/www/locale/ca/LC_MESSAGES/django.po
b/www/locale/ca/LC_MESSAGES/django.po
index 599b193..2b42ead 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-07 13:05+0100\n"
+"POT-Creation-Date: 2010-01-08 16:33+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:147
+#: settings.py:152
msgid "No localization"
msgstr "Sense localització"
@@ -95,7 +95,7 @@ msgstr ""
"La renderització ha fallat, contacteu amb <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:63
msgid "Home"
msgstr "Inici"
@@ -131,11 +131,11 @@ 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:67
msgid "About"
msgstr "Quant a"
-#: templates/maposmatic/about.html:37
+#: templates/maposmatic/about.html:36
msgid "History"
msgstr "Història"
@@ -163,21 +163,22 @@ msgstr ""
"<strong>MapOSMatic</strong>. El grup d'esbojarrats hackers volen agrair a en "
"Gilles per compartir la seva brillant idea"
-#: templates/maposmatic/about.html:51
+#: templates/maposmatic/about.html:53
+#, fuzzy
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\n"
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
msgstr ""
"Ãbviament, el MapOSMatic és programari lliure, publicat sota els termes de "
"la llicència <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html";
"\">AGPLv3</a>."
-#: templates/maposmatic/about.html:54
+#: templates/maposmatic/about.html:60
msgid "How does it work?"
msgstr "Com funciona?"
-#: templates/maposmatic/about.html:56
+#: templates/maposmatic/about.html:63
msgid ""
"On our server, we run a <a\n"
"href=\"http://www.postgresql.org\";>PostgreSQL</a> server, with the <a\n"
@@ -203,7 +204,7 @@ msgstr ""
"la base de dades, que permet tenir actualitzades les dades amb les noves "
"contribucions dels usuaris de l'OpenStreetMap."
-#: templates/maposmatic/about.html:68
+#: 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"
@@ -221,7 +222,7 @@ msgstr ""
"i <a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, hem construït "
"l'<i>OCitySMap</i>, un mòdul de Python que:"
-#: templates/maposmatic/about.html:78
+#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
@@ -229,7 +230,7 @@ msgstr ""
"Renderitza els maps fent servir dades de l'OpenStreetmap i el full d'estil "
"del Mapnik;"
-#: templates/maposmatic/about.html:81
+#: templates/maposmatic/about.html:89
msgid ""
"Renders on top of the map, using Mapnik, the grid\n"
" of 500 meters squares, the labels of the squares, and a few other\n"
@@ -240,7 +241,7 @@ msgstr ""
"500 m , les etiquetes de la graella, i unes poques informacions al mapa "
"(copyright, escala, etc.)"
-#: templates/maposmatic/about.html:86
+#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
@@ -248,7 +249,7 @@ msgstr ""
"Posa en gris tota l'Ã rea fora de la ciutat, si trobem els lÃmits "
"administratius;"
-#: templates/maposmatic/about.html:89
+#: 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"
@@ -257,7 +258,7 @@ msgstr ""
"Renderitza un Ãndex dels carrers, basat en les dades de l'OpenStreetMap i "
"amb la intersecció dels carrers amb les caselles del mapa."
-#: templates/maposmatic/about.html:95
+#: templates/maposmatic/about.html:101
msgid ""
"This Python module can be used through a command-line\n"
"tool provided with OCitySMap, so everyone can run its own city-map\n"
@@ -273,7 +274,7 @@ msgstr ""
"sobre de tot, aixà els usuaris finals poden generar i usar, fà cilment, els "
"mapes de ciutat OpenStreetMap."
-#: templates/maposmatic/about.html:102
+#: templates/maposmatic/about.html:110
msgid ""
"This web service has been called <i>MapOSMatic</i>,\n"
"like <i>map-o-matic</i> but with a reference to OpenStreetMap (OSM). The\n"
@@ -294,7 +295,7 @@ msgstr ""
"fa una renderització a la vegada, cosa que és molt important degut a l´us "
"intensiu de la CPU i E/S que fa el procès de renderització."
-#: templates/maposmatic/about.html:112
+#: templates/maposmatic/about.html:122
msgid ""
"For the city search engine, we use the wonderful <a\n"
"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. This\n"
@@ -308,11 +309,11 @@ msgstr ""
"entre múltiples ciutats amb el mateix nom, proporcionant informació de la "
"ubicació de la ciutat."
-#: templates/maposmatic/about.html:118
+#: templates/maposmatic/about.html:130
msgid "Contributing"
msgstr "Contribuir-hi"
-#: templates/maposmatic/about.html:120
+#: templates/maposmatic/about.html:133
msgid ""
"As stated above, both <i>OCitySMap</i> and\n"
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
@@ -324,7 +325,7 @@ msgstr ""
"contribute. Here are the few starting points to help\n"
"us:"
-#: templates/maposmatic/about.html:127
+#: templates/maposmatic/about.html:140
msgid ""
"The <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project on\n"
@@ -333,7 +334,7 @@ msgstr ""
"El <a href=\"https://savannah.nongnu.org/projects/maposmatic/\";>projecte a "
"Savannah</a>;"
-#: templates/maposmatic/about.html:131
+#: templates/maposmatic/about.html:143
msgid ""
"The <a\n"
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
@@ -343,38 +344,41 @@ msgstr ""
"La <a href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
"\">llista de distribució de desenvolupament</a>;"
-#: templates/maposmatic/about.html:135
+#: templates/maposmatic/about.html:146
+#, fuzzy
msgid ""
-"The IRC channel <code>#maposmatic</code> on\n"
+"The IRC channel <tt>#maposmatic</tt> on\n"
" Freenode;"
msgstr ""
"El canal IRC <code>#maposmatic</code> a\n"
" Freenode;"
-#: templates/maposmatic/about.html:138
+#: templates/maposmatic/about.html:148
+#, fuzzy
msgid ""
"The <a\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>;"
+" Git repository</a>, which can be cloned using <tt>git clone\n"
+" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
msgstr ""
"El <a href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git";
"\">repositori Git de l'OCitySMap</a>, que podeu clonar amb l'ordre <code>git "
"clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
-#: templates/maposmatic/about.html:143
+#: templates/maposmatic/about.html:152
+#, fuzzy
msgid ""
"The <a\n"
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
-" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
+" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
msgstr ""
"El <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>repositori "
"Git del MapOSMatic</a>, que podeu clonar amb la comanda <code>git clone "
"git://git.sv.gnu.org/maposmatic.git</code>;"
-#: templates/maposmatic/about.html:148
+#: templates/maposmatic/about.html:156
msgid ""
"<a\n"
" href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
@@ -383,11 +387,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:163
msgid "Authors"
msgstr "Autors"
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:174
msgid "Contributors"
msgstr "Col·laboradors"
@@ -395,7 +399,7 @@ msgstr "Col·laboradors"
msgid "Job list"
msgstr "Llistat de tasques"
-#: templates/maposmatic/all_jobs.html:42
+#: templates/maposmatic/all_jobs.html:41
msgid ""
"This page gives the status of all the rendering\n"
"requests received during the last 24 hours, starting from the most\n"
@@ -404,23 +408,23 @@ msgstr ""
"Aquesta pà gina us proporciona l'estat de totes les peticions de "
"renderització rebudes les darreres 24 hores, començant des de la mes
recent."
-#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:57
+#: templates/maposmatic/all_jobs.html:54 templates/maposmatic/all_maps.html:57
msgid "Previous"
msgstr "Enrere"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "Page"
msgstr "PÃ gina"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "of"
msgstr "de"
-#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:65
+#: templates/maposmatic/all_jobs.html:56 templates/maposmatic/all_maps.html:65
msgid "Next"
msgstr "Següent"
-#: templates/maposmatic/all_jobs.html:71
+#: templates/maposmatic/all_jobs.html:62
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -435,7 +439,7 @@ msgstr "cerca"
msgid "Search coming soon!"
msgstr ""
-#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:65
msgid "Maps"
msgstr "Mapes"
@@ -448,62 +452,55 @@ msgstr ""
msgid "No map starts with %(current_letter)s in our database!"
msgstr ""
-#: templates/maposmatic/base.html:49
+#: templates/maposmatic/base.html:53
msgid "Your free city maps!"
msgstr "Els vostres mapes de ciutat lliures, i gratuits!"
-#: templates/maposmatic/base.html:54
+#: templates/maposmatic/base.html:64
msgid "Jobs"
msgstr "Tasques"
-#: templates/maposmatic/base.html:56
+#: templates/maposmatic/base.html:66
msgid "News"
msgstr "NotÃcies"
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:77
+msgid "Contact"
+msgstr "Contacte"
+
+#: templates/maposmatic/base.html:79
+msgid "Mail:"
+msgstr "Correu:"
+
+#: templates/maposmatic/base.html:80
+msgid "IRC:"
+msgstr "IRC:"
+
+#: templates/maposmatic/base.html:80
+msgid "on"
+msgstr "a"
+
+#: templates/maposmatic/base.html:85
msgid "Random map"
msgstr "Mapa aleatori"
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:92
msgid "No random map found."
msgstr "No s'ha trobat cap mapa aleatori."
-#: templates/maposmatic/base.html:84
+#: templates/maposmatic/base.html:97
msgid "Latest news"
msgstr "Ãltimes notÃcies"
-#: templates/maposmatic/base.html:89
-#, python-format
-msgid ""
-"\n"
-" published %(date)s ago\n"
-" "
+#: templates/maposmatic/base.html:102
+#, fuzzy, python-format
+msgid "published %(date)s ago"
msgstr ""
"\n"
" publicat fa %(date)s\n"
" "
-#: templates/maposmatic/base.html:99
-msgid "Contact"
-msgstr "Contacte"
-
-#: templates/maposmatic/base.html:101
-msgid "Mail:"
-msgstr "Correu:"
-
-#: templates/maposmatic/base.html:102
-msgid "IRC:"
-msgstr "IRC:"
-
-#: templates/maposmatic/base.html:102
-msgid "on"
-msgstr "a"
-
-#: templates/maposmatic/base.html:108
-msgid "Language:"
-msgstr "Llengua:"
-
-#: templates/maposmatic/index.html:227
+#: templates/maposmatic/index.html:225
msgid ""
"This place cannot be rendered by MapOSMatic, administrative boundary "
"missing. Please contribute !"
@@ -511,31 +508,31 @@ msgstr ""
"Aquest lloc no és pot renderitzar amb el MapOSMatic, no hi ha cap lÃmit "
"administratiu. Col·laboreu-hi!"
-#: templates/maposmatic/index.html:240
+#: templates/maposmatic/index.html:238
msgid "No results found."
msgstr "No s'ha trobat cap resultat."
-#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:250 templates/maposmatic/index.html:323
msgid "Generate"
msgstr "Genera"
-#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:256 templates/maposmatic/index.html:324
msgid "Please fill in the form before trying to proceed"
msgstr "Empleneu el formulari abans d'intentar continuar"
-#: templates/maposmatic/index.html:274
+#: templates/maposmatic/index.html:267
msgid "Introduction"
msgstr "Introducció"
-#: templates/maposmatic/index.html:284
+#: templates/maposmatic/index.html:277
msgid "City Map"
msgstr "Mapa de la ciutat"
-#: templates/maposmatic/index.html:290
+#: templates/maposmatic/index.html:281
msgid "Streets index"
msgstr "Ãndex de carrers"
-#: templates/maposmatic/index.html:299
+#: templates/maposmatic/index.html:289
msgid ""
"MapOSMatic is a free software web service that\n"
"allows you to generate maps of cities using\n"
@@ -548,18 +545,18 @@ msgstr ""
"l'<a href=\"http://www.openstreetmap.org\";>OpenStreetMap</a>. Cada mapa "
"generat consta de dues pà gines:"
-#: templates/maposmatic/index.html:305
+#: templates/maposmatic/index.html:296
msgid ""
"The map itself, splitted in squares allowing to easily look for streets;"
msgstr ""
"El mapa pròpiament dit, amb una graella de quadres que permet trobar els "
"carrers rà pidament;"
-#: templates/maposmatic/index.html:306
+#: templates/maposmatic/index.html:297
msgid "An index of the streets with references to the squares on the map."
msgstr "Un Ãndex de carrers amb referències a la graella del mapa."
-#: templates/maposmatic/index.html:309
+#: templates/maposmatic/index.html:301
msgid ""
"The generated maps are available in PNG, PDF and\n"
"SVG formats and are ready to be printed."
@@ -567,7 +564,7 @@ msgstr ""
"Els mapes generats estan disponibles en els formats PNG, PDF i SVG, "
"preparats per imprimir."
-#: templates/maposmatic/index.html:312
+#: templates/maposmatic/index.html:306
msgid ""
"As the data used to generate maps is coming from\n"
"OpenStreetMap, you can freely (under the <a\n"
@@ -580,39 +577,39 @@ msgstr ""
"\">termes de la llicència de l'OpenStreetMap</a>) reutilitzar, vendre, "
"modificar,... els mapes generats."
-#: templates/maposmatic/index.html:318
+#: templates/maposmatic/index.html:313
msgid "More details"
msgstr "Més detalls"
-#: templates/maposmatic/index.html:320
+#: templates/maposmatic/index.html:316
msgid "Generate your own map"
msgstr "Genereu el vostre mapa"
-#: templates/maposmatic/index.html:327
+#: templates/maposmatic/index.html:320
msgid "Area selection mode:"
msgstr "Mètode de selecció geogrà fica:"
-#: templates/maposmatic/index.html:339
+#: templates/maposmatic/index.html:334
msgid "City name:"
msgstr "Nom de la ciutat:"
-#: templates/maposmatic/index.html:342
+#: templates/maposmatic/index.html:338
msgid "search"
msgstr "cerca"
-#: templates/maposmatic/index.html:348
+#: templates/maposmatic/index.html:344
msgid "Title of the map:"
msgstr "TÃtol del mapa :"
-#: templates/maposmatic/index.html:354
+#: templates/maposmatic/index.html:350
msgid "Bounding box:"
msgstr "Ãrea geogrà fica:"
-#: templates/maposmatic/index.html:366
+#: templates/maposmatic/index.html:361
msgid "Map Index Language:"
msgstr "Llengua de l'Ãndex del mapa:"
-#: templates/maposmatic/index.html:376
+#: templates/maposmatic/index.html:372
msgid ""
"<em>MapOSMatic</em> covers the whole world but we need\n"
"contributors to translate and adapt the few parts of <em>MapOSMatic</em>\n"
@@ -622,14 +619,14 @@ msgstr ""
"traduir i adaptar les parts del <em>MapOSMatic</em> que són especÃfiques de
"
"llengua o situació geogrà fica."
-#: templates/maposmatic/index.html:380
+#: templates/maposmatic/index.html:378
msgid ""
"To select the city to be rendered, two modes are\n"
"available:"
msgstr ""
"Podeu seleccionar la ciutat que voleu renderitzar de dos modes diferents:"
-#: templates/maposmatic/index.html:385
+#: templates/maposmatic/index.html:383
msgid ""
"<em>Using an administrative boundary</em>. It allows\n"
" to get a map with precise boundaries of the city when such limits are\n"
@@ -641,13 +638,12 @@ msgstr ""
"troben disponibles a la base de dades. Altrament, heu d'indicar una à rea "
"geogrà fica."
-#: templates/maposmatic/index.html:390
-msgid ""
-"<em>Using a traditional bounding\n"
-" box</em>."
+#: templates/maposmatic/index.html:387
+#, fuzzy
+msgid "<em>Using a traditional bounding box</em>."
msgstr "<em>Indicació d'una à rea geogrà fica</em>."
-#: templates/maposmatic/index.html:395
+#: templates/maposmatic/index.html:391
msgid ""
"Once the rendering is submitted, you will be brought\n"
"to a page giving the status of your rendering request. As soon as the\n"
@@ -736,6 +732,9 @@ msgstr "Els fitxer generats ja no són disponibles"
msgid "Rendering completed on"
msgstr "Inici de la renderització"
+#~ msgid "Language:"
+#~ msgstr "Llengua:"
+
#~ msgid "Title"
#~ msgstr "TÃtol"
diff --git a/www/locale/de/LC_MESSAGES/django.po
b/www/locale/de/LC_MESSAGES/django.po
index 7545358..470067f 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: 2010-01-07 13:05+0100\n"
+"POT-Creation-Date: 2010-01-08 16:33+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:147
+#: settings.py:152
msgid "No localization"
msgstr "Keine Ãbersetzung"
@@ -96,7 +96,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:63
msgid "Home"
msgstr "Start"
@@ -132,11 +132,11 @@ 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:67
msgid "About"
msgstr "Ãber"
-#: templates/maposmatic/about.html:37
+#: templates/maposmatic/about.html:36
msgid "History"
msgstr "Chronik"
@@ -168,21 +168,22 @@ msgstr ""
" Die Gruppe der <em>Hacker</em> möchte Gilles dafür danken, dass er seine "
"geniale Idee teilte."
-#: templates/maposmatic/about.html:51
+#: templates/maposmatic/about.html:53
+#, fuzzy
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\n"
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
msgstr ""
"Natürlich ist MapOSMatic Freie Software,\n"
" lizenziert unter den Bedingungen der\n"
" <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>."
-#: templates/maposmatic/about.html:54
+#: templates/maposmatic/about.html:60
msgid "How does it work?"
msgstr "Wie funktioniert das?"
-#: templates/maposmatic/about.html:56
+#: templates/maposmatic/about.html:63
msgid ""
"On our server, we run a <a\n"
"href=\"http://www.postgresql.org\";>PostgreSQL</a> server, with the <a\n"
@@ -210,7 +211,7 @@ msgstr ""
" der OSM-Datenbank eingepflegt. So ist es MapOSMatic möglich, \n"
" Stadtpläne mit den neuesten Beiträgen der OpenStreetMap-User zu erzeugen."
-#: templates/maposmatic/about.html:68
+#: 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"
@@ -229,7 +230,7 @@ msgstr ""
" 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
+#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
@@ -237,7 +238,7 @@ msgstr ""
"die StraÃen anhand der OpenStreetMap-Daten und des OpenStreetMap Mapnik-"
"Stylesheets rendert;"
-#: templates/maposmatic/about.html:81
+#: templates/maposmatic/about.html:89
msgid ""
"Renders on top of the map, using Mapnik, the grid\n"
" of 500 meters squares, the labels of the squares, and a few other\n"
@@ -248,7 +249,7 @@ msgstr ""
" 500 Metern im Quadrat rendert, dazu die entsprechenden Bezeichnungen\n"
" und einige andere Informationen auf dem Plan (Copyright, MaÃstab usw.);"
-#: templates/maposmatic/about.html:86
+#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
@@ -256,7 +257,7 @@ msgstr ""
"Gebiete auÃerhalb der Stadt ausgraut, sofern wir deren administrative Grenze
"
"finden;"
-#: templates/maposmatic/about.html:89
+#: 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"
@@ -265,7 +266,7 @@ msgstr ""
"ein StraÃenverzeichnis anhand der OpenStreetMap-Daten und der\n"
" Kreuzungspunkte der StraÃen mit den Planquadraten erstellt."
-#: templates/maposmatic/about.html:95
+#: templates/maposmatic/about.html:101
msgid ""
"This Python module can be used through a command-line\n"
"tool provided with OCitySMap, so everyone can run its own city-map\n"
@@ -282,7 +283,7 @@ msgstr ""
" so dass Endnutzer OpenStreetMap-Stadtpläne einfach erstellen und benutzen "
"können."
-#: templates/maposmatic/about.html:102
+#: templates/maposmatic/about.html:110
msgid ""
"This web service has been called <i>MapOSMatic</i>,\n"
"like <i>map-o-matic</i> but with a reference to OpenStreetMap (OSM). The\n"
@@ -304,7 +305,7 @@ msgstr ""
"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
+#: templates/maposmatic/about.html:122
msgid ""
"For the city search engine, we use the wonderful <a\n"
"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. This\n"
@@ -318,11 +319,11 @@ msgstr ""
" bei der man zwischen Städten gleichen Namens unterscheiden kann,\n"
" da Informationenen zur Lage der Stadt anzeigt werden."
-#: templates/maposmatic/about.html:118
+#: templates/maposmatic/about.html:130
msgid "Contributing"
msgstr "Mitmachen"
-#: templates/maposmatic/about.html:120
+#: templates/maposmatic/about.html:133
msgid ""
"As stated above, both <i>OCitySMap</i> and\n"
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
@@ -334,7 +335,7 @@ msgstr ""
" Sie sind eingeladen, sich daran zu beteiligen. Hier ein paar Ansatzpunkte, "
"wie Sie uns helfen können:"
-#: templates/maposmatic/about.html:127
+#: templates/maposmatic/about.html:140
msgid ""
"The <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project on\n"
@@ -343,7 +344,7 @@ msgstr ""
"Dieses Projekt wird bei Savannah <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>gehostet</a>.;"
-#: templates/maposmatic/about.html:131
+#: templates/maposmatic/about.html:143
msgid ""
"The <a\n"
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
@@ -354,19 +355,21 @@ msgstr ""
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
"\">Entwickler-Mailingliste (in Englisch)</a> ;"
-#: templates/maposmatic/about.html:135
+#: templates/maposmatic/about.html:146
+#, fuzzy
msgid ""
-"The IRC channel <code>#maposmatic</code> on\n"
+"The IRC channel <tt>#maposmatic</tt> on\n"
" Freenode;"
msgstr "Der IRC-Channel <code>#maposmatic</code> auf Freenode;"
-#: templates/maposmatic/about.html:138
+#: templates/maposmatic/about.html:148
+#, fuzzy
msgid ""
"The <a\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>;"
+" 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";
@@ -374,19 +377,20 @@ msgstr ""
" das mit folgender Befehlszeile heruntergeladen werden kann:\n"
" « <code>git clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</code> »;"
-#: templates/maposmatic/about.html:143
+#: templates/maposmatic/about.html:152
+#, fuzzy
msgid ""
"The <a\n"
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
-" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
+" <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 mit folgender Befehlszeile heruntergeladen werden kann:\n"
" « <code>git clone git://git.sv.gnu.org/maposmatic.git</code> »;"
-#: templates/maposmatic/about.html:148
+#: templates/maposmatic/about.html:156
msgid ""
"<a\n"
" href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
@@ -396,11 +400,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:163
msgid "Authors"
msgstr "Autoren"
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:174
msgid "Contributors"
msgstr "Mitwirkende"
@@ -408,7 +412,7 @@ msgstr "Mitwirkende"
msgid "Job list"
msgstr "Liste der Rendervorgänge"
-#: templates/maposmatic/all_jobs.html:42
+#: templates/maposmatic/all_jobs.html:41
msgid ""
"This page gives the status of all the rendering\n"
"requests received during the last 24 hours, starting from the most\n"
@@ -417,23 +421,23 @@ msgstr ""
"Diese Seite zeigt den Status aller innerhalb der letzten 24 Stunden\n"
" eingegangenen Renderanfragen, beginnend mit der neuesten."
-#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:57
+#: templates/maposmatic/all_jobs.html:54 templates/maposmatic/all_maps.html:57
msgid "Previous"
msgstr "Vorherige"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "Page"
msgstr "Seite"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "of"
msgstr "von"
-#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:65
+#: templates/maposmatic/all_jobs.html:56 templates/maposmatic/all_maps.html:65
msgid "Next"
msgstr "Nächste"
-#: templates/maposmatic/all_jobs.html:71
+#: templates/maposmatic/all_jobs.html:62
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -448,7 +452,7 @@ msgstr "Suche"
msgid "Search coming soon!"
msgstr ""
-#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:65
msgid "Maps"
msgstr "Pläne"
@@ -461,61 +465,54 @@ msgstr ""
msgid "No map starts with %(current_letter)s in our database!"
msgstr ""
-#: templates/maposmatic/base.html:49
+#: templates/maposmatic/base.html:53
msgid "Your free city maps!"
msgstr "Ihre freien Stadtpläne!"
-#: templates/maposmatic/base.html:54
+#: templates/maposmatic/base.html:64
msgid "Jobs"
msgstr "Rendervorgänge"
-#: templates/maposmatic/base.html:56
+#: templates/maposmatic/base.html:66
msgid "News"
msgstr "Aktuelles"
-#: templates/maposmatic/base.html:69
-msgid "Random map"
-msgstr "Zufälliger Plan"
-
-#: templates/maposmatic/base.html:79
-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:89
-#, python-format
-msgid ""
-"\n"
-" published %(date)s ago\n"
-" "
-msgstr ""
-"\n"
-" vor %(date)s veröffentlicht"
-
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:77
msgid "Contact"
msgstr "Kontakt"
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:79
msgid "Mail:"
msgstr "E-Mail:"
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:80
msgid "IRC:"
msgstr "IRC:"
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:80
msgid "on"
msgstr "auf"
-#: templates/maposmatic/base.html:108
-msgid "Language:"
-msgstr "Sprache:"
+#: templates/maposmatic/base.html:85
+msgid "Random map"
+msgstr "Zufälliger Plan"
+
+#: templates/maposmatic/base.html:92
+msgid "No random map found."
+msgstr "Keinen zufälligen Plan gefunden."
+
+#: templates/maposmatic/base.html:97
+msgid "Latest news"
+msgstr "Aktuelles"
+
+#: templates/maposmatic/base.html:102
+#, fuzzy, python-format
+msgid "published %(date)s ago"
+msgstr ""
+"\n"
+" vor %(date)s veröffentlicht"
-#: templates/maposmatic/index.html:227
+#: templates/maposmatic/index.html:225
msgid ""
"This place cannot be rendered by MapOSMatic, administrative boundary "
"missing. Please contribute !"
@@ -523,31 +520,31 @@ msgstr ""
"Ein Plan dieses Ortes kann von MapOSMatic nicht erzeugt werden, da die "
"Verwaltungsgrenzen fehlen. Bitte helfen Sie mit!"
-#: templates/maposmatic/index.html:240
+#: templates/maposmatic/index.html:238
msgid "No results found."
msgstr "Kein Ort gefunden."
-#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:250 templates/maposmatic/index.html:323
msgid "Generate"
msgstr "Erzeugen"
-#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:256 templates/maposmatic/index.html:324
msgid "Please fill in the form before trying to proceed"
msgstr "Bitte füllen Sie das Formular aus, bevor Sie versuchen fortzufahren."
-#: templates/maposmatic/index.html:274
+#: templates/maposmatic/index.html:267
msgid "Introduction"
msgstr "Einleitung"
-#: templates/maposmatic/index.html:284
+#: templates/maposmatic/index.html:277
msgid "City Map"
msgstr "Stadtplan"
-#: templates/maposmatic/index.html:290
+#: templates/maposmatic/index.html:281
msgid "Streets index"
msgstr "StraÃenverzeichnis"
-#: templates/maposmatic/index.html:299
+#: templates/maposmatic/index.html:289
msgid ""
"MapOSMatic is a free software web service that\n"
"allows you to generate maps of cities using\n"
@@ -560,25 +557,25 @@ msgstr ""
"erzeugen.\n"
" Ein Stadtplan besteht aus zwei Seiten:"
-#: templates/maposmatic/index.html:305
+#: templates/maposmatic/index.html:296
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
+#: templates/maposmatic/index.html:297
msgid "An index of the streets with references to the squares on the map."
msgstr "Dem StraÃenverzeichnis, das sich auf die Planquadrate bezieht."
-#: templates/maposmatic/index.html:309
+#: templates/maposmatic/index.html:301
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."
-#: templates/maposmatic/index.html:312
+#: templates/maposmatic/index.html:306
msgid ""
"As the data used to generate maps is coming from\n"
"OpenStreetMap, you can freely (under the <a\n"
@@ -592,39 +589,39 @@ msgstr ""
"Lizenz</a>\n"
" benutzen, verkaufen, verändern..."
-#: templates/maposmatic/index.html:318
+#: templates/maposmatic/index.html:313
msgid "More details"
msgstr "Mehr Informationen"
-#: templates/maposmatic/index.html:320
+#: templates/maposmatic/index.html:316
msgid "Generate your own map"
msgstr "Erzeugen Sie Ihren eigenen Plan"
-#: templates/maposmatic/index.html:327
+#: templates/maposmatic/index.html:320
msgid "Area selection mode:"
msgstr "Auswahlmodus"
-#: templates/maposmatic/index.html:339
+#: templates/maposmatic/index.html:334
msgid "City name:"
msgstr "Name des Ortes:"
-#: templates/maposmatic/index.html:342
+#: templates/maposmatic/index.html:338
msgid "search"
msgstr "Suche"
-#: templates/maposmatic/index.html:348
+#: templates/maposmatic/index.html:344
msgid "Title of the map:"
msgstr "Name des Stadtplans:"
-#: templates/maposmatic/index.html:354
+#: templates/maposmatic/index.html:350
msgid "Bounding box:"
msgstr "Begrenzungsrahmen:"
-#: templates/maposmatic/index.html:366
+#: templates/maposmatic/index.html:361
msgid "Map Index Language:"
msgstr "Sprache des Stadtplanindex:"
-#: templates/maposmatic/index.html:376
+#: templates/maposmatic/index.html:372
msgid ""
"<em>MapOSMatic</em> covers the whole world but we need\n"
"contributors to translate and adapt the few parts of <em>MapOSMatic</em>\n"
@@ -634,13 +631,13 @@ msgstr ""
" aber wir brauchen Helfer, die die wenigen länderspezifischen\n"
" Teile von <em>MapOSMatic</em> übersetzen und anpassen."
-#: templates/maposmatic/index.html:380
+#: templates/maposmatic/index.html:378
msgid ""
"To select the city to be rendered, two modes are\n"
"available:"
msgstr "Es gibt zwei Arten, die zu rendernde Stadt auszuwählen:"
-#: templates/maposmatic/index.html:385
+#: templates/maposmatic/index.html:383
msgid ""
"<em>Using an administrative boundary</em>. It allows\n"
" to get a map with precise boundaries of the city when such limits are\n"
@@ -651,13 +648,12 @@ msgstr ""
" einen Plan mit präzisen Stadtgrenzen, sofern diese vorhanden sind.\n"
" Anderenfalls müssen Sie einen Begrenzungsrahmen verwenden."
-#: templates/maposmatic/index.html:390
-msgid ""
-"<em>Using a traditional bounding\n"
-" box</em>."
+#: templates/maposmatic/index.html:387
+#, fuzzy
+msgid "<em>Using a traditional bounding box</em>."
msgstr "<em>Unter Verwendung eines rechteckigen Begrenzungsrahmens</em>."
-#: templates/maposmatic/index.html:395
+#: templates/maposmatic/index.html:391
msgid ""
"Once the rendering is submitted, you will be brought\n"
"to a page giving the status of your rendering request. As soon as the\n"
@@ -750,6 +746,9 @@ msgstr "Die erzeugten Dateien sind nicht mehr verfügbar"
msgid "Rendering completed on"
msgstr "Rendervorgang gestartet am"
+#~ msgid "Language:"
+#~ msgstr "Sprache:"
+
#~ msgid "Title"
#~ msgstr "Name"
diff --git a/www/locale/fr/LC_MESSAGES/django.po
b/www/locale/fr/LC_MESSAGES/django.po
index de755ef..854e2b3 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-07 13:05+0100\n"
+"POT-Creation-Date: 2010-01-08 16:33+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:147
+#: settings.py:152
msgid "No localization"
msgstr "Pas de traduction"
@@ -91,7 +91,7 @@ msgstr "Rendu terminé avec succès"
msgid "Rendering failed, please contact address@hidden"
msgstr "Le rendu a échoué, merci de contacter address@hidden"
-#: 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:63
msgid "Home"
msgstr "Accueil"
@@ -127,11 +127,11 @@ 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:67
msgid "About"
msgstr "Ã propos..."
-#: templates/maposmatic/about.html:37
+#: templates/maposmatic/about.html:36
msgid "History"
msgstr "Historique"
@@ -158,21 +158,21 @@ msgstr ""
"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:51
+#: templates/maposmatic/about.html:53
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\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>."
+"\">AGPLv3</a>.\n"
-#: templates/maposmatic/about.html:54
+#: templates/maposmatic/about.html:60
msgid "How does it work?"
msgstr "Comment est-ce que ça fonctionne ?"
-#: templates/maposmatic/about.html:56
+#: templates/maposmatic/about.html:63
msgid ""
"On our server, we run a <a\n"
"href=\"http://www.postgresql.org\";>PostgreSQL</a> server, with the <a\n"
@@ -197,7 +197,7 @@ msgstr ""
"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:68
+#: 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"
@@ -216,7 +216,7 @@ msgstr ""
"\"http://cairographics.org/pycairo/\";>Cairo</a>, nous avons développé "
"<i>OCitySMap</i>, un module Python qui :"
-#: templates/maposmatic/about.html:78
+#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
@@ -224,7 +224,7 @@ 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:81
+#: templates/maposmatic/about.html:89
msgid ""
"Renders on top of the map, using Mapnik, the grid\n"
" of 500 meters squares, the labels of the squares, and a few other\n"
@@ -235,7 +235,7 @@ msgstr ""
"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:86
+#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
@@ -243,7 +243,7 @@ msgstr ""
"Ajoute un pourtour gris autour de la ville si nous avons ses limites "
"administratives ;"
-#: templates/maposmatic/about.html:89
+#: 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"
@@ -252,7 +252,7 @@ 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:95
+#: templates/maposmatic/about.html:101
msgid ""
"This Python module can be used through a command-line\n"
"tool provided with OCitySMap, so everyone can run its own city-map\n"
@@ -268,7 +268,7 @@ msgstr ""
"été créé pour permettre aux utilisateurs finaux de générer et
d'utiliser "
"facilement des cartes de ville OpenStreetMap."
-#: templates/maposmatic/about.html:102
+#: templates/maposmatic/about.html:110
msgid ""
"This web service has been called <i>MapOSMatic</i>,\n"
"like <i>map-o-matic</i> but with a reference to OpenStreetMap (OSM). The\n"
@@ -289,7 +289,7 @@ msgstr ""
"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:112
+#: templates/maposmatic/about.html:122
msgid ""
"For the city search engine, we use the wonderful <a\n"
"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. This\n"
@@ -304,11 +304,11 @@ msgstr ""
"parmi plusieurs villes de même nom, en offrant des informations sur la "
"localisation de la ville."
-#: templates/maposmatic/about.html:118
+#: templates/maposmatic/about.html:130
msgid "Contributing"
msgstr "Contribuer"
-#: templates/maposmatic/about.html:120
+#: templates/maposmatic/about.html:133
msgid ""
"As stated above, both <i>OCitySMap</i> and\n"
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
@@ -319,7 +319,7 @@ msgstr ""
"Logiciels Libres, vous êtes donc invités à y contribuer. Voici quelques "
"points de départ pour nous aider :"
-#: templates/maposmatic/about.html:127
+#: templates/maposmatic/about.html:140
msgid ""
"The <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project on\n"
@@ -329,7 +329,7 @@ msgstr ""
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>projet sur\n"
" Savannah</a> ;"
-#: templates/maposmatic/about.html:131
+#: templates/maposmatic/about.html:143
msgid ""
"The <a\n"
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
@@ -340,37 +340,37 @@ msgstr ""
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>liste de "
"diffusion pour le développement (en langue anglaise)</a> ;"
-#: templates/maposmatic/about.html:135
+#: templates/maposmatic/about.html:146
msgid ""
-"The IRC channel <code>#maposmatic</code> on\n"
+"The IRC channel <tt>#maposmatic</tt> on\n"
" Freenode;"
-msgstr "Le canal IRC <code>#maposmatic</code> sur le réseau Freenode ;"
+msgstr "Le canal IRC <tt>#maposmatic</tt> sur le réseau Freenode ;"
-#: templates/maposmatic/about.html:138
+#: templates/maposmatic/about.html:148
msgid ""
"The <a\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>;"
+" 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 « <code>git clone
git://git.sv.gnu."
-"org/maposmatic/ocitysmap.git</code> » ;"
+"Git OCitySMap</a>, qui peut être cloné via « <tt>git clone
git://git.sv.gnu."
+"org/maposmatic/ocitysmap.git</tt> » ;"
-#: templates/maposmatic/about.html:143
+#: templates/maposmatic/about.html:152
msgid ""
"The <a\n"
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
-" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
+" <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 « <code>git clone
git://git.sv.gnu."
-"org/maposmatic.git</code> » ;"
+"MapOSMatic</a>, qui peut être cloné via « <tt>git clone git://git.sv.gnu."
+"org/maposmatic.git</tt> » ;"
-#: templates/maposmatic/about.html:148
+#: templates/maposmatic/about.html:156
msgid ""
"<a\n"
" href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
@@ -380,11 +380,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:163
msgid "Authors"
msgstr "Auteurs"
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:174
msgid "Contributors"
msgstr "Contributeurs"
@@ -392,7 +392,7 @@ msgstr "Contributeurs"
msgid "Job list"
msgstr "Liste des rendus"
-#: templates/maposmatic/all_jobs.html:42
+#: templates/maposmatic/all_jobs.html:41
msgid ""
"This page gives the status of all the rendering\n"
"requests received during the last 24 hours, starting from the most\n"
@@ -401,23 +401,23 @@ msgstr ""
"Cette page donne l'état de toutes les demandes de rendu reçues durant les "
"dernières 24 heures, de la plus récente à la plus ancienne."
-#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:57
+#: templates/maposmatic/all_jobs.html:54 templates/maposmatic/all_maps.html:57
msgid "Previous"
msgstr "Précédent"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "Page"
msgstr "Page"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "of"
msgstr "de"
-#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:65
+#: templates/maposmatic/all_jobs.html:56 templates/maposmatic/all_maps.html:65
msgid "Next"
msgstr "Suivant"
-#: templates/maposmatic/all_jobs.html:71
+#: templates/maposmatic/all_jobs.html:62
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -431,7 +431,7 @@ msgstr "Recherche"
msgid "Search coming soon!"
msgstr "Recherche bientôt disponible !"
-#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:65
msgid "Maps"
msgstr "Cartes"
@@ -445,61 +445,52 @@ msgid "No map starts with %(current_letter)s in our
database!"
msgstr ""
"Aucune carte ne commence par %(current_letter)s dans notre base de données !"
-#: templates/maposmatic/base.html:49
+#: templates/maposmatic/base.html:53
msgid "Your free city maps!"
msgstr "Vos cartes de ville libres !"
-#: templates/maposmatic/base.html:54
+#: templates/maposmatic/base.html:64
msgid "Jobs"
msgstr "Rendus"
-#: templates/maposmatic/base.html:56
+#: templates/maposmatic/base.html:66
msgid "News"
msgstr "Actualités"
-#: templates/maposmatic/base.html:69
-msgid "Random map"
-msgstr "Carte au hasard"
-
-#: templates/maposmatic/base.html:79
-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:89
-#, python-format
-msgid ""
-"\n"
-" published %(date)s ago\n"
-" "
-msgstr ""
-"\n"
-"publié il y a %(date)s"
-
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:77
msgid "Contact"
msgstr "Contact"
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:79
msgid "Mail:"
msgstr "Email :"
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:80
msgid "IRC:"
msgstr "IRC :"
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:80
msgid "on"
msgstr "sur"
-#: templates/maposmatic/base.html:108
-msgid "Language:"
-msgstr "Langue :"
+#: templates/maposmatic/base.html:85
+msgid "Random map"
+msgstr "Carte au hasard"
+
+#: templates/maposmatic/base.html:92
+msgid "No random map found."
+msgstr "Aucune carte trouvée."
+
+#: templates/maposmatic/base.html:97
+msgid "Latest news"
+msgstr "Dernières actualités"
+
+#: templates/maposmatic/base.html:102
+#, python-format
+msgid "published %(date)s ago"
+msgstr "publié il y a %(date)s"
-#: templates/maposmatic/index.html:227
+#: templates/maposmatic/index.html:225
msgid ""
"This place cannot be rendered by MapOSMatic, administrative boundary "
"missing. Please contribute !"
@@ -507,31 +498,31 @@ msgstr ""
"Cette ville ne peut être rendue par MapOSMatic, la limite administrative est
"
"manquante. Veuillez contribuer !"
-#: templates/maposmatic/index.html:240
+#: templates/maposmatic/index.html:238
msgid "No results found."
msgstr "Aucun résultat."
-#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:250 templates/maposmatic/index.html:323
msgid "Generate"
msgstr "Générer..."
-#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:256 templates/maposmatic/index.html:324
msgid "Please fill in the form before trying to proceed"
msgstr "Veuillez remplir le formulaire avant de continuer"
-#: templates/maposmatic/index.html:274
+#: templates/maposmatic/index.html:267
msgid "Introduction"
msgstr "Introduction"
-#: templates/maposmatic/index.html:284
+#: templates/maposmatic/index.html:277
msgid "City Map"
msgstr "Carte de la ville"
-#: templates/maposmatic/index.html:290
+#: templates/maposmatic/index.html:281
msgid "Streets index"
msgstr "Index des rues "
-#: templates/maposmatic/index.html:299
+#: templates/maposmatic/index.html:289
msgid ""
"MapOSMatic is a free software web service that\n"
"allows you to generate maps of cities using\n"
@@ -543,18 +534,18 @@ msgstr ""
"openstreetmap.org\">OpenStreetMap</a>. La carte d'une ville est constituée "
"de deux pages :"
-#: templates/maposmatic/index.html:305
+#: templates/maposmatic/index.html:296
msgid ""
"The map itself, splitted in squares allowing to easily look for streets;"
msgstr ""
"la carte elle-même, découpée en carrés pour faciliter la recherche de "
"rues ;"
-#: templates/maposmatic/index.html:306
+#: templates/maposmatic/index.html:297
msgid "An index of the streets with references to the squares on the map."
msgstr "un index des rues référencées selon les carrés de la carte."
-#: templates/maposmatic/index.html:309
+#: templates/maposmatic/index.html:301
msgid ""
"The generated maps are available in PNG, PDF and\n"
"SVG formats and are ready to be printed."
@@ -562,7 +553,7 @@ 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:312
+#: templates/maposmatic/index.html:306
msgid ""
"As the data used to generate maps is coming from\n"
"OpenStreetMap, you can freely (under the <a\n"
@@ -575,39 +566,39 @@ msgstr ""
"cartes générées (en respectant la <a href=\"http://wiki.openstreetmap.org/";
"wiki/License\">licence OpenStreetMap</a>)."
-#: templates/maposmatic/index.html:318
+#: templates/maposmatic/index.html:313
msgid "More details"
msgstr "Plus d'informations"
-#: templates/maposmatic/index.html:320
+#: templates/maposmatic/index.html:316
msgid "Generate your own map"
msgstr "Générer votre carte"
-#: templates/maposmatic/index.html:327
+#: templates/maposmatic/index.html:320
msgid "Area selection mode:"
msgstr "Mode de sélection :"
-#: templates/maposmatic/index.html:339
+#: templates/maposmatic/index.html:334
msgid "City name:"
msgstr "Nom de la ville :"
-#: templates/maposmatic/index.html:342
+#: templates/maposmatic/index.html:338
msgid "search"
msgstr "Recherche"
-#: templates/maposmatic/index.html:348
+#: templates/maposmatic/index.html:344
msgid "Title of the map:"
msgstr "Titre de la carte :"
-#: templates/maposmatic/index.html:354
+#: templates/maposmatic/index.html:350
msgid "Bounding box:"
msgstr "Zone géographique :"
-#: templates/maposmatic/index.html:366
+#: templates/maposmatic/index.html:361
msgid "Map Index Language:"
msgstr "Langue de l'index de la carte :"
-#: templates/maposmatic/index.html:376
+#: templates/maposmatic/index.html:372
msgid ""
"<em>MapOSMatic</em> covers the whole world but we need\n"
"contributors to translate and adapt the few parts of <em>MapOSMatic</em>\n"
@@ -617,13 +608,13 @@ msgstr ""
"contributeurs pour traduire et adapter les quelques parties de "
"<em>MapOSMatic</em> qui sont spécifiques à un pays donné."
-#: templates/maposmatic/index.html:380
+#: templates/maposmatic/index.html:378
msgid ""
"To select the city to be rendered, two modes are\n"
"available:"
msgstr "Pour sélectionner la ville, deux modes sont disponibles :"
-#: templates/maposmatic/index.html:385
+#: templates/maposmatic/index.html:383
msgid ""
"<em>Using an administrative boundary</em>. It allows\n"
" to get a map with precise boundaries of the city when such limits are\n"
@@ -634,13 +625,11 @@ msgstr ""
"carte avec une limite précise de la ville quand celle-ci est disponible dans
"
"la base. Sinon il faut utiliser une Zone géographique."
-#: templates/maposmatic/index.html:390
-msgid ""
-"<em>Using a traditional bounding\n"
-" box</em>."
+#: templates/maposmatic/index.html:387
+msgid "<em>Using a traditional bounding box</em>."
msgstr "<em>En utilisant une bounding box traditionnelle</em>."
-#: templates/maposmatic/index.html:395
+#: templates/maposmatic/index.html:391
msgid ""
"Once the rendering is submitted, you will be brought\n"
"to a page giving the status of your rendering request. As soon as the\n"
diff --git a/www/locale/it/LC_MESSAGES/django.po
b/www/locale/it/LC_MESSAGES/django.po
index aba65a9..c8556db 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-07 13:05+0100\n"
+"POT-Creation-Date: 2010-01-08 16:33+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:147
+#: settings.py:152
msgid "No localization"
msgstr "Nessuna traduzione"
@@ -95,7 +95,7 @@ msgstr ""
"Rendering fallito, si prega di contattare <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:63
msgid "Home"
msgstr "Home"
@@ -131,11 +131,11 @@ 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:67
msgid "About"
msgstr "Informazioni"
-#: templates/maposmatic/about.html:37
+#: templates/maposmatic/about.html:36
msgid "History"
msgstr "Storico"
@@ -163,21 +163,22 @@ msgstr ""
"<em>hacker</em> pazzi vuole ringraziare Gilles di aver condiviso la sua "
"brillante idea !"
-#: templates/maposmatic/about.html:51
+#: templates/maposmatic/about.html:53
+#, fuzzy
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\n"
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
msgstr ""
"Ovviamente, MapOSMatic è software libero, disponibile secondo i termini "
"della licenza <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html";
"\">AGPLv3</a>."
-#: templates/maposmatic/about.html:54
+#: templates/maposmatic/about.html:60
msgid "How does it work?"
msgstr "Come funziona?"
-#: templates/maposmatic/about.html:56
+#: templates/maposmatic/about.html:63
#, fuzzy
msgid ""
"On our server, we run a <a\n"
@@ -198,7 +199,7 @@ msgstr ""
"l'aiuto di <a\n"
"href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\";>osm2pgsql</a>."
-#: templates/maposmatic/about.html:68
+#: 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"
@@ -217,13 +218,13 @@ msgstr ""
"\"http://cairographics.org/pycairo/\";>Cairo</a>, abbiamo sviluppato "
"<i>OCitySMap</i>, un modulo Python che:"
-#: templates/maposmatic/about.html:78
+#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
msgstr ""
-#: templates/maposmatic/about.html:81
+#: templates/maposmatic/about.html:89
msgid ""
"Renders on top of the map, using Mapnik, the grid\n"
" of 500 meters squares, the labels of the squares, and a few other\n"
@@ -231,20 +232,20 @@ msgid ""
" etc.);"
msgstr ""
-#: templates/maposmatic/about.html:86
+#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
msgstr ""
-#: templates/maposmatic/about.html:89
+#: 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 ""
-#: templates/maposmatic/about.html:95
+#: templates/maposmatic/about.html:101
msgid ""
"This Python module can be used through a command-line\n"
"tool provided with OCitySMap, so everyone can run its own city-map\n"
@@ -254,7 +255,7 @@ msgid ""
"OpenStreetMap city maps."
msgstr ""
-#: templates/maposmatic/about.html:102
+#: templates/maposmatic/about.html:110
msgid ""
"This web service has been called <i>MapOSMatic</i>,\n"
"like <i>map-o-matic</i> but with a reference to OpenStreetMap (OSM). The\n"
@@ -267,7 +268,7 @@ msgid ""
"intensive nature of the map rendering process."
msgstr ""
-#: templates/maposmatic/about.html:112
+#: templates/maposmatic/about.html:122
msgid ""
"For the city search engine, we use the wonderful <a\n"
"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. This\n"
@@ -276,11 +277,11 @@ msgid ""
"providing informations on the city location."
msgstr ""
-#: templates/maposmatic/about.html:118
+#: templates/maposmatic/about.html:130
msgid "Contributing"
msgstr "Contribuer"
-#: templates/maposmatic/about.html:120
+#: templates/maposmatic/about.html:133
msgid ""
"As stated above, both <i>OCitySMap</i> and\n"
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
@@ -288,14 +289,14 @@ msgid ""
"us:"
msgstr ""
-#: templates/maposmatic/about.html:127
+#: templates/maposmatic/about.html:140
msgid ""
"The <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project on\n"
" Savannah</a>;"
msgstr ""
-#: templates/maposmatic/about.html:131
+#: templates/maposmatic/about.html:143
msgid ""
"The <a\n"
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
@@ -303,41 +304,41 @@ msgid ""
" mailing-list</a>;"
msgstr ""
-#: templates/maposmatic/about.html:135
+#: templates/maposmatic/about.html:146
msgid ""
-"The IRC channel <code>#maposmatic</code> on\n"
+"The IRC channel <tt>#maposmatic</tt> on\n"
" Freenode;"
msgstr ""
-#: templates/maposmatic/about.html:138
+#: templates/maposmatic/about.html:148
msgid ""
"The <a\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>;"
+" Git repository</a>, which can be cloned using <tt>git clone\n"
+" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
msgstr ""
-#: templates/maposmatic/about.html:143
+#: templates/maposmatic/about.html:152
msgid ""
"The <a\n"
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
-" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
+" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
msgstr ""
-#: templates/maposmatic/about.html:148
+#: templates/maposmatic/about.html:156
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:163
msgid "Authors"
msgstr ""
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:174
msgid "Contributors"
msgstr ""
@@ -345,30 +346,30 @@ msgstr ""
msgid "Job list"
msgstr ""
-#: templates/maposmatic/all_jobs.html:42
+#: templates/maposmatic/all_jobs.html:41
msgid ""
"This page gives the status of all the rendering\n"
"requests received during the last 24 hours, starting from the most\n"
"recent one."
msgstr ""
-#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:57
+#: templates/maposmatic/all_jobs.html:54 templates/maposmatic/all_maps.html:57
msgid "Previous"
msgstr ""
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "Page"
msgstr ""
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "of"
msgstr ""
-#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:65
+#: templates/maposmatic/all_jobs.html:56 templates/maposmatic/all_maps.html:65
msgid "Next"
msgstr ""
-#: templates/maposmatic/all_jobs.html:71
+#: templates/maposmatic/all_jobs.html:62
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -383,7 +384,7 @@ msgstr "Ricerca"
msgid "Search coming soon!"
msgstr ""
-#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:65
msgid "Maps"
msgstr "Mappe"
@@ -396,89 +397,82 @@ msgstr ""
msgid "No map starts with %(current_letter)s in our database!"
msgstr ""
-#: templates/maposmatic/base.html:49
+#: templates/maposmatic/base.html:53
msgid "Your free city maps!"
msgstr ""
-#: templates/maposmatic/base.html:54
+#: templates/maposmatic/base.html:64
msgid "Jobs"
msgstr "Risultati"
-#: templates/maposmatic/base.html:56
+#: templates/maposmatic/base.html:66
msgid "News"
msgstr "Attualità "
-#: templates/maposmatic/base.html:69
-msgid "Random map"
+#: templates/maposmatic/base.html:77
+msgid "Contact"
msgstr ""
#: templates/maposmatic/base.html:79
-msgid "No random map found."
+msgid "Mail:"
msgstr ""
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
+#: templates/maposmatic/base.html:80
+msgid "IRC:"
msgstr ""
-#: templates/maposmatic/base.html:89
-#, python-format
-msgid ""
-"\n"
-" published %(date)s ago\n"
-" "
+#: templates/maposmatic/base.html:80
+msgid "on"
msgstr ""
-#: templates/maposmatic/base.html:99
-msgid "Contact"
+#: templates/maposmatic/base.html:85
+msgid "Random map"
msgstr ""
-#: templates/maposmatic/base.html:101
-msgid "Mail:"
+#: templates/maposmatic/base.html:92
+msgid "No random map found."
msgstr ""
-#: templates/maposmatic/base.html:102
-msgid "IRC:"
+#: templates/maposmatic/base.html:97
+msgid "Latest news"
msgstr ""
#: templates/maposmatic/base.html:102
-msgid "on"
-msgstr ""
-
-#: templates/maposmatic/base.html:108
-msgid "Language:"
+#, python-format
+msgid "published %(date)s ago"
msgstr ""
-#: templates/maposmatic/index.html:227
+#: templates/maposmatic/index.html:225
msgid ""
"This place cannot be rendered by MapOSMatic, administrative boundary "
"missing. Please contribute !"
msgstr ""
-#: templates/maposmatic/index.html:240
+#: templates/maposmatic/index.html:238
msgid "No results found."
msgstr ""
-#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:250 templates/maposmatic/index.html:323
msgid "Generate"
msgstr ""
-#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:256 templates/maposmatic/index.html:324
msgid "Please fill in the form before trying to proceed"
msgstr ""
-#: templates/maposmatic/index.html:274
+#: templates/maposmatic/index.html:267
msgid "Introduction"
msgstr "Introduzione"
-#: templates/maposmatic/index.html:284
+#: templates/maposmatic/index.html:277
msgid "City Map"
msgstr "Mappa della città "
-#: templates/maposmatic/index.html:290
+#: templates/maposmatic/index.html:281
msgid "Streets index"
msgstr "Stradario "
-#: templates/maposmatic/index.html:299
+#: templates/maposmatic/index.html:289
msgid ""
"MapOSMatic is a free software web service that\n"
"allows you to generate maps of cities using\n"
@@ -490,20 +484,20 @@ msgstr ""
"openstreetmap.org\">OpenStreetMap</a>. Ogni mappa di città generata\n"
" sarà costituita da due pagine:"
-#: templates/maposmatic/index.html:305
+#: templates/maposmatic/index.html:296
msgid ""
"The map itself, splitted in squares allowing to easily look for streets;"
msgstr ""
"La carta stessa con sovrapposta una griglia di riferimento per facilitare la "
"ricerca delle strade ;"
-#: templates/maposmatic/index.html:306
+#: templates/maposmatic/index.html:297
msgid "An index of the streets with references to the squares on the map."
msgstr ""
"Uno stradario con i riferimenti diretti alla cella della griglia di "
"riferimento."
-#: templates/maposmatic/index.html:309
+#: templates/maposmatic/index.html:301
msgid ""
"The generated maps are available in PNG, PDF and\n"
"SVG formats and are ready to be printed."
@@ -511,7 +505,7 @@ msgstr ""
"Le mappe generate sono disponibili e pronte per la stampa\n"
" in formato PNG, PDF e SVG."
-#: templates/maposmatic/index.html:312
+#: templates/maposmatic/index.html:306
msgid ""
"As the data used to generate maps is coming from\n"
"OpenStreetMap, you can freely (under the <a\n"
@@ -525,39 +519,39 @@ msgstr ""
"(nel rispetto della <a href=\"http://wiki.openstreetmap.org/wiki/License";
"\">licenza OpenStreetMap</a>)."
-#: templates/maposmatic/index.html:318
+#: templates/maposmatic/index.html:313
msgid "More details"
msgstr "Maggiori dettagli"
-#: templates/maposmatic/index.html:320
+#: templates/maposmatic/index.html:316
msgid "Generate your own map"
msgstr "Crea la tua mappa"
-#: templates/maposmatic/index.html:327
+#: templates/maposmatic/index.html:320
msgid "Area selection mode:"
msgstr "Modalità di selezione dell'area geografica :"
-#: templates/maposmatic/index.html:339
+#: templates/maposmatic/index.html:334
msgid "City name:"
msgstr "Nome della città :"
-#: templates/maposmatic/index.html:342
+#: templates/maposmatic/index.html:338
msgid "search"
msgstr "Ricerca"
-#: templates/maposmatic/index.html:348
+#: templates/maposmatic/index.html:344
msgid "Title of the map:"
msgstr "Titolo della carta :"
-#: templates/maposmatic/index.html:354
+#: templates/maposmatic/index.html:350
msgid "Bounding box:"
msgstr "Area geografica :"
-#: templates/maposmatic/index.html:366
+#: templates/maposmatic/index.html:361
msgid "Map Index Language:"
msgstr "Lingua dello stradario :"
-#: templates/maposmatic/index.html:376
+#: templates/maposmatic/index.html:372
msgid ""
"<em>MapOSMatic</em> covers the whole world but we need\n"
"contributors to translate and adapt the few parts of <em>MapOSMatic</em>\n"
@@ -567,14 +561,14 @@ msgstr ""
"collaboratori per tradurree adattare alcuni contenuti di\n"
"<em>MapOSMatic</em> che sono peculiari di una specifica nazione."
-#: templates/maposmatic/index.html:380
+#: templates/maposmatic/index.html:378
msgid ""
"To select the city to be rendered, two modes are\n"
"available:"
msgstr ""
"Selezionare il metodo preferito di selezione della città da renderizzare :"
-#: templates/maposmatic/index.html:385
+#: templates/maposmatic/index.html:383
msgid ""
"<em>Using an administrative boundary</em>. It allows\n"
" to get a map with precise boundaries of the city when such limits are\n"
@@ -586,13 +580,12 @@ msgstr ""
"sono presenti nella banca dati. Altrimenti è necessario specificare un'area "
"geografica."
-#: templates/maposmatic/index.html:390
-msgid ""
-"<em>Using a traditional bounding\n"
-" box</em>."
+#: templates/maposmatic/index.html:387
+#, fuzzy
+msgid "<em>Using a traditional bounding box</em>."
msgstr "<em>Specificando un'area geografica</em>."
-#: templates/maposmatic/index.html:395
+#: templates/maposmatic/index.html:391
msgid ""
"Once the rendering is submitted, you will be brought\n"
"to a page giving the status of your rendering request. As soon as the\n"
diff --git a/www/locale/nl_NL/LC_MESSAGES/django.po
b/www/locale/nl_NL/LC_MESSAGES/django.po
index 9928771..5d888ef 100644
--- a/www/locale/nl_NL/LC_MESSAGES/django.po
+++ b/www/locale/nl_NL/LC_MESSAGES/django.po
@@ -19,27 +19,27 @@ 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-08 16:33+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"
-#: maposmatic/models.py:144
+#: maposmatic/models.py:146
#, python-format
msgid "%(title)s %(format)s Map"
msgstr "Kaart voor %(title)s (bestandsindeling %(format)s)"
-#: maposmatic/models.py:149
+#: maposmatic/models.py:150
#, python-format
msgid "%(title)s %(format)s Index"
msgstr "Straatindex voor %(title)s (bestandsindeling %(format)s)"
@@ -91,14 +91,13 @@ msgid "Rendering successful"
msgstr "Reproductie is succesvol afgerond"
#: maposmatic/templatetags/extratags.py:47
-msgid ""
-"Rendering failed, please contact <a "
-"href=\"mailto:address@hidden";>address@hidden</a>"
+#, fuzzy
+msgid "Rendering failed, please contact address@hidden"
msgstr ""
"De reproductie van uw kaart is mislukt, gelieve contact op te nemen met <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:63
msgid "Home"
msgstr "Thuis"
@@ -134,11 +133,11 @@ 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:67
msgid "About"
msgstr "Over..."
-#: templates/maposmatic/about.html:37
+#: templates/maposmatic/about.html:36
msgid "History"
msgstr "Geschiedenis"
@@ -149,8 +148,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,29 +157,30 @@ 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!"
-
-#: templates/maposmatic/about.html:51
+"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:53
+#, fuzzy
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\n"
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
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
+#: templates/maposmatic/about.html:60
msgid "How does it work?"
msgstr "Hoe werkt het?"
-#: templates/maposmatic/about.html:56
+#: templates/maposmatic/about.html:63
msgid ""
"On our server, we run a <a\n"
"href=\"http://www.postgresql.org\";>PostgreSQL</a> server, with the <a\n"
@@ -194,25 +194,24 @@ 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> "
"bij, opdat we de nieuwe contributies aan OpenStreetMap door hun gebruikers "
"kunnen volgen."
-#: templates/maposmatic/about.html:68
+#: 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:"
@@ -225,7 +224,7 @@ msgstr ""
"<a href=\"http://cairographics.org/pycairo/\";>Cairo</a>, hebben we de "
"<i>OCitySMap</i> Python module geschreven, deze :"
-#: templates/maposmatic/about.html:78
+#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
@@ -233,7 +232,7 @@ msgstr ""
"Reproduceert de kaart vanaf de gegevens van OpenStreetMap met behulp van de "
"OpenStreetMap stylesheet voor Mapnik;"
-#: templates/maposmatic/about.html:81
+#: templates/maposmatic/about.html:89
msgid ""
"Renders on top of the map, using Mapnik, the grid\n"
" of 500 meters squares, the labels of the squares, and a few other\n"
@@ -244,7 +243,7 @@ msgstr ""
"Mapnik, voegt labels toe aan dit raster, en geeft verdere informatie weer op "
"de kaart (auteursrecht, schaal, et cetera)"
-#: templates/maposmatic/about.html:86
+#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
@@ -253,7 +252,7 @@ msgstr ""
"buiten dit gebied grijs worden gearceerd om nadruk te leggen op de plaats in "
"kwestie;"
-#: templates/maposmatic/about.html:89
+#: 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"
@@ -262,7 +261,7 @@ msgstr ""
"Maakt een index van straten gebaseerd op de OpenStreetMap gegevens en waar "
"deze kruisen op de kaart met het eerdergenoemd raster."
-#: templates/maposmatic/about.html:95
+#: templates/maposmatic/about.html:101
msgid ""
"This Python module can be used through a command-line\n"
"tool provided with OCitySMap, so everyone can run its own city-map\n"
@@ -277,7 +276,7 @@ msgstr ""
"gecompliceerd, dus is er een kleine 'web service' opgezet zodat iedereen "
"gemakkelijk OpenStreetMap stadskaarten kan aanvragen en laten reproduceren."
-#: templates/maposmatic/about.html:102
+#: templates/maposmatic/about.html:110
msgid ""
"This web service has been called <i>MapOSMatic</i>,\n"
"like <i>map-o-matic</i> but with a reference to OpenStreetMap (OSM). The\n"
@@ -291,14 +290,14 @@ 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 "
"de processor en harddisk."
-#: templates/maposmatic/about.html:112
+#: templates/maposmatic/about.html:122
msgid ""
"For the city search engine, we use the wonderful <a\n"
"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. This\n"
@@ -306,18 +305,17 @@ 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
+#: templates/maposmatic/about.html:130
msgid "Contributing"
msgstr "Bijdragen"
-#: templates/maposmatic/about.html:120
+#: templates/maposmatic/about.html:133
msgid ""
"As stated above, both <i>OCitySMap</i> and\n"
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
@@ -328,7 +326,7 @@ msgstr ""
"Vrije Software projecten, dus u van harte welkom om bij te dragen. Hier "
"volgen wat startpunten om ons te helpen:"
-#: templates/maposmatic/about.html:127
+#: templates/maposmatic/about.html:140
msgid ""
"The <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project on\n"
@@ -338,46 +336,51 @@ msgstr ""
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project op\n"
" Savannah</a> ;"
-#: templates/maposmatic/about.html:131
+#: templates/maposmatic/about.html:143
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"
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\";>email "
"distributielijst voor ontwikkelaars (de voertaal is Engels)</a> ;"
-#: templates/maposmatic/about.html:135
+#: templates/maposmatic/about.html:146
+#, fuzzy
msgid ""
-"The IRC channel <code>#maposmatic</code> on\n"
+"The IRC channel <tt>#maposmatic</tt> on\n"
" Freenode;"
msgstr "Het <code>#maposmatic</code> IRC-kanaal op Freenode;"
-#: templates/maposmatic/about.html:138
+#: templates/maposmatic/about.html:148
+#, fuzzy
msgid ""
"The <a\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>;"
+" 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 ""
"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> » ;"
+" 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> » ;"
-#: templates/maposmatic/about.html:143
+#: templates/maposmatic/about.html:152
+#, fuzzy
msgid ""
"The <a\n"
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
-" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
+" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
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> » ;"
+"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> » ;"
-#: templates/maposmatic/about.html:148
+#: templates/maposmatic/about.html:156
msgid ""
"<a\n"
" href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
@@ -387,11 +390,11 @@ msgstr ""
" href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>Taken- en "
"ideeenlijst</a>."
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:163
msgid "Authors"
msgstr "Auteurs"
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:174
msgid "Contributors"
msgstr "Bijdragers"
@@ -399,7 +402,7 @@ msgstr "Bijdragers"
msgid "Job list"
msgstr "Opdrachtenlijst"
-#: templates/maposmatic/all_jobs.html:42
+#: templates/maposmatic/all_jobs.html:41
msgid ""
"This page gives the status of all the rendering\n"
"requests received during the last 24 hours, starting from the most\n"
@@ -408,139 +411,98 @@ msgstr ""
"Deze pagina geeft de status weer van alle aanvragen die in de laatste 24 uur "
"zijn ontvangen, beginnend met de meest recente."
-#: templates/maposmatic/all_jobs.html:49 templates/maposmatic/all_maps.html:40
-msgid "Title"
-msgstr "Titel"
-
-#: templates/maposmatic/all_jobs.html:50 templates/maposmatic/all_maps.html:41
-msgid "Location"
-msgstr "Locatie"
-
-#: templates/maposmatic/all_jobs.html:51
-msgid "Job status"
-msgstr "Opdracht status"
-
-#: templates/maposmatic/all_jobs.html:52
-msgid "Submission at"
-msgstr "Datum van aanvraag"
-
-#: templates/maposmatic/all_jobs.html:53
-msgid "Rendering started at"
-msgstr "Reproductie gestart op"
-
-#: templates/maposmatic/all_jobs.html:54
-msgid "Rendering finished at"
-msgstr "Reproductie beeindigd op"
-
-#: templates/maposmatic/all_jobs.html:55
-msgid "Position in queue"
-msgstr "Nummer in de wachtrij"
-
-#: templates/maposmatic/all_jobs.html:78
-msgid "not started"
-msgstr "niet gestart"
-
-#: templates/maposmatic/all_jobs.html:87
-msgid "not finished"
-msgstr "niet beeindigd"
-
-#: templates/maposmatic/all_jobs.html:103
-#: templates/maposmatic/all_maps.html:82
+#: templates/maposmatic/all_jobs.html:54 templates/maposmatic/all_maps.html:57
msgid "Previous"
msgstr "Vorige"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "Page"
msgstr "Pagina"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "of"
msgstr "van"
-#: templates/maposmatic/all_jobs.html:111
-#: templates/maposmatic/all_maps.html:90
+#: templates/maposmatic/all_jobs.html:56 templates/maposmatic/all_maps.html:65
msgid "Next"
msgstr "Volgende"
-#: templates/maposmatic/all_jobs.html:117
+#: templates/maposmatic/all_jobs.html:62
msgid ""
"No map rendering request since the last 24\n"
"hours."
msgstr "Geen aanvragen gedaan in de afgelopen 24 uur."
-#: templates/maposmatic/all_maps.html:35 templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:35
+#, fuzzy
+msgid "Search"
+msgstr "Zoek"
+
+#: templates/maposmatic/all_maps.html:35
+msgid "Search coming soon!"
+msgstr ""
+
+#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:65
msgid "Maps"
msgstr "Kaarten"
-#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:115
-msgid "Thumbnail"
-msgstr "Miniatuur"
-
-#: templates/maposmatic/all_maps.html:43
-msgid "Files"
-msgstr "Bestanden"
+#: templates/maposmatic/all_maps.html:40
+msgid "All"
+msgstr ""
-#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:130
-msgid "The generated files are no longer available"
-msgstr "De gegenereerde bestanden zijn niet langer beschikbaar"
+#: templates/maposmatic/all_maps.html:49
+#, python-format
+msgid "No map starts with %(current_letter)s in our database!"
+msgstr ""
-#: templates/maposmatic/base.html:49
+#: templates/maposmatic/base.html:53
msgid "Your free city maps!"
msgstr "Uw vrije stadskaarten!"
-#: templates/maposmatic/base.html:54
+#: templates/maposmatic/base.html:64
msgid "Jobs"
msgstr "Opdrachten"
-#: templates/maposmatic/base.html:56
+#: templates/maposmatic/base.html:66
msgid "News"
msgstr "Nieuws"
-#: templates/maposmatic/base.html:69
-msgid "Random map"
-msgstr "Willekeurge kaart"
-
-#: templates/maposmatic/base.html:79
-msgid "No random map found."
-msgstr "Geen kaart gevonden."
-
-#: templates/maposmatic/base.html:84
-msgid "Latest news"
-msgstr "Laatste nieuws"
-
-#: templates/maposmatic/base.html:89
-#, python-format
-msgid ""
-"\n"
-" published %(date)s ago\n"
-" "
-msgstr ""
-"\n"
-"%(date)s geleden gepubliceerd"
-
-#: templates/maposmatic/base.html:99
+#: templates/maposmatic/base.html:77
msgid "Contact"
msgstr "Contact"
-#: templates/maposmatic/base.html:101
+#: templates/maposmatic/base.html:79
msgid "Mail:"
msgstr "Email :"
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:80
msgid "IRC:"
msgstr "IRC :"
-#: templates/maposmatic/base.html:102
+#: templates/maposmatic/base.html:80
msgid "on"
msgstr "op"
-#: templates/maposmatic/base.html:108
-msgid "Language:"
-msgstr "Taal:"
+#: templates/maposmatic/base.html:85
+msgid "Random map"
+msgstr "Willekeurge kaart"
+
+#: templates/maposmatic/base.html:92
+msgid "No random map found."
+msgstr "Geen kaart gevonden."
-#: templates/maposmatic/index.html:227
+#: templates/maposmatic/base.html:97
+msgid "Latest news"
+msgstr "Laatste nieuws"
+
+#: templates/maposmatic/base.html:102
+#, fuzzy, python-format
+msgid "published %(date)s ago"
+msgstr ""
+"\n"
+"%(date)s geleden gepubliceerd"
+
+#: templates/maposmatic/index.html:225
msgid ""
"This place cannot be rendered by MapOSMatic, administrative boundary "
"missing. Please contribute !"
@@ -548,31 +510,31 @@ msgstr ""
"Deze plaats kan niet door MapOSMatic worden gereproduceerd, de "
"administratieve grens ontbreekt. Gelieve bij te dragen!"
-#: templates/maposmatic/index.html:240
+#: templates/maposmatic/index.html:238
msgid "No results found."
msgstr "Geen resultaten gevonden."
-#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:250 templates/maposmatic/index.html:323
msgid "Generate"
msgstr "Genereer"
-#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:256 templates/maposmatic/index.html:324
msgid "Please fill in the form before trying to proceed"
msgstr "Vul a.u.b. het formulier in alvorens verder te gaan"
-#: templates/maposmatic/index.html:274
+#: templates/maposmatic/index.html:267
msgid "Introduction"
msgstr "Introductie"
-#: templates/maposmatic/index.html:284
+#: templates/maposmatic/index.html:277
msgid "City Map"
msgstr "Stadskaart"
-#: templates/maposmatic/index.html:290
+#: templates/maposmatic/index.html:281
msgid "Streets index"
msgstr "Straatindex "
-#: templates/maposmatic/index.html:299
+#: templates/maposmatic/index.html:289
msgid ""
"MapOSMatic is a free software web service that\n"
"allows you to generate maps of cities using\n"
@@ -580,21 +542,21 @@ 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
+#: templates/maposmatic/index.html:296
msgid ""
"The map itself, splitted in squares allowing to easily look for streets;"
msgstr ""
"De kaart an sich, verdeeld in sectoren om gemakkelijk straten op te zoeken;"
-#: templates/maposmatic/index.html:306
+#: templates/maposmatic/index.html:297
msgid "An index of the streets with references to the squares on the map."
msgstr "een index van de straten met referentie aan de sectoren op de kaart."
-#: templates/maposmatic/index.html:309
+#: templates/maposmatic/index.html:301
msgid ""
"The generated maps are available in PNG, PDF and\n"
"SVG formats and are ready to be printed."
@@ -602,7 +564,7 @@ msgstr ""
"Deze gegenereerde kaarten zijn beschikbaar in PNG, PDF en SVG "
"bestandsindeling en zijn geschikt om te printen."
-#: templates/maposmatic/index.html:312
+#: templates/maposmatic/index.html:306
msgid ""
"As the data used to generate maps is coming from\n"
"OpenStreetMap, you can freely (under the <a\n"
@@ -611,43 +573,43 @@ 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
+#: templates/maposmatic/index.html:313
msgid "More details"
msgstr "Meer details"
-#: templates/maposmatic/index.html:320
+#: templates/maposmatic/index.html:316
msgid "Generate your own map"
msgstr "Genereer uw kaart"
-#: templates/maposmatic/index.html:327
+#: templates/maposmatic/index.html:320
msgid "Area selection mode:"
msgstr "Gebied selectie methode:"
-#: templates/maposmatic/index.html:339
+#: templates/maposmatic/index.html:334
msgid "City name:"
msgstr "Plaatsnaam:"
-#: templates/maposmatic/index.html:342
+#: templates/maposmatic/index.html:338
msgid "search"
msgstr "Zoek"
-#: templates/maposmatic/index.html:348
+#: templates/maposmatic/index.html:344
msgid "Title of the map:"
msgstr "Kaarttitel:"
-#: templates/maposmatic/index.html:354
+#: templates/maposmatic/index.html:350
msgid "Bounding box:"
msgstr "Omkaderd gebied:"
-#: templates/maposmatic/index.html:366
+#: templates/maposmatic/index.html:361
msgid "Map Index Language:"
msgstr "Taal van de kaart index:"
-#: templates/maposmatic/index.html:376
+#: templates/maposmatic/index.html:372
msgid ""
"<em>MapOSMatic</em> covers the whole world but we need\n"
"contributors to translate and adapt the few parts of <em>MapOSMatic</em>\n"
@@ -657,14 +619,14 @@ msgstr ""
"nodig om een paar gedeeltes van <em>MapOSMatic</em> te vertalen en aan te "
"passen die landsspecifiek zijn."
-#: templates/maposmatic/index.html:380
+#: templates/maposmatic/index.html:378
msgid ""
"To select the city to be rendered, two modes are\n"
"available:"
msgstr ""
"Om een plaats om te reproduceren te selecteren zijn twee modi beschikbaar:"
-#: templates/maposmatic/index.html:385
+#: templates/maposmatic/index.html:383
msgid ""
"<em>Using an administrative boundary</em>. It allows\n"
" to get a map with precise boundaries of the city when such limits are\n"
@@ -675,13 +637,12 @@ msgstr ""
"kaart te maken met een preciese grens van de plaats wanneer deze grens "
"bekend is in de database. Anders zult u een omkaderd gebied moeten kiezen."
-#: templates/maposmatic/index.html:390
-msgid ""
-"<em>Using a traditional bounding\n"
-" box</em>."
+#: templates/maposmatic/index.html:387
+#, fuzzy
+msgid "<em>Using a traditional bounding box</em>."
msgstr "<em>Gebruik een traditioneel omkaderd gebied</em>."
-#: templates/maposmatic/index.html:395
+#: templates/maposmatic/index.html:391
msgid ""
"Once the rendering is submitted, you will be brought\n"
"to a page giving the status of your rendering request. As soon as the\n"
@@ -695,62 +656,145 @@ msgstr ""
"— zal bij uw na het verversen van de pagina koppelingen naar uw kaart "
"aantreffen."
-#: templates/maposmatic/job.html:38
-#, python-format
-msgid "Map <i>%(job_t)s</i> Status"
-msgstr "Status van de kaart <i>%(job_t)s</i>"
-
-#: templates/maposmatic/job.html:43
+#: templates/maposmatic/job-page.html:43
msgid ""
"You have been redirected to a similar map, rendered less than 24 hours ago."
msgstr ""
"U bent naar een soortgelijke kaart omgeleid, deze is minder dan 24 uur "
"geleden gemaakt."
-#: templates/maposmatic/job.html:51
+#: templates/maposmatic/job-page.html:51
msgid "Refresh the status"
msgstr "Ververs de status"
-#: templates/maposmatic/job.html:56
-msgid "Map title"
-msgstr "Kaarttitel"
+#: templates/maposmatic/job-page.html:51
+msgid ""
+"(the page will refresh automatically every 5 seconds until the rendering is "
+"completed)."
+msgstr ""
-#: templates/maposmatic/job.html:61
-msgid "Administrative city"
-msgstr "Administratieve grens"
+#: templates/maposmatic/job.html:44
+#, fuzzy
+msgid "Rendering: "
+msgstr "Reproductie is succesvol afgerond"
+
+#: templates/maposmatic/job.html:45
+#, fuzzy
+msgid "Rendering submitted"
+msgstr "Reproductie gestart op"
+
+#: templates/maposmatic/job.html:47
+msgid "In queue, position"
+msgstr ""
+
+#: templates/maposmatic/job.html:47
+msgid "estimated completion time"
+msgstr ""
+
+#: templates/maposmatic/job.html:49
+msgid "Completed on"
+msgstr ""
+
+#: templates/maposmatic/job.html:51
+msgid "Failed on"
+msgstr ""
+
+#: templates/maposmatic/job.html:53
+#, python-format
+msgid "rendering took %(rendering)s"
+msgstr ""
+
+#: templates/maposmatic/job.html:55
+#, fuzzy
+msgid "Rendering in progress..."
+msgstr "Reproductie is gaande"
+
+#: templates/maposmatic/job.html:61 templates/maposmatic/map.html:45
+#, fuzzy
+msgid "Files: "
+msgstr "Bestanden"
+
+#: templates/maposmatic/job.html:63 templates/maposmatic/map.html:47
+#, fuzzy
+msgid "Map: "
+msgstr "Kaarten"
+
+#: templates/maposmatic/job.html:64 templates/maposmatic/map.html:48
+msgid "Index: "
+msgstr ""
+
+#: templates/maposmatic/job.html:67 templates/maposmatic/map.html:51
+#, fuzzy
+msgid "The generated files are no longer available."
+msgstr "De gegenereerde bestanden zijn niet langer beschikbaar"
+
+#: templates/maposmatic/map.html:42
+#, fuzzy
+msgid "Rendering completed on"
+msgstr "Reproductie gestart op"
+
+#~ msgid "Title"
+#~ msgstr "Titel"
+
+#~ msgid "Location"
+#~ msgstr "Locatie"
+
+#~ msgid "Job status"
+#~ msgstr "Opdracht status"
+
+#~ msgid "Submission at"
+#~ msgstr "Datum van aanvraag"
+
+#~ msgid "Rendering finished at"
+#~ msgstr "Reproductie beeindigd op"
+
+#~ msgid "Position in queue"
+#~ msgstr "Nummer in de wachtrij"
+
+#~ msgid "not started"
+#~ msgstr "niet gestart"
+
+#~ msgid "not finished"
+#~ msgstr "niet beeindigd"
+
+#~ msgid "Thumbnail"
+#~ msgstr "Miniatuur"
+
+#~ msgid "Language:"
+#~ msgstr "Taal:"
+
+#~ msgid "Map <i>%(job_t)s</i> Status"
+#~ msgstr "Status van de kaart <i>%(job_t)s</i>"
+
+#~ msgid "Map title"
+#~ msgstr "Kaarttitel"
+
+#~ msgid "Administrative city"
+#~ msgstr "Administratieve grens"
-#: templates/maposmatic/job.html:66
-msgid "Bounding-box coordinates"
-msgstr "Coordinaten van het omkaderd gebied (lengte/breedte)"
+#~ msgid "Bounding-box coordinates"
+#~ msgstr "Coordinaten van het omkaderd gebied (lengte/breedte)"
-#: templates/maposmatic/job.html:76
-msgid "Status"
-msgstr "Status"
+#~ msgid "Status"
+#~ msgstr "Status"
-#: templates/maposmatic/job.html:80
-msgid "Submission time"
-msgstr "Datum van aanvraag"
+#~ msgid "Submission time"
+#~ msgstr "Datum van aanvraag"
-#: templates/maposmatic/job.html:84
-msgid "Start of rendering time"
-msgstr "Begintijd van de reproductie"
+#~ msgid "Start of rendering time"
+#~ msgstr "Begintijd van de reproductie"
-#: templates/maposmatic/job.html:87 templates/maposmatic/job.html.py:100
-msgid "Rendering not started yet"
-msgstr "Reproductie is nog niet begonnen"
+#~ msgid "Rendering not started yet"
+#~ msgstr "Reproductie is nog niet begonnen"
-#: templates/maposmatic/job.html:94
-msgid "End of rendering time"
-msgstr "Eindtijd van de reproductie"
+#~ msgid "End of rendering time"
+#~ msgstr "Eindtijd van de reproductie"
-#: templates/maposmatic/job.html:103
-msgid "Rendering not finished yet"
-msgstr "Reproductie is nog niet voltooid"
+#~ msgid "Rendering not finished yet"
+#~ msgstr "Reproductie is nog niet voltooid"
-#: templates/maposmatic/job.html:109
-msgid "Current position in queue"
-msgstr "Positie van uw aanvraag in de wachtrij"
+#~ msgid "Current position in queue"
+#~ msgstr "Positie van uw aanvraag in de wachtrij"
-#: templates/maposmatic/job.html:123
-msgid "Result files"
-msgstr "Gegenereerde bestanden"
+#~ msgid "Result files"
+#~ msgstr "Gegenereerde bestanden"
diff --git a/www/locale/pt_BR/LC_MESSAGES/django.po
b/www/locale/pt_BR/LC_MESSAGES/django.po
index c0aaadc..cc43770 100644
--- a/www/locale/pt_BR/LC_MESSAGES/django.po
+++ b/www/locale/pt_BR/LC_MESSAGES/django.po
@@ -20,24 +20,25 @@ 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-08 16:33+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"
-#: maposmatic/models.py:144
+#: maposmatic/models.py:146
#, python-format
msgid "%(title)s %(format)s Map"
msgstr "Mapa de %(title)s (format %(format)s)"
-#: maposmatic/models.py:149
+#: maposmatic/models.py:150
#, python-format
msgid "%(title)s %(format)s Index"
msgstr "Ãndice de ruas pelo %(title)s (format %(format)s)"
@@ -88,12 +89,13 @@ 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>"
+#, fuzzy
+msgid "Rendering failed, please contact address@hidden"
+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:63
msgid "Home"
msgstr "InÃcio"
@@ -129,12 +131,11 @@ 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:67
msgid "About"
msgstr "Sobre"
-#: templates/maposmatic/about.html:37
+#: templates/maposmatic/about.html:36
msgid "History"
msgstr "Histórico"
@@ -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"
@@ -153,27 +155,35 @@ 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
+#: templates/maposmatic/about.html:53
+#, fuzzy
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\n"
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
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
+#: templates/maposmatic/about.html:60
msgid "How does it work?"
msgstr "Como isto funciona?"
-#: templates/maposmatic/about.html:56
+#: templates/maposmatic/about.html:63
msgid ""
"On our server, we run a <a\n"
"href=\"http://www.postgresql.org\";>PostgreSQL</a> server, with the <a\n"
@@ -191,30 +201,36 @@ 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
+#: 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 ""
"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:"
-
-#: templates/maposmatic/about.html:78
+"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 ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
@@ -222,7 +238,7 @@ msgstr ""
"Renderiza o mapa usando os dados do OpenStreetMap\n"
" e o estilo Mapnik do OpenStreetMap;"
-#: templates/maposmatic/about.html:81
+#: templates/maposmatic/about.html:89
msgid ""
"Renders on top of the map, using Mapnik, the grid\n"
" of 500 meters squares, the labels of the squares, and a few other\n"
@@ -234,7 +250,7 @@ msgstr ""
" dos quadrados, e mais algumas informações no mapa\n"
" (copyright, escala, etc.);"
-#: templates/maposmatic/about.html:86
+#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
@@ -242,7 +258,7 @@ msgstr ""
"Destaca a área dentro da cidade se encontrar a sua\n"
" fronteira administrativa;"
-#: templates/maposmatic/about.html:89
+#: 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"
@@ -252,7 +268,7 @@ msgstr ""
" do OpenStreetMap e a interseção das ruas\n"
" com os quadrados no mapa."
-#: templates/maposmatic/about.html:95
+#: templates/maposmatic/about.html:101
msgid ""
"This Python module can be used through a command-line\n"
"tool provided with OCitySMap, so everyone can run its own city-map\n"
@@ -269,7 +285,7 @@ msgstr ""
"usuários finais pudessem facilmente gerar e usar mapas de cidade do\n"
"OpenStreetMap."
-#: templates/maposmatic/about.html:102
+#: templates/maposmatic/about.html:110
msgid ""
"This web service has been called <i>MapOSMatic</i>,\n"
"like <i>map-o-matic</i> but with a reference to OpenStreetMap (OSM). The\n"
@@ -290,7 +306,7 @@ msgstr ""
"um trabalho por vez, o que é muito importante devido a utilização
intensa\n"
"de CPU e I/O de cada processo de renderização de mapas."
-#: templates/maposmatic/about.html:112
+#: templates/maposmatic/about.html:122
msgid ""
"For the city search engine, we use the wonderful <a\n"
"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. This\n"
@@ -299,15 +315,16 @@ 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."
-#: templates/maposmatic/about.html:118
+#: templates/maposmatic/about.html:130
msgid "Contributing"
msgstr "Contribuindo"
-#: templates/maposmatic/about.html:120
+#: templates/maposmatic/about.html:133
msgid ""
"As stated above, both <i>OCitySMap</i> and\n"
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
@@ -318,7 +335,7 @@ msgstr ""
"<i>MapOSMatic</i> são softwares livres, então você está convidado a\n"
"contribuir. Aqui estão alguns lugares para nos ajudar:"
-#: templates/maposmatic/about.html:127
+#: templates/maposmatic/about.html:140
msgid ""
"The <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project on\n"
@@ -328,48 +345,55 @@ msgstr ""
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>projeto no\n"
" Savannah</a>;"
-#: templates/maposmatic/about.html:131
+#: templates/maposmatic/about.html:143
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
+#: templates/maposmatic/about.html:146
+#, fuzzy
msgid ""
-"The IRC channel <code>#maposmatic</code> on\n"
+"The IRC channel <tt>#maposmatic</tt> 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
+#: templates/maposmatic/about.html:148
+#, fuzzy
msgid ""
"The <a\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>;"
+" 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"
" <code>git clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
-#: templates/maposmatic/about.html:143
+#: templates/maposmatic/about.html:152
+#, fuzzy
msgid ""
"The <a\n"
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
-" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
+" <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"
" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
-#: templates/maposmatic/about.html:148
+#: templates/maposmatic/about.html:156
msgid ""
"<a\n"
" href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
@@ -379,11 +403,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:163
msgid "Authors"
msgstr "Autores"
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:174
msgid "Contributors"
msgstr "Contribuidores"
@@ -391,7 +415,7 @@ msgstr "Contribuidores"
msgid "Job list"
msgstr "Lista de trabalhos"
-#: templates/maposmatic/all_jobs.html:42
+#: templates/maposmatic/all_jobs.html:41
msgid ""
"This page gives the status of all the rendering\n"
"requests received during the last 24 hours, starting from the most\n"
@@ -401,69 +425,23 @@ 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
-msgid "Title"
-msgstr "TÃtulo"
-
-#: templates/maposmatic/all_jobs.html:50
-#: templates/maposmatic/all_maps.html:41
-msgid "Location"
-msgstr "Localidade"
-
-#: templates/maposmatic/all_jobs.html:51
-msgid "Job status"
-msgstr "Status do trabalho"
-
-#: templates/maposmatic/all_jobs.html:52
-msgid "Submission at"
-msgstr "Data de submissão"
-
-#: templates/maposmatic/all_jobs.html:53
-msgid "Rendering started at"
-msgstr "Renderização iniciada em"
-
-#: templates/maposmatic/all_jobs.html:54
-msgid "Rendering finished at"
-msgstr "Renderização finalizada em"
-
-#: templates/maposmatic/all_jobs.html:55
-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
-msgid "not started"
-msgstr "não iniciado"
-
-#: templates/maposmatic/all_jobs.html:88
-msgid "not finished"
-msgstr "não terminado"
-
-#: templates/maposmatic/all_jobs.html:109
-#: templates/maposmatic/all_maps.html:82
+#: templates/maposmatic/all_jobs.html:54 templates/maposmatic/all_maps.html:57
msgid "Previous"
msgstr "Anterior"
-#: templates/maposmatic/all_jobs.html:113
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "Page"
msgstr "Página"
-#: templates/maposmatic/all_jobs.html:113
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "of"
msgstr "de"
-#: templates/maposmatic/all_jobs.html:117
-#: templates/maposmatic/all_maps.html:90
+#: templates/maposmatic/all_jobs.html:56 templates/maposmatic/all_maps.html:65
msgid "Next"
msgstr "Próxima"
-#: templates/maposmatic/all_jobs.html:123
+#: templates/maposmatic/all_jobs.html:62
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -472,110 +450,108 @@ msgstr ""
"as últimas 24 horas."
#: templates/maposmatic/all_maps.html:35
-#: templates/maposmatic/base.html:55
+#, fuzzy
+msgid "Search"
+msgstr "procurar"
+
+#: templates/maposmatic/all_maps.html:35
+msgid "Search coming soon!"
+msgstr ""
+
+#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:65
msgid "Maps"
msgstr "Mapas"
-#: templates/maposmatic/all_maps.html:42
-#: templates/maposmatic/job.html:119
-msgid "Thumbnail"
-msgstr "Miniatura"
-
-#: templates/maposmatic/all_maps.html:43
-msgid "Files"
-msgstr "Arquivos"
+#: templates/maposmatic/all_maps.html:40
+msgid "All"
+msgstr ""
-#: templates/maposmatic/all_maps.html:71
-#: templates/maposmatic/job.html:134
-msgid "The generated files are no longer available"
-msgstr "Os arquivos gerados não estão mais disponÃveis"
+#: templates/maposmatic/all_maps.html:49
+#, python-format
+msgid "No map starts with %(current_letter)s in our database!"
+msgstr ""
-#: templates/maposmatic/base.html:49
+#: templates/maposmatic/base.html:53
msgid "Your free city maps!"
msgstr "Seus mapas de cidade livres!"
-#: templates/maposmatic/base.html:54
+#: templates/maposmatic/base.html:64
msgid "Jobs"
msgstr "Trabalhos"
-#: templates/maposmatic/base.html:56
+#: templates/maposmatic/base.html:66
msgid "News"
msgstr "NotÃcias"
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:77
+msgid "Contact"
+msgstr "Contato"
+
+#: templates/maposmatic/base.html:79
+msgid "Mail:"
+msgstr "Email:"
+
+#: templates/maposmatic/base.html:80
+msgid "IRC:"
+msgstr "IRC:"
+
+#: templates/maposmatic/base.html:80
+msgid "on"
+msgstr "no"
+
+#: templates/maposmatic/base.html:85
msgid "Random map"
msgstr "Mapa aleatório"
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:92
msgid "No random map found."
msgstr "Nenhum mapa aleatório encontrado."
-#: templates/maposmatic/base.html:84
+#: templates/maposmatic/base.html:97
msgid "Latest news"
msgstr "Ãltimas notÃcias"
-#: templates/maposmatic/base.html:89
-#, python-format
-msgid ""
-"\n"
-" published %(date)s ago\n"
-" "
+#: templates/maposmatic/base.html:102
+#, fuzzy, python-format
+msgid "published %(date)s ago"
msgstr ""
"\n"
" publicado a %(date)s atrás\n"
" "
-#: templates/maposmatic/base.html:99
-msgid "Contact"
-msgstr "Contato"
-
-#: templates/maposmatic/base.html:101
-msgid "Mail:"
-msgstr "Email:"
-
-#: templates/maposmatic/base.html:102
-msgid "IRC:"
-msgstr "IRC:"
-
-#: templates/maposmatic/base.html:102
-msgid "on"
-msgstr "no"
-
-#: templates/maposmatic/base.html:108
-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!"
+#: templates/maposmatic/index.html:225
+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
+#: templates/maposmatic/index.html:238
msgid "No results found."
msgstr "Nenhum resultado encontrado."
-#: templates/maposmatic/index.html:252
-#: templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:250 templates/maposmatic/index.html:323
msgid "Generate"
msgstr "Gerar"
-#: templates/maposmatic/index.html:258
-#: templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:256 templates/maposmatic/index.html:324
msgid "Please fill in the form before trying to proceed"
msgstr "Por favor preencha o formulário abaixo antes de prosseguir"
-#: templates/maposmatic/index.html:274
+#: templates/maposmatic/index.html:267
msgid "Introduction"
msgstr "Introdução"
-#: templates/maposmatic/index.html:284
+#: templates/maposmatic/index.html:277
msgid "City Map"
msgstr "Mapa da Cidade"
-#: templates/maposmatic/index.html:290
+#: templates/maposmatic/index.html:281
msgid "Streets index"
msgstr "Ãndice de ruas"
-#: templates/maposmatic/index.html:299
+#: templates/maposmatic/index.html:289
msgid ""
"MapOSMatic is a free software web service that\n"
"allows you to generate maps of cities using\n"
@@ -583,18 +559,22 @@ 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;"
+#: templates/maposmatic/index.html:296
+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
+#: templates/maposmatic/index.html:297
msgid "An index of the streets with references to the squares on the map."
msgstr "Um Ãndice das ruas com referências aos quadrados no mapa."
-#: templates/maposmatic/index.html:309
+#: templates/maposmatic/index.html:301
msgid ""
"The generated maps are available in PNG, PDF and\n"
"SVG formats and are ready to be printed."
@@ -602,7 +582,7 @@ msgstr ""
"Os mapas gerados estão disponÃveis nos formatos\n"
"PNG, PDF e SVG e estão prontos para impressão."
-#: templates/maposmatic/index.html:312
+#: templates/maposmatic/index.html:306
msgid ""
"As the data used to generate maps is coming from\n"
"OpenStreetMap, you can freely (under the <a\n"
@@ -612,52 +592,54 @@ 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
+#: templates/maposmatic/index.html:313
msgid "More details"
msgstr "Mais detalhes"
-#: templates/maposmatic/index.html:320
+#: templates/maposmatic/index.html:316
msgid "Generate your own map"
msgstr "Gerar seu próprio mapa"
-#: templates/maposmatic/index.html:327
+#: templates/maposmatic/index.html:320
msgid "Area selection mode:"
msgstr "Modo de seleção de área:"
-#: templates/maposmatic/index.html:339
+#: templates/maposmatic/index.html:334
msgid "City name:"
msgstr "Nome da cidade:"
-#: templates/maposmatic/index.html:342
+#: templates/maposmatic/index.html:338
msgid "search"
msgstr "procurar"
-#: templates/maposmatic/index.html:348
+#: templates/maposmatic/index.html:344
msgid "Title of the map:"
msgstr "TÃtulo do mapa:"
-#: templates/maposmatic/index.html:354
+#: templates/maposmatic/index.html:350
msgid "Bounding box:"
msgstr "Bounding box:"
-#: templates/maposmatic/index.html:366
+#: templates/maposmatic/index.html:361
msgid "Map Index Language:"
msgstr "LÃngua do Ãndice do Mapa:"
-#: templates/maposmatic/index.html:376
+#: templates/maposmatic/index.html:372
msgid ""
"<em>MapOSMatic</em> covers the whole world but we need\n"
"contributors to translate and adapt the few parts of <em>MapOSMatic</em>\n"
"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
+#: templates/maposmatic/index.html:378
msgid ""
"To select the city to be rendered, two modes are\n"
"available:"
@@ -665,7 +647,7 @@ msgstr ""
"Para selecionar a cidade a ser renderizada, \n"
"dois modos estão disponÃveis:"
-#: templates/maposmatic/index.html:385
+#: templates/maposmatic/index.html:383
msgid ""
"<em>Using an administrative boundary</em>. It allows\n"
" to get a map with precise boundaries of the city when such limits are\n"
@@ -677,13 +659,12 @@ msgstr ""
" estiverem disponÃveis no banco de dados. Caso contrário, você
precisará\n"
" usar uma bounding box."
-#: templates/maposmatic/index.html:390
-msgid ""
-"<em>Using a traditional bounding\n"
-" box</em>."
+#: templates/maposmatic/index.html:387
+#, fuzzy
+msgid "<em>Using a traditional bounding box</em>."
msgstr "<em>Usando uma bounding box tradicional</em>."
-#: templates/maposmatic/index.html:395
+#: templates/maposmatic/index.html:391
msgid ""
"Once the rendering is submitted, you will be brought\n"
"to a page giving the status of your rendering request. As soon as the\n"
@@ -696,65 +677,149 @@ msgstr ""
"renderizado (o que pode levar algum tempo dependendo da fila), \n"
"esta página terá o link para o arquivo."
-#: templates/maposmatic/job.html:38
-#, python-format
-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."
+#: templates/maposmatic/job-page.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."
-#: templates/maposmatic/job.html:51
+#: templates/maposmatic/job-page.html:51
msgid "Refresh the status"
msgstr "Atualizar o status"
-#: templates/maposmatic/job.html:56
-msgid "Map title"
-msgstr "TÃtulo do mapa"
+#: templates/maposmatic/job-page.html:51
+msgid ""
+"(the page will refresh automatically every 5 seconds until the rendering is "
+"completed)."
+msgstr ""
-#: templates/maposmatic/job.html:61
-msgid "Administrative city"
-msgstr "Limite administrativo"
+#: templates/maposmatic/job.html:44
+#, fuzzy
+msgid "Rendering: "
+msgstr "Renderização concluÃda com sucesso"
-#: templates/maposmatic/job.html:66
-msgid "Bounding-box coordinates"
-msgstr "Coordenadas de bounding-box"
+#: templates/maposmatic/job.html:45
+#, fuzzy
+msgid "Rendering submitted"
+msgstr "Renderização iniciada em"
-#: templates/maposmatic/job.html:76
-msgid "Status"
-msgstr "Status"
+#: templates/maposmatic/job.html:47
+msgid "In queue, position"
+msgstr ""
-#: templates/maposmatic/job.html:80
-msgid "Submission time"
-msgstr "Data de submissão"
+#: templates/maposmatic/job.html:47
+#, fuzzy
+msgid "estimated completion time"
+msgstr "Tempo estimado para a renderização"
-#: templates/maposmatic/job.html:84
-msgid "Start of rendering time"
-msgstr "Data do começo da renderização"
+#: templates/maposmatic/job.html:49
+msgid "Completed on"
+msgstr ""
-#: templates/maposmatic/job.html:87
-#: templates/maposmatic/job.html.py:100
-msgid "Rendering not started yet"
-msgstr "Renderização ainda não iniciada"
+#: templates/maposmatic/job.html:51
+msgid "Failed on"
+msgstr ""
-#: templates/maposmatic/job.html:94
-msgid "End of rendering time"
-msgstr "Data final de renderização"
+#: templates/maposmatic/job.html:53
+#, python-format
+msgid "rendering took %(rendering)s"
+msgstr ""
-#: templates/maposmatic/job.html:103
-msgid "Rendering not finished yet"
-msgstr "Renderização ainda não terminada"
+#: templates/maposmatic/job.html:55
+#, fuzzy
+msgid "Rendering in progress..."
+msgstr "Renderização em progresso"
-#: templates/maposmatic/job.html:109
-msgid "Current position in queue"
-msgstr "Posição atual na fila"
+#: templates/maposmatic/job.html:61 templates/maposmatic/map.html:45
+#, fuzzy
+msgid "Files: "
+msgstr "Arquivos"
-#: templates/maposmatic/job.html:113
-msgid "Estimated rendering time completion"
-msgstr "Tempo estimado para a renderização"
+#: templates/maposmatic/job.html:63 templates/maposmatic/map.html:47
+#, fuzzy
+msgid "Map: "
+msgstr "Mapas"
+
+#: templates/maposmatic/job.html:64 templates/maposmatic/map.html:48
+msgid "Index: "
+msgstr ""
+
+#: templates/maposmatic/job.html:67 templates/maposmatic/map.html:51
+#, fuzzy
+msgid "The generated files are no longer available."
+msgstr "Os arquivos gerados não estão mais disponÃveis"
+
+#: templates/maposmatic/map.html:42
+#, fuzzy
+msgid "Rendering completed on"
+msgstr "Renderização iniciada em"
+
+#~ msgid "Title"
+#~ msgstr "TÃtulo"
+
+#~ msgid "Location"
+#~ msgstr "Localidade"
+
+#~ msgid "Job status"
+#~ msgstr "Status do trabalho"
+
+#~ msgid "Submission at"
+#~ msgstr "Data de submissão"
+
+#~ msgid "Rendering finished at"
+#~ msgstr "Renderização finalizada em"
+
+#~ msgid "Position in queue"
+#~ msgstr "Posição na fila"
+
+#~ msgid "ETA before rendering"
+#~ msgstr "Tempo estimado antes de renderizar"
+
+#~ msgid "not started"
+#~ msgstr "não iniciado"
+
+#~ msgid "not finished"
+#~ msgstr "não terminado"
+
+#~ msgid "Thumbnail"
+#~ msgstr "Miniatura"
+
+#~ msgid "Language:"
+#~ msgstr "Idioma:"
+
+#~ msgid "Map <i>%(job_t)s</i> Status"
+#~ msgstr "Statusw do mapa <i>%(job_t)s</i>"
+
+#~ msgid "Map title"
+#~ msgstr "TÃtulo do mapa"
+
+#~ msgid "Administrative city"
+#~ msgstr "Limite administrativo"
+
+#~ msgid "Bounding-box coordinates"
+#~ msgstr "Coordenadas de bounding-box"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Submission time"
+#~ msgstr "Data de submissão"
+
+#~ msgid "Start of rendering time"
+#~ msgstr "Data do começo da renderização"
+
+#~ msgid "Rendering not started yet"
+#~ msgstr "Renderização ainda não iniciada"
+
+#~ msgid "End of rendering time"
+#~ msgstr "Data final de renderização"
+
+#~ msgid "Rendering not finished yet"
+#~ msgstr "Renderização ainda não terminada"
-#: templates/maposmatic/job.html:127
-msgid "Result files"
-msgstr "Arquivos gerados"
+#~ msgid "Current position in queue"
+#~ msgstr "Posição atual na fila"
+#~ msgid "Result files"
+#~ msgstr "Arquivos gerados"
diff --git a/www/locale/ru/LC_MESSAGES/django.po
b/www/locale/ru/LC_MESSAGES/django.po
index df0b1f5..6827032 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: 2010-01-07 13:05+0100\n"
+"POT-Creation-Date: 2010-01-08 16:33+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:147
+#: settings.py:152
msgid "No localization"
msgstr "Ðез локализаÑии"
@@ -94,7 +94,7 @@ 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:63
msgid "Home"
msgstr "Ðомой"
@@ -130,11 +130,11 @@ 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:67
msgid "About"
msgstr "Ð ÑеÑвиÑе"
-#: templates/maposmatic/about.html:37
+#: templates/maposmatic/about.html:36
msgid "History"
msgstr "ÐÑÑоÑиÑ"
@@ -165,21 +165,22 @@ msgstr ""
"благодаÑÐ¸Ñ Gilles\n"
"за Ñо ÑÑо он поделилÑÑ Ñвоей идеей!"
-#: templates/maposmatic/about.html:51
+#: templates/maposmatic/about.html:53
+#, fuzzy
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\n"
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\";>AGPLv3</a>.\n"
msgstr ""
"ÐонеÑно, MapOSMatic полноÑÑÑÑ Ñвободное
пÑогÑаммное обеÑпеÑение,\n"
"ÑаÑпÑоÑÑÑанÑемое по <a
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.";
"html\">AGPLv3</a>."
-#: templates/maposmatic/about.html:54
+#: templates/maposmatic/about.html:60
msgid "How does it work?"
msgstr "Ðак ÑÑо ÑабоÑаеÑ?"
-#: templates/maposmatic/about.html:56
+#: templates/maposmatic/about.html:63
msgid ""
"On our server, we run a <a\n"
"href=\"http://www.postgresql.org\";>PostgreSQL</a> server, with the <a\n"
@@ -207,7 +208,7 @@ msgstr ""
"даннÑÑ
, ÑÑо позволÑÐµÑ Ð½Ð°Ð¼ поддеÑживаÑÑ Ð²
акÑÑалÑном ÑоÑÑоÑнии наÑÑ Ð±Ð°Ð·Ñ,\n"
"загÑÑÐ¶Ð°Ñ Ð¿Ð¾Ñление Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² OpenStreetMap."
-#: templates/maposmatic/about.html:68
+#: 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"
@@ -228,7 +229,7 @@ msgstr ""
"модÑлÑ\n"
"<i>OCitySMap</i>, коÑоÑÑй:"
-#: templates/maposmatic/about.html:78
+#: templates/maposmatic/about.html:87
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
@@ -236,7 +237,7 @@ msgstr ""
"ÐÑÑиÑовÑÐ²Ð°ÐµÑ ÐºÐ°ÑÑÑ Ð¸ÑполÑзÑÑ Ð´Ð°Ð½Ð½Ñе
OpenStreetMap и\n"
" ÑаблиÑÑ ÑÑилей OpenStreetMap Ð´Ð»Ñ Mapnik;"
-#: templates/maposmatic/about.html:81
+#: templates/maposmatic/about.html:89
msgid ""
"Renders on top of the map, using Mapnik, the grid\n"
" of 500 meters squares, the labels of the squares, and a few other\n"
@@ -247,7 +248,7 @@ msgstr ""
" по 500 меÑÑов, обознаÑÐµÐ½Ð¸Ñ ÐºÐ²Ð°Ð´ÑаÑов и
некоÑоÑÑÑ Ð´ÑÑгÑÑ\n"
" инÑоÑмаÑÐ¸Ñ Ð¾ каÑÑе (копиÑайÑ, маÑÑÑаб и
Ñ.д.)"
-#: templates/maposmatic/about.html:86
+#: templates/maposmatic/about.html:93
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
@@ -255,7 +256,7 @@ msgstr ""
"ÐÐµÐ»Ð°ÐµÑ ÑеÑÑм облаÑÑÑ Ð·Ð° гÑаниÑей гоÑода,
еÑли мÑ\n"
" найдем ÑÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑивнÑÑ Ð³ÑаниÑÑ."
-#: templates/maposmatic/about.html:89
+#: 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"
@@ -264,7 +265,7 @@ msgstr ""
"ÐÑÑиÑовÑÐ²Ð°ÐµÑ ÑказаÑÐµÐ»Ñ ÑлиÑ, оÑнованнÑй
на даннÑÑ
из\n"
" OpenStreetMap и пеÑеÑеÑенÑÑ
ÑÐ»Ð¸Ñ Ñ ÐºÐ²Ð°Ð´ÑаÑами
каÑÑÑ."
-#: templates/maposmatic/about.html:95
+#: templates/maposmatic/about.html:101
msgid ""
"This Python module can be used through a command-line\n"
"tool provided with OCitySMap, so everyone can run its own city-map\n"
@@ -282,7 +283,7 @@ msgstr ""
"гоÑодов\n"
"из OpenStreetMap."
-#: templates/maposmatic/about.html:102
+#: templates/maposmatic/about.html:110
msgid ""
"This web service has been called <i>MapOSMatic</i>,\n"
"like <i>map-o-matic</i> but with a reference to OpenStreetMap (OSM). The\n"
@@ -305,7 +306,7 @@ msgstr ""
"одновÑеменно, ÑÑо оÑÐµÐ½Ñ Ð²Ð°Ð¶Ð½Ð¾, Ñак как
пÑоÑеÑÑ Ð¾ÑÑиÑовки инÑенÑивно\n"
"иÑполÑзÑÐµÑ Ð¦Ð Ð¸ ÑиÑÑÐµÐ¼Ñ Ð²Ð²Ð¾Ð´Ð°/вÑвода."
-#: templates/maposmatic/about.html:112
+#: templates/maposmatic/about.html:122
msgid ""
"For the city search engine, we use the wonderful <a\n"
"href=\"http://nominatim.openstreetmap.org\";>Nominatim</a> service. This\n"
@@ -319,11 +320,11 @@ msgstr ""
"Ð¼ÐµÐ¶Ð´Ñ Ð½ÐµÑколÑкими гоÑодами Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñм
названием,\n"
"показÑваÑÑий ÑаÑположение гоÑодов."
-#: templates/maposmatic/about.html:118
+#: templates/maposmatic/about.html:130
msgid "Contributing"
msgstr "УÑаÑÑие в ÑазÑабоÑке"
-#: templates/maposmatic/about.html:120
+#: templates/maposmatic/about.html:133
msgid ""
"As stated above, both <i>OCitySMap</i> and\n"
"<i>MapOSMatic</i> are fully free software, so you're invited to\n"
@@ -335,7 +336,7 @@ msgstr ""
"Ñак ÑÑо пÑиглаÑаем пÑинÑÑÑ ÑÑаÑÑие в
ÑазÑабоÑке. Ðак Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе помоÑÑ\n"
"нам:"
-#: templates/maposmatic/about.html:127
+#: templates/maposmatic/about.html:140
msgid ""
"The <a\n"
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>project on\n"
@@ -345,7 +346,7 @@ msgstr ""
" href=\"https://savannah.nongnu.org/projects/maposmatic/\";>ÐÑоекÑ
на\n"
" Savannah</a>;"
-#: templates/maposmatic/about.html:131
+#: templates/maposmatic/about.html:143
msgid ""
"The <a\n"
" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev";
@@ -357,21 +358,23 @@ msgstr ""
"ÑаÑÑÑлки\n"
" поÑвÑÑеннÑй ÑазÑабоÑке</a>;"
-#: templates/maposmatic/about.html:135
+#: templates/maposmatic/about.html:146
+#, fuzzy
msgid ""
-"The IRC channel <code>#maposmatic</code> on\n"
+"The IRC channel <tt>#maposmatic</tt> on\n"
" Freenode;"
msgstr ""
"IRC-канал <code>#maposmatic</code> в ÑеÑи\n"
" Freenode;"
-#: templates/maposmatic/about.html:138
+#: templates/maposmatic/about.html:148
+#, fuzzy
msgid ""
"The <a\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>;"
+" 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-"
@@ -379,12 +382,13 @@ msgstr ""
" </a>, коÑоÑÑй можно ÑклониÑоваÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹\n"
" <code>git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
-#: templates/maposmatic/about.html:143
+#: templates/maposmatic/about.html:152
+#, fuzzy
msgid ""
"The <a\n"
" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>MapOSMatic\n"
" Git repository</a>, which can be cloned using\n"
-" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
+" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
msgstr ""
"<a\n"
"
href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\";>Git-ÑепозиÑаÑий
"
@@ -392,7 +396,7 @@ msgstr ""
" </a>, коÑоÑÑй можно ÑклониÑоваÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹\n"
" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
-#: templates/maposmatic/about.html:148
+#: templates/maposmatic/about.html:156
msgid ""
"<a\n"
" href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-list\n"
@@ -402,11 +406,11 @@ msgstr ""
"
href=\"https://savannah.nongnu.org/task/?group=maposmatic\";>TODO-ÑпиÑок\n"
" и идеи</a>."
-#: templates/maposmatic/about.html:154
+#: templates/maposmatic/about.html:163
msgid "Authors"
msgstr "ÐвÑоÑÑ"
-#: templates/maposmatic/about.html:166
+#: templates/maposmatic/about.html:174
msgid "Contributors"
msgstr "СоавÑоÑÑ"
@@ -414,7 +418,7 @@ msgstr "СоавÑоÑÑ"
msgid "Job list"
msgstr "СпиÑок заданий"
-#: templates/maposmatic/all_jobs.html:42
+#: templates/maposmatic/all_jobs.html:41
msgid ""
"This page gives the status of all the rendering\n"
"requests received during the last 24 hours, starting from the most\n"
@@ -423,23 +427,23 @@ msgstr ""
"ÐÑа ÑÑÑаниÑа показÑÐ²Ð°ÐµÑ ÑоÑÑоÑние вÑеÑ
запÑоÑов на оÑÑиÑовкÑ,\n"
"полÑÑеннÑÑ
за поÑледние 24 ÑаÑа, наÑÐ¸Ð½Ð°Ñ Ñ
Ñамого нового."
-#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:57
+#: templates/maposmatic/all_jobs.html:54 templates/maposmatic/all_maps.html:57
msgid "Previous"
msgstr "ÐÑедÑдÑÑаÑ"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "Page"
msgstr "СÑÑаниÑа"
-#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:61
+#: templates/maposmatic/all_jobs.html:55 templates/maposmatic/all_maps.html:61
msgid "of"
msgstr "из"
-#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:65
+#: templates/maposmatic/all_jobs.html:56 templates/maposmatic/all_maps.html:65
msgid "Next"
msgstr "СледÑÑÑаÑ"
-#: templates/maposmatic/all_jobs.html:71
+#: templates/maposmatic/all_jobs.html:62
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -456,7 +460,7 @@ msgstr "поиÑк"
msgid "Search coming soon!"
msgstr ""
-#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:37 templates/maposmatic/base.html:65
msgid "Maps"
msgstr "ÐаÑÑÑ"
@@ -469,62 +473,55 @@ msgstr ""
msgid "No map starts with %(current_letter)s in our database!"
msgstr ""
-#: templates/maposmatic/base.html:49
+#: templates/maposmatic/base.html:53
msgid "Your free city maps!"
msgstr "ÐаÑи ÑвободнÑе каÑÑÑ Ð³Ð¾Ñодов!"
-#: templates/maposmatic/base.html:54
+#: templates/maposmatic/base.html:64
msgid "Jobs"
msgstr "ÐаданиÑ"
-#: templates/maposmatic/base.html:56
+#: templates/maposmatic/base.html:66
msgid "News"
msgstr "ÐовоÑÑи"
-#: templates/maposmatic/base.html:69
+#: templates/maposmatic/base.html:77
+msgid "Contact"
+msgstr "СвÑзаÑÑÑÑ"
+
+#: templates/maposmatic/base.html:79
+msgid "Mail:"
+msgstr "ÐоÑÑа:"
+
+#: templates/maposmatic/base.html:80
+msgid "IRC:"
+msgstr "IRC:"
+
+#: templates/maposmatic/base.html:80
+msgid "on"
+msgstr "вкл"
+
+#: templates/maposmatic/base.html:85
msgid "Random map"
msgstr "СлÑÑÐ°Ð¹Ð½Ð°Ñ ÐºÐ°ÑÑа"
-#: templates/maposmatic/base.html:79
+#: templates/maposmatic/base.html:92
msgid "No random map found."
msgstr "Ðе найдено ÑлÑÑайной каÑÑÑ."
-#: templates/maposmatic/base.html:84
+#: templates/maposmatic/base.html:97
msgid "Latest news"
msgstr "ÐоÑледние новоÑÑи"
-#: templates/maposmatic/base.html:89
-#, python-format
-msgid ""
-"\n"
-" published %(date)s ago\n"
-" "
+#: templates/maposmatic/base.html:102
+#, fuzzy, python-format
+msgid "published %(date)s ago"
msgstr ""
"\n"
" опÑбликовано %(date)s назад\n"
" "
-#: templates/maposmatic/base.html:99
-msgid "Contact"
-msgstr "СвÑзаÑÑÑÑ"
-
-#: templates/maposmatic/base.html:101
-msgid "Mail:"
-msgstr "ÐоÑÑа:"
-
-#: templates/maposmatic/base.html:102
-msgid "IRC:"
-msgstr "IRC:"
-
-#: templates/maposmatic/base.html:102
-msgid "on"
-msgstr "вкл"
-
-#: templates/maposmatic/base.html:108
-msgid "Language:"
-msgstr "ЯзÑк:"
-
-#: templates/maposmatic/index.html:227
+#: templates/maposmatic/index.html:225
msgid ""
"This place cannot be rendered by MapOSMatic, administrative boundary "
"missing. Please contribute !"
@@ -532,31 +529,31 @@ msgstr ""
"ÐÑо меÑÑо не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾ÑÑиÑовано MapOSMatic,
оÑÑÑÑÑÑвÑÐµÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑÐ¸Ð²Ð½Ð°Ñ "
"гÑаниÑа. ÐожалÑйÑÑа, оÑмеÑÑÑе ее на
OpenStreetMap!"
-#: templates/maposmatic/index.html:240
+#: templates/maposmatic/index.html:238
msgid "No results found."
msgstr "РезÑлÑÑаÑов не найдено."
-#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:250 templates/maposmatic/index.html:323
msgid "Generate"
msgstr "СоздаÑÑ"
-#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:256 templates/maposmatic/index.html:324
msgid "Please fill in the form before trying to proceed"
msgstr "ÐожалÑйÑÑа, заполниÑе ÑоÑмÑ"
-#: templates/maposmatic/index.html:274
+#: templates/maposmatic/index.html:267
msgid "Introduction"
msgstr "Ðведение"
-#: templates/maposmatic/index.html:284
+#: templates/maposmatic/index.html:277
msgid "City Map"
msgstr "ÐаÑÑа гоÑода"
-#: templates/maposmatic/index.html:290
+#: templates/maposmatic/index.html:281
msgid "Streets index"
msgstr "УказаÑÐµÐ»Ñ ÑлиÑ"
-#: templates/maposmatic/index.html:299
+#: templates/maposmatic/index.html:289
msgid ""
"MapOSMatic is a free software web service that\n"
"allows you to generate maps of cities using\n"
@@ -569,16 +566,16 @@ msgstr ""
"гоÑода\n"
"вклÑÑÐ°ÐµÑ Ð´Ð²Ðµ ÑÑÑаниÑÑ:"
-#: templates/maposmatic/index.html:305
+#: templates/maposmatic/index.html:296
msgid ""
"The map itself, splitted in squares allowing to easily look for streets;"
msgstr "Сама каÑÑа, ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ Ð½Ð° квадÑаÑÑ,
позволÑÑÑие наÑ
одиÑÑ ÑлиÑÑ."
-#: templates/maposmatic/index.html:306
+#: templates/maposmatic/index.html:297
msgid "An index of the streets with references to the squares on the map."
msgstr "УказаÑÐµÐ»Ñ ÑÐ»Ð¸Ñ Ñо ÑÑÑлками на
квадÑаÑÑ ÐºÐ°ÑÑÑ."
-#: templates/maposmatic/index.html:309
+#: templates/maposmatic/index.html:301
msgid ""
"The generated maps are available in PNG, PDF and\n"
"SVG formats and are ready to be printed."
@@ -586,7 +583,7 @@ msgstr ""
"СгенеÑиÑованнÑе каÑÑÑ Ð´Ð¾ÑÑÑÐ¿Ð½Ñ Ð² ÑоÑмаÑаÑ
PNG, PDF и\n"
"SVG и гоÑÐ¾Ð²Ñ Ð´Ð»Ñ Ð¿ÐµÑаÑи."
-#: templates/maposmatic/index.html:312
+#: templates/maposmatic/index.html:306
msgid ""
"As the data used to generate maps is coming from\n"
"OpenStreetMap, you can freely (under the <a\n"
@@ -601,39 +598,39 @@ msgstr ""
"иÑполÑзоваÑÑ, пÑодаваÑÑ, модиÑиÑиÑоваÑÑ,
... ÑгенеÑиÑованнÑе\n"
"каÑÑÑ."
-#: templates/maposmatic/index.html:318
+#: templates/maposmatic/index.html:313
msgid "More details"
msgstr "ÐодÑобнее"
-#: templates/maposmatic/index.html:320
+#: templates/maposmatic/index.html:316
msgid "Generate your own map"
msgstr "СоздайÑе ваÑÑ ÐºÐ°ÑÑÑ"
-#: templates/maposmatic/index.html:327
+#: templates/maposmatic/index.html:320
msgid "Area selection mode:"
msgstr "Режим вÑбоÑа облаÑÑи:"
-#: templates/maposmatic/index.html:339
+#: templates/maposmatic/index.html:334
msgid "City name:"
msgstr "Ðазвание гоÑода:"
-#: templates/maposmatic/index.html:342
+#: templates/maposmatic/index.html:338
msgid "search"
msgstr "поиÑк"
-#: templates/maposmatic/index.html:348
+#: templates/maposmatic/index.html:344
msgid "Title of the map:"
msgstr "Ðаголовок каÑÑÑ:"
-#: templates/maposmatic/index.html:354
+#: templates/maposmatic/index.html:350
msgid "Bounding box:"
msgstr "ÐÑÑмоÑголÑÐ½Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑÑ:"
-#: templates/maposmatic/index.html:366
+#: templates/maposmatic/index.html:361
msgid "Map Index Language:"
msgstr "ЯзÑк ÑказаÑÐµÐ»Ñ ÐºÐ°ÑÑÑ:"
-#: templates/maposmatic/index.html:376
+#: templates/maposmatic/index.html:372
msgid ""
"<em>MapOSMatic</em> covers the whole world but we need\n"
"contributors to translate and adapt the few parts of <em>MapOSMatic</em>\n"
@@ -644,7 +641,7 @@ msgstr ""
"<em>MapOSMatic</em>,\n"
"коÑоÑÑе ÑпеÑиÑиÑÐ½Ñ Ð´Ð»Ñ Ð¾ÑделÑнÑÑ
ÑÑÑан."
-#: templates/maposmatic/index.html:380
+#: templates/maposmatic/index.html:378
msgid ""
"To select the city to be rendered, two modes are\n"
"available:"
@@ -652,7 +649,7 @@ msgstr ""
"ÐоÑÑÑÐ¿Ð½Ñ Ð´Ð²Ð° Ñежима вÑбоÑа гоÑода,
коÑоÑÑй бÑдеÑ\n"
"оÑÑиÑовÑваÑÑÑÑ:"
-#: templates/maposmatic/index.html:385
+#: templates/maposmatic/index.html:383
msgid ""
"<em>Using an administrative boundary</em>. It allows\n"
" to get a map with precise boundaries of the city when such limits are\n"
@@ -664,15 +661,14 @@ msgstr ""
" РпÑоÑивном ÑлÑÑае вам понадобиÑÑÑ
иÑполÑзоваÑÑ Ð¿ÑÑмоÑголÑнÑÑ\n"
" облаÑÑÑ."
-#: templates/maposmatic/index.html:390
-msgid ""
-"<em>Using a traditional bounding\n"
-" box</em>."
+#: templates/maposmatic/index.html:387
+#, fuzzy
+msgid "<em>Using a traditional bounding box</em>."
msgstr ""
"<em>ÐÑполÑзÑÑ ÑÑадиÑионнÑй пÑÑмоÑголÑник\n"
" облаÑÑи</em>."
-#: templates/maposmatic/index.html:395
+#: templates/maposmatic/index.html:391
msgid ""
"Once the rendering is submitted, you will be brought\n"
"to a page giving the status of your rendering request. As soon as the\n"
@@ -765,6 +761,9 @@ msgstr "СгенеÑиÑованнÑе ÑайлÑ
болÑÑе не доÑÑÑп
msgid "Rendering completed on"
msgstr "ÐÑÑиÑовка запÑÑена"
+#~ msgid "Language:"
+#~ msgstr "ЯзÑк:"
+
#~ msgid "Title"
#~ msgstr "Ðазвание"
--
1.6.3.3.261.g85c6
- [Maposmatic-dev] [PATCH 01/24] Revamp the jobs and maps pages, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 02/24] Updated PO files for the UI revamp., Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 03/24] Add by-letter maps pagination, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 04/24] Make the ITEMS_PER_PAGE settings local., Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 05/24] Add an 'All' link in the letter selection., Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 06/24] Update translation files, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 07/24] French terminoly improvements, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 08/24] New header background, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 09/24] Complete site-wide UI overhaul., Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 10/24] Updated translations to follow the small changes made during the redesign.,
Maxime Petazzoni <=
- [Maposmatic-dev] [PATCH 11/24] Small typographic fix, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 12/24] Add a link on the header, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 13/24] HTML fixes, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 14/24] New automatic suggestion mechanism, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 15/24] Restored the two columns layout., Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 16/24] Put the map generation form on its own page, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 17/24] PO file update for UI changes. French is translated, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 18/24] More work on the form behavior, added info note for unselectable items, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 19/24] Cleanup and comment the suggest JS code, Maxime Petazzoni, 2010/01/10
- [Maposmatic-dev] [PATCH 20/24] Removed JQuery from the main page, it's not needed there, Maxime Petazzoni, 2010/01/10