From 9648ce786b1693ae9dcf9e381d68fc42015d7948 Mon Sep 17 00:00:00 2001 From: David MENTRE Date: Fri, 29 Jan 2010 19:31:37 +0100 Subject: [PATCH maposmatic] Fix issues in Croatian translation * Synchronize hr_HR translation with latest Django code. * Restore correct encoding of "<" and ">" and so on that were encoded as "<", ">" and so on. * Remove two translations that were present twice. * Mark all translated sentences as non-fuzzy so they are taken into account when producing .mo file. --- www/locale/hr_HR/LC_MESSAGES/django.po | 274 ++++++++++++++++---------------- 1 files changed, 139 insertions(+), 135 deletions(-) diff --git a/www/locale/hr_HR/LC_MESSAGES/django.po b/www/locale/hr_HR/LC_MESSAGES/django.po index 156da14..2ae79dc 100644 --- a/www/locale/hr_HR/LC_MESSAGES/django.po +++ b/www/locale/hr_HR/LC_MESSAGES/django.po @@ -13,67 +13,67 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see . # msgid "" msgstr "" "Project-Id-Version: mapOSMatic 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-19 16:31+0100\n" -"PO-Revision-Date: 2010-01-21 13:40+0100\n" -"Last-Translator: Marjan Vrban \n" -"Language-Team: FR <address@hidden>\n" +"POT-Creation-Date: 2010-01-29 19:14+0100\n" +"PO-Revision-Date: 2010-01-29 19:29+0100\n" +"Last-Translator: David MENTRÉ \n" +"Language-Team: FR \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:155 +#: settings.py:156 msgid "No localization" msgstr "Nema lokalizacije" -#: maposmatic/models.py:146 -#, python-format -msgid "%(title)s %(format)s Map" -msgstr "%(title)s %(format)s" - -#: maposmatic/models.py:150 -#, python-format -msgid "%(title)s %(format)s Index" -msgstr "%(title)s %(format)s - popis ulica" - -#: maposmatic/views.py:101 +#: maposmatic/forms.py:53 msgid "Administrative boundary" msgstr "Administrativna granica" -#: maposmatic/views.py:102 +#: maposmatic/forms.py:54 msgid "Bounding box" msgstr "Područje (granični okvir)" -#: maposmatic/views.py:105 +#: maposmatic/forms.py:59 msgid "Area" msgstr "Područje" -#: maposmatic/views.py:121 +#: maposmatic/forms.py:84 msgid "Administrative city required" msgstr "Ime grada je obavezno" -#: maposmatic/views.py:137 +#: maposmatic/forms.py:100 #, python-format msgid "Error with osm city: %s" msgstr "Greška s osm gradom: %s" -#: maposmatic/views.py:142 +#: maposmatic/forms.py:105 msgid "Map title required" msgstr "Naslov karte je obavezan" -#: maposmatic/views.py:150 +#: maposmatic/forms.py:113 msgid "Required" msgstr "Obavezno" -#: maposmatic/views.py:166 +#: maposmatic/forms.py:129 msgid "Bounding Box too large" msgstr "Granični okvir je prevelik" +#: maposmatic/models.py:146 +#, python-format +msgid "%(title)s %(format)s Map" +msgstr "%(title)s %(format)s" + +#: maposmatic/models.py:150 +#, python-format +msgid "%(title)s %(format)s Index" +msgstr "%(title)s %(format)s - popis ulica" + #: maposmatic/templatetags/extratags.py:40 msgid "Waiting rendering" msgstr "Čekam na izradu (rendering)" @@ -105,8 +105,8 @@ msgid "Not Found (404)" msgstr "Nije nađeno (404)" #: templates/404.html:8 -msgid "Not Found <em>(404)</em>" -msgstr "Nije nađeno <em>(404)</em>" +msgid "Not Found (404)" +msgstr "Nije nađeno (404)" #: templates/404.html:9 msgid "Not Found." @@ -121,8 +121,8 @@ msgid "Server error (500)" msgstr "Greška poslužitelja (500)" #: templates/500.html:8 -msgid "Server Error <em>(500)</em>" -msgstr "Greška poslužitelja <em>500</em>" +msgid "Server Error (500)" +msgstr "Greška poslužitelja (500)" #: templates/500.html:9 msgid "There's been an error." @@ -140,32 +140,32 @@ msgstr "Povijest" #: templates/maposmatic/about.html:39 msgid "" "MapOSMatic has been started thanks to an idea of\n" -"Gilles Lamiral, an <a\n" -"href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and free\n" +"Gilles Lamiral, an OpenStreetMap 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" -"met together during a one-week <em>Hackfest</em> in August 2009 and\n" +"crazy hackers\n" +"met together during a one-week Hackfest 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" +"named the project MapOSMatic. The group of crazy\n" "hackers would like to thank Gilles for sharing his bright\n" "idea!" msgstr "" -"MapOSMatic je započet zahvaljujući ideji Gilles Lamiral-a, softverskog doprinositelja <a href=\"http://www.openstreetmap.org\">OpenStreetMap</a> iz područja Rennes-a, Francuska. Iz njegove ideje, skupinaf\n" -"ludih <a\n" -"href=\"http://en.wikipedia.org/wiki/Hacker_%28programmer_subculture%29\">hakera</a>\n" -"okupila se tijekom jednog tjedna <em>Hackfest</em> u kolovozu 2009 i\n" +"MapOSMatic je započet zahvaljujući ideji Gilles Lamiral-a, softverskog doprinositelja OpenStreetMap iz područja Rennes-a, Francuska. Iz njegove ideje, skupinaf\n" +"ludih hakera\n" +"okupila se tijekom jednog tjedna Hackfest u kolovozu 2009 i\n" "oživjela ideju Gilles Lamiral-a u programski kod i\n" -"nazvala projekt <strong>MapOSMatic</strong>. Gruša ludih \n" +"nazvala projekt MapOSMatic. Gruša ludih \n" "hakera želi zahvaliti Gilles-u za sjajnu\n" "ideju!" #: templates/maposmatic/about.html:53 msgid "" "Of course, MapOSMatic is fully free software,\n" -"licensed under the <a\n" -"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPLv3</a>.\n" -msgstr "Naravno, MapOSMatic je potpuno slobodan softver, pod dozvolom <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPLv3</a>.\n" +"licensed under the AGPLv3.\n" +msgstr "Naravno, MapOSMatic je potpuno slobodan softver, pod dozvolom AGPLv3.\n" #: templates/maposmatic/about.html:60 msgid "How does it work?" @@ -173,39 +173,39 @@ msgstr "Kako to radi?" #: 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" -"href=\"http://postgis.refractions.net\">PostGIS</a> extension. In this\n" -"PostgreSQL server, we have loaded the <a\n" -"href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\">OpenStreetMap\n" -"data for the whole world</a> using the <a\n" -"href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\">osm2pgsql</a>\n" -"tool. The same tool is also used to apply <a\n" -"href=\"http://planet.openstreetmap.org/daily/\">daily differences</a> of\n" +"On our server, we run a PostgreSQL server, with the PostGIS extension. In this\n" +"PostgreSQL server, we have loaded the OpenStreetMap\n" +"data for the whole world using the osm2pgsql\n" +"tool. The same tool is also used to apply daily differences of\n" "the database, which allows to keep it up to date with the new\n" "contributions of OpenStreetMap users." msgstr "" -"Na našem poslužitelju vrtimo, <a href=\"http://www.postgresql.org\">PostgreSQL</a> s ekstenzijom <a href=\"http://postgis.refractions.net\">PostGIS</a>. U PostgreSQL poslužitelj smo učitali <a href=\"http://wiki.openstreetmap.org/wiki/Planet.osm\">podatke OpenStreetMap za cijeli Svijet</a> koristeći <a\n" -"href=\"http://wiki.openstreetmap.org/wiki/Osm2pgsql\">osm2pgsql</a>. Isti alat je korišten za ažuriranje <a\n" -"href=\"http://planet.openstreetmap.org/daily/\">dnevnih promjena</a> baze podataka, tako da držimo korak s novim doprinosima OpenStreetMap korisnika." +"Na našem poslužitelju vrtimo, PostgreSQL s ekstenzijom PostGIS. U PostgreSQL poslužitelj smo učitali podatke OpenStreetMap za cijeli Svijet koristeći osm2pgsql. Isti alat je korišten za ažuriranje dnevnih promjena baze podataka, tako da držimo korak s novim doprinosima OpenStreetMap korisnika." #: 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" +"famous Mapnik with the OpenStreetMap\n" "stylesheet\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:" +"available in\n" +"OpenStreetMap Subversion repository. Using Mapnik\n" +"and Cairo, we\n" +"built OCitySMap, a Python module that:" msgstr "" "Za izradu (renderiranje) karti, koristimo \n" -"poznati <a href=\"http://www.mapnik.org\">Mapnik</a> s OpenStreetMap\n" +"poznati Mapnik s OpenStreetMap\n" "stylesheet-ovima \n" -"dostupni na <a href=\"http://svn.openstreetmap.org/applications/rendering/mapnik\">in\n" -"OpenStreetMap Subversion repository</a>. Koristeći Mapnik\n" -"and <a href=\"http://cairographics.org/pycairo/\">Cairo</a>, napravili smo\n" -" <i>OCitySMap</i>, a Python module koji:" +"dostupni na in\n" +"OpenStreetMap Subversion repository. Koristeći Mapnik\n" +"and Cairo, napravili smo\n" +" OCitySMap, a Python module koji:" #: templates/maposmatic/about.html:87 msgid "" @@ -261,36 +261,36 @@ msgstr "" #: 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" +"This web service has been called MapOSMatic,\n" +"like map-o-matic but with a reference to OpenStreetMap (OSM). The\n" "web service is written in Python\n" -"using <a href=\"http://www.djangoproject.com\">Django</a>. It is\n" +"using Django. It is\n" "responsible for storing the rendering requests and displaying the result\n" "of these requests. The rendering itself takes place asynchronously\n" -"through the <i>maposmaticd</i> daemon. This daemon does only one\n" +"through the maposmaticd daemon. This daemon does only one\n" "rendering at a time, which is very important because of the CPU and I/O\n" "intensive nature of the map rendering process." msgstr "" -"Ovaj web servis se zove <i>MapOSMatic</i>,\n" -"like <i>map-o-matic</i> sa referencom na OpenStreetMap (OSM). \n" +"Ovaj web servis se zove MapOSMatic,\n" +"like map-o-matic sa referencom na OpenStreetMap (OSM). \n" "Web servis je pisan u Python-u\n" -"koristeći <a href=\"http://www.djangoproject.com\">Django</a>. On je \n" +"koristeći Django. On je \n" "odgovoran za pohranjivanje zahtjeva za izradu i prikazivanje rezultata\n" "tih zahtjeva. Izrada (rendering) se odvija asinhrono\n" -"kroz the <i>maposmaticd</i> daemon. Ovaj daemon radi samo jednu\n" +"kroz the maposmaticd daemon. Ovaj daemon radi samo jednu\n" "izradu (rendering) u momentu, što je vrlovažno zbog CPU i I/O\n" "koji je intenzivne prirode pri izradi karti." #: 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" +"For the city search engine, we use the wonderful Nominatim service. This\n" "service made it really simple to provide a nice search engine that\n" "allows to select between multiple cities of the same name, by\n" "providing informations on the city location." msgstr "" -"Za traženje gradova, koristimo odličan <a\n" -"href=\"http://nominatim.openstreetmap.org\">Nominatim</a> servis. Ovaj\n" +"Za traženje gradova, koristimo odličan Nominatim servis. Ovaj\n" "servis je pojednostavio traženje i dozvoljava\n" "izbor izbeđu nekoliko gradova sličnog imena, davajući\n" "informacije o lokaciji grada." @@ -301,84 +301,84 @@ msgstr "Doprinjeli" #: 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" +"As stated above, both OCitySMap and\n" +"MapOSMatic are fully free software, so you're invited to\n" "contribute. Here are the few starting points to help\n" "us:" msgstr "" -"Kako je gore rečeno, <i>OCitySMap</i> i\n" -"<i>MapOSMatic</i> su potpuno slobodan software, tako da si i ti pozvan\n" +"Kako je gore rečeno, OCitySMap i\n" +"MapOSMatic su potpuno slobodan software, tako da si i ti pozvan\n" "doprinjeti. Ovdje je nekoliko početnih točaka za pomoć:" #: templates/maposmatic/about.html:140 msgid "" "The\n" -" <a href=\"https://wiki.maposmatic.org\">MapOSMatic Wiki</a>,\n" +" MapOSMatic Wiki,\n" " which contains valuable technical information and documents about\n" " MapOSMatic;" msgstr "" -" <a href=\"https://wiki.maposmatic.org\">MapOSMatic Wiki</a>,\n" +" MapOSMatic Wiki,\n" " koji sadrži vrijedne tehničke informacije i dokumente o MapOSMatic;" #: templates/maposmatic/about.html:144 msgid "" -"The <a\n" -" href=\"https://savannah.nongnu.org/projects/maposmatic/\">project on\n" -" Savannah</a>;" +"The project on\n" +" Savannah;" msgstr "" -" <a\n" -" href=\"https://savannah.nongnu.org/projects/maposmatic/\">projekt na\n" -" Savannah</a>&nbsp;;" +" projekt na\n" +" Savannah;" #: templates/maposmatic/about.html:147 msgid "" -"The <a\n" -" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">development\n" -" mailing-list</a>;" +"The development\n" +" mailing-list;" msgstr "" -" <a\n" -" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">development\n" -" mailing-lista</a>;" +" development\n" +" mailing-lista;" #: templates/maposmatic/about.html:150 msgid "" -"The IRC channel <tt>#maposmatic</tt> on\n" +"The IRC channel #maposmatic on\n" " Freenode;" -msgstr "IRC kanal <tt>#maposmatic</tt> na Freenode&nbsp;;" +msgstr "IRC kanal #maposmatic na Freenode;" #: templates/maposmatic/about.html:152 msgid "" -"The <a\n" -" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">OCitySMap\n" -" Git repository</a>, which can be cloned using <tt>git clone\n" -" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;" +"The OCitySMap\n" +" Git repository, which can be cloned using git clone\n" +" git://git.sv.gnu.org/maposmatic/ocitysmap.git;" msgstr "" -" <a\n" -" href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">OCitySMap\n" -" Git repository</a>, koji se može klonirati koristeći <tt>git clone\n" -" git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;" +" OCitySMap\n" +" Git repository, koji se može klonirati koristeći git clone\n" +" git://git.sv.gnu.org/maposmatic/ocitysmap.git;" #: templates/maposmatic/about.html:156 msgid "" -"The <a\n" -" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\">MapOSMatic\n" -" Git repository</a>, which can be cloned using\n" -" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;" +"The MapOSMatic\n" +" Git repository, which can be cloned using\n" +" git clone git://git.sv.gnu.org/maposmatic.git;" msgstr "" -" <a\n" -" href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\">MapOSMatic\n" -" Git repository</a>, koji se može klonirati koristeći\n" -" <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;" +" MapOSMatic\n" +" Git repository, koji se može klonirati koristeći\n" +" git clone git://git.sv.gnu.org/maposmatic.git;" #: templates/maposmatic/about.html:160 msgid "" -"<a\n" -" href=\"https://savannah.nongnu.org/task/?group=maposmatic\">TODO-list\n" -" and ideas</a>." +"TODO-list\n" +" and ideas." msgstr "" -"<a\n" -" href=\"https://savannah.nongnu.org/task/?group=maposmatic\">TODO-list\n" -" i ideje</a>." +"TODO-list\n" +" i ideje." #: templates/maposmatic/about.html:167 msgid "Authors" @@ -425,6 +425,10 @@ msgstr "" msgid "dutch translation" msgstr "" +#: templates/maposmatic/about.html:190 +msgid "croatian translation" +msgstr "" + #: templates/maposmatic/all_jobs.html:35 msgid "Job list" msgstr "Lista zadataka" @@ -561,10 +565,10 @@ msgstr "Kazalo ulica" msgid "" "MapOSMatic is a free software web service that\n" "allows you to generate maps of cities using\n" -"<a href=\"http://www.openstreetmap.org\">OpenStreetMap</a> data. A city map\n" +"OpenStreetMap data. A city map\n" "is made of two pages:" msgstr "" -"MapOSMatic je slobodan web uslužni softvare koji omogućuje izradu karti gradova koristeći <a href=\"http://www.openstreetmap.org\">OpenStreetMap</a> podatke. Karta grada je \n" +"MapOSMatic je slobodan web uslužni softvare koji omogućuje izradu karti gradova koristeći OpenStreetMap podatke. Karta grada je \n" "napravljena u dva dijela:" #: templates/maposmatic/index.html:60 @@ -584,15 +588,15 @@ msgstr "Izrađene karte su dostupne u PNG, PDF i SVG i spreme su za tisak." #: templates/maposmatic/index.html:70 msgid "" "As the data used to generate maps is coming from\n" -"OpenStreetMap, you can freely (under the <a\n" -"href=\"http://wiki.openstreetmap.org/wiki/License\">terms of\n" -"OpenStreetMap license</a>) reuse, sell, modify, ... the generated\n" +"OpenStreetMap, you can freely (under the terms of\n" +"OpenStreetMap license) reuse, sell, modify, ... the generated\n" "maps." msgstr "" "Kako podaci za izradu dolaze s \n" -"OpenStreetMap, možete slobodno (pod <a\n" -"href=\"http://wiki.openstreetmap.org/wiki/License\">uvijetima\n" -"OpenStreetMap dozvole</a>) koristiti, prodavati i modificirati, ... izrađene \n" +"OpenStreetMap, možete slobodno (pod uvijetima\n" +"OpenStreetMap dozvole) koristiti, prodavati i modificirati, ... izrađene \n" "karte." #: templates/maposmatic/index.html:79 @@ -671,10 +675,10 @@ msgstr "Izradi svoju kartu" #: templates/maposmatic/new.html:41 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" +"MapOSMatic covers the whole world but we need\n" +"contributors to translate and adapt the few parts of MapOSMatic\n" "that are country specific." -msgstr "<em>MapOSMatic</em> couvre le monde entier mais nous avons besoin de contributeurs pour traduire et adapter les quelques parties de <em>MapOSMatic</em> qui sont spécifiques à un pays donné." +msgstr "MapOSMatic couvre le monde entier mais nous avons besoin de contributeurs pour traduire et adapter les quelques parties de MapOSMatic qui sont spécifiques à un pays donné." #: templates/maposmatic/new.html:47 msgid "" @@ -684,18 +688,18 @@ msgstr "ZA izbor grada za izradu karte, postoje dva načina (moda):" #: templates/maposmatic/new.html:52 msgid "" -"<em>Using an administrative boundary</em>. It allows\n" +"Using an administrative boundary. It allows\n" " to get a map with precise boundaries of the city when such limits are\n" " available in the database. Otherwise, you need to use a bounding\n" " box." msgstr "" -"<em>Koristeći administrativne granice</em>. To dozvoljava\n" +"Koristeći administrativne granice. To dozvoljava\n" " da se dobije karta s preciznim granicama grada kada su takve granice \n" " dostupne u pazi podataka. U drugom slučaju, trebate koristiti granični okvir." #: templates/maposmatic/new.html:56 -msgid "<em>Using a traditional bounding box</em>." -msgstr "<em>Koristeći tradicionalni granični okvir</em>." +msgid "Using a traditional bounding box." +msgstr "Koristeći tradicionalni granični okvir." #: templates/maposmatic/new.html:60 msgid "" @@ -735,8 +739,8 @@ msgid "Generate" msgstr "Izradi..." #: templates/maposmatic/new.html:106 -msgid "Wondering why you can't choose some of these results?<br />Their administrative boundaries are missing from the OSM database.<br />Look at the <a href=\"http://wiki.maposmatic.org/doku.php?id=faq\">FAQ</a> for more details." -msgstr "Pitate se zašto ne možete izabrati neke od ovih rezultata?<br />Njihove administrativne granice nedostaju u OSM bazi podataka.<br />Pogedajte <a href=\"http://wiki.maposmatic.org/doku.php?id=faq\">FAQ</a> za više detalja." +msgid "Wondering why you can't choose some of these results?
Their administrative boundaries are missing from the OSM database.
Look at the FAQ for more details." +msgstr "Pitate se zašto ne možete izabrati neke od ovih rezultata?
Njihove administrativne granice nedostaju u OSM bazi podataka.
Pogedajte FAQ za više detalja." #: templates/maposmatic/new.html:107 msgid "No results." -- 1.6.3.3