diff --git a/CHANGES.txt b/CHANGES.txt index aad80770..71a92bf8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,44 @@ -master - * Drop support for Django versions before 1.8. #209 +Version 1.5, 2016-09-22 + * Add support for Django 1.9 and 1.10, drop older than 1.8. #209 #248 + * Add support for Debian jessie/Ubuntu xenial. #254 #255 + * Add documentation for the /code API endpoint. #242 + * Add new footer. #238 + * Area import + * Allow name_field to specify multiple options. + * Add option to skip entries with blank names. + * Postcode import + * Add detecting location availability per postcode. + * Allow updating locationless postcodes. + * Bugfixes: + * Only try and set GDAL exceptions on first use. #211 #231 + * Fix redirects when MapIt is mounted on a subpath. #228 #236 + * No need for a syncdb call, now covered by migrate. #221 + * Fix and improve JSONP middleware handling. #212 + * Disable project gzip middleware. #215 + * Tweak install script for if sudo is not installed. + * Fix usage of imp module in newer Python versions. + * Development: + * Add VagrantFile and instructions for development. #237 + * Allow overriding of email subject prefix. #229 + * Add postgresql to SysV init script. #234 + * Switch api-docs ID to sidebar class for other use. #246 + * Add a couple of index page template hooks. + * Don't show deprecation warnings by default. + * Move to using libsass. * MapIt Global specific: - Fix issue parsing KML in python2 prior to 2.7.4. #206 + * Fix issue parsing KML in python2 prior to 2.7.4. #206 + * Add a missing '{% load i18n %}' which broke front page + * MapIt UK specific: + * ONSPD import and improvements. #214 #216 + * October 2015 Boundary-Line. #210 #232 + * May 2016 Boundary-Line. #240 + * Script to add ONS codes to forward release. + * OSNI boundary data import. + * Open CSV files with the correct encoding. #225 + +Thanks to Steven Day, Simon Hughesdon, Isabell Long, Mark Longair, Sym Roe, +Matthew Somerville, Murray Steele, and Zarino Zappia for their work on this +release. v1.4, 2015-09-18 * Mark all strings for translation. #185 diff --git a/mapit/locale/it/LC_MESSAGES/django.po b/mapit/locale/it/LC_MESSAGES/django.po index d66865db..e289ca8c 100644 --- a/mapit/locale/it/LC_MESSAGES/django.po +++ b/mapit/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-18 17:20+0100\n" +"POT-Creation-Date: 2016-09-22 18:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: shortcuts.py:55 templates/mapit/areas.html:6 +#: shortcuts.py:34 templates/mapit/areas.html:6 msgid "No matching areas found." msgstr "Nessun area trovata" @@ -46,64 +46,65 @@ msgstr "500 Errore interno del server" msgid "Sorry, something's gone wrong." msgstr "Spiacenti, qualcosa è andato storto." -#: templates/mapit/api/area.html:4 +#: templates/mapit/api/area.html:3 msgid "lookup by area" msgstr "ricerca per area" -#: templates/mapit/api/area.html:8 +#: templates/mapit/api/area.html:7 msgid "URL" msgstr "" -#: templates/mapit/api/area.html:11 +#: templates/mapit/api/area.html:10 msgid "area ID or ONS code" msgstr "ID dell'area o codice ONS" -#: templates/mapit/api/area.html:13 templates/mapit/api/area.html.py:19 -#: templates/mapit/api/area.html:21 templates/mapit/api/area.html.py:22 -#: templates/mapit/api/area.html:23 templates/mapit/api/area.html.py:50 -#: templates/mapit/api/area.html:51 templates/mapit/api/area.html.py:53 -#: templates/mapit/api/area.html:54 templates/mapit/api/area.html.py:55 -#: templates/mapit/api/area.html:56 templates/mapit/api/area.html.py:57 +#: templates/mapit/api/area.html:12 templates/mapit/api/area.html.py:18 +#: templates/mapit/api/area.html:20 templates/mapit/api/area.html.py:21 +#: templates/mapit/api/area.html:22 templates/mapit/api/area.html.py:49 +#: templates/mapit/api/area.html:50 templates/mapit/api/area.html.py:52 +#: templates/mapit/api/area.html:53 templates/mapit/api/area.html.py:54 +#: templates/mapit/api/area.html:55 templates/mapit/api/area.html.py:56 msgid "area ID" msgstr "ID dell'area" -#: templates/mapit/api/area.html:16 +#: templates/mapit/api/area.html:15 msgid "OSM relation ID" msgstr "ID della relazione OSM" -#: templates/mapit/api/area.html:17 +#: templates/mapit/api/area.html:16 msgid "OSM way ID" msgstr "ID della via OSM" -#: templates/mapit/api/area.html:22 +#: templates/mapit/api/area.html:21 msgid "kml or geojson or wkt" msgstr "kml o geojson o wkt" -#: templates/mapit/api/area.html:23 +#: templates/mapit/api/area.html:22 msgid "SRID" msgstr "" -#: templates/mapit/api/area.html:23 +#: templates/mapit/api/area.html:22 msgid "kml or json or wkt" msgstr "kml o json o wkt" -#: templates/mapit/api/area.html:25 templates/mapit/api/area.html.py:60 -#: templates/mapit/api/areas.html:22 templates/mapit/api/postcode.html:22 +#: templates/mapit/api/area.html:24 templates/mapit/api/area.html.py:59 +#: templates/mapit/api/areas.html:21 templates/mapit/api/postcode.html:21 msgid "Optional query parameters" msgstr "Parametri di ricerca opzionali" -#: templates/mapit/api/area.html:26 +#: templates/mapit/api/area.html:25 msgid "a floating point parameter to simplify the polygons returned" msgstr "un parametro decimale, per semplificare i poligoni restituiti" -#: templates/mapit/api/area.html:27 templates/mapit/api/area.html.py:72 -#: templates/mapit/api/areas.html:29 templates/mapit/api/generations.html:10 -#: templates/mapit/api/point.html:65 templates/mapit/api/point.html.py:87 -#: templates/mapit/api/postcode.html:13 templates/mapit/api/postcode.html:41 +#: templates/mapit/api/area.html:26 templates/mapit/api/area.html.py:71 +#: templates/mapit/api/areas.html:28 templates/mapit/api/code.html:20 +#: templates/mapit/api/generations.html:9 templates/mapit/api/point.html:64 +#: templates/mapit/api/point.html.py:86 templates/mapit/api/postcode.html:12 +#: templates/mapit/api/postcode.html:40 msgid "Returns" msgstr "Restituisce" -#: templates/mapit/api/area.html:29 +#: templates/mapit/api/area.html:28 msgid "" "Information on a particular area, including name, type, parent, and any " "associated codes (see below for details). The code " @@ -113,30 +114,30 @@ msgstr "" "qualsiasi codice associato (vedere nel seguito per i " "dettagli). Le ricerche per codice redirezionano alla URI dell'area." -#: templates/mapit/api/area.html:34 +#: templates/mapit/api/area.html:33 msgid "example_postcode returns a random postcode within the area specified." msgstr "" "example_postcode restituisce un codice postale casuale all'interno dell'area " "specificata." -#: templates/mapit/api/area.html:36 +#: templates/mapit/api/area.html:35 msgid "geometry returns centroid, extent and area of the area." msgstr "" "geometry restituisce il centroide, l'estensione e l'area dell'area " "specificata." -#: templates/mapit/api/area.html:46 +#: templates/mapit/api/area.html:45 msgid "lookup related areas" msgstr "ricerca aree correlate" -#: templates/mapit/api/area.html:62 +#: templates/mapit/api/area.html:61 msgid "" "
  • type, to restrict results to a particular type or types.
    • " msgstr "" "
  • tipo, per restringere i risultati a un particolare tipo (o tipi)." "
    • " -#: templates/mapit/api/area.html:65 +#: templates/mapit/api/area.html:64 msgid "" "
  • generation, to return results from a previous generation " "(children only).
    • " @@ -144,7 +145,7 @@ msgstr "" "
  • generation, per restituire risultati di una generazione " "precedente (solo figli).
    • " -#: templates/mapit/api/area.html:68 +#: templates/mapit/api/area.html:67 msgid "" "
  • min_generation, to return areas since that generation (children " "only).
    • " @@ -152,32 +153,32 @@ msgstr "" "
  • min_generation, per restituire risultati a partire da quella " "generazione (solo figli).
    • " -#: templates/mapit/api/area.html:73 +#: templates/mapit/api/area.html:72 msgid "A hash of areas that match the requested lookup." msgstr "Un gruppo di aree che verifica la ricerca inviata." -#: templates/mapit/api/areas.html:4 +#: templates/mapit/api/areas.html:3 msgid "lookup multiple areas" msgstr "ricerca per aree multiple" -#: templates/mapit/api/areas.html:10 templates/mapit/api/areas.html.py:11 +#: templates/mapit/api/areas.html:9 templates/mapit/api/areas.html.py:10 msgid "area IDs" msgstr "ID dell'area" -#: templates/mapit/api/areas.html:12 +#: templates/mapit/api/areas.html:11 msgid "type(s)" msgstr "tipo(i)" -#: templates/mapit/api/areas.html:13 +#: templates/mapit/api/areas.html:12 msgid "name prefix" msgstr "prefisso del nome" -#: templates/mapit/api/areas.html:15 templates/mapit/api/point.html:13 -#: templates/mapit/api/point.html.py:85 +#: templates/mapit/api/areas.html:14 templates/mapit/api/code.html:11 +#: templates/mapit/api/point.html:12 templates/mapit/api/point.html.py:84 msgid "Parameters" msgstr "Parametri" -#: templates/mapit/api/areas.html:16 +#: templates/mapit/api/areas.html:15 msgid "" "Separate multiple parameters with commas. Name prefix means it will return " "any area that starts with the string given." @@ -186,18 +187,18 @@ msgstr "" "prefisso vengono restituite tutte le aree che iniziano con il prefisso " "inserito." -#: templates/mapit/api/areas.html:24 +#: templates/mapit/api/areas.html:23 msgid "to return areas in that generation (type and name lookups only)" msgstr "" "per restituire aree in quella generazione (solo ricerche per tipo e nome)" -#: templates/mapit/api/areas.html:25 +#: templates/mapit/api/areas.html:24 msgid "to return areas since that generation (type and name lookups only)" msgstr "" "per restituire aree a partire da quella generazione (solo ricerche per tipo " "e nome)" -#: templates/mapit/api/areas.html:26 +#: templates/mapit/api/areas.html:25 msgid "" "to restrict results to a type or types (multiple separated by commas; name " "lookup only)" @@ -205,7 +206,7 @@ msgstr "" "per restringere i risultati a un particolare tipo o tipi(tipi multipli " "separati da virgole)" -#: templates/mapit/api/areas.html:32 +#: templates/mapit/api/areas.html:31 msgid "" "Information on multiple areas that match the parameters provided, as a " "dictionary indexed by area ID. The geometry argument lets you fetch multiple " @@ -215,20 +216,49 @@ msgstr "" "un dizionario, che ha per chiave l'ID di area. L'argomento geometry, " "permette di ottenere più di una geometria di area singola per volta." -#: templates/mapit/api/generations.html:5 templates/mapit/generations.html:5 -#: templates/mapit/generations.html.py:9 templates/mapit/index.html:54 +#: templates/mapit/api/code.html:3 +#, fuzzy +#| msgid "lookup by postcode" +msgid "lookup by code" +msgstr "ricerca per codice postale" + +#: templates/mapit/api/code.html:9 +msgid "code type" +msgstr "" + +#: templates/mapit/api/code.html:9 +#, fuzzy +#| msgid "postcode" +msgid "code" +msgstr "codice postale" + +#: templates/mapit/api/code.html:12 +msgid "" +"code type and a code should uniquely identify an area. (MapIt " +"uses code types and codes to associate external identifiers with areas.)" +msgstr "" + +#: templates/mapit/api/code.html:23 +msgid "" +"This returns an HTTP 302 Found redirect to the corresponding /area/[area " +"ID] page. Any format extension (.html or .json) will " +"be preserved in the URL that's redirected to." +msgstr "" + +#: templates/mapit/api/generations.html:4 templates/mapit/generations.html:4 +#: templates/mapit/generations.html.py:8 templates/mapit/index.html:55 msgid "Generations" msgstr "Generazioni" -#: templates/mapit/api/generations.html:11 +#: templates/mapit/api/generations.html:10 msgid "A list of all generations in this installation of MapIt." msgstr "L'elenco di generazioni in questa installazione di MapIt." -#: templates/mapit/api/generations.html:20 +#: templates/mapit/api/generations.html:19 msgid "Example" msgstr "Esempio" -#: templates/mapit/api/generations.html:21 +#: templates/mapit/api/generations.html:20 msgid "List of generations" msgstr "Lista delle generazioni" @@ -243,11 +273,11 @@ msgstr "" "Greco, per favore vai alla nostra pagina per non-" "sviluppatori.

    " -#: templates/mapit/api/point.html:4 +#: templates/mapit/api/point.html:3 msgid "lookup by point" msgstr "ricerca per punto" -#: templates/mapit/api/point.html:15 +#: templates/mapit/api/point.html:14 msgid "" "

    SRID is a unique number referring to a particular co-ordinate " "system;" @@ -255,7 +285,7 @@ msgstr "" "

    SRID è un numero univoco, che si riferisce a un particolare " "sistema di coordinate;" -#: templates/mapit/api/point.html:20 +#: templates/mapit/api/point.html:19 msgid "" "the ones you probably are interested in are 27700 for British National Grid, " "4326 for WGS84 lon/lat, and 29902 for the Irish National Grid." @@ -264,7 +294,7 @@ msgstr "" "Grid, 4326 per il sistema di lon/lat WGS84, e 29902 per l'Irish National " "Grid." -#: templates/mapit/api/point.html:26 +#: templates/mapit/api/point.html:25 msgid "" "the ones you probably are interested in are 32632 o UTM zone 32N, for Italy " "or 4326 for WGS84 lon/lat." @@ -272,14 +302,14 @@ msgstr "" "quello cui sei interessato probabilmente sono 32632 o zona UTM 32N, per " "l'Italia e 4326 per il sistema normale di lon/lat WGS84." -#: templates/mapit/api/point.html:31 +#: templates/mapit/api/point.html:30 msgid "" "the one you probably are interested in is 4326 for WGS84 normal lon/lat." msgstr "" "quello cui sei interessato probabilmente è 4326 per il sistema normale di " "lon/lat WGS84." -#: templates/mapit/api/point.html:37 +#: templates/mapit/api/point.html:36 msgid "" "

    x and y are the co-ordinates of the point in the co-" "ordinate system; note that x,y means longitude,latitude.

    " @@ -287,11 +317,11 @@ msgstr "" "

    x e y sono le coordinate del punto nel sistema di " "coordinate; nota che x,y significa longitudine,latitudine.

    " -#: templates/mapit/api/point.html:42 +#: templates/mapit/api/point.html:41 msgid "
    Optional query parameters:
    " msgstr "Parametri di ricerca opzionali:" -#: templates/mapit/api/point.html:48 +#: templates/mapit/api/point.html:47 msgid "" "type, to restrict results to a particular area type or types " "(multiple types separated by commas);" @@ -299,18 +329,18 @@ msgstr "" "tipo, per restringere i risultati a un particolare tipo o tipi(tipi " "multipli separati da virgole);" -#: templates/mapit/api/point.html:53 +#: templates/mapit/api/point.html:52 msgid "generation, to return results for a previous generation." msgstr "" "generation, per restituire risultati di una generazione precedente." -#: templates/mapit/api/point.html:58 +#: templates/mapit/api/point.html:57 msgid "min_generation, to return results since that generation." msgstr "" "min_generation, per restituire risultati a partire da quella " "generazione" -#: templates/mapit/api/point.html:67 +#: templates/mapit/api/point.html:66 msgid "" "

    A hash of the areas that the point is contained within. If the /box " "version is used, only the area bounding boxes are considered.

    " @@ -318,31 +348,31 @@ msgstr "" "

    Un gruppo di aree che contengono il punto. Se si usa la versione /box," "sono considerate solamente le bounding box.

    " -#: templates/mapit/api/point.html:79 +#: templates/mapit/api/point.html:78 msgid "lookupnearest postcode" msgstr "ricerca il codice postale più vicino" -#: templates/mapit/api/point.html:86 +#: templates/mapit/api/point.html:85 msgid "Same as for" msgstr "Gli stessi di" -#: templates/mapit/api/point.html:86 +#: templates/mapit/api/point.html:85 msgid "by point" msgstr "per punto" -#: templates/mapit/api/point.html:88 +#: templates/mapit/api/point.html:87 msgid "The postcode closest to the particular point." msgstr "Il codice postale più vicino al punto specificato." -#: templates/mapit/api/postcode.html:5 +#: templates/mapit/api/postcode.html:4 msgid "lookup by postcode" msgstr "ricerca per codice postale" -#: templates/mapit/api/postcode.html:11 +#: templates/mapit/api/postcode.html:10 msgid "postcode" msgstr "codice postale" -#: templates/mapit/api/postcode.html:15 +#: templates/mapit/api/postcode.html:14 #, fuzzy msgid "" "

    Information on a particular postcode, including its location in WGS84 " @@ -352,21 +382,21 @@ msgstr "" "localizzazione nel sistema WGS84 di lat/long, e le aree in cui è contenuto." -#: templates/mapit/api/postcode.html:24 +#: templates/mapit/api/postcode.html:23 msgid "

    generation, to return results from a previous generation.

    " msgstr "" "

    generation, per restituire risultati di una generazione precedente." "

    " -#: templates/mapit/api/postcode.html:35 +#: templates/mapit/api/postcode.html:34 msgid "lookup by partial postcode" msgstr "ricerca per codice postale parziale" -#: templates/mapit/api/postcode.html:39 +#: templates/mapit/api/postcode.html:38 msgid "partial postcode" msgstr "codice postale parziale" -#: templates/mapit/api/postcode.html:43 +#: templates/mapit/api/postcode.html:42 msgid "" "

    Geographical details for the centroid of the partial postcode specified." @@ -374,38 +404,38 @@ msgstr "" "

    Dettagli geografici del centroide del codice postale parziale indicato." -#: templates/mapit/area.html:13 +#: templates/mapit/area.html:12 msgid "Type" msgstr "Tipo" -#: templates/mapit/area.html:14 +#: templates/mapit/area.html:13 msgid "Exists in generations" msgstr "Esiste nelle generazioni" -#: templates/mapit/area.html:16 +#: templates/mapit/area.html:15 msgid "Country" msgstr "Nazione" -#: templates/mapit/area.html:20 templates/mapit/areas_item.html:10 +#: templates/mapit/area.html:19 templates/mapit/areas_item.html:9 #, python-format msgid "A child of %(name)s." msgstr "Un figlio di %(name)s." -#: templates/mapit/area.html:25 +#: templates/mapit/area.html:24 msgid "Example postcode" msgstr "Codice postale di esempio" -#: templates/mapit/area.html:29 +#: templates/mapit/area.html:28 msgid "Children" msgstr "Figli" -#: templates/mapit/area.html:33 templates/mapit/data.html:10 -#: templates/mapit/generations.html:12 templates/mapit/postcode.html:26 +#: templates/mapit/area.html:32 templates/mapit/data.html:10 +#: templates/mapit/generations.html:11 templates/mapit/postcode.html:25 #, python-format msgid "Get this data as JSON" msgstr "Prendi questi dati in formato JSON" -#: templates/mapit/area.html:43 templates/mapit/postcode.html:35 +#: templates/mapit/area.html:42 templates/mapit/postcode.html:34 msgid "" "Map © OpenStreetMap " "contributors" @@ -413,55 +443,55 @@ msgstr "" "© dei dati di mappa: contributori a OpenStreetMap" -#: templates/mapit/area.html:69 templates/mapit/area.html.py:71 +#: templates/mapit/area.html:68 templates/mapit/area.html.py:70 msgid "Geometry" msgstr "Geometria" -#: templates/mapit/area.html:80 templates/mapit/postcode.html:48 +#: templates/mapit/area.html:79 templates/mapit/postcode.html:47 msgid "Areas" msgstr "Aree" -#: templates/mapit/area.html:82 +#: templates/mapit/area.html:81 msgid "Touching this area" msgstr "Toccano quest'area" -#: templates/mapit/area.html:83 +#: templates/mapit/area.html:82 msgid "Overlapping this area" msgstr "Si sovrappongono a quest'area" -#: templates/mapit/area.html:84 +#: templates/mapit/area.html:83 msgid "Covering this area" msgstr "Coprono quest'area" -#: templates/mapit/area.html:85 +#: templates/mapit/area.html:84 msgid "Covered by this area" msgstr "Coperti da quest'area" -#: templates/mapit/area.html:86 +#: templates/mapit/area.html:85 msgid "Covered by or overlapping this area" msgstr "Coperte da o che si sovrappongono a quest'area" -#: templates/mapit/area.html:87 +#: templates/mapit/area.html:86 msgid "Intersects this area" msgstr "Intersecano quest'area" -#: templates/mapit/area.html:92 +#: templates/mapit/area.html:91 msgid "Codes" msgstr "Codici" -#: templates/mapit/area.html:103 +#: templates/mapit/area.html:102 msgid "No codes found" msgstr "Codici non trovati" -#: templates/mapit/area.html:108 +#: templates/mapit/area.html:107 msgid "Alternative Names" msgstr "Nomi alternativi" -#: templates/mapit/area.html:113 +#: templates/mapit/area.html:112 msgid "No alternative names found" msgstr "Nessun nome alternativo trovato" -#: templates/mapit/base.html:10 +#: templates/mapit/base.html:9 msgid "" "MapIt: a web service that maps postcodes and geographical points to " "administrative areas." @@ -469,22 +499,18 @@ msgstr "" "MapIt: un servizio web che associa codici postali e punti geografici ad aree " "amministrative." -#: templates/mapit/base.html:52 +#: templates/mapit/base.html:51 msgid "MapIt is a charitable project from mySociety" msgstr "MapIt è un progetto no-profit di mySociety" -#: templates/mapit/base.html:57 +#: templates/mapit/base.html:56 msgid "Keep us online, Donate Now" msgstr "Tienici online, Dona ora!" -#: templates/mapit/base.html:64 +#: templates/mapit/base.html:63 msgid "Home & Documentation" msgstr "Home e Documentazione" -#: templates/mapit/base.html:78 -msgid "Django powered" -msgstr "" - #: templates/mapit/copyright.html:2 msgid "" "

    You should replace the text here with copyright statements describing the " @@ -501,11 +527,11 @@ msgstr "" msgid "New Install" msgstr "Nuova installazione" -#: templates/mapit/example-postcode.html:5 +#: templates/mapit/example-postcode.html:4 msgid "Example postcode in" msgstr "Codice postale di esempio in" -#: templates/mapit/example-postcode.html:11 +#: templates/mapit/example-postcode.html:10 #, fuzzy, python-format msgid "" "An example postcode for %(area_name)s is " @@ -514,11 +540,11 @@ msgstr "" "Codice postale di esempio %(area_name)s is " "%(postcode)s (JSON)." -#: templates/mapit/generations.html:18 +#: templates/mapit/generations.html:17 msgid "Active" msgstr "Attiva" -#: templates/mapit/generations.html:18 +#: templates/mapit/generations.html:17 msgid "Inactive" msgstr "Inattiva" @@ -561,7 +587,7 @@ msgstr "" "dovrebbe usare il testo “Powered by MapIt”, con un collegamento " "a questa pagina.

    " -#: templates/mapit/index.html:7 +#: templates/mapit/index.html:6 msgid "MapIt : map postcodes and geographical points to administrative areas" msgstr "" "MapIt: associa codici postali e punti geografici ad aree amministrative" @@ -624,37 +650,43 @@ msgstr "Aree correlate" msgid "Multiple areas" msgstr "Aree multiple" -#: templates/mapit/index.html:57 +#: templates/mapit/index.html:54 +#, fuzzy +#| msgid "Codes" +msgid "Code" +msgstr "Codici" + +#: templates/mapit/index.html:58 #, fuzzy #| msgid "General information" msgid "Information" msgstr "Informazioni generali" -#: templates/mapit/index.html:59 templates/mapit/index.html.py:82 +#: templates/mapit/index.html:60 templates/mapit/index.html.py:86 msgid "General information" msgstr "Informazioni generali" -#: templates/mapit/index.html:60 templates/mapit/index.html.py:110 +#: templates/mapit/index.html:61 templates/mapit/index.html.py:114 msgid "About MapIt" msgstr "A proposito di MapIt" -#: templates/mapit/index.html:61 +#: templates/mapit/index.html:62 msgid "Usage & licence" msgstr "Uso e Licenza" -#: templates/mapit/index.html:62 +#: templates/mapit/index.html:63 msgid "Source code" msgstr "Codice sorgente" -#: templates/mapit/index.html:64 +#: templates/mapit/index.html:65 msgid "Changelog" msgstr "Elenco dei cambiamenti" -#: templates/mapit/index.html:84 +#: templates/mapit/index.html:88 msgid "Format" msgstr "Formato" -#: templates/mapit/index.html:87 +#: templates/mapit/index.html:91 msgid "" "

    All calls return JSON, you can generally get an HTML representation by " "sticking .html on the end.

    " @@ -662,7 +694,7 @@ msgstr "" "

    Tutte le chiamate restituiscono JSON, puoi ottenere una rappresentazione " "HTML attaccando .html alla fine.

    " -#: templates/mapit/index.html:92 +#: templates/mapit/index.html:96 msgid "" "

    Whenever an area is returned from MapIt, it is as a dictionary with the " "following keys: id, name, country, type, parent_area, generation_low, " @@ -672,11 +704,11 @@ msgstr "" "chiavi: id, name, country, type, parent_area, generation_low, " "generation_high, codes.

    " -#: templates/mapit/index.html:98 +#: templates/mapit/index.html:102 msgid "Historical areas" msgstr "Aree storiche" -#: templates/mapit/index.html:100 +#: templates/mapit/index.html:104 msgid "" "By default, calls will return active areas; for some calls you may specify a " "previous generation to look up instead." @@ -684,7 +716,7 @@ msgstr "" "Per definizione, le chiamate restituiscono esclusivamente le aree attive; " "per alcune chiamate puoi specificare di voler ricercare generazioni passate." -#: templates/mapit/index.html:112 +#: templates/mapit/index.html:116 msgid "" "

    MapIt was written back in 2003 as a postcode lookup to power the original " "mySociety sites such as Quando il limite viene raggiunto, il servizio smettera di rispondere, " "fino a quando i valori medi non siano tornati nei limiti stabiliti." -#: templates/mapit/postcode.html:5 +#: templates/mapit/postcode.html:4 #, python-format msgid "Results for “%(postcode)s”" msgstr "Risultati per “%(postcode)s”" -#: templates/mapit/postcode.html:17 +#: templates/mapit/postcode.html:16 msgid "WGS84 lat/lon" msgstr "lat/lon WGS84" -#: templates/mapit/postcode.html:19 +#: templates/mapit/postcode.html:18 msgid "" "No location information. Note this is a valid postcode (otherwise " "you would have got a 404), just one for which we don’t know the " @@ -905,32 +937,32 @@ msgstr "" "codicevalido (altrimenti si sarebbe ottenuto un errore 404), si tratta solo " "di un codice del quale non conosciamo la località." -#: views/areas.py:57 +#: views/areas.py:51 msgid "Bad generation specified" msgstr "Generazione non valida o inesistente" -#: views/areas.py:64 +#: views/areas.py:58 msgid "Bad min_generation specified" msgstr "min_generation invalida o inesistente" -#: views/areas.py:94 +#: views/areas.py:88 msgid "Badly specified tolerance" msgstr "Tolleranza invalida o inesistente" -#: views/areas.py:98 views/areas.py:118 +#: views/areas.py:92 views/areas.py:112 msgid "Bad area ID specified" msgstr "ID dell'area invalido o inesistente" -#: views/areas.py:168 views/areas.py:186 views/areas.py:294 +#: views/areas.py:162 views/areas.py:180 views/areas.py:288 msgid "No polygons found" msgstr "Nessun poligono trovato" -#: views/areas.py:180 +#: views/areas.py:174 #, python-format msgid "Children of %s" msgstr "Figli di %s" -#: views/areas.py:200 +#: views/areas.py:194 msgid "" "That query was taking too long to compute - try restricting to a specific " "type, if you weren't already doing so." @@ -938,76 +970,79 @@ msgstr "" "La query stava prendendo troppo tempo - prova a restringere a un " "tipospecifico, se non lo stavi già facendo" -#: views/areas.py:203 +#: views/areas.py:197 msgid "There was an internal error performing that query." msgstr "Si è verificato un errore interno durante la query" -#: views/areas.py:211 +#: views/areas.py:205 #, python-format msgid "Areas touching %s" msgstr "Aree che toccano %s" -#: views/areas.py:216 +#: views/areas.py:210 #, python-format msgid "Areas overlapping %s" msgstr "Aree che si sovrappongono a %s" -#: views/areas.py:221 +#: views/areas.py:215 #, python-format msgid "Areas covered by %s" msgstr "Aree coperte da %s" -#: views/areas.py:226 +#: views/areas.py:220 #, python-format msgid "Areas covered by or overlapping %s" msgstr "Aree coperte da o che si sovrappongono a %s" -#: views/areas.py:231 +#: views/areas.py:225 #, python-format msgid "Areas that cover %s" msgstr "Aree che coprono %s" -#: views/areas.py:236 +#: views/areas.py:230 #, python-format msgid "Areas that intersect %s" msgstr "Aree che intersecano %s" -#: views/areas.py:243 +#: views/areas.py:237 msgid "Areas ID lookup" msgstr "Ricerca per ID di aree" -#: views/areas.py:250 +#: views/areas.py:244 #, python-format msgid "Areas in %s" msgstr "Aree in %s" -#: views/areas.py:258 +#: views/areas.py:252 #, python-format msgid "Areas starting with %s" msgstr "Aree che iniziano per %s" -#: views/areas.py:268 +#: views/areas.py:262 #, fuzzy #| msgid "No codes found" msgid "No areas found" msgstr "Codici non trovati" -#: views/areas.py:339 +#: views/areas.py:333 +#, python-brace-format msgid "No areas were found that matched code {0} = {1}." msgstr "Nessun area trovata che verifichi il codice {0} = {1}" -#: views/areas.py:342 +#: views/areas.py:336 +#, python-brace-format msgid "There were multiple areas that matched code {0} = {1}." msgstr "Più di un'area trovata che verifia il codice {0} = {1}" -#: views/areas.py:355 +#: views/areas.py:353 msgid "Point outside the area geometry" msgstr "Punto fuori la geometria dell'area" -#: views/areas.py:385 +#: views/areas.py:383 +#, python-brace-format msgid "Areas covering the point ({0},{1})" msgstr "Aree che coprono il punto ({0},{1})" -#: views/areas.py:422 +#: views/areas.py:428 msgid "No content specified" msgstr "Contenuto non valido o inesistente" diff --git a/mapit/locale/nb_NO/LC_MESSAGES/django.po b/mapit/locale/nb_NO/LC_MESSAGES/django.po index 25df38c8..9feea189 100644 --- a/mapit/locale/nb_NO/LC_MESSAGES/django.po +++ b/mapit/locale/nb_NO/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-18 17:20+0100\n" +"POT-Creation-Date: 2016-09-22 18:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: shortcuts.py:55 templates/mapit/areas.html:6 +#: shortcuts.py:34 templates/mapit/areas.html:6 msgid "No matching areas found." msgstr "" @@ -45,165 +45,191 @@ msgstr "" msgid "Sorry, something's gone wrong." msgstr "" -#: templates/mapit/api/area.html:4 +#: templates/mapit/api/area.html:3 msgid "lookup by area" msgstr "" -#: templates/mapit/api/area.html:8 +#: templates/mapit/api/area.html:7 msgid "URL" msgstr "" -#: templates/mapit/api/area.html:11 +#: templates/mapit/api/area.html:10 msgid "area ID or ONS code" msgstr "" -#: templates/mapit/api/area.html:13 templates/mapit/api/area.html.py:19 -#: templates/mapit/api/area.html:21 templates/mapit/api/area.html.py:22 -#: templates/mapit/api/area.html:23 templates/mapit/api/area.html.py:50 -#: templates/mapit/api/area.html:51 templates/mapit/api/area.html.py:53 -#: templates/mapit/api/area.html:54 templates/mapit/api/area.html.py:55 -#: templates/mapit/api/area.html:56 templates/mapit/api/area.html.py:57 +#: templates/mapit/api/area.html:12 templates/mapit/api/area.html.py:18 +#: templates/mapit/api/area.html:20 templates/mapit/api/area.html.py:21 +#: templates/mapit/api/area.html:22 templates/mapit/api/area.html.py:49 +#: templates/mapit/api/area.html:50 templates/mapit/api/area.html.py:52 +#: templates/mapit/api/area.html:53 templates/mapit/api/area.html.py:54 +#: templates/mapit/api/area.html:55 templates/mapit/api/area.html.py:56 msgid "area ID" msgstr "" -#: templates/mapit/api/area.html:16 +#: templates/mapit/api/area.html:15 msgid "OSM relation ID" msgstr "" -#: templates/mapit/api/area.html:17 +#: templates/mapit/api/area.html:16 msgid "OSM way ID" msgstr "" -#: templates/mapit/api/area.html:22 +#: templates/mapit/api/area.html:21 msgid "kml or geojson or wkt" msgstr "" -#: templates/mapit/api/area.html:23 +#: templates/mapit/api/area.html:22 msgid "SRID" msgstr "" -#: templates/mapit/api/area.html:23 +#: templates/mapit/api/area.html:22 msgid "kml or json or wkt" msgstr "" -#: templates/mapit/api/area.html:25 templates/mapit/api/area.html.py:60 -#: templates/mapit/api/areas.html:22 templates/mapit/api/postcode.html:22 +#: templates/mapit/api/area.html:24 templates/mapit/api/area.html.py:59 +#: templates/mapit/api/areas.html:21 templates/mapit/api/postcode.html:21 msgid "Optional query parameters" msgstr "" -#: templates/mapit/api/area.html:26 +#: templates/mapit/api/area.html:25 msgid "a floating point parameter to simplify the polygons returned" msgstr "" -#: templates/mapit/api/area.html:27 templates/mapit/api/area.html.py:72 -#: templates/mapit/api/areas.html:29 templates/mapit/api/generations.html:10 -#: templates/mapit/api/point.html:65 templates/mapit/api/point.html.py:87 -#: templates/mapit/api/postcode.html:13 templates/mapit/api/postcode.html:41 +#: templates/mapit/api/area.html:26 templates/mapit/api/area.html.py:71 +#: templates/mapit/api/areas.html:28 templates/mapit/api/code.html:20 +#: templates/mapit/api/generations.html:9 templates/mapit/api/point.html:64 +#: templates/mapit/api/point.html.py:86 templates/mapit/api/postcode.html:12 +#: templates/mapit/api/postcode.html:40 msgid "Returns" msgstr "" -#: templates/mapit/api/area.html:29 +#: templates/mapit/api/area.html:28 msgid "" "Information on a particular area, including name, type, parent, and any " "associated codes (see below for details). The code " "lookups redirect to the area URI." msgstr "" -#: templates/mapit/api/area.html:34 +#: templates/mapit/api/area.html:33 msgid "example_postcode returns a random postcode within the area specified." msgstr "" -#: templates/mapit/api/area.html:36 +#: templates/mapit/api/area.html:35 msgid "geometry returns centroid, extent and area of the area." msgstr "" -#: templates/mapit/api/area.html:46 +#: templates/mapit/api/area.html:45 msgid "lookup related areas" msgstr "" -#: templates/mapit/api/area.html:62 +#: templates/mapit/api/area.html:61 msgid "" "

  • type, to restrict results to a particular type or types.
    • " msgstr "" -#: templates/mapit/api/area.html:65 +#: templates/mapit/api/area.html:64 msgid "" "
  • generation, to return results from a previous generation " "(children only).
    • " msgstr "" -#: templates/mapit/api/area.html:68 +#: templates/mapit/api/area.html:67 msgid "" "
  • min_generation, to return areas since that generation (children " "only).
    • " msgstr "" -#: templates/mapit/api/area.html:73 +#: templates/mapit/api/area.html:72 msgid "A hash of areas that match the requested lookup." msgstr "" -#: templates/mapit/api/areas.html:4 +#: templates/mapit/api/areas.html:3 msgid "lookup multiple areas" msgstr "" -#: templates/mapit/api/areas.html:10 templates/mapit/api/areas.html.py:11 +#: templates/mapit/api/areas.html:9 templates/mapit/api/areas.html.py:10 msgid "area IDs" msgstr "" -#: templates/mapit/api/areas.html:12 +#: templates/mapit/api/areas.html:11 msgid "type(s)" msgstr "" -#: templates/mapit/api/areas.html:13 +#: templates/mapit/api/areas.html:12 msgid "name prefix" msgstr "" -#: templates/mapit/api/areas.html:15 templates/mapit/api/point.html:13 -#: templates/mapit/api/point.html.py:85 +#: templates/mapit/api/areas.html:14 templates/mapit/api/code.html:11 +#: templates/mapit/api/point.html:12 templates/mapit/api/point.html.py:84 msgid "Parameters" msgstr "" -#: templates/mapit/api/areas.html:16 +#: templates/mapit/api/areas.html:15 msgid "" "Separate multiple parameters with commas. Name prefix means it will return " "any area that starts with the string given." msgstr "" -#: templates/mapit/api/areas.html:24 +#: templates/mapit/api/areas.html:23 msgid "to return areas in that generation (type and name lookups only)" msgstr "" -#: templates/mapit/api/areas.html:25 +#: templates/mapit/api/areas.html:24 msgid "to return areas since that generation (type and name lookups only)" msgstr "" -#: templates/mapit/api/areas.html:26 +#: templates/mapit/api/areas.html:25 msgid "" "to restrict results to a type or types (multiple separated by commas; name " "lookup only)" msgstr "" -#: templates/mapit/api/areas.html:32 +#: templates/mapit/api/areas.html:31 msgid "" "Information on multiple areas that match the parameters provided, as a " "dictionary indexed by area ID. The geometry argument lets you fetch multiple " "single area geometry results at once." msgstr "" -#: templates/mapit/api/generations.html:5 templates/mapit/generations.html:5 -#: templates/mapit/generations.html.py:9 templates/mapit/index.html:54 +#: templates/mapit/api/code.html:3 +msgid "lookup by code" +msgstr "" + +#: templates/mapit/api/code.html:9 +msgid "code type" +msgstr "" + +#: templates/mapit/api/code.html:9 +msgid "code" +msgstr "" + +#: templates/mapit/api/code.html:12 +msgid "" +"code type and a code should uniquely identify an area. (MapIt " +"uses code types and codes to associate external identifiers with areas.)" +msgstr "" + +#: templates/mapit/api/code.html:23 +msgid "" +"This returns an HTTP 302 Found redirect to the corresponding /area/[area " +"ID] page. Any format extension (.html or .json) will " +"be preserved in the URL that's redirected to." +msgstr "" + +#: templates/mapit/api/generations.html:4 templates/mapit/generations.html:4 +#: templates/mapit/generations.html.py:8 templates/mapit/index.html:55 msgid "Generations" msgstr "" -#: templates/mapit/api/generations.html:11 +#: templates/mapit/api/generations.html:10 msgid "A list of all generations in this installation of MapIt." msgstr "" -#: templates/mapit/api/generations.html:20 +#: templates/mapit/api/generations.html:19 msgid "Example" msgstr "" -#: templates/mapit/api/generations.html:21 +#: templates/mapit/api/generations.html:20 msgid "List of generations" msgstr "" @@ -214,218 +240,214 @@ msgid "" "see our page for non-developers.

    " msgstr "" -#: templates/mapit/api/point.html:4 +#: templates/mapit/api/point.html:3 msgid "lookup by point" msgstr "" -#: templates/mapit/api/point.html:15 +#: templates/mapit/api/point.html:14 msgid "" "

    SRID is a unique number referring to a particular co-ordinate " "system;" msgstr "" -#: templates/mapit/api/point.html:20 +#: templates/mapit/api/point.html:19 msgid "" "the ones you probably are interested in are 27700 for British National Grid, " "4326 for WGS84 lon/lat, and 29902 for the Irish National Grid." msgstr "" -#: templates/mapit/api/point.html:26 +#: templates/mapit/api/point.html:25 msgid "" "the ones you probably are interested in are 32632 o UTM zone 32N, for Italy " "or 4326 for WGS84 lon/lat." msgstr "" -#: templates/mapit/api/point.html:31 +#: templates/mapit/api/point.html:30 msgid "" "the one you probably are interested in is 4326 for WGS84 normal lon/lat." msgstr "" -#: templates/mapit/api/point.html:37 +#: templates/mapit/api/point.html:36 msgid "" "

    x and y are the co-ordinates of the point in the co-" "ordinate system; note that x,y means longitude,latitude.

    " msgstr "" -#: templates/mapit/api/point.html:42 +#: templates/mapit/api/point.html:41 msgid "
    Optional query parameters:
    " msgstr "" -#: templates/mapit/api/point.html:48 +#: templates/mapit/api/point.html:47 msgid "" "type, to restrict results to a particular area type or types " "(multiple types separated by commas);" msgstr "" -#: templates/mapit/api/point.html:53 +#: templates/mapit/api/point.html:52 msgid "generation, to return results for a previous generation." msgstr "" -#: templates/mapit/api/point.html:58 +#: templates/mapit/api/point.html:57 msgid "min_generation, to return results since that generation." msgstr "" -#: templates/mapit/api/point.html:67 +#: templates/mapit/api/point.html:66 msgid "" "

    A hash of the areas that the point is contained within. If the /box " "version is used, only the area bounding boxes are considered.

    " msgstr "" -#: templates/mapit/api/point.html:79 +#: templates/mapit/api/point.html:78 msgid "lookupnearest postcode" msgstr "" -#: templates/mapit/api/point.html:86 +#: templates/mapit/api/point.html:85 msgid "Same as for" msgstr "" -#: templates/mapit/api/point.html:86 +#: templates/mapit/api/point.html:85 msgid "by point" msgstr "" -#: templates/mapit/api/point.html:88 +#: templates/mapit/api/point.html:87 msgid "The postcode closest to the particular point." msgstr "" -#: templates/mapit/api/postcode.html:5 +#: templates/mapit/api/postcode.html:4 msgid "lookup by postcode" msgstr "" -#: templates/mapit/api/postcode.html:11 +#: templates/mapit/api/postcode.html:10 msgid "postcode" msgstr "" -#: templates/mapit/api/postcode.html:15 +#: templates/mapit/api/postcode.html:14 msgid "" "

    Information on a particular postcode, including its location in WGS84 " "latitude/longitude, and the areas it is contained within.

    " msgstr "" -#: templates/mapit/api/postcode.html:24 +#: templates/mapit/api/postcode.html:23 msgid "

    generation, to return results from a previous generation.

    " msgstr "" -#: templates/mapit/api/postcode.html:35 +#: templates/mapit/api/postcode.html:34 msgid "lookup by partial postcode" msgstr "" -#: templates/mapit/api/postcode.html:39 +#: templates/mapit/api/postcode.html:38 msgid "partial postcode" msgstr "" -#: templates/mapit/api/postcode.html:43 +#: templates/mapit/api/postcode.html:42 msgid "" "

    Geographical details for the centroid of the partial postcode specified." msgstr "" -#: templates/mapit/area.html:13 +#: templates/mapit/area.html:12 msgid "Type" msgstr "" -#: templates/mapit/area.html:14 +#: templates/mapit/area.html:13 msgid "Exists in generations" msgstr "" -#: templates/mapit/area.html:16 +#: templates/mapit/area.html:15 msgid "Country" msgstr "" -#: templates/mapit/area.html:20 templates/mapit/areas_item.html:10 +#: templates/mapit/area.html:19 templates/mapit/areas_item.html:9 #, python-format msgid "A child of %(name)s." msgstr "" -#: templates/mapit/area.html:25 +#: templates/mapit/area.html:24 msgid "Example postcode" msgstr "" -#: templates/mapit/area.html:29 +#: templates/mapit/area.html:28 msgid "Children" msgstr "" -#: templates/mapit/area.html:33 templates/mapit/data.html:10 -#: templates/mapit/generations.html:12 templates/mapit/postcode.html:26 +#: templates/mapit/area.html:32 templates/mapit/data.html:10 +#: templates/mapit/generations.html:11 templates/mapit/postcode.html:25 #, python-format msgid "Get this data as JSON" msgstr "" -#: templates/mapit/area.html:43 templates/mapit/postcode.html:35 +#: templates/mapit/area.html:42 templates/mapit/postcode.html:34 msgid "" "Map © OpenStreetMap " "contributors" msgstr "" -#: templates/mapit/area.html:69 templates/mapit/area.html.py:71 +#: templates/mapit/area.html:68 templates/mapit/area.html.py:70 msgid "Geometry" msgstr "" -#: templates/mapit/area.html:80 templates/mapit/postcode.html:48 +#: templates/mapit/area.html:79 templates/mapit/postcode.html:47 msgid "Areas" msgstr "" -#: templates/mapit/area.html:82 +#: templates/mapit/area.html:81 msgid "Touching this area" msgstr "" -#: templates/mapit/area.html:83 +#: templates/mapit/area.html:82 msgid "Overlapping this area" msgstr "" -#: templates/mapit/area.html:84 +#: templates/mapit/area.html:83 msgid "Covering this area" msgstr "" -#: templates/mapit/area.html:85 +#: templates/mapit/area.html:84 msgid "Covered by this area" msgstr "" -#: templates/mapit/area.html:86 +#: templates/mapit/area.html:85 msgid "Covered by or overlapping this area" msgstr "" -#: templates/mapit/area.html:87 +#: templates/mapit/area.html:86 msgid "Intersects this area" msgstr "" -#: templates/mapit/area.html:92 +#: templates/mapit/area.html:91 msgid "Codes" msgstr "" -#: templates/mapit/area.html:103 +#: templates/mapit/area.html:102 msgid "No codes found" msgstr "" -#: templates/mapit/area.html:108 +#: templates/mapit/area.html:107 msgid "Alternative Names" msgstr "" -#: templates/mapit/area.html:113 +#: templates/mapit/area.html:112 msgid "No alternative names found" msgstr "" -#: templates/mapit/base.html:10 +#: templates/mapit/base.html:9 msgid "" "MapIt: a web service that maps postcodes and geographical points to " "administrative areas." msgstr "" -#: templates/mapit/base.html:52 +#: templates/mapit/base.html:51 msgid "MapIt is a charitable project from mySociety" msgstr "" -#: templates/mapit/base.html:57 +#: templates/mapit/base.html:56 msgid "Keep us online, Donate Now" msgstr "" -#: templates/mapit/base.html:64 +#: templates/mapit/base.html:63 msgid "Home & Documentation" msgstr "" -#: templates/mapit/base.html:78 -msgid "Django powered" -msgstr "" - #: templates/mapit/copyright.html:2 msgid "" "

    You should replace the text here with copyright statements describing the " @@ -438,22 +460,22 @@ msgstr "" msgid "New Install" msgstr "" -#: templates/mapit/example-postcode.html:5 +#: templates/mapit/example-postcode.html:4 msgid "Example postcode in" msgstr "" -#: templates/mapit/example-postcode.html:11 +#: templates/mapit/example-postcode.html:10 #, python-format msgid "" "An example postcode for %(area_name)s is " "%(postcode)s (JSON)." msgstr "" -#: templates/mapit/generations.html:18 +#: templates/mapit/generations.html:17 msgid "Active" msgstr "" -#: templates/mapit/generations.html:18 +#: templates/mapit/generations.html:17 msgid "Inactive" msgstr "" @@ -486,7 +508,7 @@ msgid "" "MapIt”, with a link back to this page.

    " msgstr "" -#: templates/mapit/index.html:7 +#: templates/mapit/index.html:6 msgid "MapIt : map postcodes and geographical points to administrative areas" msgstr "" @@ -546,58 +568,62 @@ msgstr "" msgid "Multiple areas" msgstr "" -#: templates/mapit/index.html:57 +#: templates/mapit/index.html:54 +msgid "Code" +msgstr "" + +#: templates/mapit/index.html:58 msgid "Information" msgstr "" -#: templates/mapit/index.html:59 templates/mapit/index.html.py:82 +#: templates/mapit/index.html:60 templates/mapit/index.html.py:86 msgid "General information" msgstr "" -#: templates/mapit/index.html:60 templates/mapit/index.html.py:110 +#: templates/mapit/index.html:61 templates/mapit/index.html.py:114 msgid "About MapIt" msgstr "" -#: templates/mapit/index.html:61 +#: templates/mapit/index.html:62 msgid "Usage & licence" msgstr "" -#: templates/mapit/index.html:62 +#: templates/mapit/index.html:63 msgid "Source code" msgstr "" -#: templates/mapit/index.html:64 +#: templates/mapit/index.html:65 msgid "Changelog" msgstr "" -#: templates/mapit/index.html:84 +#: templates/mapit/index.html:88 msgid "Format" msgstr "" -#: templates/mapit/index.html:87 +#: templates/mapit/index.html:91 msgid "" "

    All calls return JSON, you can generally get an HTML representation by " "sticking .html on the end.

    " msgstr "" -#: templates/mapit/index.html:92 +#: templates/mapit/index.html:96 msgid "" "

    Whenever an area is returned from MapIt, it is as a dictionary with the " "following keys: id, name, country, type, parent_area, generation_low, " "generation_high, codes.

    " msgstr "" -#: templates/mapit/index.html:98 +#: templates/mapit/index.html:102 msgid "Historical areas" msgstr "" -#: templates/mapit/index.html:100 +#: templates/mapit/index.html:104 msgid "" "By default, calls will return active areas; for some calls you may specify a " "previous generation to look up instead." msgstr "" -#: templates/mapit/index.html:112 +#: templates/mapit/index.html:116 msgid "" "

    MapIt was written back in 2003 as a postcode lookup to power the original " "mySociety sites such as " msgstr "" -#: templates/mapit/postcode.html:5 +#: templates/mapit/postcode.html:4 #, python-format msgid "Results for “%(postcode)s”" msgstr "" -#: templates/mapit/postcode.html:17 +#: templates/mapit/postcode.html:16 msgid "WGS84 lat/lon" msgstr "" -#: templates/mapit/postcode.html:19 +#: templates/mapit/postcode.html:18 msgid "" "No location information. Note this is a valid postcode (otherwise " "you would have got a 404), just one for which we don’t know the " "location." msgstr "" -#: views/areas.py:57 +#: views/areas.py:51 msgid "Bad generation specified" msgstr "" -#: views/areas.py:64 +#: views/areas.py:58 msgid "Bad min_generation specified" msgstr "" -#: views/areas.py:94 +#: views/areas.py:88 msgid "Badly specified tolerance" msgstr "" -#: views/areas.py:98 views/areas.py:118 +#: views/areas.py:92 views/areas.py:112 msgid "Bad area ID specified" msgstr "" -#: views/areas.py:168 views/areas.py:186 views/areas.py:294 +#: views/areas.py:162 views/areas.py:180 views/areas.py:288 msgid "No polygons found" msgstr "" -#: views/areas.py:180 +#: views/areas.py:174 #, python-format msgid "Children of %s" msgstr "" -#: views/areas.py:200 +#: views/areas.py:194 msgid "" "That query was taking too long to compute - try restricting to a specific " "type, if you weren't already doing so." msgstr "" -#: views/areas.py:203 +#: views/areas.py:197 msgid "There was an internal error performing that query." msgstr "" -#: views/areas.py:211 +#: views/areas.py:205 #, python-format msgid "Areas touching %s" msgstr "" -#: views/areas.py:216 +#: views/areas.py:210 #, python-format msgid "Areas overlapping %s" msgstr "" -#: views/areas.py:221 +#: views/areas.py:215 #, python-format msgid "Areas covered by %s" msgstr "" -#: views/areas.py:226 +#: views/areas.py:220 #, python-format msgid "Areas covered by or overlapping %s" msgstr "" -#: views/areas.py:231 +#: views/areas.py:225 #, python-format msgid "Areas that cover %s" msgstr "" -#: views/areas.py:236 +#: views/areas.py:230 #, python-format msgid "Areas that intersect %s" msgstr "" -#: views/areas.py:243 +#: views/areas.py:237 msgid "Areas ID lookup" msgstr "" -#: views/areas.py:250 +#: views/areas.py:244 #, python-format msgid "Areas in %s" msgstr "" -#: views/areas.py:258 +#: views/areas.py:252 #, python-format msgid "Areas starting with %s" msgstr "" -#: views/areas.py:268 +#: views/areas.py:262 msgid "No areas found" msgstr "" -#: views/areas.py:339 +#: views/areas.py:333 +#, python-brace-format msgid "No areas were found that matched code {0} = {1}." msgstr "" -#: views/areas.py:342 +#: views/areas.py:336 +#, python-brace-format msgid "There were multiple areas that matched code {0} = {1}." msgstr "" -#: views/areas.py:355 +#: views/areas.py:353 msgid "Point outside the area geometry" msgstr "" -#: views/areas.py:385 +#: views/areas.py:383 +#, python-brace-format msgid "Areas covering the point ({0},{1})" msgstr "" -#: views/areas.py:422 +#: views/areas.py:428 msgid "No content specified" msgstr "" diff --git a/mapit/locale/sv_SE/LC_MESSAGES/django.po b/mapit/locale/sv_SE/LC_MESSAGES/django.po index 737aee8d..9e35091b 100644 --- a/mapit/locale/sv_SE/LC_MESSAGES/django.po +++ b/mapit/locale/sv_SE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: MapIt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-18 17:20+0100\n" +"POT-Creation-Date: 2016-09-22 18:11+0100\n" "PO-Revision-Date: 2015-05-18 19:52+0000\n" "Last-Translator: Jon Kristensen \n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/mapit/" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: shortcuts.py:55 templates/mapit/areas.html:6 +#: shortcuts.py:34 templates/mapit/areas.html:6 msgid "No matching areas found." msgstr "Inga matchande områden hittades." @@ -47,64 +47,65 @@ msgstr "500 Internal Server Error" msgid "Sorry, something's gone wrong." msgstr "Något gick fel." -#: templates/mapit/api/area.html:4 +#: templates/mapit/api/area.html:3 msgid "lookup by area" msgstr "slå upp efter område" -#: templates/mapit/api/area.html:8 +#: templates/mapit/api/area.html:7 msgid "URL" msgstr "URL" -#: templates/mapit/api/area.html:11 +#: templates/mapit/api/area.html:10 msgid "area ID or ONS code" msgstr "områdes-ID eller ONS-kod" -#: templates/mapit/api/area.html:13 templates/mapit/api/area.html.py:19 -#: templates/mapit/api/area.html:21 templates/mapit/api/area.html.py:22 -#: templates/mapit/api/area.html:23 templates/mapit/api/area.html.py:50 -#: templates/mapit/api/area.html:51 templates/mapit/api/area.html.py:53 -#: templates/mapit/api/area.html:54 templates/mapit/api/area.html.py:55 -#: templates/mapit/api/area.html:56 templates/mapit/api/area.html.py:57 +#: templates/mapit/api/area.html:12 templates/mapit/api/area.html.py:18 +#: templates/mapit/api/area.html:20 templates/mapit/api/area.html.py:21 +#: templates/mapit/api/area.html:22 templates/mapit/api/area.html.py:49 +#: templates/mapit/api/area.html:50 templates/mapit/api/area.html.py:52 +#: templates/mapit/api/area.html:53 templates/mapit/api/area.html.py:54 +#: templates/mapit/api/area.html:55 templates/mapit/api/area.html.py:56 msgid "area ID" msgstr "områdes-ID" -#: templates/mapit/api/area.html:16 +#: templates/mapit/api/area.html:15 msgid "OSM relation ID" msgstr "OSM-relation-ID" -#: templates/mapit/api/area.html:17 +#: templates/mapit/api/area.html:16 msgid "OSM way ID" msgstr "OSM-way-ID" -#: templates/mapit/api/area.html:22 +#: templates/mapit/api/area.html:21 msgid "kml or geojson or wkt" msgstr "kml eller geojson eller wkt" -#: templates/mapit/api/area.html:23 +#: templates/mapit/api/area.html:22 msgid "SRID" msgstr "SRID" -#: templates/mapit/api/area.html:23 +#: templates/mapit/api/area.html:22 msgid "kml or json or wkt" msgstr "kml eller json eller wkt" -#: templates/mapit/api/area.html:25 templates/mapit/api/area.html.py:60 -#: templates/mapit/api/areas.html:22 templates/mapit/api/postcode.html:22 +#: templates/mapit/api/area.html:24 templates/mapit/api/area.html.py:59 +#: templates/mapit/api/areas.html:21 templates/mapit/api/postcode.html:21 msgid "Optional query parameters" msgstr "Valfria parametrar till förfrågan" -#: templates/mapit/api/area.html:26 +#: templates/mapit/api/area.html:25 msgid "a floating point parameter to simplify the polygons returned" msgstr "en flyttalsparameter för att förenkla de returnerade polygonerna" -#: templates/mapit/api/area.html:27 templates/mapit/api/area.html.py:72 -#: templates/mapit/api/areas.html:29 templates/mapit/api/generations.html:10 -#: templates/mapit/api/point.html:65 templates/mapit/api/point.html.py:87 -#: templates/mapit/api/postcode.html:13 templates/mapit/api/postcode.html:41 +#: templates/mapit/api/area.html:26 templates/mapit/api/area.html.py:71 +#: templates/mapit/api/areas.html:28 templates/mapit/api/code.html:20 +#: templates/mapit/api/generations.html:9 templates/mapit/api/point.html:64 +#: templates/mapit/api/point.html.py:86 templates/mapit/api/postcode.html:12 +#: templates/mapit/api/postcode.html:40 msgid "Returns" msgstr "Returnerar" -#: templates/mapit/api/area.html:29 +#: templates/mapit/api/area.html:28 msgid "" "Information on a particular area, including name, type, parent, and any " "associated codes (see below for details). The code " @@ -114,28 +115,28 @@ msgstr "" "eventuella associerade koder (se nedan för detaljer). Koduppslagningar omdirigerar till områdets URI." -#: templates/mapit/api/area.html:34 +#: templates/mapit/api/area.html:33 msgid "example_postcode returns a random postcode within the area specified." msgstr "" "example_postcode returnerar ett slumpmässigt postnummer inom det " "specificerade området" -#: templates/mapit/api/area.html:36 +#: templates/mapit/api/area.html:35 msgid "geometry returns centroid, extent and area of the area." msgstr "geometry returnerar centroiden, omfattningen och området för området." -#: templates/mapit/api/area.html:46 +#: templates/mapit/api/area.html:45 msgid "lookup related areas" msgstr "slå upp relaterade areor" -#: templates/mapit/api/area.html:62 +#: templates/mapit/api/area.html:61 msgid "" "

  • type, to restrict results to a particular type or types.
    • " msgstr "" "
  • type, för att begränsa resultatet till en särskild typ eller till " "särskilda typer.
    • " -#: templates/mapit/api/area.html:65 +#: templates/mapit/api/area.html:64 msgid "" "
  • generation, to return results from a previous generation " "(children only).
    • " @@ -143,7 +144,7 @@ msgstr "" "
  • generation, för att returnera resultat från en tidigare " "generation (endast barn).
    • " -#: templates/mapit/api/area.html:68 +#: templates/mapit/api/area.html:67 msgid "" "
  • min_generation, to return areas since that generation (children " "only).
    • " @@ -151,32 +152,32 @@ msgstr "" "
  • min_generation, för att returnera areor sedan generationen " "(endast barn).
    • " -#: templates/mapit/api/area.html:73 +#: templates/mapit/api/area.html:72 msgid "A hash of areas that match the requested lookup." msgstr "En hash av areor som matchar den efterfrågade uppslagningen." -#: templates/mapit/api/areas.html:4 +#: templates/mapit/api/areas.html:3 msgid "lookup multiple areas" msgstr "slå upp flera areor" -#: templates/mapit/api/areas.html:10 templates/mapit/api/areas.html.py:11 +#: templates/mapit/api/areas.html:9 templates/mapit/api/areas.html.py:10 msgid "area IDs" msgstr "områdes-ID:t" -#: templates/mapit/api/areas.html:12 +#: templates/mapit/api/areas.html:11 msgid "type(s)" msgstr "typ(er)" -#: templates/mapit/api/areas.html:13 +#: templates/mapit/api/areas.html:12 msgid "name prefix" msgstr "namnprefix" -#: templates/mapit/api/areas.html:15 templates/mapit/api/point.html:13 -#: templates/mapit/api/point.html.py:85 +#: templates/mapit/api/areas.html:14 templates/mapit/api/code.html:11 +#: templates/mapit/api/point.html:12 templates/mapit/api/point.html.py:84 msgid "Parameters" msgstr "Parametrar" -#: templates/mapit/api/areas.html:16 +#: templates/mapit/api/areas.html:15 msgid "" "Separate multiple parameters with commas. Name prefix means it will return " "any area that starts with the string given." @@ -184,19 +185,19 @@ msgstr "" "Separera flera parametrar med kommatecken. Namnprefix betyder att den endast " "kommer att returnera areor som börjar med den angivna strängen." -#: templates/mapit/api/areas.html:24 +#: templates/mapit/api/areas.html:23 msgid "to return areas in that generation (type and name lookups only)" msgstr "" "för att returnera areor i den generationen (endast typ- och " "namnuppslagningar)" -#: templates/mapit/api/areas.html:25 +#: templates/mapit/api/areas.html:24 msgid "to return areas since that generation (type and name lookups only)" msgstr "" "för att returnera areor sedan den generationen (endast typ- och " "namnuppslagningar)" -#: templates/mapit/api/areas.html:26 +#: templates/mapit/api/areas.html:25 msgid "" "to restrict results to a type or types (multiple separated by commas; name " "lookup only)" @@ -204,7 +205,7 @@ msgstr "" "för att begränsa resultatet till en typ eller typer (flera avgränsas med " "kommatecken; endast namnuppslagning)" -#: templates/mapit/api/areas.html:32 +#: templates/mapit/api/areas.html:31 msgid "" "Information on multiple areas that match the parameters provided, as a " "dictionary indexed by area ID. The geometry argument lets you fetch multiple " @@ -214,20 +215,49 @@ msgstr "" "katalog indexerad med områdes-ID. Geometriargumentet låter dig hämta flera " "enskilda områdesgeometriresultat samtidigt." -#: templates/mapit/api/generations.html:5 templates/mapit/generations.html:5 -#: templates/mapit/generations.html.py:9 templates/mapit/index.html:54 +#: templates/mapit/api/code.html:3 +#, fuzzy +#| msgid "lookup by postcode" +msgid "lookup by code" +msgstr "slå upp efter postnummer" + +#: templates/mapit/api/code.html:9 +msgid "code type" +msgstr "" + +#: templates/mapit/api/code.html:9 +#, fuzzy +#| msgid "postcode" +msgid "code" +msgstr "postnummer" + +#: templates/mapit/api/code.html:12 +msgid "" +"code type and a code should uniquely identify an area. (MapIt " +"uses code types and codes to associate external identifiers with areas.)" +msgstr "" + +#: templates/mapit/api/code.html:23 +msgid "" +"This returns an HTTP 302 Found redirect to the corresponding /area/[area " +"ID] page. Any format extension (.html or .json) will " +"be preserved in the URL that's redirected to." +msgstr "" + +#: templates/mapit/api/generations.html:4 templates/mapit/generations.html:4 +#: templates/mapit/generations.html.py:8 templates/mapit/index.html:55 msgid "Generations" msgstr "Generationer" -#: templates/mapit/api/generations.html:11 +#: templates/mapit/api/generations.html:10 msgid "A list of all generations in this installation of MapIt." msgstr "En lista av alla generationer i den här MapIt-installationen." -#: templates/mapit/api/generations.html:20 +#: templates/mapit/api/generations.html:19 msgid "Example" msgstr "Exempel" -#: templates/mapit/api/generations.html:21 +#: templates/mapit/api/generations.html:20 msgid "List of generations" msgstr "Generationslista" @@ -241,11 +271,11 @@ msgstr "" "webbtjänst och beskriver dess REST-API. Om detta är som grekiska för dig, se " "    vår sida för icke-utvecklare.

    " -#: templates/mapit/api/point.html:4 +#: templates/mapit/api/point.html:3 msgid "lookup by point" msgstr "slå upp efter punkt" -#: templates/mapit/api/point.html:15 +#: templates/mapit/api/point.html:14 msgid "" "

    SRID is a unique number referring to a particular co-ordinate " "system;" @@ -253,7 +283,7 @@ msgstr "" "

    SRID är ett unikt nummer som refererar till ett särskilt " "koordinatsystem;" -#: templates/mapit/api/point.html:20 +#: templates/mapit/api/point.html:19 msgid "" "the ones you probably are interested in are 27700 for British National Grid, " "4326 for WGS84 lon/lat, and 29902 for the Irish National Grid." @@ -261,7 +291,7 @@ msgstr "" "de du förmodligen är intresserad av är 27700 för British National Grid, 4326 " "för WGS84 lon/lat, och 29902 för Irish National Grid." -#: templates/mapit/api/point.html:26 +#: templates/mapit/api/point.html:25 msgid "" "the ones you probably are interested in are 32632 o UTM zone 32N, for Italy " "or 4326 for WGS84 lon/lat." @@ -269,12 +299,12 @@ msgstr "" "de du förmodligen är intresserad av är 32632 o UTM zone 32N, för Italien " "eller 4326 för WGS84 lon/lat." -#: templates/mapit/api/point.html:31 +#: templates/mapit/api/point.html:30 msgid "" "the one you probably are interested in is 4326 for WGS84 normal lon/lat." msgstr "de du förmodligen är intresserade av är 4326 för WGS84 normal lon/lat." -#: templates/mapit/api/point.html:37 +#: templates/mapit/api/point.html:36 msgid "" "

    x and y are the co-ordinates of the point in the co-" "ordinate system; note that x,y means longitude,latitude.

    " @@ -282,11 +312,11 @@ msgstr "" "

    x och y är koordinaterna för punkten i koordinatsystemet; " "notera att x,y betyder longitud,latitud.

    " -#: templates/mapit/api/point.html:42 +#: templates/mapit/api/point.html:41 msgid "
    Optional query parameters:
    " msgstr "
    Valfria parametrar till förfrågan:
    " -#: templates/mapit/api/point.html:48 +#: templates/mapit/api/point.html:47 msgid "" "type, to restrict results to a particular area type or types " "(multiple types separated by commas);" @@ -294,17 +324,17 @@ msgstr "" "type, för att begränsa resultatet till en särskild typ eller till " "särskilda typer (flera typer avgränsas med kommatecken);" -#: templates/mapit/api/point.html:53 +#: templates/mapit/api/point.html:52 msgid "generation, to return results for a previous generation." msgstr "" "generation, för att returnera resultat för en tidigare generation." -#: templates/mapit/api/point.html:58 +#: templates/mapit/api/point.html:57 msgid "min_generation, to return results since that generation." msgstr "" "min_generation, för att returnera resultat sedan den generationen." -#: templates/mapit/api/point.html:67 +#: templates/mapit/api/point.html:66 msgid "" "

    A hash of the areas that the point is contained within. If the /box " "version is used, only the area bounding boxes are considered.

    " @@ -312,31 +342,31 @@ msgstr "" "

    En hash med areor som innehåller punkten. Om /box-versionen används så " "tas endast \"bounding boxes\" hänsyn till.

    " -#: templates/mapit/api/point.html:79 +#: templates/mapit/api/point.html:78 msgid "lookupnearest postcode" msgstr "slå uppnärmaste postnummer" -#: templates/mapit/api/point.html:86 +#: templates/mapit/api/point.html:85 msgid "Same as for" msgstr "Samma som för" -#: templates/mapit/api/point.html:86 +#: templates/mapit/api/point.html:85 msgid "by point" msgstr "efter punkt" -#: templates/mapit/api/point.html:88 +#: templates/mapit/api/point.html:87 msgid "The postcode closest to the particular point." msgstr "Postnumret närmast den särskilda punkten." -#: templates/mapit/api/postcode.html:5 +#: templates/mapit/api/postcode.html:4 msgid "lookup by postcode" msgstr "slå upp efter postnummer" -#: templates/mapit/api/postcode.html:11 +#: templates/mapit/api/postcode.html:10 msgid "postcode" msgstr "postnummer" -#: templates/mapit/api/postcode.html:15 +#: templates/mapit/api/postcode.html:14 msgid "" "

    Information on a particular postcode, including its location in WGS84 " "latitude/longitude, and the areas it is contained within.

    " @@ -344,21 +374,21 @@ msgstr "" "

    Information om ett särskild postnummer, inklusive dess plats i WGS84 " "latitude/longitude, och de areor som innehåller punkten.

    " -#: templates/mapit/api/postcode.html:24 +#: templates/mapit/api/postcode.html:23 msgid "

    generation, to return results from a previous generation.

    " msgstr "" "

    generation, för att returnera resultat från en tidigare generation." "

    " -#: templates/mapit/api/postcode.html:35 +#: templates/mapit/api/postcode.html:34 msgid "lookup by partial postcode" msgstr "slå upp efter partiellt postnummer" -#: templates/mapit/api/postcode.html:39 +#: templates/mapit/api/postcode.html:38 msgid "partial postcode" msgstr "partiellt postnummer" -#: templates/mapit/api/postcode.html:43 +#: templates/mapit/api/postcode.html:42 msgid "" "

    Geographical details for the centroid of the partial postcode specified." @@ -366,38 +396,38 @@ msgstr "" "

    Geografiska detaljer kring centroiden från det angivna partiella " "postnumret

    " -#: templates/mapit/area.html:13 +#: templates/mapit/area.html:12 msgid "Type" msgstr "Typ" -#: templates/mapit/area.html:14 +#: templates/mapit/area.html:13 msgid "Exists in generations" msgstr "Finns i generationer" -#: templates/mapit/area.html:16 +#: templates/mapit/area.html:15 msgid "Country" msgstr "Land" -#: templates/mapit/area.html:20 templates/mapit/areas_item.html:10 +#: templates/mapit/area.html:19 templates/mapit/areas_item.html:9 #, python-format msgid "A child of %(name)s." msgstr "Ett barn till %(name)s." -#: templates/mapit/area.html:25 +#: templates/mapit/area.html:24 msgid "Example postcode" msgstr "Exempelpostnummer" -#: templates/mapit/area.html:29 +#: templates/mapit/area.html:28 msgid "Children" msgstr "Barn" -#: templates/mapit/area.html:33 templates/mapit/data.html:10 -#: templates/mapit/generations.html:12 templates/mapit/postcode.html:26 +#: templates/mapit/area.html:32 templates/mapit/data.html:10 +#: templates/mapit/generations.html:11 templates/mapit/postcode.html:25 #, python-format msgid "Get this data as JSON" msgstr "Hämta denna data som JSON" -#: templates/mapit/area.html:43 templates/mapit/postcode.html:35 +#: templates/mapit/area.html:42 templates/mapit/postcode.html:34 msgid "" "Map © OpenStreetMap " "contributors" @@ -405,55 +435,55 @@ msgstr "" "Map © OpenStreetMap " "bidragsgivare" -#: templates/mapit/area.html:69 templates/mapit/area.html.py:71 +#: templates/mapit/area.html:68 templates/mapit/area.html.py:70 msgid "Geometry" msgstr "Geometri" -#: templates/mapit/area.html:80 templates/mapit/postcode.html:48 +#: templates/mapit/area.html:79 templates/mapit/postcode.html:47 msgid "Areas" msgstr "Areor" -#: templates/mapit/area.html:82 +#: templates/mapit/area.html:81 msgid "Touching this area" msgstr "Angränsar detta område" -#: templates/mapit/area.html:83 +#: templates/mapit/area.html:82 msgid "Overlapping this area" msgstr "Överlappar detta område" -#: templates/mapit/area.html:84 +#: templates/mapit/area.html:83 msgid "Covering this area" msgstr "Täcker detta område" -#: templates/mapit/area.html:85 +#: templates/mapit/area.html:84 msgid "Covered by this area" msgstr "Täcks av detta område" -#: templates/mapit/area.html:86 +#: templates/mapit/area.html:85 msgid "Covered by or overlapping this area" msgstr "Täcks av eller överlappar detta område" -#: templates/mapit/area.html:87 +#: templates/mapit/area.html:86 msgid "Intersects this area" msgstr "Beskär detta område" -#: templates/mapit/area.html:92 +#: templates/mapit/area.html:91 msgid "Codes" msgstr "Koder" -#: templates/mapit/area.html:103 +#: templates/mapit/area.html:102 msgid "No codes found" msgstr "Inga koder hittades" -#: templates/mapit/area.html:108 +#: templates/mapit/area.html:107 msgid "Alternative Names" msgstr "Alternativa Namn" -#: templates/mapit/area.html:113 +#: templates/mapit/area.html:112 msgid "No alternative names found" msgstr "Inga alternativa namn hittades" -#: templates/mapit/base.html:10 +#: templates/mapit/base.html:9 msgid "" "MapIt: a web service that maps postcodes and geographical points to " "administrative areas." @@ -461,22 +491,18 @@ msgstr "" "MapIt: en webbtjänst som mappar postnummer och geografiska punkter till " "administrativa områden." -#: templates/mapit/base.html:52 +#: templates/mapit/base.html:51 msgid "MapIt is a charitable project from mySociety" msgstr "MapIt är ett välgörenhetsprojekt från mySociety" -#: templates/mapit/base.html:57 +#: templates/mapit/base.html:56 msgid "Keep us online, Donate Now" msgstr "Hjälp oss förbli online, Donera Nu" -#: templates/mapit/base.html:64 +#: templates/mapit/base.html:63 msgid "Home & Documentation" msgstr "Hem & Dokumentation" -#: templates/mapit/base.html:78 -msgid "Django powered" -msgstr "Django powered" - #: templates/mapit/copyright.html:2 msgid "" "

    You should replace the text here with copyright statements describing the " @@ -494,11 +520,11 @@ msgstr "" msgid "New Install" msgstr "Ny Installation" -#: templates/mapit/example-postcode.html:5 +#: templates/mapit/example-postcode.html:4 msgid "Example postcode in" msgstr "Exempelposkod i" -#: templates/mapit/example-postcode.html:11 +#: templates/mapit/example-postcode.html:10 #, python-format msgid "" "An example postcode for %(area_name)s is " @@ -507,11 +533,11 @@ msgstr "" "Ett exempelpostnummer för %(area_name)s är " "%(postcode)s (JSON)." -#: templates/mapit/generations.html:18 +#: templates/mapit/generations.html:17 msgid "Active" msgstr "Aktiv" -#: templates/mapit/generations.html:18 +#: templates/mapit/generations.html:17 msgid "Inactive" msgstr "Inaktiv" @@ -554,7 +580,7 @@ msgstr "" "använda texten “Powered by MapIt”, med en länk till den här " "sidan.

    " -#: templates/mapit/index.html:7 +#: templates/mapit/index.html:6 msgid "MapIt : map postcodes and geographical points to administrative areas" msgstr "" "MapIt: mappa postnummer och geografiska punkter till administrativa områden" @@ -615,35 +641,41 @@ msgstr "Relaterade områden" msgid "Multiple areas" msgstr "Flera områden" -#: templates/mapit/index.html:57 +#: templates/mapit/index.html:54 +#, fuzzy +#| msgid "Codes" +msgid "Code" +msgstr "Koder" + +#: templates/mapit/index.html:58 msgid "Information" msgstr "Information" -#: templates/mapit/index.html:59 templates/mapit/index.html.py:82 +#: templates/mapit/index.html:60 templates/mapit/index.html.py:86 msgid "General information" msgstr "Allmän information" -#: templates/mapit/index.html:60 templates/mapit/index.html.py:110 +#: templates/mapit/index.html:61 templates/mapit/index.html.py:114 msgid "About MapIt" msgstr "Om MapIt" -#: templates/mapit/index.html:61 +#: templates/mapit/index.html:62 msgid "Usage & licence" msgstr "Användning & licens" -#: templates/mapit/index.html:62 +#: templates/mapit/index.html:63 msgid "Source code" msgstr "Källkod" -#: templates/mapit/index.html:64 +#: templates/mapit/index.html:65 msgid "Changelog" msgstr "Ändringslogg" -#: templates/mapit/index.html:84 +#: templates/mapit/index.html:88 msgid "Format" msgstr "Format" -#: templates/mapit/index.html:87 +#: templates/mapit/index.html:91 msgid "" "

    All calls return JSON, you can generally get an HTML representation by " "sticking .html on the end.

    " @@ -651,7 +683,7 @@ msgstr "" "

    Samtliga anrop returnerar JSON, du kan generellt hämta en HTML-" "representation genom att lägga till .html på slutet.

    " -#: templates/mapit/index.html:92 +#: templates/mapit/index.html:96 msgid "" "

    Whenever an area is returned from MapIt, it is as a dictionary with the " "following keys: id, name, country, type, parent_area, generation_low, " @@ -661,11 +693,11 @@ msgstr "" "nycklar: id, name, country, type, parent_area, generation_low, " "generation_high, codes.

    " -#: templates/mapit/index.html:98 +#: templates/mapit/index.html:102 msgid "Historical areas" msgstr "Historiska områden" -#: templates/mapit/index.html:100 +#: templates/mapit/index.html:104 msgid "" "By default, calls will return active areas; for some calls you may specify a " "previous generation to look up instead." @@ -673,7 +705,7 @@ msgstr "" "Som standard returnerar anrop aktiva områden; för vissa anrop kan du ange en " "tidigare generation att slå upp istället." -#: templates/mapit/index.html:112 +#: templates/mapit/index.html:116 msgid "" "

    MapIt was written back in 2003 as a postcode lookup to power the original " "mySociety sites such as " -#: templates/mapit/postcode.html:5 +#: templates/mapit/postcode.html:4 #, python-format msgid "Results for “%(postcode)s”" msgstr "Resultat för “%(postcode)s”" -#: templates/mapit/postcode.html:17 +#: templates/mapit/postcode.html:16 msgid "WGS84 lat/lon" msgstr "WGS84 lat/lon" -#: templates/mapit/postcode.html:19 +#: templates/mapit/postcode.html:18 msgid "" "No location information. Note this is a valid postcode (otherwise " "you would have got a 404), just one for which we don’t know the " @@ -926,32 +958,32 @@ msgstr "" "(annars skulle du ha fått en 404), men ett postnummer för vilket vi inte vet " "dess plats." -#: views/areas.py:57 +#: views/areas.py:51 msgid "Bad generation specified" msgstr "Ogiltligt angiven min_tolerance" -#: views/areas.py:64 +#: views/areas.py:58 msgid "Bad min_generation specified" msgstr "Ogiltligt angiven min_tolerance" -#: views/areas.py:94 +#: views/areas.py:88 msgid "Badly specified tolerance" msgstr "Ogiltligt angiven tolerans" -#: views/areas.py:98 views/areas.py:118 +#: views/areas.py:92 views/areas.py:112 msgid "Bad area ID specified" msgstr "Ogiltligt angivet områdes-ID" -#: views/areas.py:168 views/areas.py:186 views/areas.py:294 +#: views/areas.py:162 views/areas.py:180 views/areas.py:288 msgid "No polygons found" msgstr "Inga polygoner hittades" -#: views/areas.py:180 +#: views/areas.py:174 #, python-format msgid "Children of %s" msgstr "Barn till %s" -#: views/areas.py:200 +#: views/areas.py:194 msgid "" "That query was taking too long to compute - try restricting to a specific " "type, if you weren't already doing so." @@ -959,76 +991,82 @@ msgstr "" "Det anropet tog för lång tid att beräkna - försök att begränsa sökningen " "till en specifik typ om du inte redan gjorde det." -#: views/areas.py:203 +#: views/areas.py:197 msgid "There was an internal error performing that query." msgstr "Ett internt fel uppstod då det anropet försökte utföras." -#: views/areas.py:211 +#: views/areas.py:205 #, python-format msgid "Areas touching %s" msgstr "Områden som berör %s" -#: views/areas.py:216 +#: views/areas.py:210 #, python-format msgid "Areas overlapping %s" msgstr "Områden som överlappar %s" -#: views/areas.py:221 +#: views/areas.py:215 #, python-format msgid "Areas covered by %s" msgstr "Områden som täcks av %s" -#: views/areas.py:226 +#: views/areas.py:220 #, python-format msgid "Areas covered by or overlapping %s" msgstr "Områden som täcks av eller överlappar %s" -#: views/areas.py:231 +#: views/areas.py:225 #, python-format msgid "Areas that cover %s" msgstr "Områden som täcker %s" -#: views/areas.py:236 +#: views/areas.py:230 #, python-format msgid "Areas that intersect %s" msgstr "Områden som genomskär %s" -#: views/areas.py:243 +#: views/areas.py:237 msgid "Areas ID lookup" msgstr "Uppslagning av områdes-ID" -#: views/areas.py:250 +#: views/areas.py:244 #, python-format msgid "Areas in %s" msgstr "Områden i %s" -#: views/areas.py:258 +#: views/areas.py:252 #, python-format msgid "Areas starting with %s" msgstr "Områden som börjar med %s" -#: views/areas.py:268 +#: views/areas.py:262 #, fuzzy #| msgid "No codes found" msgid "No areas found" msgstr "Inga koder hittades" -#: views/areas.py:339 +#: views/areas.py:333 +#, python-brace-format msgid "No areas were found that matched code {0} = {1}." msgstr "Inga områden hittades som matchade kod {0} = {1}." -#: views/areas.py:342 +#: views/areas.py:336 +#, python-brace-format msgid "There were multiple areas that matched code {0} = {1}." msgstr "Flera områden hittades som matchade kod {0} = {1}." -#: views/areas.py:355 +#: views/areas.py:353 msgid "Point outside the area geometry" msgstr "Punkt utanför områdets geometri" -#: views/areas.py:385 +#: views/areas.py:383 +#, python-brace-format msgid "Areas covering the point ({0},{1})" msgstr "Områden som täcker punkten ({0},{1})" -#: views/areas.py:422 +#: views/areas.py:428 msgid "No content specified" msgstr "Inget innehåll angivet" + +#~ msgid "Django powered" +#~ msgstr "Django powered" diff --git a/setup.py b/setup.py index aff24ac8..0c4812ac 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ def read_file(filename): setup( name='django-mapit', - version='1.4', + version='1.5', description=( 'A web service for mapping postcodes and points to current or past ' 'administrative area information and polygons.'),