OpenStreetMap

" style="display:none"> - - <%end%> - -<%+cbi/valuefooter%> diff --git a/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm b/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm new file mode 100644 index 0000000000..30ad5bc34d --- /dev/null +++ b/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm @@ -0,0 +1,20 @@ + + + + OpenStreetMap + + + + + +

+ Map by openstreetmap.org, License CC-BY-SA + + + Latitude: + Longitude: + +

+ + diff --git a/modules/freifunk/htdocs/luci-static/resources/osm.js b/modules/freifunk/htdocs/luci-static/resources/osm.js new file mode 100644 index 0000000000..4138ef6ad2 --- /dev/null +++ b/modules/freifunk/htdocs/luci-static/resources/osm.js @@ -0,0 +1,130 @@ +var map; +var layer_mapnik; +var layer_tah; +var layer_markers; +var PI = Math.PI; +var latfield = ''; +var lonfield = ''; +var latfield_id=''; +var lonfield_id=''; +var centerlon = 10; +var centerlat = 52; +var zoom = 6; + +function lon2merc(lon) { + return 20037508.34 * lon / 180; +} + +function lat2merc(lat) { + lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / PI; + return 20037508.34 * lat; +} + +function merc2lon(lon) { + return lon*180/20037508.34; +}; + +function merc2lat(lat) { + return Math.atan(Math.exp(lat*PI/20037508.34))*360/PI-90; +}; + +OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { + defaultHandlerOptions: { + 'single': true, + 'double': false, + 'pixelTolerance': 0, + 'stopSingle': false, + 'stopDouble': false + }, + + initialize: function(options) { + this.handlerOptions = OpenLayers.Util.extend( + {}, this.defaultHandlerOptions + ); + OpenLayers.Control.prototype.initialize.apply( + this, arguments + ); + this.handler = new OpenLayers.Handler.Click( + this, { + 'click': this.trigger + }, this.handlerOptions + ); + }, + + trigger: function(e) { + var lonlat = map.getLonLatFromViewPortPx(e.xy); + lat=merc2lat(lonlat.lat); + lon=merc2lon(lonlat.lon); + if(parent.document.getElementById(latfield_id)==null){ + latfield=document.getElementById('osmlat'); + }else{ + latfield=parent.document.getElementById(latfield_id); + } + if(parent.document.getElementById(lonfield_id)==null){ + lonfield=document.getElementById('osmlon'); + }else{ + lonfield=parent.document.getElementById(lonfield_id); + } + latfield.value = lat; + lonfield.value = lon; + } +}); + +function init(){ + var field = window.name.substring(0, window.name.lastIndexOf(".")); + if(parent.document.getElementById(field+".latfield")!=null){ + latfield_id = parent.document.getElementById(field+".latfield").value; + document.getElementById('osm').style.display="none"; + } + if(parent.document.getElementById(field+".lonfield")!=null){ + lonfield_id = parent.document.getElementById(field+".lonfield").value; + } + if(parent.document.getElementById(field+".centerlat")!=null){ + centerlat =parseFloat(parent.document.getElementById(field+".centerlat").value); + } + if(parent.document.getElementById(field+".centerlon")!=null){ + centerlon = parseFloat(parent.document.getElementById(field+".centerlon").value); + } + if(parent.document.getElementById(field+".zoom")!=null){ + zoom = parseFloat(parent.document.getElementById(field+".zoom").value); + } +} + +function drawmap() { + OpenLayers.Lang.setCode('de'); + mapdiv=document.getElementById('map'); + mapdiv.style.height=window.innerHeight+"px"; + mapdiv.style.width=window.innerWidth+"px"; + map = new OpenLayers.Map('map', { + projection: new OpenLayers.Projection("EPSG:900913"), + displayProjection: new OpenLayers.Projection("EPSG:4326"), + controls: [ + new OpenLayers.Control.MouseDefaults(), + new OpenLayers.Control.PanZoomBar()], + maxExtent: + new OpenLayers.Bounds(-20037508.34,-20037508.34, 20037508.34, 20037508.34), + numZoomLevels: 18, + maxResolution: 156543, + units: 'meters' + }); + + layer_mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik"); + + map.addLayers([layer_mapnik]); + var y =lat2merc(centerlat); + var x =lon2merc(centerlon); + map.setCenter(new OpenLayers.LonLat(x, y), zoom); + + // Check for geolocation support + if(navigator.geolocation){ + navigator.geolocation.getCurrentPosition(function(position){ + var y =lat2merc(position.coords.latitude); + var x =lon2merc(position.coords.longitude); + map.setCenter(new OpenLayers.LonLat(x, y), '17'); + }); + } + + var click = new OpenLayers.Control.Click(); + map.addControl(click); + click.activate(); +} diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua b/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua index 2c22f7b49f..247e8816c3 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua @@ -2,6 +2,7 @@ LuCI - Lua Configuration Interface Copyright 2008 Steven Barth +Copyright 2011 Manuel Munz Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,6 +16,7 @@ local util = require "luci.util" local uci = require "luci.model.uci".cursor() local profiles = "/etc/config/profile_" + m = Map("freifunk", translate ("Community")) c = m:section(NamedSection, "community", "public", nil, translate("These are the basic settings for your local wireless community. These settings define the default values for the wizard and DO NOT affect the actual configuration of the router.")) @@ -30,7 +32,12 @@ for k,v in ipairs(list) do community:value(n, name) end + n = Map("system", translate("Basic system settings")) +function n.on_after_commit(self) + luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "basics")) +end + b = n:section(TypedSection, "system") b.anonymous = true @@ -42,25 +49,31 @@ loc = b:option(Value, "location", translate("Location")) loc.rmempty = false lat = b:option(Value, "latitude", translate("Latitude"), translate("e.g.") .. " 48.12345") +lat.datatype = "float" lat.rmempty = false lon = b:option(Value, "longitude", translate("Longitude"), translate("e.g.") .. " 10.12345") +lon.datatype = "float" lon.rmempty = false --[[ Opens an OpenStreetMap iframe or popup Makes use of resources/OSMLatLon.htm and htdocs/resources/osm.js -(is that the right place for files like these?) ]]-- ---[[ this needs to be fixed local class = util.class -local co = "profile_augsburg" -local syslat = uci:get_first(co, "community", "latitude") -local syslon = uci:get_first(co, "community", "longitude") - -OpenStreetMapLonLat = class(AbstractValue) +local ff = uci:get("freifunk", "community", "name") or "" +local co = "profile_" .. ff + +local deflat = uci:get_first("system", "system", "latitude") or uci:get_first(co, "community", "latitude") or 52 +local deflon = uci:get_first("system", "system", "longitude") or uci:get_first(co, "community", "longitude") or 10 +local zoom = 12 +if ( deflat == 52 and deflon == 10 ) then + zoom = 4 +end +OpenStreetMapLonLat = luci.util.class(AbstractValue) + function OpenStreetMapLonLat.__init__(self, ...) AbstractValue.__init__(self, ...) self.template = "cbi/osmll_value" @@ -76,29 +89,16 @@ function OpenStreetMapLonLat.__init__(self, ...) self.hidetext="X" -- text on button, that hides OSMap end - -f = SimpleForm("ffwizward", "OpenStreetMap", "Hier kann man die Geokoordinaten des Knotens herausfinden.") - -osm = f:field(OpenStreetMapLonLat, "latlon", "Geokoordinaten mit OpenStreetMap ermitteln:", "Klicken Sie auf Ihren Standort in der Karte. Diese Karte funktioniert nur, wenn das GerÃ¤t bereits eine Verbindung zum Internet hat.") -osm.latfield = "lat" -osm.lonfield = "lon" -osm.centerlat = syslat -osm.centerlon = syslon -osm.width = "100%" -osm.height = "600" -osm.popup = false - -syslatlengh = string.len(syslat) -if syslatlengh > 7 then - osm.zoom = "15" -elseif syslatlengh > 5 then - osm.zoom = "12" -else - osm.zoom = "6" -end - -osm.displaytext="OpenStreetMap anzeigen" -osm.hidetext="OpenStreetMap verbergen" -]] + osm = b:option(OpenStreetMapLonLat, "latlon", translate("Find your coordinates with OpenStreetMap"), translate("Select your location with a mouse click on the map. The map will only show up if you are connected to the Internet.")) + osm.latfield = "latitude" + osm.lonfield = "longitude" + osm.centerlat = uci:get_first("system", "system", "latitude") or deflat + osm.centerlon = uci:get_first("system", "system", "longitude") or deflon + osm.zoom = zoom + osm.width = "100%" + osm.height = "600" + osm.popup = false + osm.displaytext=translate("Show OpenStreetMap") + osm.hidetext=translate("Hide OpenStreetMap") return m, n diff --git a/modules/freifunk/luasrc/view/cbi/osmll_value.htm b/modules/freifunk/luasrc/view/cbi/osmll_value.htm new file mode 100644 index 0000000000..c368b67bdf --- /dev/null +++ b/modules/freifunk/luasrc/view/cbi/osmll_value.htm @@ -0,0 +1,55 @@ +<%# +cc-by-sa Andreas Pittrich +in behalf of the german pirate party (Piratenpartei) +www.piratenpartei.de + +$Id$ + +-%> +<%+cbi/valueheader%> + + <% if self:cfgvalue(section) ~= false then %> + <% if self.latfield and self.lonfield then %> + /> + /> + <% end %> + /> + /> + /> + <% end %> + + <% if self.popup then %> + + onclick=" + popup=window.open('/luci-static/resources/OSMLatLon.htm', '<%=cbid%>.window', 'innerWidth=<%=self.width%>, innerHeight=<%=self.height%>, location=no, menubar=no, scrollbars=no, status=no, toolbar=no'); + popup.focus(); + " + /> +

" style="display:none"> + + <%end%> + +<%+cbi/valuefooter%> diff --git a/po/ca/freifunk.po b/po/ca/freifunk.po index 8517b38b13..35b84a024a 100644 --- a/po/ca/freifunk.po +++ b/po/ca/freifunk.po @@ -98,6 +98,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -116,6 +122,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "Hola i benvingut a la xarxa de" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -253,9 +262,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -361,6 +378,11 @@ msgstr "Pots trobar mÃ©s informaciÃ³ sobre la iniciativa global Freifunk a" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/de/freifunk.po b/po/de/freifunk.po index 3d0eff0bca..4fa645fdcd 100644 --- a/po/de/freifunk.po +++ b/po/de/freifunk.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2011-02-11 21:42+0100\n" +"PO-Revision-Date: 2011-03-12 15:13+0100\n" "Last-Translator: Manuel Munz \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -99,6 +99,12 @@ msgstr "Splash-Text bearbeiten" msgid "Edit index page" msgstr "Indexseite bearbeiten" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "Geokoordinaten mit OpenStreetMap ermitteln" + msgid "Freifunk" msgstr "" @@ -117,6 +123,9 @@ msgstr "Gehe zu" msgid "Hello and welcome in the network of" msgstr "Hallo und willkommen im Netz von" +msgid "Hide OpenStreetMap" +msgstr "OpenStreetMap ausblenden" + msgid "Homepage" msgstr "" @@ -259,9 +268,19 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" +"WÃ¤hle hier deinen Standort durch einen Mausklick aus. Die Karte funktioniert " +"nur, wenn bereits eine Verbindung zum Internet besteht." + msgid "Services" msgstr "Dienste" +msgid "Show OpenStreetMap" +msgstr "OpenStreetMap anzeigen" + msgid "Signal" msgstr "" @@ -384,6 +403,13 @@ msgstr "Weitere Informationen zur globalen Freifunkinitiative findest du unter" msgid "You can manually edit the selected community profile here." msgstr "Hier kann das ausgewÃ¤hlte Community-Profil bearbeitet werden." +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" +"Es muss ein Profil ausgewÃ¤hlt werden, bevor es editiert werden kann. Gehe " +"dazu zur Seite" + msgid "and fill out all required fields." msgstr "und fÃ¼lle alle benÃ¶tigten Felder aus." diff --git a/po/el/freifunk.po b/po/el/freifunk.po index 8af8a132c3..726495f2f5 100644 --- a/po/el/freifunk.po +++ b/po/el/freifunk.po @@ -96,6 +96,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "ÎÎµÎ¹Î± ÏÎ±Ï ÎºÎ±Î¹ ÎºÎ±Î»ÏÏ Î®Î»Î¸Î±ÏÎµ ÏÏÎ¿ Î´Î¯ÎºÏÏÎ¿" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -249,9 +258,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -360,6 +377,11 @@ msgstr "" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/en/freifunk.po b/po/en/freifunk.po index 61e1a8f76a..d8853ca338 100644 --- a/po/en/freifunk.po +++ b/po/en/freifunk.po @@ -96,6 +96,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "Hello and welcome in the network of" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -249,9 +258,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -359,6 +376,11 @@ msgstr "" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/es/freifunk.po b/po/es/freifunk.po index 825fa49304..b15377b3eb 100644 --- a/po/es/freifunk.po +++ b/po/es/freifunk.po @@ -96,6 +96,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "Hola y bienvenido a la red de" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -251,9 +260,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -360,6 +377,11 @@ msgstr "Puede obtener informaciÃ³n acrca de la iniciativaglobal Freifunk en" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/fr/freifunk.po b/po/fr/freifunk.po index a16e17b331..814b52e3ee 100644 --- a/po/fr/freifunk.po +++ b/po/fr/freifunk.po @@ -97,6 +97,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -115,6 +121,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -248,9 +257,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -355,6 +372,11 @@ msgstr "" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/it/freifunk.po b/po/it/freifunk.po index 22cb689cb6..f3b27debb6 100644 --- a/po/it/freifunk.po +++ b/po/it/freifunk.po @@ -97,6 +97,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -115,6 +121,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -248,9 +257,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -355,6 +372,11 @@ msgstr "" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/ja/freifunk.po b/po/ja/freifunk.po index a16e17b331..814b52e3ee 100644 --- a/po/ja/freifunk.po +++ b/po/ja/freifunk.po @@ -97,6 +97,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -115,6 +121,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -248,9 +257,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -355,6 +372,11 @@ msgstr "" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/no/freifunk.po b/po/no/freifunk.po index ecb1c83b6d..eb324a6aff 100644 --- a/po/no/freifunk.po +++ b/po/no/freifunk.po @@ -96,6 +96,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "Hei og velkommen i nettverket av" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -251,9 +260,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -360,6 +377,11 @@ msgstr "Du finner mer informasjon om den globale Freifunk initiativ pÃ¥" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/pt/freifunk.po b/po/pt/freifunk.po index 32c7980655..9f8fe5cf4e 100644 --- a/po/pt/freifunk.po +++ b/po/pt/freifunk.po @@ -96,6 +96,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "OlÃ¡ e benvindo Ã rede " +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -251,9 +260,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -360,6 +377,11 @@ msgstr "Pode encontrar mais informaÃ§Ãµes sobre a iniciativa global Freifunk em msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/pt_BR/freifunk.po b/po/pt_BR/freifunk.po index aad9a7cdbb..5ca5421601 100644 --- a/po/pt_BR/freifunk.po +++ b/po/pt_BR/freifunk.po @@ -96,6 +96,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "OlÃ¡ e benvindo Ã rede " +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -251,9 +260,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -360,6 +377,11 @@ msgstr "Pode encontrar mais informaÃ§Ãµes sobre a iniciativa global Freifunk em msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/ru/freifunk.po b/po/ru/freifunk.po index a16e17b331..814b52e3ee 100644 --- a/po/ru/freifunk.po +++ b/po/ru/freifunk.po @@ -97,6 +97,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -115,6 +121,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -248,9 +257,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -355,6 +372,11 @@ msgstr "" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/templates/freifunk.pot b/po/templates/freifunk.pot index bee7a581a5..130e5ec0a4 100644 --- a/po/templates/freifunk.pot +++ b/po/templates/freifunk.pot @@ -85,6 +85,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -103,6 +109,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -236,9 +245,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -343,6 +360,11 @@ msgstr "" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" diff --git a/po/vi/freifunk.po b/po/vi/freifunk.po index 62d343938c..8abb27f123 100644 --- a/po/vi/freifunk.po +++ b/po/vi/freifunk.po @@ -98,6 +98,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -116,6 +122,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "Xin chÃ o vÃ chÃ o má»«ng gia nháºp máº¡ng lÆ°á»i cá»§a" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -252,9 +261,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -359,6 +376,11 @@ msgstr "Báº¡n cÃ³ thá» tÃ¬m tháº¥y thÃ´ng tin vá» Freifunk toÃ n cáº§u táº¡i " msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" @@ -400,12 +422,3 @@ msgstr "danh sÃ¡ch tráº¯ng" msgid "wireless settings" msgstr "" - - - - - - - - - diff --git a/po/zh_CN/freifunk.po b/po/zh_CN/freifunk.po index 2a566f0b7f..62b4d272c9 100644 --- a/po/zh_CN/freifunk.po +++ b/po/zh_CN/freifunk.po @@ -96,6 +96,12 @@ msgstr "" msgid "Edit index page" msgstr "" +msgid "Error" +msgstr "" + +msgid "Find your coordinates with OpenStreetMap" +msgstr "" + msgid "Freifunk" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Hello and welcome in the network of" msgstr "" +msgid "Hide OpenStreetMap" +msgstr "" + msgid "Homepage" msgstr "" @@ -247,9 +256,17 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Select your location with a mouse click on the map. The map will only show " +"up if you are connected to the Internet." +msgstr "" + msgid "Services" msgstr "" +msgid "Show OpenStreetMap" +msgstr "" + msgid "Signal" msgstr "" @@ -354,6 +371,11 @@ msgstr "" msgid "You can manually edit the selected community profile here." msgstr "" +msgid "" +"You need to select a profile before you can edit it. To select a profile go " +"to" +msgstr "" + msgid "and fill out all required fields." msgstr "" @@ -395,5 +417,3 @@ msgstr "" msgid "wireless settings" msgstr "" - -