1. Yohan Boniface
  2. django-leaflet-storage

Commits

Yohan Boniface  committed eadb379

Rename category in datalayer (fix #82)

  • Participants
  • Parent commits 5ca4add
  • Branches master

Comments (0)

Files changed (29)

File leaflet_storage/admin.py

View file
 from django.contrib.gis import admin
-from .models import Map, Marker, Category, Pictogram, TileLayer, Polyline,\
+from .models import Map, Marker, DataLayer, Pictogram, TileLayer, Polyline,\
                     Licence
 
 
 admin.site.register(Map, MapAdmin)
 admin.site.register(Marker, admin.OSMGeoAdmin)
 admin.site.register(Polyline, admin.OSMGeoAdmin)
-admin.site.register(Category)
+admin.site.register(DataLayer)
 admin.site.register(Pictogram)
 admin.site.register(TileLayer)
 admin.site.register(Licence)

File leaflet_storage/base_models.py

View file
         abstract = True
 
 
-class Category(NamedModel, IconConfigMixin):
+class DataLayer(NamedModel, IconConfigMixin):
     """
-    Category of a Feature.
+    Layer to store Features in.
     """
     map = models.ForeignKey(Map)
     description = models.TextField(
     display_on_load = models.BooleanField(
         default=False,
         verbose_name=_("display on load"),
-        help_text=_("Display this category on load.")
+        help_text=_("Display this layer on load.")
     )
 
     @property
     def features(self):
         if not hasattr(self, "_features"):
             filters = {
-                "category": self
+                "datalayer": self
             }
             markers = get_model("Marker").objects.filter(**filters)
             polylines = get_model("Polyline").objects.filter(**filters)
 
     @classmethod
     def create_default(cls, map_inst):
-        return Category.objects.create(
+        return DataLayer.objects.create(
             map=map_inst,
-            name=getattr(settings, "LEAFLET_STORAGE_DEFAULT_CATEGORY_NAME", _("My data")),
+            name=getattr(settings, "LEAFLET_STORAGE_DEFAULT_LAYER_NAME", _("Layer 1")),
             display_on_load=True
         )
 
         null=True,
         verbose_name=_("description")
     )
-    category = models.ForeignKey(Category, verbose_name=_("category"))
+    datalayer = models.ForeignKey(DataLayer, verbose_name=_("layer"))
     options = DictField(blank=True, null=True, verbose_name=_("options"))
 
     objects = models.GeoManager()

File leaflet_storage/forms.py

View file
 
 from vectorformats.formats import geojson, kml, gpx, csv
 
-from .models import Map, Category, Polyline, Polygon, Marker
+from .models import Map, DataLayer, Polyline, Polygon, Marker
 
 DEFAULT_lATITUDE = settings.LEAFLET_LATITUDE if hasattr(settings, "LEAFLET_LATITUDE") else 51
 DEFAULT_LONGITUDE = settings.LEAFLET_LONGITUDE if hasattr(settings, "LEAFLET_LONGITUDE") else 2
         label=_("Copy/paste"),
         widget=forms.Textarea
     )
-    category = forms.ModelChoiceField([], label=_("category"))  # queryset is set by view
+    datalayer = forms.ModelChoiceField([], label=_("datalayer"))  # queryset is set by view
 
     def clean_data_file(self):
         """
     )
 
 
-class CategoryForm(OptionsForm, PathStyleMixin):
+class DataLayerForm(OptionsForm, PathStyleMixin):
 
     options_color = forms.CharField(
         required=False,
     )
 
     class Meta:
-        model = Category
+        model = DataLayer
         widgets = {
             "map": forms.HiddenInput(),
             "icon_class": forms.HiddenInput(),
     options_color = forms.CharField(
         required=False,
         label=_('color'),
-        help_text=_("Optional. Category color is used if not set.")
+        help_text=_("Optional. Layer color is used if not set.")
     )
 
 
 
     class Meta:
         model = Polygon
-        fields = ('name', 'description', 'category', 'latlng')
+        fields = ('name', 'description', 'datalayer', 'latlng')
         widgets = {
             'latlng': forms.HiddenInput(),
         }
         self.fields["fill"].initial = False
 
     class Meta:
-        fields = ('name', 'description', 'category', 'latlng')
+        fields = ('name', 'description', 'datalayer', 'latlng')
         model = Polyline
         widgets = {
             'latlng': forms.HiddenInput(),
 class MarkerForm(FeatureForm):
 
     class Meta:
-        fields = ('name', 'description', 'category', 'latlng', 'icon_class', 'pictogram')
+        fields = ('name', 'description', 'datalayer', 'latlng', 'icon_class', 'pictogram')
         model = Marker
         widgets = {
             'latlng': forms.HiddenInput(),

File leaflet_storage/locale/de/LC_MESSAGES/django.mo

Binary file modified.

File leaflet_storage/locale/de/LC_MESSAGES/django.po

View file
 msgstr ""
 "Project-Id-Version: 0.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-03 21:02+0100\n"
+"POT-Creation-Date: 2013-06-08 12:39+0200\n"
 "PO-Revision-Date: 2012-12-27 11:09+0100\n"
 "Last-Translator: YOHAN BONIFACE <yb@enix.org>\n"
 "Language-Team: FR <LL@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: base_models.py:12
+#: base_models.py:16
 msgid "name"
 msgstr "Name"
 
-#: base_models.py:26
+#: base_models.py:31
 msgid "details"
 msgstr "Details"
 
-#: base_models.py:27
+#: base_models.py:32
 msgid "Link to a page where the licence is detailed."
 msgstr "Verlinke auf eine Seite mit der Lizenz."
 
-#: base_models.py:38
+#: base_models.py:44
 msgid "No licence set"
 msgstr "Keine Lizenz ausgewählt"
 
-#: base_models.py:45
+#: base_models.py:51
 msgid "URL template using OSM tile format"
 msgstr "Das URL-Template nutzt das OSM Tile Format"
 
-#: base_models.py:71
+#: base_models.py:59
+msgid "Order of the tilelayers in the edit box"
+msgstr ""
+
+#: base_models.py:85 forms.py:116
 msgid "Everyone can edit"
 msgstr "Jeder kann bearbeiten"
 
-#: base_models.py:72
+#: base_models.py:86
 msgid "Only editors can edit"
 msgstr "Nur Bearbeiter können bearbeiten."
 
-#: base_models.py:73
+#: base_models.py:87
 msgid "Only owner can edit"
 msgstr "Nur der Ersteller kann bearbeiten"
 
-#: base_models.py:76 base_models.py:151 base_models.py:221
+#: base_models.py:90 base_models.py:231 base_models.py:277
 msgid "description"
 msgstr "Beschreibung"
 
-#: base_models.py:77
+#: base_models.py:91
 msgid "center"
 msgstr "Mittelpunkt"
 
-#: base_models.py:78
+#: base_models.py:92
 msgid "zoom"
 msgstr "zoom"
 
-#: base_models.py:79
+#: base_models.py:93
 msgid "locate"
 msgstr "lokalisiere"
 
-#: base_models.py:79
+#: base_models.py:93
 msgid "Locate user on load?"
 msgstr "Standort des Benutzers bei dem Laden bestimmen?"
 
-#: base_models.py:82
+#: base_models.py:96
 msgid "Choose the map licence."
 msgstr "Kartenlizenz auswählen"
 
-#: base_models.py:83
+#: base_models.py:97
 msgid "licence"
 msgstr "Lizenz"
 
-#: base_models.py:88
+#: base_models.py:103
 msgid "owner"
 msgstr "Ersteller"
 
-#: base_models.py:89
+#: base_models.py:104
 msgid "editors"
 msgstr "Bearbeiter"
 
-#: base_models.py:90
+#: base_models.py:105
 msgid "edit status"
 msgstr "Bearbeitungsstatus"
 
-#: base_models.py:156
-msgid "Must be a CSS valid name (eg.: DarkBlue or #123456)"
-msgstr "Es muss ein gültiger CSS Name verwendet werden (z.B. DarkBlue ou #123456)"
+#: base_models.py:106
+msgid "settings"
+msgstr ""
 
-#: base_models.py:157 base_models.py:227
-msgid "color"
-msgstr "Farbe"
+#: base_models.py:153
+#, python-format
+msgid "Your anonymous map has been attached to your account %s"
+msgstr ""
 
-#: base_models.py:163
+#: base_models.py:208
 msgid "pictogram"
 msgstr "pictogram"
 
-#: base_models.py:173
+#: base_models.py:215
+msgid "icon type"
+msgstr ""
+
+#: base_models.py:216
+msgid "Choose the style of the marker."
+msgstr ""
+
+#: base_models.py:233 base_models.py:280
+msgid "options"
+msgstr ""
+
+#: base_models.py:236
 msgid "display on load"
 msgstr "Bei dem Laden anzeigen"
 
-#: base_models.py:174
-msgid "Display this category on load."
+#: base_models.py:237
+#, fuzzy
+msgid "Display this layer on load."
 msgstr "Diese Katergorie bereits beim Laden einblenden."
 
-#: base_models.py:179
-msgid "Rank to order the categories"
-msgstr "Priorität zum Ordnen der Kategorieren"
+#: base_models.py:267
+msgid "Layer 1"
+msgstr ""
 
-#: base_models.py:180
-msgid "rank"
-msgstr "Priorität"
+#: base_models.py:279
+msgid "layer"
+msgstr ""
 
-#: base_models.py:211
-msgid "My data"
-msgstr "Meine Daten"
+#: forms.py:112
+#, python-format
+msgid "Secret edit link is %s"
+msgstr ""
 
-#: base_models.py:229 forms.py:95
-msgid "category"
-msgstr "Kategorie"
+#: forms.py:117
+msgid "Only editable with secret edit link"
+msgstr ""
 
-#: forms.py:64
-msgid "You already have a map with this name."
-msgstr "Du hast bereits eine Karte mit diesem Namen."
+#: forms.py:143
+msgid "Content type"
+msgstr ""
 
-#: forms.py:93
+#: forms.py:144
 msgid "file"
 msgstr "Datei"
 
-#: forms.py:94
+#: forms.py:147
 msgid "URL"
 msgstr "URL"
 
-#: forms.py:115
+#: forms.py:148
+msgid "Supported values that will dynamically replaced: "
+msgstr ""
+
+#: forms.py:153
+msgid "Copy/paste"
+msgstr ""
+
+#: forms.py:176
 msgid "Unable to fetch content from URL."
 msgstr "Die verlinkte Datei konnte nicht gelesen werden."
 
-#: forms.py:128
-msgid "You must provide an URL or a file."
+#: forms.py:196
+#, fuzzy
+msgid "You must provide one data source."
 msgstr "Du musst eine URL oder eine Datei angeben."
 
-#: forms.py:130
-msgid "You can't provide both a file and an URL."
-msgstr "Du kannst entweder eine Datei oder eine URL angeben. Beides geht nicht."
+#: forms.py:209
+#, python-format
+msgid "Unsupported content_type: %s"
+msgstr "Content-Type wird nicht unterstützt: %s"
 
-#: forms.py:140
-msgid "Invalid GeoJSON"
-msgstr "GeoJSON ungültig"
+#: forms.py:214
+#, fuzzy, python-format
+msgid "Invalid %(content_type)s"
+msgstr "Content-Type wird nicht unterstützt: %s"
 
-#: forms.py:146
-msgid "Invalid KML"
-msgstr "KML ungültig"
+#: forms.py:227
+msgid "Format"
+msgstr ""
 
-#: forms.py:148
+#: forms.py:233
+msgid "Path smooth factor"
+msgstr ""
+
+#: forms.py:234
+msgid ""
+"How much to simplify the polyline on each zoom level (more = better "
+"performance and smoother look, less = more accurate)"
+msgstr ""
+
+#: forms.py:241
+msgid "Path opacity"
+msgstr ""
+
+#: forms.py:242
+msgid "Opacity, from 0.1 to 1.0 (opaque)."
+msgstr ""
+
+#: forms.py:247
+msgid "Polygon stroke"
+msgstr ""
+
+#: forms.py:248
+msgid "Whether to display or not the Polygon path."
+msgstr ""
+
+#: forms.py:254
+msgid "Path weight"
+msgstr ""
+
+#: forms.py:255
+msgid "Path weight in pixels. Max: 10."
+msgstr ""
+
+#: forms.py:260
+msgid "Path fill"
+msgstr ""
+
+#: forms.py:261
+msgid "Whether to fill the path with color."
+msgstr ""
+
+#: forms.py:267
+msgid "Fill opacity"
+msgstr ""
+
+#: forms.py:268
+msgid "Fill opacity, from 0.1 to 1.0 (opaque)."
+msgstr ""
+
+#: forms.py:272
+#, fuzzy
+msgid "Fill color"
+msgstr "Farbe"
+
+#: forms.py:273
+msgid "Optional. Same as color if not set."
+msgstr ""
+
+#: forms.py:277
+msgid "Dash array"
+msgstr ""
+
+#: forms.py:278
+msgid "A string that defines the stroke dash pattern. Ex.: '5, 10, 15'."
+msgstr ""
+
+#: forms.py:286 forms.py:303
+msgid "color"
+msgstr "Farbe"
+
+#: forms.py:287
+msgid "Must be a CSS valid name (eg.: DarkBlue or #123456)"
+msgstr ""
+"Es muss ein gültiger CSS Name verwendet werden (z.B. DarkBlue ou #123456)"
+
+#: forms.py:304
+msgid "Optional. Layer color is used if not set."
+msgstr ""
+
+#: forms.py:348
+msgid "Do you want to display the locate control?"
+msgstr ""
+
+#: forms.py:349
+msgid "Do you want to display the 'quick search' control?"
+msgstr ""
+
+#: forms.py:350
+msgid "Do you want to display the 'back to home page' control?"
+msgstr ""
+
+#: forms.py:351
+msgid "Do you want to display the embed control?"
+msgstr ""
+
+#: forms.py:352
+msgid "Do you want to display the scale control?"
+msgstr ""
+
+#: forms.py:353
+#, fuzzy
+msgid "Do you want to locate user on load?"
+msgstr "Standort des Benutzers bei dem Laden bestimmen?"
+
+#: forms.py:354
+msgid "Do you want to display map caption on load?"
+msgstr ""
+
+#: forms.py:355
+msgid "Do you want to display a minimap?"
+msgstr ""
+
+#: forms.py:356
+msgid "Do you want to display control with links to edit in OSM?"
+msgstr ""
+
+#: forms.py:357
+msgid "Do you want to enable Marker drawing?"
+msgstr ""
+
+#: forms.py:358
+msgid "Do you want to enable Polyline drawing?"
+msgstr ""
+
+#: forms.py:359
+msgid "Do you want to enable Polygon drawing?"
+msgstr ""
+
+#: views.py:173
 #, python-format
-msgid "Unsupported content_type: %s"
-msgstr "Content-Type wird nicht unterstützt: %s"
+msgid ""
+"Your map has been created! If you want to edit this map from another "
+"computer, please use this link: %(anonymous_url)s"
+msgstr ""
 
-#: views.py:188
+#: views.py:178
+msgid ""
+"Congratulations, your map has been created! To start editing, click on the "
+"pen icon."
+msgstr ""
+
+#: views.py:223
 msgid "Zoom and center updated with success!"
 msgstr "Zoomstufe und Mittelpunkt erfolgreich geändert!"
 
-#: views.py:206
+#: views.py:246
 msgid "Map editors updated with success!"
 msgstr "Bearbeiter erfolgreich geändert"
 
-#: views.py:371
+#: views.py:475
 msgid "Only its owner can delete the map."
 msgstr "Nur der Ersteller kann eine Karte löschen."
 
 #. Translators: "feature" is a feature type: Marker, Polyline, Polygon
-#: views.py:496
+#: views.py:636
 #, python-format
 msgid "%(feature)s successfully deleted."
 msgstr "%(feature)s erfolgreich gelöscht."
 
-#: views.py:641
-msgid "Category successfully deleted."
+#: views.py:787
+#, fuzzy
+msgid "Layer successfully deleted."
 msgstr "Kategorie erfolgreich gelöscht."
 
-#: templates/leaflet_storage/category_confirm_delete.html:2
-#: templates/leaflet_storage/category_form.html:7
+#: templates/leaflet_storage/datalayer_confirm_delete.html:2
+#: templates/leaflet_storage/datalayer_form.html:7
 #: templates/leaflet_storage/feature_confirm_delete.html:2
-#: templates/leaflet_storage/feature_form.html:12
+#: templates/leaflet_storage/feature_form.html:8
 #: templates/leaflet_storage/map_confirm_delete.html:2
-#: templates/leaflet_storage/map_form.html:6
+#: templates/leaflet_storage/map_form.html:9
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/leaflet_storage/category_confirm_delete.html:4
+#: templates/leaflet_storage/datalayer_confirm_delete.html:4
 #, fuzzy, python-format
 msgid ""
-"This will also delete all the %(category_count)s feature(s) of this category."
+"This will also delete all the %(feature_count)s feature(s) of this datalayer."
 msgstr ""
-"Dies wird auch alle %(category_count)s Objekte dieser Kategorie löschen."
+"Dies wird auch alle %(feature_count)s Objekte dieser Kategorie löschen."
 
-#: templates/leaflet_storage/category_confirm_delete.html:9
+#: templates/leaflet_storage/datalayer_confirm_delete.html:9
 #: templates/leaflet_storage/feature_confirm_delete.html:6
 #: templates/leaflet_storage/map_confirm_delete.html:10
 msgid "yes"
 msgstr "Ja"
 
+#: templates/leaflet_storage/login_popup_end.html:2
+msgid "You are logged in. Continuing..."
+msgstr ""
+
 #: templates/leaflet_storage/map_confirm_delete.html:4
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"This will also delete the %(category_count)s category(ies) of this map and "
-"all their features."
+"This will also delete the %(datalayer_count)s layer(s) of this map and all "
+"their features."
 msgstr ""
-"This will also delete the %(category_count)s category(ies) of this map and "
+"This will also delete the %(datalayer_count)s datalayer(ies) of this map and "
 "all their features."
 
 #: templates/leaflet_storage/map_confirm_delete.html:6
 msgid "Embed this map"
 msgstr "Diese Karte einbinden"
 
+#: templates/leaflet_storage/map_embed.html:3
+msgid "See full screen"
+msgstr ""
+
+#: templates/leaflet_storage/map_embed.html:4
+msgid "Short URL"
+msgstr ""
+
+#: templates/leaflet_storage/map_embed.html:6
+msgid "Download map data"
+msgstr ""
+
+#: templates/leaflet_storage/map_embed.html:7
+#, python-format
+msgid ""
+"The data is published under the <a href=\"%(licence.details)s\">%(licence)s</"
+"a> licence. Please check it before using the data in your own projects."
+msgstr ""
+
+#: templates/leaflet_storage/map_embed.html:10
+msgid "Download"
+msgstr ""
+
+#: templates/leaflet_storage/map_form.html:6
+msgid ""
+"You are creating a map without being authenticated. A cookie will be set on "
+"this browser to make possible for you to edit the map in the future. If you "
+"want to edit the map from another computer, use the \"edit url\" displayed "
+"in the \"permissions\" window. If you log in and load the map, the map will "
+"be attached to your account."
+msgstr ""
+
 #: templates/leaflet_storage/map_infos.html:8
 msgid "User content credits"
 msgstr "User content credits"
 "Map user content has been published under licence <a href=\"%(url)s\">"
 "%(licence)s</a>"
 msgstr ""
-"Die hinzugefügten Informationen wurden unter der "
-"<a href=\"%(url)s\">%(licence)s</a> veröffentlicht."
+"Die hinzugefügten Informationen wurden unter der <a href=\"%(url)s\">"
+"%(licence)s</a> veröffentlicht."
 
 #: templates/leaflet_storage/map_infos.html:10
 msgid "Tile layers credits"
 msgstr "Tile layers credits"
 
 #: templates/leaflet_storage/map_infos.html:16
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "Powered by <a href=\"%(leaflet_url)s\">Leaflet</a> and <a href="
-"\"%(django_url)s\">Django</a>, glued by <a href=\"%(umap_url)s\">u{Map} "
+"\"%(django_url)s\">Django</a>, glued by <a href=\"%(umap_url)s\">uMap "
 "project</a>."
 msgstr ""
 "Powered by <a href=\"%(leaflet_url)s\">Leaflet</a> and <a href="
 msgid "Map permissions"
 msgstr "Kartenberechtigungen"
 
+#: templates/leaflet_storage/map_update_settings.html:2
+msgid "Map settings"
+msgstr ""
+
+#: templates/leaflet_storage/map_update_tilelayers.html:2
+msgid "Choose your tilelayer"
+msgstr ""
+
 #: templates/leaflet_storage/upload_form.html:2
 msgid "Upload features"
 msgstr "POIs importieren"
 
 #: templates/leaflet_storage/upload_form.html:4
 msgid "GeoJSON (properties used: name or title, description, color)"
-msgstr "GeoJSON (Benutzte Einstellungen: Name oder Titel, Beschreibung und Farbe"
+msgstr ""
+"GeoJSON (Benutzte Einstellungen: Name oder Titel, Beschreibung und Farbe"
 
 #: templates/leaflet_storage/upload_form.html:5
 msgid "KML (properties used: name, description)"
 msgstr "KML (Benutze Einstellungen: Name, Beschreibung)"
 
+#: templates/leaflet_storage/upload_form.html:6
+#, fuzzy
+msgid "GPX (properties used: name, desc)"
+msgstr "KML (Benutze Einstellungen: Name, Beschreibung)"
+
 #: templates/registration/login.html:2
 msgid "Please log in to proceed"
 msgstr "Bitte logge dich ein um fortzufahren."
 
 #: templates/registration/login.html:4
 msgid "Your username and password didn't match. Please try again."
-msgstr "Dein Benutzername und Password stimmen nicht überein. Bitte versuche es noch einmal."
+msgstr ""
+"Dein Benutzername und Password stimmen nicht überein. Bitte versuche es noch "
+"einmal."
+
+msgid "Rank to order the datalayers"
+msgstr "Priorität zum Ordnen der Kategorieren"
+
+msgid "rank"
+msgstr "Priorität"
+
+msgid "My data"
+msgstr "Meine Daten"
+
+msgid "datalayer"
+msgstr "Kategorie"

File leaflet_storage/locale/fi/LC_MESSAGES/django.mo

Binary file added.

File leaflet_storage/locale/fi/LC_MESSAGES/django.po

View file
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-16 12:20+0200\n"
+"POT-Creation-Date: 2013-06-08 12:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 msgid "URL template using OSM tile format"
 msgstr ""
 
-#: base_models.py:77 forms.py:116
+#: base_models.py:59
+msgid "Order of the tilelayers in the edit box"
+msgstr ""
+
+#: base_models.py:85 forms.py:116
 msgid "Everyone can edit"
 msgstr ""
 
-#: base_models.py:78
+#: base_models.py:86
 msgid "Only editors can edit"
 msgstr ""
 
-#: base_models.py:79
+#: base_models.py:87
 msgid "Only owner can edit"
 msgstr ""
 
-#: base_models.py:82 base_models.py:223 base_models.py:269
+#: base_models.py:90 base_models.py:231 base_models.py:277
 msgid "description"
 msgstr ""
 
-#: base_models.py:83
+#: base_models.py:91
 msgid "center"
 msgstr ""
 
-#: base_models.py:84
+#: base_models.py:92
 msgid "zoom"
 msgstr ""
 
-#: base_models.py:85
+#: base_models.py:93
 msgid "locate"
 msgstr ""
 
-#: base_models.py:85
+#: base_models.py:93
 msgid "Locate user on load?"
 msgstr ""
 
-#: base_models.py:88
+#: base_models.py:96
 msgid "Choose the map licence."
 msgstr ""
 
-#: base_models.py:89
+#: base_models.py:97
 msgid "licence"
 msgstr ""
 
-#: base_models.py:95
+#: base_models.py:103
 msgid "owner"
 msgstr ""
 
-#: base_models.py:96
+#: base_models.py:104
 msgid "editors"
 msgstr ""
 
-#: base_models.py:97
+#: base_models.py:105
 msgid "edit status"
 msgstr ""
 
-#: base_models.py:98
+#: base_models.py:106
 msgid "settings"
 msgstr ""
 
-#: base_models.py:145
+#: base_models.py:153
 #, python-format
 msgid "Your anonymous map has been attached to your account %s"
 msgstr ""
 
-#: base_models.py:200
+#: base_models.py:208
 msgid "pictogram"
 msgstr ""
 
-#: base_models.py:207
+#: base_models.py:215
 msgid "icon type"
 msgstr ""
 
-#: base_models.py:208
+#: base_models.py:216
 msgid "Choose the style of the marker."
 msgstr ""
 
-#: base_models.py:225 base_models.py:272
+#: base_models.py:233 base_models.py:280
 msgid "options"
 msgstr ""
 
-#: base_models.py:228
+#: base_models.py:236
 msgid "display on load"
 msgstr ""
 
-#: base_models.py:229
-msgid "Display this category on load."
+#: base_models.py:237
+msgid "Display this layer on load."
 msgstr ""
 
-#: base_models.py:259
-msgid "My data"
+#: base_models.py:267
+msgid "Layer 1"
 msgstr ""
 
-#: base_models.py:271 forms.py:149
-msgid "category"
+#: base_models.py:279
+msgid "layer"
 msgstr ""
 
 #: forms.py:112
 msgid "Only editable with secret edit link"
 msgstr ""
 
-#: forms.py:141
+#: forms.py:143
 msgid "Content type"
 msgstr ""
 
-#: forms.py:142
+#: forms.py:144
 msgid "file"
 msgstr ""
 
-#: forms.py:145
+#: forms.py:147
 msgid "URL"
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid "Supported values that will dynamically replaced: "
 msgstr ""
 
-#: forms.py:169
-msgid "Unable to fetch content from URL."
+#: forms.py:153
+msgid "Copy/paste"
+msgstr ""
+
+#: forms.py:156
+msgid "datalayer"
 msgstr ""
 
-#: forms.py:181
-msgid "You must provide an URL or a file."
+#: forms.py:176
+msgid "Unable to fetch content from URL."
 msgstr ""
 
-#: forms.py:183
-msgid "You can't provide both a file and an URL."
+#: forms.py:196
+msgid "You must provide one data source."
 msgstr ""
 
-#: forms.py:195
+#: forms.py:209
 #, python-format
 msgid "Unsupported content_type: %s"
 msgstr ""
 
-#: forms.py:200
+#: forms.py:214
 #, python-format
 msgid "Invalid %(content_type)s"
 msgstr ""
 
-#: forms.py:209
+#: forms.py:227
+msgid "Format"
+msgstr ""
+
+#: forms.py:233
 msgid "Path smooth factor"
 msgstr ""
 
-#: forms.py:210
+#: forms.py:234
 msgid ""
 "How much to simplify the polyline on each zoom level (more = better "
 "performance and smoother look, less = more accurate)"
 msgstr ""
 
-#: forms.py:217
+#: forms.py:241
 msgid "Path opacity"
 msgstr ""
 
-#: forms.py:218
+#: forms.py:242
 msgid "Opacity, from 0.1 to 1.0 (opaque)."
 msgstr ""
 
-#: forms.py:223
+#: forms.py:247
 msgid "Polygon stroke"
 msgstr ""
 
-#: forms.py:224
+#: forms.py:248
 msgid "Whether to display or not the Polygon path."
 msgstr ""
 
-#: forms.py:230
+#: forms.py:254
 msgid "Path weight"
 msgstr ""
 
-#: forms.py:231
+#: forms.py:255
 msgid "Path weight in pixels. Max: 10."
 msgstr ""
 
-#: forms.py:236
+#: forms.py:260
 msgid "Path fill"
 msgstr ""
 
-#: forms.py:237
+#: forms.py:261
 msgid "Whether to fill the path with color."
 msgstr ""
 
-#: forms.py:243
+#: forms.py:267
 msgid "Fill opacity"
 msgstr ""
 
-#: forms.py:244
+#: forms.py:268
 msgid "Fill opacity, from 0.1 to 1.0 (opaque)."
 msgstr ""
 
-#: forms.py:248
+#: forms.py:272
 msgid "Fill color"
 msgstr ""
 
-#: forms.py:249
+#: forms.py:273
 msgid "Optional. Same as color if not set."
 msgstr ""
 
-#: forms.py:253
+#: forms.py:277
 msgid "Dash array"
 msgstr ""
 
-#: forms.py:254
+#: forms.py:278
 msgid "A string that defines the stroke dash pattern. Ex.: '5, 10, 15'."
 msgstr ""
 
-#: forms.py:262 forms.py:279
+#: forms.py:286 forms.py:303
 msgid "color"
 msgstr ""
 
-#: forms.py:263
+#: forms.py:287
 msgid "Must be a CSS valid name (eg.: DarkBlue or #123456)"
 msgstr ""
 
-#: forms.py:280
-msgid "Optional. Category color is used if not set."
+#: forms.py:304
+msgid "Optional. Layer color is used if not set."
 msgstr ""
 
-#: forms.py:324
+#: forms.py:348
 msgid "Do you want to display the locate control?"
 msgstr ""
 
-#: forms.py:325
+#: forms.py:349
 msgid "Do you want to display the 'quick search' control?"
 msgstr ""
 
-#: forms.py:326
+#: forms.py:350
 msgid "Do you want to display the 'back to home page' control?"
 msgstr ""
 
-#: forms.py:327
+#: forms.py:351
 msgid "Do you want to display the embed control?"
 msgstr ""
 
-#: forms.py:328
+#: forms.py:352
 msgid "Do you want to display the scale control?"
 msgstr ""
 
-#: forms.py:329
+#: forms.py:353
 msgid "Do you want to locate user on load?"
 msgstr ""
 
-#: forms.py:330
+#: forms.py:354
 msgid "Do you want to display map caption on load?"
 msgstr ""
 
-#: forms.py:331
+#: forms.py:355
 msgid "Do you want to display a minimap?"
 msgstr ""
 
-#: forms.py:332
+#: forms.py:356
 msgid "Do you want to display control with links to edit in OSM?"
 msgstr ""
 
-#: forms.py:333
+#: forms.py:357
 msgid "Do you want to enable Marker drawing?"
 msgstr ""
 
-#: forms.py:334
+#: forms.py:358
 msgid "Do you want to enable Polyline drawing?"
 msgstr ""
 
-#: forms.py:335
+#: forms.py:359
 msgid "Do you want to enable Polygon drawing?"
 msgstr ""
 
-#: views.py:161
+#: views.py:173
 #, python-format
 msgid ""
 "Your map has been created! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
 msgstr ""
 
-#: views.py:166
+#: views.py:178
 msgid ""
 "Congratulations, your map has been created! To start editing, click on the "
 "pen icon."
 msgstr ""
 
-#: views.py:211
+#: views.py:223
 msgid "Zoom and center updated with success!"
 msgstr ""
 
-#: views.py:234
+#: views.py:246
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:438
+#: views.py:475
 msgid "Only its owner can delete the map."
 msgstr ""
 
 #. Translators: "feature" is a feature type: Marker, Polyline, Polygon
-#: views.py:602
+#: views.py:636
 #, python-format
 msgid "%(feature)s successfully deleted."
 msgstr ""
 
-#: views.py:753
-msgid "Category successfully deleted."
+#: views.py:787
+msgid "Layer successfully deleted."
 msgstr ""
 
-#: templates/leaflet_storage/category_confirm_delete.html:2
-#: templates/leaflet_storage/category_form.html:7
+#: templates/leaflet_storage/datalayer_confirm_delete.html:2
+#: templates/leaflet_storage/datalayer_form.html:7
 #: templates/leaflet_storage/feature_confirm_delete.html:2
 #: templates/leaflet_storage/feature_form.html:8
 #: templates/leaflet_storage/map_confirm_delete.html:2
 msgid "Delete"
 msgstr ""
 
-#: templates/leaflet_storage/category_confirm_delete.html:4
+#: templates/leaflet_storage/datalayer_confirm_delete.html:4
 #, python-format
 msgid ""
-"This will also delete all the %(category_count)s feature(s) of this category."
+"This will also delete all the %(feature_count)s feature(s) of this datalayer."
 msgstr ""
 
-#: templates/leaflet_storage/category_confirm_delete.html:9
+#: templates/leaflet_storage/datalayer_confirm_delete.html:9
 #: templates/leaflet_storage/feature_confirm_delete.html:6
 #: templates/leaflet_storage/map_confirm_delete.html:10
 msgid "yes"
 #: templates/leaflet_storage/map_confirm_delete.html:4
 #, python-format
 msgid ""
-"This will also delete the %(category_count)s category(ies) of this map and "
-"all their features."
+"This will also delete the %(datalayer_count)s layer(s) of this map and all "
+"their features."
 msgstr ""
 
 #: templates/leaflet_storage/map_confirm_delete.html:6
 msgid "Short URL"
 msgstr ""
 
+#: templates/leaflet_storage/map_embed.html:6
+msgid "Download map data"
+msgstr ""
+
+#: templates/leaflet_storage/map_embed.html:7
+#, python-format
+msgid ""
+"The data is published under the <a href=\"%(licence.details)s\">%(licence)s</"
+"a> licence. Please check it before using the data in your own projects."
+msgstr ""
+
+#: templates/leaflet_storage/map_embed.html:10
+msgid "Download"
+msgstr ""
+
 #: templates/leaflet_storage/map_form.html:6
 msgid ""
 "You are creating a map without being authenticated. A cookie will be set on "
 msgid "Map settings"
 msgstr ""
 
+#: templates/leaflet_storage/map_update_tilelayers.html:2
+msgid "Choose your tilelayer"
+msgstr ""
+
 #: templates/leaflet_storage/upload_form.html:2
 msgid "Upload features"
 msgstr ""

File leaflet_storage/locale/fr/LC_MESSAGES/django.mo

Binary file modified.

File leaflet_storage/locale/fr/LC_MESSAGES/django.po

View file
 msgstr ""
 "Project-Id-Version: 0.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-01 07:21-0400\n"
+"POT-Creation-Date: 2013-06-08 12:39+0200\n"
 "PO-Revision-Date: 2012-12-27 11:09+0100\n"
 "Last-Translator: YOHAN BONIFACE <yb@enix.org>\n"
 "Language-Team: FR <LL@li.org>\n"
 msgid "Link to a page where the licence is detailed."
 msgstr "Lien vers une page détaillant la licence."
 
-#: base_models.py:43
+#: base_models.py:44
 msgid "No licence set"
 msgstr "Aucune licence"
 
-#: base_models.py:50
+#: base_models.py:51
 msgid "URL template using OSM tile format"
 msgstr "Template d'URL au format OSM"
 
-#: base_models.py:76 forms.py:116
+#: base_models.py:59
+msgid "Order of the tilelayers in the edit box"
+msgstr ""
+
+#: base_models.py:85 forms.py:116
 msgid "Everyone can edit"
 msgstr "Tout le monde peut éditer"
 
-#: base_models.py:77
+#: base_models.py:86
 msgid "Only editors can edit"
 msgstr "Seuls les éditeurs peuvent éditer"
 
-#: base_models.py:78
+#: base_models.py:87
 msgid "Only owner can edit"
 msgstr "Seul le créateur peut modifier"
 
-#: base_models.py:81 base_models.py:222 base_models.py:268
+#: base_models.py:90 base_models.py:231 base_models.py:277
 msgid "description"
 msgstr "description"
 
-#: base_models.py:82
+#: base_models.py:91
 msgid "center"
 msgstr "centre"
 
-#: base_models.py:83
+#: base_models.py:92
 msgid "zoom"
 msgstr "zoom"
 
-#: base_models.py:84
+#: base_models.py:93
 msgid "locate"
 msgstr "géolocaliser"
 
-#: base_models.py:84
+#: base_models.py:93
 msgid "Locate user on load?"
 msgstr "Géolocaliser l'utilisateur au chargement?"
 
-#: base_models.py:87
+#: base_models.py:96
 msgid "Choose the map licence."
 msgstr "Chosir une licence pour la carte"
 
-#: base_models.py:88
+#: base_models.py:97
 msgid "licence"
 msgstr "licence"
 
-#: base_models.py:94
+#: base_models.py:103
 msgid "owner"
 msgstr "créateur"
 
-#: base_models.py:95
+#: base_models.py:104
 msgid "editors"
 msgstr "éditeurs"
 
-#: base_models.py:96
+#: base_models.py:105
 msgid "edit status"
 msgstr "statut d'édition"
 
-#: base_models.py:97
+#: base_models.py:106
 msgid "settings"
 msgstr "réglages"
 
-#: base_models.py:144
+#: base_models.py:153
 #, python-format
 msgid "Your anonymous map has been attached to your account %s"
 msgstr "La carte a été associée à votre compte %s"
 
-#: base_models.py:199
+#: base_models.py:208
 msgid "pictogram"
 msgstr "picto"
 
-#: base_models.py:206
+#: base_models.py:215
 msgid "icon type"
 msgstr "Type d'icone"
 
-#: base_models.py:207
+#: base_models.py:216
 msgid "Choose the style of the marker."
 msgstr "Choisir le style du marqueur"
 
-#: base_models.py:224 base_models.py:271
+#: base_models.py:233 base_models.py:280
 msgid "options"
 msgstr "options"
 
-#: base_models.py:227
+#: base_models.py:236
 msgid "display on load"
 msgstr "afficher au chargement."
 
-#: base_models.py:228
-msgid "Display this category on load."
-msgstr "Afficher cette catégorie au chargement."
+#: base_models.py:237
+msgid "Display this layer on load."
+msgstr "Afficher ce calque au chargement."
 
-#: base_models.py:258
-msgid "My data"
-msgstr "Mes données"
+#: base_models.py:267
+msgid "Layer 1"
+msgstr ""
 
-#: base_models.py:270 forms.py:149
-msgid "category"
-msgstr "catégorie"
+#: base_models.py:279
+msgid "layer"
+msgstr ""
 
 #: forms.py:112
 #, python-format
 msgid "Only editable with secret edit link"
 msgstr "Editable seulement avec le lien d'édition secret"
 
-#: forms.py:141
+#: forms.py:143
 msgid "Content type"
 msgstr "Type de contenu"
 
-#: forms.py:142
+#: forms.py:144
 msgid "file"
 msgstr "fichier"
 
-#: forms.py:145
+#: forms.py:147
 msgid "URL"
 msgstr "URL"
 
-#: forms.py:146
+#: forms.py:148
 msgid "Supported values that will dynamically replaced: "
 msgstr "Valeurs qui seront dynamiquement remplacées: "
 
-#: forms.py:169
+#: forms.py:153
+msgid "Copy/paste"
+msgstr ""
+
+#: forms.py:156
+msgid "datalayer"
+msgstr "calque"
+
+#: forms.py:176
 msgid "Unable to fetch content from URL."
 msgstr "Impossible de récupérer le contenu de cette URL."
 
-#: forms.py:181
-msgid "You must provide an URL or a file."
+#: forms.py:196
+msgid "You must provide one data source."
 msgstr "Vous devez définir au moins une URL ou un fichier."
 
-#: forms.py:183
-msgid "You can't provide both a file and an URL."
-msgstr "Vous ne pouvez pas définir à la fois une URL et un fichier."
-
-#: forms.py:195
+#: forms.py:209
 #, python-format
 msgid "Unsupported content_type: %s"
 msgstr "Content-Type non pris en charge: %s"
 
-#: forms.py:200
+#: forms.py:214
 #, python-format
 msgid "Invalid %(content_type)s"
 msgstr "Fichier %(content_type)s invalide"
 
-#: forms.py:209
+#: forms.py:227
+msgid "Format"
+msgstr ""
+
+#: forms.py:233
 msgid "Path smooth factor"
 msgstr ""
 
-#: forms.py:210
+#: forms.py:234
 msgid ""
 "How much to simplify the polyline on each zoom level (more = better "
 "performance and smoother look, less = more accurate)"
 "Valeur de simplification des lignes pour chaque niveau de zoom (grand nombre "
 "= meilleure performance, petit nombre = plus précis)"
 
-#: forms.py:217
+#: forms.py:241
 msgid "Path opacity"
 msgstr "Opacité du trait"
 
-#: forms.py:218
+#: forms.py:242
 msgid "Opacity, from 0.1 to 1.0 (opaque)."
 msgstr "Opacité, de 0.1 à 1.0 (opaque)"
 
-#: forms.py:223
+#: forms.py:247
 msgid "Polygon stroke"
 msgstr "Contour du polygon"
 
-#: forms.py:224
+#: forms.py:248
 msgid "Whether to display or not the Polygon path."
 msgstr "Afficher ou non le trait du polygon"
 
-#: forms.py:230
+#: forms.py:254
 msgid "Path weight"
 msgstr "Épaisseur du trait"
 
-#: forms.py:231
+#: forms.py:255
 msgid "Path weight in pixels. Max: 10."
 msgstr "Épaisseur du trait, en pixels. Max: 10."
 
-#: forms.py:236
+#: forms.py:260
 msgid "Path fill"
 msgstr "Coloriage du fond"
 
-#: forms.py:237
+#: forms.py:261
 msgid "Whether to fill the path with color."
 msgstr "Colorier la fond"
 
-#: forms.py:243
+#: forms.py:267
 msgid "Fill opacity"
 msgstr "Opacité du fond"
 
-#: forms.py:244
+#: forms.py:268
 msgid "Fill opacity, from 0.1 to 1.0 (opaque)."
 msgstr "Opacité du fond, de 0.1 à 1.0 (opaque)."
 
-#: forms.py:248
-#, fuzzy
+#: forms.py:272
 msgid "Fill color"
 msgstr "couleur"
 
-#: forms.py:249
-#, fuzzy
+#: forms.py:273
 msgid "Optional. Same as color if not set."
-msgstr "Laisser vide pour utiliser la couleur de la catégorie."
+msgstr "Laisser vide pour utiliser la couleur du calque."
 
-#: forms.py:253
+#: forms.py:277
 msgid "Dash array"
 msgstr "Pointillés du trait"
 
-#: forms.py:254
+#: forms.py:278
 msgid "A string that defines the stroke dash pattern. Ex.: '5, 10, 15'."
 msgstr "Une chaîne définissant les pointillés du trait. Ex: '5, 10, 15'."
 
-#: forms.py:262 forms.py:279
+#: forms.py:286 forms.py:303
 msgid "color"
 msgstr "couleur"
 
-#: forms.py:263
+#: forms.py:287
 msgid "Must be a CSS valid name (eg.: DarkBlue or #123456)"
 msgstr "Doit être une chaîne CSS valide (ex. DarkBlud ou #123456)"
 
-#: forms.py:280
-msgid "Optional. Category color is used if not set."
-msgstr "Laisser vide pour utiliser la couleur de la catégorie."
+#: forms.py:304
+msgid "Optional. Layer color is used if not set."
+msgstr "Laisser vide pour utiliser la couleur du calque."
 
-#: forms.py:324
+#: forms.py:348
 msgid "Do you want to display the locate control?"
 msgstr "Voulez-vous affichez le bouton de géolocalisation?"
 
-#: forms.py:325
+#: forms.py:349
 msgid "Do you want to display the 'quick search' control?"
 msgstr "Voulez-vous afficher le bouton de recherche rapide?"
 
-#: forms.py:326
+#: forms.py:350
 msgid "Do you want to display the 'back to home page' control?"
 msgstr "Voulez-vous affichez le bouton de retour à la page d'accueil?"
 
-#: forms.py:327
+#: forms.py:351
 msgid "Do you want to display the embed control?"
 msgstr "Voulez-vous afficher le bouton d'export?"
 
-#: forms.py:328
+#: forms.py:352
 msgid "Do you want to display the scale control?"
 msgstr "Voulez-vous afficher l'échelle?"
 
-#: forms.py:329
+#: forms.py:353
 msgid "Do you want to locate user on load?"
 msgstr "Géolocaliser l'utilisateur au chargement?"
 
-#: forms.py:330
+#: forms.py:354
+msgid "Do you want to display map caption on load?"
+msgstr "Voulez-vous afficher la minicarte?"
+
+#: forms.py:355
 msgid "Do you want to display a minimap?"
 msgstr "Voulez-vous afficher la minicarte?"
 
-#: forms.py:331
+#: forms.py:356
 msgid "Do you want to display control with links to edit in OSM?"
 msgstr "Voulez-vous afficher le bouton d'édition dans OSM?"
 
-#: forms.py:332
+#: forms.py:357
 msgid "Do you want to enable Marker drawing?"
 msgstr "Autoriser l'ajout de marqueurs?"
 
-#: forms.py:333
+#: forms.py:358
 msgid "Do you want to enable Polyline drawing?"
 msgstr "Autoriser l'ajout de lignes?"
 
-#: forms.py:334
+#: forms.py:359
 msgid "Do you want to enable Polygon drawing?"
 msgstr "Autoriser l'ajout de polygones?"
 
-#: views.py:161
+#: views.py:173
 #, python-format
 msgid ""
 "Your map has been created! If you want to edit this map from another "
 "Votre carte a été créée! Si vous souhaitez l'éditer depuis un autre "
 "ordinateur, veuillez utiliser ce lien: %(anonymous_url)s"
 
-#: views.py:166
+#: views.py:178
 msgid ""
 "Congratulations, your map has been created! To start editing, click on the "
 "pen icon."
 msgstr ""
 "Votre carte a été créée! Pour commencer à la modifier, cliquez sur le stylo."
 
-#: views.py:211
+#: views.py:223
 msgid "Zoom and center updated with success!"
 msgstr "Zoom et centre mis à jour!"
 
-#: views.py:234
+#: views.py:246
 msgid "Map editors updated with success!"
 msgstr "Éditeurs de la carte mis à jour!"
 
-#: views.py:437
+#: views.py:475
 msgid "Only its owner can delete the map."
 msgstr "Seul le créateur de la carte peut la supprimer."
 
 #. Translators: "feature" is a feature type: Marker, Polyline, Polygon
-#: views.py:601
+#: views.py:636
 #, python-format
 msgid "%(feature)s successfully deleted."
 msgstr "%(feature)s supprimé(e)."
 
-#: views.py:752
-msgid "Category successfully deleted."
-msgstr "Catégorie supprimée."
+#: views.py:787
+msgid "Layer successfully deleted."
+msgstr "Calque supprimé."
 
-#: templates/leaflet_storage/category_confirm_delete.html:2
-#: templates/leaflet_storage/category_form.html:7
+#: templates/leaflet_storage/datalayer_confirm_delete.html:2
+#: templates/leaflet_storage/datalayer_form.html:7
 #: templates/leaflet_storage/feature_confirm_delete.html:2
 #: templates/leaflet_storage/feature_form.html:8
 #: templates/leaflet_storage/map_confirm_delete.html:2
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/leaflet_storage/category_confirm_delete.html:4
+#: templates/leaflet_storage/datalayer_confirm_delete.html:4
 #, python-format
 msgid ""
-"This will also delete all the %(category_count)s feature(s) of this category."
+"This will also delete all the %(feature_count)s feature(s) of this datalayer."
 msgstr ""
-"Ceci va aussi supprimer le(s) %(category_count)s POI(s) de cette catégorie."
+"Ceci va aussi supprimer le(s) %(feature_count)s POI(s) de ce calque."
 
-#: templates/leaflet_storage/category_confirm_delete.html:9
+#: templates/leaflet_storage/datalayer_confirm_delete.html:9
 #: templates/leaflet_storage/feature_confirm_delete.html:6
 #: templates/leaflet_storage/map_confirm_delete.html:10
 msgid "yes"
 #: templates/leaflet_storage/map_confirm_delete.html:4
 #, python-format
 msgid ""
-"This will also delete the %(category_count)s category(ies) of this map and "
-"all their features."
+"This will also delete the %(datalayer_count)s layer(s) of this map and all "
+"their features."
 msgstr ""
-"Ceci va aussi supprimer les %(category_count)s catégorie(s) de cette carte "
+"Ceci va aussi supprimer les %(datalayer_count)s calques de cette carte "
 "et leurs POI."
 
 #: templates/leaflet_storage/map_confirm_delete.html:6
 msgid "Embed this map"
 msgstr "Exporter cette carte"
 
+#: templates/leaflet_storage/map_embed.html:3
+msgid "See full screen"
+msgstr ""
+
 #: templates/leaflet_storage/map_embed.html:4
 msgid "Short URL"
 msgstr "URL courte"
 
+#: templates/leaflet_storage/map_embed.html:6
+msgid "Download map data"
+msgstr ""
+
+#: templates/leaflet_storage/map_embed.html:7
+#, python-format
+msgid ""
+"The data is published under the <a href=\"%(licence.details)s\">%(licence)s</"
+"a> licence. Please check it before using the data in your own projects."
+msgstr ""
+
+#: templates/leaflet_storage/map_embed.html:10
+msgid "Download"
+msgstr ""
+
 #: templates/leaflet_storage/map_form.html:6
 msgid ""
 "You are creating a map without being authenticated. A cookie will be set on "
 #, python-format
 msgid ""
 "Powered by <a href=\"%(leaflet_url)s\">Leaflet</a> and <a href="
-"\"%(django_url)s\">Django</a>, glued by <a href=\"%(umap_url)s\">u{Map} "
+"\"%(django_url)s\">Django</a>, glued by <a href=\"%(umap_url)s\">uMap "
 "project</a>."
 msgstr ""
 "Propulsé par <a href=\"%(leaflet_url)s\">Leaflet</a> et <a href="
 msgid "Map settings"
 msgstr "Réglages de la carte"
 
+#: templates/leaflet_storage/map_update_tilelayers.html:2
+msgid "Choose your tilelayer"
+msgstr ""
+
 #: templates/leaflet_storage/upload_form.html:2
 msgid "Upload features"
 msgstr "Importer des POI"
 #: templates/registration/login.html:4
 msgid "Your username and password didn't match. Please try again."
 msgstr "Nom d'utilisateur ou mot de passe incorrect. Merci de corriger."
-
-#~ msgid "Rank to order the categories"
-#~ msgstr "Rang pour trier les catégories."
-
-#~ msgid "rank"
-#~ msgstr "rang"
-
-#~ msgid "You already have a map with this name."
-#~ msgstr "Vous avez déjà une carte portant ce nom."

File leaflet_storage/locale/it/LC_MESSAGES/django.mo

Binary file modified.

File leaflet_storage/locale/it/LC_MESSAGES/django.po

View file
 msgstr ""
 "Project-Id-Version: 0.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-05 00:43+0100\n"
+"POT-Creation-Date: 2013-06-08 12:39+0200\n"
 "PO-Revision-Date: 2013-01-07 01:14+0100\n"
 "Last-Translator: Stefano\n"
 "Language-Team: FR <LL@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: base_models.py:12
+#: base_models.py:16
 msgid "name"
 msgstr "nome"
 
-#: base_models.py:26
+#: base_models.py:31
 msgid "details"
 msgstr "dettagli"
 
-#: base_models.py:27
+#: base_models.py:32
 msgid "Link to a page where the licence is detailed."
 msgstr "Link ad una pagina dove ci sono i dettagli della licenza."
 
-#: base_models.py:38
+#: base_models.py:44
 msgid "No licence set"
 msgstr "Nessuna licenza impostata"
 
-#: base_models.py:45
+#: base_models.py:51
 msgid "URL template using OSM tile format"
 msgstr "Modello dell'URL usando il formato delle tile OSM"
 
-#: base_models.py:71
+#: base_models.py:59
+msgid "Order of the tilelayers in the edit box"
+msgstr ""
+
+#: base_models.py:85 forms.py:116
 msgid "Everyone can edit"
 msgstr "Tutti possono modificare"
 
-#: base_models.py:72
+#: base_models.py:86
 msgid "Only editors can edit"
 msgstr "Solo gli editor possono modificare"
 
-#: base_models.py:73
+#: base_models.py:87
 msgid "Only owner can edit"
 msgstr "Solo il proprietario può modificare"
 
-#: base_models.py:76
-#: base_models.py:151
-#: base_models.py:221
+#: base_models.py:90 base_models.py:231 base_models.py:277
 msgid "description"
 msgstr "descrizione"
 
-#: base_models.py:77
+#: base_models.py:91
 msgid "center"
 msgstr "centro"
 
-#: base_models.py:78
+#: base_models.py:92
 msgid "zoom"
 msgstr "zoom"
 
-#: base_models.py:79
+#: base_models.py:93
 msgid "locate"
 msgstr "localizza"
 
-#: base_models.py:79
+#: base_models.py:93
 msgid "Locate user on load?"
 msgstr "Geolocalizzare l'utente al caricamento?"
 
-#: base_models.py:82
+#: base_models.py:96
 msgid "Choose the map licence."
 msgstr "Scegliere una licenza per la mappa."
 
-#: base_models.py:83
+#: base_models.py:97
 msgid "licence"
 msgstr "licenza"
 
-#: base_models.py:88
+#: base_models.py:103
 msgid "owner"
 msgstr "proprietario"
 
-#: base_models.py:89
+#: base_models.py:104
 msgid "editors"
 msgstr "editor"
 
-#: base_models.py:90
+#: base_models.py:105
 msgid "edit status"
 msgstr "stato della modifica"
 
-#: base_models.py:156
-msgid "Must be a CSS valid name (eg.: DarkBlue or #123456)"
-msgstr "Dev'essere un nome CSS valido (es. DarkBlud o #123456)"
+#: base_models.py:106
+msgid "settings"
+msgstr ""
 
-#: base_models.py:157
-#: base_models.py:227
-msgid "color"
-msgstr "colore"
+#: base_models.py:153
+#, python-format
+msgid "Your anonymous map has been attached to your account %s"
+msgstr ""
 
-#: base_models.py:163
+#: base_models.py:208
 msgid "pictogram"
 msgstr "pittogramma"
 
-#: base_models.py:173
+#: base_models.py:215
+#, fuzzy
+msgid "icon type"
+msgstr "Tipo del contenuto"
+
+#: base_models.py:216
+msgid "Choose the style of the marker."
+msgstr ""
+
+#: base_models.py:233 base_models.py:280
+msgid "options"
+msgstr ""
+
+#: base_models.py:236
 msgid "display on load"
 msgstr "mostra al caricamento"
 
-#: base_models.py:174
-msgid "Display this category on load."
+#: base_models.py:237
+#, fuzzy
+msgid "Display this layer on load."
 msgstr "Mostra questa categoria al caricamento."
 
-#: base_models.py:179
-msgid "Rank to order the categories"
-msgstr "Posiziona per ordinare le categorie"
-
-#: base_models.py:180
-msgid "rank"
-msgstr "posizione"
-
-#: base_models.py:211
-msgid "My data"
-msgstr "I miei dati"
+#: base_models.py:267
+msgid "Layer 1"
+msgstr ""
 
-#: base_models.py:228
-msgid "Optional. Uses category color if not set. "
-msgstr "Opzionale. Usa il colore della categoria se non impostato."
+#: base_models.py:279
+msgid "layer"
+msgstr ""