[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH 02/24] Updated PO files for the UI revamp.
From: |
Maxime Petazzoni |
Subject: |
[Maposmatic-dev] [PATCH 02/24] Updated PO files for the UI revamp. |
Date: |
Sun, 10 Jan 2010 15:53:56 +0100 |
French is already translated. Other languages need sync ASAP.
---
www/locale/ar/LC_MESSAGES/django.po | 256 ++++++++++++------------
www/locale/ca/LC_MESSAGES/django.po | 239 ++++++++++++----------
www/locale/de/LC_MESSAGES/django.po | 383 ++++++++++++++++++++---------------
www/locale/fr/LC_MESSAGES/django.po | 168 ++++++----------
www/locale/it/LC_MESSAGES/django.po | 203 +++++++++----------
www/locale/ru/LC_MESSAGES/django.po | 352 ++++++++++++++++++--------------
6 files changed, 849 insertions(+), 752 deletions(-)
diff --git a/www/locale/ar/LC_MESSAGES/django.po
b/www/locale/ar/LC_MESSAGES/django.po
index 269e31e..89086a4 100644
--- a/www/locale/ar/LC_MESSAGES/django.po
+++ b/www/locale/ar/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-05 21:38+0100\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
"PO-Revision-Date: 2010-01-06 09:03+0300\n"
"Last-Translator: Bassem JARKAS <address@hidden>\n"
"Language-Team: Arabic Translation\n"
-"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Virtaal 0.5.0\n"
-#: settings.py:139
+#: settings.py:147
msgid "No localization"
msgstr "Ùا ÙÙجد ترجÙ
Ø©"
-#: maposmatic/models.py:144
+#: maposmatic/models.py:146
#, python-format
msgid "%(title)s %(format)s Map"
msgstr "خرÙطة %(title)s %(format)s"
-#: maposmatic/models.py:149
+#: maposmatic/models.py:150
#, python-format
msgid "%(title)s %(format)s Index"
msgstr "ÙÙرس %(title)s %(format)s"
@@ -78,9 +78,7 @@ msgid "Rendering successful"
msgstr "ÙØ¬Ø Ø§Ùعرض"
#: maposmatic/templatetags/extratags.py:47
-msgid ""
-"Rendering failed, please contact <a "
-"href=\"mailto:address@hidden">address@hidden</a>"
+msgid "Rendering failed, please contact address@hidden"
msgstr ""
#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:53
@@ -134,8 +132,8 @@ msgid ""
"href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and free\n"
"software contributor of Rennes area, France. From his idea, a group of\n"
"crazy <a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%"
-"29\">hackers</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29"
+"\">hackers</a>\n"
"met together during a one-week <em>Hackfest</em> in August 2009 and\n"
"brought the idea of Gilles Lamiral to life by writing the code and\n"
"named the project <strong>MapOSMatic</strong>. The group of crazy\n"
@@ -146,8 +144,8 @@ msgstr ""
#: templates/maposmatic/about.html:51
msgid ""
"Of course, MapOSMatic is fully free software,\n"
-"licensed under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPLv3</a>."
+"licensed under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0."
+"html\">AGPLv3</a>."
msgstr ""
#: templates/maposmatic/about.html:54
@@ -174,8 +172,8 @@ msgid ""
"For the map rendering, we use the\n"
"famous <a href=\"http://www.mapnik.org\">Mapnik</a> with the OpenStreetMap\n"
"stylesheet\n"
-"available <a "
-"href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\">in\n"
+"available <a href=\"http://svn.openstreetmap.org/applications/rendering/"
+"mapnik\">in\n"
"OpenStreetMap Subversion repository</a>. Using Mapnik\n"
"and <a href=\"http://cairographics.org/pycairo/\">Cairo</a>, we\n"
"built <i>OCitySMap</i>, a Python module that:"
@@ -262,7 +260,8 @@ msgstr ""
#: templates/maposmatic/about.html:131
msgid ""
"The <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">development\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev"
+"\">development\n"
" mailing-list</a>;"
msgstr ""
@@ -275,7 +274,8 @@ msgstr ""
#: templates/maposmatic/about.html:138
msgid ""
"The <a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git"
+"\">OCitySMap\n"
" Git repository</a>, which can be cloned using <code>git clone\n"
" git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
msgstr ""
@@ -314,63 +314,23 @@ msgid ""
"recent one."
msgstr ""
-#: templates/maposmatic/all_jobs.html:49 templates/maposmatic/all_maps.html:40
-msgid "Title"
-msgstr "اÙعÙÙاÙ"
-
-#: templates/maposmatic/all_jobs.html:50 templates/maposmatic/all_maps.html:41
-msgid "Location"
-msgstr "اÙÙ
ÙÙع"
-
-#: templates/maposmatic/all_jobs.html:51
-msgid "Job status"
-msgstr "ØاÙØ© اÙÙ
ÙÙ
Ø©"
-
-#: templates/maposmatic/all_jobs.html:52
-msgid "Submission at"
-msgstr "Ø£Ùرس٠ÙÙ"
-
-#: templates/maposmatic/all_jobs.html:53
-msgid "Rendering started at"
-msgstr "بدأ اÙعرض ÙÙ"
-
-#: templates/maposmatic/all_jobs.html:54
-msgid "Rendering finished at"
-msgstr "اÙتÙ٠اÙعرض ÙÙ"
-
-#: templates/maposmatic/all_jobs.html:55
-msgid "Position in queue"
-msgstr "اÙÙ
Ùضع Ù٠اÙاÙتظار"
-
-#: templates/maposmatic/all_jobs.html:78
-msgid "not started"
-msgstr "ÙÙ
Ùبدأ"
-
-#: templates/maposmatic/all_jobs.html:87
-msgid "not finished"
-msgstr "ÙÙ
ÙÙتÙ"
-
-#: templates/maposmatic/all_jobs.html:103
-#: templates/maposmatic/all_maps.html:82
+#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:47
msgid "Previous"
msgstr "اÙسابÙ"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "Page"
msgstr "اÙصÙØØ©"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "of"
msgstr "Ù
Ù"
-#: templates/maposmatic/all_jobs.html:111
-#: templates/maposmatic/all_maps.html:90
+#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:55
msgid "Next"
msgstr "اÙتاÙÙ"
-#: templates/maposmatic/all_jobs.html:117
+#: templates/maposmatic/all_jobs.html:71
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -380,18 +340,6 @@ msgstr ""
msgid "Maps"
msgstr "اÙخرائط"
-#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:126
-msgid "Thumbnail"
-msgstr "Ù
صغرة"
-
-#: templates/maposmatic/all_maps.html:43
-msgid "Files"
-msgstr "اÙÙ
ÙÙات"
-
-#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:141
-msgid "The generated files are no longer available"
-msgstr "اÙÙ
ÙÙات اÙت٠تÙ
Ø¥ÙشاؤÙا ÙÙ
تعد Ù
تÙÙرة"
-
#: templates/maposmatic/base.html:49
msgid "Your free city maps!"
msgstr "خرائط Ù
دÙÙت٠اÙØرة!"
@@ -589,79 +537,137 @@ msgstr ""
"اÙتÙ
ا٠اÙعرض (ÙاÙØ°Ù Ùد Ùأخذ بعض اÙÙÙت اعتÙ
ادÙا عÙÙ Ø·Ù٠طابÙر اÙاÙتظار) ÙØ¥Ù "
"Ùذ٠اÙصÙØØ© ستØتÙ٠عÙÙ ÙصÙات اÙخرÙطة اÙÙ
ÙÙÙدة."
-#: templates/maposmatic/job.html:38
-#, python-format
-msgid "Map <i>%(job_t)s</i> Status"
+#: templates/maposmatic/job-page.html:43
+msgid ""
+"You have been redirected to a similar map, rendered less than 24 hours ago."
msgstr ""
-#: templates/maposmatic/job.html:44
+#: templates/maposmatic/job-page.html:51
+msgid "Refresh the status"
+msgstr "ØدÙØ« اÙØاÙØ©"
+
+#: templates/maposmatic/job-page.html:51
msgid ""
-"You have been redirected to a similar map, rendered less than 24 hours ago."
+"(the page will refresh automatically every 5 seconds until the rendering is "
+"completed)."
+msgstr ""
+
+#: templates/maposmatic/job.html:44
+#, fuzzy
+msgid "Rendering: "
+msgstr "ÙØ¬Ø Ø§Ùعرض"
+
+#: templates/maposmatic/job.html:45
+#, fuzzy
+msgid "Rendering submitted"
+msgstr "بدأ اÙعرض ÙÙ"
+
+#: templates/maposmatic/job.html:47
+msgid "In queue, position"
msgstr ""
#: templates/maposmatic/job.html:47
-msgid ""
-"You have been redirected to a similar rendering request, submitted less than "
-"24 hours ago. This request failed and we therefore prevent running the same "
-"request again. Please contact us at <a href="
+msgid "estimated completion time"
msgstr ""
-#: templates/maposmatic/job.html:50
-msgid ""
-"You have been redirected to a similar rendering request, submitted less than "
-"24 hours ago, and currently waiting to be processed."
+#: templates/maposmatic/job.html:49
+msgid "Completed on"
+msgstr ""
+
+#: templates/maposmatic/job.html:51
+msgid "Failed on"
msgstr ""
#: templates/maposmatic/job.html:53
-msgid ""
-"You have been redirected to a similar rendering request, submitted less than "
-"24 hours ago, and currently being processed."
+#, python-format
+msgid "rendering took %(rendering)s"
msgstr ""
-#: templates/maposmatic/job.html:62
-msgid "Refresh the status"
-msgstr "ØدÙØ« اÙØاÙØ©"
+#: templates/maposmatic/job.html:55
+#, fuzzy
+msgid "Rendering in progress..."
+msgstr "جار٠اÙعرض"
+
+#: templates/maposmatic/job.html:61 templates/maposmatic/map.html:45
+#, fuzzy
+msgid "Files: "
+msgstr "اÙÙ
ÙÙات"
+
+#: templates/maposmatic/job.html:63 templates/maposmatic/map.html:47
+#, fuzzy
+msgid "Map: "
+msgstr "اÙخرائط"
+
+#: 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 "اÙÙ
ÙÙات اÙت٠تÙ
Ø¥ÙشاؤÙا ÙÙ
تعد Ù
تÙÙرة"
+
+#: templates/maposmatic/map.html:42
+#, fuzzy
+msgid "Rendering completed on"
+msgstr "بدأ اÙعرض ÙÙ"
+
+#~ msgid "Title"
+#~ msgstr "اÙعÙÙاÙ"
+
+#~ msgid "Location"
+#~ msgstr "اÙÙ
ÙÙع"
+
+#~ msgid "Job status"
+#~ msgstr "ØاÙØ© اÙÙ
ÙÙ
Ø©"
+
+#~ msgid "Submission at"
+#~ msgstr "Ø£Ùرس٠ÙÙ"
+
+#~ msgid "Rendering finished at"
+#~ msgstr "اÙتÙ٠اÙعرض ÙÙ"
+
+#~ msgid "Position in queue"
+#~ msgstr "اÙÙ
Ùضع Ù٠اÙاÙتظار"
+
+#~ msgid "not started"
+#~ msgstr "ÙÙ
Ùبدأ"
+
+#~ msgid "not finished"
+#~ msgstr "ÙÙ
ÙÙتÙ"
+
+#~ msgid "Thumbnail"
+#~ msgstr "Ù
صغرة"
-#: templates/maposmatic/job.html:67
-msgid "Map title"
-msgstr "عÙÙا٠اÙخرÙطة"
+#~ msgid "Map title"
+#~ msgstr "عÙÙا٠اÙخرÙطة"
-#: templates/maposmatic/job.html:72
-msgid "Administrative city"
-msgstr "Ù
دÙÙØ© إدارÙØ©"
+#~ msgid "Administrative city"
+#~ msgstr "Ù
دÙÙØ© إدارÙØ©"
-#: templates/maposmatic/job.html:77
-msgid "Bounding-box coordinates"
-msgstr "Ø¥ØداثÙات Ù
ربع اÙØ¥Øاطة"
+#~ msgid "Bounding-box coordinates"
+#~ msgstr "Ø¥ØداثÙات Ù
ربع اÙØ¥Øاطة"
-#: templates/maposmatic/job.html:87
-msgid "Status"
-msgstr "اÙØاÙØ©"
+#~ msgid "Status"
+#~ msgstr "اÙØاÙØ©"
-#: templates/maposmatic/job.html:91
-msgid "Submission time"
-msgstr "ÙÙت اÙإرساÙ"
+#~ msgid "Submission time"
+#~ msgstr "ÙÙت اÙإرساÙ"
-#: templates/maposmatic/job.html:95
-msgid "Start of rendering time"
-msgstr "ÙÙت بدء اÙعرض"
+#~ msgid "Start of rendering time"
+#~ msgstr "ÙÙت بدء اÙعرض"
-#: templates/maposmatic/job.html:98 templates/maposmatic/job.html.py:111
-msgid "Rendering not started yet"
-msgstr "اÙعرض ÙÙ
Ùبدأ بعد"
+#~ msgid "Rendering not started yet"
+#~ msgstr "اÙعرض ÙÙ
Ùبدأ بعد"
-#: templates/maposmatic/job.html:105
-msgid "End of rendering time"
-msgstr "ÙÙت ÙÙاÙØ© اÙعرض"
+#~ msgid "End of rendering time"
+#~ msgstr "ÙÙت ÙÙاÙØ© اÙعرض"
-#: templates/maposmatic/job.html:114
-msgid "Rendering not finished yet"
-msgstr "اÙعرض ÙÙ
ÙÙت٠بعد"
+#~ msgid "Rendering not finished yet"
+#~ msgstr "اÙعرض ÙÙ
ÙÙت٠بعد"
-#: templates/maposmatic/job.html:120
-msgid "Current position in queue"
-msgstr "اÙÙ
Ùضع اÙØاÙÙ Ù٠اÙاÙتظار"
+#~ msgid "Current position in queue"
+#~ msgstr "اÙÙ
Ùضع اÙØاÙÙ Ù٠اÙاÙتظار"
-#: templates/maposmatic/job.html:134
-msgid "Result files"
-msgstr "Ù
ÙÙات اÙÙتÙجة"
+#~ msgid "Result files"
+#~ msgstr "Ù
ÙÙات اÙÙتÙجة"
diff --git a/www/locale/ca/LC_MESSAGES/django.po
b/www/locale/ca/LC_MESSAGES/django.po
index b490334..7617ee8 100644
--- a/www/locale/ca/LC_MESSAGES/django.po
+++ b/www/locale/ca/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-05 22:05+0100\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
"PO-Revision-Date: 2010-01-05 22:00+0100\n"
"Last-Translator: Thomas Petazzoni <address@hidden>\n"
"Language-Team: CA <>\n"
@@ -29,16 +29,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: settings.py:140
+#: settings.py:147
msgid "No localization"
msgstr "Sense localització"
-#: 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 "Ãndex de %(title)s (format %(format)s)"
@@ -89,9 +89,8 @@ msgid "Rendering successful"
msgstr "La renderització ha finalitzat satisfà ctoriament"
#: 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 ""
"La renderització ha fallat, contacteu amb <a href=\"mailto:"
"address@hidden">address@hidden</a>"
@@ -405,63 +404,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:49 templates/maposmatic/all_maps.html:40
-msgid "Title"
-msgstr "TÃtol"
-
-#: templates/maposmatic/all_jobs.html:50 templates/maposmatic/all_maps.html:41
-msgid "Location"
-msgstr "Localització"
-
-#: templates/maposmatic/all_jobs.html:51
-msgid "Job status"
-msgstr "Estat de la tasca"
-
-#: templates/maposmatic/all_jobs.html:52
-msgid "Submission at"
-msgstr "Sol·licitat"
-
-#: templates/maposmatic/all_jobs.html:53
-msgid "Rendering started at"
-msgstr "Inici de la renderització"
-
-#: templates/maposmatic/all_jobs.html:54
-msgid "Rendering finished at"
-msgstr "Finalització de la renderització"
-
-#: templates/maposmatic/all_jobs.html:55
-msgid "Position in queue"
-msgstr "Posició a la cua"
-
-#: templates/maposmatic/all_jobs.html:78
-msgid "not started"
-msgstr "no ha començat"
-
-#: templates/maposmatic/all_jobs.html:87
-msgid "not finished"
-msgstr "no ha finalitzat"
-
-#: templates/maposmatic/all_jobs.html:103
-#: templates/maposmatic/all_maps.html:82
+#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:47
msgid "Previous"
msgstr "Enrere"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "Page"
msgstr "PÃ gina"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "of"
msgstr "de"
-#: templates/maposmatic/all_jobs.html:111
-#: templates/maposmatic/all_maps.html:90
+#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:55
msgid "Next"
msgstr "Següent"
-#: templates/maposmatic/all_jobs.html:117
+#: templates/maposmatic/all_jobs.html:71
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -471,18 +430,6 @@ msgstr "No hi ha hagut cap petició en les darreres 24
hores."
msgid "Maps"
msgstr "Mapes"
-#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:115
-msgid "Thumbnail"
-msgstr "Miniatura"
-
-#: templates/maposmatic/all_maps.html:43
-msgid "Files"
-msgstr "Fitxers"
-
-#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:130
-msgid "The generated files are no longer available"
-msgstr "Els fitxer generats ja no són disponibles"
-
#: templates/maposmatic/base.html:49
msgid "Your free city maps!"
msgstr "Els vostres mapes de ciutat lliures, i gratuits!"
@@ -695,63 +642,144 @@ msgstr ""
"trigar estona depenet de la cua de treball), aquesta pà gina contindrà els "
"enllaços al mapa generat."
-#: templates/maposmatic/job.html:38
-#, python-format
-msgid "Map <i>%(job_t)s</i> Status"
-msgstr "Estat del mapa <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 "Heu estat redirigit a un mapa similar, generat fa menys de 24 hores."
-#: templates/maposmatic/job.html:51
+#: templates/maposmatic/job-page.html:51
msgid "Refresh the status"
msgstr "Actualitza l'estat"
-#: templates/maposmatic/job.html:56
-msgid "Map title"
-msgstr "TÃtol del 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:44
+#, fuzzy
+msgid "Rendering: "
+msgstr "La renderització ha finalitzat satisfà ctoriament"
+
+#: templates/maposmatic/job.html:45
+#, fuzzy
+msgid "Rendering submitted"
+msgstr "Inici de la renderització"
+
+#: templates/maposmatic/job.html:47
+msgid "In queue, position"
+msgstr ""
+
+#: templates/maposmatic/job.html:47
+#, fuzzy
+msgid "estimated completion time"
+msgstr "Temps estimat de finalització de la renderització"
+
+#: 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 "La renderització és en procès"
+
+#: templates/maposmatic/job.html:61 templates/maposmatic/map.html:45
+#, fuzzy
+msgid "Files: "
+msgstr "Fitxers"
+
+#: templates/maposmatic/job.html:63 templates/maposmatic/map.html:47
+#, fuzzy
+msgid "Map: "
+msgstr "Mapes"
+
+#: 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 "Els fitxer generats ja no són disponibles"
+
+#: templates/maposmatic/map.html:42
+#, fuzzy
+msgid "Rendering completed on"
+msgstr "Inici de la renderització"
+
+#~ msgid "Title"
+#~ msgstr "TÃtol"
+
+#~ msgid "Location"
+#~ msgstr "Localització"
+
+#~ msgid "Job status"
+#~ msgstr "Estat de la tasca"
+
+#~ msgid "Submission at"
+#~ msgstr "Sol·licitat"
+
+#~ msgid "Rendering finished at"
+#~ msgstr "Finalització de la renderització"
-#: templates/maposmatic/job.html:61
-msgid "Administrative city"
-msgstr "Ciutat administrativa"
+#~ msgid "Position in queue"
+#~ msgstr "Posició a la cua"
-#: templates/maposmatic/job.html:66
-msgid "Bounding-box coordinates"
-msgstr "Coordenades de l'à raa geogrà fica (long/lat)"
+#~ msgid "not started"
+#~ msgstr "no ha començat"
-#: templates/maposmatic/job.html:76
-msgid "Status"
-msgstr "Estat"
+#~ msgid "not finished"
+#~ msgstr "no ha finalitzat"
-#: templates/maposmatic/job.html:80
-msgid "Submission time"
-msgstr "Hora de la sol·licitud"
+#~ msgid "Thumbnail"
+#~ msgstr "Miniatura"
-#: templates/maposmatic/job.html:84
-msgid "Start of rendering time"
-msgstr "Hora d'inici de la rendertizació"
+#~ msgid "Map <i>%(job_t)s</i> Status"
+#~ msgstr "Estat del mapa <i>%(job_t)s</i> "
-#: templates/maposmatic/job.html:87 templates/maposmatic/job.html.py:100
-msgid "Rendering not started yet"
-msgstr "La renderització encara no ha començat"
+#~ msgid "Map title"
+#~ msgstr "TÃtol del mapa"
-#: templates/maposmatic/job.html:94
-msgid "End of rendering time"
-msgstr "Hora de finalització de la renderització"
+#~ msgid "Administrative city"
+#~ msgstr "Ciutat administrativa"
-#: templates/maposmatic/job.html:103
-msgid "Rendering not finished yet"
-msgstr "La renderització encara no ha finalitzat"
+#~ msgid "Bounding-box coordinates"
+#~ msgstr "Coordenades de l'à raa geogrà fica (long/lat)"
-#: templates/maposmatic/job.html:109
-msgid "Current position in queue"
-msgstr "Possició actual a la cua"
+#~ msgid "Status"
+#~ msgstr "Estat"
-#: templates/maposmatic/job.html:123
-msgid "Result files"
-msgstr "Fitxers generats"
+#~ msgid "Submission time"
+#~ msgstr "Hora de la sol·licitud"
+
+#~ msgid "Start of rendering time"
+#~ msgstr "Hora d'inici de la rendertizació"
+
+#~ msgid "Rendering not started yet"
+#~ msgstr "La renderització encara no ha començat"
+
+#~ msgid "End of rendering time"
+#~ msgstr "Hora de finalització de la renderització"
+
+#~ msgid "Rendering not finished yet"
+#~ msgstr "La renderització encara no ha finalitzat"
+
+#~ msgid "Current position in queue"
+#~ msgstr "Possició actual a la cua"
+
+#~ msgid "Result files"
+#~ msgstr "Fitxers generats"
#~ msgid ""
#~ "You have been redirected to a similar rendering request, submitted less "
@@ -767,6 +795,3 @@ msgstr "Fitxers generats"
#~ msgid "ETA before rendering"
#~ msgstr "Temps estimat de renderització"
-
-#~ msgid "Estimated rendering time completion"
-#~ msgstr "Temps estimat de finalització de la renderització"
diff --git a/www/locale/de/LC_MESSAGES/django.po
b/www/locale/de/LC_MESSAGES/django.po
index b50248a..17f8bf2 100644
--- a/www/locale/de/LC_MESSAGES/django.po
+++ b/www/locale/de/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-26 20:47+0100\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
"PO-Revision-Date: 2010-01-04 21:10+0100\n"
"Last-Translator: malenki <address@hidden>\n"
"Language-Team: <address@hidden>\n"
@@ -30,16 +30,16 @@ msgstr ""
"X-Poedit-Language: German\n"
"X-Poedit-Country: GERMANY\n"
-#: settings.py:140
+#: settings.py:147
msgid "No localization"
msgstr "Keine Ãbersetzung"
-#: maposmatic/models.py:144
+#: maposmatic/models.py:146
#, python-format
msgid "%(title)s %(format)s Map"
msgstr "Plan von %(title)s (format %(format)s)"
-#: maposmatic/models.py:149
+#: maposmatic/models.py:150
#, python-format
msgid "%(title)s %(format)s Index"
msgstr "StraÃenverzeichnis von %(title)s (format %(format)s)"
@@ -90,16 +90,13 @@ msgid "Rendering successful"
msgstr "Rendern erfolgreich"
#: 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 ""
"Rendern fehlgeschlagen, bitte kontaktieren Sie <a href=\"mailto:"
"address@hidden">address@hidden</a>"
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:53
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:53
msgid "Home"
msgstr "Start"
@@ -135,8 +132,7 @@ msgstr "Interner Serverfehler <em>500</em>"
msgid "There's been an error."
msgstr "Ein Fehler ist aufgetreten."
-#: templates/maposmatic/about.html:35
-#: templates/maposmatic/base.html:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:57
msgid "About"
msgstr "Ãber"
@@ -151,24 +147,32 @@ msgid ""
"href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and free\n"
"software contributor of Rennes area, France. From his idea, a group of\n"
"crazy <a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\">hackers</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29"
+"\">hackers</a>\n"
"met together during a one-week <em>Hackfest</em> in August 2009 and\n"
"brought the idea of Gilles Lamiral to life by writing the code and\n"
"named the project <strong>MapOSMatic</strong>. The group of crazy\n"
"hackers would like to thank Gilles for sharing his bright\n"
"idea!"
msgstr ""
-"MapOSMatic entstand dank einer Idee von Gilles Lamiral, einem Mitarbeiter
von\n"
-" <a href=\"http://www.openstreetmap.org\">OpenStreetMap</a> und Freier
Software bei Rennes in Frankreich.\n"
-" Zu seiner Idee fand sich eine Gruppe von <a
href=\"http://de.wikipedia.org/wiki/Hacker%23Free-Software-_und_Open-Source-Hackerkultur\">Hackern</a>\n"
-" während eines einwöchigen <em>Hackfests</em> im August 2009. Sie hauchten
Gilles' Idee Leben ein,\n"
-" indem sie den Code schrieben und das Projekt <strong>MapOSMatic</strong>
nannten.\n"
-" Die Gruppe der <em>Hacker</em> möchte Gilles dafür danken, dass er seine
geniale Idee teilte."
+"MapOSMatic entstand dank einer Idee von Gilles Lamiral, einem Mitarbeiter "
+"von\n"
+" <a href=\"http://www.openstreetmap.org\">OpenStreetMap</a> und Freier "
+"Software bei Rennes in Frankreich.\n"
+" Zu seiner Idee fand sich eine Gruppe von <a href=\"http://de.wikipedia.org/"
+"wiki/Hacker%23Free-Software-_und_Open-Source-Hackerkultur\">Hackern</a>\n"
+" während eines einwöchigen <em>Hackfests</em> im August 2009. Sie hauchten "
+"Gilles' Idee Leben ein,\n"
+" indem sie den Code schrieben und das Projekt <strong>MapOSMatic</strong> "
+"nannten.\n"
+" Die Gruppe der <em>Hacker</em> möchte Gilles dafür danken, dass er seine "
+"geniale Idee teilte."
#: templates/maposmatic/about.html:51
msgid ""
"Of course, MapOSMatic is fully free software,\n"
-"licensed under the <a
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPLv3</a>."
+"licensed under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0."
+"html\">AGPLv3</a>."
msgstr ""
"Natürlich ist MapOSMatic Freie Software,\n"
" lizenziert unter den Bedingungen der\n"
@@ -194,12 +198,15 @@ msgid ""
msgstr ""
"Auf unserem Server läuft ein\n"
" <a href=\"http://www.postgresql.org\">PostgreSQL</a>-Server mit der\n"
-" <a href=\"http://postgis.refractions.net\">PostGIS</a>-Erweiterung. In
diesen\n"
+" <a href=\"http://postgis.refractions.net\">PostGIS</a>-Erweiterung. In "
+"diesen\n"
" PostgreSQL-Server haben wir unter Verwendung des\n"
-" <a
href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\">osm2pgsql</a>-Tools\n"
+" <a href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\">osm2pgsql</a>-"
+"Tools\n"
" die <a href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\">\n"
" OpenStreetMap-Daten der gesamten Welt</a> geladen. Mit diesem Tool\n"
-" werden auch die <a
href=\"http://planet.openstreetmap.org/daily/\">täglichen diffs</a> \n"
+" werden auch die <a href=\"http://planet.openstreetmap.org/daily/"
+"\">täglichen diffs</a> \n"
" der OSM-Datenbank eingepflegt. So ist es MapOSMatic möglich, \n"
" Stadtpläne mit den neuesten Beiträgen der OpenStreetMap-User zu erzeugen."
@@ -208,22 +215,27 @@ msgid ""
"For the map rendering, we use the\n"
"famous <a href=\"http://www.mapnik.org\">Mapnik</a> with the OpenStreetMap\n"
"stylesheet\n"
-"available <a
href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\">in\n"
+"available <a href=\"http://svn.openstreetmap.org/applications/rendering/"
+"mapnik\">in\n"
"OpenStreetMap Subversion repository</a>. Using Mapnik\n"
"and <a href=\"http://cairographics.org/pycairo/\">Cairo</a>, we\n"
"built <i>OCitySMap</i>, a Python module that:"
msgstr ""
"Um den Plan zu rendern, nutzen wir das berühmte <a\n"
-" href=\"http://www.mapnik.org\">Mapnik</a> mit dem OpenStreetMap-Stylesheet,
das im\n"
+" href=\"http://www.mapnik.org\">Mapnik</a> mit dem OpenStreetMap-Stylesheet, "
+"das im\n"
" <a href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\">\n"
" OpenStreetMap Subversion-Repository </a> zu finden ist.\n"
-" Unter Verwendung von Mapnik und <a
href=\"http://cairographics.org/pycairo/\">Cairo</a> entwickelten wir
<i>OCitySMap</i>, ein Python-Modul, das:"
+" Unter Verwendung von Mapnik und <a href=\"http://cairographics.org/pycairo/"
+"\">Cairo</a> entwickelten wir <i>OCitySMap</i>, ein Python-Modul, das:"
#: templates/maposmatic/about.html:78
msgid ""
"Renders the map using OpenStreetMap data and the\n"
" OpenStreetMap Mapnik stylesheet;"
-msgstr "die StraÃen anhand der OpenStreetMap-Daten und des OpenStreetMap
Mapnik-Stylesheets rendert;"
+msgstr ""
+"die StraÃen anhand der OpenStreetMap-Daten und des OpenStreetMap Mapnik-"
+"Stylesheets rendert;"
#: templates/maposmatic/about.html:81
msgid ""
@@ -240,7 +252,9 @@ msgstr ""
msgid ""
"Greys out all the area outside the city if we find\n"
" its administrative boundary;"
-msgstr "Gebiete auÃerhalb der Stadt ausgraut, sofern wir deren administrative
Grenze finden;"
+msgstr ""
+"Gebiete auÃerhalb der Stadt ausgraut, sofern wir deren administrative Grenze
"
+"finden;"
#: templates/maposmatic/about.html:89
msgid ""
@@ -265,7 +279,8 @@ msgstr ""
" seine eigenen Stadtpläne rendern kann.\n"
" Da die Installation der verschiedenen Komponenten relativ kompliziert ist,\n"
" wurde ein darauf basierender Webservice erstellt,\n"
-" so dass Endnutzer OpenStreetMap-Stadtpläne einfach erstellen und benutzen
können."
+" so dass Endnutzer OpenStreetMap-Stadtpläne einfach erstellen und benutzen "
+"können."
#: templates/maposmatic/about.html:102
msgid ""
@@ -281,9 +296,13 @@ msgid ""
msgstr ""
"Dieser Webservice wurde <i>MapOSMatic</i>genannt,\n"
" wie <i>map-o-matic</i> aber mit einer Referenz an OpenStreetMap (OSM).\n"
-" Der Webservice wurde unter Benutzung von <a
href=\"http://www.djangoproject.com\">Django</a>\n"
-" in Python geschrieben. Er speichert die Renderanfragen und zeigt deren
Ergebnisse an.\n"
-" Das Rendern selbst findet asynchron durch den <i>maposmaticd</i>-Daemon
statt.Dieser Daemon bearbeitet nur eine Anfrage auf einmal, da durch das
Rendern hohe Prozessor- und In-/Output-Last entsteht."
+" Der Webservice wurde unter Benutzung von <a href=\"http://www.djangoproject."
+"com\">Django</a>\n"
+" in Python geschrieben. Er speichert die Renderanfragen und zeigt deren "
+"Ergebnisse an.\n"
+" Das Rendern selbst findet asynchron durch den <i>maposmaticd</i>-Daemon "
+"statt.Dieser Daemon bearbeitet nur eine Anfrage auf einmal, da durch das "
+"Rendern hohe Prozessor- und In-/Output-Last entsteht."
#: templates/maposmatic/about.html:112
msgid ""
@@ -310,8 +329,10 @@ msgid ""
"contribute. Here are the few starting points to help\n"
"us:"
msgstr ""
-"Wie oben erwähnt sind <i>OCitySMap</i> und <i>MapOSMatic</i> Freie
Software.\n"
-" Sie sind eingeladen, sich daran zu beteiligen. Hier ein paar Ansatzpunkte,
wie Sie uns helfen können:"
+"Wie oben erwähnt sind <i>OCitySMap</i> und <i>MapOSMatic</i> Freie "
+"Software.\n"
+" Sie sind eingeladen, sich daran zu beteiligen. Hier ein paar Ansatzpunkte, "
+"wie Sie uns helfen können:"
#: templates/maposmatic/about.html:127
msgid ""
@@ -325,11 +346,13 @@ msgstr ""
#: templates/maposmatic/about.html:131
msgid ""
"The <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">development\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev"
+"\">development\n"
" mailing-list</a>;"
msgstr ""
"Die <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">Entwickler-Mailingliste
(in Englisch)</a> ;"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev"
+"\">Entwickler-Mailingliste (in Englisch)</a> ;"
#: templates/maposmatic/about.html:135
msgid ""
@@ -340,12 +363,14 @@ msgstr "Der IRC-Channel <code>#maposmatic</code> auf
Freenode;"
#: templates/maposmatic/about.html:138
msgid ""
"The <a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git"
+"\">OCitySMap\n"
" Git repository</a>, which can be cloned using <code>git clone\n"
" git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
msgstr ""
"Das <a\n"
-" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">OCitySMap
Git-Repository</a>,\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git"
+"\">OCitySMap Git-Repository</a>,\n"
" das mit folgender Befehlszeile heruntergeladen werden kann:\n"
" « <code>git clone git://git.sv.gnu.org/maposmatic/ocitysmap.git</code> »;"
@@ -356,7 +381,8 @@ msgid ""
" Git repository</a>, which can be cloned using\n"
" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
msgstr ""
-"Das <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\">MapOSMatic
Git-Repository</a>,\n"
+"Das <a href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\">MapOSMatic "
+"Git-Repository</a>,\n"
" das mit folgender Befehlszeile heruntergeladen werden kann:\n"
" « <code>git clone git://git.sv.gnu.org/maposmatic.git</code> »;"
@@ -391,87 +417,32 @@ msgstr ""
"Diese Seite zeigt den Status aller innerhalb der letzten 24 Stunden\n"
" eingegangenen Renderanfragen, beginnend mit der neuesten."
-#: templates/maposmatic/all_jobs.html:49
-#: templates/maposmatic/all_maps.html:40
-msgid "Title"
-msgstr "Name"
-
-#: templates/maposmatic/all_jobs.html:50
-#: templates/maposmatic/all_maps.html:41
-msgid "Location"
-msgstr "Ort"
-
-#: templates/maposmatic/all_jobs.html:51
-msgid "Job status"
-msgstr "Status des Rendervorgangs"
-
-#: templates/maposmatic/all_jobs.html:52
-msgid "Submission at"
-msgstr "Datum der Anfrage"
-
-#: templates/maposmatic/all_jobs.html:53
-msgid "Rendering started at"
-msgstr "Rendervorgang gestartet am"
-
-#: templates/maposmatic/all_jobs.html:54
-msgid "Rendering finished at"
-msgstr "Rendervorgang beendet am"
-
-#: templates/maposmatic/all_jobs.html:55
-msgid "Position in queue"
-msgstr "Position in der Warteschlange"
-
-#: templates/maposmatic/all_jobs.html:78
-msgid "not started"
-msgstr "nicht begonnen"
-
-#: templates/maposmatic/all_jobs.html:87
-msgid "not finished"
-msgstr "nicht beendet"
-
-#: templates/maposmatic/all_jobs.html:103
-#: templates/maposmatic/all_maps.html:82
+#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:47
msgid "Previous"
msgstr "Vorherige"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "Page"
msgstr "Seite"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "of"
msgstr "von"
-#: templates/maposmatic/all_jobs.html:111
-#: templates/maposmatic/all_maps.html:90
+#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:55
msgid "Next"
msgstr "Nächste"
-#: templates/maposmatic/all_jobs.html:117
+#: templates/maposmatic/all_jobs.html:71
msgid ""
"No map rendering request since the last 24\n"
"hours."
msgstr "Keine Renderanfragen innerhalb der letzten 24 Stunden."
-#: templates/maposmatic/all_maps.html:35
-#: templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:35 templates/maposmatic/base.html:55
msgid "Maps"
msgstr "Pläne"
-#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:115
-msgid "Thumbnail"
-msgstr "Vorschaubild"
-
-#: templates/maposmatic/all_maps.html:43
-msgid "Files"
-msgstr "Dateien"
-
-#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:130
-msgid "The generated files are no longer available"
-msgstr "Die erzeugten Dateien sind nicht mehr verfügbar"
-
#: templates/maposmatic/base.html:49
msgid "Your free city maps!"
msgstr "Ihre freien Stadtpläne!"
@@ -527,20 +498,22 @@ msgid "Language:"
msgstr "Sprache:"
#: templates/maposmatic/index.html:227
-msgid "This place cannot be rendered by MapOSMatic, administrative boundary
missing. Please contribute !"
-msgstr "Ein Plan dieses Ortes kann von MapOSMatic nicht erzeugt werden, da die
Verwaltungsgrenzen fehlen. Bitte helfen Sie mit!"
+msgid ""
+"This place cannot be rendered by MapOSMatic, administrative boundary "
+"missing. Please contribute !"
+msgstr ""
+"Ein Plan dieses Ortes kann von MapOSMatic nicht erzeugt werden, da die "
+"Verwaltungsgrenzen fehlen. Bitte helfen Sie mit!"
#: templates/maposmatic/index.html:240
msgid "No results found."
msgstr "Kein Ort gefunden."
-#: templates/maposmatic/index.html:252
-#: templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
msgid "Generate"
msgstr "Erzeugen"
-#: templates/maposmatic/index.html:258
-#: templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
msgid "Please fill in the form before trying to proceed"
msgstr "Bitte füllen Sie das Formular aus, bevor Sie versuchen fortzufahren."
@@ -563,13 +536,18 @@ msgid ""
"<a href=\"http://www.openstreetmap.org\">OpenStreetMap</a> data. A city map\n"
"is made of two pages:"
msgstr ""
-"MapOSMatic ist ein freier Webservice, der es Ihnen ermöglicht, Stadtpläne
unter Benutzung der\n"
-" <a href=\"http://www.openstreetmap.org\">OpenStreetMap</a>-Daten zu
erzeugen.\n"
+"MapOSMatic ist ein freier Webservice, der es Ihnen ermöglicht, Stadtpläne "
+"unter Benutzung der\n"
+" <a href=\"http://www.openstreetmap.org\">OpenStreetMap</a>-Daten zu "
+"erzeugen.\n"
" Ein Stadtplan besteht aus zwei Seiten:"
#: templates/maposmatic/index.html:305
-msgid "The map itself, splitted in squares allowing to easily look for
streets;"
-msgstr "Dem Plan selbst, aufgeteilt in Quadrate, um leicht nach StraÃen
suchen zu können;"
+msgid ""
+"The map itself, splitted in squares allowing to easily look for streets;"
+msgstr ""
+"Dem Plan selbst, aufgeteilt in Quadrate, um leicht nach StraÃen suchen zu "
+"können;"
#: templates/maposmatic/index.html:306
msgid "An index of the streets with references to the squares on the map."
@@ -579,7 +557,8 @@ msgstr "Dem StraÃenverzeichnis, das sich auf die
Planquadrate bezieht."
msgid ""
"The generated maps are available in PNG, PDF and\n"
"SVG formats and are ready to be printed."
-msgstr "Die erzeugten Pläne sind als PNG, PDF und SVG verfügbar und
druckfertig."
+msgstr ""
+"Die erzeugten Pläne sind als PNG, PDF und SVG verfügbar und druckfertig."
#: templates/maposmatic/index.html:312
msgid ""
@@ -591,7 +570,8 @@ msgid ""
msgstr ""
"Da OpenStreetMap-Daten benutzt werden um die Pläne zu erzeugen,\n"
" dürfen Sie diese unter den Bedingungen der\n"
-" <a
href=\"http://wiki.openstreetmap.org/wiki/License\">OpenStreetMap-Lizenz</a>\n"
+" <a href=\"http://wiki.openstreetmap.org/wiki/License\">OpenStreetMap-"
+"Lizenz</a>\n"
" benutzen, verkaufen, verändern..."
#: templates/maposmatic/index.html:318
@@ -674,79 +654,162 @@ msgstr ""
" (was abhängig von der Länge der Warteschlange einige Zeit dauern kann),\n"
" wird diese Seite Links zum erzeugten Plan anzeigen."
-#: templates/maposmatic/job.html:38
-#, python-format
-msgid "Map <i>%(job_t)s</i> Status"
-msgstr "Rendervorgang bei <i>%(job_t)s</i>"
-
-#: templates/maposmatic/job.html:43
-msgid "You have been redirected to a similar map, rendered less than 24 hours
ago."
-msgstr "Sie wurden zu einem ähnlichen Plan weitergeleitet, der vor weniger
als 24 Stunden erzeugt wurde."
+#: templates/maposmatic/job-page.html:43
+msgid ""
+"You have been redirected to a similar map, rendered less than 24 hours ago."
+msgstr ""
+"Sie wurden zu einem ähnlichen Plan weitergeleitet, der vor weniger als 24 "
+"Stunden erzeugt wurde."
-#: templates/maposmatic/job.html:51
+#: templates/maposmatic/job-page.html:51
msgid "Refresh the status"
msgstr "Renderstatus aktualisieren"
-#: templates/maposmatic/job.html:56
-msgid "Map title"
-msgstr "Name des Stadtplans"
+#: 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:44
+#, fuzzy
+msgid "Rendering: "
+msgstr "Rendern erfolgreich"
+
+#: templates/maposmatic/job.html:45
+#, fuzzy
+msgid "Rendering submitted"
+msgstr "Rendervorgang gestartet am"
+
+#: templates/maposmatic/job.html:47
+msgid "In queue, position"
+msgstr ""
+
+#: templates/maposmatic/job.html:47
+#, fuzzy
+msgid "estimated completion time"
+msgstr "Voraussichtliches Ende des Rendervorgangs"
-#: templates/maposmatic/job.html:61
-msgid "Administrative city"
-msgstr "Ort"
+#: 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 "Plan wird gerendert"
+
+#: templates/maposmatic/job.html:61 templates/maposmatic/map.html:45
+#, fuzzy
+msgid "Files: "
+msgstr "Dateien"
+
+#: templates/maposmatic/job.html:63 templates/maposmatic/map.html:47
+#, fuzzy
+msgid "Map: "
+msgstr "Pläne"
+
+#: 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 "Die erzeugten Dateien sind nicht mehr verfügbar"
+
+#: templates/maposmatic/map.html:42
+#, fuzzy
+msgid "Rendering completed on"
+msgstr "Rendervorgang gestartet am"
+
+#~ msgid "Title"
+#~ msgstr "Name"
-#: templates/maposmatic/job.html:66
-msgid "Bounding-box coordinates"
-msgstr "Koordinaten des Begrenzungsrahmens (geografische Länge/Breite)"
+#~ msgid "Location"
+#~ msgstr "Ort"
-#: templates/maposmatic/job.html:76
-msgid "Status"
-msgstr "Status"
+#~ msgid "Job status"
+#~ msgstr "Status des Rendervorgangs"
-#: templates/maposmatic/job.html:80
-msgid "Submission time"
-msgstr "Datum der Anforderung"
+#~ msgid "Submission at"
+#~ msgstr "Datum der Anfrage"
-#: templates/maposmatic/job.html:84
-msgid "Start of rendering time"
-msgstr "Beginn des Rendervorgangs"
+#~ msgid "Rendering finished at"
+#~ msgstr "Rendervorgang beendet am"
-#: templates/maposmatic/job.html:87
-#: templates/maposmatic/job.html.py:100
-msgid "Rendering not started yet"
-msgstr "Rendervorgang noch nicht begonnen"
+#~ msgid "Position in queue"
+#~ msgstr "Position in der Warteschlange"
-#: templates/maposmatic/job.html:94
-msgid "End of rendering time"
-msgstr "Ende des Rendervorgangs"
+#~ msgid "not started"
+#~ msgstr "nicht begonnen"
-#: templates/maposmatic/job.html:103
-msgid "Rendering not finished yet"
-msgstr "Rendern läuft noch"
+#~ msgid "not finished"
+#~ msgstr "nicht beendet"
-#: templates/maposmatic/job.html:109
-msgid "Current position in queue"
-msgstr "Aktuelle Position in der Warteschlange"
+#~ msgid "Thumbnail"
+#~ msgstr "Vorschaubild"
-#: templates/maposmatic/job.html:123
-msgid "Result files"
-msgstr "Erzeugte Dateien:"
+#~ msgid "Map <i>%(job_t)s</i> Status"
+#~ msgstr "Rendervorgang bei <i>%(job_t)s</i>"
+
+#~ msgid "Map title"
+#~ msgstr "Name des Stadtplans"
+
+#~ msgid "Administrative city"
+#~ msgstr "Ort"
+
+#~ msgid "Bounding-box coordinates"
+#~ msgstr "Koordinaten des Begrenzungsrahmens (geografische Länge/Breite)"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Submission time"
+#~ msgstr "Datum der Anforderung"
+
+#~ msgid "Start of rendering time"
+#~ msgstr "Beginn des Rendervorgangs"
+
+#~ msgid "Rendering not started yet"
+#~ msgstr "Rendervorgang noch nicht begonnen"
+
+#~ msgid "End of rendering time"
+#~ msgstr "Ende des Rendervorgangs"
+
+#~ msgid "Rendering not finished yet"
+#~ msgstr "Rendern läuft noch"
+
+#~ msgid "Current position in queue"
+#~ msgstr "Aktuelle Position in der Warteschlange"
+
+#~ msgid "Result files"
+#~ msgstr "Erzeugte Dateien:"
#~ msgid "ETA before rendering"
#~ msgstr "Voraussichtlicher Beginn des Rendervorgangs"
-#~ msgid "Estimated rendering time completion"
-#~ msgstr "Voraussichtliches Ende des Rendervorgangs"
-
#~ msgid ""
#~ "No administrative boundaries found for this city. Try with proper casing."
#~ msgstr ""
#~ "Keine administrativen Grenzen für diese Stadt gefunden. Versuchen Sie es "
#~ "mit korrekter GroÃ-/Kleinschreibung."
+
#~ msgid "Sorry, only cities in France can be rendered for the moment"
#~ msgstr "Leider können derzeit nur französische Städte gerendert werden."
+
#~ msgid "Rendering failed, reason: <i>%(errmsg)s</i>"
#~ msgstr "Rendern aus folgendem Grund fehlgeschlagen : <i>%(errmsg)s</i>"
+
#~ msgid ""
#~ "Using an administrative boundary. It allows to get a\n"
#~ " map with precise boundaries of the city, but they are for the moment\n"
@@ -766,10 +829,12 @@ msgstr "Erzeugte Dateien:"
#~ "(keine abweichende GroÃschreibung und diakritische Zeichen erlaubt).\n"
#~ "Funktionierende Beispiele sind:\n"
#~ "<code>Chavagne</code>, <code>Bénodet</code> or <code>Sanguinet</code>."
+
#~ msgid "Generated maps"
#~ msgstr "Cartes générées"
+
#~ msgid "Links:"
#~ msgstr "Liens :"
+
#~ msgid "Design by"
#~ msgstr "Style :"
-
diff --git a/www/locale/fr/LC_MESSAGES/django.po
b/www/locale/fr/LC_MESSAGES/django.po
index 9422d95..77577da 100644
--- a/www/locale/fr/LC_MESSAGES/django.po
+++ b/www/locale/fr/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-05 22:05+0100\n"
+"POT-Creation-Date: 2010-01-07 10:57+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,16 +28,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: settings.py:140
+#: settings.py:147
msgid "No localization"
msgstr "Pas de traduction"
-#: maposmatic/models.py:144
+#: maposmatic/models.py:146
#, python-format
msgid "%(title)s %(format)s Map"
msgstr "Carte pour %(title)s (format %(format)s)"
-#: maposmatic/models.py:149
+#: maposmatic/models.py:150
#, python-format
msgid "%(title)s %(format)s Index"
msgstr "Index des rues pour %(title)s (format %(format)s)"
@@ -88,12 +88,8 @@ msgid "Rendering successful"
msgstr "Rendu terminé avec succès"
#: maposmatic/templatetags/extratags.py:47
-msgid ""
-"Rendering failed, please contact <a href=\"mailto:address@hidden"
-"\">address@hidden</a>"
-msgstr ""
-"Le rendu a échoué, merci de contacter <a href=\"mailto:address@hidden"
-"\">address@hidden</a>"
+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
msgid "Home"
@@ -405,63 +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:49 templates/maposmatic/all_maps.html:40
-msgid "Title"
-msgstr "Titre"
-
-#: templates/maposmatic/all_jobs.html:50 templates/maposmatic/all_maps.html:41
-msgid "Location"
-msgstr "Lieu"
-
-#: templates/maposmatic/all_jobs.html:51
-msgid "Job status"
-msgstr "Ãtat du rendu"
-
-#: templates/maposmatic/all_jobs.html:52
-msgid "Submission at"
-msgstr "Date de soumission"
-
-#: templates/maposmatic/all_jobs.html:53
-msgid "Rendering started at"
-msgstr "Date de début du rendu"
-
-#: templates/maposmatic/all_jobs.html:54
-msgid "Rendering finished at"
-msgstr "Date de fin du rendu"
-
-#: templates/maposmatic/all_jobs.html:55
-msgid "Position in queue"
-msgstr "Position dans la file d'attente"
-
-#: templates/maposmatic/all_jobs.html:78
-msgid "not started"
-msgstr "Rendu en attente"
-
-#: templates/maposmatic/all_jobs.html:87
-msgid "not finished"
-msgstr "n/d"
-
-#: templates/maposmatic/all_jobs.html:103
-#: templates/maposmatic/all_maps.html:82
+#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:47
msgid "Previous"
msgstr "Précédent"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "Page"
msgstr "Page"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "of"
msgstr "de"
-#: templates/maposmatic/all_jobs.html:111
-#: templates/maposmatic/all_maps.html:90
+#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:55
msgid "Next"
msgstr "Suivant"
-#: templates/maposmatic/all_jobs.html:117
+#: templates/maposmatic/all_jobs.html:71
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -471,18 +427,6 @@ msgstr "Pas de demande de rendu de carte durant les
dernières 24 heures."
msgid "Maps"
msgstr "Cartes"
-#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:115
-msgid "Thumbnail"
-msgstr "Miniature"
-
-#: templates/maposmatic/all_maps.html:43
-msgid "Files"
-msgstr "Fichiers"
-
-#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:130
-msgid "The generated files are no longer available"
-msgstr "Les fichiers générés ne sont plus disponibles"
-
#: templates/maposmatic/base.html:49
msgid "Your free city maps!"
msgstr "Vos cartes de ville libres !"
@@ -691,62 +635,74 @@ msgstr ""
"qui peut prendre un peu de temps en fonction de la longueur de la file "
"d'attente), cette page contiendra des liens vers la carte générée."
-#: templates/maposmatic/job.html:38
-#, python-format
-msgid "Map <i>%(job_t)s</i> Status"
-msgstr "Ãtat du rendu de la carte <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 ""
"Vous avez été redirigé vers une carte similaire, rendue il y a moins de 24
"
"heures."
-#: templates/maposmatic/job.html:51
+#: templates/maposmatic/job-page.html:51
msgid "Refresh the status"
msgstr "Rafraîchir l'état du rendu"
-#: templates/maposmatic/job.html:56
-msgid "Map title"
-msgstr "Titre de la carte"
+#: templates/maposmatic/job-page.html:51
+msgid ""
+"(the page will refresh automatically every 5 seconds until the rendering is "
+"completed)."
+msgstr ""
+"(la page se rechargera automatiquement toutes les 5 secondes jusqu'Ã ce que "
+"le rendu soit terminé)."
-#: templates/maposmatic/job.html:61
-msgid "Administrative city"
-msgstr "Limite administrative"
+#: templates/maposmatic/job.html:44
+msgid "Rendering: "
+msgstr "Rendu : "
-#: templates/maposmatic/job.html:66
-msgid "Bounding-box coordinates"
-msgstr "Coordonnées de la zone géographique (long/lat)"
+#: templates/maposmatic/job.html:45
+msgid "Rendering submitted"
+msgstr "Rendu soumis le"
-#: templates/maposmatic/job.html:76
-msgid "Status"
-msgstr "Ãtat"
+#: templates/maposmatic/job.html:47
+msgid "In queue, position"
+msgstr "Dans la file d'attente en position"
-#: templates/maposmatic/job.html:80
-msgid "Submission time"
-msgstr "Date de soumission"
+#: templates/maposmatic/job.html:47
+msgid "estimated completion time"
+msgstr "temps estimé avant rendu"
-#: templates/maposmatic/job.html:84
-msgid "Start of rendering time"
-msgstr "Date de début du rendu"
+#: templates/maposmatic/job.html:49
+msgid "Completed on"
+msgstr "Terminé le"
-#: templates/maposmatic/job.html:87 templates/maposmatic/job.html.py:100
-msgid "Rendering not started yet"
-msgstr "Rendu en attente"
+#: templates/maposmatic/job.html:51
+msgid "Failed on"
+msgstr "Ãchoué le"
-#: templates/maposmatic/job.html:94
-msgid "End of rendering time"
-msgstr "Date de fin du rendu"
+#: templates/maposmatic/job.html:53
+#, python-format
+msgid "rendering took %(rendering)s"
+msgstr "%(rendering)s de rendu"
-#: templates/maposmatic/job.html:103
-msgid "Rendering not finished yet"
+#: templates/maposmatic/job.html:55
+msgid "Rendering in progress..."
msgstr "Rendu en cours..."
-#: templates/maposmatic/job.html:109
-msgid "Current position in queue"
-msgstr "Position dans la file d'attente"
+#: templates/maposmatic/job.html:61 templates/maposmatic/map.html:45
+msgid "Files: "
+msgstr "Fichiers : "
+
+#: templates/maposmatic/job.html:63 templates/maposmatic/map.html:47
+msgid "Map: "
+msgstr "Cartes : "
+
+#: templates/maposmatic/job.html:64 templates/maposmatic/map.html:48
+msgid "Index: "
+msgstr "Index : "
+
+#: templates/maposmatic/job.html:67 templates/maposmatic/map.html:51
+msgid "The generated files are no longer available."
+msgstr "Les fichiers générés ne sont plus disponibles."
-#: templates/maposmatic/job.html:123
-msgid "Result files"
-msgstr "Fichiers générés"
+#: templates/maposmatic/map.html:42
+msgid "Rendering completed on"
+msgstr "Rendu terminé le"
diff --git a/www/locale/it/LC_MESSAGES/django.po
b/www/locale/it/LC_MESSAGES/django.po
index 8fc213a..cf8a6f9 100644
--- a/www/locale/it/LC_MESSAGES/django.po
+++ b/www/locale/it/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-05 22:05+0100\n"
+"POT-Creation-Date: 2010-01-07 10:57+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,16 +28,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: settings.py:140
+#: settings.py:147
msgid "No localization"
msgstr "Nessuna traduzione"
-#: maposmatic/models.py:144
+#: maposmatic/models.py:146
#, python-format
msgid "%(title)s %(format)s Map"
msgstr "Mappa di %(title)s (format %(format)s)"
-#: maposmatic/models.py:149
+#: maposmatic/models.py:150
#, python-format
msgid "%(title)s %(format)s Index"
msgstr "Stradario di %(title)s (format %(format)s)"
@@ -89,9 +89,8 @@ msgid "Rendering successful"
msgstr "Rendering eseguito con successo"
#: 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 ""
"Rendering fallito, si prega di contattare <a href=\"mailto:"
"address@hidden">address@hidden</a>"
@@ -353,63 +352,23 @@ msgid ""
"recent one."
msgstr ""
-#: templates/maposmatic/all_jobs.html:49 templates/maposmatic/all_maps.html:40
-msgid "Title"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:50 templates/maposmatic/all_maps.html:41
-msgid "Location"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:51
-msgid "Job status"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:52
-msgid "Submission at"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:53
-msgid "Rendering started at"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:54
-msgid "Rendering finished at"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:55
-msgid "Position in queue"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:78
-msgid "not started"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:87
-msgid "not finished"
-msgstr ""
-
-#: templates/maposmatic/all_jobs.html:103
-#: templates/maposmatic/all_maps.html:82
+#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:47
msgid "Previous"
msgstr ""
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "Page"
msgstr ""
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "of"
msgstr ""
-#: templates/maposmatic/all_jobs.html:111
-#: templates/maposmatic/all_maps.html:90
+#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:55
msgid "Next"
msgstr ""
-#: templates/maposmatic/all_jobs.html:117
+#: templates/maposmatic/all_jobs.html:71
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -419,18 +378,6 @@ msgstr ""
msgid "Maps"
msgstr "Mappe"
-#: templates/maposmatic/all_maps.html:42 templates/maposmatic/job.html:115
-msgid "Thumbnail"
-msgstr ""
-
-#: templates/maposmatic/all_maps.html:43
-msgid "Files"
-msgstr ""
-
-#: templates/maposmatic/all_maps.html:71 templates/maposmatic/job.html:130
-msgid "The generated files are no longer available"
-msgstr ""
-
#: templates/maposmatic/base.html:49
msgid "Your free city maps!"
msgstr ""
@@ -641,65 +588,111 @@ msgstr ""
"completato (con tempi che dipendono dalla coda di processi),\n"
"la pagina riporterà il link alla mappa generata."
-#: templates/maposmatic/job.html:38
-#, python-format
-msgid "Map <i>%(job_t)s</i> Status"
-msgstr "Status del processo di renderizzazione della mappa <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 ""
"Sei stato reindirizzato ad un mappa simile a qella richiesta, generata più "
"recentemente di 24 ore fa."
-#: templates/maposmatic/job.html:51
+#: templates/maposmatic/job-page.html:51
msgid "Refresh the status"
msgstr "Aggiorna lo status"
-#: templates/maposmatic/job.html:56
-msgid "Map title"
-msgstr "Titolo della mappa"
+#: 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 "Confini amministrativi"
+#: templates/maposmatic/job.html:44
+#, fuzzy
+msgid "Rendering: "
+msgstr "Rendering eseguito con successo"
+
+#: templates/maposmatic/job.html:45
+#, fuzzy
+msgid "Rendering submitted"
+msgstr "Renderizzazione non ancora iniziata"
+
+#: templates/maposmatic/job.html:47
+msgid "In queue, position"
+msgstr ""
+
+#: templates/maposmatic/job.html:47
+#, fuzzy
+msgid "estimated completion time"
+msgstr "Tempo stimato per il completamento"
-#: templates/maposmatic/job.html:66
-msgid "Bounding-box coordinates"
-msgstr "Coordinate dell'area geografica (long/lat)"
+#: templates/maposmatic/job.html:49
+msgid "Completed on"
+msgstr ""
-#: templates/maposmatic/job.html:76
-msgid "Status"
-msgstr "Status"
+#: templates/maposmatic/job.html:51
+msgid "Failed on"
+msgstr ""
-#: templates/maposmatic/job.html:80
-msgid "Submission time"
-msgstr "Data di sottomissione della richiesta"
+#: templates/maposmatic/job.html:53
+#, python-format
+msgid "rendering took %(rendering)s"
+msgstr ""
-#: templates/maposmatic/job.html:84
-msgid "Start of rendering time"
-msgstr "Inizio del processo di renderizzazione"
+#: templates/maposmatic/job.html:55
+#, fuzzy
+msgid "Rendering in progress..."
+msgstr "Rendering in corso"
-#: templates/maposmatic/job.html:87 templates/maposmatic/job.html.py:100
-msgid "Rendering not started yet"
+#: templates/maposmatic/job.html:61 templates/maposmatic/map.html:45
+msgid "Files: "
+msgstr ""
+
+#: templates/maposmatic/job.html:63 templates/maposmatic/map.html:47
+#, fuzzy
+msgid "Map: "
+msgstr "Mappe"
+
+#: templates/maposmatic/job.html:64 templates/maposmatic/map.html:48
+msgid "Index: "
+msgstr ""
+
+#: templates/maposmatic/job.html:67 templates/maposmatic/map.html:51
+msgid "The generated files are no longer available."
+msgstr ""
+
+#: templates/maposmatic/map.html:42
+#, fuzzy
+msgid "Rendering completed on"
msgstr "Renderizzazione non ancora iniziata"
-#: templates/maposmatic/job.html:94
-msgid "End of rendering time"
-msgstr "Fine stimata del processo di renderizzazione"
+#~ msgid "Map <i>%(job_t)s</i> Status"
+#~ msgstr "Status del processo di renderizzazione della mappa <i>%(job_t)s</i>"
+
+#~ msgid "Map title"
+#~ msgstr "Titolo della mappa"
+
+#~ msgid "Administrative city"
+#~ msgstr "Confini amministrativi"
+
+#~ msgid "Bounding-box coordinates"
+#~ msgstr "Coordinate dell'area geografica (long/lat)"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Submission time"
+#~ msgstr "Data di sottomissione della richiesta"
+
+#~ msgid "Start of rendering time"
+#~ msgstr "Inizio del processo di renderizzazione"
-#: templates/maposmatic/job.html:103
-msgid "Rendering not finished yet"
-msgstr "Renderizzazione non ancora terminata"
+#~ msgid "End of rendering time"
+#~ msgstr "Fine stimata del processo di renderizzazione"
-#: templates/maposmatic/job.html:109
-msgid "Current position in queue"
-msgstr "Posizione attuale nella coda dei processi"
+#~ msgid "Rendering not finished yet"
+#~ msgstr "Renderizzazione non ancora terminata"
-#: templates/maposmatic/job.html:123
-msgid "Result files"
-msgstr "File generati"
+#~ msgid "Current position in queue"
+#~ msgstr "Posizione attuale nella coda dei processi"
-#~ msgid "Estimated rendering time completion"
-#~ msgstr "Tempo stimato per il completamento"
+#~ msgid "Result files"
+#~ msgstr "File generati"
diff --git a/www/locale/ru/LC_MESSAGES/django.po
b/www/locale/ru/LC_MESSAGES/django.po
index 0017ad5..fa6de5a 100644
--- a/www/locale/ru/LC_MESSAGES/django.po
+++ b/www/locale/ru/LC_MESSAGES/django.po
@@ -19,8 +19,8 @@
msgid ""
msgstr ""
"Project-Id-Version: mapOSMatic 0.1\n"
-"Report-Msgid-Bugs-To: Konstantin Mochalov <address@hidden>\n"
-"POT-Creation-Date: 2010-01-05 23:26+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-07 10:57+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,16 +28,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: settings.py:139
+#: settings.py:147
msgid "No localization"
msgstr "Ðез локализаÑии"
-#: maposmatic/models.py:144
+#: maposmatic/models.py:146
#, python-format
msgid "%(title)s %(format)s Map"
msgstr "ÐаÑÑа %(title)s %(format)s"
-#: maposmatic/models.py:149
+#: maposmatic/models.py:150
#, python-format
msgid "%(title)s %(format)s Index"
msgstr "УказаÑÐµÐ»Ñ %(title)s %(format)s"
@@ -88,12 +88,13 @@ msgid "Rendering successful"
msgstr "ÐÑÑиÑовка завеÑÑена ÑдаÑно"
#: maposmatic/templatetags/extratags.py:47
-msgid "Rendering failed, please contact <a
href=\"mailto:address@hidden">address@hidden</a>"
-msgstr "ÐÑÑиÑовка завеÑÑилаÑÑ Ð½ÐµÑдаÑно,
пожалÑйÑÑа ÑообÑиÑе на <a
href=\"mailto:address@hidden">address@hidden</a>"
+#, fuzzy
+msgid "Rendering failed, please contact address@hidden"
+msgstr ""
+"ÐÑÑиÑовка завеÑÑилаÑÑ Ð½ÐµÑдаÑно,
пожалÑйÑÑа ÑообÑиÑе на <a href=\"mailto:"
+"address@hidden">address@hidden</a>"
-#: templates/404.html:3
-#: templates/500.html:3
-#: templates/maposmatic/base.html:53
+#: templates/404.html:3 templates/500.html:3 templates/maposmatic/base.html:53
msgid "Home"
msgstr "Ðомой"
@@ -129,8 +130,7 @@ msgstr "ÐÑибка ÑеÑвеÑа <em>(500)</em>"
msgid "There's been an error."
msgstr "ÐÑоизоÑла оÑибка."
-#: templates/maposmatic/about.html:35
-#: templates/maposmatic/base.html:57
+#: templates/maposmatic/about.html:35 templates/maposmatic/base.html:57
msgid "About"
msgstr "Ð ÑеÑвиÑе"
@@ -145,7 +145,8 @@ msgid ""
"href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and free\n"
"software contributor of Rennes area, France. From his idea, a group of\n"
"crazy <a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\">hackers</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29"
+"\">hackers</a>\n"
"met together during a one-week <em>Hackfest</em> in August 2009 and\n"
"brought the idea of Gilles Lamiral to life by writing the code and\n"
"named the project <strong>MapOSMatic</strong>. The group of crazy\n"
@@ -154,20 +155,25 @@ msgid ""
msgstr ""
"MapOSMatic поÑвилÑÑ Ð±Ð»Ð°Ð³Ð¾Ð´Ð°ÑÑ Ð¸Ð´ÐµÐµ \n"
"Gilles Lamiral, ÑазÑабоÑÑÐ¸ÐºÑ <a\n"
-"href=\"http://www.openstreetmap.org\">OpenStreetMap</a> и дÑÑгого
Ñвободного ÐРиз\n"
+"href=\"http://www.openstreetmap.org\">OpenStreetMap</a> и дÑÑгого
Ñвободного "
+"ÐРиз\n"
"Rennes area, ФÑанÑиÑ. С его идеи, гÑÑппа
ÑÑмаÑÑедÑиÑ
<a\n"
-"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\">Ñ
акеÑов</a>\n"
+"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29"
+"\">Ñ
акеÑов</a>\n"
"ÑобÑалаÑÑ Ð² одно-неделÑнÑй <em>Hackfest</em> в
авгÑÑÑе 2009 и\n"
-"назвала пÑÐ¾ÐµÐºÑ <strong>MapOSMatic</strong>. ÐÑÑппа
ÑÑмаÑÑедÑиÑ
Ñ
акеÑов благодаÑÐ¸Ñ Gilles\n"
+"назвала пÑÐ¾ÐµÐºÑ <strong>MapOSMatic</strong>. ÐÑÑппа
ÑÑмаÑÑедÑиÑ
Ñ
акеÑов "
+"благодаÑÐ¸Ñ Gilles\n"
"за Ñо ÑÑо он поделилÑÑ Ñвоей идеей!"
#: templates/maposmatic/about.html:51
msgid ""
"Of course, MapOSMatic is fully free software,\n"
-"licensed under the <a
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPLv3</a>."
+"licensed under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0."
+"html\">AGPLv3</a>."
msgstr ""
"ÐонеÑно, MapOSMatic полноÑÑÑÑ Ñвободное
пÑогÑаммное обеÑпеÑение,\n"
-"ÑаÑпÑоÑÑÑанÑемое по <a
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPLv3</a>."
+"ÑаÑпÑоÑÑÑанÑемое по <a
href=\"http://www.fsf.org/licensing/licenses/agpl-3.0."
+"html\">AGPLv3</a>."
#: templates/maposmatic/about.html:54
msgid "How does it work?"
@@ -189,13 +195,15 @@ msgid ""
msgstr ""
"Ðа наÑем ÑеÑвеÑе Ð¼Ñ Ð¸ÑполÑзÑем Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
<a\n"
"href=\"http://www.postgresql.org\">PostgreSQL</a> Ñ ÑаÑÑиÑением
<a\n"
-"href=\"http://postgis.refractions.net\">PostGIS</a> extension. Ð ÑÑоÑ
ÑеÑвеÑ\n"
+"href=\"http://postgis.refractions.net\">PostGIS</a> extension. Ð ÑÑÐ¾Ñ "
+"ÑеÑвеÑ\n"
"PostgreSQL Ð¼Ñ Ð·Ð°Ð³ÑÑзили <a\n"
"href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\">даннÑе
OpenStreetMap\n"
"Ð´Ð»Ñ Ð²Ñего миÑа</a> иÑполÑзÑÑ ÑÑилиÑÑ <a\n"
"href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\">osm2pgsql</a>\n"
". Та же ÑÑилиÑа иÑполÑзÑеÑÑÑ Ð´Ð»Ñ
пÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ <a\n"
-"href=\"http://planet.openstreetmap.org/daily/\">ежедневнÑÑ
изменений</a> базÑ\n"
+"href=\"http://planet.openstreetmap.org/daily/\">ежедневнÑÑ
изменений</a> "
+"базÑ\n"
"даннÑÑ
, ÑÑо позволÑÐµÑ Ð½Ð°Ð¼ поддеÑживаÑÑ Ð²
акÑÑалÑном ÑоÑÑоÑнии наÑÑ Ð±Ð°Ð·Ñ,\n"
"загÑÑÐ¶Ð°Ñ Ð¿Ð¾Ñление Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² OpenStreetMap."
@@ -204,16 +212,20 @@ msgid ""
"For the map rendering, we use the\n"
"famous <a href=\"http://www.mapnik.org\">Mapnik</a> with the OpenStreetMap\n"
"stylesheet\n"
-"available <a
href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\">in\n"
+"available <a href=\"http://svn.openstreetmap.org/applications/rendering/"
+"mapnik\">in\n"
"OpenStreetMap Subversion repository</a>. Using Mapnik\n"
"and <a href=\"http://cairographics.org/pycairo/\">Cairo</a>, we\n"
"built <i>OCitySMap</i>, a Python module that:"
msgstr ""
"ÐÐ»Ñ Ð¾ÑÑиÑовки каÑÑ Ð¼Ñ Ð¸ÑполÑзÑем
знамениÑÑй\n"
-"<a href=\"http://www.mapnik.org\">Mapnik</a> Ñ ÑаблиÑей ÑÑилей
OpenStreetMap\n"
-"доÑÑÑпной в <a
href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\">Subversion-ÑепозиÑаÑии\n"
+"<a href=\"http://www.mapnik.org\">Mapnik</a> Ñ ÑаблиÑей ÑÑилей
"
+"OpenStreetMap\n"
+"доÑÑÑпной в <a
href=\"http://svn.openstreetmap.org/applications/rendering/"
+"mapnik\">Subversion-ÑепозиÑаÑии\n"
"OpenStreetMap</a>. ÐÑполÑзÑÑ Mapnik и\n"
-"<a href=\"http://cairographics.org/pycairo/\">Cairo</a>, Ð¼Ñ Ñоздали
Python-модÑлÑ\n"
+"<a href=\"http://cairographics.org/pycairo/\">Cairo</a>, Ð¼Ñ Ñоздали
Python-"
+"модÑлÑ\n"
"<i>OCitySMap</i>, коÑоÑÑй:"
#: templates/maposmatic/about.html:78
@@ -264,8 +276,10 @@ msgstr ""
"ÐÑÐ¾Ñ Python-модÑÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ Ñ
помоÑÑÑ ÑÑилиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹\n"
"ÑÑÑоки, вÑ
одÑÑей в OCitySMap, Ñак ÑÑо лÑбой
Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°ÑÑÑоиÑÑ ÑÐ²Ð¾Ñ ÑиÑÑемÑ\n"
"оÑÑиÑовки каÑÑ Ð³Ð¾Ñодов. Ðднако, ÑÑÑановка
ÑазлиÑнÑÑ
компоненÑов доволÑно\n"
-"Ñложна, поÑÑÐ¾Ð¼Ñ Ð¼Ñ Ñоздали неболÑÑой
вебÑеÑÐ²Ð¸Ñ Ð¿Ð¾Ð²ÐµÑÑ
ÑÑого модÑлÑ, Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ\n"
-"коÑоÑого полÑзоваÑели ÑмогÑÑ Ð¿ÑоÑÑо
ÑгенеÑиÑоваÑÑ Ð¸ иÑполÑзоваÑÑ ÐºÐ°ÑÑÑ
гоÑодов\n"
+"Ñложна, поÑÑÐ¾Ð¼Ñ Ð¼Ñ Ñоздали неболÑÑой
вебÑеÑÐ²Ð¸Ñ Ð¿Ð¾Ð²ÐµÑÑ
ÑÑого модÑлÑ, Ñ "
+"помоÑÑÑ\n"
+"коÑоÑого полÑзоваÑели ÑмогÑÑ Ð¿ÑоÑÑо
ÑгенеÑиÑоваÑÑ Ð¸ иÑполÑзоваÑÑ ÐºÐ°ÑÑÑ "
+"гоÑодов\n"
"из OpenStreetMap."
#: templates/maposmatic/about.html:102
@@ -281,7 +295,8 @@ msgid ""
"intensive nature of the map rendering process."
msgstr ""
"ÐебÑеÑÐ²Ð¸Ñ Ð½Ð°Ð·ÑваеÑÑÑ <i>MapOSMatic</i>,\n"
-"как <i>map-o-matic</i>, но Ñ Ñказанием
пÑинадлежноÑÑи к OpenStreetMap (OSM).\n"
+"как <i>map-o-matic</i>, но Ñ Ñказанием
пÑинадлежноÑÑи к OpenStreetMap "
+"(OSM).\n"
"ÐебÑеÑÐ²Ð¸Ñ Ð½Ð°Ð¿Ð¸Ñан на Python\n"
"Ñ Ð¸ÑполÑзованием <a
href=\"http://www.djangoproject.com\">Django</a>. Ðн\n"
"оÑвеÑÐ°ÐµÑ Ð·Ð° ÑоÑ
Ñанение запÑоÑов на
оÑÑиÑÐ¾Ð²ÐºÑ Ð¸ показ ÑезÑлÑÑаÑов\n"
@@ -333,11 +348,13 @@ msgstr ""
#: templates/maposmatic/about.html:131
msgid ""
"The <a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">development\n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev"
+"\">development\n"
" mailing-list</a>;"
msgstr ""
"<a\n"
-"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">СпиÑок
ÑаÑÑÑлки\n"
+"
href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">СпиÑок "
+"ÑаÑÑÑлки\n"
" поÑвÑÑеннÑй ÑазÑабоÑке</a>;"
#: templates/maposmatic/about.html:135
@@ -351,12 +368,14 @@ msgstr ""
#: templates/maposmatic/about.html:138
msgid ""
"The <a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git"
+"\">OCitySMap\n"
" Git repository</a>, which can be cloned using <code>git clone\n"
" git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
msgstr ""
"<a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">Git-ÑепозиÑаÑий
OCitySMap\n"
+" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">Git-"
+"ÑепозиÑаÑий OCitySMap\n"
" </a>, коÑоÑÑй можно ÑклониÑоваÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹\n"
" <code>git://git.sv.gnu.org/maposmatic/ocitysmap.git</code>;"
@@ -368,7 +387,8 @@ msgid ""
" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
msgstr ""
"<a\n"
-"
href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\">Git-ÑепозиÑаÑий
MapOSMatic\n"
+"
href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\">Git-ÑепозиÑаÑий
"
+"MapOSMatic\n"
" </a>, коÑоÑÑй можно ÑклониÑоваÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹\n"
" <code>git clone git://git.sv.gnu.org/maposmatic.git</code>;"
@@ -403,65 +423,23 @@ msgstr ""
"ÐÑа ÑÑÑаниÑа показÑÐ²Ð°ÐµÑ ÑоÑÑоÑние вÑеÑ
запÑоÑов на оÑÑиÑовкÑ,\n"
"полÑÑеннÑÑ
за поÑледние 24 ÑаÑа, наÑÐ¸Ð½Ð°Ñ Ñ
Ñамого нового."
-#: templates/maposmatic/all_jobs.html:49
-#: templates/maposmatic/all_maps.html:40
-msgid "Title"
-msgstr "Ðазвание"
-
-#: templates/maposmatic/all_jobs.html:50
-#: templates/maposmatic/all_maps.html:41
-msgid "Location"
-msgstr "ÐеÑÑноÑÑÑ"
-
-#: templates/maposmatic/all_jobs.html:51
-msgid "Job status"
-msgstr "СоÑÑоÑние заданиÑ"
-
-#: templates/maposmatic/all_jobs.html:52
-msgid "Submission at"
-msgstr "ÐÑпÑавлено"
-
-#: templates/maposmatic/all_jobs.html:53
-msgid "Rendering started at"
-msgstr "ÐÑÑиÑовка запÑÑена"
-
-#: templates/maposmatic/all_jobs.html:54
-msgid "Rendering finished at"
-msgstr "ÐÑÑиÑовка завеÑÑена"
-
-#: templates/maposmatic/all_jobs.html:55
-msgid "Position in queue"
-msgstr "ÐозиÑÐ¸Ñ Ð² оÑеÑеди"
-
-#: templates/maposmatic/all_jobs.html:78
-msgid "not started"
-msgstr "не запÑÑено"
-
-#: templates/maposmatic/all_jobs.html:87
-msgid "not finished"
-msgstr "не завеÑÑено"
-
-#: templates/maposmatic/all_jobs.html:103
-#: templates/maposmatic/all_maps.html:82
+#: templates/maposmatic/all_jobs.html:57 templates/maposmatic/all_maps.html:47
msgid "Previous"
msgstr "ÐÑедÑдÑÑаÑ"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "Page"
msgstr "СÑÑаниÑа"
-#: templates/maposmatic/all_jobs.html:107
-#: templates/maposmatic/all_maps.html:86
+#: templates/maposmatic/all_jobs.html:61 templates/maposmatic/all_maps.html:51
msgid "of"
msgstr "из"
-#: templates/maposmatic/all_jobs.html:111
-#: templates/maposmatic/all_maps.html:90
+#: templates/maposmatic/all_jobs.html:65 templates/maposmatic/all_maps.html:55
msgid "Next"
msgstr "СледÑÑÑаÑ"
-#: templates/maposmatic/all_jobs.html:117
+#: templates/maposmatic/all_jobs.html:71
msgid ""
"No map rendering request since the last 24\n"
"hours."
@@ -469,25 +447,10 @@ msgstr ""
"Ðе бÑло запÑоÑов на оÑÑиÑÐ¾Ð²ÐºÑ ÐºÐ°ÑÑÑ Ð²
поÑледние 24\n"
"ÑаÑа."
-#: templates/maposmatic/all_maps.html:35
-#: templates/maposmatic/base.html:55
+#: templates/maposmatic/all_maps.html:35 templates/maposmatic/base.html:55
msgid "Maps"
msgstr "ÐаÑÑÑ"
-#: templates/maposmatic/all_maps.html:42
-#: templates/maposmatic/job.html:115
-msgid "Thumbnail"
-msgstr "ÐÑкиз"
-
-#: templates/maposmatic/all_maps.html:43
-msgid "Files"
-msgstr "ФайлÑ"
-
-#: templates/maposmatic/all_maps.html:71
-#: templates/maposmatic/job.html:130
-msgid "The generated files are no longer available"
-msgstr "СгенеÑиÑованнÑе ÑÐ°Ð¹Ð»Ñ Ð±Ð¾Ð»ÑÑе не
доÑÑÑпнÑ"
-
#: templates/maposmatic/base.html:49
msgid "Your free city maps!"
msgstr "ÐаÑи ÑвободнÑе каÑÑÑ Ð³Ð¾Ñодов!"
@@ -544,20 +507,22 @@ msgid "Language:"
msgstr "ЯзÑк:"
#: templates/maposmatic/index.html:227
-msgid "This place cannot be rendered by MapOSMatic, administrative boundary
missing. Please contribute !"
-msgstr "ÐÑо меÑÑо не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾ÑÑиÑовано
MapOSMatic, оÑÑÑÑÑÑвÑÐµÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑивнаÑ
гÑаниÑа. ÐожалÑйÑÑа, оÑмеÑÑÑе ее на OpenStreetMap!"
+msgid ""
+"This place cannot be rendered by MapOSMatic, administrative boundary "
+"missing. Please contribute !"
+msgstr ""
+"ÐÑо меÑÑо не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾ÑÑиÑовано MapOSMatic,
оÑÑÑÑÑÑвÑÐµÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑÐ¸Ð²Ð½Ð°Ñ "
+"гÑаниÑа. ÐожалÑйÑÑа, оÑмеÑÑÑе ее на
OpenStreetMap!"
#: templates/maposmatic/index.html:240
msgid "No results found."
msgstr "РезÑлÑÑаÑов не найдено."
-#: templates/maposmatic/index.html:252
-#: templates/maposmatic/index.html:329
+#: templates/maposmatic/index.html:252 templates/maposmatic/index.html:329
msgid "Generate"
msgstr "СоздаÑÑ"
-#: templates/maposmatic/index.html:258
-#: templates/maposmatic/index.html:330
+#: templates/maposmatic/index.html:258 templates/maposmatic/index.html:330
msgid "Please fill in the form before trying to proceed"
msgstr "ÐожалÑйÑÑа, заполниÑе ÑоÑмÑ"
@@ -582,11 +547,13 @@ msgid ""
msgstr ""
"MapOSMatic â оÑнованнÑй на Ñвободном ÐÐ
вебÑеÑвиÑ,\n"
"позволÑÑÑий генеÑиÑоваÑÑ ÐºÐ°ÑÑÑ Ð³Ð¾Ñодов
иÑполÑзÑÑ Ð´Ð°Ð½Ð½Ñе\n"
-"<a href=\"http://www.openstreetmap.org\">OpenStreetMap</a>.
Ð¡Ð¾Ð·Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ°ÑÑа гоÑода\n"
+"<a href=\"http://www.openstreetmap.org\">OpenStreetMap</a>.
Ð¡Ð¾Ð·Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ°ÑÑа "
+"гоÑода\n"
"вклÑÑÐ°ÐµÑ Ð´Ð²Ðµ ÑÑÑаниÑÑ:"
#: templates/maposmatic/index.html:305
-msgid "The map itself, splitted in squares allowing to easily look for
streets;"
+msgid ""
+"The map itself, splitted in squares allowing to easily look for streets;"
msgstr "Сама каÑÑа, ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ Ð½Ð° квадÑаÑÑ,
позволÑÑÑие наÑ
одиÑÑ ÑлиÑÑ."
#: templates/maposmatic/index.html:306
@@ -611,7 +578,8 @@ msgid ""
msgstr ""
"Так как Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑаÑии каÑÑÑ Ð¸ÑполÑзÑÑÑÑÑ
даннÑе из OpenStreetMap,\n"
"Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе Ñвободно (под ÑÑловиÑми <a\n"
-"href=\"http://wiki.openstreetmap.org/wiki/License\">лиÑензии
OpenStreetMap)</a>)\n"
+"href=\"http://wiki.openstreetmap.org/wiki/License\">лиÑензии
OpenStreetMap)</"
+"a>)\n"
"иÑполÑзоваÑÑ, пÑодаваÑÑ, модиÑиÑиÑоваÑÑ,
... ÑгенеÑиÑованнÑе\n"
"каÑÑÑ."
@@ -654,7 +622,8 @@ msgid ""
"that are country specific."
msgstr ""
"<em>MapOSMatic</em> покÑÑÐ²Ð°ÐµÑ Ð²ÐµÑÑ Ð¼Ð¸Ñ, но нам
нÑжнÑ\n"
-"желаÑÑие помоÑÑ Ð² пеÑеводаÑ
на ÑзÑки и
адапÑаÑии некоÑоÑÑÑ
ÑаÑÑей <em>MapOSMatic</em>,\n"
+"желаÑÑие помоÑÑ Ð² пеÑеводаÑ
на ÑзÑки и
адапÑаÑии некоÑоÑÑÑ
ÑаÑÑей "
+"<em>MapOSMatic</em>,\n"
"коÑоÑÑе ÑпеÑиÑиÑÐ½Ñ Ð´Ð»Ñ Ð¾ÑделÑнÑÑ
ÑÑÑан."
#: templates/maposmatic/index.html:380
@@ -695,65 +664,148 @@ msgid ""
msgstr ""
"Ðак ÑолÑко задание в оÑеÑÐµÐ´Ñ Ð½Ð° оÑÑиÑовкÑ
ÑоздаÑÑÑÑ, \n"
"Ð²Ñ Ð±ÑдеÑе напÑÐ°Ð²Ð»ÐµÐ½Ñ Ð½Ð° ÑÑÑаниÑÑ,
показÑваÑÑÑÑ ÑоÑÑоÑние заданиÑ
оÑÑиÑовки.\n"
-"Ðак ÑолÑко оÑÑиÑовка завеÑÑиÑÑÑ (ÑÑо
Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð½ÑÑÑ Ð½ÐµÐºÐ¾ÑоÑое вÑÐµÐ¼Ñ Ð²
завиÑимоÑÑи\n"
-"Ð¾Ñ Ð·Ð°Ð³ÑÑженноÑÑи оÑеÑеди), ÑÑа ÑÑÑаниÑа
бÑÐ´ÐµÑ ÑодеÑжаÑÑ ÑÑÑлки на
ÑгенеÑиÑованнÑÑ\n"
+"Ðак ÑолÑко оÑÑиÑовка завеÑÑиÑÑÑ (ÑÑо
Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð½ÑÑÑ Ð½ÐµÐºÐ¾ÑоÑое вÑÐµÐ¼Ñ Ð² "
+"завиÑимоÑÑи\n"
+"Ð¾Ñ Ð·Ð°Ð³ÑÑженноÑÑи оÑеÑеди), ÑÑа ÑÑÑаниÑа
бÑÐ´ÐµÑ ÑодеÑжаÑÑ ÑÑÑлки на "
+"ÑгенеÑиÑованнÑÑ\n"
"каÑÑÑ."
-#: templates/maposmatic/job.html:38
-#, python-format
-msgid "Map <i>%(job_t)s</i> Status"
-msgstr "СоÑÑоÑние каÑÑÑ <i>%(job_t)s</i>"
-
-#: templates/maposmatic/job.html:43
-msgid "You have been redirected to a similar map, rendered less than 24 hours
ago."
-msgstr "ÐÑ Ð±Ñли пеÑенапÑÐ°Ð²Ð»ÐµÐ½Ñ Ð½Ð° поÑ
ожÑÑ
каÑÑÑ, оÑÑиÑованнÑÑ Ð¼ÐµÐ½ÐµÐµ Ñем 24 ÑаÑа назад."
+#: templates/maposmatic/job-page.html:43
+msgid ""
+"You have been redirected to a similar map, rendered less than 24 hours ago."
+msgstr ""
+"ÐÑ Ð±Ñли пеÑенапÑÐ°Ð²Ð»ÐµÐ½Ñ Ð½Ð° поÑ
ожÑÑ ÐºÐ°ÑÑÑ,
оÑÑиÑованнÑÑ Ð¼ÐµÐ½ÐµÐµ Ñем 24 ÑаÑа "
+"назад."
-#: templates/maposmatic/job.html:51
+#: templates/maposmatic/job-page.html:51
msgid "Refresh the status"
msgstr "ÐбновиÑÑ ÑоÑÑоÑние"
-#: templates/maposmatic/job.html:56
-msgid "Map title"
-msgstr "Ðаголовок каÑÑÑ"
+#: 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:44
+#, fuzzy
+msgid "Rendering: "
+msgstr "ÐÑÑиÑовка завеÑÑена ÑдаÑно"
+
+#: templates/maposmatic/job.html:45
+#, fuzzy
+msgid "Rendering submitted"
+msgstr "ÐÑÑиÑовка запÑÑена"
+
+#: 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 "ÐÑполнÑеÑÑÑ Ð¾ÑÑиÑовка"
+
+#: templates/maposmatic/job.html:61 templates/maposmatic/map.html:45
+#, fuzzy
+msgid "Files: "
+msgstr "ФайлÑ"
+
+#: templates/maposmatic/job.html:63 templates/maposmatic/map.html:47
+#, fuzzy
+msgid "Map: "
+msgstr "ÐаÑÑÑ"
+
+#: 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 "СгенеÑиÑованнÑе ÑÐ°Ð¹Ð»Ñ Ð±Ð¾Ð»ÑÑе не
доÑÑÑпнÑ"
+
+#: templates/maposmatic/map.html:42
+#, fuzzy
+msgid "Rendering completed on"
+msgstr "ÐÑÑиÑовка запÑÑена"
+
+#~ msgid "Title"
+#~ msgstr "Ðазвание"
+
+#~ msgid "Location"
+#~ msgstr "ÐеÑÑноÑÑÑ"
+
+#~ msgid "Job status"
+#~ msgstr "СоÑÑоÑние заданиÑ"
+
+#~ msgid "Submission at"
+#~ msgstr "ÐÑпÑавлено"
+
+#~ msgid "Rendering finished at"
+#~ msgstr "ÐÑÑиÑовка завеÑÑена"
+
+#~ msgid "Position in queue"
+#~ msgstr "ÐозиÑÐ¸Ñ Ð² оÑеÑеди"
+
+#~ msgid "not started"
+#~ msgstr "не запÑÑено"
+
+#~ msgid "not finished"
+#~ msgstr "не завеÑÑено"
+
+#~ msgid "Thumbnail"
+#~ msgstr "ÐÑкиз"
+
+#~ msgid "Map <i>%(job_t)s</i> Status"
+#~ msgstr "СоÑÑоÑние каÑÑÑ <i>%(job_t)s</i>"
-#: templates/maposmatic/job.html:61
-msgid "Administrative city"
-msgstr "ÐоÑод (админиÑÑÑаÑÐ¸Ð²Ð½Ð°Ñ Ð³ÑаниÑа)"
+#~ msgid "Map title"
+#~ msgstr "Ðаголовок каÑÑÑ"
-#: templates/maposmatic/job.html:66
-msgid "Bounding-box coordinates"
-msgstr "ÐооÑдинаÑÑ Ð¿ÑÑмоÑголÑной облаÑÑи"
+#~ msgid "Administrative city"
+#~ msgstr "ÐоÑод (админиÑÑÑаÑÐ¸Ð²Ð½Ð°Ñ Ð³ÑаниÑа)"
-#: templates/maposmatic/job.html:76
-msgid "Status"
-msgstr "СоÑÑоÑние"
+#~ msgid "Bounding-box coordinates"
+#~ msgstr "ÐооÑдинаÑÑ Ð¿ÑÑмоÑголÑной облаÑÑи"
-#: templates/maposmatic/job.html:80
-msgid "Submission time"
-msgstr "ÐÑÐµÐ¼Ñ ÑозданиÑ"
+#~ msgid "Status"
+#~ msgstr "СоÑÑоÑние"
-#: templates/maposmatic/job.html:84
-msgid "Start of rendering time"
-msgstr "ÐÑÐµÐ¼Ñ Ð½Ð°Ñала оÑÑиÑовки"
+#~ msgid "Submission time"
+#~ msgstr "ÐÑÐµÐ¼Ñ ÑозданиÑ"
-#: templates/maposmatic/job.html:87
-#: templates/maposmatic/job.html.py:100
-msgid "Rendering not started yet"
-msgstr "ÐÑÑиÑовка еÑе не наÑаÑа"
+#~ msgid "Start of rendering time"
+#~ msgstr "ÐÑÐµÐ¼Ñ Ð½Ð°Ñала оÑÑиÑовки"
-#: templates/maposmatic/job.html:94
-msgid "End of rendering time"
-msgstr "ÐÑÐµÐ¼Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ Ð¾ÑÑиÑовки"
+#~ msgid "Rendering not started yet"
+#~ msgstr "ÐÑÑиÑовка еÑе не наÑаÑа"
-#: templates/maposmatic/job.html:103
-msgid "Rendering not finished yet"
-msgstr "ÐÑÑиÑовка еÑе не завеÑÑена"
+#~ msgid "End of rendering time"
+#~ msgstr "ÐÑÐµÐ¼Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ Ð¾ÑÑиÑовки"
-#: templates/maposmatic/job.html:109
-msgid "Current position in queue"
-msgstr "ТекÑÑÐ°Ñ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ñ Ð² оÑеÑеди"
+#~ msgid "Rendering not finished yet"
+#~ msgstr "ÐÑÑиÑовка еÑе не завеÑÑена"
-#: templates/maposmatic/job.html:123
-msgid "Result files"
-msgstr "Ð¤Ð°Ð¹Ð»Ñ ÑезÑлÑÑаÑа"
+#~ msgid "Current position in queue"
+#~ msgstr "ТекÑÑÐ°Ñ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ñ Ð² оÑеÑеди"
+#~ msgid "Result files"
+#~ 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 <=
- [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, 2010/01/10
- [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